diff --git a/cluster/monitoring.yaml b/cluster/monitoring.yaml index 5cc5c8c..1797e5b 100644 --- a/cluster/monitoring.yaml +++ b/cluster/monitoring.yaml @@ -102,12 +102,16 @@ spec: role = "pod" } - // kubelet and cAdvisor, through the API server proxy + // kubelet and cAdvisor, straight from each kubelet (:10250). The API + // server proxy path (nodes/proxy) answers 403 on this k3s. The + // kubelet serving certs are signed by k3s-server-ca (the same CA as + // the service account's ca.crt) and carry the node IP as a SAN. discovery.relabel "kubelet" { targets = discovery.kubernetes.nodes.targets rule { - target_label = "__address__" - replacement = "kubernetes.default.svc:443" + source_labels = ["__meta_kubernetes_node_address_InternalIP"] + target_label = "__address__" + replacement = "$1:10250" } rule { source_labels = ["__meta_kubernetes_node_name"] @@ -115,17 +119,15 @@ spec: } rule { source_labels = ["__meta_kubernetes_node_name"] - target_label = "__metrics_path__" - replacement = "/api/v1/nodes/$1/proxy/metrics" + target_label = "instance" } } discovery.relabel "cadvisor" { targets = discovery.relabel.kubelet.output rule { - source_labels = ["node"] - target_label = "__metrics_path__" - replacement = "/api/v1/nodes/$1/proxy/metrics/cadvisor" + target_label = "__metrics_path__" + replacement = "/metrics/cadvisor" } }