AETHER-896 Changes to integrate with Rancher Monitoring v2
Change-Id: I423f1070bad727e467521e73962ee91a8a282b78
diff --git a/monitoring/grafana-aether/Chart.yaml b/monitoring/grafana-aether/Chart.yaml
index cfe7efb..9913ac1 100644
--- a/monitoring/grafana-aether/Chart.yaml
+++ b/monitoring/grafana-aether/Chart.yaml
@@ -5,6 +5,6 @@
name: grafana-aether
description: A Helm chart for deploying Grafana with Aether dashboards
-version: 0.3.1
+version: 0.4.0
appVersion: 0.1.0
diff --git a/monitoring/grafana-aether/requirements.yaml b/monitoring/grafana-aether/requirements.yaml
index af1ded3..e10bc60 100644
--- a/monitoring/grafana-aether/requirements.yaml
+++ b/monitoring/grafana-aether/requirements.yaml
@@ -5,3 +5,4 @@
- name: grafana
version: 5.5.0
repository: https://kubernetes-charts.storage.googleapis.com/
+ condition: grafana.enabled
diff --git a/monitoring/grafana-aether/templates/dashboard-configmap.yaml b/monitoring/grafana-aether/templates/dashboard-configmap.yaml
index a9e6d98..cc0dfa2 100644
--- a/monitoring/grafana-aether/templates/dashboard-configmap.yaml
+++ b/monitoring/grafana-aether/templates/dashboard-configmap.yaml
@@ -5,6 +5,9 @@
kind: ConfigMap
metadata:
name: {{ .Release.Name }}-dashboards
+{{- if .Values.dashboardNamespace }}
+ namespace: {{ .Values.dashboardNamespace }}
+{{- end }}
labels:
grafana_dashboard: "1"
data:
diff --git a/monitoring/grafana-aether/templates/datasource-configmap.yaml b/monitoring/grafana-aether/templates/datasource-configmap.yaml
index 81034e2..0de48da 100644
--- a/monitoring/grafana-aether/templates/datasource-configmap.yaml
+++ b/monitoring/grafana-aether/templates/datasource-configmap.yaml
@@ -5,6 +5,9 @@
kind: ConfigMap
metadata:
name: {{ .Release.Name }}-datasource
+{{- if .Values.datasourceNamespace }}
+ namespace: {{ .Values.datasourceNamespace }}
+{{- end }}
labels:
grafana_datasource: "1"
data:
diff --git a/monitoring/grafana-aether/values.yaml b/monitoring/grafana-aether/values.yaml
index c6a8891..e824277 100644
--- a/monitoring/grafana-aether/values.yaml
+++ b/monitoring/grafana-aether/values.yaml
@@ -38,7 +38,14 @@
# ...
# -----END PRIVATE KEY-----
+# Namespace to deploy dashboard ConfigMaps (leave blank for chart namespace)
+dashboardNamespace: ""
+
+# Namespace to deploy datasource ConfigMaps (leave blank for chart namespace)
+datasourceNamespace: ""
+
grafana:
+ enabled: true
grafana.ini:
auth.anonymous:
enabled: true