From 2a96d77dd931274990e62cd431b16282e2eed064 Mon Sep 17 00:00:00 2001
From: Frederic Branczyk <fbranczyk@gmail.com>
Date: Thu, 28 Jun 2018 17:31:58 +0200
Subject: [PATCH] kube-prometheus: Re-generate Grafana jsonnet dependency
---
manifests/grafana-dashboardDatasources.yaml | 19 +++----------------
manifests/grafana-deployment.yaml | 6 +++---
2 files changed, 6 insertions(+), 19 deletions(-)
diff --git a/manifests/grafana-dashboardDatasources.yaml b/manifests/grafana-dashboardDatasources.yaml
index 5585057c..446c6864 100644
--- a/manifests/grafana-dashboardDatasources.yaml
+++ b/manifests/grafana-dashboardDatasources.yaml
@@ -1,21 +1,8 @@
apiVersion: v1
data:
- prometheus.yaml: |-
- {
- "apiVersion": 1,
- "datasources": [
- {
- "access": "proxy",
- "editable": false,
- "name": "prometheus",
- "orgId": 1,
- "type": "prometheus",
- "url": "http://prometheus-k8s.monitoring.svc:9090",
- "version": 1
- }
- ]
- }
-kind: ConfigMap
+ prometheus.yaml: ewogICAgImFwaVZlcnNpb24iOiAxLAogICAgImRhdGFzb3VyY2VzIjogWwogICAgICAgIHsKICAgICAgICAgICAgImFjY2VzcyI6ICJwcm94eSIsCiAgICAgICAgICAgICJlZGl0YWJsZSI6IGZhbHNlLAogICAgICAgICAgICAibmFtZSI6ICJwcm9tZXRoZXVzIiwKICAgICAgICAgICAgIm9yZ0lkIjogMSwKICAgICAgICAgICAgInR5cGUiOiAicHJvbWV0aGV1cyIsCiAgICAgICAgICAgICJ1cmwiOiAiaHR0cDovL3Byb21ldGhldXMtazhzLm1vbml0b3Jpbmcuc3ZjOjkwOTAiLAogICAgICAgICAgICAidmVyc2lvbiI6IDEKICAgICAgICB9CiAgICBdCn0=
+kind: Secret
metadata:
name: grafana-datasources
namespace: monitoring
+type: Opaque
diff --git a/manifests/grafana-deployment.yaml b/manifests/grafana-deployment.yaml
index 8002d832..4b00b004 100644
--- a/manifests/grafana-deployment.yaml
+++ b/manifests/grafana-deployment.yaml
@@ -69,9 +69,9 @@ spec:
volumes:
- emptyDir: {}
name: grafana-storage
- - configMap:
- name: grafana-datasources
- name: grafana-datasources
+ - name: grafana-datasources
+ secret:
+ secretName: grafana-datasources
- configMap:
name: grafana-dashboards
name: grafana-dashboards
--
GitLab