update mixin

Signed-off-by: Weifeng Wang <[email protected]>
qclaogui · Dec 1, 2023 · 5ba2489 · 5ba2489
1 parent b50f590
commit 5ba2489
Show file tree

Hide file tree

Showing 50 changed files with 200,051 additions and 200,079 deletions.
diff --git a/kubernetes/monolithic-mode/k8s-all-in-one.yaml b/kubernetes/monolithic-mode/k8s-all-in-one.yaml
@@ -792,21 +792,11 @@ metadata:
 type: Opaque
 ---
 apiVersion: v1
-data:
-  TRACES_ENDPOINT: dGVtcG8udHJhY2luZy1zeXN0ZW0uc3ZjLmNsdXN0ZXIubG9jYWw6NDMxNw==
-kind: Secret
-metadata:
-  name: agent-env
-  namespace: monitoring-system
-type: Opaque
----
-apiVersion: v1
 data:
   GF_FEATURE_TOGGLES_ENABLE: dHJhY2VxbEVkaXRvcixkYXNoZ3B0
   GF_LOG_LEVEL: d2Fybg==
-  GF_TRACING_OPENTELEMETRY_CUSTOM_ATTRIBUTES: Y2x1c3RlcjprM2QtazNzLWNvZGVsYWIsbmFtZXNwYWNlOm1vbml0b3Jpbmctc3lzdGVt
+  GF_TRACING_OPENTELEMETRY_CUSTOM_ATTRIBUTES: bmFtZXNwYWNlOm1vbml0b3Jpbmctc3lzdGVt
   GF_TRACING_OPENTELEMETRY_OTLP_ADDRESS: Z3JhZmFuYS1hZ2VudC5tb25pdG9yaW5nLXN5c3RlbTo0MzE3
-  NAMESPACE: bW9uaXRvcmluZy1zeXN0ZW0=
 kind: Secret
 metadata:
   name: grafana-env

diff --git a/kubernetes/monolithic-mode/kustomization.yaml b/kubernetes/monolithic-mode/kustomization.yaml
@@ -13,25 +13,15 @@ resources:
 - traces/tempo/k8s-all-in-one.yaml
 - grafana-datasources-all-in-one.yaml
 
-
 secretGenerator:
-- name: agent-env
-  namespace: monitoring-system
-  options:
-    disableNameSuffixHash: true
-  literals:
-  - TRACES_ENDPOINT=tempo.tracing-system.svc.cluster.local:4317
-
-# replace grafana-env
 - name: grafana-env
   namespace: monitoring-system
   options:
     disableNameSuffixHash: true
   literals:
-  - NAMESPACE=monitoring-system
   - GF_LOG_LEVEL=warn
   - GF_TRACING_OPENTELEMETRY_OTLP_ADDRESS=grafana-agent.monitoring-system:4317
-  - GF_TRACING_OPENTELEMETRY_CUSTOM_ATTRIBUTES=cluster:k3d-k3s-codelab,namespace:monitoring-system
+  - GF_TRACING_OPENTELEMETRY_CUSTOM_ATTRIBUTES=namespace:monitoring-system
   - GF_FEATURE_TOGGLES_ENABLE=traceqlEditor,dashgpt
 
 - name: loki-env