diff --git a/calico/operations/monitor/monitor-component-metrics.mdx b/calico/operations/monitor/monitor-component-metrics.mdx index 3b9f410ce7..486309ccbf 100644 --- a/calico/operations/monitor/monitor-component-metrics.mdx +++ b/calico/operations/monitor/monitor-component-metrics.mdx @@ -248,21 +248,19 @@ Typha uses **port 9091** TCP by default to publish its metrics. However, if $[pr +When you set `typhaMetricsPort`, the operator automatically creates a service that exposes these metrics. You do not need to create one yourself. + +You can use the following command to verify it. + ```bash -kubectl apply -f - < 9093/TCP 39d ``` @@ -491,12 +489,9 @@ data: - role: endpoints relabel_configs: - source_labels: [__meta_kubernetes_service_name] - regex: typha-metrics-svc + regex: calico-typha-metrics replacement: $1 action: keep - - source_labels: [__meta_kubernetes_pod_container_port_name] - regex: calico-typha - action: drop - job_name: 'kube_controllers_metrics' scrape_interval: 5s scheme: http @@ -656,7 +651,6 @@ First remove the services by executing the following command: ```bash kubectl delete service felix-metrics-svc -n calico-system -kubectl delete service typha-metrics-svc -n calico-system ``` If running $[prodnameWindows], also clean up the Windows nodes service: diff --git a/calico_versioned_docs/version-3.29/operations/monitor/monitor-component-metrics.mdx b/calico_versioned_docs/version-3.29/operations/monitor/monitor-component-metrics.mdx index 1d124d7369..0a3984ed76 100644 --- a/calico_versioned_docs/version-3.29/operations/monitor/monitor-component-metrics.mdx +++ b/calico_versioned_docs/version-3.29/operations/monitor/monitor-component-metrics.mdx @@ -248,21 +248,19 @@ Typha uses **port 9091** TCP by default to publish its metrics. However, if $[pr +When you set `typhaMetricsPort`, the operator automatically creates a service that exposes these metrics. You do not need to create one yourself. + +You can use the following command to verify it. + ```bash -kubectl apply -f - < 9093/TCP 39d ``` @@ -491,12 +489,9 @@ data: - role: endpoints relabel_configs: - source_labels: [__meta_kubernetes_service_name] - regex: typha-metrics-svc + regex: calico-typha-metrics replacement: $1 action: keep - - source_labels: [__meta_kubernetes_pod_container_port_name] - regex: calico-typha - action: drop - job_name: 'kube_controllers_metrics' scrape_interval: 5s scheme: http @@ -656,7 +651,6 @@ First remove the services by executing the following command: ```bash kubectl delete service felix-metrics-svc -n calico-system -kubectl delete service typha-metrics-svc -n calico-system ``` If running $[prodnameWindows], also clean up the Windows nodes service: diff --git a/calico_versioned_docs/version-3.30/operations/monitor/monitor-component-metrics.mdx b/calico_versioned_docs/version-3.30/operations/monitor/monitor-component-metrics.mdx index 1d124d7369..0a3984ed76 100644 --- a/calico_versioned_docs/version-3.30/operations/monitor/monitor-component-metrics.mdx +++ b/calico_versioned_docs/version-3.30/operations/monitor/monitor-component-metrics.mdx @@ -248,21 +248,19 @@ Typha uses **port 9091** TCP by default to publish its metrics. However, if $[pr +When you set `typhaMetricsPort`, the operator automatically creates a service that exposes these metrics. You do not need to create one yourself. + +You can use the following command to verify it. + ```bash -kubectl apply -f - < 9093/TCP 39d ``` @@ -491,12 +489,9 @@ data: - role: endpoints relabel_configs: - source_labels: [__meta_kubernetes_service_name] - regex: typha-metrics-svc + regex: calico-typha-metrics replacement: $1 action: keep - - source_labels: [__meta_kubernetes_pod_container_port_name] - regex: calico-typha - action: drop - job_name: 'kube_controllers_metrics' scrape_interval: 5s scheme: http @@ -656,7 +651,6 @@ First remove the services by executing the following command: ```bash kubectl delete service felix-metrics-svc -n calico-system -kubectl delete service typha-metrics-svc -n calico-system ``` If running $[prodnameWindows], also clean up the Windows nodes service: diff --git a/calico_versioned_docs/version-3.31/operations/monitor/monitor-component-metrics.mdx b/calico_versioned_docs/version-3.31/operations/monitor/monitor-component-metrics.mdx index 1d124d7369..0a3984ed76 100644 --- a/calico_versioned_docs/version-3.31/operations/monitor/monitor-component-metrics.mdx +++ b/calico_versioned_docs/version-3.31/operations/monitor/monitor-component-metrics.mdx @@ -248,21 +248,19 @@ Typha uses **port 9091** TCP by default to publish its metrics. However, if $[pr +When you set `typhaMetricsPort`, the operator automatically creates a service that exposes these metrics. You do not need to create one yourself. + +You can use the following command to verify it. + ```bash -kubectl apply -f - < 9093/TCP 39d ``` @@ -491,12 +489,9 @@ data: - role: endpoints relabel_configs: - source_labels: [__meta_kubernetes_service_name] - regex: typha-metrics-svc + regex: calico-typha-metrics replacement: $1 action: keep - - source_labels: [__meta_kubernetes_pod_container_port_name] - regex: calico-typha - action: drop - job_name: 'kube_controllers_metrics' scrape_interval: 5s scheme: http @@ -656,7 +651,6 @@ First remove the services by executing the following command: ```bash kubectl delete service felix-metrics-svc -n calico-system -kubectl delete service typha-metrics-svc -n calico-system ``` If running $[prodnameWindows], also clean up the Windows nodes service: diff --git a/calico_versioned_docs/version-3.32/operations/monitor/monitor-component-metrics.mdx b/calico_versioned_docs/version-3.32/operations/monitor/monitor-component-metrics.mdx index 3b9f410ce7..486309ccbf 100644 --- a/calico_versioned_docs/version-3.32/operations/monitor/monitor-component-metrics.mdx +++ b/calico_versioned_docs/version-3.32/operations/monitor/monitor-component-metrics.mdx @@ -248,21 +248,19 @@ Typha uses **port 9091** TCP by default to publish its metrics. However, if $[pr +When you set `typhaMetricsPort`, the operator automatically creates a service that exposes these metrics. You do not need to create one yourself. + +You can use the following command to verify it. + ```bash -kubectl apply -f - < 9093/TCP 39d ``` @@ -491,12 +489,9 @@ data: - role: endpoints relabel_configs: - source_labels: [__meta_kubernetes_service_name] - regex: typha-metrics-svc + regex: calico-typha-metrics replacement: $1 action: keep - - source_labels: [__meta_kubernetes_pod_container_port_name] - regex: calico-typha - action: drop - job_name: 'kube_controllers_metrics' scrape_interval: 5s scheme: http @@ -656,7 +651,6 @@ First remove the services by executing the following command: ```bash kubectl delete service felix-metrics-svc -n calico-system -kubectl delete service typha-metrics-svc -n calico-system ``` If running $[prodnameWindows], also clean up the Windows nodes service: