From: David Garcia <david.garcia@canonical.com>
Date: Thu, 12 Nov 2020 14:30:56 +0000 (+0100)
Subject: Add grafana config options to MON charm
X-Git-Tag: release-v9.0-start~40
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=refs%2Fchanges%2F70%2F9970%2F3;p=osm%2Fdevops.git

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>
---

diff --git a/installers/charm/mon-k8s/config.yaml b/installers/charm/mon-k8s/config.yaml
index 069758fe..6f44b2e1 100644
--- a/installers/charm/mon-k8s/config.yaml
+++ b/installers/charm/mon-k8s/config.yaml
@@ -76,3 +76,15 @@ options:
     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
diff --git a/installers/charm/mon-k8s/reactive/spec_template.yaml b/installers/charm/mon-k8s/reactive/spec_template.yaml
index bc6cb079..90c881d5 100644
--- a/installers/charm/mon-k8s/reactive/spec_template.yaml
+++ b/installers/charm/mon-k8s/reactive/spec_template.yaml
@@ -41,6 +41,9 @@ containers:
       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: