improvements

Author: ganga1980

Documentation/MultiTenancyLogging/ama-metrics-prometheus-config-node.yaml

@@ -0,0 +1,32 @@
+kind: ConfigMap
+apiVersion: v1
+data:
+  prometheus-config: |-
+    scrape_configs:
+    - job_name: ama-logs-daemonset
+      kubernetes_sd_configs:
+        - role: pod
+      relabel_configs:
+        - source_labels: [__meta_kubernetes_pod_controller_kind]
+          action: keep
+          regex: 'DaemonSet'
+        - source_labels: [__meta_kubernetes_pod_controller_name]
+          regex: ^(ama-logs|ama-logs-windows)$
+          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
+        - source_labels: [__meta_kubernetes_pod_node_name]
+          action: keep
+          regex: $NODE_NAME
+metadata:
+  name: ama-metrics-prometheus-config-node
+  namespace: kube-system

Documentation/MultiTenancyLogging/ama-metrics-prometheus-config.yaml

@@ -3,27 +3,6 @@ apiVersion: v1
 data:
   prometheus-config: |-
     scrape_configs:
-    - job_name: ama-logs-daemonset
-      kubernetes_sd_configs:
-        - role: pod
-      relabel_configs:
-        - source_labels: [__meta_kubernetes_pod_controller_kind]
-          action: keep
-          regex: 'DaemonSet'
-        - source_labels: [__meta_kubernetes_pod_controller_name]
-          regex: ^(ama-logs|ama-logs-windows)$
-          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
     - job_name: ama-logs-multitenancy
       kubernetes_sd_configs:
         - role: pod

kubernetes/container-azm-ms-agentconfig.yaml

@@ -14,13 +14,14 @@ data:
     [log_collection_settings]
       ##  This feature in private preview and not ready for production use,please reach out us to try out this feature.
       #  [log_collection_settings.multi_tenancy]
-      #    # High log scale MUST be enabled to use this feature. Refer to https://aka.ms/cihsmode for more details on high log scale mode
+      ## High log scale MUST be enabled to use this feature. Refer to https://aka.ms/cihsmode for more details on high log scale mode
       #    enabled = true
       #    disable_fallback_ingestion = false # by default fallback ingestion to default container insights extension DCR is enabled
       ###   Below advanced settings MUST be provided when ama-logs-multitenancy service deployed through AKS Monitoring Addon
+      ###   Advanced mode recommened when the log scale more than the 50K logs/sec per node
       ##    advanced_mode_enabled = false # Default value is false
-      ##    namespaces = ["app-team-1","app-team-2"]
-      ##    namespace_settings = ["app-team-1:throttle_rate=2000","app-team-2:throttle_rate=5000"]
+      ##    namespaces = ["app-team-1","app-team-2"] # All namespaces MUST be provided when advanced_mode_enabled is set to true since there will be separate fluent-bit plugins for each namespace
+      ##    namespace_settings = ["app-team-1:throttle_rate=2000","app-team-2:throttle_rate=5000"] # optional settings for each namespace if the default settings are not sufficient
 
        [log_collection_settings.stdout]
           # In the absense of this configmap, default value for enabled is true