Merge branch 'main' into kube-prometheus-stack/jkroepke

Signed-off-by: Quentin Bisson <[email protected]>

.github/CODEOWNERS

@@ -6,6 +6,8 @@
 # Unless a later match takes precedence, they will be requested for review when someone opens a pull request.
 * @prometheus-community/helm-charts-admins
 
+/.github/workflows/ @prometheus-community/helm-charts-admins @jkroepke @GMartinez-Sisti
+
 /charts/alertmanager/ @monotek @naseemkullah
 /charts/alertmanager-snmp-notifier/ @maxwo
 /charts/jiralert/ @jkroepke @zanhsieh
@@ -32,6 +34,7 @@
 /charts/prometheus-nats-exporter/ @caarlos0 @okgolove
 /charts/prometheus-nginx-exporter/ @nlamirault @zeritti
 /charts/prometheus-node-exporter/ @gianrubio @zanhsieh @zeritti
+/charts/prometheus-opencost-exporter/ @mattray
 /charts/prometheus-operator-admission-webhook/ @zeritti
 /charts/prometheus-operator-crds/ @dacamposol @desaintmartin @jkroepke @QuentinBisson
 /charts/prometheus-pgbouncer-exporter/ @stewartshea @zeritti
@@ -45,5 +48,6 @@
 /charts/prometheus-snmp-exporter/ @miouge1 @xiu
 /charts/prometheus-stackdriver-exporter/ @apenney @rpahli
 /charts/prometheus-statsd-exporter/ @scDisorder
+/charts/prometheus-systemd-exporter/ @capuche2412
 /charts/prometheus-to-sd/ @acondrat
 /charts/prometheus-windows-exporter/ @jkroepke

.github/linters/ct.yaml

@@ -12,4 +12,5 @@ excluded-charts:
   # If not running on GCE, will error: "Failed to get GCE config"
   - prometheus-to-sd
 additional-commands:
+  - sh -ec "if [ -f '{{ .Path }}/ci/lint.sh' ]; then shellcheck '{{ .Path }}/ci/lint.sh'; bash '{{ .Path }}/ci/lint.sh'; fi"
   # - helm unittest --helm3 --strict --file unittests/*.yaml --file 'unittests/**/*.yaml' {{ .Path }}

.github/workflows/lint-test.yaml

@@ -16,7 +16,7 @@ jobs:
         with:
           version: v3.12.0
 
-      - uses: actions/setup-python@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: '3.7'
 

charts/alertmanager-snmp-notifier/Chart.yaml

@@ -5,8 +5,8 @@ home: https://github.com/maxwo/snmp_notifier
 sources:
   - https://github.com/maxwo/snmp_notifier
 type: application
-version: 0.1.2
-appVersion: v1.4.0
+version: 0.3.0
+appVersion: v1.5.0
 keywords:
   - monitoring
 maintainers:

charts/alertmanager-snmp-notifier/templates/service.yaml

@@ -7,6 +7,10 @@ metadata:
   {{- if .Values.service.annotations }}
   {{- end }}
 spec:
+{{- if .Values.service.ipDualStack.enabled }}
+  ipFamilies: {{ toYaml .Values.service.ipDualStack.ipFamilies | nindent 4 }}
+  ipFamilyPolicy: {{ .Values.service.ipDualStack.ipFamilyPolicy }}
+{{- end }}
   type: {{ .Values.service.type }}
   ports:
     - port: {{ .Values.service.port }}

charts/alertmanager-snmp-notifier/values.yaml

@@ -95,6 +95,10 @@ securityContext: {}
 service:
   type: ClusterIP
   port: 9464
+  ipDualStack:
+    enabled: false
+    ipFamilies: ["IPv6", "IPv4"]
+    ipFamilyPolicy: "PreferDualStack"
 
 ingress:
   enabled: false

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: 54.2.1
-appVersion: v0.69.1
+version: 55.8.2
+appVersion: v0.70.0
 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.15.*"
+    version: "5.16.*"
     repository: https://prometheus-community.github.io/helm-charts
     condition: kubeStateMetrics.enabled
   - name: prometheus-node-exporter
-    version: "4.23.*"
+    version: "4.25.*"
     repository: https://prometheus-community.github.io/helm-charts
     condition: nodeExporter.enabled
   - name: grafana
-    version: "7.0.*"
+    version: "7.1.*"
     repository: https://grafana.github.io/helm-charts
     condition: grafana.enabled
   - name: prometheus-windows-exporter
     repository: https://prometheus-community.github.io/helm-charts
-    version: "0.1.*"
+    version: "0.2.*"
     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 54.x to 55.x
+
+This version upgrades Prometheus-Operator to v0.70.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.70.0/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagerconfigs.yaml
+kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.70.0/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagers.yaml
+kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.70.0/example/prometheus-operator-crd/monitoring.coreos.com_podmonitors.yaml
+kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.70.0/example/prometheus-operator-crd/monitoring.coreos.com_probes.yaml
+kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.70.0/example/prometheus-operator-crd/monitoring.coreos.com_prometheusagents.yaml
+kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.70.0/example/prometheus-operator-crd/monitoring.coreos.com_prometheuses.yaml
+kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.70.0/example/prometheus-operator-crd/monitoring.coreos.com_prometheusrules.yaml
+kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.70.0/example/prometheus-operator-crd/monitoring.coreos.com_scrapeconfigs.yaml
+kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.70.0/example/prometheus-operator-crd/monitoring.coreos.com_servicemonitors.yaml
+kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.70.0/example/prometheus-operator-crd/monitoring.coreos.com_thanosrulers.yaml
+```
+
 ### From 53.x to 54.x
 
 Grafana Helm Chart has bumped to version 7