Gangams/multi tenancy private preview customer feedback implementation (

#1343) * add all namespaces support in DCR * handle fallback ingestion and all namespaces config * handle casing of all_k8s_namespaces * add telemetry * fix comment * improvements * rename grafana dashboard file * grafana updates * Grafana updates * dashboard updates * grafana updates
microsoft · Jan 31, 2025 · 3d028ff · 3d028ff
1 parent 38786dc
commit 3d028ff
Show file tree

Hide file tree

Showing 9 changed files with 2,052 additions and 125 deletions.
diff --git a/...enancyLogging/AzureMonitorContainers.json → ...nitorContainers_AdvancedMode_Grafana.json b/...enancyLogging/AzureMonitorContainers.json → ...nitorContainers_AdvancedMode_Grafana.json
diff --git a/...ogging/ama-metrics-prometheus-config.yaml → ...e/ama-metrics-prometheus-config-node.yaml b/...ogging/ama-metrics-prometheus-config.yaml → ...e/ama-metrics-prometheus-config-node.yaml
@@ -24,27 +24,9 @@ data:
         - source_labels: [__meta_kubernetes_pod_node_name]
           action: replace
           target_label: node
-    - job_name: ama-logs-multitenancy
-      kubernetes_sd_configs:
-        - role: pod
-      relabel_configs:
-        - source_labels: [__meta_kubernetes_pod_controller_kind]
-          action: keep
-          regex: 'ReplicaSet'
-        - source_labels: [__meta_kubernetes_pod_controller_name]
-          regex: '^ama-logs-multitenancy(-.*)?$'
-          action: keep
-        - source_labels: [__address__]
-          action: replace
-          target_label: __address__
-          regex: (.+?)(\:\d+)?
-          replacement: $1:9102
-        - source_labels: [__meta_kubernetes_pod_name]
-          action: replace
-          target_label: instance
         - source_labels: [__meta_kubernetes_pod_node_name]
-          action: replace
-          target_label: node
+          action: keep
+          regex: $NODE_NAME
 metadata:
-  name: ama-metrics-prometheus-config
+  name: ama-metrics-prometheus-config-node
   namespace: kube-system
diff --git a/Documentation/MultiTenancyLogging/AdvancedMode/ama-metrics-prometheus-config.yaml b/Documentation/MultiTenancyLogging/AdvancedMode/ama-metrics-prometheus-config.yaml
@@ -0,0 +1,29 @@
+kind: ConfigMap
+apiVersion: v1
+data:
+  prometheus-config: |-
+    scrape_configs:
+    - job_name: ama-logs-multitenancy
+      kubernetes_sd_configs:
+        - role: pod
+      relabel_configs:
+        - source_labels: [__meta_kubernetes_pod_controller_kind]
+          action: keep
+          regex: 'ReplicaSet'
+        - source_labels: [__meta_kubernetes_pod_controller_name]
+          regex: '^ama-logs-multitenancy(-.*)?$'
+          action: keep
+        - source_labels: [__address__]
+          action: replace
+          target_label: __address__
+          regex: (.+?)(\:\d+)?
+          replacement: $1:9102
+        - source_labels: [__meta_kubernetes_pod_name]
+          action: replace
+          target_label: instance
+        - source_labels: [__meta_kubernetes_pod_node_name]
+          action: replace
+          target_label: node
+metadata:
+  name: ama-metrics-prometheus-config
+  namespace: kube-system