From 76d7cbc9cf1155b2ab5dd547a169c891e7fd8c6d Mon Sep 17 00:00:00 2001 From: Vishnu kannan Date: Mon, 28 Sep 2015 10:27:01 -0700 Subject: [PATCH] 1. Make grafana accessible via api-server proxy 2. Add a persistent storage for grafana. 3. Do not enable LoadBalancer by default for Grafana service. This breaks in many deployments. --- .../influxdb/grafana-service.yaml | 1 - .../influxdb/influxdb-grafana-controller.yaml | 17 +++++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/cluster/addons/cluster-monitoring/influxdb/grafana-service.yaml b/cluster/addons/cluster-monitoring/influxdb/grafana-service.yaml index df00141fc5e..e9a63ab808a 100644 --- a/cluster/addons/cluster-monitoring/influxdb/grafana-service.yaml +++ b/cluster/addons/cluster-monitoring/influxdb/grafana-service.yaml @@ -7,7 +7,6 @@ metadata: kubernetes.io/cluster-service: "true" kubernetes.io/name: "Grafana" spec: - type: LoadBalancer ports: - port: 80 targetPort: 3000 diff --git a/cluster/addons/cluster-monitoring/influxdb/influxdb-grafana-controller.yaml b/cluster/addons/cluster-monitoring/influxdb/influxdb-grafana-controller.yaml index fa507d980c0..0e6ab61c2c0 100644 --- a/cluster/addons/cluster-monitoring/influxdb/influxdb-grafana-controller.yaml +++ b/cluster/addons/cluster-monitoring/influxdb/influxdb-grafana-controller.yaml @@ -40,7 +40,24 @@ spec: limits: cpu: 100m memory: 100Mi + env: + - name: "GF_AUTH_BASIC_ENABLED" + value: "false" + - name: "GF_AUTH_ANONYMOUS_ENABLED" + value: "true" + - name: "GF_AUTH_ANONYMOUS_ORG_ROLE" + value: "Admin" + - name: "GF_SERVER_ROOT_URL" + value: "/api/v1/proxy/namespaces/kube-system/services/monitoring-grafana/" + volumeMounts: + - name: grafana-persistent-storage + mountPath: /var + + volumes: - name: influxdb-persistent-storage emptyDir: {} + - name: grafana-persistent-storage + emptyDir: {} +