Use stage.cri for cri-o container runtimes (#496)

Signed-off-by: Pete Wall <pete.wall@grafana.com>
grafana · Apr 30, 2024 · ca161f3 · ca161f3
1 parent 2986a2f
commit ca161f3
Show file tree

Hide file tree

Showing 62 changed files with 1,755 additions and 61 deletions.
diff --git a/charts/k8s-monitoring/templates/alloy_config/_pod_logs_discovery.alloy.txt b/charts/k8s-monitoring/templates/alloy_config/_pod_logs_discovery.alloy.txt
@@ -55,7 +55,7 @@ discovery.relabel "pod_logs" {
   rule {
     action = "replace"
     source_labels = ["__meta_kubernetes_pod_container_id"]
-    regex = "^(\\w+):\\/\\/.+$"
+    regex = "^(\\S+):\\/\\/.+$"
     replacement = "$1"
     target_label = "tmp_container_runtime"
   }

diff --git a/charts/k8s-monitoring/templates/alloy_config/_pod_logs_processor.alloy.txt b/charts/k8s-monitoring/templates/alloy_config/_pod_logs_processor.alloy.txt
@@ -14,6 +14,20 @@ loki.process "pod_logs" {
     }
   }
 
+  stage.match {
+    selector = "{tmp_container_runtime=\"cri-o\"}"
+    // the cri processing stage extracts the following k/v pairs: log, stream, time, flags
+    stage.cri {}
+
+    // Set the extract flags and stream values as labels
+    stage.labels {
+      values = {
+        flags  = "",
+        stream  = "",
+      }
+    }
+  }
+
   // if the label tmp_container_runtime from above is docker parse using docker
   stage.match {
     selector = "{tmp_container_runtime=\"docker\"}"

diff --git a/examples/alloy-autoscaling-and-storage/logs.alloy b/examples/alloy-autoscaling-and-storage/logs.alloy
diff --git a/examples/alloy-autoscaling-and-storage/metrics.alloy b/examples/alloy-autoscaling-and-storage/metrics.alloy
diff --git a/examples/alloy-autoscaling-and-storage/output.yaml b/examples/alloy-autoscaling-and-storage/output.yaml
diff --git a/examples/control-plane-metrics/logs.alloy b/examples/control-plane-metrics/logs.alloy
diff --git a/examples/control-plane-metrics/metrics.alloy b/examples/control-plane-metrics/metrics.alloy
diff --git a/examples/control-plane-metrics/output.yaml b/examples/control-plane-metrics/output.yaml
diff --git a/examples/custom-config/logs.alloy b/examples/custom-config/logs.alloy
diff --git a/examples/custom-config/metrics.alloy b/examples/custom-config/metrics.alloy