From e768931b94e86cdd7f527a008cdfb35d0fb9a79c Mon Sep 17 00:00:00 2001 From: Grace Do Date: Tue, 20 Feb 2024 12:13:28 -0800 Subject: [PATCH] feat(kps): Bump to 56.8.0 (#1484) * feat(kps): Upgrade to 56.8.0 * chore: copy upstream chart version: 56.8.0 * chore: apply patch_3_mesosphere_hooks.sh * chore: apply patch_4_ingress_rbac.sh * chore: apply patch_5_mesosphere_rules.sh * chore: apply patch_6_mesosphere_values.sh * chore: apply patch_7_patch_grafana_dashboards.sh * chore: apply patch_9_mesosphere_helmignore.sh * chore: apply patch_10_mesosphere_patch_storage.sh * chore: apply patch_11_mesosphere_helpers.sh * chore: helm dependency update --- staging/kube-prometheus-stack/Chart.lock | 10 +++--- staging/kube-prometheus-stack/Chart.yaml | 10 +++--- .../crds/crds/crd-alertmanagerconfigs.yaml | 4 +-- .../charts/crds/crds/crd-alertmanagers.yaml | 4 +-- .../charts/crds/crds/crd-podmonitors.yaml | 4 +-- .../charts/crds/crds/crd-probes.yaml | 4 +-- .../crds/crds/crd-prometheusagents.yaml | 4 +-- .../charts/crds/crds/crd-prometheuses.yaml | 4 +-- .../charts/crds/crds/crd-prometheusrules.yaml | 4 +-- .../charts/crds/crds/crd-scrapeconfigs.yaml | 4 +-- .../charts/crds/crds/crd-servicemonitors.yaml | 4 +-- .../charts/crds/crds/crd-thanosrulers.yaml | 4 +-- .../templates/_helpers.tpl | 7 +++- .../templates/alertmanager/ingress.yaml | 2 +- .../alertmanager/ingressperreplica.yaml | 2 +- .../grafana/dashboards-1.14/prometheus.yaml | 2 +- .../deployment/deployment.yaml | 2 +- .../admission-webhooks/deployment/pdb.yaml | 2 +- .../deployment/service.yaml | 2 +- .../ciliumnetworkpolicy.yaml | 2 +- .../prometheus-operator/clusterrole.yaml | 9 ++++- .../clusterrolebinding.yaml | 4 +-- .../prometheus-operator/deployment.yaml | 2 +- .../prometheus-operator/networkpolicy.yaml | 2 +- .../prometheus-operator/psp-clusterrole.yaml | 4 +-- .../psp-clusterrolebinding.yaml | 4 +-- .../templates/prometheus-operator/psp.yaml | 2 +- .../prometheus-operator/service.yaml | 2 +- .../prometheus-operator/servicemonitor.yaml | 2 +- .../verticalpodautoscaler.yaml | 4 +-- .../templates/prometheus/ingress.yaml | 2 +- .../prometheus/ingressThanosSidecar.yaml | 2 +- .../prometheus/ingressperreplica.yaml | 2 +- .../templates/prometheus/prometheus.yaml | 6 ++++ .../templates/thanos-ruler/ingress.yaml | 2 +- .../kube-prometheus-stack/upgrade_operator.sh | 2 +- staging/kube-prometheus-stack/values.yaml | 33 +++++++++++++++++-- 37 files changed, 105 insertions(+), 60 deletions(-) diff --git a/staging/kube-prometheus-stack/Chart.lock b/staging/kube-prometheus-stack/Chart.lock index de24b6442..dd4ed16ed 100644 --- a/staging/kube-prometheus-stack/Chart.lock +++ b/staging/kube-prometheus-stack/Chart.lock @@ -7,12 +7,12 @@ dependencies: version: 5.16.0 - name: prometheus-node-exporter repository: https://prometheus-community.github.io/helm-charts - version: 4.25.0 + version: 4.30.2 - name: grafana repository: https://grafana.github.io/helm-charts - version: 7.2.4 + version: 7.3.0 - name: prometheus-windows-exporter repository: https://prometheus-community.github.io/helm-charts - version: 0.2.0 -digest: sha256:04a0dfebe8b7d5df5b6569b4c719892f38c5a45a626fb23c57453515e0c10759 -generated: "2024-01-22T20:04:07.97441-08:00" + version: 0.3.1 +digest: sha256:9b0e7758ffc10ad9de7e319c5a4b08aad6571b87fa3295d7cad7eeb5bb703296 +generated: "2024-02-19T17:59:47.849914-08:00" diff --git a/staging/kube-prometheus-stack/Chart.yaml b/staging/kube-prometheus-stack/Chart.yaml index 094caaa49..6131ba5ac 100644 --- a/staging/kube-prometheus-stack/Chart.yaml +++ b/staging/kube-prometheus-stack/Chart.yaml @@ -23,8 +23,8 @@ name: kube-prometheus-stack sources: - https://github.com/prometheus-community/helm-charts - https://github.com/prometheus-operator/kube-prometheus -version: 56.0.3 -appVersion: v0.71.0 +version: 56.8.0 +appVersion: v0.71.2 kubeVersion: ">=1.19.0-0" home: https://github.com/prometheus-operator/kube-prometheus keywords: @@ -49,14 +49,14 @@ dependencies: repository: https://prometheus-community.github.io/helm-charts condition: kubeStateMetrics.enabled - name: prometheus-node-exporter - version: "4.25.*" + version: "4.30.*" repository: https://prometheus-community.github.io/helm-charts condition: nodeExporter.enabled - name: grafana - version: "7.2.*" + version: "7.3.*" repository: https://grafana.github.io/helm-charts condition: grafana.enabled - name: prometheus-windows-exporter repository: https://prometheus-community.github.io/helm-charts - version: "0.2.*" + version: "0.3.*" condition: windowsMonitoring.enabled diff --git a/staging/kube-prometheus-stack/charts/crds/crds/crd-alertmanagerconfigs.yaml b/staging/kube-prometheus-stack/charts/crds/crds/crd-alertmanagerconfigs.yaml index b3666d91c..ce64b9bc3 100644 --- a/staging/kube-prometheus-stack/charts/crds/crds/crd-alertmanagerconfigs.yaml +++ b/staging/kube-prometheus-stack/charts/crds/crds/crd-alertmanagerconfigs.yaml @@ -1,11 +1,11 @@ -# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.71.0/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagerconfigs.yaml +# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.71.2/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagerconfigs.yaml --- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.13.0 - operator.prometheus.io/version: 0.71.0 + operator.prometheus.io/version: 0.71.2 name: alertmanagerconfigs.monitoring.coreos.com spec: group: monitoring.coreos.com diff --git a/staging/kube-prometheus-stack/charts/crds/crds/crd-alertmanagers.yaml b/staging/kube-prometheus-stack/charts/crds/crds/crd-alertmanagers.yaml index 8a4779bc6..5feaee175 100644 --- a/staging/kube-prometheus-stack/charts/crds/crds/crd-alertmanagers.yaml +++ b/staging/kube-prometheus-stack/charts/crds/crds/crd-alertmanagers.yaml @@ -1,11 +1,11 @@ -# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.71.0/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagers.yaml +# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.71.2/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagers.yaml --- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.13.0 - operator.prometheus.io/version: 0.71.0 + operator.prometheus.io/version: 0.71.2 name: alertmanagers.monitoring.coreos.com spec: group: monitoring.coreos.com diff --git a/staging/kube-prometheus-stack/charts/crds/crds/crd-podmonitors.yaml b/staging/kube-prometheus-stack/charts/crds/crds/crd-podmonitors.yaml index a1717d999..4b4a8c3b2 100644 --- a/staging/kube-prometheus-stack/charts/crds/crds/crd-podmonitors.yaml +++ b/staging/kube-prometheus-stack/charts/crds/crds/crd-podmonitors.yaml @@ -1,11 +1,11 @@ -# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.71.0/example/prometheus-operator-crd/monitoring.coreos.com_podmonitors.yaml +# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.71.2/example/prometheus-operator-crd/monitoring.coreos.com_podmonitors.yaml --- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.13.0 - operator.prometheus.io/version: 0.71.0 + operator.prometheus.io/version: 0.71.2 name: podmonitors.monitoring.coreos.com spec: group: monitoring.coreos.com diff --git a/staging/kube-prometheus-stack/charts/crds/crds/crd-probes.yaml b/staging/kube-prometheus-stack/charts/crds/crds/crd-probes.yaml index 092419c7b..54b141804 100644 --- a/staging/kube-prometheus-stack/charts/crds/crds/crd-probes.yaml +++ b/staging/kube-prometheus-stack/charts/crds/crds/crd-probes.yaml @@ -1,11 +1,11 @@ -# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.71.0/example/prometheus-operator-crd/monitoring.coreos.com_probes.yaml +# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.71.2/example/prometheus-operator-crd/monitoring.coreos.com_probes.yaml --- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.13.0 - operator.prometheus.io/version: 0.71.0 + operator.prometheus.io/version: 0.71.2 name: probes.monitoring.coreos.com spec: group: monitoring.coreos.com diff --git a/staging/kube-prometheus-stack/charts/crds/crds/crd-prometheusagents.yaml b/staging/kube-prometheus-stack/charts/crds/crds/crd-prometheusagents.yaml index 54520dd8c..d573b95d1 100644 --- a/staging/kube-prometheus-stack/charts/crds/crds/crd-prometheusagents.yaml +++ b/staging/kube-prometheus-stack/charts/crds/crds/crd-prometheusagents.yaml @@ -1,11 +1,11 @@ -# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.71.0/example/prometheus-operator-crd/monitoring.coreos.com_prometheusagents.yaml +# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.71.2/example/prometheus-operator-crd/monitoring.coreos.com_prometheusagents.yaml --- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.13.0 - operator.prometheus.io/version: 0.71.0 + operator.prometheus.io/version: 0.71.2 name: prometheusagents.monitoring.coreos.com spec: group: monitoring.coreos.com diff --git a/staging/kube-prometheus-stack/charts/crds/crds/crd-prometheuses.yaml b/staging/kube-prometheus-stack/charts/crds/crds/crd-prometheuses.yaml index 8ed338402..4b9dc337e 100644 --- a/staging/kube-prometheus-stack/charts/crds/crds/crd-prometheuses.yaml +++ b/staging/kube-prometheus-stack/charts/crds/crds/crd-prometheuses.yaml @@ -1,11 +1,11 @@ -# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.71.0/example/prometheus-operator-crd/monitoring.coreos.com_prometheuses.yaml +# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.71.2/example/prometheus-operator-crd/monitoring.coreos.com_prometheuses.yaml --- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.13.0 - operator.prometheus.io/version: 0.71.0 + operator.prometheus.io/version: 0.71.2 name: prometheuses.monitoring.coreos.com spec: group: monitoring.coreos.com diff --git a/staging/kube-prometheus-stack/charts/crds/crds/crd-prometheusrules.yaml b/staging/kube-prometheus-stack/charts/crds/crds/crd-prometheusrules.yaml index cc972a93c..fb2270cda 100644 --- a/staging/kube-prometheus-stack/charts/crds/crds/crd-prometheusrules.yaml +++ b/staging/kube-prometheus-stack/charts/crds/crds/crd-prometheusrules.yaml @@ -1,11 +1,11 @@ -# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.71.0/example/prometheus-operator-crd/monitoring.coreos.com_prometheusrules.yaml +# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.71.2/example/prometheus-operator-crd/monitoring.coreos.com_prometheusrules.yaml --- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.13.0 - operator.prometheus.io/version: 0.71.0 + operator.prometheus.io/version: 0.71.2 name: prometheusrules.monitoring.coreos.com spec: group: monitoring.coreos.com diff --git a/staging/kube-prometheus-stack/charts/crds/crds/crd-scrapeconfigs.yaml b/staging/kube-prometheus-stack/charts/crds/crds/crd-scrapeconfigs.yaml index db0471595..9abe8f85e 100644 --- a/staging/kube-prometheus-stack/charts/crds/crds/crd-scrapeconfigs.yaml +++ b/staging/kube-prometheus-stack/charts/crds/crds/crd-scrapeconfigs.yaml @@ -1,11 +1,11 @@ -# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.71.0/example/prometheus-operator-crd/monitoring.coreos.com_scrapeconfigs.yaml +# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.71.2/example/prometheus-operator-crd/monitoring.coreos.com_scrapeconfigs.yaml --- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.13.0 - operator.prometheus.io/version: 0.71.0 + operator.prometheus.io/version: 0.71.2 name: scrapeconfigs.monitoring.coreos.com spec: group: monitoring.coreos.com diff --git a/staging/kube-prometheus-stack/charts/crds/crds/crd-servicemonitors.yaml b/staging/kube-prometheus-stack/charts/crds/crds/crd-servicemonitors.yaml index fc2151efb..c59e60cdd 100644 --- a/staging/kube-prometheus-stack/charts/crds/crds/crd-servicemonitors.yaml +++ b/staging/kube-prometheus-stack/charts/crds/crds/crd-servicemonitors.yaml @@ -1,11 +1,11 @@ -# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.71.0/example/prometheus-operator-crd/monitoring.coreos.com_servicemonitors.yaml +# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.71.2/example/prometheus-operator-crd/monitoring.coreos.com_servicemonitors.yaml --- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.13.0 - operator.prometheus.io/version: 0.71.0 + operator.prometheus.io/version: 0.71.2 name: servicemonitors.monitoring.coreos.com spec: group: monitoring.coreos.com diff --git a/staging/kube-prometheus-stack/charts/crds/crds/crd-thanosrulers.yaml b/staging/kube-prometheus-stack/charts/crds/crds/crd-thanosrulers.yaml index 3c322568f..e408cd2b5 100644 --- a/staging/kube-prometheus-stack/charts/crds/crds/crd-thanosrulers.yaml +++ b/staging/kube-prometheus-stack/charts/crds/crds/crd-thanosrulers.yaml @@ -1,11 +1,11 @@ -# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.71.0/example/prometheus-operator-crd/monitoring.coreos.com_thanosrulers.yaml +# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.71.2/example/prometheus-operator-crd/monitoring.coreos.com_thanosrulers.yaml --- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.13.0 - operator.prometheus.io/version: 0.71.0 + operator.prometheus.io/version: 0.71.2 name: thanosrulers.monitoring.coreos.com spec: group: monitoring.coreos.com diff --git a/staging/kube-prometheus-stack/templates/_helpers.tpl b/staging/kube-prometheus-stack/templates/_helpers.tpl index a350d9a69..69a2fc5f8 100644 --- a/staging/kube-prometheus-stack/templates/_helpers.tpl +++ b/staging/kube-prometheus-stack/templates/_helpers.tpl @@ -24,10 +24,15 @@ The longest name that gets created adds and extra 37 characters, so truncation s {{- end -}} {{- end -}} -{{/* Fullname suffixed with operator */}} +{{/* Fullname suffixed with -operator */}} +{{/* Adding 9 to 26 truncation of kube-prometheus-stack.fullname */}} {{- define "kube-prometheus-stack.operator.fullname" -}} +{{- if .Values.prometheusOperator.fullnameOverride -}} +{{- .Values.prometheusOperator.fullnameOverride | trunc 35 | trimSuffix "-" -}} +{{- else -}} {{- printf "%s-operator" (include "kube-prometheus-stack.fullname" .) -}} {{- end }} +{{- end }} {{/* Prometheus custom resource instance name */}} {{- define "kube-prometheus-stack.prometheus.crname" -}} diff --git a/staging/kube-prometheus-stack/templates/alertmanager/ingress.yaml b/staging/kube-prometheus-stack/templates/alertmanager/ingress.yaml index 201a69ec6..be9f5aa27 100644 --- a/staging/kube-prometheus-stack/templates/alertmanager/ingress.yaml +++ b/staging/kube-prometheus-stack/templates/alertmanager/ingress.yaml @@ -14,7 +14,7 @@ metadata: namespace: {{ template "kube-prometheus-stack.namespace" . }} {{- if .Values.alertmanager.ingress.annotations }} annotations: -{{ toYaml .Values.alertmanager.ingress.annotations | indent 4 }} + {{- tpl (toYaml .Values.alertmanager.ingress.annotations) . | nindent 4 }} {{- end }} labels: app: {{ template "kube-prometheus-stack.name" . }}-alertmanager diff --git a/staging/kube-prometheus-stack/templates/alertmanager/ingressperreplica.yaml b/staging/kube-prometheus-stack/templates/alertmanager/ingressperreplica.yaml index f21bf9616..8fb5d1334 100644 --- a/staging/kube-prometheus-stack/templates/alertmanager/ingressperreplica.yaml +++ b/staging/kube-prometheus-stack/templates/alertmanager/ingressperreplica.yaml @@ -25,7 +25,7 @@ items: {{- end }} {{- if $ingressValues.annotations }} annotations: -{{ toYaml $ingressValues.annotations | indent 8 }} + {{- tpl (toYaml $ingressValues.annotations) . | nindent 8 }} {{- end }} spec: {{- if $apiIsStable }} diff --git a/staging/kube-prometheus-stack/templates/grafana/dashboards-1.14/prometheus.yaml b/staging/kube-prometheus-stack/templates/grafana/dashboards-1.14/prometheus.yaml index c74ecb98b..36a710a0c 100644 --- a/staging/kube-prometheus-stack/templates/grafana/dashboards-1.14/prometheus.yaml +++ b/staging/kube-prometheus-stack/templates/grafana/dashboards-1.14/prometheus.yaml @@ -20,5 +20,5 @@ metadata: {{ include "kube-prometheus-stack.labels" $ | indent 4 }} data: prometheus.json: |- - {{`{"annotations":{"list":[]},"editable":`}}{{ .Values.grafana.defaultDashboardsEditable }}{{`,"gnetId":null,"graphTooltip":0,"hideControls":false,"links":[],"refresh":"60s","rows":[{"collapse":false,"height":"250px","panels":[{"aliasColors":{},"bars":false,"dashLength":10,"dashes":false,"datasource":"$datasource","fill":1,"id":1,"legend":{"avg":false,"current":false,"max":false,"min":false,"show":true,"total":false,"values":false},"lines":true,"linewidth":1,"links":[],"nullPointMode":"null as zero","percentage":false,"pointradius":5,"points":false,"renderer":"flot","seriesOverrides":[],"spaceLength":10,"span":12,"stack":false,"steppedLine":false,"styles":[{"alias":"Time","dateFormat":"YYYY-MM-DD HH:mm:ss","pattern":"Time","type":"hidden"},{"alias":"Count","colorMode":null,"colors":[],"dateFormat":"YYYY-MM-DD HH:mm:ss","decimals":2,"link":false,"linkTargetBlank":false,"linkTooltip":"Drill down","linkUrl":"","pattern":"Value #A","thresholds":[],"type":"hidden","unit":"short"},{"alias":"Uptime","colorMode":null,"colors":[],"dateFormat":"YYYY-MM-DD HH:mm:ss","decimals":2,"link":false,"linkTargetBlank":false,"linkTooltip":"Drill down","linkUrl":"","pattern":"Value #B","thresholds":[],"type":"number","unit":"s"},{"alias":"Instance","colorMode":null,"colors":[],"dateFormat":"YYYY-MM-DD HH:mm:ss","decimals":2,"link":false,"linkTargetBlank":false,"linkTooltip":"Drill down","linkUrl":"","pattern":"instance","thresholds":[],"type":"number","unit":"short"},{"alias":"Job","colorMode":null,"colors":[],"dateFormat":"YYYY-MM-DD HH:mm:ss","decimals":2,"link":false,"linkTargetBlank":false,"linkTooltip":"Drill down","linkUrl":"","pattern":"job","thresholds":[],"type":"number","unit":"short"},{"alias":"Version","colorMode":null,"colors":[],"dateFormat":"YYYY-MM-DD HH:mm:ss","decimals":2,"link":false,"linkTargetBlank":false,"linkTooltip":"Drill down","linkUrl":"","pattern":"version","thresholds":[],"type":"number","unit":"short"},{"alias":"","colorMode":null,"colors":[],"dateFormat":"YYYY-MM-DD HH:mm:ss","decimals":2,"pattern":"/.*/","thresholds":[],"type":"string","unit":"short"}],"targets":[{"expr":"count by (job, instance, version) (prometheus_build_info{job=~\"$job\", instance=~\"$instance\"})","format":"table","instant":true,"legendFormat":"","refId":"A"},{"expr":"max by (job, instance) (time() - process_start_time_seconds{job=~\"$job\", instance=~\"$instance\"})","format":"table","instant":true,"legendFormat":"","refId":"B"}],"thresholds":[],"timeFrom":null,"timeShift":null,"title":"Prometheus Stats","tooltip":{"shared":true,"sort":2,"value_type":"individual"},"transform":"table","type":"table","xaxis":{"buckets":null,"mode":"time","name":null,"show":true,"values":[]},"yaxes":[{"format":"short","label":null,"logBase":1,"max":null,"min":0,"show":true},{"format":"short","label":null,"logBase":1,"max":null,"min":null,"show":false}]}],"repeat":null,"repeatIteration":null,"repeatRowId":null,"showTitle":true,"title":"Prometheus Stats","titleSize":"h6"},{"collapse":false,"height":"250px","panels":[{"aliasColors":{},"bars":false,"dashLength":10,"dashes":false,"datasource":"$datasource","fill":1,"id":2,"legend":{"avg":false,"current":false,"max":false,"min":false,"show":true,"total":false,"values":false},"lines":true,"linewidth":1,"links":[],"nullPointMode":"null as zero","percentage":false,"pointradius":5,"points":false,"renderer":"flot","seriesOverrides":[],"spaceLength":10,"span":6,"stack":false,"steppedLine":false,"targets":[{"expr":"sum(rate(prometheus_target_sync_length_seconds_sum{job=~\"$job\",instance=~\"$instance\"}[5m])) by (scrape_job) * 1e3","format":"time_series","legendFormat":"{{scrape_job}}","legendLink":null}],"thresholds":[],"timeFrom":null,"timeShift":null,"title":"Target Sync","tooltip":{"shared":true,"sort":2,"value_type":"individual"},"type":"graph","xaxis":{"buckets":null,"mode":"time","name":null,"show":true,"values":[]},"yaxes":[{"format":"ms","label":null,"logBase":1,"max":null,"min":0,"show":true},{"format":"short","label":null,"logBase":1,"max":null,"min":null,"show":false}]},{"aliasColors":{},"bars":false,"dashLength":10,"dashes":false,"datasource":"$datasource","fill":10,"id":3,"legend":{"avg":false,"current":false,"max":false,"min":false,"show":true,"total":false,"values":false},"lines":true,"linewidth":0,"links":[],"nullPointMode":"null as zero","percentage":false,"pointradius":5,"points":false,"renderer":"flot","seriesOverrides":[],"spaceLength":10,"span":6,"stack":true,"steppedLine":false,"targets":[{"expr":"sum(prometheus_sd_discovered_targets{job=~\"$job\",instance=~\"$instance\"})","format":"time_series","legendFormat":"Targets","legendLink":null}],"thresholds":[],"timeFrom":null,"timeShift":null,"title":"Targets","tooltip":{"shared":true,"sort":2,"value_type":"individual"},"type":"graph","xaxis":{"buckets":null,"mode":"time","name":null,"show":true,"values":[]},"yaxes":[{"format":"short","label":null,"logBase":1,"max":null,"min":0,"show":true},{"format":"short","label":null,"logBase":1,"max":null,"min":null,"show":false}]}],"repeat":null,"repeatIteration":null,"repeatRowId":null,"showTitle":true,"title":"Discovery","titleSize":"h6"},{"collapse":false,"height":"250px","panels":[{"aliasColors":{},"bars":false,"dashLength":10,"dashes":false,"datasource":"$datasource","fill":1,"id":4,"legend":{"avg":false,"current":false,"max":false,"min":false,"show":true,"total":false,"values":false},"lines":true,"linewidth":1,"links":[],"nullPointMode":"null as zero","percentage":false,"pointradius":5,"points":false,"renderer":"flot","seriesOverrides":[],"spaceLength":10,"span":4,"stack":false,"steppedLine":false,"targets":[{"expr":"rate(prometheus_target_interval_length_seconds_sum{job=~\"$job\",instance=~\"$instance\"}[5m]) / rate(prometheus_target_interval_length_seconds_count{job=~\"$job\",instance=~\"$instance\"}[5m]) * 1e3","format":"time_series","legendFormat":"{{interval}} configured","legendLink":null}],"thresholds":[],"timeFrom":null,"timeShift":null,"title":"Average Scrape Interval Duration","tooltip":{"shared":true,"sort":2,"value_type":"individual"},"type":"graph","xaxis":{"buckets":null,"mode":"time","name":null,"show":true,"values":[]},"yaxes":[{"format":"ms","label":null,"logBase":1,"max":null,"min":0,"show":true},{"format":"short","label":null,"logBase":1,"max":null,"min":null,"show":false}]},{"aliasColors":{},"bars":false,"dashLength":10,"dashes":false,"datasource":"$datasource","fill":10,"id":5,"legend":{"avg":false,"current":false,"max":false,"min":false,"show":true,"total":false,"values":false},"lines":true,"linewidth":0,"links":[],"nullPointMode":"null as zero","percentage":false,"pointradius":5,"points":false,"renderer":"flot","seriesOverrides":[],"spaceLength":10,"span":4,"stack":true,"steppedLine":false,"targets":[{"expr":"sum by (job) (rate(prometheus_target_scrapes_exceeded_body_size_limit_total[1m]))","format":"time_series","legendFormat":"exceeded body size limit: {{job}}","legendLink":null},{"expr":"sum by (job) (rate(prometheus_target_scrapes_exceeded_sample_limit_total[1m]))","format":"time_series","legendFormat":"exceeded sample limit: {{job}}","legendLink":null},{"expr":"sum by (job) (rate(prometheus_target_scrapes_sample_duplicate_timestamp_total[1m]))","format":"time_series","legendFormat":"duplicate timestamp: {{job}}","legendLink":null},{"expr":"sum by (job) (rate(prometheus_target_scrapes_sample_out_of_bounds_total[1m]))","format":"time_series","legendFormat":"out of bounds: {{job}}","legendLink":null},{"expr":"sum by (job) (rate(prometheus_target_scrapes_sample_out_of_order_total[1m]))","format":"time_series","legendFormat":"out of order: {{job}}","legendLink":null}],"thresholds":[],"timeFrom":null,"timeShift":null,"title":"Scrape failures","tooltip":{"shared":true,"sort":2,"value_type":"individual"},"type":"graph","xaxis":{"buckets":null,"mode":"time","name":null,"show":true,"values":[]},"yaxes":[{"format":"short","label":null,"logBase":1,"max":null,"min":0,"show":true},{"format":"short","label":null,"logBase":1,"max":null,"min":null,"show":false}]},{"aliasColors":{},"bars":false,"dashLength":10,"dashes":false,"datasource":"$datasource","fill":10,"id":6,"legend":{"avg":false,"current":false,"max":false,"min":false,"show":true,"total":false,"values":false},"lines":true,"linewidth":0,"links":[],"nullPointMode":"null as zero","percentage":false,"pointradius":5,"points":false,"renderer":"flot","seriesOverrides":[],"spaceLength":10,"span":4,"stack":true,"steppedLine":false,"targets":[{"expr":"rate(prometheus_tsdb_head_samples_appended_total{job=~\"$job\",instance=~\"$instance\"}[5m])","format":"time_series","legendFormat":"{{job}} {{instance}}","legendLink":null}],"thresholds":[],"timeFrom":null,"timeShift":null,"title":"Appended Samples","tooltip":{"shared":true,"sort":2,"value_type":"individual"},"type":"graph","xaxis":{"buckets":null,"mode":"time","name":null,"show":true,"values":[]},"yaxes":[{"format":"short","label":null,"logBase":1,"max":null,"min":0,"show":true},{"format":"short","label":null,"logBase":1,"max":null,"min":null,"show":false}]}],"repeat":null,"repeatIteration":null,"repeatRowId":null,"showTitle":true,"title":"Retrieval","titleSize":"h6"},{"collapse":false,"height":"250px","panels":[{"aliasColors":{},"bars":false,"dashLength":10,"dashes":false,"datasource":"$datasource","fill":10,"id":7,"legend":{"avg":false,"current":false,"max":false,"min":false,"show":true,"total":false,"values":false},"lines":true,"linewidth":0,"links":[],"nullPointMode":"null as zero","percentage":false,"pointradius":5,"points":false,"renderer":"flot","seriesOverrides":[],"spaceLength":10,"span":6,"stack":true,"steppedLine":false,"targets":[{"expr":"prometheus_tsdb_head_series{job=~\"$job\",instance=~\"$instance\"}","format":"time_series","legendFormat":"{{job}} {{instance}} head series","legendLink":null}],"thresholds":[],"timeFrom":null,"timeShift":null,"title":"Head Series","tooltip":{"shared":true,"sort":2,"value_type":"individual"},"type":"graph","xaxis":{"buckets":null,"mode":"time","name":null,"show":true,"values":[]},"yaxes":[{"format":"short","label":null,"logBase":1,"max":null,"min":0,"show":true},{"format":"short","label":null,"logBase":1,"max":null,"min":null,"show":false}]},{"aliasColors":{},"bars":false,"dashLength":10,"dashes":false,"datasource":"$datasource","fill":10,"id":8,"legend":{"avg":false,"current":false,"max":false,"min":false,"show":true,"total":false,"values":false},"lines":true,"linewidth":0,"links":[],"nullPointMode":"null as zero","percentage":false,"pointradius":5,"points":false,"renderer":"flot","seriesOverrides":[],"spaceLength":10,"span":6,"stack":true,"steppedLine":false,"targets":[{"expr":"prometheus_tsdb_head_chunks{job=~\"$job\",instance=~\"$instance\"}","format":"time_series","legendFormat":"{{job}} {{instance}} head chunks","legendLink":null}],"thresholds":[],"timeFrom":null,"timeShift":null,"title":"Head Chunks","tooltip":{"shared":true,"sort":2,"value_type":"individual"},"type":"graph","xaxis":{"buckets":null,"mode":"time","name":null,"show":true,"values":[]},"yaxes":[{"format":"short","label":null,"logBase":1,"max":null,"min":0,"show":true},{"format":"short","label":null,"logBase":1,"max":null,"min":null,"show":false}]}],"repeat":null,"repeatIteration":null,"repeatRowId":null,"showTitle":true,"title":"Storage","titleSize":"h6"},{"collapse":false,"height":"250px","panels":[{"aliasColors":{},"bars":false,"dashLength":10,"dashes":false,"datasource":"$datasource","fill":10,"id":9,"legend":{"avg":false,"current":false,"max":false,"min":false,"show":true,"total":false,"values":false},"lines":true,"linewidth":0,"links":[],"nullPointMode":"null as zero","percentage":false,"pointradius":5,"points":false,"renderer":"flot","seriesOverrides":[],"spaceLength":10,"span":6,"stack":true,"steppedLine":false,"targets":[{"expr":"rate(prometheus_engine_query_duration_seconds_count{job=~\"$job\",instance=~\"$instance\",slice=\"inner_eval\"}[5m])","format":"time_series","legendFormat":"{{job}} {{instance}}","legendLink":null}],"thresholds":[],"timeFrom":null,"timeShift":null,"title":"Query Rate","tooltip":{"shared":true,"sort":2,"value_type":"individual"},"type":"graph","xaxis":{"buckets":null,"mode":"time","name":null,"show":true,"values":[]},"yaxes":[{"format":"short","label":null,"logBase":1,"max":null,"min":0,"show":true},{"format":"short","label":null,"logBase":1,"max":null,"min":null,"show":false}]},{"aliasColors":{},"bars":false,"dashLength":10,"dashes":false,"datasource":"$datasource","fill":10,"id":10,"legend":{"avg":false,"current":false,"max":false,"min":false,"show":true,"total":false,"values":false},"lines":true,"linewidth":0,"links":[],"nullPointMode":"null as zero","percentage":false,"pointradius":5,"points":false,"renderer":"flot","seriesOverrides":[],"spaceLength":10,"span":6,"stack":true,"steppedLine":false,"targets":[{"expr":"max by (slice) (prometheus_engine_query_duration_seconds{quantile=\"0.9\",job=~\"$job\",instance=~\"$instance\"}) * 1e3","format":"time_series","legendFormat":"{{slice}}","legendLink":null}],"thresholds":[],"timeFrom":null,"timeShift":null,"title":"Stage Duration","tooltip":{"shared":true,"sort":2,"value_type":"individual"},"type":"graph","xaxis":{"buckets":null,"mode":"time","name":null,"show":true,"values":[]},"yaxes":[{"format":"ms","label":null,"logBase":1,"max":null,"min":0,"show":true},{"format":"short","label":null,"logBase":1,"max":null,"min":null,"show":false}]}],"repeat":null,"repeatIteration":null,"repeatRowId":null,"showTitle":true,"title":"Query","titleSize":"h6"}],"schemaVersion":14,"style":"dark","tags":["prometheus-mixin"],"templating":{"list":[{"current":{"text":"default","value":"default"},"hide":0,"label":"Data source","name":"datasource","options":[],"query":"prometheus","refresh":1,"regex":"","type":"datasource"},{"allValue":".+","current":{"selected":true,"text":"All","value":"$__all"},"datasource":"$datasource","hide":0,"includeAll":true,"label":"job","multi":true,"name":"job","options":[],"query":"label_values(prometheus_build_info{job=\"prometheus-k8s\",namespace=\"monitoring\"}, job)","refresh":1,"regex":"","sort":2,"tagValuesQuery":"","tags":[],"tagsQuery":"","type":"query","useTags":false},{"allValue":".+","current":{"selected":true,"text":"All","value":"$__all"},"datasource":"$datasource","hide":0,"includeAll":true,"label":"instance","multi":true,"name":"instance","options":[],"query":"label_values(prometheus_build_info{job=~\"$job\"}, instance)","refresh":1,"regex":"","sort":2,"tagValuesQuery":"","tags":[],"tagsQuery":"","type":"query","useTags":false}]},"time":{"from":"now-1h","to":"now"},"timepicker":{"refresh_intervals":["5s","10s","30s","1m","5m","15m","30m","1h","2h","1d"],"time_options":["5m","15m","1h","6h","12h","24h","2d","7d","30d"]},"timezone": "`}}{{ .Values.grafana.defaultDashboardsTimezone }}{{`","title":"Prometheus / Overview","uid":"","version":0}`}} + {{`{"annotations":{"list":[]},"editable":`}}{{ .Values.grafana.defaultDashboardsEditable }}{{`,"gnetId":null,"graphTooltip":0,"hideControls":false,"links":[],"refresh":"60s","rows":[{"collapse":false,"height":"250px","panels":[{"aliasColors":{},"bars":false,"dashLength":10,"dashes":false,"datasource":"$datasource","fill":1,"id":1,"legend":{"avg":false,"current":false,"max":false,"min":false,"show":true,"total":false,"values":false},"lines":true,"linewidth":1,"links":[],"nullPointMode":"null as zero","percentage":false,"pointradius":5,"points":false,"renderer":"flot","seriesOverrides":[],"spaceLength":10,"span":12,"stack":false,"steppedLine":false,"styles":[{"alias":"Time","dateFormat":"YYYY-MM-DD HH:mm:ss","pattern":"Time","type":"hidden"},{"alias":"Count","colorMode":null,"colors":[],"dateFormat":"YYYY-MM-DD HH:mm:ss","decimals":2,"link":false,"linkTargetBlank":false,"linkTooltip":"Drill down","linkUrl":"","pattern":"Value #A","thresholds":[],"type":"hidden","unit":"short"},{"alias":"Uptime","colorMode":null,"colors":[],"dateFormat":"YYYY-MM-DD HH:mm:ss","decimals":2,"link":false,"linkTargetBlank":false,"linkTooltip":"Drill down","linkUrl":"","pattern":"Value #B","thresholds":[],"type":"number","unit":"s"},{"alias":"Cluster","colorMode":null,"colors":[],"dateFormat":"YYYY-MM-DD HH:mm:ss","decimals":2,"link":false,"linkTargetBlank":false,"linkTooltip":"Drill down","linkUrl":"","pattern":"cluster","thresholds":[],"type":"number","unit":"short"},{"alias":"Instance","colorMode":null,"colors":[],"dateFormat":"YYYY-MM-DD HH:mm:ss","decimals":2,"link":false,"linkTargetBlank":false,"linkTooltip":"Drill down","linkUrl":"","pattern":"instance","thresholds":[],"type":"number","unit":"short"},{"alias":"Job","colorMode":null,"colors":[],"dateFormat":"YYYY-MM-DD HH:mm:ss","decimals":2,"link":false,"linkTargetBlank":false,"linkTooltip":"Drill down","linkUrl":"","pattern":"job","thresholds":[],"type":"number","unit":"short"},{"alias":"Version","colorMode":null,"colors":[],"dateFormat":"YYYY-MM-DD HH:mm:ss","decimals":2,"link":false,"linkTargetBlank":false,"linkTooltip":"Drill down","linkUrl":"","pattern":"version","thresholds":[],"type":"number","unit":"short"},{"alias":"","colorMode":null,"colors":[],"dateFormat":"YYYY-MM-DD HH:mm:ss","decimals":2,"pattern":"/.*/","thresholds":[],"type":"string","unit":"short"}],"targets":[{"expr":"count by (cluster, job, instance, version) (prometheus_build_info{cluster=~\"$cluster\", job=~\"$job\", instance=~\"$instance\"})","format":"table","instant":true,"legendFormat":"","refId":"A"},{"expr":"max by (cluster, job, instance) (time() - process_start_time_seconds{cluster=~\"$cluster\", job=~\"$job\", instance=~\"$instance\"})","format":"table","instant":true,"legendFormat":"","refId":"B"}],"thresholds":[],"timeFrom":null,"timeShift":null,"title":"Prometheus Stats","tooltip":{"shared":true,"sort":2,"value_type":"individual"},"transform":"table","type":"table","xaxis":{"buckets":null,"mode":"time","name":null,"show":true,"values":[]},"yaxes":[{"format":"short","label":null,"logBase":1,"max":null,"min":0,"show":true},{"format":"short","label":null,"logBase":1,"max":null,"min":null,"show":false}]}],"repeat":null,"repeatIteration":null,"repeatRowId":null,"showTitle":true,"title":"Prometheus Stats","titleSize":"h6"},{"collapse":false,"height":"250px","panels":[{"aliasColors":{},"bars":false,"dashLength":10,"dashes":false,"datasource":"$datasource","fill":1,"id":2,"legend":{"avg":false,"current":false,"max":false,"min":false,"show":true,"total":false,"values":false},"lines":true,"linewidth":1,"links":[],"nullPointMode":"null as zero","percentage":false,"pointradius":5,"points":false,"renderer":"flot","seriesOverrides":[],"spaceLength":10,"span":6,"stack":false,"steppedLine":false,"targets":[{"expr":"sum(rate(prometheus_target_sync_length_seconds_sum{cluster=~\"$cluster\",job=~\"$job\",instance=~\"$instance\"}[5m])) by (cluster, job, scrape_job, instance) * 1e3","format":"time_series","legendFormat":"{{cluster}}:{{job}}:{{instance}}:{{scrape_job}}","legendLink":null}],"thresholds":[],"timeFrom":null,"timeShift":null,"title":"Target Sync","tooltip":{"shared":true,"sort":2,"value_type":"individual"},"type":"graph","xaxis":{"buckets":null,"mode":"time","name":null,"show":true,"values":[]},"yaxes":[{"format":"ms","label":null,"logBase":1,"max":null,"min":0,"show":true},{"format":"short","label":null,"logBase":1,"max":null,"min":null,"show":false}]},{"aliasColors":{},"bars":false,"dashLength":10,"dashes":false,"datasource":"$datasource","fill":10,"id":3,"legend":{"avg":false,"current":false,"max":false,"min":false,"show":true,"total":false,"values":false},"lines":true,"linewidth":0,"links":[],"nullPointMode":"null as zero","percentage":false,"pointradius":5,"points":false,"renderer":"flot","seriesOverrides":[],"spaceLength":10,"span":6,"stack":true,"steppedLine":false,"targets":[{"expr":"sum by (cluster, job, instance) (prometheus_sd_discovered_targets{cluster=~\"$cluster\", job=~\"$job\",instance=~\"$instance\"})","format":"time_series","legendFormat":"{{cluster}}:{{job}}:{{instance}}","legendLink":null}],"thresholds":[],"timeFrom":null,"timeShift":null,"title":"Targets","tooltip":{"shared":true,"sort":2,"value_type":"individual"},"type":"graph","xaxis":{"buckets":null,"mode":"time","name":null,"show":true,"values":[]},"yaxes":[{"format":"short","label":null,"logBase":1,"max":null,"min":0,"show":true},{"format":"short","label":null,"logBase":1,"max":null,"min":null,"show":false}]}],"repeat":null,"repeatIteration":null,"repeatRowId":null,"showTitle":true,"title":"Discovery","titleSize":"h6"},{"collapse":false,"height":"250px","panels":[{"aliasColors":{},"bars":false,"dashLength":10,"dashes":false,"datasource":"$datasource","fill":1,"id":4,"legend":{"avg":false,"current":false,"max":false,"min":false,"show":true,"total":false,"values":false},"lines":true,"linewidth":1,"links":[],"nullPointMode":"null as zero","percentage":false,"pointradius":5,"points":false,"renderer":"flot","seriesOverrides":[],"spaceLength":10,"span":4,"stack":false,"steppedLine":false,"targets":[{"expr":"rate(prometheus_target_interval_length_seconds_sum{cluster=~\"$cluster\", job=~\"$job\",instance=~\"$instance\"}[5m]) / rate(prometheus_target_interval_length_seconds_count{cluster=~\"$cluster\", job=~\"$job\",instance=~\"$instance\"}[5m]) * 1e3","format":"time_series","legendFormat":"{{cluster}}:{{job}}:{{instance}} {{interval}} configured","legendLink":null}],"thresholds":[],"timeFrom":null,"timeShift":null,"title":"Average Scrape Interval Duration","tooltip":{"shared":true,"sort":2,"value_type":"individual"},"type":"graph","xaxis":{"buckets":null,"mode":"time","name":null,"show":true,"values":[]},"yaxes":[{"format":"ms","label":null,"logBase":1,"max":null,"min":0,"show":true},{"format":"short","label":null,"logBase":1,"max":null,"min":null,"show":false}]},{"aliasColors":{},"bars":false,"dashLength":10,"dashes":false,"datasource":"$datasource","fill":10,"id":5,"legend":{"avg":false,"current":false,"max":false,"min":false,"show":true,"total":false,"values":false},"lines":true,"linewidth":0,"links":[],"nullPointMode":"null as zero","percentage":false,"pointradius":5,"points":false,"renderer":"flot","seriesOverrides":[],"spaceLength":10,"span":4,"stack":true,"steppedLine":false,"targets":[{"expr":"sum by (cluster, job, instance) (rate(prometheus_target_scrapes_exceeded_body_size_limit_total{cluster=~\"$cluster\",job=~\"$job\",instance=~\"$instance\"}[1m]))","format":"time_series","legendFormat":"exceeded body size limit: {{cluster}} {{job}} {{instance}}","legendLink":null},{"expr":"sum by (cluster, job, instance) (rate(prometheus_target_scrapes_exceeded_sample_limit_total{cluster=~\"$cluster\",job=~\"$job\",instance=~\"$instance\"}[1m]))","format":"time_series","legendFormat":"exceeded sample limit: {{cluster}} {{job}} {{instance}}","legendLink":null},{"expr":"sum by (cluster, job, instance) (rate(prometheus_target_scrapes_sample_duplicate_timestamp_total{cluster=~\"$cluster\",job=~\"$job\",instance=~\"$instance\"}[1m]))","format":"time_series","legendFormat":"duplicate timestamp: {{cluster}} {{job}} {{instance}}","legendLink":null},{"expr":"sum by (cluster, job, instance) (rate(prometheus_target_scrapes_sample_out_of_bounds_total{cluster=~\"$cluster\",job=~\"$job\",instance=~\"$instance\"}[1m]))","format":"time_series","legendFormat":"out of bounds: {{cluster}} {{job}} {{instance}}","legendLink":null},{"expr":"sum by (cluster, job, instance) (rate(prometheus_target_scrapes_sample_out_of_order_total{cluster=~\"$cluster\",job=~\"$job\",instance=~\"$instance\"}[1m]))","format":"time_series","legendFormat":"out of order: {{cluster}} {{job}} {{instance}}","legendLink":null}],"thresholds":[],"timeFrom":null,"timeShift":null,"title":"Scrape failures","tooltip":{"shared":true,"sort":2,"value_type":"individual"},"type":"graph","xaxis":{"buckets":null,"mode":"time","name":null,"show":true,"values":[]},"yaxes":[{"format":"short","label":null,"logBase":1,"max":null,"min":0,"show":true},{"format":"short","label":null,"logBase":1,"max":null,"min":null,"show":false}]},{"aliasColors":{},"bars":false,"dashLength":10,"dashes":false,"datasource":"$datasource","fill":10,"id":6,"legend":{"avg":false,"current":false,"max":false,"min":false,"show":true,"total":false,"values":false},"lines":true,"linewidth":0,"links":[],"nullPointMode":"null as zero","percentage":false,"pointradius":5,"points":false,"renderer":"flot","seriesOverrides":[],"spaceLength":10,"span":4,"stack":true,"steppedLine":false,"targets":[{"expr":"rate(prometheus_tsdb_head_samples_appended_total{cluster=~\"$cluster\", job=~\"$job\",instance=~\"$instance\"}[5m])","format":"time_series","legendFormat":"{{cluster}} {{job}} {{instance}}","legendLink":null}],"thresholds":[],"timeFrom":null,"timeShift":null,"title":"Appended Samples","tooltip":{"shared":true,"sort":2,"value_type":"individual"},"type":"graph","xaxis":{"buckets":null,"mode":"time","name":null,"show":true,"values":[]},"yaxes":[{"format":"short","label":null,"logBase":1,"max":null,"min":0,"show":true},{"format":"short","label":null,"logBase":1,"max":null,"min":null,"show":false}]}],"repeat":null,"repeatIteration":null,"repeatRowId":null,"showTitle":true,"title":"Retrieval","titleSize":"h6"},{"collapse":false,"height":"250px","panels":[{"aliasColors":{},"bars":false,"dashLength":10,"dashes":false,"datasource":"$datasource","fill":10,"id":7,"legend":{"avg":false,"current":false,"max":false,"min":false,"show":true,"total":false,"values":false},"lines":true,"linewidth":0,"links":[],"nullPointMode":"null as zero","percentage":false,"pointradius":5,"points":false,"renderer":"flot","seriesOverrides":[],"spaceLength":10,"span":6,"stack":true,"steppedLine":false,"targets":[{"expr":"prometheus_tsdb_head_series{cluster=~\"$cluster\",job=~\"$job\",instance=~\"$instance\"}","format":"time_series","legendFormat":"{{cluster}} {{job}} {{instance}} head series","legendLink":null}],"thresholds":[],"timeFrom":null,"timeShift":null,"title":"Head Series","tooltip":{"shared":true,"sort":2,"value_type":"individual"},"type":"graph","xaxis":{"buckets":null,"mode":"time","name":null,"show":true,"values":[]},"yaxes":[{"format":"short","label":null,"logBase":1,"max":null,"min":0,"show":true},{"format":"short","label":null,"logBase":1,"max":null,"min":null,"show":false}]},{"aliasColors":{},"bars":false,"dashLength":10,"dashes":false,"datasource":"$datasource","fill":10,"id":8,"legend":{"avg":false,"current":false,"max":false,"min":false,"show":true,"total":false,"values":false},"lines":true,"linewidth":0,"links":[],"nullPointMode":"null as zero","percentage":false,"pointradius":5,"points":false,"renderer":"flot","seriesOverrides":[],"spaceLength":10,"span":6,"stack":true,"steppedLine":false,"targets":[{"expr":"prometheus_tsdb_head_chunks{cluster=~\"$cluster\",job=~\"$job\",instance=~\"$instance\"}","format":"time_series","legendFormat":"{{cluster}} {{job}} {{instance}} head chunks","legendLink":null}],"thresholds":[],"timeFrom":null,"timeShift":null,"title":"Head Chunks","tooltip":{"shared":true,"sort":2,"value_type":"individual"},"type":"graph","xaxis":{"buckets":null,"mode":"time","name":null,"show":true,"values":[]},"yaxes":[{"format":"short","label":null,"logBase":1,"max":null,"min":0,"show":true},{"format":"short","label":null,"logBase":1,"max":null,"min":null,"show":false}]}],"repeat":null,"repeatIteration":null,"repeatRowId":null,"showTitle":true,"title":"Storage","titleSize":"h6"},{"collapse":false,"height":"250px","panels":[{"aliasColors":{},"bars":false,"dashLength":10,"dashes":false,"datasource":"$datasource","fill":10,"id":9,"legend":{"avg":false,"current":false,"max":false,"min":false,"show":true,"total":false,"values":false},"lines":true,"linewidth":0,"links":[],"nullPointMode":"null as zero","percentage":false,"pointradius":5,"points":false,"renderer":"flot","seriesOverrides":[],"spaceLength":10,"span":6,"stack":true,"steppedLine":false,"targets":[{"expr":"rate(prometheus_engine_query_duration_seconds_count{cluster=~\"$cluster\",job=~\"$job\",instance=~\"$instance\",slice=\"inner_eval\"}[5m])","format":"time_series","legendFormat":"{{cluster}} {{job}} {{instance}}","legendLink":null}],"thresholds":[],"timeFrom":null,"timeShift":null,"title":"Query Rate","tooltip":{"shared":true,"sort":2,"value_type":"individual"},"type":"graph","xaxis":{"buckets":null,"mode":"time","name":null,"show":true,"values":[]},"yaxes":[{"format":"short","label":null,"logBase":1,"max":null,"min":0,"show":true},{"format":"short","label":null,"logBase":1,"max":null,"min":null,"show":false}]},{"aliasColors":{},"bars":false,"dashLength":10,"dashes":false,"datasource":"$datasource","fill":10,"id":10,"legend":{"avg":false,"current":false,"max":false,"min":false,"show":true,"total":false,"values":false},"lines":true,"linewidth":0,"links":[],"nullPointMode":"null as zero","percentage":false,"pointradius":5,"points":false,"renderer":"flot","seriesOverrides":[],"spaceLength":10,"span":6,"stack":true,"steppedLine":false,"targets":[{"expr":"max by (slice) (prometheus_engine_query_duration_seconds{quantile=\"0.9\",cluster=~\"$cluster\", job=~\"$job\",instance=~\"$instance\"}) * 1e3","format":"time_series","legendFormat":"{{slice}}","legendLink":null}],"thresholds":[],"timeFrom":null,"timeShift":null,"title":"Stage Duration","tooltip":{"shared":true,"sort":2,"value_type":"individual"},"type":"graph","xaxis":{"buckets":null,"mode":"time","name":null,"show":true,"values":[]},"yaxes":[{"format":"ms","label":null,"logBase":1,"max":null,"min":0,"show":true},{"format":"short","label":null,"logBase":1,"max":null,"min":null,"show":false}]}],"repeat":null,"repeatIteration":null,"repeatRowId":null,"showTitle":true,"title":"Query","titleSize":"h6"}],"schemaVersion":14,"style":"dark","tags":["prometheus-mixin"],"templating":{"list":[{"current":{"text":"default","value":"default"},"hide":0,"label":"Data source","name":"datasource","options":[],"query":"prometheus","refresh":1,"regex":"","type":"datasource"},{"allValue":".+","current":{"selected":true,"text":"All","value":"$__all"},"datasource":"$datasource","hide":`}}{{ if .Values.grafana.sidecar.dashboards.multicluster.global.enabled }}0{{ else }}2{{ end }}{{`,"includeAll":true,"label":"cluster","multi":true,"name":"cluster","options":[],"query":"label_values(prometheus_build_info{job=\"prometheus-k8s\",namespace=\"monitoring\"}, cluster)","refresh":1,"regex":"","sort":2,"tagValuesQuery":"","tags":[],"tagsQuery":"","type":"query","useTags":false},{"allValue":".+","current":{"selected":true,"text":"All","value":"$__all"},"datasource":"$datasource","hide":0,"includeAll":true,"label":"job","multi":true,"name":"job","options":[],"query":"label_values(prometheus_build_info{cluster=~\"$cluster\"}, job)","refresh":1,"regex":"","sort":2,"tagValuesQuery":"","tags":[],"tagsQuery":"","type":"query","useTags":false},{"allValue":".+","current":{"selected":true,"text":"All","value":"$__all"},"datasource":"$datasource","hide":0,"includeAll":true,"label":"instance","multi":true,"name":"instance","options":[],"query":"label_values(prometheus_build_info{cluster=~\"$cluster\", job=~\"$job\"}, instance)","refresh":1,"regex":"","sort":2,"tagValuesQuery":"","tags":[],"tagsQuery":"","type":"query","useTags":false}]},"time":{"from":"now-1h","to":"now"},"timepicker":{"refresh_intervals":["5s","10s","30s","1m","5m","15m","30m","1h","2h","1d"],"time_options":["5m","15m","1h","6h","12h","24h","2d","7d","30d"]},"timezone": "`}}{{ .Values.grafana.defaultDashboardsTimezone }}{{`","title":"Prometheus / Overview","uid":"","version":0}`}} {{- end }} \ No newline at end of file diff --git a/staging/kube-prometheus-stack/templates/prometheus-operator/admission-webhooks/deployment/deployment.yaml b/staging/kube-prometheus-stack/templates/prometheus-operator/admission-webhooks/deployment/deployment.yaml index 350810dae..7ce357bb9 100644 --- a/staging/kube-prometheus-stack/templates/prometheus-operator/admission-webhooks/deployment/deployment.yaml +++ b/staging/kube-prometheus-stack/templates/prometheus-operator/admission-webhooks/deployment/deployment.yaml @@ -2,7 +2,7 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: {{ template "kube-prometheus-stack.fullname" . }}-operator-webhook + name: {{ template "kube-prometheus-stack.operator.fullname" . }}-webhook namespace: {{ template "kube-prometheus-stack.namespace" . }} labels: app: {{ template "kube-prometheus-stack.name" . }}-operator-webhook diff --git a/staging/kube-prometheus-stack/templates/prometheus-operator/admission-webhooks/deployment/pdb.yaml b/staging/kube-prometheus-stack/templates/prometheus-operator/admission-webhooks/deployment/pdb.yaml index 48459ad55..52dd78f62 100644 --- a/staging/kube-prometheus-stack/templates/prometheus-operator/admission-webhooks/deployment/pdb.yaml +++ b/staging/kube-prometheus-stack/templates/prometheus-operator/admission-webhooks/deployment/pdb.yaml @@ -2,7 +2,7 @@ apiVersion: policy/v1{{ ternary "" "beta1" ($.Capabilities.APIVersions.Has "policy/v1/PodDisruptionBudget") }} kind: PodDisruptionBudget metadata: - name: {{ template "kube-prometheus-stack.fullname" . }}-operator-webhook + name: {{ template "kube-prometheus-stack.operator.fullname" . }}-webhook namespace: {{ template "kube-prometheus-stack.namespace" . }} labels: {{- include "kube-prometheus-stack.prometheus-operator-webhook.labels" . | nindent 4 }} diff --git a/staging/kube-prometheus-stack/templates/prometheus-operator/admission-webhooks/deployment/service.yaml b/staging/kube-prometheus-stack/templates/prometheus-operator/admission-webhooks/deployment/service.yaml index 18f96efe3..b06c12912 100644 --- a/staging/kube-prometheus-stack/templates/prometheus-operator/admission-webhooks/deployment/service.yaml +++ b/staging/kube-prometheus-stack/templates/prometheus-operator/admission-webhooks/deployment/service.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: Service metadata: - name: {{ template "kube-prometheus-stack.fullname" . }}-operator-webhook + name: {{ template "kube-prometheus-stack.operator.fullname" . }}-webhook namespace: {{ template "kube-prometheus-stack.namespace" . }} labels: app: {{ template "kube-prometheus-stack.name" . }}-operator-webhook diff --git a/staging/kube-prometheus-stack/templates/prometheus-operator/ciliumnetworkpolicy.yaml b/staging/kube-prometheus-stack/templates/prometheus-operator/ciliumnetworkpolicy.yaml index 018c4e3c9..07e2e9996 100644 --- a/staging/kube-prometheus-stack/templates/prometheus-operator/ciliumnetworkpolicy.yaml +++ b/staging/kube-prometheus-stack/templates/prometheus-operator/ciliumnetworkpolicy.yaml @@ -2,7 +2,7 @@ apiVersion: cilium.io/v2 kind: CiliumNetworkPolicy metadata: - name: {{ template "kube-prometheus-stack.fullname" . }}-operator + name: {{ template "kube-prometheus-stack.operator.fullname" . }} namespace: {{ template "kube-prometheus-stack.namespace" . }} labels: {{- include "kube-prometheus-stack.prometheus-operator.labels" . | nindent 4 }} diff --git a/staging/kube-prometheus-stack/templates/prometheus-operator/clusterrole.yaml b/staging/kube-prometheus-stack/templates/prometheus-operator/clusterrole.yaml index 64353107f..fd11b69ee 100644 --- a/staging/kube-prometheus-stack/templates/prometheus-operator/clusterrole.yaml +++ b/staging/kube-prometheus-stack/templates/prometheus-operator/clusterrole.yaml @@ -2,7 +2,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: - name: {{ template "kube-prometheus-stack.fullname" . }}-operator + name: {{ template "kube-prometheus-stack.operator.fullname" . }} labels: {{- include "kube-prometheus-stack.prometheus-operator.labels" . | nindent 4 }} rules: @@ -75,6 +75,13 @@ rules: - get - list - watch +- apiGroups: + - "" + resources: + - events + verbs: + - patch + - create - apiGroups: - networking.k8s.io resources: diff --git a/staging/kube-prometheus-stack/templates/prometheus-operator/clusterrolebinding.yaml b/staging/kube-prometheus-stack/templates/prometheus-operator/clusterrolebinding.yaml index 93b5a1d16..ad9e3ef6c 100644 --- a/staging/kube-prometheus-stack/templates/prometheus-operator/clusterrolebinding.yaml +++ b/staging/kube-prometheus-stack/templates/prometheus-operator/clusterrolebinding.yaml @@ -2,13 +2,13 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: - name: {{ template "kube-prometheus-stack.fullname" . }}-operator + name: {{ template "kube-prometheus-stack.operator.fullname" . }} labels: {{- include "kube-prometheus-stack.prometheus-operator.labels" . | nindent 4 }} roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole - name: {{ template "kube-prometheus-stack.fullname" . }}-operator + name: {{ template "kube-prometheus-stack.operator.fullname" . }} subjects: - kind: ServiceAccount name: {{ template "kube-prometheus-stack.operator.serviceAccountName" . }} diff --git a/staging/kube-prometheus-stack/templates/prometheus-operator/deployment.yaml b/staging/kube-prometheus-stack/templates/prometheus-operator/deployment.yaml index 1d19d2ce7..5889bd234 100644 --- a/staging/kube-prometheus-stack/templates/prometheus-operator/deployment.yaml +++ b/staging/kube-prometheus-stack/templates/prometheus-operator/deployment.yaml @@ -4,7 +4,7 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: {{ template "kube-prometheus-stack.fullname" . }}-operator + name: {{ template "kube-prometheus-stack.operator.fullname" . }} namespace: {{ template "kube-prometheus-stack.namespace" . }} labels: {{- include "kube-prometheus-stack.prometheus-operator.labels" . | nindent 4 }} diff --git a/staging/kube-prometheus-stack/templates/prometheus-operator/networkpolicy.yaml b/staging/kube-prometheus-stack/templates/prometheus-operator/networkpolicy.yaml index 1953cf2fe..cfd5b0b8c 100644 --- a/staging/kube-prometheus-stack/templates/prometheus-operator/networkpolicy.yaml +++ b/staging/kube-prometheus-stack/templates/prometheus-operator/networkpolicy.yaml @@ -2,7 +2,7 @@ apiVersion: {{ template "kube-prometheus-stack.prometheus.networkPolicy.apiVersion" . }} kind: NetworkPolicy metadata: - name: {{ template "kube-prometheus-stack.fullname" . }}-operator + name: {{ template "kube-prometheus-stack.operator.fullname" . }} namespace: {{ template "kube-prometheus-stack.namespace" . }} labels: {{- include "kube-prometheus-stack.prometheus-operator.labels" . | nindent 4 }} diff --git a/staging/kube-prometheus-stack/templates/prometheus-operator/psp-clusterrole.yaml b/staging/kube-prometheus-stack/templates/prometheus-operator/psp-clusterrole.yaml index 31d2ff164..976623896 100644 --- a/staging/kube-prometheus-stack/templates/prometheus-operator/psp-clusterrole.yaml +++ b/staging/kube-prometheus-stack/templates/prometheus-operator/psp-clusterrole.yaml @@ -3,7 +3,7 @@ kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: - name: {{ template "kube-prometheus-stack.fullname" . }}-operator-psp + name: {{ template "kube-prometheus-stack.operator.fullname" . }}-psp labels: {{- include "kube-prometheus-stack.prometheus-operator.labels" . | nindent 4 }} rules: @@ -16,6 +16,6 @@ rules: resources: ['podsecuritypolicies'] verbs: ['use'] resourceNames: - - {{ template "kube-prometheus-stack.fullname" . }}-operator + - {{ template "kube-prometheus-stack.operator.fullname" . }} {{- end }} {{- end }} diff --git a/staging/kube-prometheus-stack/templates/prometheus-operator/psp-clusterrolebinding.yaml b/staging/kube-prometheus-stack/templates/prometheus-operator/psp-clusterrolebinding.yaml index aa3329251..01f5f3d9d 100644 --- a/staging/kube-prometheus-stack/templates/prometheus-operator/psp-clusterrolebinding.yaml +++ b/staging/kube-prometheus-stack/templates/prometheus-operator/psp-clusterrolebinding.yaml @@ -3,13 +3,13 @@ kind: ClusterRoleBinding apiVersion: rbac.authorization.k8s.io/v1 metadata: - name: {{ template "kube-prometheus-stack.fullname" . }}-operator-psp + name: {{ template "kube-prometheus-stack.operator.fullname" . }}-psp labels: {{- include "kube-prometheus-stack.prometheus-operator.labels" . | nindent 4 }} roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole - name: {{ template "kube-prometheus-stack.fullname" . }}-operator-psp + name: {{ template "kube-prometheus-stack.operator.fullname" . }}-psp subjects: - kind: ServiceAccount name: {{ template "kube-prometheus-stack.operator.serviceAccountName" . }} diff --git a/staging/kube-prometheus-stack/templates/prometheus-operator/psp.yaml b/staging/kube-prometheus-stack/templates/prometheus-operator/psp.yaml index beb4fe1e3..0943b5f56 100644 --- a/staging/kube-prometheus-stack/templates/prometheus-operator/psp.yaml +++ b/staging/kube-prometheus-stack/templates/prometheus-operator/psp.yaml @@ -3,7 +3,7 @@ apiVersion: policy/v1beta1 kind: PodSecurityPolicy metadata: - name: {{ template "kube-prometheus-stack.fullname" . }}-operator + name: {{ template "kube-prometheus-stack.operator.fullname" . }} labels: {{- include "kube-prometheus-stack.prometheus-operator.labels" . | nindent 4 }} {{- if .Values.global.rbac.pspAnnotations }} diff --git a/staging/kube-prometheus-stack/templates/prometheus-operator/service.yaml b/staging/kube-prometheus-stack/templates/prometheus-operator/service.yaml index f424c4be9..d45ab22d0 100644 --- a/staging/kube-prometheus-stack/templates/prometheus-operator/service.yaml +++ b/staging/kube-prometheus-stack/templates/prometheus-operator/service.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: Service metadata: - name: {{ template "kube-prometheus-stack.fullname" . }}-operator + name: {{ template "kube-prometheus-stack.operator.fullname" . }} namespace: {{ template "kube-prometheus-stack.namespace" . }} labels: {{- include "kube-prometheus-stack.prometheus-operator.labels" . | nindent 4 }} diff --git a/staging/kube-prometheus-stack/templates/prometheus-operator/servicemonitor.yaml b/staging/kube-prometheus-stack/templates/prometheus-operator/servicemonitor.yaml index ee6e3a4c5..d5ad94a18 100644 --- a/staging/kube-prometheus-stack/templates/prometheus-operator/servicemonitor.yaml +++ b/staging/kube-prometheus-stack/templates/prometheus-operator/servicemonitor.yaml @@ -2,7 +2,7 @@ apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: - name: {{ template "kube-prometheus-stack.fullname" . }}-operator + name: {{ template "kube-prometheus-stack.operator.fullname" . }} namespace: {{ template "kube-prometheus-stack.namespace" . }} labels: {{- include "kube-prometheus-stack.prometheus-operator.labels" . | nindent 4 }} diff --git a/staging/kube-prometheus-stack/templates/prometheus-operator/verticalpodautoscaler.yaml b/staging/kube-prometheus-stack/templates/prometheus-operator/verticalpodautoscaler.yaml index 2d9906300..f225d16dd 100644 --- a/staging/kube-prometheus-stack/templates/prometheus-operator/verticalpodautoscaler.yaml +++ b/staging/kube-prometheus-stack/templates/prometheus-operator/verticalpodautoscaler.yaml @@ -2,7 +2,7 @@ apiVersion: autoscaling.k8s.io/v1 kind: VerticalPodAutoscaler metadata: - name: {{ template "kube-prometheus-stack.fullname" . }}-operator + name: {{ template "kube-prometheus-stack.operator.fullname" . }} namespace: {{ template "kube-prometheus-stack.namespace" . }} labels: {{- include "kube-prometheus-stack.prometheus-operator.labels" . | nindent 4 }} @@ -32,7 +32,7 @@ spec: targetRef: apiVersion: apps/v1 kind: Deployment - name: {{ template "kube-prometheus-stack.fullname" . }}-operator + name: {{ template "kube-prometheus-stack.operator.fullname" . }} {{- with .Values.prometheusOperator.verticalPodAutoscaler.updatePolicy }} updatePolicy: {{- toYaml . | nindent 4 }} diff --git a/staging/kube-prometheus-stack/templates/prometheus/ingress.yaml b/staging/kube-prometheus-stack/templates/prometheus/ingress.yaml index 91fadf905..d2f6af5dd 100644 --- a/staging/kube-prometheus-stack/templates/prometheus/ingress.yaml +++ b/staging/kube-prometheus-stack/templates/prometheus/ingress.yaml @@ -11,7 +11,7 @@ kind: Ingress metadata: {{- if .Values.prometheus.ingress.annotations }} annotations: -{{ toYaml .Values.prometheus.ingress.annotations | indent 4 }} + {{- tpl (toYaml .Values.prometheus.ingress.annotations) . | nindent 4 }} {{- end }} name: {{ $serviceName }} namespace: {{ template "kube-prometheus-stack.namespace" . }} diff --git a/staging/kube-prometheus-stack/templates/prometheus/ingressThanosSidecar.yaml b/staging/kube-prometheus-stack/templates/prometheus/ingressThanosSidecar.yaml index a3da99faa..3f507cfa9 100644 --- a/staging/kube-prometheus-stack/templates/prometheus/ingressThanosSidecar.yaml +++ b/staging/kube-prometheus-stack/templates/prometheus/ingressThanosSidecar.yaml @@ -11,7 +11,7 @@ kind: Ingress metadata: {{- if .Values.prometheus.thanosIngress.annotations }} annotations: -{{ toYaml .Values.prometheus.thanosIngress.annotations | indent 4 }} + {{- tpl (toYaml .Values.prometheus.thanosIngress.annotations) . | nindent 4 }} {{- end }} name: {{ template "kube-prometheus-stack.fullname" . }}-thanos-gateway namespace: {{ template "kube-prometheus-stack.namespace" . }} diff --git a/staging/kube-prometheus-stack/templates/prometheus/ingressperreplica.yaml b/staging/kube-prometheus-stack/templates/prometheus/ingressperreplica.yaml index df631993b..a3685275d 100644 --- a/staging/kube-prometheus-stack/templates/prometheus/ingressperreplica.yaml +++ b/staging/kube-prometheus-stack/templates/prometheus/ingressperreplica.yaml @@ -25,7 +25,7 @@ items: {{- end }} {{- if $ingressValues.annotations }} annotations: -{{ toYaml $ingressValues.annotations | indent 8 }} + {{- tpl (toYaml $ingressValues.annotations) . | nindent 8 }} {{- end }} spec: {{- if $apiIsStable }} diff --git a/staging/kube-prometheus-stack/templates/prometheus/prometheus.yaml b/staging/kube-prometheus-stack/templates/prometheus/prometheus.yaml index 479bc0af2..2f2852526 100644 --- a/staging/kube-prometheus-stack/templates/prometheus/prometheus.yaml +++ b/staging/kube-prometheus-stack/templates/prometheus/prometheus.yaml @@ -435,6 +435,9 @@ spec: {{- if .Values.prometheus.prometheusSpec.sampleLimit }} sampleLimit: {{ .Values.prometheus.prometheusSpec.sampleLimit }} {{- end }} +{{- if .Values.prometheus.prometheusSpec.enforcedKeepDroppedTargets }} + enforcedKeepDroppedTargets: {{ .Values.prometheus.prometheusSpec.enforcedKeepDroppedTargets }} +{{- end }} {{- if .Values.prometheus.prometheusSpec.enforcedSampleLimit }} enforcedSampleLimit: {{ .Values.prometheus.prometheusSpec.enforcedSampleLimit }} {{- end }} @@ -455,6 +458,9 @@ spec: {{- end }} {{- if .Values.prometheus.prometheusSpec.minReadySeconds }} minReadySeconds: {{ .Values.prometheus.prometheusSpec.minReadySeconds }} +{{- end }} +{{- if .Values.prometheus.prometheusSpec.maximumStartupDurationSeconds }} + maximumStartupDurationSeconds: {{ .Values.prometheus.prometheusSpec.maximumStartupDurationSeconds }} {{- end }} hostNetwork: {{ .Values.prometheus.prometheusSpec.hostNetwork }} {{- if .Values.prometheus.prometheusSpec.hostAliases }} diff --git a/staging/kube-prometheus-stack/templates/thanos-ruler/ingress.yaml b/staging/kube-prometheus-stack/templates/thanos-ruler/ingress.yaml index aed9db280..e245ad448 100644 --- a/staging/kube-prometheus-stack/templates/thanos-ruler/ingress.yaml +++ b/staging/kube-prometheus-stack/templates/thanos-ruler/ingress.yaml @@ -13,7 +13,7 @@ metadata: namespace: {{ template "kube-prometheus-stack.namespace" . }} {{- if .Values.thanosRuler.ingress.annotations }} annotations: -{{ toYaml .Values.thanosRuler.ingress.annotations | indent 4 }} + {{- tpl (toYaml .Values.thanosRuler.ingress.annotations) . | nindent 4 }} {{- end }} labels: app: {{ template "kube-prometheus-stack.thanosRuler.name" . }} diff --git a/staging/kube-prometheus-stack/upgrade_operator.sh b/staging/kube-prometheus-stack/upgrade_operator.sh index f2f839ecf..f1be67fdb 100755 --- a/staging/kube-prometheus-stack/upgrade_operator.sh +++ b/staging/kube-prometheus-stack/upgrade_operator.sh @@ -13,7 +13,7 @@ shopt -s dotglob BASEDIR=$(dirname "$(realpath "$0")") UPSTREAM_REPO=git@github.com:prometheus-community/helm-charts.git PROMETHEUS_PATH=charts/kube-prometheus-stack -PROMETHEUS_TAG=kube-prometheus-stack-56.0.3 +PROMETHEUS_TAG=kube-prometheus-stack-56.8.0 TMPDIR=$(mktemp -d) STARTING_REV=$(git rev-parse HEAD) export STARTING_REV diff --git a/staging/kube-prometheus-stack/values.yaml b/staging/kube-prometheus-stack/values.yaml index 695096db1..988781cb8 100644 --- a/staging/kube-prometheus-stack/values.yaml +++ b/staging/kube-prometheus-stack/values.yaml @@ -996,6 +996,18 @@ grafana: # hosts: # - grafana.example.com + # # To make Grafana persistent (Using Statefulset) + # # + # persistence: + # enabled: true + # type: sts + # storageClassName: "storageClassName" + # accessModes: + # - ReadWriteOnce + # size: 20Gi + # finalizers: + # - kubernetes.io/pvc-protection + sidecar: dashboards: enabled: true @@ -2061,6 +2073,9 @@ prometheus-node-exporter: prometheusOperator: enabled: true + ## Use '{{ template "kube-prometheus-stack.fullname" . }}-operator' by default + fullnameOverride: "" + ## Number of old replicasets to retain ## ## The default value is 10, 0 will garbage-collect old replicasets ## revisionHistoryLimit: 10 @@ -2697,7 +2712,7 @@ prometheusOperator: thanosImage: registry: quay.io repository: thanos/thanos - tag: v0.33.0 + tag: v0.34.0 sha: "" ## Set a Label Selector to filter watched prometheus and prometheusAgent @@ -3795,6 +3810,11 @@ prometheus: # Set to 'false' to disable global sample_limit. or set to a number to override the default value. sampleLimit: false + # EnforcedKeepDroppedTargetsLimit defines on the number of targets dropped by relabeling that will be kept in memory. + # The value overrides any spec.keepDroppedTargets set by ServiceMonitor, PodMonitor, Probe objects unless spec.keepDroppedTargets + # is greater than zero and less than spec.enforcedKeepDroppedTargets. 0 means no limit. + enforcedKeepDroppedTargets: 0 + ## EnforcedSampleLimit defines global limit on number of scraped samples that will be accepted. This overrides any SampleLimit ## set per ServiceMonitor or/and PodMonitor. It is meant to be used by admins to enforce the SampleLimit to keep overall ## number of samples/series under the desired limit. Note that if SampleLimit is lower that value will be taken instead. @@ -3856,6 +3876,13 @@ prometheus: ## Otherwise, use prometheus.prometheusSpec.additionalConfig (passed through tpl) additionalConfigString: "" + ## Defines the maximum time that the `prometheus` container's startup probe + ## will wait before being considered failed. The startup probe will return + ## success after the WAL replay is complete. If set, the value should be + ## greater than 60 (seconds). Otherwise it will be equal to 600 seconds (15 + ## minutes). + maximumStartupDurationSeconds: 0 + additionalRulesForClusterRole: [] # - apiGroups: [ "" ] # resources: @@ -4197,7 +4224,7 @@ thanosRuler: image: registry: quay.io repository: thanos/thanos - tag: v0.33.0 + tag: v0.34.0 sha: "" ## Namespaces to be selected for PrometheusRules discovery. @@ -4487,7 +4514,7 @@ mesosphereResources: elasticsearch: false velero: false hooks: - kubectlImage: bitnami/kubectl:1.26.4 + kubectlImage: bitnami/kubectl:1.29.2 prometheus: jobName: prom-get-cluster-id configmapName: cluster-info-configmap