Merge remote-tracking branch 'origin/main' into am-default-dashboard

charts/alertmanager/Chart.yaml

@@ -6,7 +6,7 @@ icon: https://raw.githubusercontent.com/prometheus/prometheus.github.io/master/a
 sources:
   - https://github.com/prometheus/alertmanager
 type: application
-version: 1.11.0
+version: 1.12.0
 appVersion: v0.27.0
 kubeVersion: ">=1.19.0-0"
 keywords:

charts/alertmanager/templates/vpa.yaml

@@ -0,0 +1,26 @@
+{{- if .Values.verticalPodAutoscaler.enabled }}
+apiVersion: autoscaling.k8s.io/v1
+kind: VerticalPodAutoscaler
+metadata:
+  name: {{ include "alertmanager.fullname" . }}
+  namespace: {{ .Release.Namespace }}
+spec:
+  {{- if .Values.verticalPodAutoscaler.recommenders }}
+  recommenders:
+    {{- range .Values.verticalPodAutoscaler.recommenders }}
+    - name: {{ .name }}
+    {{- end }}
+  {{- end }}
+  targetRef:
+    apiVersion: apps/v1
+    kind: StatefulSet
+    name: {{ include "alertmanager.fullname" . }}
+  {{- if .Values.verticalPodAutoscaler.updatePolicy }}
+  updatePolicy:
+    {{- toYaml .Values.verticalPodAutoscaler.updatePolicy | nindent 4 }}
+  {{- end }}
+  {{- if .Values.verticalPodAutoscaler.resourcePolicy }}
+  resourcePolicy:
+    {{- toYaml .Values.verticalPodAutoscaler.resourcePolicy | nindent 4 }}
+  {{- end }}
+{{- end }}

charts/alertmanager/values.schema.json

@@ -627,7 +627,7 @@
                 "nodePort": {
                     "description": "Specific nodePort to force when service type is NodePort.",
                     "type": "integer"
-                }        
+                }
             }
         },
         "ingress": {
@@ -918,6 +918,25 @@
                     "type": "object"
                 }
             }
+        },
+        "verticalPodAutoscaler": {
+            "description": "Vertical Pod Autoscaling configuration.",
+            "type": "object",
+            "properties": {
+                "enabled": {
+                    "type": "boolean",
+                    "default": false
+                },
+                "recommenders": {
+                    "type": "array"
+                },
+                "updatePolicy": {
+                    "type": "object"
+                },
+                "resourcePolicy": {
+                    "type": "object"
+                }
+            }
         }
     }
 }

charts/alertmanager/values.yaml

@@ -377,3 +377,23 @@ testFramework:
   annotations:
     "helm.sh/hook": test-success
     # "helm.sh/hook-delete-policy": "before-hook-creation,hook-succeeded"
+
+# --- Vertical Pod Autoscaler
+verticalPodAutoscaler:
+  # -- Use VPA for alertmanager
+  enabled: false
+  # recommenders:
+  #   - name: 'alternative'
+  # updatePolicy:
+  #   updateMode: "Auto"
+  #   minReplicas: 1
+  # resourcePolicy:
+  #   containerPolicies:
+  #     - containerName: '*'
+  #       minAllowed:
+  #         cpu: 100m
+  #         memory: 128Mi
+  #       maxAllowed:
+  #         cpu: 1
+  #         memory: 500Mi
+  #       controlledResources: ["cpu", "memory"]

charts/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: 61.4.0
-appVersion: v0.75.1
+version: 62.6.0
+appVersion: v0.76.1
 kubeVersion: ">=1.19.0-0"
 home: https://github.com/prometheus-operator/kube-prometheus
 keywords:
@@ -45,18 +45,18 @@ dependencies:
     version: "0.0.0"
     condition: crds.enabled
   - name: kube-state-metrics
-    version: "5.21.*"
+    version: "5.25.*"
     repository: https://prometheus-community.github.io/helm-charts
     condition: kubeStateMetrics.enabled
   - name: prometheus-node-exporter
-    version: "4.37.*"
+    version: "4.39.*"
     repository: https://prometheus-community.github.io/helm-charts
     condition: nodeExporter.enabled
   - name: grafana
-    version: "8.3.*"
+    version: "8.5.*"
     repository: https://grafana.github.io/helm-charts
     condition: grafana.enabled
   - name: prometheus-windows-exporter
     repository: https://prometheus-community.github.io/helm-charts
-    version: "0.3.*"
+    version: "0.5.*"
     condition: windowsMonitoring.enabled

charts/kube-prometheus-stack/README.md

@@ -82,6 +82,25 @@ _See [helm upgrade](https://helm.sh/docs/helm/helm_upgrade/) for command documen
 
 A major chart version change (like v1.2.3 -> v2.0.0) indicates that there is an incompatible breaking change needing manual actions.
 
+### From 61.x to 62.x
+
+This version upgrades Prometheus-Operator to v0.76.0
+
+Run these commands to update the CRDs before applying the upgrade.
+
+```console
+kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.76.0/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagerconfigs.yaml
+kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.76.0/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagers.yaml
+kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.76.0/example/prometheus-operator-crd/monitoring.coreos.com_podmonitors.yaml
+kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.76.0/example/prometheus-operator-crd/monitoring.coreos.com_probes.yaml
+kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.76.0/example/prometheus-operator-crd/monitoring.coreos.com_prometheusagents.yaml
+kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.76.0/example/prometheus-operator-crd/monitoring.coreos.com_prometheuses.yaml
+kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.76.0/example/prometheus-operator-crd/monitoring.coreos.com_prometheusrules.yaml
+kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.76.0/example/prometheus-operator-crd/monitoring.coreos.com_scrapeconfigs.yaml
+kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.76.0/example/prometheus-operator-crd/monitoring.coreos.com_servicemonitors.yaml
+kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.76.0/example/prometheus-operator-crd/monitoring.coreos.com_thanosrulers.yaml
+```
+
 ### From 60.x to 61.x
 
 This version upgrades Prometheus-Operator to v0.75.0