Merge branch 'main' into feature/node_exporter_linux_and_darwin

Signed-off-by: Piotr Kowalczyk <[email protected]>

charts/kube-prometheus-stack/Chart.yaml

@@ -21,7 +21,7 @@ name: kube-prometheus-stack
 sources:
   - https://github.com/prometheus-community/helm-charts
   - https://github.com/prometheus-operator/kube-prometheus
-version: 51.0.1
+version: 51.0.3
 appVersion: v0.68.0
 kubeVersion: ">=1.19.0-0"
 home: https://github.com/prometheus-operator/kube-prometheus

charts/kube-prometheus-stack/templates/alertmanager/service.yaml

@@ -1,3 +1,4 @@
+{{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }}
 {{- if .Values.alertmanager.enabled }}
 apiVersion: v1
 kind: Service
@@ -44,6 +45,9 @@ spec:
     targetPort: {{ .Values.alertmanager.service.targetPort }}
     protocol: TCP
   - name: reloader-web
+    {{- if semverCompare ">=1.20.0-0" $kubeTargetVersion }}
+    appProtocol: http
+    {{- end }}
     port: 8080
     targetPort: reloader-web
 {{- if .Values.alertmanager.service.additionalPorts }}

charts/kube-prometheus-stack/templates/prometheus-operator/ciliumnetworkpolicy.yaml

@@ -32,8 +32,10 @@ spec:
       - port: "8080"
       {{- end }}
         protocol: "TCP"
+      {{- if not .Values.prometheusOperator.tls.enabled }}
       rules:
         http:
         - method: "GET"
           path: "/metrics"
+      {{- end }}
 {{- end }}

charts/kube-prometheus-stack/templates/prometheus/service.yaml

@@ -1,3 +1,4 @@
+{{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }}
 {{- if .Values.prometheus.enabled }}
 apiVersion: v1
 kind: Service
@@ -43,6 +44,9 @@ spec:
     port: {{ .Values.prometheus.service.port }}
     targetPort: {{ .Values.prometheus.service.targetPort }}
   - name: reloader-web
+    {{- if semverCompare "> 1.20.0-0" $kubeTargetVersion }}
+    appProtocol: http
+    {{- end }}
     port: 8080
     targetPort: reloader-web
   {{- if .Values.prometheus.thanosIngress.enabled }}

charts/prom-label-proxy/Chart.yaml

@@ -2,8 +2,8 @@ apiVersion: v2
 name: prom-label-proxy
 description: A proxy that enforces a given label in a given PromQL query.
 type: application
-version: 0.5.0
-appVersion: "v0.6.0"
+version: 0.6.0
+appVersion: "v0.7.0"
 home: "https://github.com/prometheus-community/prom-label-proxy"
 keywords:
   - metric

charts/prometheus-kafka-exporter/Chart.yaml

@@ -1,9 +1,9 @@
 apiVersion: v2
-appVersion: "v1.6.0"
+appVersion: "v1.7.0"
 description: A Helm chart to export the metrics from Kafka in Prometheus format using the kafka-exporter from https://github.com/danielqsj/kafka_exporter
 name: prometheus-kafka-exporter
 home: https://github.com/danielqsj/kafka_exporter
-version: 2.4.0
+version: 2.5.0
 kubeVersion: ">=1.19.0-0"
 sources:
   - https://gkarthiks.github.io/helm-charts/charts/prometheus-kafka-exporter
@@ -22,7 +22,7 @@ annotations:
     - name: Chart Source
       url: https://github.com/prometheus-community/helm-charts/tree/main/charts/prometheus-kafka-exporter
 dependencies:
-- name: kafka
-  version: "18.5.0"
-  repository: https://charts.bitnami.com/bitnami
-  condition: kafka.enabled
+  - name: kafka
+    version: "18.5.0"
+    repository: https://charts.bitnami.com/bitnami
+    condition: kafka.enabled

charts/prometheus-operator-admission-webhook/Chart.yaml

