Merge pull request hitachienergy#12 from erzetpe/develop

Changes for grafana and fixes after migration.
to-bar · Jan 11, 2019 · 057e009 · 057e009
2 parents f4934fa + 5693763
commit 057e009
Show file tree

Hide file tree

Showing 38 changed files with 5 additions and 3,158 deletions.
diff --git a/core/bin/gen_docs.sh b/core/bin/gen_docs.sh
diff --git a/core/bin/template_engine b/core/bin/template_engine
diff --git a/core/core/src/ansible/roles/common/files/operations.sh b/core/core/src/ansible/roles/common/files/operations.sh
diff --git a/core/core/src/ansible/roles/grafana/tasks/install.yml b/core/core/src/ansible/roles/grafana/tasks/install.yml
@@ -33,7 +33,7 @@
 - block:
     - name: Import Grafana GPG signing key [Debian/Ubuntu]
       apt_key:
-        url: "https://packagecloud.io/gpg.key"
+        url: "https://packages.grafana.com/gpg.key"
         state: present
         validate_certs: false
       register: _add_apt_key_x86
@@ -47,7 +47,7 @@
 
     - name: Add Grafana repository [Debian/Ubuntu]
       apt_repository:
-        repo: deb https://packagecloud.io/grafana/stable/debian/ jessie main
+        repo: deb https://packages.grafana.com/oss/deb stable main
         state: present
         update_cache: false
       register: _apt_add_repo_x86

diff --git a/core/core/src/ansible/roles/grafana/templates/grafana.yum.repo.j2 b/core/core/src/ansible/roles/grafana/templates/grafana.yum.repo.j2
@@ -1,10 +1,10 @@
 # {{ ansible_managed }}
 [grafana]
 name=grafana
-baseurl=https://packagecloud.io/grafana/stable/el/7/$basearch
+baseurl=https://packages.grafana.com/oss/rpm
 #repo_gpgcheck=1
 enabled=1
 gpgcheck=1
-gpgkey=https://packagecloud.io/gpg.key https://grafanarel.s3.amazonaws.com/RPM-GPG-KEY-grafana
+gpgkey=https://packages.grafana.com/gpg.key
 sslverify=1
 sslcacert=/etc/pki/tls/certs/ca-bundle.crt 
diff --git a/core/core/src/ansible/roles/kafka/files/kafka_generate_ssl.sh b/core/core/src/ansible/roles/kafka/files/kafka_generate_ssl.sh
diff --git a/core/core/src/docker/deploy/init.sh b/core/core/src/docker/deploy/init.sh
diff --git a/core/core/src/docker/test/run.sh b/core/core/src/docker/test/run.sh
diff --git a/core/core/src/scripts/azure/fill_in_manifest.py b/core/core/src/scripts/azure/fill_in_manifest.py
diff --git a/core/core/src/scripts/azure/gen_templates_azure.sh b/core/core/src/scripts/azure/gen_templates_azure.sh
diff --git a/core/core/src/scripts/azure/run_build.sh b/core/core/src/scripts/azure/run_build.sh
diff --git a/core/core/src/scripts/common/base_colors.sh b/core/core/src/scripts/common/base_colors.sh
diff --git a/core/core/src/scripts/common/functions.sh b/core/core/src/scripts/common/functions.sh
diff --git a/core/core/src/scripts/kubernetes/get-id-rsa-from-value.sh b/core/core/src/scripts/kubernetes/get-id-rsa-from-value.sh
diff --git a/core/core/src/scripts/kubernetes/get-init-token.sh b/core/core/src/scripts/kubernetes/get-init-token.sh
diff --git a/core/core/src/scripts/kubernetes/linux/make-executable.sh b/core/core/src/scripts/kubernetes/linux/make-executable.sh
diff --git a/core/core/src/scripts/kubernetes/linux/master/apply-kubernetes-dashboard.sh b/core/core/src/scripts/kubernetes/linux/master/apply-kubernetes-dashboard.sh
diff --git a/core/core/src/scripts/kubernetes/linux/master/init-kubernetes-master.sh b/core/core/src/scripts/kubernetes/linux/master/init-kubernetes-master.sh
diff --git a/core/core/src/scripts/kubernetes/linux/master/untaint-master.sh b/core/core/src/scripts/kubernetes/linux/master/untaint-master.sh
diff --git a/core/core/src/scripts/kubernetes/linux/node/init-kubernetes-nodes.sh b/core/core/src/scripts/kubernetes/linux/node/init-kubernetes-nodes.sh
diff --git a/core/core/src/scripts/kubernetes/linux/prepare-system-kubernetes-redhat.sh b/core/core/src/scripts/kubernetes/linux/prepare-system-kubernetes-redhat.sh
diff --git a/core/core/src/scripts/kubernetes/linux/prepare-system-kubernetes-ubuntu.sh b/core/core/src/scripts/kubernetes/linux/prepare-system-kubernetes-ubuntu.sh
diff --git a/core/core/src/scripts/vsts/run-template-engine.sh b/core/core/src/scripts/vsts/run-template-engine.sh
diff --git a/core/core/test/kubernetes/install-test-prerequisites.sh b/core/core/test/kubernetes/install-test-prerequisites.sh
diff --git a/core/core/test/kubernetes/run-sonobuoy-test.sh b/core/core/test/kubernetes/run-sonobuoy-test.sh
diff --git a/core/core/test/serverspec/rvm.sh b/core/core/test/serverspec/rvm.sh
diff --git a/core/epiphany b/core/epiphany
diff --git a/core/proxy.sh b/core/proxy.sh
diff --git a/core/version.sh b/core/version.sh
@@ -25,5 +25,5 @@ set -e
 unset EPIPHANY_VERSION
 unset EPIPHANY_VERSION_NAME
 
-export EPIPHANY_VERSION="0.1.2"
+export EPIPHANY_VERSION="0.1.20"
 export EPIPHANY_VERSION_NAME="Epiphany"
diff --git a/data/azure/infrastructure/README.md b/data/azure/infrastructure/README.md