Skip to content

Commit 86d8b57

Browse files
authored
Add support for KCM and KSH metrics (#289)
* Add kcm and ksh metrics scraping jobs * tflint updates
1 parent 0fe3950 commit 86d8b57

File tree

3 files changed

+48
-0
lines changed

3 files changed

+48
-0
lines changed

modules/eks-monitoring/add-ons/adot-operator/main.tf

+5
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,11 @@ resource "kubernetes_cluster_role_v1" "adot" {
176176
non_resource_urls = ["/metrics"]
177177
verbs = ["get"]
178178
}
179+
rule {
180+
api_groups = ["metrics.eks.amazonaws.com"]
181+
verbs = ["get"]
182+
resources = ["kcm/metrics", "ksh/metrics"]
183+
}
179184
rule {
180185
api_groups = [""]
181186
resources = ["configmaps"]

modules/eks-monitoring/otel-config/templates/clusterrole.yaml

+7
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,13 @@ rules:
2323
- get
2424
- list
2525
- watch
26+
- apiGroups:
27+
- metrics.eks.amazonaws.com
28+
resources:
29+
- kcm/metrics
30+
- ksh/metrics
31+
verbs:
32+
- get
2633
- nonResourceURLs:
2734
- /metrics
2835
verbs:

modules/eks-monitoring/otel-config/templates/opentelemetrycollector.yaml

+36
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,42 @@ spec:
104104
regex: apiserver_request_duration_seconds_bucket;(0.15|0.2|0.3|0.35|0.4|0.45|0.6|0.7|0.8|0.9|1.25|1.5|1.75|2|3|3.5|4|4.5|6|7|8|9|15|25|40|50)
105105
replacement: $${1}
106106
action: drop
107+
- job_name: 'ksh-metrics'
108+
scheme: https
109+
tls_config:
110+
ca_file: /var/run/secrets/kubernetes.io/serviceaccount/ca.crt
111+
insecure_skip_verify: true
112+
bearer_token_file: /var/run/secrets/kubernetes.io/serviceaccount/token
113+
kubernetes_sd_configs:
114+
- role: endpoints
115+
metrics_path: /apis/metrics.eks.amazonaws.com/v1/ksh/container/metrics
116+
relabel_configs:
117+
- source_labels:
118+
[
119+
__meta_kubernetes_namespace,
120+
__meta_kubernetes_service_name,
121+
__meta_kubernetes_endpoint_port_name,
122+
]
123+
action: keep
124+
regex: default;kubernetes;https
125+
- job_name: 'kcm-metrics'
126+
scheme: https
127+
tls_config:
128+
ca_file: /var/run/secrets/kubernetes.io/serviceaccount/ca.crt
129+
insecure_skip_verify: true
130+
bearer_token_file: /var/run/secrets/kubernetes.io/serviceaccount/token
131+
kubernetes_sd_configs:
132+
- role: endpoints
133+
metrics_path: /apis/metrics.eks.amazonaws.com/v1/kcm/container/metrics
134+
relabel_configs:
135+
- source_labels:
136+
[
137+
__meta_kubernetes_namespace,
138+
__meta_kubernetes_service_name,
139+
__meta_kubernetes_endpoint_port_name,
140+
]
141+
action: keep
142+
regex: default;kubernetes;https
107143
{{ end }}
108144
109145
- job_name: serviceMonitor/default/kube-prometheus-stack-prometheus-node-exporter/0

0 commit comments

Comments
 (0)