EDGEPOD-34 Add ability to configure Grafana dashboards to import
Also, bump Prometheus and Grafana helm chart version.
Change-Id: I74ab2f8d70671fa3ccaf2efab2de107c0c5d47b5
diff --git a/nem-monitoring/templates/grafana-dashboard-aaa-configmap.yaml b/nem-monitoring/templates/grafana-dashboard-aaa-configmap.yaml
deleted file mode 100644
index 46d51f5..0000000
--- a/nem-monitoring/templates/grafana-dashboard-aaa-configmap.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
----
-# Copyright 2018-present Open Networking Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-apiVersion: v1
-kind: ConfigMap
-metadata:
- name: grafana-dashboard-aaa
- labels:
- grafana_dashboard: "1"
-data:
- aaa.json: |
-{{ .Files.Get "grafana-dashboards/aaa-stats.json" | indent 4 }}
diff --git a/nem-monitoring/templates/grafana-dashboard-configmap.yaml b/nem-monitoring/templates/grafana-dashboard-configmap.yaml
new file mode 100644
index 0000000..c217d20
--- /dev/null
+++ b/nem-monitoring/templates/grafana-dashboard-configmap.yaml
@@ -0,0 +1,50 @@
+---
+# Copyright 2019-present Open Networking Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+apiVersion: v1
+kind: ConfigMap
+metadata:
+ name: grafana-dashboards
+ labels:
+ grafana_dashboard: "1"
+data:
+{{- if .Values.dashboards.k8s }}
+ k8s.json: |
+{{ .Files.Get "grafana-dashboards/k8s-app-metrics.json" | indent 4 }}
+{{- end }}
+{{- if .Values.dashboards.nodeExporter }}
+ node-exporter.json: |
+{{ .Files.Get "grafana-dashboards/node-exporter.json" | indent 4 }}
+{{- end }}
+{{- if .Values.dashboards.xos }}
+ xos.json: |
+{{ .Files.Get "grafana-dashboards/xos.json" | indent 4 }}
+{{- end }}
+{{- if .Values.dashboards.onos }}
+ onos.json: |
+{{ .Files.Get "grafana-dashboards/onos-kpi.json" | indent 4 }}
+{{- end }}
+{{- if .Values.dashboards.aaa }}
+ aaa.json: |
+{{ .Files.Get "grafana-dashboards/aaa-stats.json" | indent 4 }}
+{{- end }}
+{{- if .Values.dashboards.voltha }}
+ voltha.json: |
+{{ .Files.Get "grafana-dashboards/voltha-kpi.json" | indent 4 }}
+{{- end }}
+{{- if .Values.dashboards.omec }}
+ omec.json: |
+{{ .Files.Get "grafana-dashboards/omec.json" | indent 4 }}
+{{- end }}
diff --git a/nem-monitoring/templates/grafana-dashboard-kb8s-configmap.yaml b/nem-monitoring/templates/grafana-dashboard-kb8s-configmap.yaml
deleted file mode 100644
index 3334c51..0000000
--- a/nem-monitoring/templates/grafana-dashboard-kb8s-configmap.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
----
-# Copyright 2018-present Open Networking Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-apiVersion: v1
-kind: ConfigMap
-metadata:
- name: grafana-dashboard-kb8s
- labels:
- grafana_dashboard: "1"
-data:
- kb8s.json: |
-{{ .Files.Get "grafana-dashboards/kb8s-app-metrics.json" | indent 4 }}
\ No newline at end of file
diff --git a/nem-monitoring/templates/grafana-dashboard-node-exporter.yaml b/nem-monitoring/templates/grafana-dashboard-node-exporter.yaml
deleted file mode 100644
index 684f7e3..0000000
--- a/nem-monitoring/templates/grafana-dashboard-node-exporter.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
----
-# Copyright 2018-present Open Networking Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-apiVersion: v1
-kind: ConfigMap
-metadata:
- name: grafana-dashboard-node-exporter
- labels:
- grafana_dashboard: "1"
-data:
- xos.json: |
-{{ .Files.Get "grafana-dashboards/node-exporter.json" | indent 4 }}
diff --git a/nem-monitoring/templates/grafana-dashboard-omec-configmap.yaml b/nem-monitoring/templates/grafana-dashboard-omec-configmap.yaml
deleted file mode 100644
index a7b780b..0000000
--- a/nem-monitoring/templates/grafana-dashboard-omec-configmap.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
----
-# Copyright 2018-present Open Networking Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-apiVersion: v1
-kind: ConfigMap
-metadata:
- name: grafana-dashboard-omec
- labels:
- grafana_dashboard: "1"
-data:
- mcord.json: |
-{{ .Files.Get "grafana-dashboards/omec.json" | indent 4 }}
diff --git a/nem-monitoring/templates/grafana-dashboard-onos-configmap.yaml b/nem-monitoring/templates/grafana-dashboard-onos-configmap.yaml
deleted file mode 100644
index 25d270e..0000000
--- a/nem-monitoring/templates/grafana-dashboard-onos-configmap.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
----
-# Copyright 2018-present Open Networking Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-apiVersion: v1
-kind: ConfigMap
-metadata:
- name: grafana-dashboard-onos
- labels:
- grafana_dashboard: "1"
-data:
- onos.json: |
-{{ .Files.Get "grafana-dashboards/onos-kpi.json" | indent 4 }}
\ No newline at end of file
diff --git a/nem-monitoring/templates/grafana-dashboard-voltha-configmap.yaml b/nem-monitoring/templates/grafana-dashboard-voltha-configmap.yaml
deleted file mode 100644
index efbb0dd..0000000
--- a/nem-monitoring/templates/grafana-dashboard-voltha-configmap.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
----
-# Copyright 2018-present Open Networking Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-apiVersion: v1
-kind: ConfigMap
-metadata:
- name: grafana-dashboard-voltha
- labels:
- grafana_dashboard: "1"
-data:
- voltha.json: |
-{{ .Files.Get "grafana-dashboards/voltha-kpi.json" | indent 4 }}
\ No newline at end of file
diff --git a/nem-monitoring/templates/grafana-dashboard-xos-configmap.yaml b/nem-monitoring/templates/grafana-dashboard-xos-configmap.yaml
deleted file mode 100644
index 13b99ef..0000000
--- a/nem-monitoring/templates/grafana-dashboard-xos-configmap.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
----
-# Copyright 2018-present Open Networking Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-apiVersion: v1
-kind: ConfigMap
-metadata:
- name: grafana-dashboard-xos
- labels:
- grafana_dashboard: "1"
-data:
- xos.json: |
-{{ .Files.Get "grafana-dashboards/xos.json" | indent 4 }}
\ No newline at end of file