Skip to content

Commit 3d028ff

Browse files
authored
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
1 parent 38786dc commit 3d028ff

9 files changed

+2052
-125
lines changed

Documentation/MultiTenancyLogging/AzureMonitorContainers.json Documentation/MultiTenancyLogging/AdvancedMode/AzureMonitorContainers_AdvancedMode_Grafana.json

+415-88
Large diffs are not rendered by default.

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

+3-21
Original file line numberDiff line numberDiff line change
@@ -24,27 +24,9 @@ data:
2424
- source_labels: [__meta_kubernetes_pod_node_name]
2525
action: replace
2626
target_label: node
27-
- job_name: ama-logs-multitenancy
28-
kubernetes_sd_configs:
29-
- role: pod
30-
relabel_configs:
31-
- source_labels: [__meta_kubernetes_pod_controller_kind]
32-
action: keep
33-
regex: 'ReplicaSet'
34-
- source_labels: [__meta_kubernetes_pod_controller_name]
35-
regex: '^ama-logs-multitenancy(-.*)?$'
36-
action: keep
37-
- source_labels: [__address__]
38-
action: replace
39-
target_label: __address__
40-
regex: (.+?)(\:\d+)?
41-
replacement: $1:9102
42-
- source_labels: [__meta_kubernetes_pod_name]
43-
action: replace
44-
target_label: instance
4527
- source_labels: [__meta_kubernetes_pod_node_name]
46-
action: replace
47-
target_label: node
28+
action: keep
29+
regex: $NODE_NAME
4830
metadata:
49-
name: ama-metrics-prometheus-config
31+
name: ama-metrics-prometheus-config-node
5032
namespace: kube-system
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
kind: ConfigMap
2+
apiVersion: v1
3+
data:
4+
prometheus-config: |-
5+
scrape_configs:
6+
- job_name: ama-logs-multitenancy
7+
kubernetes_sd_configs:
8+
- role: pod
9+
relabel_configs:
10+
- source_labels: [__meta_kubernetes_pod_controller_kind]
11+
action: keep
12+
regex: 'ReplicaSet'
13+
- source_labels: [__meta_kubernetes_pod_controller_name]
14+
regex: '^ama-logs-multitenancy(-.*)?$'
15+
action: keep
16+
- source_labels: [__address__]
17+
action: replace
18+
target_label: __address__
19+
regex: (.+?)(\:\d+)?
20+
replacement: $1:9102
21+
- source_labels: [__meta_kubernetes_pod_name]
22+
action: replace
23+
target_label: instance
24+
- source_labels: [__meta_kubernetes_pod_node_name]
25+
action: replace
26+
target_label: node
27+
metadata:
28+
name: ama-metrics-prometheus-config
29+
namespace: kube-system

0 commit comments

Comments
 (0)