Merge pull request #2782 from fluxcd/monitoring-refactoring

Refactor Flux Prometheus monitoring stack
fluxcd · May 30, 2022 · bcef28e · bcef28e
2 parents b816471 + 4acef9d
commit bcef28e
Show file tree

Hide file tree

Showing 19 changed files with 53 additions and 307 deletions.
diff --git a/manifests/monitoring/grafana/datasources.yaml b/manifests/monitoring/grafana/datasources.yaml
diff --git a/manifests/monitoring/grafana/deployment.yaml b/manifests/monitoring/grafana/deployment.yaml
diff --git a/manifests/monitoring/grafana/kustomization.yaml b/manifests/monitoring/grafana/kustomization.yaml
diff --git a/manifests/monitoring/grafana/providers.yaml b/manifests/monitoring/grafana/providers.yaml
diff --git a/manifests/monitoring/grafana/service.yaml b/manifests/monitoring/grafana/service.yaml
diff --git a/manifests/monitoring/kube-prometheus-stack/namespace.yaml b/manifests/monitoring/kube-prometheus-stack/namespace.yaml
@@ -2,3 +2,5 @@ apiVersion: v1
 kind: Namespace
 metadata:
  name: monitoring
+ labels:
+ app.kubernetes.io/component: monitoring
diff --git a/manifests/monitoring/kube-prometheus-stack/release.yaml b/manifests/monitoring/kube-prometheus-stack/release.yaml
@@ -6,25 +6,28 @@ spec:
  interval: 5m
  chart:
  spec:
- version: 34.7.0
+ version: "35.x"
  chart: kube-prometheus-stack
  sourceRef:
  kind: HelmRepository
  name: prometheus-community
- interval: 1m
+ interval: 60m
  install:
  crds: Create
  upgrade:
  crds: CreateReplace
+ # https:/prometheus-community/helm-charts/blob/main/charts/kube-prometheus-stack/values.yaml
  values:
  alertmanager:
  enabled: false
- grafana:
- sidecar:
- dashboards:
- searchNamespace: ALL
  prometheus:
  prometheusSpec:
+ retention: 24h
+ resources:
+ requests:
+ cpu: 200m
+ memory: 200Mi
+ podMonitorNamespaceSelector: {}
  podMonitorSelector:
  matchLabels:
- app.kubernetes.io/part-of: flux
+ app.kubernetes.io/component: monitoring
diff --git a/manifests/monitoring/kube-prometheus-stack/repository.yaml b/manifests/monitoring/kube-prometheus-stack/repository.yaml
@@ -1,7 +1,7 @@
-apiVersion: source.toolkit.fluxcd.io/v1beta1
+apiVersion: source.toolkit.fluxcd.io/v1beta2
 kind: HelmRepository
 metadata:
  name: prometheus-community
 spec:
- interval: 1m
+ interval: 120m
  url: https://prometheus-community.github.io/helm-charts
diff --git a/manifests/monitoring/kustomization.yaml b/manifests/monitoring/kustomization.yaml
diff --git a/...onitoring/grafana/dashboards/cluster.json → ...monitoring-config/dashboards/cluster.json b/...onitoring/grafana/dashboards/cluster.json → ...monitoring-config/dashboards/cluster.json
@@ -9,6 +9,23 @@
  "iconColor": "rgba(0, 211, 255, 1)",
  "name": "Annotations & Alerts",
  "type": "dashboard"
+ },
+ {
+ "datasource": {
+ "type": "datasource",
+ "uid": "grafana"
+ },
+ "enable": true,
+ "iconColor": "red",
+ "name": "flux events",
+ "target": {
+ "limit": 100,
+ "matchAny": false,
+ "tags": [
+ "flux"
+ ],
+ "type": "tags"
+ }
  }
  ]
  },

diff --git a/...ing/grafana/dashboards/control-plane.json → ...ring-config/dashboards/control-plane.json b/...ing/grafana/dashboards/control-plane.json → ...ring-config/dashboards/control-plane.json
@@ -15,6 +15,23 @@
  "type": "dashboard"
  },
  "type": "dashboard"
+ },
+ {
+ "datasource": {
+ "type": "datasource",
+ "uid": "grafana"
+ },
+ "enable": true,
+ "iconColor": "red",
+ "name": "flux events",
+ "target": {
+ "limit": 100,
+ "matchAny": false,
+ "tags": [
+ "flux"
+ ],
+ "type": "tags"
+ }
  }
  ]
  },

diff --git a/manifests/monitoring/monitoring-config/kustomization.yaml b/manifests/monitoring/monitoring-config/kustomization.yaml
@@ -6,8 +6,10 @@ resources:
 configMapGenerator:
  - name: flux-grafana-dashboards
  files:
- - ../grafana/dashboards/control-plane.json
- - ../grafana/dashboards/cluster.json
+ - dashboards/control-plane.json
+ - dashboards/cluster.json
  options:
  labels:
  grafana_dashboard: "1"
+ app.kubernetes.io/part-of: flux
+ app.kubernetes.io/component: monitoring
diff --git a/manifests/monitoring/monitoring-config/podmonitor.yaml b/manifests/monitoring/monitoring-config/podmonitor.yaml
@@ -5,6 +5,7 @@ metadata:
  namespace: flux-system
  labels:
  app.kubernetes.io/part-of: flux
+ app.kubernetes.io/component: monitoring
 spec:
  namespaceSelector:
  matchNames:

diff --git a/manifests/monitoring/prometheus/account.yaml b/manifests/monitoring/prometheus/account.yaml
diff --git a/manifests/monitoring/prometheus/deployment.yaml b/manifests/monitoring/prometheus/deployment.yaml
diff --git a/manifests/monitoring/prometheus/kustomization.yaml b/manifests/monitoring/prometheus/kustomization.yaml
diff --git a/manifests/monitoring/prometheus/prometheus.yml b/manifests/monitoring/prometheus/prometheus.yml