diff --git a/pkg/component/etcd/monitoring.go b/pkg/component/etcd/monitoring.go index 3a750cbb159..46f6c3f0f0d 100644 --- a/pkg/component/etcd/monitoring.go +++ b/pkg/component/etcd/monitoring.go @@ -302,12 +302,12 @@ kubernetes_sd_configs: names: [{{ .namespace }}] relabel_configs: - source_labels: - - __meta_kubernetes_service_label_` + v1beta1constants.LabelApp + ` - - __meta_kubernetes_service_label_` + v1beta1constants.LabelRole + ` + - __meta_kubernetes_pod_label_` + v1beta1constants.LabelApp + ` + - __meta_kubernetes_pod_label_` + v1beta1constants.LabelRole + ` - __meta_kubernetes_endpoint_port_name action: keep regex: ` + LabelAppValue + `;{{ .role }};` + portNameClient + ` -- source_labels: [ __meta_kubernetes_service_label_` + v1beta1constants.LabelRole + ` ] +- source_labels: [ __meta_kubernetes_pod_label_` + v1beta1constants.LabelRole + ` ] target_label: role - source_labels: [ __meta_kubernetes_pod_name ] target_label: pod @@ -332,12 +332,12 @@ kubernetes_sd_configs: names: [{{ .namespace }}] relabel_configs: - source_labels: - - __meta_kubernetes_service_label_` + v1beta1constants.LabelApp + ` - - __meta_kubernetes_service_label_` + v1beta1constants.LabelRole + ` + - __meta_kubernetes_pod_label_` + v1beta1constants.LabelApp + ` + - __meta_kubernetes_pod_label_` + v1beta1constants.LabelRole + ` - __meta_kubernetes_endpoint_port_name action: keep regex: ` + LabelAppValue + `;{{ .role }};` + portNameBackupRestore + ` -- source_labels: [ __meta_kubernetes_service_label_role ] +- source_labels: [ __meta_kubernetes_pod_label_role ] target_label: role - source_labels: [ __meta_kubernetes_pod_name ] target_label: pod diff --git a/pkg/component/etcd/monitoring_test.go b/pkg/component/etcd/monitoring_test.go index 2dbc74f3501..9fe2814ee64 100644 --- a/pkg/component/etcd/monitoring_test.go +++ b/pkg/component/etcd/monitoring_test.go @@ -175,12 +175,12 @@ kubernetes_sd_configs: names: [` + testNamespace + `] relabel_configs: - source_labels: - - __meta_kubernetes_service_label_app - - __meta_kubernetes_service_label_role + - __meta_kubernetes_pod_label_app + - __meta_kubernetes_pod_label_role - __meta_kubernetes_endpoint_port_name action: keep regex: etcd-statefulset;` + testRole + `;client -- source_labels: [ __meta_kubernetes_service_label_role ] +- source_labels: [ __meta_kubernetes_pod_label_role ] target_label: role - source_labels: [ __meta_kubernetes_pod_name ] target_label: pod @@ -204,12 +204,12 @@ kubernetes_sd_configs: names: [` + testNamespace + `] relabel_configs: - source_labels: - - __meta_kubernetes_service_label_app - - __meta_kubernetes_service_label_role + - __meta_kubernetes_pod_label_app + - __meta_kubernetes_pod_label_role - __meta_kubernetes_endpoint_port_name action: keep regex: etcd-statefulset;` + testRole + `;backuprestore -- source_labels: [ __meta_kubernetes_service_label_role ] +- source_labels: [ __meta_kubernetes_pod_label_role ] target_label: role - source_labels: [ __meta_kubernetes_pod_name ] target_label: pod