Merge pull request #184 from weaveworks/add-flux-dashboards

Add flux grafana dashboards and increase version of kube-prometheus-s…

charts/prometheus/Chart.lock

@@ -1,6 +1,6 @@
 dependencies:
 - name: kube-prometheus-stack
   repository: https://prometheus-community.github.io/helm-charts
-  version: 19.2.2
-digest: sha256:d6cee6c5e7e00b2d7eb2bf5fb8187ed80c6e1bff7a6b3712e23a797bbbd16edf
-generated: "2021-10-21T10:53:02.734701-04:00"
+  version: 40.3.1
+digest: sha256:f93fa4de76e0363a0df89fdbf34ab36363106d2c4b3b385f0d833d2e455f3b05
+generated: "2022-10-04T21:54:15.465857271+01:00"

charts/prometheus/Chart.yaml

@@ -3,19 +3,17 @@ name: prometheus
 icon: https://raw.githubusercontent.com/prometheus/prometheus.github.io/master/assets/prometheus_logo-cb55bb5c346.png
 description: A Weaveworks Helm chart for observability
 type: application
-version: 0.0.11
+version: 1.0.0
 kubeVersion: ">=1.16.0-0"
 home: https://github.com/weaveworks/profiles-catalog
 sources:
   - https://github.com/prometheus-community/helm-charts
   - https://github.com/prometheus-operator/kube-prometheus
-
 keywords:
 - operator
 - prometheus
 - kube-prometheus
 - observability
-
 annotations:
   "weave.works/profile": prometheus
   "weave.works/category": Observability
@@ -29,13 +27,11 @@ annotations:
   "weave.works/profile-ci": |
     - "gke"
     - "kind"
-
 maintainers:
   - name: Weaveworks
     email: [email protected]
-
 dependencies:
 - name: kube-prometheus-stack
-  version: "19.2.2"
+  version: "40.3.1"
   repository: "https://prometheus-community.github.io/helm-charts"
   condition: kube-prometheus-stack.enabled

charts/prometheus/README.md

@@ -0,0 +1,29 @@
+# Prometheus WGE Profile
+
+This profile includes:
+
+- flux podmonitor
+- flux dashboards
+
+## Adding or changing JSON dashboards
+
+The file templates/dashboards.yaml contains the JSON dashboard spec.
+The grafana dashboards include variables to be replaced in Grafana such as:
+```
+{{kind}}
+```
+
+Helm template engine will attempt to interpret these as Helm variables, but we want them passed through without Helm interpreting them.
+You can get round this by quoting the variable inside backticks and double curly braces like this:
+```
+{{`{{`}}kind{{`}}`}}
+```
+
+This can be seen used in the upstream kube-prometheus-stack chart here:
+- https://github.com/prometheus-community/helm-charts/blob/92a69db2825845e3032a6834dec21e9ec6a5f557/charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/pod-total.yaml#L404
+
+## Source Dashboards
+
+The source of the dashboards, for flux these are located here:
+- https://github.com/fluxcd/flux2/tree/main/manifests/monitoring/monitoring-config/dashboards
+- https://github.com/steveww/pypodinfo/tree/main/kustomize/monitoring/dashboards