commit d4f66da948f4bcc3082272360c61ca453c56342f
author David Garcia <david.garcia@canonical.com> Thu Nov 12 15:30:56 2020 +0100
committer garciadav <david.garcia@canonical.com> Fri Nov 13 15:12:13 2020 +0100
tree bfc9a663b7c8fd38f49136a10af5ee3fbba82d6e
parent 9b6ad36b93538bbe2621b8c30d899862d8840e60

Add grafana config options to MON charm

Added options:
- grafana_url
- grafana_user
- grafana_password

Change-Id: Ifa152297aaac876c86f36a1a5dace01491538145
Signed-off-by: David Garcia <david.garcia@canonical.com>

installers/charm/mon-k8s/config.yaml

diff --git a/installers/charm/mon-k8s/config.yaml b/installers/charm/mon-k8s/config.yaml
index 069758f..6f44b2e 100644
--- a/installers/charm/mon-k8s/config.yaml
+++ b/installers/charm/mon-k8s/config.yaml
@@ -76,3 +76,15 @@
     description: Docker repository password
     type: string
     default: ""
+  grafana_url:
+    description: Grafana URL
+    type: string
+    default: http://grafana-k8s:3000
+  grafana_user:
+    description: Grafana user
+    type: string
+    default: admin
+  grafana_password:
+    description: Grafana password
+    type: string
+    default: admin

installers/charm/mon-k8s/reactive/spec_template.yaml

diff --git a/installers/charm/mon-k8s/reactive/spec_template.yaml b/installers/charm/mon-k8s/reactive/spec_template.yaml
index bc6cb07..90c881d 100644
--- a/installers/charm/mon-k8s/reactive/spec_template.yaml
+++ b/installers/charm/mon-k8s/reactive/spec_template.yaml
@@ -41,6 +41,9 @@
       OSMMON_COLLECTOR_INTERVAL: %(OSMMON_COLLECTOR_INTERVAL)s
       OSMMON_EVALUATOR_INTERVAL: %(OSMMON_EVALUATOR_INTERVAL)s
       OSMMON_PROMETHEUS_URL: http://%(prometheus_url)s
+      OSMMON_GRAFANA_URL: %(grafana_url)s
+      OSMMON_GRAFANA_USER: %(grafana_user)s
+      OSMMON_GRAFANA_PASSWORD: %(grafana_password)s
     kubernetes:
       readinessProbe:
         tcpSocket: