From beef8c1a3edc835d2892d69315bab1c0e7161553 Mon Sep 17 00:00:00 2001 From: Massaki Archambault Date: Mon, 6 Sep 2021 16:39:49 -0400 Subject: [PATCH] provision grafana plugins --- .../bases/grafana/grafana-deployment.yaml | 26 +++---------------- .../bases/grafana/provision/datasources.yaml | 2 +- .../namespaces/monitoring/kustomization.yaml | 2 +- 3 files changed, 5 insertions(+), 25 deletions(-) diff --git a/kustomize/bases/grafana/grafana-deployment.yaml b/kustomize/bases/grafana/grafana-deployment.yaml index 437f59d..7e0cdae 100644 --- a/kustomize/bases/grafana/grafana-deployment.yaml +++ b/kustomize/bases/grafana/grafana-deployment.yaml @@ -28,29 +28,9 @@ spec: image: grafana/grafana env: - name: GF_AUTH_ANONYMOUS_ENABLED - value: "false" - # - name: GF_DATABASE_TYPE - # value: postgres - # - name: GF_DATABASE_HOST - # valueFrom: - # secretKeyRef: - # name: postgres-credentials - # key: host - # - name: GF_DATABASE_NAME - # valueFrom: - # secretKeyRef: - # name: postgres-credentials - # key: database - # - name: GF_DATABASE_USER - # valueFrom: - # secretKeyRef: - # name: postgres-credentials - # key: username - # - name: GF_DATABASE_PASSWORD - # valueFrom: - # secretKeyRef: - # name: postgres-credentials - # key: password + value: "true" + - name: GF_INSTALL_PLUGINS + value: marcusolsson-json-datasource,marcusolsson-treemap-panel readinessProbe: failureThreshold: 3 httpGet: diff --git a/kustomize/bases/grafana/provision/datasources.yaml b/kustomize/bases/grafana/provision/datasources.yaml index ffd9b4e..eb5a677 100644 --- a/kustomize/bases/grafana/provision/datasources.yaml +++ b/kustomize/bases/grafana/provision/datasources.yaml @@ -4,4 +4,4 @@ datasources: type: prometheus access: proxy url: http://prometheus-operated.monitoring.svc.cluster.local:9090 - is_default: true + isDefault: true diff --git a/kustomize/namespaces/monitoring/kustomization.yaml b/kustomize/namespaces/monitoring/kustomization.yaml index cb36ef4..4ff8c99 100644 --- a/kustomize/namespaces/monitoring/kustomization.yaml +++ b/kustomize/namespaces/monitoring/kustomization.yaml @@ -1,6 +1,6 @@ bases: - ../../bases/prometheus - - ../../bases/node-exporter + # - ../../bases/node-exporter - ../../bases/blackbox-exporter - ../../bases/kube-state-metrics