From 0500cc8855fa2c37fb24e9952f7c840088d23703 Mon Sep 17 00:00:00 2001 From: Casey Davenport Date: Sun, 2 Aug 2026 17:21:10 -0700 Subject: [PATCH 1/2] Stop telling operator users to create a Typha metrics service The operator creates one in calico-system when typhaMetricsPort is set. --- .../monitor/monitor-component-metrics.mdx | 31 +++++++------------ .../monitor/monitor-component-metrics.mdx | 31 +++++++------------ .../monitor/monitor-component-metrics.mdx | 31 +++++++------------ .../monitor/monitor-component-metrics.mdx | 31 +++++++------------ .../monitor/monitor-component-metrics.mdx | 31 +++++++------------ 5 files changed, 60 insertions(+), 95 deletions(-) diff --git a/calico/operations/monitor/monitor-component-metrics.mdx b/calico/operations/monitor/monitor-component-metrics.mdx index 3b9f410ce7..351a1c0f79 100644 --- a/calico/operations/monitor/monitor-component-metrics.mdx +++ b/calico/operations/monitor/monitor-component-metrics.mdx @@ -248,21 +248,18 @@ 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 +488,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 +650,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..701507feba 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,18 @@ 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 +488,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 +650,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..701507feba 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,18 @@ 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 +488,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 +650,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..701507feba 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,18 @@ 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 +488,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 +650,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..351a1c0f79 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,18 @@ 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 +488,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 +650,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: From 9b87583e8880cc35cbaa739bb81b097a88fca2f6 Mon Sep 17 00:00:00 2001 From: Casey Davenport Date: Mon, 3 Aug 2026 05:34:42 -0700 Subject: [PATCH 2/2] Verify the Typha metrics service by name --- calico/operations/monitor/monitor-component-metrics.mdx | 5 +++-- .../operations/monitor/monitor-component-metrics.mdx | 5 +++-- .../operations/monitor/monitor-component-metrics.mdx | 5 +++-- .../operations/monitor/monitor-component-metrics.mdx | 5 +++-- .../operations/monitor/monitor-component-metrics.mdx | 5 +++-- 5 files changed, 15 insertions(+), 10 deletions(-) diff --git a/calico/operations/monitor/monitor-component-metrics.mdx b/calico/operations/monitor/monitor-component-metrics.mdx index 351a1c0f79..486309ccbf 100644 --- a/calico/operations/monitor/monitor-component-metrics.mdx +++ b/calico/operations/monitor/monitor-component-metrics.mdx @@ -253,13 +253,14 @@ When you set `typhaMetricsPort`, the operator automatically creates a service th You can use the following command to verify it. ```bash -kubectl get svc -n calico-system +kubectl get svc -n calico-system calico-typha-metrics ``` You should see a result similar to: ```bash -calico-typha-metrics ClusterIP 10.43.164.10 9093/TCP 39d +NAME TYPE CLUSTER-IP EXTERNAL-IP PORT(S) AGE +calico-typha-metrics ClusterIP 10.43.164.10 9093/TCP 39d ``` 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 701507feba..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 @@ -253,13 +253,14 @@ When you set `typhaMetricsPort`, the operator automatically creates a service th You can use the following command to verify it. ```bash -kubectl get svc -n calico-system +kubectl get svc -n calico-system calico-typha-metrics ``` You should see a result similar to: ```bash -calico-typha-metrics ClusterIP 10.43.164.10 9093/TCP 39d +NAME TYPE CLUSTER-IP EXTERNAL-IP PORT(S) AGE +calico-typha-metrics ClusterIP 10.43.164.10 9093/TCP 39d ``` 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 701507feba..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 @@ -253,13 +253,14 @@ When you set `typhaMetricsPort`, the operator automatically creates a service th You can use the following command to verify it. ```bash -kubectl get svc -n calico-system +kubectl get svc -n calico-system calico-typha-metrics ``` You should see a result similar to: ```bash -calico-typha-metrics ClusterIP 10.43.164.10 9093/TCP 39d +NAME TYPE CLUSTER-IP EXTERNAL-IP PORT(S) AGE +calico-typha-metrics ClusterIP 10.43.164.10 9093/TCP 39d ``` 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 701507feba..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 @@ -253,13 +253,14 @@ When you set `typhaMetricsPort`, the operator automatically creates a service th You can use the following command to verify it. ```bash -kubectl get svc -n calico-system +kubectl get svc -n calico-system calico-typha-metrics ``` You should see a result similar to: ```bash -calico-typha-metrics ClusterIP 10.43.164.10 9093/TCP 39d +NAME TYPE CLUSTER-IP EXTERNAL-IP PORT(S) AGE +calico-typha-metrics ClusterIP 10.43.164.10 9093/TCP 39d ``` 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 351a1c0f79..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 @@ -253,13 +253,14 @@ When you set `typhaMetricsPort`, the operator automatically creates a service th You can use the following command to verify it. ```bash -kubectl get svc -n calico-system +kubectl get svc -n calico-system calico-typha-metrics ``` You should see a result similar to: ```bash -calico-typha-metrics ClusterIP 10.43.164.10 9093/TCP 39d +NAME TYPE CLUSTER-IP EXTERNAL-IP PORT(S) AGE +calico-typha-metrics ClusterIP 10.43.164.10 9093/TCP 39d ```