kube-prometheus: Upgrade to grafana v5

2018-02-07 10:09:41 +01:00
parent ba5192bcaf
commit 85f88025f3
24 changed files with 7510 additions and 7682 deletions
--- a/hack/grafana-dashboards-configmap-generator/bin/grafana_dashboards_generate.sh
+++ b/hack/grafana-dashboards-configmap-generator/bin/grafana_dashboards_generate.sh
@@ -70,7 +70,7 @@ DATE_EXEC="$(date "+%Y-%m-%d-%H%M%S")"
 BIN_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 TOOL_HOME="$(dirname $BIN_DIR)"
 SCRIPT_BASE=`basename $0 | sed "s/\.[Ss][Hh]//"`
-CONFIGMAP_DASHBOARD_PREFIX="grafana-dashboards"
+CONFIGMAP_DASHBOARD_PREFIX="grafana-dashboard-definitions"

 TEMPLATES_DIR="$TOOL_HOME/templates"
 DASHBOARD_HEADER_FILE="$TEMPLATES_DIR/dashboard.header"
@@ -327,7 +327,10 @@ initialize-bin-pack
 bin-pack-files "$(find $DASHBOARDS_DIR -maxdepth 1 -type f -name "*-dashboard.json" | sort)"

 # Continue processing datasources (maintaining the same queue)
-bin-pack-files "$(find $DASHBOARDS_DIR -maxdepth 1 -type f -name "*-datasource.json" | sort )"
+#
+# Commented out, as datasources are provisionable by Grafana by default in Grafana v5, but from a separate directory, meaning a separate ConfigMap for us.
+#
+# bin-pack-files "$(find $DASHBOARDS_DIR -maxdepth 1 -type f -name "*-datasource.json" | sort )"

 # Processing remaining data in the queue (or unique)
 if [ "$to_process" ]; then
@@ -361,7 +364,7 @@ for (( i=0; i<$total_configmaps_created; i++ )); do
  configmap="$CONFIGMAP_DASHBOARD_PREFIX-$i"
  echo "# Preparing grafana deployment to support configmap: $configmap"

-  test "$VOLUME_MOUNTS" && VOLUME_MOUNTS="$VOLUME_MOUNTS\n- name: $configmap\n  mountPath: /var/$configmap" || VOLUME_MOUNTS="- name: $configmap\n  mountPath: /var/$configmap"
+  test "$VOLUME_MOUNTS" && VOLUME_MOUNTS="$VOLUME_MOUNTS\n- name: $configmap\n  mountPath: /grafana-dashboard-definitions/$i" || VOLUME_MOUNTS="- name: $configmap\n  mountPath: /grafana-dashboard-definitions/$i"
  test "$VOLUMES" && VOLUMES="$VOLUMES\n- name: $configmap\n  configMap:\n    name: $configmap" || VOLUMES="- name: $configmap\n  configMap:\n    name: $configmap"
  test "$WATCH_DIR" && WATCH_DIR="$WATCH_DIR\n- '--watch-dir=/var/$configmap'" || WATCH_DIR="- '--watch-dir=/var/$configmap'"
  # echo "DEBUG:"
--- a/hack/grafana-dashboards-configmap-generator/templates/ConfigMap.header
+++ b/hack/grafana-dashboards-configmap-generator/templates/ConfigMap.header
@@ -1,5 +1,5 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: grafana-dashboards
+  name: grafana-dashboard-definitions
 data:
--- a/hack/grafana-dashboards-configmap-generator/templates/dashboard.foot
+++ b/hack/grafana-dashboards-configmap-generator/templates/dashboard.foot
@@ -1,11 +0,0 @@
-    ,
-      "inputs": [
-        {
-          "name": "DS_PROMETHEUS",
-          "pluginId": "prometheus",
-          "type": "datasource",
-          "value": "prometheus"
-        }
-      ],
-      "overwrite": true
-    }
--- a/hack/grafana-dashboards-configmap-generator/templates/dashboard.header
+++ b/hack/grafana-dashboards-configmap-generator/templates/dashboard.header
@@ -1,2 +0,0 @@
-    {
-      "dashboard":
--- a/hack/grafana-dashboards-configmap-generator/templates/grafana-deployment-template.yaml
+++ b/hack/grafana-dashboards-configmap-generator/templates/grafana-deployment-template.yaml
@@ -14,25 +14,15 @@ spec:
        runAsUser: 65534
      containers:
      - name: grafana
-        image: quay.io/coreos/monitoring-grafana:4.6.3-non-root.1
-        env:
-        - name: GF_AUTH_BASIC_ENABLED
-          value: "true"
-        - name: GF_AUTH_ANONYMOUS_ENABLED
-          value: "true"
-        - name: GF_SECURITY_ADMIN_USER
-          valueFrom:
-            secretKeyRef:
-              name: grafana-credentials
-              key: user
-        - name: GF_SECURITY_ADMIN_PASSWORD
-          valueFrom:
-            secretKeyRef:
-              name: grafana-credentials
-              key: password
+        image: quay.io/coreos/monitoring-grafana:5.0.0-beta1
        volumeMounts:
        - name: grafana-storage
          mountPath: /data
+        - name: grafana-datasources
+          mountPath: /grafana/conf/provisioning/datasources
+        - name: grafana-dashboards
+          mountPath: /grafana/conf/provisioning/dashboards
+XXX_VOLUME_MOUNTS_XXX
        ports:
        - name: web
          containerPort: 3000
@@ -43,32 +33,13 @@ spec:
          limits:
            memory: 200Mi
            cpu: 200m
-      - name: grafana-watcher
-        image: quay.io/coreos/grafana-watcher:v0.0.8
-        args:
-XXX_WATCH_DIR_XXX
-          - '--grafana-url=http://localhost:3000'
-        env:
-        - name: GRAFANA_USER
-          valueFrom:
-            secretKeyRef:
-              name: grafana-credentials
-              key: user
-        - name: GRAFANA_PASSWORD
-          valueFrom:
-            secretKeyRef:
-              name: grafana-credentials
-              key: password
-        resources:
-          requests:
-            memory: "16Mi"
-            cpu: "50m"
-          limits:
-            memory: "32Mi"
-            cpu: "100m"
-        volumeMounts:
-XXX_VOLUME_MOUNTS_XXX
      volumes:
      - name: grafana-storage
        emptyDir: {}
+      - name: grafana-datasources
+        configMap:
+          name: grafana-datasources
+      - name: grafana-dashboards
+        configMap:
+          name: grafana-dashboards
 XXX_VOLUMES_XXX
--- a/hack/scripts/generate-dashboards-configmap.sh
+++ b/hack/scripts/generate-dashboards-configmap.sh
@@ -6,7 +6,7 @@ cat <<-EOF
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: grafana-dashboards-0
+  name: grafana-dashboard-definitions-0
 data:
 EOF

@@ -37,10 +37,3 @@ do
    hack/scripts/wrap-dashboard.sh $f prometheus-k8s | sed "s/^/    /g"
  fi
 done
-
-for f in assets/grafana/*-datasource.json
-do
-  cp $f assets/grafana/generated/
-  echo "  $(basename $f): |+"
-  cat $f | sed "s/^/    /g"
-done
--- a/hack/scripts/generate-manifests.sh
+++ b/hack/scripts/generate-manifests.sh
@@ -6,16 +6,16 @@ set +x
 hack/scripts/generate-rules-configmap.sh > manifests/prometheus/prometheus-k8s-rules.yaml

 # Generate Dashboard ConfigMap
-hack/scripts/generate-dashboards-configmap.sh > manifests/grafana/grafana-dashboards.yaml
+hack/scripts/generate-dashboards-configmap.sh > manifests/grafana/grafana-dashboard-definitions.yaml

 # Generate Dashboard ConfigMap with configmap-generator tool
 # Max Size per ConfigMap: 240000
 # Input dir: assets/grafana
 # output file: manifests/grafana/grafana-dashboards.yaml
 # grafana deployment output file: manifests/grafana/grafana-deployment.yaml
-test -f manifests/grafana/grafana-dashboards.yaml && rm -f manifests/grafana/grafana-dashboards.yaml
+test -f manifests/grafana/grafana-dashboards.yaml && rm -f manifests/grafana/grafana-dashboard-definitions.yaml
 test -f manifests/grafana/grafana-deployment.yaml && rm -f manifests/grafana/grafana-deployment.yaml
-hack/grafana-dashboards-configmap-generator/bin/grafana_dashboards_generate.sh -s 240000 -i assets/grafana/generated -o manifests/grafana/grafana-dashboards.yaml -g manifests/grafana/grafana-deployment.yaml
+hack/grafana-dashboards-configmap-generator/bin/grafana_dashboards_generate.sh -s 240000 -i assets/grafana/generated -o manifests/grafana/grafana-dashboard-definitions.yaml -g manifests/grafana/grafana-deployment.yaml

 # Generate Grafana Credentials Secret
 hack/scripts/generate-grafana-credentials-secret.sh admin admin > manifests/grafana/grafana-credentials.yaml