👽 Use OpenShift Grafana image; use v3.11 OCP tag

JIRA: https://issues.jboss.org/browse/AEROGEAR-8083
aerogearcatalog · Nov 22, 2018 · 88a11dd · 88a11dd
1 parent d567045
commit 88a11dd
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/roles/provision-metrics-apb/defaults/main.yml b/roles/provision-metrics-apb/defaults/main.yml
@@ -1,12 +1,12 @@
 # Prometheus Values
 prometheus_image: "registry.access.redhat.com/openshift3/prometheus"
-prometheus_version: "v3.9"
+prometheus_version: "v3.11"
 prometheus_port: 9090
 prometheus_proxy_port: 4180
 
 # Grafana values
-grafana_image: "docker.io/aerogear/grafana"
-grafana_version: "v5.0.0-pre1"
+grafana_image: "registry.access.redhat.com/openshift3/grafana"
+grafana_version: "v3.11"
 grafana_port: 3000
 grafana_proxy_port: 4181
 grafana_log_level: debug
@@ -26,5 +26,5 @@ postgres_password: "{{ POSTGRES_PASSWORD | default(lookup('password', '/tmp/pass
 postgres_database: "aerogear_mobile_metrics"
 
 # OAuth Proxy values
-proxy_image: "docker.io/openshift/oauth-proxy"
-proxy_version: "v1.1.0"
+proxy_image: "registry.access.redhat.com/openshift3/oauth-proxy"
+proxy_version: "v3.11"
diff --git a/roles/provision-metrics-apb/tasks/provision-grafana.yml b/roles/provision-metrics-apb/tasks/provision-grafana.yml
@@ -73,6 +73,8 @@
       - --cookie-secret=SECRET
     - name: grafana
       image: '{{ grafana_image }}:{{ grafana_version }}'
+      args:
+        - -config=/etc/grafana/grafana.ini
       ports:
       - container_port: '{{ grafana_port }}'
         protocol: TCP