Merge pull request #139 from qclaogui/alloy-1.1.1

bump to grafana/alloy:v1.1.1
qclaogui · May 31, 2024 · b27b394 · b27b394
2 parents f7cddb5 + a75d612
commit b27b394
Show file tree

Hide file tree

Showing 23 changed files with 535 additions and 509 deletions.
diff --git a/Makefile b/Makefile
@@ -34,7 +34,7 @@ ALLOY_CONFIG_FILES_IN_DOCKER = $(subst ./, /data/, $(ALLOY_CONFIG_FILES))
 fmt: ## Uses Grafana Alloy to fmt the config
 	@for c in $(ALLOY_CONFIG_FILES_IN_DOCKER); do \
 		echo "$$c"; \
-		docker run --rm --volume "$(shell pwd):/data" -u $(shell id -u) grafana/alloy:v1.0.0 fmt -w $$c ; \
+		docker run --rm --volume "$(shell pwd):/data" -u $(shell id -u) grafana/alloy:v1.1.1 fmt -w $$c ; \
 	done
 
 ##@ Docker compose

diff --git a/docker-compose/common/compose-include/alloy.yaml b/docker-compose/common/compose-include/alloy.yaml
@@ -1,7 +1,7 @@
 services:
   alloy:
     depends_on: { gateway: { condition: service_healthy } }
-    image: ${ALLOY_IMAGE:-docker.io/grafana/alloy:v1.0.0}
+    image: ${ALLOY_IMAGE:-docker.io/grafana/alloy:v1.1.1}
     configs:
       - source: alloy_config_file
         target: /etc/alloy/config.alloy

diff --git a/docker-compose/common/config/.env b/docker-compose/common/config/.env
@@ -1,4 +1,4 @@
-ALLOY_IMAGE=grafana/alloy:v1.0.0
+ALLOY_IMAGE=grafana/alloy:v1.1.1
 AGENT_IMAGE=grafana/agent:v0.40.3
 LOKI_IMAGE=grafana/loki:3.0.0
 GRAFANA_IMAGE=grafana/grafana:11.0.0

diff --git a/kubernetes/common/alloy/kustomization.yaml b/kubernetes/common/alloy/kustomization.yaml
@@ -4,7 +4,7 @@ namespace: monitoring-system
 helmCharts:
 - name: alloy
   repo: https://grafana.github.io/helm-charts
-  version: 0.3.1
+  version: 0.3.2
   releaseName: alloy
   namespace: monitoring-system
   includeCRDs: false

diff --git a/kubernetes/common/alloy/manifests/k8s-all-in-one.yaml b/kubernetes/common/alloy/manifests/k8s-all-in-one.yaml
@@ -7,8 +7,8 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: alloy
     app.kubernetes.io/part-of: alloy
-    app.kubernetes.io/version: v1.1.0
-    helm.sh/chart: alloy-0.3.1
+    app.kubernetes.io/version: v1.1.1
+    helm.sh/chart: alloy-0.3.2
   name: alloy
   namespace: monitoring-system
 ---
@@ -21,8 +21,8 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: alloy
     app.kubernetes.io/part-of: alloy
-    app.kubernetes.io/version: v1.1.0
-    helm.sh/chart: alloy-0.3.1
+    app.kubernetes.io/version: v1.1.1
+    helm.sh/chart: alloy-0.3.2
   name: alloy
 rules:
 - apiGroups:
@@ -125,8 +125,8 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: alloy
     app.kubernetes.io/part-of: alloy
-    app.kubernetes.io/version: v1.1.0
-    helm.sh/chart: alloy-0.3.1
+    app.kubernetes.io/version: v1.1.1
+    helm.sh/chart: alloy-0.3.2
   name: alloy
 roleRef:
   apiGroup: rbac.authorization.k8s.io
@@ -4302,8 +4302,8 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: alloy
     app.kubernetes.io/part-of: alloy
-    app.kubernetes.io/version: v1.1.0
-    helm.sh/chart: alloy-0.3.1
+    app.kubernetes.io/version: v1.1.1
+    helm.sh/chart: alloy-0.3.2
   name: alloy
   namespace: monitoring-system
 spec:
@@ -4343,8 +4343,8 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: alloy
     app.kubernetes.io/part-of: alloy
-    app.kubernetes.io/version: v1.1.0
-    helm.sh/chart: alloy-0.3.1
+    app.kubernetes.io/version: v1.1.1
+    helm.sh/chart: alloy-0.3.2
   name: alloy-cluster
   namespace: monitoring-system
 spec:
@@ -4383,8 +4383,8 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: alloy
     app.kubernetes.io/part-of: alloy
-    app.kubernetes.io/version: v1.1.0
-    helm.sh/chart: alloy-0.3.1
+    app.kubernetes.io/version: v1.1.1
+    helm.sh/chart: alloy-0.3.2
   name: alloy
   namespace: monitoring-system
 spec:
@@ -4437,7 +4437,7 @@ spec:
         - secretRef:
             name: alloy-env
             optional: true
-        image: docker.io/grafana/alloy:v1.1.0
+        image: docker.io/grafana/alloy:v1.1.1
         imagePullPolicy: IfNotPresent
         name: alloy
         ports:
@@ -4508,7 +4508,7 @@ metadata:
   namespace: monitoring-system
 spec:
   groups:
-  - name: clustering
+  - name: alloy_clustering
     rules:
     - alert: ClusterNotConverging
       annotations:
@@ -4524,8 +4524,8 @@ spec:
           split brain state.
       expr: |
         sum without (state) (cluster_node_peers) !=
-        on (cluster, namespace) group_left
-        count by (cluster, namespace) (cluster_node_info)
+        on (cluster, namespace, job) group_left
+        count by (cluster, namespace, job) (cluster_node_info)
       for: 15m
     - alert: ClusterNodeUnhealthy
       annotations:
@@ -4551,7 +4551,7 @@ spec:
         message: Cluster nodes are not using the same configuration file.
       expr: |
         count without (sha256) (
-            max by (cluster, namespace, sha256) (alloy_config_hash and on(cluster, namespace) cluster_node_info)
+            max by (cluster, namespace, sha256, job) (alloy_config_hash and on(cluster, namespace) cluster_node_info)
         ) > 1
       for: 5m
   - name: alloy_controller
@@ -4568,17 +4568,19 @@ spec:
       expr: sum by (cluster, namespace) (alloy_component_controller_running_components{health_type!="healthy"})
         > 0
       for: 15m
-  - name: otelcol
+  - name: alloy_otelcol
     rules:
     - alert: OtelcolReceiverRefusedSpans
       annotations:
         message: The receiver could not push some spans to the pipeline.
-      expr: sum(rate(receiver_refused_spans_ratio_total{}[1m])) > 0
+      expr: sum by (cluster, namespace) (rate(receiver_refused_spans_ratio_total{}[1m]))
+        > 0
       for: 5m
     - alert: OtelcolExporterFailedSpans
       annotations:
         message: The exporter failed to send spans to their destination.
-      expr: sum(rate(exporter_send_failed_spans_ratio_total{}[1m])) > 0
+      expr: sum by (cluster, namespace) (rate(exporter_send_failed_spans_ratio_total{}[1m]))
+        > 0
       for: 5m
 ---
 apiVersion: monitoring.coreos.com/v1
@@ -4590,8 +4592,8 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: alloy
     app.kubernetes.io/part-of: alloy
-    app.kubernetes.io/version: v1.1.0
-    helm.sh/chart: alloy-0.3.1
+    app.kubernetes.io/version: v1.1.1
+    helm.sh/chart: alloy-0.3.2
   name: alloy
   namespace: monitoring-system
 spec:
@@ -4613,8 +4615,8 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: alloy
     app.kubernetes.io/part-of: alloy
-    app.kubernetes.io/version: v1.1.0
-    helm.sh/chart: alloy-0.3.1
+    app.kubernetes.io/version: v1.1.1
+    helm.sh/chart: alloy-0.3.2
   name: alloy
   namespace: monitoring-system
 spec: