From 01cd60a8ee985bafd87c6bdf7add389d35603b62 Mon Sep 17 00:00:00 2001 From: Phil Henderson Date: Wed, 15 Jan 2025 11:59:42 -0600 Subject: [PATCH] Correcting Prometheus scrape configuration for Multi-Cluster. --- linkerd.io/content/2-edge/tasks/external-prometheus.md | 6 +++--- linkerd.io/content/2.15/tasks/external-prometheus.md | 6 +++--- linkerd.io/content/2.16/tasks/external-prometheus.md | 6 +++--- linkerd.io/content/2.17/tasks/external-prometheus.md | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/linkerd.io/content/2-edge/tasks/external-prometheus.md b/linkerd.io/content/2-edge/tasks/external-prometheus.md index 1ac7b70e60..abfbceba54 100644 --- a/linkerd.io/content/2-edge/tasks/external-prometheus.md +++ b/linkerd.io/content/2-edge/tasks/external-prometheus.md @@ -48,20 +48,20 @@ with direct values for the below configuration to work. - source_labels: [__meta_kubernetes_pod_container_name] action: replace target_label: component - + - job_name: 'linkerd-service-mirror' kubernetes_sd_configs: - role: pod relabel_configs: - source_labels: - - __meta_kubernetes_pod_label_linkerd_io_control_plane_component + - __meta_kubernetes_pod_label_component - __meta_kubernetes_pod_container_port_name action: keep regex: linkerd-service-mirror;admin-http$ - source_labels: [__meta_kubernetes_pod_container_name] action: replace target_label: component - + - job_name: 'linkerd-proxy' kubernetes_sd_configs: - role: pod diff --git a/linkerd.io/content/2.15/tasks/external-prometheus.md b/linkerd.io/content/2.15/tasks/external-prometheus.md index d127017e51..8434525838 100644 --- a/linkerd.io/content/2.15/tasks/external-prometheus.md +++ b/linkerd.io/content/2.15/tasks/external-prometheus.md @@ -48,20 +48,20 @@ with direct values for the below configuration to work. - source_labels: [__meta_kubernetes_pod_container_name] action: replace target_label: component - + - job_name: 'linkerd-service-mirror' kubernetes_sd_configs: - role: pod relabel_configs: - source_labels: - - __meta_kubernetes_pod_label_linkerd_io_control_plane_component + - __meta_kubernetes_pod_label_component - __meta_kubernetes_pod_container_port_name action: keep regex: linkerd-service-mirror;admin-http$ - source_labels: [__meta_kubernetes_pod_container_name] action: replace target_label: component - + - job_name: 'linkerd-proxy' kubernetes_sd_configs: - role: pod diff --git a/linkerd.io/content/2.16/tasks/external-prometheus.md b/linkerd.io/content/2.16/tasks/external-prometheus.md index d127017e51..8434525838 100644 --- a/linkerd.io/content/2.16/tasks/external-prometheus.md +++ b/linkerd.io/content/2.16/tasks/external-prometheus.md @@ -48,20 +48,20 @@ with direct values for the below configuration to work. - source_labels: [__meta_kubernetes_pod_container_name] action: replace target_label: component - + - job_name: 'linkerd-service-mirror' kubernetes_sd_configs: - role: pod relabel_configs: - source_labels: - - __meta_kubernetes_pod_label_linkerd_io_control_plane_component + - __meta_kubernetes_pod_label_component - __meta_kubernetes_pod_container_port_name action: keep regex: linkerd-service-mirror;admin-http$ - source_labels: [__meta_kubernetes_pod_container_name] action: replace target_label: component - + - job_name: 'linkerd-proxy' kubernetes_sd_configs: - role: pod diff --git a/linkerd.io/content/2.17/tasks/external-prometheus.md b/linkerd.io/content/2.17/tasks/external-prometheus.md index d127017e51..8434525838 100644 --- a/linkerd.io/content/2.17/tasks/external-prometheus.md +++ b/linkerd.io/content/2.17/tasks/external-prometheus.md @@ -48,20 +48,20 @@ with direct values for the below configuration to work. - source_labels: [__meta_kubernetes_pod_container_name] action: replace target_label: component - + - job_name: 'linkerd-service-mirror' kubernetes_sd_configs: - role: pod relabel_configs: - source_labels: - - __meta_kubernetes_pod_label_linkerd_io_control_plane_component + - __meta_kubernetes_pod_label_component - __meta_kubernetes_pod_container_port_name action: keep regex: linkerd-service-mirror;admin-http$ - source_labels: [__meta_kubernetes_pod_container_name] action: replace target_label: component - + - job_name: 'linkerd-proxy' kubernetes_sd_configs: - role: pod