Update kube-prometheus-stack chart to v35
- Automate kube-prometheus-stack helm release upgrades for the v35.x range - Remove deprecated Grafana settings - Set Prometheus retention to 24h - Label Flux dashboards and PodMonitors with `app.kubernetes.io/component: monitoring` - Change the `podMonitorSelector` to match the label `app.kubernetes.io/component: monitoring` Signed-off-by: Stefan Prodan <stefan.prodan@gmail.com>
This commit is contained in:
@@ -2,3 +2,5 @@ apiVersion: v1
|
|||||||
kind: Namespace
|
kind: Namespace
|
||||||
metadata:
|
metadata:
|
||||||
name: monitoring
|
name: monitoring
|
||||||
|
labels:
|
||||||
|
app.kubernetes.io/component: monitoring
|
||||||
|
|||||||
@@ -6,25 +6,28 @@ spec:
|
|||||||
interval: 5m
|
interval: 5m
|
||||||
chart:
|
chart:
|
||||||
spec:
|
spec:
|
||||||
version: 34.7.0
|
version: "35.x"
|
||||||
chart: kube-prometheus-stack
|
chart: kube-prometheus-stack
|
||||||
sourceRef:
|
sourceRef:
|
||||||
kind: HelmRepository
|
kind: HelmRepository
|
||||||
name: prometheus-community
|
name: prometheus-community
|
||||||
interval: 1m
|
interval: 60m
|
||||||
install:
|
install:
|
||||||
crds: Create
|
crds: Create
|
||||||
upgrade:
|
upgrade:
|
||||||
crds: CreateReplace
|
crds: CreateReplace
|
||||||
|
# https://github.com/prometheus-community/helm-charts/blob/main/charts/kube-prometheus-stack/values.yaml
|
||||||
values:
|
values:
|
||||||
alertmanager:
|
alertmanager:
|
||||||
enabled: false
|
enabled: false
|
||||||
grafana:
|
|
||||||
sidecar:
|
|
||||||
dashboards:
|
|
||||||
searchNamespace: ALL
|
|
||||||
prometheus:
|
prometheus:
|
||||||
prometheusSpec:
|
prometheusSpec:
|
||||||
|
retention: 24h
|
||||||
|
resources:
|
||||||
|
requests:
|
||||||
|
cpu: 200m
|
||||||
|
memory: 200Mi
|
||||||
|
podMonitorNamespaceSelector: {}
|
||||||
podMonitorSelector:
|
podMonitorSelector:
|
||||||
matchLabels:
|
matchLabels:
|
||||||
app.kubernetes.io/part-of: flux
|
app.kubernetes.io/component: monitoring
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
apiVersion: source.toolkit.fluxcd.io/v1beta1
|
apiVersion: source.toolkit.fluxcd.io/v1beta2
|
||||||
kind: HelmRepository
|
kind: HelmRepository
|
||||||
metadata:
|
metadata:
|
||||||
name: prometheus-community
|
name: prometheus-community
|
||||||
spec:
|
spec:
|
||||||
interval: 1m
|
interval: 120m
|
||||||
url: https://prometheus-community.github.io/helm-charts
|
url: https://prometheus-community.github.io/helm-charts
|
||||||
|
|||||||
@@ -6,8 +6,10 @@ resources:
|
|||||||
configMapGenerator:
|
configMapGenerator:
|
||||||
- name: flux-grafana-dashboards
|
- name: flux-grafana-dashboards
|
||||||
files:
|
files:
|
||||||
- ../grafana/dashboards/control-plane.json
|
- dashboards/control-plane.json
|
||||||
- ../grafana/dashboards/cluster.json
|
- dashboards/cluster.json
|
||||||
options:
|
options:
|
||||||
labels:
|
labels:
|
||||||
grafana_dashboard: "1"
|
grafana_dashboard: "1"
|
||||||
|
app.kubernetes.io/part-of: flux
|
||||||
|
app.kubernetes.io/component: monitoring
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ metadata:
|
|||||||
namespace: flux-system
|
namespace: flux-system
|
||||||
labels:
|
labels:
|
||||||
app.kubernetes.io/part-of: flux
|
app.kubernetes.io/part-of: flux
|
||||||
|
app.kubernetes.io/component: monitoring
|
||||||
spec:
|
spec:
|
||||||
namespaceSelector:
|
namespaceSelector:
|
||||||
matchNames:
|
matchNames:
|
||||||
|
|||||||
Reference in New Issue
Block a user