Merge branch 'grafana:main' into feature-integration-tempo

Author: Imshelledin21

README.md

@@ -42,12 +42,12 @@ for chart install instructions.
 
 We hold office hours roughly monthly. Meeting times and recordings will be posted here:
 
-| Date       | Topic                       | Link                                                                           |
-|------------|-----------------------------|--------------------------------------------------------------------------------|
-| 2024-10-11 | Upcoming 2.0 version        | [Recording](https://youtu.be/2N6MQN45Gy8)                                      |
-| 2024-11-22 | 2.0 Status                  | [Recording](https://youtu.be/rR6yxTEGLZc)                                      |
-| 2024-12-19 | 2.0 Status and release date | [Recording](https://youtu.be/zkhR_5v1i9g)                                      |
-| 2025-01-24 | 2.0 Release and future      | [Meeting Link](https://grafana.slack.com/archives/CAGMZG3GB/p1737059655740439) |
+| Date       | Topic                       | Link                                      |
+|------------|-----------------------------|-------------------------------------------|
+| 2024-10-11 | Upcoming 2.0 version        | [Recording](https://youtu.be/2N6MQN45Gy8) |
+| 2024-11-22 | 2.0 Status                  | [Recording](https://youtu.be/rR6yxTEGLZc) |
+| 2024-12-19 | 2.0 Status and release date | [Recording](https://youtu.be/zkhR_5v1i9g) |
+| 2025-01-24 | 2.0 Release and future      | [Recording](https://youtu.be/-cNnXO1AGOk) |
 
 ## Contributing
 

charts/k8s-monitoring-test/Makefile

@@ -41,5 +41,5 @@ test: build
 ifdef HAS_HELM_UNITTEST
 	helm unittest .
 else
-	docker run --rm --volume $(shell pwd):/apps helmunittest/helm-unittest .
+	docker run --rm --volume $(shell pwd):/apps helmunittest/helm-unittest:3.17.0-0.7.1 .
 endif

charts/k8s-monitoring-v1/Chart.lock

@@ -1,19 +1,19 @@
 dependencies:
 - name: alloy
   repository: https://grafana.github.io/helm-charts
-  version: 0.10.1
+  version: 0.11.0
 - name: alloy
   repository: https://grafana.github.io/helm-charts
-  version: 0.10.1
+  version: 0.11.0
 - name: alloy
   repository: https://grafana.github.io/helm-charts
-  version: 0.10.1
+  version: 0.11.0
 - name: alloy
   repository: https://grafana.github.io/helm-charts
-  version: 0.10.1
+  version: 0.11.0
 - name: kube-state-metrics
   repository: https://prometheus-community.github.io/helm-charts
-  version: 5.28.0
+  version: 5.29.0
 - name: prometheus-node-exporter
   repository: https://prometheus-community.github.io/helm-charts
   version: 4.43.1
@@ -25,12 +25,12 @@ dependencies:
   version: 0.8.0
 - name: opencost
   repository: https://opencost.github.io/opencost-helm-chart
-  version: 1.43.0
+  version: 1.43.2
 - 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.6.3
-digest: sha256:f2f2f1f096018f84eb9d715265803485c7464dd43ddb046a0a40bf2a494c2b6b
-generated: "2025-01-17T00:21:25.907838331Z"
+  version: 1.7.2
+digest: sha256:ad45897cbbb6f25dd332b476419b54f3294ae457ca02be46bdfc83fecca6e4f0
+generated: "2025-01-30T15:06:03.465026-06:00"

charts/k8s-monitoring-v1/Chart.yaml

@@ -3,7 +3,7 @@ apiVersion: v2
 name: k8s-monitoring
 description: A Helm chart for gathering, scraping, and forwarding Kubernetes telemetry data to a Grafana Stack.
 type: application
-version: 1.6.21
+version: 1.6.23
 appVersion: 2.11.2
 icon: https://raw.githubusercontent.com/grafana/grafana/main/public/img/grafana_icon.svg
 sources:
@@ -15,26 +15,26 @@ maintainers:
     name: skl
 dependencies:
   - name: alloy
-    version: 0.10.1
+    version: 0.11.0
     repository: https://grafana.github.io/helm-charts
     condition: alloy.enabled
   - alias: alloy-events
     name: alloy
-    version: 0.10.1
+    version: 0.11.0
     repository: https://grafana.github.io/helm-charts
     condition: logs.cluster_events.enabled
   - alias: alloy-logs
     name: alloy
-    version: 0.10.1
+    version: 0.11.0
     repository: https://grafana.github.io/helm-charts
     condition: logs.pod_logs.enabled
   - alias: alloy-profiles
     name: alloy
-    version: 0.10.1
+    version: 0.11.0
     repository: https://grafana.github.io/helm-charts
     condition: profiles.enabled
   - name: kube-state-metrics
-    version: 5.28.0
+    version: 5.29.0
     repository: https://prometheus-community.github.io/helm-charts
     condition: kube-state-metrics.enabled
   - name: prometheus-node-exporter
@@ -50,14 +50,14 @@ dependencies:
     repository: https://prometheus-community.github.io/helm-charts
     condition: prometheus-windows-exporter.enabled
   - name: opencost
-    version: 1.43.0
+    version: 1.43.2
     repository: https://opencost.github.io/opencost-helm-chart
     condition: opencost.enabled
   - name: kepler
     version: 0.5.12
     repository: https://sustainable-computing-io.github.io/kepler-helm-chart
     condition: kepler.enabled
   - name: beyla
-    version: 1.6.3
+    version: 1.7.2
     repository: https://grafana.github.io/helm-charts
     condition: beyla.enabled

charts/k8s-monitoring-v1/README.md

@@ -5,7 +5,7 @@
 
 # k8s-monitoring
 
-![Version: 1.6.21](https://img.shields.io/badge/Version-1.6.21-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.11.2](https://img.shields.io/badge/AppVersion-2.11.2-informational?style=flat-square)
+![Version: 1.6.23](https://img.shields.io/badge/Version-1.6.23-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.11.2](https://img.shields.io/badge/AppVersion-2.11.2-informational?style=flat-square)
 
 A Helm chart for gathering, scraping, and forwarding Kubernetes telemetry data to a Grafana Stack.
 
@@ -138,13 +138,13 @@ The Prometheus and Loki services may be hosted on the same cluster, or remotely
 
 | Repository | Name | Version |
 |------------|------|---------|
-| https://grafana.github.io/helm-charts | alloy | 0.10.1 |
-| https://grafana.github.io/helm-charts | alloy-events(alloy) | 0.10.1 |
-| 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.6.3 |
-| 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://grafana.github.io/helm-charts | alloy | 0.11.0 |
+| https://grafana.github.io/helm-charts | alloy-events(alloy) | 0.11.0 |
+| https://grafana.github.io/helm-charts | alloy-logs(alloy) | 0.11.0 |
+| https://grafana.github.io/helm-charts | alloy-profiles(alloy) | 0.11.0 |
+| https://grafana.github.io/helm-charts | beyla | 1.7.2 |
+| https://opencost.github.io/opencost-helm-chart | opencost | 1.43.2 |
+| https://prometheus-community.github.io/helm-charts | kube-state-metrics | 5.29.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.8.0 |