@@ -2,8 +2,8 @@
 apiVersion: v2
 description: Prometheus Operator Admission Webhook
 name: prometheus-operator-admission-webhook
-version: 0.6.0
-appVersion: 0.67.0
+version: 0.7.0
+appVersion: 0.68.0
 home: https://github.com/prometheus-operator/prometheus-operator
 icon: https://github.com/prometheus-operator/prometheus-operator/raw/main/Documentation/logos/prometheus-operator-logo.png
 keywords:
@@ -21,7 +21,7 @@ type: application
 annotations:
   "artifacthub.io/license": Apache-2.0
   "artifacthub.io/links": |
-   - name: Chart Source
-     url: https://github.com/prometheus-community/helm-charts
-   - name: Upstream Project
-     url: https://github.com/prometheus-operator/prometheus-operator
+    - name: Chart Source
+      url: https://github.com/prometheus-community/helm-charts
+    - name: Upstream Project
+      url: https://github.com/prometheus-operator/prometheus-operator

charts/prometheus-pushgateway/Chart.yaml

@@ -1,22 +1,22 @@
 apiVersion: v2
-appVersion: "v1.6.0"
+appVersion: "v1.6.1"
 description: A Helm chart for prometheus pushgateway
 name: prometheus-pushgateway
-version: 2.4.0
+version: 2.4.1
 home: https://github.com/prometheus/pushgateway
 sources:
-- https://github.com/prometheus/pushgateway
+  - https://github.com/prometheus/pushgateway
 type: application
 keywords:
-- pushgateway
-- prometheus
+  - pushgateway
+  - prometheus
 maintainers:
-- email: [email protected]
-  name: gianrubio
-- email: [email protected]
-  name: cstaud
-- email: [email protected]
-  name: zeritti
+  - email: [email protected]
+    name: gianrubio
+  - email: [email protected]
+    name: cstaud
+  - email: [email protected]
+    name: zeritti
 annotations:
   "artifacthub.io/license": Apache-2.0
   "artifacthub.io/links": |

charts/prometheus/Chart.lock

@@ -4,12 +4,12 @@ dependencies:
   version: 1.6.0
 - name: kube-state-metrics
   repository: https://prometheus-community.github.io/helm-charts
-  version: 5.11.0
+  version: 5.13.0
 - name: prometheus-node-exporter
   repository: https://prometheus-community.github.io/helm-charts
-  version: 4.22.0
+  version: 4.23.0
 - name: prometheus-pushgateway
   repository: https://prometheus-community.github.io/helm-charts
   version: 2.4.0
-digest: sha256:1aa107e6e124974678660600ac0260321e81887a64fb7c0fd85d34a0bbb95e7d
-generated: "2023-08-26T22:57:53.836095+09:00"
+digest: sha256:bf13f4af7d61779aab6785b88cf6c51e24e2d46d06c847749be90c08317f0948
+generated: "2023-09-11T12:41:14.328722+03:00"

charts/prometheus/Chart.yaml

@@ -1,7 +1,7 @@
 apiVersion: v2
 name: prometheus
-appVersion: v2.46.0
-version: 24.3.1
+appVersion: v2.47.0
+version: 24.4.0
 kubeVersion: ">=1.19.0-0"
 description: Prometheus is a monitoring system and time series database.
 home: https://prometheus.io/
@@ -30,11 +30,11 @@ dependencies:
     repository: https://prometheus-community.github.io/helm-charts
     condition: alertmanager.enabled
   - name: kube-state-metrics
-    version: "5.11.*"
+    version: "5.13.*"
     repository: https://prometheus-community.github.io/helm-charts
     condition: kube-state-metrics.enabled
   - name: prometheus-node-exporter
-    version: "4.22.*"
+    version: "4.23.*"
     repository: https://prometheus-community.github.io/helm-charts
     condition: prometheus-node-exporter.enabled
   - name: prometheus-pushgateway