Merge branch 'main' into patch-1

grafana · Oct 4, 2024 · 60e4948 · 60e4948
2 parents 5b9cec1 + 1f14cca
commit 60e4948
Show file tree

Hide file tree

Showing 39 changed files with 67 additions and 43 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -31,17 +31,31 @@ Main (unreleased)
 
 ### Bugfixes
 
+- Fixed a bug in `import.git` which caused a `"non-fast-forward update"` error message. (@ptodev)
+
+### Other changes
+
+- Small fix in UI stylesheet to fit more content into visible table area. (@defanator)
+
+- Changed OTEL alerts in Alloy mixin to use success rate for tracing. (@thampiotr)
+
+- Support TLS client settings for clustering (@tiagorossig)
+
+v1.4.2
+-----------------
+
+### Bugfixes
+
 - Update windows_exporter from v0.27.2 vo v0.27.3: (@jkroepke)
   - Fixes a bug where scraping Windows service crashes alloy
 
 - Update yet-another-cloudwatch-exporter from v0.60.0 vo v0.61.0: (@morremeyer)
   - Fixes a bug where cloudwatch S3 metrics are reported as `0`
+
 - Issue 1687 - otelcol.exporter.awss3 fails to configure (@cydergoth)
   - Fix parsing of the Level configuration attribute in debug_metrics config block
   - Ensure "optional" debug_metrics config block really is optional
 
-- Fixed a bug in `import.git` which caused a `"non-fast-forward update"` error message. (@ptodev)
-
 - Fixed an issue with `loki.process` where `stage.luhn` and `stage.timestamp` would not apply 
   default configuration settings correctly (@thampiotr)
 

diff --git a/operations/alloy-mixin/alerts/opentelemetry.libsonnet b/operations/alloy-mixin/alerts/opentelemetry.libsonnet
@@ -4,13 +4,13 @@ local alert = import './utils/alert.jsonnet';
   local successRateQuery(enableK8sCluster, failed, success) =
         local sumBy = if enableK8sCluster then "cluster, namespace, job" else "job";
         |||
