[kubenertes] enabled log in traces

Signed-off-by: Weifeng Wang <[email protected]>
qclaogui · Apr 29, 2024 · e3f7af5 · e3f7af5
1 parent 4c4c86a
commit e3f7af5
Show file tree

Hide file tree

Showing 45 changed files with 2,018 additions and 1,618 deletions.
diff --git a/docker-compose/common/config/alloy/all-in-one.alloy b/docker-compose/common/config/alloy/all-in-one.alloy
@@ -1,5 +1,5 @@
 logging {
-	level  = coalesce(env("ALLOY_LOG_LEVEL"), "info")
+	level  = coalesce(env("ALLOY_LOG_LEVEL"), "warn")
 	format = "logfmt"
 }
 

diff --git a/docker-compose/common/config/alloy/logs.alloy b/docker-compose/common/config/alloy/logs.alloy
@@ -1,5 +1,5 @@
 logging {
-	level  = coalesce(env("ALLOY_LOG_LEVEL"), "info")
+	level  = coalesce(env("ALLOY_LOG_LEVEL"), "warn")
 	format = "logfmt"
 }
 

diff --git a/docker-compose/common/config/alloy/metrics.alloy b/docker-compose/common/config/alloy/metrics.alloy
@@ -1,5 +1,5 @@
 logging {
-	level  = coalesce(env("ALLOY_LOG_LEVEL"), "info")
+	level  = coalesce(env("ALLOY_LOG_LEVEL"), "warn")
 	format = "logfmt"
 }
 

diff --git a/docker-compose/common/config/alloy/profiles.alloy b/docker-compose/common/config/alloy/profiles.alloy
@@ -1,5 +1,5 @@
 logging {
-	level  = coalesce(env("ALLOY_LOG_LEVEL"), "info")
+	level  = coalesce(env("ALLOY_LOG_LEVEL"), "warn")
 	format = "logfmt"
 }
 

diff --git a/docker-compose/common/config/alloy/traces.alloy b/docker-compose/common/config/alloy/traces.alloy
@@ -1,5 +1,5 @@
 logging {
-	level  = coalesce(env("ALLOY_LOG_LEVEL"), "info")
+	level  = coalesce(env("ALLOY_LOG_LEVEL"), "warn")
 	format = "logfmt"
 }
 

diff --git a/kubernetes/common/alloy/configs/config.alloy b/kubernetes/common/alloy/configs/config.alloy
@@ -1,4 +1,4 @@
 logging {
-	level  = coalesce(env("ALLOY_LOG_LEVEL"), "info")
+	level  = coalesce(env("ALLOY_LOG_LEVEL"), "warn")
 	format = "logfmt"
 }
diff --git a/kubernetes/common/alloy/kustomization.yaml b/kubernetes/common/alloy/kustomization.yaml
@@ -13,6 +13,7 @@ helmCharts:
   valuesFile: values-k3d-k3s.yaml
 
 resources:
+- configs/kubernetes/integrations
 - ../../../monitoring-mixins/alloy-mixin/deploy
 
 configMapGenerator:
@@ -51,8 +52,3 @@ configMapGenerator:
   - configs/kubernetes/jobs/kube-state-metrics.alloy
   - configs/kubernetes/jobs/kubelet.alloy
   - configs/kubernetes/jobs/node-exporter.alloy
-
-secretGenerator:
-- name: alloy-env
-  literals:
-  - ALLOY_LOG_LEVEL=warn
diff --git a/kubernetes/common/alloy/manifests/k8s-all-in-one.yaml b/kubernetes/common/alloy/manifests/k8s-all-in-one.yaml
diff --git a/kubernetes/common/alloy/values-k3d-k3s.yaml b/kubernetes/common/alloy/values-k3d-k3s.yaml
@@ -3,6 +3,8 @@ crds:
 configReloader:
   enabled: false
 alloy:
+  securityContext:
+    privileged: true
   enableReporting: false
   configMap:
     create: false

diff --git a/kubernetes/microservices-mode/logs/k8s-all-in-one.yaml b/kubernetes/microservices-mode/logs/k8s-all-in-one.yaml
@@ -1183,7 +1183,7 @@ metadata:
 ---
 apiVersion: v1
 data:
-  config.alloy: "logging {\n\tlevel  = coalesce(env(\"ALLOY_LOG_LEVEL\"), \"info\")\n\tformat
+  config.alloy: "logging {\n\tlevel  = coalesce(env(\"ALLOY_LOG_LEVEL\"), \"warn\")\n\tformat
     = \"logfmt\"\n}\n\n/********************************************\n * Grafana LGTMP
     Stack Receiver Provider\n ********************************************/\nimport.git
     \"provider\" {\n\trepository     = \"https://github.com/qclaogui/codelab-monitoring.git\"\n\trevision
@@ -1216,7 +1216,7 @@ data:
     = [provider.self_hosted_stack.kubernetes.metrics_receiver]\n}\n"
 kind: ConfigMap
 metadata:
-  name: alloy-config-hfmb58htdm
+  name: alloy-config-2g5bc6hfmc
   namespace: monitoring-system
 ---
 apiVersion: v1
@@ -4631,15 +4631,6 @@ metadata:
 type: Opaque
 ---
 apiVersion: v1
-data:
-  ALLOY_LOG_LEVEL: d2Fybg==
-kind: Secret
-metadata:
-  name: alloy-env-f7k229g955
-  namespace: monitoring-system
-type: Opaque
----
-apiVersion: v1
 data:
   instance-address: bWVtY2FjaGVkLm1lbWNhY2hlZC1zeXN0ZW0uc3ZjLmNsdXN0ZXIubG9jYWw6MTEyMTE=
   instance-name: cHJpbWFyeQ==
@@ -6508,7 +6499,7 @@ spec:
               fieldPath: spec.nodeName
         envFrom:
         - secretRef:
-            name: alloy-env-f7k229g955
+            name: alloy-env
             optional: true
         image: docker.io/grafana/alloy:v1.0.0
         imagePullPolicy: IfNotPresent
@@ -6535,6 +6526,8 @@ spec:
             scheme: HTTP
           initialDelaySeconds: 10
           timeoutSeconds: 1
+        securityContext:
+          privileged: true
         volumeMounts:
         - mountPath: /etc/alloy
           name: config
@@ -6554,7 +6547,7 @@ spec:
       serviceAccountName: alloy
       volumes:
       - configMap:
-          name: alloy-config-hfmb58htdm
+          name: alloy-config-2g5bc6hfmc
         name: config
       - configMap:
           name: alloy-modules-kubernetes-metrics-db96446m8f

diff --git a/kubernetes/microservices-mode/logs/kustomization.yaml b/kubernetes/microservices-mode/logs/kustomization.yaml
@@ -9,7 +9,6 @@ kind: Kustomization
 
 resources:
 - ../../common/alloy
-- ../../common/alloy/configs/kubernetes/integrations
 - loki
 
 # optional

diff --git a/kubernetes/microservices-mode/logs/logs.alloy b/kubernetes/microservices-mode/logs/logs.alloy
@@ -1,5 +1,5 @@
 logging {
-	level  = coalesce(env("ALLOY_LOG_LEVEL"), "info")
+	level  = coalesce(env("ALLOY_LOG_LEVEL"), "warn")
 	format = "logfmt"
 }
 

diff --git a/kubernetes/microservices-mode/metrics/k8s-all-in-one.yaml b/kubernetes/microservices-mode/metrics/k8s-all-in-one.yaml
@@ -1009,7 +1009,7 @@ metadata:
 ---
 apiVersion: v1
 data:
-  config.alloy: "logging {\n\tlevel  = coalesce(env(\"ALLOY_LOG_LEVEL\"), \"info\")\n\tformat
+  config.alloy: "logging {\n\tlevel  = coalesce(env(\"ALLOY_LOG_LEVEL\"), \"warn\")\n\tformat
     = \"logfmt\"\n}\n\n/********************************************\n * Grafana LGTMP
     Stack Receiver Provider\n ********************************************/\nimport.git
     \"provider\" {\n\trepository     = \"https://github.com/qclaogui/codelab-monitoring.git\"\n\trevision
@@ -1033,7 +1033,7 @@ data:
     = [provider.self_hosted_stack.kubernetes.metrics_receiver]\n}\n"
 kind: ConfigMap
 metadata:
-  name: alloy-config-5fh6g2bbbg
+  name: alloy-config-764m96t48b
   namespace: monitoring-system
 ---
 apiVersion: v1
@@ -4513,15 +4513,6 @@ metadata:
   namespace: monitoring-system
 ---
 apiVersion: v1
-data:
-  ALLOY_LOG_LEVEL: d2Fybg==
-kind: Secret
-metadata:
-  name: alloy-env-f7k229g955
-  namespace: monitoring-system
-type: Opaque
----
-apiVersion: v1
 data:
   instance-address: bWVtY2FjaGVkLm1lbWNhY2hlZC1zeXN0ZW0uc3ZjLmNsdXN0ZXIubG9jYWw6MTEyMTE=
   instance-name: cHJpbWFyeQ==
@@ -5885,7 +5876,7 @@ spec:
               fieldPath: spec.nodeName
         envFrom:
         - secretRef:
-            name: alloy-env-f7k229g955
+            name: alloy-env
             optional: true
         image: docker.io/grafana/alloy:v1.0.0
         imagePullPolicy: IfNotPresent
@@ -5912,6 +5903,8 @@ spec:
             scheme: HTTP
           initialDelaySeconds: 10
           timeoutSeconds: 1
+        securityContext:
+          privileged: true
         volumeMounts:
         - mountPath: /etc/alloy
           name: config
@@ -5931,7 +5924,7 @@ spec:
       serviceAccountName: alloy
       volumes:
       - configMap:
-          name: alloy-config-5fh6g2bbbg
+          name: alloy-config-764m96t48b
         name: config
       - configMap:
           name: alloy-modules-kubernetes-metrics-db96446m8f

diff --git a/kubernetes/microservices-mode/metrics/kustomization.yaml b/kubernetes/microservices-mode/metrics/kustomization.yaml
@@ -9,7 +9,6 @@ kind: Kustomization
 
 resources:
 - ../../common/alloy
-- ../../common/alloy/configs/kubernetes/integrations
 - mimir-distributed
 
 images:

diff --git a/kubernetes/microservices-mode/metrics/metrics.alloy b/kubernetes/microservices-mode/metrics/metrics.alloy
@@ -1,5 +1,5 @@
 logging {
-	level  = coalesce(env("ALLOY_LOG_LEVEL"), "info")
+	level  = coalesce(env("ALLOY_LOG_LEVEL"), "warn")
 	format = "logfmt"
 }
 

diff --git a/kubernetes/microservices-mode/profiles/k8s-all-in-one.yaml b/kubernetes/microservices-mode/profiles/k8s-all-in-one.yaml
@@ -1069,7 +1069,7 @@ metadata:
 ---
 apiVersion: v1
 data:
-  config.alloy: "logging {\n\tlevel  = coalesce(env(\"ALLOY_LOG_LEVEL\"), \"info\")\n\tformat
+  config.alloy: "logging {\n\tlevel  = coalesce(env(\"ALLOY_LOG_LEVEL\"), \"warn\")\n\tformat
     = \"logfmt\"\n}\n\n/********************************************\n * Grafana LGTMP
     Stack Receiver Provider\n ********************************************/\nimport.git
     \"provider\" {\n\trepository     = \"https://github.com/qclaogui/codelab-monitoring.git\"\n\trevision
@@ -1099,7 +1099,7 @@ data:
     = [provider.self_hosted_stack.kubernetes.metrics_receiver]\n}\n"
 kind: ConfigMap
 metadata:
-  name: alloy-config-m9k4kcgmdc
+  name: alloy-config-6h7tb697c9
   namespace: monitoring-system
 ---
 apiVersion: v1
@@ -4554,15 +4554,6 @@ metadata:
   namespace: profiles-system
 ---
 apiVersion: v1
-data:
-  ALLOY_LOG_LEVEL: d2Fybg==
-kind: Secret
-metadata:
-  name: alloy-env-f7k229g955
-  namespace: monitoring-system
-type: Opaque
----
-apiVersion: v1
 data:
   instance-address: bWVtY2FjaGVkLm1lbWNhY2hlZC1zeXN0ZW0uc3ZjLmNsdXN0ZXIubG9jYWw6MTEyMTE=
   instance-name: cHJpbWFyeQ==
@@ -5622,7 +5613,7 @@ spec:
               fieldPath: spec.nodeName
         envFrom:
         - secretRef:
-            name: alloy-env-f7k229g955
+            name: alloy-env
             optional: true
         image: docker.io/grafana/alloy:v1.0.0
         imagePullPolicy: IfNotPresent
@@ -5649,6 +5640,8 @@ spec:
             scheme: HTTP
           initialDelaySeconds: 10
           timeoutSeconds: 1
+        securityContext:
+          privileged: true
         volumeMounts:
         - mountPath: /etc/alloy
           name: config
@@ -5668,7 +5661,7 @@ spec:
       serviceAccountName: alloy
       volumes:
       - configMap:
-          name: alloy-config-m9k4kcgmdc
+          name: alloy-config-6h7tb697c9
         name: config
       - configMap:
           name: alloy-modules-kubernetes-metrics-db96446m8f

diff --git a/kubernetes/microservices-mode/profiles/kustomization.yaml b/kubernetes/microservices-mode/profiles/kustomization.yaml
@@ -9,7 +9,6 @@ kind: Kustomization
 
 resources:
 - ../../common/alloy
-- ../../common/alloy/configs/kubernetes/integrations
 - pyroscope
 
 # optional

diff --git a/kubernetes/microservices-mode/profiles/profiles.alloy b/kubernetes/microservices-mode/profiles/profiles.alloy
@@ -1,5 +1,5 @@
 logging {
-	level  = coalesce(env("ALLOY_LOG_LEVEL"), "info")
+	level  = coalesce(env("ALLOY_LOG_LEVEL"), "warn")
 	format = "logfmt"
 }