WIP

Signed-off-by: Pete Wall <[email protected]>
grafana · Dec 10, 2024 · 3c67889 · 3c67889
1 parent 302b407
commit 3c67889
Show file tree

Hide file tree

Showing 15 changed files with 10 additions and 34 deletions.
diff --git a/charts/k8s-monitoring/Chart.lock b/charts/k8s-monitoring/Chart.lock
@@ -45,4 +45,4 @@ dependencies:
   repository: https://grafana.github.io/helm-charts
   version: 0.10.1
 digest: sha256:e2eab36a3b814d7ec09942c3fe46a5c76d606f7c3022628905c41fba7a47b405
-generated: "2024-12-09T19:06:04.597148-06:00"
+generated: "2024-12-09T20:10:53.818921-06:00"
diff --git a/charts/k8s-monitoring/charts/k8s-monitoring-feature-annotation-autodiscovery-1.0.0.tgz b/charts/k8s-monitoring/charts/k8s-monitoring-feature-annotation-autodiscovery-1.0.0.tgz
diff --git a/charts/k8s-monitoring/charts/k8s-monitoring-feature-application-observability-1.0.0.tgz b/charts/k8s-monitoring/charts/k8s-monitoring-feature-application-observability-1.0.0.tgz
diff --git a/charts/k8s-monitoring/charts/k8s-monitoring-feature-auto-instrumentation-1.0.0.tgz b/charts/k8s-monitoring/charts/k8s-monitoring-feature-auto-instrumentation-1.0.0.tgz
diff --git a/charts/k8s-monitoring/charts/k8s-monitoring-feature-cluster-events-1.0.0.tgz b/charts/k8s-monitoring/charts/k8s-monitoring-feature-cluster-events-1.0.0.tgz
diff --git a/charts/k8s-monitoring/charts/k8s-monitoring-feature-cluster-metrics-1.0.0.tgz b/charts/k8s-monitoring/charts/k8s-monitoring-feature-cluster-metrics-1.0.0.tgz
diff --git a/charts/k8s-monitoring/charts/k8s-monitoring-feature-integrations-1.0.0.tgz b/charts/k8s-monitoring/charts/k8s-monitoring-feature-integrations-1.0.0.tgz
diff --git a/charts/k8s-monitoring/charts/k8s-monitoring-feature-node-logs-1.0.0.tgz b/charts/k8s-monitoring/charts/k8s-monitoring-feature-node-logs-1.0.0.tgz
diff --git a/charts/k8s-monitoring/charts/k8s-monitoring-feature-pod-logs-1.0.0.tgz b/charts/k8s-monitoring/charts/k8s-monitoring-feature-pod-logs-1.0.0.tgz
diff --git a/charts/k8s-monitoring/charts/k8s-monitoring-feature-profiling-1.0.0.tgz b/charts/k8s-monitoring/charts/k8s-monitoring-feature-profiling-1.0.0.tgz
diff --git a/charts/k8s-monitoring/charts/k8s-monitoring-feature-prometheus-operator-objects-1.0.0.tgz b/charts/k8s-monitoring/charts/k8s-monitoring-feature-prometheus-operator-objects-1.0.0.tgz
diff --git a/charts/k8s-monitoring/tests/platform/otlp-gateway/.rendered/output.yaml b/charts/k8s-monitoring/tests/platform/otlp-gateway/.rendered/output.yaml
@@ -66,11 +66,6 @@ data:
         action = "upsert"
         value = "otlp-gateway-test"
       }
-      action {
-        key = "random"
-        action = "upsert"
-        value = sys.env("RANDOM_NUMBER")
-      }
       output {
         metrics = [otelcol.processor.transform.otlp_gateway.input]
         logs = [otelcol.processor.transform.otlp_gateway.input]
@@ -491,11 +486,6 @@ data:
         action = "upsert"
         value = "otlp-gateway-test"
       }
-      action {
-        key = "random"
-        action = "upsert"
-        value = sys.env("RANDOM_NUMBER")
-      }
       output {
         metrics = [otelcol.processor.transform.otlp_gateway.input]
         logs = [otelcol.processor.transform.otlp_gateway.input]
@@ -603,6 +593,9 @@ data:
           role = "pod"
           field = "spec.nodeName=" + env("HOSTNAME")
         }
+        namespaces {
+          names = ["default"]
+        }
       }
       
       discovery.relabel "filtered_pods_with_paths" {
@@ -623,6 +616,7 @@ data:
       
       loki.source.file "pod_logs" {
         targets    = local.file_match.pod_logs.targets
+        tail_from_end = true
         forward_to = [loki.process.pod_logs.receiver]
       }
       
@@ -1049,9 +1043,6 @@ spec:
               valueFrom:
                 fieldRef:
                   fieldPath: spec.nodeName
-          envFrom:
-            - configMapRef:
-                name: test-variables
           ports:
             - containerPort: 12345
               name: http-metrics
@@ -1172,9 +1163,6 @@ spec:
               valueFrom:
                 fieldRef:
                   fieldPath: spec.nodeName
-          envFrom:
-            - configMapRef:
-                name: test-variables
           ports:
             - containerPort: 12345
               name: http-metrics

diff --git a/...latform/otlp-gateway/deployments/Makefile → ...ring/tests/platform/otlp-gateway/Makefile b/...latform/otlp-gateway/deployments/Makefile → ...ring/tests/platform/otlp-gateway/Makefile
diff --git a/charts/k8s-monitoring/tests/platform/otlp-gateway/deployments/query-test.yaml b/charts/k8s-monitoring/tests/platform/otlp-gateway/deployments/query-test.yaml
@@ -35,9 +35,9 @@ spec:
           - configMapRef: {name: test-variables}
         queries:
           # Metrics are being delivered
-          - query: alloy_build_info{cluster="otlp-gateway-test", random="$RANDOM_NUMBER"}
+          - query: alloy_build_info{cluster="$CLUSTER"}
             type: promql
 
           # Logs are being delivered
-          - query: '{cluster="otlp-gateway-test", pod="k8s-monitoring-alloy-metrics-0", random="$RANDOM_NUMBER"}'
+          - query: count_over_time({cluster="$CLUSTER", pod=~".*alloy-metrics-0"}[1h])
             type: logql
diff --git a/charts/k8s-monitoring/tests/platform/otlp-gateway/values.yaml b/charts/k8s-monitoring/tests/platform/otlp-gateway/values.yaml
@@ -17,16 +17,12 @@ destinations:
     metrics: {enabled: true}
     logs: {enabled: true}
     traces: {enabled: true}
-    processors:
-      attributes:
-        actions:
-          - key: random
-            action: upsert
-            valueFrom: sys.env("RANDOM_NUMBER")
 
 podLogs:
   enabled: true
-  namespace: default
+  namespaces: [default]
+  volumeGatherSettings:
+    onlyGatherNewLogLines: true
 
 integrations:
   alloy:
@@ -35,14 +31,6 @@ integrations:
 
 alloy-metrics:
   enabled: true
-  alloy:
-    envFrom:
-      - configMapRef:
-          name: test-variables
 
 alloy-logs:
   enabled: true
-  alloy:
-    envFrom:
-      - configMapRef:
-          name: test-variables