-          (1 - sum by (%s) (
-                  rate(%s{}[1m])
+          (1 - (
+                  sum by (%s) (rate(%s{}[1m]))
                   /
-                  (rate(%s{}[1m]) + rate(%s{}[1m]))
+                  sum by (%s) (rate(%s{}[1m]) + rate(%s{}[1m]))
                )
           ) < 0.95
-        ||| % [sumBy, failed, failed, success],
+        ||| % [sumBy, failed, sumBy, failed, success],
 
   newOpenTelemetryAlertsGroup(enableK8sCluster=true):
     alert.newGroup(

diff --git a/operations/helm/charts/alloy/CHANGELOG.md b/operations/helm/charts/alloy/CHANGELOG.md
@@ -10,6 +10,16 @@ internal API changes are not present.
 Unreleased
 ----------
 
+0.9.1 (2024-10-04)
+------------------
+
+### Enhancements
+
+- Update to Grafana Alloy v1.4.2. (@ptodev)
+
+0.9.0 (2024-10-02)
+------------------
+
 ### Enhancements
 
 - Add lifecyle hook to the Helm chart. (@etiennep)

diff --git a/operations/helm/charts/alloy/Chart.yaml b/operations/helm/charts/alloy/Chart.yaml
@@ -2,8 +2,8 @@ apiVersion: v2
 name: alloy
 description: 'Grafana Alloy'
 type: application
-version: 0.9.0
-appVersion: 'v1.4.1'
+version: 0.9.1
+appVersion: 'v1.4.2'
 icon: https://raw.githubusercontent.com/grafana/alloy/main/docs/sources/assets/alloy_icon_orange.svg
 
 dependencies:

diff --git a/operations/helm/charts/alloy/README.md b/operations/helm/charts/alloy/README.md
@@ -1,6 +1,6 @@
 # Grafana Alloy Helm chart
 
-![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![Version: 0.9.0](https://img.shields.io/badge/Version-0.9.0-informational?style=flat-square) ![AppVersion: v1.4.1](https://img.shields.io/badge/AppVersion-v1.4.1-informational?style=flat-square)
+![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![Version: 0.9.1](https://img.shields.io/badge/Version-0.9.1-informational?style=flat-square) ![AppVersion: v1.4.2](https://img.shields.io/badge/AppVersion-v1.4.2-informational?style=flat-square)
 
 Helm chart for deploying [Grafana Alloy][] to Kubernetes.
 

diff --git a/...ons/helm/tests/additional-serviceaccount-label/alloy/templates/controllers/daemonset.yaml b/...ons/helm/tests/additional-serviceaccount-label/alloy/templates/controllers/daemonset.yaml
@@ -27,7 +27,7 @@ spec:
       serviceAccountName: alloy
       containers:
         - name: alloy
-          image: docker.io/grafana/alloy:v1.4.1
+          image: docker.io/grafana/alloy:v1.4.2
           imagePullPolicy: IfNotPresent
           args:
             - run

diff --git a/operations/helm/tests/clustering/alloy/templates/controllers/statefulset.yaml b/operations/helm/tests/clustering/alloy/templates/controllers/statefulset.yaml
@@ -30,7 +30,7 @@ spec:
       serviceAccountName: alloy
       containers:
         - name: alloy
-          image: docker.io/grafana/alloy:v1.4.1
+          image: docker.io/grafana/alloy:v1.4.2
           imagePullPolicy: IfNotPresent
           args:
             - run

diff --git a/...sts/controller-deployment-pdb-max-unavailable/alloy/templates/controllers/deployment.yaml b/...sts/controller-deployment-pdb-max-unavailable/alloy/templates/controllers/deployment.yaml
@@ -28,7 +28,7 @@ spec:
       serviceAccountName: alloy
       containers:
         - name: alloy
-          image: docker.io/grafana/alloy:v1.4.1
+          image: docker.io/grafana/alloy:v1.4.2
           imagePullPolicy: IfNotPresent
           args:
             - run

diff --git a/...tests/controller-deployment-pdb-min-available/alloy/templates/controllers/deployment.yaml b/...tests/controller-deployment-pdb-min-available/alloy/templates/controllers/deployment.yaml
@@ -28,7 +28,7 @@ spec:
       serviceAccountName: alloy
       containers:
         - name: alloy
-          image: docker.io/grafana/alloy:v1.4.1
+          image: docker.io/grafana/alloy:v1.4.2
           imagePullPolicy: IfNotPresent
           args:
             - run

diff --git a/...s/controller-statefulset-pdb-max-unavailable/alloy/templates/controllers/statefulset.yaml b/...s/controller-statefulset-pdb-max-unavailable/alloy/templates/controllers/statefulset.yaml
@@ -30,7 +30,7 @@ spec:
       serviceAccountName: alloy
       containers:
         - name: alloy
-          image: docker.io/grafana/alloy:v1.4.1
+          image: docker.io/grafana/alloy:v1.4.2
           imagePullPolicy: IfNotPresent
           args:
             - run

diff --git a/...sts/controller-statefulset-pdb-min-available/alloy/templates/controllers/statefulset.yaml b/...sts/controller-statefulset-pdb-min-available/alloy/templates/controllers/statefulset.yaml
@@ -30,7 +30,7 @@ spec:
       serviceAccountName: alloy
       containers:
         - name: alloy
-          image: docker.io/grafana/alloy:v1.4.1
+          image: docker.io/grafana/alloy:v1.4.2
           imagePullPolicy: IfNotPresent
           args:
             - run

diff --git a/operations/helm/tests/controller-volumes-extra/alloy/templates/controllers/daemonset.yaml b/operations/helm/tests/controller-volumes-extra/alloy/templates/controllers/daemonset.yaml
@@ -27,7 +27,7 @@ spec:
       serviceAccountName: alloy
       containers:
         - name: alloy
-          image: docker.io/grafana/alloy:v1.4.1
+          image: docker.io/grafana/alloy:v1.4.2
           imagePullPolicy: IfNotPresent
           args:
             - run

diff --git a/...ations/helm/tests/create-daemonset-hostnetwork/alloy/templates/controllers/daemonset.yaml b/...ations/helm/tests/create-daemonset-hostnetwork/alloy/templates/controllers/daemonset.yaml
@@ -27,7 +27,7 @@ spec:
       serviceAccountName: alloy
       containers:
         - name: alloy
-          image: docker.io/grafana/alloy:v1.4.1
+          image: docker.io/grafana/alloy:v1.4.2
           imagePullPolicy: IfNotPresent
           args:
             - run

diff --git a/operations/helm/tests/create-daemonset/alloy/templates/controllers/daemonset.yaml b/operations/helm/tests/create-daemonset/alloy/templates/controllers/daemonset.yaml
@@ -27,7 +27,7 @@ spec:
       serviceAccountName: alloy
       containers:
         - name: alloy
-          image: docker.io/grafana/alloy:v1.4.1
+          image: docker.io/grafana/alloy:v1.4.2
           imagePullPolicy: IfNotPresent
           args:
             - run

diff --git a/...ions/helm/tests/create-deployment-autoscaling/alloy/templates/controllers/deployment.yaml b/...ions/helm/tests/create-deployment-autoscaling/alloy/templates/controllers/deployment.yaml
@@ -27,7 +27,7 @@ spec:
       serviceAccountName: alloy
       containers:
         - name: alloy
-          image: docker.io/grafana/alloy:v1.4.1
+          image: docker.io/grafana/alloy:v1.4.2
           imagePullPolicy: IfNotPresent
           args:
             - run

diff --git a/operations/helm/tests/create-deployment/alloy/templates/controllers/deployment.yaml b/operations/helm/tests/create-deployment/alloy/templates/controllers/deployment.yaml
@@ -28,7 +28,7 @@ spec:
       serviceAccountName: alloy
       containers:
         - name: alloy
-          image: docker.io/grafana/alloy:v1.4.1
+          image: docker.io/grafana/alloy:v1.4.2
           imagePullPolicy: IfNotPresent
           args:
             - run

diff --git a/...ns/helm/tests/create-statefulset-autoscaling/alloy/templates/controllers/statefulset.yaml b/...ns/helm/tests/create-statefulset-autoscaling/alloy/templates/controllers/statefulset.yaml
@@ -29,7 +29,7 @@ spec:
       serviceAccountName: alloy
       containers:
         - name: alloy
-          image: docker.io/grafana/alloy:v1.4.1
+          image: docker.io/grafana/alloy:v1.4.2
           imagePullPolicy: IfNotPresent
           args:
             - run

diff --git a/operations/helm/tests/create-statefulset/alloy/templates/controllers/statefulset.yaml b/operations/helm/tests/create-statefulset/alloy/templates/controllers/statefulset.yaml
@@ -30,7 +30,7 @@ spec:
       serviceAccountName: alloy
       containers:
         - name: alloy
-          image: docker.io/grafana/alloy:v1.4.1
+          image: docker.io/grafana/alloy:v1.4.2
           imagePullPolicy: IfNotPresent
           args:
             - run

diff --git a/operations/helm/tests/custom-config/alloy/templates/controllers/daemonset.yaml b/operations/helm/tests/custom-config/alloy/templates/controllers/daemonset.yaml
@@ -27,7 +27,7 @@ spec:
       serviceAccountName: alloy
       containers:
         - name: alloy
-          image: docker.io/grafana/alloy:v1.4.1
+          image: docker.io/grafana/alloy:v1.4.2
           imagePullPolicy: IfNotPresent
           args:
             - run

diff --git a/operations/helm/tests/default-values/alloy/templates/controllers/daemonset.yaml b/operations/helm/tests/default-values/alloy/templates/controllers/daemonset.yaml
@@ -27,7 +27,7 @@ spec:
       serviceAccountName: alloy
       containers:
         - name: alloy
-          image: docker.io/grafana/alloy:v1.4.1
+          image: docker.io/grafana/alloy:v1.4.2
           imagePullPolicy: IfNotPresent
           args:
             - run

diff --git a/operations/helm/tests/enable-servicemonitor-tls/alloy/templates/controllers/daemonset.yaml b/operations/helm/tests/enable-servicemonitor-tls/alloy/templates/controllers/daemonset.yaml
@@ -27,7 +27,7 @@ spec:
       serviceAccountName: alloy
       containers:
         - name: alloy
-          image: docker.io/grafana/alloy:v1.4.1
+          image: docker.io/grafana/alloy:v1.4.2
           imagePullPolicy: IfNotPresent
           args:
             - run

diff --git a/operations/helm/tests/enable-servicemonitor/alloy/templates/controllers/daemonset.yaml b/operations/helm/tests/enable-servicemonitor/alloy/templates/controllers/daemonset.yaml
@@ -27,7 +27,7 @@ spec:
       serviceAccountName: alloy
       containers:
         - name: alloy
-          image: docker.io/grafana/alloy:v1.4.1
+          image: docker.io/grafana/alloy:v1.4.2
           imagePullPolicy: IfNotPresent
           args:
             - run

diff --git a/operations/helm/tests/envFrom/alloy/templates/controllers/daemonset.yaml b/operations/helm/tests/envFrom/alloy/templates/controllers/daemonset.yaml
@@ -27,7 +27,7 @@ spec:
       serviceAccountName: alloy
       containers:
         - name: alloy
-          image: docker.io/grafana/alloy:v1.4.1
+          image: docker.io/grafana/alloy:v1.4.2
           imagePullPolicy: IfNotPresent
           args:
             - run

diff --git a/operations/helm/tests/existing-config/alloy/templates/controllers/daemonset.yaml b/operations/helm/tests/existing-config/alloy/templates/controllers/daemonset.yaml
@@ -27,7 +27,7 @@ spec:
       serviceAccountName: alloy
       containers:
         - name: alloy
-          image: docker.io/grafana/alloy:v1.4.1
+          image: docker.io/grafana/alloy:v1.4.2
           imagePullPolicy: IfNotPresent
           args:
             - run

diff --git a/operations/helm/tests/extra-env/alloy/templates/controllers/daemonset.yaml b/operations/helm/tests/extra-env/alloy/templates/controllers/daemonset.yaml
@@ -27,7 +27,7 @@ spec:
       serviceAccountName: alloy
       containers:
         - name: alloy
-          image: docker.io/grafana/alloy:v1.4.1
+          image: docker.io/grafana/alloy:v1.4.2
           imagePullPolicy: IfNotPresent
           args:
             - run

diff --git a/operations/helm/tests/extra-ports/alloy/templates/controllers/daemonset.yaml b/operations/helm/tests/extra-ports/alloy/templates/controllers/daemonset.yaml
@@ -27,7 +27,7 @@ spec:
       serviceAccountName: alloy
       containers:
         - name: alloy
-          image: docker.io/grafana/alloy:v1.4.1
+          image: docker.io/grafana/alloy:v1.4.2
           imagePullPolicy: IfNotPresent
           args:
             - run

diff --git a/operations/helm/tests/faro-ingress/alloy/templates/controllers/daemonset.yaml b/operations/helm/tests/faro-ingress/alloy/templates/controllers/daemonset.yaml
@@ -27,7 +27,7 @@ spec:
       serviceAccountName: alloy
       containers:
         - name: alloy
-          image: docker.io/grafana/alloy:v1.4.1
+          image: docker.io/grafana/alloy:v1.4.2
           imagePullPolicy: IfNotPresent
           args:
             - run

diff --git a/operations/helm/tests/global-image-pullsecrets/alloy/templates/controllers/daemonset.yaml b/operations/helm/tests/global-image-pullsecrets/alloy/templates/controllers/daemonset.yaml
@@ -32,7 +32,7 @@ spec:
         - name: global-cred
       containers:
         - name: alloy
-          image: docker.io/grafana/alloy:v1.4.1
+          image: docker.io/grafana/alloy:v1.4.2
           imagePullPolicy: IfNotPresent
           args:
             - run

diff --git a/operations/helm/tests/global-image-registry/alloy/templates/controllers/daemonset.yaml b/operations/helm/tests/global-image-registry/alloy/templates/controllers/daemonset.yaml
@@ -27,7 +27,7 @@ spec:
       serviceAccountName: alloy
       containers:
         - name: alloy
-          image: quay.io/grafana/alloy:v1.4.1
+          image: quay.io/grafana/alloy:v1.4.2
           imagePullPolicy: IfNotPresent
           args:
             - run

diff --git a/operations/helm/tests/initcontainers/alloy/templates/controllers/daemonset.yaml b/operations/helm/tests/initcontainers/alloy/templates/controllers/daemonset.yaml
@@ -45,7 +45,7 @@ spec:
             name: geoip
       containers:
         - name: alloy
-          image: docker.io/grafana/alloy:v1.4.1
+          image: docker.io/grafana/alloy:v1.4.2
           imagePullPolicy: IfNotPresent
           args:
             - run

diff --git a/operations/helm/tests/lifecycle-hooks/alloy/templates/controllers/deployment.yaml b/operations/helm/tests/lifecycle-hooks/alloy/templates/controllers/deployment.yaml
@@ -28,7 +28,7 @@ spec:
       serviceAccountName: alloy
       containers:
         - name: alloy
-          image: docker.io/grafana/alloy:v1.4.1
+          image: docker.io/grafana/alloy:v1.4.2
           imagePullPolicy: IfNotPresent
           args:
             - run

diff --git a/operations/helm/tests/local-image-pullsecrets/alloy/templates/controllers/daemonset.yaml b/operations/helm/tests/local-image-pullsecrets/alloy/templates/controllers/daemonset.yaml
@@ -29,7 +29,7 @@ spec:
         - name: local-cred
       containers:
         - name: alloy
-          image: docker.io/grafana/alloy:v1.4.1
+          image: docker.io/grafana/alloy:v1.4.2
           imagePullPolicy: IfNotPresent
           args:
             - run

diff --git a/operations/helm/tests/local-image-registry/alloy/templates/controllers/daemonset.yaml b/operations/helm/tests/local-image-registry/alloy/templates/controllers/daemonset.yaml
@@ -27,7 +27,7 @@ spec:
       serviceAccountName: alloy
       containers:
         - name: alloy
-          image: quay.io/grafana/alloy:v1.4.1
+          image: quay.io/grafana/alloy:v1.4.2
           imagePullPolicy: IfNotPresent
           args:
             - run

diff --git a/...tions/helm/tests/nodeselectors-and-tolerations/alloy/templates/controllers/daemonset.yaml b/...tions/helm/tests/nodeselectors-and-tolerations/alloy/templates/controllers/daemonset.yaml
@@ -27,7 +27,7 @@ spec:
       serviceAccountName: alloy
       containers:
         - name: alloy
-          image: docker.io/grafana/alloy:v1.4.1
+          image: docker.io/grafana/alloy:v1.4.2
           imagePullPolicy: IfNotPresent
           args:
             - run

diff --git a/operations/helm/tests/nonroot/alloy/templates/controllers/daemonset.yaml b/operations/helm/tests/nonroot/alloy/templates/controllers/daemonset.yaml
@@ -29,7 +29,7 @@ spec:
       serviceAccountName: alloy
       containers:
         - name: alloy
-          image: docker.io/grafana/alloy:v1.4.1
+          image: docker.io/grafana/alloy:v1.4.2
           imagePullPolicy: IfNotPresent
           args:
             - run

diff --git a/operations/helm/tests/pod_annotations/alloy/templates/controllers/daemonset.yaml b/operations/helm/tests/pod_annotations/alloy/templates/controllers/daemonset.yaml
@@ -28,7 +28,7 @@ spec:
       serviceAccountName: alloy
       containers:
         - name: alloy
-          image: docker.io/grafana/alloy:v1.4.1
+          image: docker.io/grafana/alloy:v1.4.2
           imagePullPolicy: IfNotPresent
           args:
             - run

diff --git a/operations/helm/tests/sidecars/alloy/templates/controllers/daemonset.yaml b/operations/helm/tests/sidecars/alloy/templates/controllers/daemonset.yaml
@@ -27,7 +27,7 @@ spec:
       serviceAccountName: alloy
       containers:
         - name: alloy
-          image: docker.io/grafana/alloy:v1.4.1
+          image: docker.io/grafana/alloy:v1.4.2
           imagePullPolicy: IfNotPresent
           args:
             - run

diff --git a/operations/helm/tests/termination-grace-period/alloy/templates/controllers/deployment.yaml b/operations/helm/tests/termination-grace-period/alloy/templates/controllers/deployment.yaml
@@ -28,7 +28,7 @@ spec:
       serviceAccountName: alloy
       containers:
         - name: alloy
-          image: docker.io/grafana/alloy:v1.4.1
+          image: docker.io/grafana/alloy:v1.4.2
           imagePullPolicy: IfNotPresent
           args:
             - run

diff --git a/operations/helm/tests/topologyspreadconstraints/alloy/templates/controllers/deployment.yaml b/operations/helm/tests/topologyspreadconstraints/alloy/templates/controllers/deployment.yaml
@@ -28,7 +28,7 @@ spec:
       serviceAccountName: alloy
       containers:
         - name: alloy
-          image: docker.io/grafana/alloy:v1.4.1
+          image: docker.io/grafana/alloy:v1.4.2
           imagePullPolicy: IfNotPresent
           args:
             - run