From d4f66da948f4bcc3082272360c61ca453c56342f Mon Sep 17 00:00:00 2001 From: David Garcia Date: Thu, 12 Nov 2020 15:30:56 +0100 Subject: [PATCH] Add grafana config options to MON charm Added options: - grafana_url - grafana_user - grafana_password Change-Id: Ifa152297aaac876c86f36a1a5dace01491538145 Signed-off-by: David Garcia --- installers/charm/mon-k8s/config.yaml | 12 ++++++++++++ installers/charm/mon-k8s/reactive/spec_template.yaml | 3 +++ 2 files changed, 15 insertions(+) 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: -- 2.25.1