Update KSM, Node Exporter, and OpenCost (#1045)

* Update KSM, Node Exporter, and OpenCost Signed-off-by: Pete Wall <[email protected]> * fix deterministic ordering of the mysql integration Signed-off-by: Pete Wall <[email protected]> --------- Signed-off-by: Pete Wall <[email protected]>
grafana · Jan 6, 2025 · 541bc25 · 541bc25
1 parent d1b01a1
commit 541bc25
Show file tree

Hide file tree

Showing 83 changed files with 793 additions and 691 deletions.
diff --git a/charts/feature-cluster-metrics/Chart.lock b/charts/feature-cluster-metrics/Chart.lock
@@ -1,10 +1,10 @@
 dependencies:
 - name: kube-state-metrics
   repository: https://prometheus-community.github.io/helm-charts
-  version: 5.27.0
+  version: 5.28.0
 - name: prometheus-node-exporter
   repository: https://prometheus-community.github.io/helm-charts
-  version: 4.43.0
+  version: 4.43.1
 - name: prometheus-windows-exporter
   repository: https://prometheus-community.github.io/helm-charts
   version: 0.7.1
@@ -13,6 +13,6 @@ dependencies:
   version: 0.5.12
 - name: opencost
   repository: https://opencost.github.io/opencost-helm-chart
-  version: 1.42.3
-digest: sha256:ab54057daaf938cca1e2ce92f1e331213e713dfde52bff70b1cfcc43dad0adc9
-generated: "2024-12-19T12:43:03.844669-05:00"
+  version: 1.43.0
+digest: sha256:b06c60f636a467573aa1e162e4ee43a16ee627f671d19c692de341bad3dd13cf
+generated: "2025-01-02T08:29:38.80156-06:00"
diff --git a/charts/feature-cluster-metrics/Chart.yaml b/charts/feature-cluster-metrics/Chart.yaml
@@ -12,13 +12,13 @@ maintainers:
     name: petewall
 dependencies:
   - name: kube-state-metrics
-    version: 5.27.0
+    version: 5.28.0
     repository: https://prometheus-community.github.io/helm-charts
     condition: kube-state-metrics.deploy
 
   - alias: node-exporter
     name: prometheus-node-exporter
-    version: 4.43.0
+    version: 4.43.1
     repository: https://prometheus-community.github.io/helm-charts
     condition: node-exporter.deploy
 
@@ -34,6 +34,6 @@ dependencies:
     condition: kepler.enabled
 
   - name: opencost
-    version: 1.42.3
+    version: 1.43.0
     repository: https://opencost.github.io/opencost-helm-chart
     condition: opencost.enabled
diff --git a/charts/feature-cluster-metrics/README.md b/charts/feature-cluster-metrics/README.md
@@ -100,9 +100,9 @@ Be sure perform actual integration testing in a live environment in the main [k8
 
 | Repository | Name | Version |
 |------------|------|---------|
-| https://opencost.github.io/opencost-helm-chart | opencost | 1.42.3 |
-| https://prometheus-community.github.io/helm-charts | kube-state-metrics | 5.27.0 |
-| https://prometheus-community.github.io/helm-charts | node-exporter(prometheus-node-exporter) | 4.43.0 |
+| https://opencost.github.io/opencost-helm-chart | opencost | 1.43.0 |
+| https://prometheus-community.github.io/helm-charts | kube-state-metrics | 5.28.0 |
+| https://prometheus-community.github.io/helm-charts | node-exporter(prometheus-node-exporter) | 4.43.1 |
 | https://prometheus-community.github.io/helm-charts | windows-exporter(prometheus-windows-exporter) | 0.7.1 |
 | https://sustainable-computing-io.github.io/kepler-helm-chart | kepler | 0.5.12 |
 <!-- markdownlint-enable no-bare-urls -->

diff --git a/charts/feature-cluster-metrics/charts/kube-state-metrics-5.27.0.tgz b/charts/feature-cluster-metrics/charts/kube-state-metrics-5.27.0.tgz
diff --git a/charts/feature-cluster-metrics/charts/kube-state-metrics-5.28.0.tgz b/charts/feature-cluster-metrics/charts/kube-state-metrics-5.28.0.tgz
diff --git a/charts/feature-cluster-metrics/charts/opencost-1.42.3.tgz b/charts/feature-cluster-metrics/charts/opencost-1.42.3.tgz
diff --git a/charts/feature-cluster-metrics/charts/opencost-1.43.0.tgz b/charts/feature-cluster-metrics/charts/opencost-1.43.0.tgz
diff --git a/charts/feature-cluster-metrics/charts/prometheus-node-exporter-4.43.0.tgz b/charts/feature-cluster-metrics/charts/prometheus-node-exporter-4.43.0.tgz
diff --git a/charts/feature-cluster-metrics/charts/prometheus-node-exporter-4.43.1.tgz b/charts/feature-cluster-metrics/charts/prometheus-node-exporter-4.43.1.tgz
diff --git a/charts/feature-integrations/templates/_integration_mysql_logs.tpl b/charts/feature-integrations/templates/_integration_mysql_logs.tpl
@@ -29,14 +29,14 @@
 rule {
   source_labels = {{ $labelList | sortAlpha | toJson }}
   separator = ";"
-  regex = {{ $valueList | join ";" | quote }}
+  regex = {{ $valueList | sortAlpha | join ";" | quote }}
   target_label = "integration"
   replacement = "mysql"
 }
 rule {
   source_labels = {{ $labelList | sortAlpha | toJson }}
   separator = ";"
-  regex = {{ $valueList | join ";" | quote }}
+  regex = {{ $valueList | sortAlpha | join ";" | quote }}
   target_label = "instance"
   replacement = {{ $instance.name | quote }}
 }

diff --git a/charts/k8s-monitoring-v1/Chart.lock b/charts/k8s-monitoring-v1/Chart.lock
@@ -13,10 +13,10 @@ dependencies:
   version: 0.10.1
 - name: kube-state-metrics
   repository: https://prometheus-community.github.io/helm-charts
-  version: 5.27.0
+  version: 5.28.0
 - name: prometheus-node-exporter
   repository: https://prometheus-community.github.io/helm-charts
-  version: 4.43.0
+  version: 4.43.1
 - name: prometheus-operator-crds
   repository: https://prometheus-community.github.io/helm-charts
   version: 17.0.2
@@ -25,12 +25,12 @@ dependencies:
   version: 0.7.1
 - name: opencost
   repository: https://opencost.github.io/opencost-helm-chart
-  version: 1.42.3
+  version: 1.43.0
 - name: kepler
   repository: https://sustainable-computing-io.github.io/kepler-helm-chart
   version: 0.5.12
 - name: beyla
   repository: https://grafana.github.io/helm-charts
   version: 1.5.0
-digest: sha256:213be57bb5b492f6aebe1328689a50e5b845b1df6822879fa8fdede2b6708eaa
-generated: "2024-12-19T00:23:01.754790316Z"
+digest: sha256:79efb53fee01a2e75328fc2ca076b983dd1022330332d8c5e290a462a39bf7e8
+generated: "2025-01-02T08:30:50.202914-06:00"
diff --git a/charts/k8s-monitoring-v1/Chart.yaml b/charts/k8s-monitoring-v1/Chart.yaml
@@ -34,11 +34,11 @@ dependencies:
     repository: https://grafana.github.io/helm-charts
     condition: profiles.enabled
   - name: kube-state-metrics
-    version: 5.27.0
+    version: 5.28.0
     repository: https://prometheus-community.github.io/helm-charts
     condition: kube-state-metrics.enabled
   - name: prometheus-node-exporter
-    version: 4.43.0
+    version: 4.43.1
     repository: https://prometheus-community.github.io/helm-charts
     condition: prometheus-node-exporter.enabled
   - name: prometheus-operator-crds
@@ -50,7 +50,7 @@ dependencies:
     repository: https://prometheus-community.github.io/helm-charts
     condition: prometheus-windows-exporter.enabled
   - name: opencost
-    version: 1.42.3
+    version: 1.43.0
     repository: https://opencost.github.io/opencost-helm-chart
     condition: opencost.enabled
   - name: kepler

diff --git a/charts/k8s-monitoring-v1/README.md b/charts/k8s-monitoring-v1/README.md
@@ -143,9 +143,9 @@ The Prometheus and Loki services may be hosted on the same cluster, or remotely
 | https://grafana.github.io/helm-charts | alloy-logs(alloy) | 0.10.1 |
 | https://grafana.github.io/helm-charts | alloy-profiles(alloy) | 0.10.1 |
 | https://grafana.github.io/helm-charts | beyla | 1.5.0 |
-| https://opencost.github.io/opencost-helm-chart | opencost | 1.42.3 |
-| https://prometheus-community.github.io/helm-charts | kube-state-metrics | 5.27.0 |
-| https://prometheus-community.github.io/helm-charts | prometheus-node-exporter | 4.43.0 |
+| https://opencost.github.io/opencost-helm-chart | opencost | 1.43.0 |
+| https://prometheus-community.github.io/helm-charts | kube-state-metrics | 5.28.0 |
+| https://prometheus-community.github.io/helm-charts | prometheus-node-exporter | 4.43.1 |
 | https://prometheus-community.github.io/helm-charts | prometheus-operator-crds | 17.0.2 |
 | https://prometheus-community.github.io/helm-charts | prometheus-windows-exporter | 0.7.1 |
 | https://sustainable-computing-io.github.io/kepler-helm-chart | kepler | 0.5.12 |

diff --git a/charts/k8s-monitoring-v1/charts/kube-state-metrics-5.27.0.tgz b/charts/k8s-monitoring-v1/charts/kube-state-metrics-5.27.0.tgz
diff --git a/charts/k8s-monitoring-v1/charts/kube-state-metrics-5.28.0.tgz b/charts/k8s-monitoring-v1/charts/kube-state-metrics-5.28.0.tgz
diff --git a/charts/k8s-monitoring-v1/charts/opencost-1.42.3.tgz b/charts/k8s-monitoring-v1/charts/opencost-1.42.3.tgz
diff --git a/charts/k8s-monitoring-v1/charts/opencost-1.43.0.tgz b/charts/k8s-monitoring-v1/charts/opencost-1.43.0.tgz
diff --git a/charts/k8s-monitoring-v1/charts/prometheus-node-exporter-4.43.0.tgz b/charts/k8s-monitoring-v1/charts/prometheus-node-exporter-4.43.0.tgz
diff --git a/charts/k8s-monitoring-v1/charts/prometheus-node-exporter-4.43.1.tgz b/charts/k8s-monitoring-v1/charts/prometheus-node-exporter-4.43.1.tgz
diff --git a/charts/k8s-monitoring-v1/docs/examples/alloy-autoscaling-and-storage/output.yaml b/charts/k8s-monitoring-v1/docs/examples/alloy-autoscaling-and-storage/output.yaml