From 4976674b33e91e37569a3d4d47be6c27c273755d Mon Sep 17 00:00:00 2001 From: Claude Date: Wed, 19 Aug 2026 16:08:43 +0000 Subject: [PATCH 1/6] Replace prometheus with pickle --- __tests__/crawler.test.js | 6 +- .../urls_projectcalico.docs.tigera.io.txt | 6 +- __tests__/data/urls_with_canonicals.txt | 126 ++-- .../components/FelixConfig/config-params.json | 30 +- .../get-started/operator-checklist.mdx | 16 +- .../beginners/simple-policy-cnx.mdx | 14 +- .../configuring/add-maglev-load-balancing.mdx | 2 +- .../mark-lb-node-for-maintenance.mdx | 2 +- calico-cloud/operations/comms/index.mdx | 8 +- calico-cloud/operations/disconnect.mdx | 2 +- calico-cloud/operations/index.mdx | 8 +- .../monitor/metrics/bgp-metrics.mdx | 10 +- .../elasticsearch-and-fluentd-metrics.mdx | 8 +- .../monitor/metrics/policy-metrics.mdx | 2 +- .../monitor/prometheus/alertmanager.mdx | 8 +- .../monitor/prometheus/byo-prometheus.mdx | 92 +-- .../prometheus/configure-prometheus.mdx | 80 +-- .../operations/monitor/prometheus/support.mdx | 6 +- calico-cloud/reference/attribution.mdx | 4 +- .../kube-controllers/index.mdx | 2 +- calico-cloud/reference/index.mdx | 4 +- calico-cloud/reference/installation/_api.mdx | 36 +- .../resources/kubecontrollersconfig.mdx | 4 +- calico-cloud/releases.json | 20 +- calico-cloud/threat/configuring-webhooks.mdx | 2 +- .../components/FelixConfig/config-params.json | 28 +- .../get-started/operator-checklist.mdx | 16 +- .../beginners/simple-policy-cnx.mdx | 14 +- .../operations/comms/secure-metrics.mdx | 76 +- .../version-22-2/operations/disconnect.mdx | 2 +- .../version-22-2/operations/index.mdx | 8 +- .../monitor/metrics/bgp-metrics.mdx | 10 +- .../elasticsearch-and-fluentd-metrics.mdx | 8 +- .../monitor/metrics/policy-metrics.mdx | 2 +- .../monitor/prometheus/alertmanager.mdx | 8 +- .../monitor/prometheus/byo-prometheus.mdx | 90 +-- .../prometheus/configure-prometheus.mdx | 84 +-- .../operations/monitor/prometheus/support.mdx | 6 +- .../version-22-2/reference/attribution.mdx | 4 +- .../kube-controllers/index.mdx | 2 +- .../version-22-2/reference/index.mdx | 4 +- .../reference/installation/_api.mdx | 36 +- .../resources/kubecontrollersconfig.mdx | 4 +- .../version-22-2/releases.json | 40 +- .../threat/configuring-webhooks.mdx | 2 +- .../components/FelixConfig/config-params.json | 30 +- .../get-started/operator-checklist.mdx | 16 +- .../beginners/simple-policy-cnx.mdx | 14 +- .../configuring/add-maglev-load-balancing.mdx | 2 +- .../mark-lb-node-for-maintenance.mdx | 2 +- .../version-23-2/operations/comms/index.mdx | 8 +- .../version-23-2/operations/disconnect.mdx | 2 +- .../version-23-2/operations/index.mdx | 8 +- .../monitor/metrics/bgp-metrics.mdx | 10 +- .../elasticsearch-and-fluentd-metrics.mdx | 8 +- .../monitor/metrics/policy-metrics.mdx | 2 +- .../monitor/prometheus/alertmanager.mdx | 8 +- .../monitor/prometheus/byo-prometheus.mdx | 92 +-- .../prometheus/configure-prometheus.mdx | 80 +-- .../operations/monitor/prometheus/support.mdx | 6 +- .../version-23-2/reference/attribution.mdx | 4 +- .../kube-controllers/index.mdx | 2 +- .../version-23-2/reference/index.mdx | 4 +- .../reference/installation/_api.mdx | 36 +- .../resources/kubecontrollersconfig.mdx | 4 +- .../version-23-2/releases.json | 20 +- .../threat/configuring-webhooks.mdx | 2 +- .../version-22-2-sidebars.json | 14 +- .../version-23-2-sidebars.json | 14 +- .../components/FelixConfig/config-params.json | 30 +- ...gStartedInstallOnClustersKubernetesHelm.js | 8 +- .../_includes/components/InstallAKS.js | 4 +- .../_includes/components/InstallEKS.js | 4 +- .../_includes/components/InstallGKE.js | 2 +- .../_includes/components/InstallGeneric.js | 2 +- .../components/OpenShiftPrometheusOperator.js | 8 +- .../components/PrivateRegistryImagePath.js | 6 +- .../components/PrivateRegistryRegular.js | 6 +- .../components/UpgradeOperatorSimple.js | 4 +- .../install-on-clusters/docker-enterprise.mdx | 2 +- .../install-on-clusters/kubernetes/helm.mdx | 4 +- .../kubernetes/quickstart.mdx | 2 +- .../install-on-clusters/rancher.mdx | 2 +- .../install-on-clusters/rke2.mdx | 2 +- .../getting-started/manifest-archive.mdx | 2 +- .../upgrade-to-tsee/helm.mdx | 8 +- .../kubernetes-upgrade-tsee/helm.mdx | 8 +- .../multicluster/federation/kubeconfig.mdx | 2 +- .../create-a-managed-cluster-helm.mdx | 4 +- .../create-a-management-cluster-helm.mdx | 8 +- .../beginners/simple-policy-cnx.mdx | 14 +- .../configuring/add-maglev-load-balancing.mdx | 2 +- .../mark-lb-node-for-maintenance.mdx | 2 +- .../review-unused-network-policies.mdx | 4 +- calico-enterprise/operations/comms/index.mdx | 10 +- calico-enterprise/operations/index.mdx | 8 +- .../operations/license-options.mdx | 8 +- .../monitor/metrics/bgp-metrics.mdx | 10 +- .../elasticsearch-and-fluentd-metrics.mdx | 20 +- .../monitor/metrics/operator-metrics.mdx | 8 +- .../monitor/metrics/policy-metrics.mdx | 2 +- .../monitor/prometheus/alertmanager.mdx | 8 +- .../monitor/prometheus/byo-prometheus.mdx | 102 +-- .../prometheus/configure-prometheus.mdx | 80 +-- .../operations/monitor/prometheus/support.mdx | 6 +- .../reference/architecture/overview.mdx | 6 +- .../clis/calicoctl/cluster/diags.mdx | 10 +- .../reference/clis/calicoq/host.mdx | 4 +- .../configure-resources.mdx | 12 +- .../kube-controllers/index.mdx | 2 +- .../reference/installation/_api.mdx | 38 +- .../resources/kubecontrollersconfig.mdx | 4 +- calico-enterprise/releases.json | 18 +- .../threat/configuring-webhooks.mdx | 2 +- ...gStartedInstallOnClustersKubernetesHelm.js | 8 +- .../_includes/components/InstallAKS.js | 4 +- .../_includes/components/InstallEKS.js | 4 +- .../_includes/components/InstallGKE.js | 2 +- .../_includes/components/InstallGeneric.js | 2 +- .../components/OpenShiftPrometheusOperator.js | 8 +- .../components/PrivateRegistryImagePath.js | 6 +- .../components/PrivateRegistryRegular.js | 6 +- .../components/UpgradeOperatorSimple.js | 4 +- .../install-on-clusters/docker-enterprise.mdx | 2 +- .../install-on-clusters/kubernetes/helm.mdx | 4 +- .../kubernetes/quickstart.mdx | 2 +- .../install-on-clusters/rancher.mdx | 2 +- .../install-on-clusters/rke2.mdx | 2 +- .../getting-started/manifest-archive.mdx | 2 +- .../upgrade-to-tsee/helm.mdx | 6 +- .../kubernetes-upgrade-tsee/helm.mdx | 6 +- .../multicluster/federation/kubeconfig.mdx | 2 +- .../create-a-managed-cluster-helm.mdx | 4 +- .../create-a-management-cluster-helm.mdx | 8 +- .../beginners/simple-policy-cnx.mdx | 14 +- .../operations/comms/secure-metrics.mdx | 76 +- .../version-3.20-2/operations/index.mdx | 8 +- .../monitor/metrics/bgp-metrics.mdx | 10 +- .../elasticsearch-and-fluentd-metrics.mdx | 20 +- .../monitor/metrics/license-agent.mdx | 12 +- .../monitor/metrics/policy-metrics.mdx | 2 +- .../monitor/prometheus/alertmanager.mdx | 8 +- .../monitor/prometheus/byo-prometheus.mdx | 90 +-- .../prometheus/configure-prometheus.mdx | 84 +-- .../operations/monitor/prometheus/support.mdx | 6 +- .../reference/architecture/overview.mdx | 6 +- .../clis/calicoctl/cluster/diags.mdx | 10 +- .../reference/clis/calicoq/host.mdx | 4 +- .../configure-resources.mdx | 12 +- .../reference/installation/_api.mdx | 36 +- .../reference/resources/felixconfig.mdx | 14 +- .../resources/kubecontrollersconfig.mdx | 4 +- .../version-3.20-2/release-notes/index.mdx | 2 +- .../version-3.20-2/releases.json | 200 +++--- .../components/FelixConfig/config-params.json | 28 +- ...gStartedInstallOnClustersKubernetesHelm.js | 8 +- .../_includes/components/InstallAKS.js | 4 +- .../_includes/components/InstallEKS.js | 4 +- .../_includes/components/InstallGKE.js | 2 +- .../_includes/components/InstallGeneric.js | 2 +- .../components/OpenShiftPrometheusOperator.js | 8 +- .../components/PrivateRegistryImagePath.js | 6 +- .../components/PrivateRegistryRegular.js | 6 +- .../components/UpgradeOperatorSimple.js | 4 +- .../install-on-clusters/docker-enterprise.mdx | 2 +- .../install-on-clusters/kubernetes/helm.mdx | 4 +- .../kubernetes/quickstart.mdx | 2 +- .../install-on-clusters/rancher.mdx | 2 +- .../install-on-clusters/rke2.mdx | 2 +- .../getting-started/manifest-archive.mdx | 2 +- .../upgrade-to-tsee/helm.mdx | 6 +- .../kubernetes-upgrade-tsee/helm.mdx | 6 +- .../multicluster/federation/kubeconfig.mdx | 2 +- .../create-a-managed-cluster-helm.mdx | 4 +- .../create-a-management-cluster-helm.mdx | 8 +- .../beginners/simple-policy-cnx.mdx | 14 +- .../operations/comms/secure-metrics.mdx | 76 +- .../version-3.21-2/operations/index.mdx | 8 +- .../monitor/metrics/bgp-metrics.mdx | 10 +- .../elasticsearch-and-fluentd-metrics.mdx | 20 +- .../monitor/metrics/license-agent.mdx | 12 +- .../monitor/metrics/policy-metrics.mdx | 2 +- .../monitor/prometheus/alertmanager.mdx | 8 +- .../monitor/prometheus/byo-prometheus.mdx | 90 +-- .../prometheus/configure-prometheus.mdx | 84 +-- .../operations/monitor/prometheus/support.mdx | 6 +- .../reference/architecture/overview.mdx | 6 +- .../clis/calicoctl/cluster/diags.mdx | 10 +- .../reference/clis/calicoq/host.mdx | 4 +- .../configure-resources.mdx | 12 +- .../reference/installation/_api.mdx | 36 +- .../resources/kubecontrollersconfig.mdx | 4 +- .../version-3.21-2/release-notes/index.mdx | 6 +- .../version-3.21-2/releases.json | 220 +++--- .../threat/configuring-webhooks.mdx | 2 +- .../components/FelixConfig/config-params.json | 28 +- ...gStartedInstallOnClustersKubernetesHelm.js | 8 +- .../_includes/components/InstallAKS.js | 4 +- .../_includes/components/InstallEKS.js | 4 +- .../_includes/components/InstallGKE.js | 2 +- .../_includes/components/InstallGeneric.js | 2 +- .../components/OpenShiftPrometheusOperator.js | 8 +- .../components/PrivateRegistryImagePath.js | 6 +- .../components/PrivateRegistryRegular.js | 6 +- .../components/UpgradeOperatorSimple.js | 4 +- .../install-on-clusters/docker-enterprise.mdx | 2 +- .../install-on-clusters/kubernetes/helm.mdx | 4 +- .../kubernetes/quickstart.mdx | 2 +- .../install-on-clusters/rancher.mdx | 2 +- .../install-on-clusters/rke2.mdx | 2 +- .../getting-started/manifest-archive.mdx | 2 +- .../upgrade-to-tsee/helm.mdx | 6 +- .../kubernetes-upgrade-tsee/helm.mdx | 6 +- .../multicluster/federation/kubeconfig.mdx | 2 +- .../create-a-managed-cluster-helm.mdx | 4 +- .../create-a-management-cluster-helm.mdx | 8 +- .../beginners/simple-policy-cnx.mdx | 14 +- .../operations/comms/secure-metrics.mdx | 76 +- .../version-3.22-2/operations/index.mdx | 8 +- .../monitor/metrics/bgp-metrics.mdx | 10 +- .../elasticsearch-and-fluentd-metrics.mdx | 20 +- .../monitor/metrics/license-agent.mdx | 12 +- .../monitor/metrics/policy-metrics.mdx | 2 +- .../monitor/prometheus/alertmanager.mdx | 8 +- .../monitor/prometheus/byo-prometheus.mdx | 90 +-- .../prometheus/configure-prometheus.mdx | 84 +-- .../operations/monitor/prometheus/support.mdx | 6 +- .../reference/architecture/overview.mdx | 6 +- .../clis/calicoctl/cluster/diags.mdx | 10 +- .../reference/clis/calicoq/host.mdx | 4 +- .../configure-resources.mdx | 12 +- .../reference/installation/_api.mdx | 36 +- .../resources/kubecontrollersconfig.mdx | 4 +- .../version-3.22-2/release-notes/index.mdx | 4 +- .../version-3.22-2/releases.json | 180 ++--- .../threat/configuring-webhooks.mdx | 2 +- .../components/FelixConfig/config-params.json | 30 +- ...gStartedInstallOnClustersKubernetesHelm.js | 8 +- .../_includes/components/InstallAKS.js | 4 +- .../_includes/components/InstallEKS.js | 4 +- .../_includes/components/InstallGKE.js | 2 +- .../_includes/components/InstallGeneric.js | 2 +- .../components/OpenShiftPrometheusOperator.js | 8 +- .../components/PrivateRegistryImagePath.js | 6 +- .../components/PrivateRegistryRegular.js | 6 +- .../components/UpgradeOperatorSimple.js | 4 +- .../install-on-clusters/docker-enterprise.mdx | 2 +- .../install-on-clusters/kubernetes/helm.mdx | 4 +- .../kubernetes/quickstart.mdx | 2 +- .../install-on-clusters/rancher.mdx | 2 +- .../install-on-clusters/rke2.mdx | 2 +- .../getting-started/manifest-archive.mdx | 2 +- .../upgrade-to-tsee/helm.mdx | 6 +- .../kubernetes-upgrade-tsee/helm.mdx | 6 +- .../multicluster/federation/kubeconfig.mdx | 2 +- .../create-a-managed-cluster-helm.mdx | 4 +- .../create-a-management-cluster-helm.mdx | 8 +- .../beginners/simple-policy-cnx.mdx | 14 +- .../configuring/add-maglev-load-balancing.mdx | 2 +- .../mark-lb-node-for-maintenance.mdx | 2 +- .../review-unused-network-policies.mdx | 4 +- .../version-3.23-2/operations/comms/index.mdx | 10 +- .../version-3.23-2/operations/index.mdx | 8 +- .../operations/license-options.mdx | 6 +- .../monitor/metrics/bgp-metrics.mdx | 10 +- .../elasticsearch-and-fluentd-metrics.mdx | 20 +- .../monitor/metrics/license-agent.mdx | 12 +- .../monitor/metrics/policy-metrics.mdx | 2 +- .../monitor/prometheus/alertmanager.mdx | 8 +- .../monitor/prometheus/byo-prometheus.mdx | 90 +-- .../prometheus/configure-prometheus.mdx | 80 +-- .../operations/monitor/prometheus/support.mdx | 6 +- .../reference/architecture/overview.mdx | 6 +- .../clis/calicoctl/cluster/diags.mdx | 10 +- .../reference/clis/calicoq/host.mdx | 4 +- .../configure-resources.mdx | 12 +- .../kube-controllers/index.mdx | 2 +- .../reference/installation/_api.mdx | 36 +- .../resources/kubecontrollersconfig.mdx | 4 +- .../version-3.23-2/releases.json | 60 +- .../threat/configuring-webhooks.mdx | 2 +- .../components/FelixConfig/config-params.json | 30 +- ...gStartedInstallOnClustersKubernetesHelm.js | 8 +- .../_includes/components/InstallAKS.js | 4 +- .../_includes/components/InstallEKS.js | 4 +- .../_includes/components/InstallGKE.js | 2 +- .../_includes/components/InstallGeneric.js | 2 +- .../components/OpenShiftPrometheusOperator.js | 8 +- .../components/PrivateRegistryImagePath.js | 6 +- .../components/PrivateRegistryRegular.js | 6 +- .../components/UpgradeOperatorSimple.js | 4 +- .../install-on-clusters/docker-enterprise.mdx | 2 +- .../install-on-clusters/kubernetes/helm.mdx | 4 +- .../kubernetes/quickstart.mdx | 2 +- .../install-on-clusters/rancher.mdx | 2 +- .../install-on-clusters/rke2.mdx | 2 +- .../getting-started/manifest-archive.mdx | 2 +- .../upgrade-to-tsee/helm.mdx | 8 +- .../kubernetes-upgrade-tsee/helm.mdx | 8 +- .../multicluster/federation/kubeconfig.mdx | 2 +- .../create-a-managed-cluster-helm.mdx | 4 +- .../create-a-management-cluster-helm.mdx | 8 +- .../beginners/simple-policy-cnx.mdx | 14 +- .../configuring/add-maglev-load-balancing.mdx | 2 +- .../mark-lb-node-for-maintenance.mdx | 2 +- .../review-unused-network-policies.mdx | 4 +- .../version-3.24-1/operations/comms/index.mdx | 10 +- .../version-3.24-1/operations/index.mdx | 8 +- .../operations/license-options.mdx | 8 +- .../monitor/metrics/bgp-metrics.mdx | 10 +- .../elasticsearch-and-fluentd-metrics.mdx | 20 +- .../monitor/metrics/operator-metrics.mdx | 8 +- .../monitor/metrics/policy-metrics.mdx | 2 +- .../monitor/prometheus/alertmanager.mdx | 8 +- .../monitor/prometheus/byo-prometheus.mdx | 102 +-- .../prometheus/configure-prometheus.mdx | 80 +-- .../operations/monitor/prometheus/support.mdx | 6 +- .../reference/architecture/overview.mdx | 6 +- .../clis/calicoctl/cluster/diags.mdx | 10 +- .../reference/clis/calicoq/host.mdx | 4 +- .../configure-resources.mdx | 12 +- .../kube-controllers/index.mdx | 2 +- .../reference/installation/_api.mdx | 38 +- .../resources/kubecontrollersconfig.mdx | 4 +- .../version-3.24-1/releases.json | 16 +- .../threat/configuring-webhooks.mdx | 2 +- .../version-3.20-2-sidebars.json | 16 +- .../version-3.21-2-sidebars.json | 16 +- .../version-3.22-2-sidebars.json | 16 +- .../version-3.23-2-sidebars.json | 16 +- .../version-3.24-1-sidebars.json | 16 +- .../components/FelixConfig/config-params.json | 20 +- .../network-policy/comms/secure-metrics.mdx | 76 +- .../configuring/add-maglev-load-balancing.mdx | 2 +- .../monitor/monitor-component-metrics.mdx | 76 +- .../monitor/monitor-component-visual.mdx | 18 +- calico/reference/calicoctl/cluster/diags.mdx | 10 +- calico/reference/index.mdx | 4 +- calico/reference/installation/_api.mdx | 8 +- .../resources/kubecontrollersconfig.mdx | 4 +- .../components/FelixConfig/config-params.json | 12 +- .../network-policy/comms/secure-metrics.mdx | 76 +- .../monitor/monitor-component-metrics.mdx | 76 +- .../monitor/monitor-component-visual.mdx | 18 +- .../version-3.29/reference/index.mdx | 4 +- .../reference/installation/_api.mdx | 8 +- .../resources/kubecontrollersconfig.mdx | 4 +- .../version-3.29/release-notes/index.mdx | 2 +- .../components/FelixConfig/config-params.json | 12 +- .../network-policy/comms/secure-metrics.mdx | 76 +- .../monitor/monitor-component-metrics.mdx | 76 +- .../monitor/monitor-component-visual.mdx | 18 +- .../reference/calicoctl/cluster/diags.mdx | 10 +- .../version-3.30/reference/index.mdx | 4 +- .../reference/installation/_api.mdx | 8 +- .../resources/kubecontrollersconfig.mdx | 4 +- .../components/FelixConfig/config-params.json | 12 +- .../network-policy/comms/secure-metrics.mdx | 76 +- .../monitor/monitor-component-metrics.mdx | 76 +- .../monitor/monitor-component-visual.mdx | 18 +- .../reference/calicoctl/cluster/diags.mdx | 10 +- .../version-3.31/reference/index.mdx | 4 +- .../reference/installation/_api.mdx | 8 +- .../resources/kubecontrollersconfig.mdx | 4 +- .../components/FelixConfig/config-params.json | 20 +- .../network-policy/comms/secure-metrics.mdx | 76 +- .../configuring/add-maglev-load-balancing.mdx | 2 +- .../monitor/monitor-component-metrics.mdx | 76 +- .../monitor/monitor-component-visual.mdx | 18 +- .../reference/calicoctl/cluster/diags.mdx | 10 +- .../version-3.32/reference/index.mdx | 4 +- .../reference/installation/_api.mdx | 8 +- .../resources/kubecontrollersconfig.mdx | 4 +- .../version-3.32/release-notes/index.mdx | 2 +- .../version-3.29-sidebars.json | 6 +- .../version-3.30-sidebars.json | 6 +- .../version-3.31-sidebars.json | 6 +- .../version-3.32-sidebars.json | 6 +- scripts/versions/main.go | 2 +- sidebars-calico-cloud.js | 14 +- sidebars-calico-enterprise.js | 16 +- sidebars-calico.js | 6 +- src/___new___/data/ccImageLists.js | 104 +-- src/utils/linkChecker.js | 2 +- static/_headers | 4 +- static/_redirects | 8 +- static/calico-cloud/llms-full.txt | 414 +++++------ static/calico-cloud/llms.txt | 14 +- static/calico-enterprise/llms-full.txt | 664 +++++++++--------- static/calico-enterprise/llms.txt | 16 +- .../licenses/third-party-attributions.html | 12 +- static/calico/3.26/licenses/index.html | 12 +- .../licenses/third-party-attributions.html | 32 +- .../licenses/third-party-attributions.html | 32 +- .../licenses/third-party-attributions.html | 32 +- .../licenses/third-party-attributions.html | 32 +- .../licenses/third-party-attributions.html | 60 +- .../licenses/third-party-attributions.html | 40 +- static/calico/llms-full.txt | 268 +++---- static/calico/llms.txt | 6 +- static/files/min-ui-user-rbac.yaml | 2 +- static/files/read-all-crud-default-rbac.yaml | 2 +- static/json/calico-api-swagger.json | 2 +- 403 files changed, 3973 insertions(+), 3973 deletions(-) diff --git a/__tests__/crawler.test.js b/__tests__/crawler.test.js index 8f59cc2d4b..916daac095 100644 --- a/__tests__/crawler.test.js +++ b/__tests__/crawler.test.js @@ -135,7 +135,7 @@ test('Crawl the docs and execute tests', async () => { 'https://tools.ietf.org/html/rfc1123', 'http://cr.yp.to/libtai/tai64.html#tai64n', 'https://thenewstack.io/faster-troubleshooting-with-dynamic-packet-capture/', //==>Origin: http://localhost:4242/calico-cloud/visibility/packetcapture - 'https://golang.org/pkg/crypto/tls/#ClientAuthType', //==>Origin: https://downloads.tigera.io/ee/v3.17.0/manifests/tigera-prometheus-operator.yaml. The dead link is automatically redirected to a working page, so no fix needed in the origin. + 'https://golang.org/pkg/crypto/tls/#ClientAuthType', //==>Origin: https://downloads.tigera.io/ee/v3.17.0/manifests/tigera-pickle-operator.yaml. The dead link is automatically redirected to a working page, so no fix needed in the origin. 'https://downloads.tigera.io/ee/archives/release-master-master.tgz', //==> This started after redesigning the archive procedure. 'http://nginx-svc.curl-ns.svc.cluster.local:80', 'http://nginx-svc.service-ns.svc.cluster.local:80', @@ -188,8 +188,8 @@ test('Crawl the docs and execute tests', async () => { 'https://www.tigera.io/blog/why-bgp/', 'https://docs.nginx.com/nginx-ingress-controller/configuration/', 'https://docs.nginx.com/nginx-ingress-controller/configuration/global-configuration/configmap-resource', - 'https://prometheus.io/docs/prometheus/latest/disabled_features/', // ==>Origin: https://downloads.tigera.io/ee/v3.17.4/manifests/tigera-prometheus-operator.yaml - 'https://prometheus.io/docs/prometheus/latest/feature_flags/', // ==>Origin: https://downloads.tigera.io/ee/v3.20.0-1.0/manifests/tigera-prometheus-operator.yaml + 'https://pickle.io/docs/pickle/latest/disabled_features/', // ==>Origin: https://downloads.tigera.io/ee/v3.17.4/manifests/tigera-pickle-operator.yaml + 'https://pickle.io/docs/pickle/latest/feature_flags/', // ==>Origin: https://downloads.tigera.io/ee/v3.20.0-1.0/manifests/tigera-pickle-operator.yaml 'https://docs.fluentd.org/filter/grep', 'https://techcommunity.microsoft.com/t5/networking-blog/direct-server-return-dsr-in-a-nutshell/ba-p/693710', 'https://www.f5.com/glossary/cookie-poisoning', //TEMPORARY diff --git a/__tests__/data/urls_projectcalico.docs.tigera.io.txt b/__tests__/data/urls_projectcalico.docs.tigera.io.txt index c0fd839b11..c1b850a005 100644 --- a/__tests__/data/urls_projectcalico.docs.tigera.io.txt +++ b/__tests__/data/urls_projectcalico.docs.tigera.io.txt @@ -142,7 +142,7 @@ https://projectcalico.docs.tigera.io/getting-started/kubernetes/self-managed-pub https://projectcalico.docs.tigera.io/getting-started/openstack/installation/redhat https://projectcalico.docs.tigera.io/security/http-methods https://projectcalico.docs.tigera.io/reference/vpp/host-network -https://projectcalico.docs.tigera.io/reference/felix/prometheus +https://projectcalico.docs.tigera.io/reference/felix/pickle https://projectcalico.docs.tigera.io/getting-started/kubernetes/hardway/ https://projectcalico.docs.tigera.io/reference/public-cloud/aws https://projectcalico.docs.tigera.io/getting-started/kubernetes/flannel/ @@ -222,8 +222,8 @@ https://projectcalico.docs.tigera.io/getting-started/bare-metal/about https://projectcalico.docs.tigera.io/reference/calicoctl/overview https://projectcalico.docs.tigera.io/reference/etcd-rbac/certificate-generation https://projectcalico.docs.tigera.io/getting-started/bare-metal/installation/binary-mgr -https://projectcalico.docs.tigera.io/reference/kube-controllers/prometheus -https://projectcalico.docs.tigera.io/reference/typha/prometheus +https://projectcalico.docs.tigera.io/reference/kube-controllers/pickle +https://projectcalico.docs.tigera.io/reference/typha/pickle https://projectcalico.docs.tigera.io/reference/architecture/design/l2-interconnect-fabric https://projectcalico.docs.tigera.io/reference/calicoctl/node/ https://projectcalico.docs.tigera.io/maintenance/clis/calicoctl/install#install-calicoctl-as-a-binary-on-a-single-host diff --git a/__tests__/data/urls_with_canonicals.txt b/__tests__/data/urls_with_canonicals.txt index f8d03eb342..c3b9c5aaff 100644 --- a/__tests__/data/urls_with_canonicals.txt +++ b/__tests__/data/urls_with_canonicals.txt @@ -20,7 +20,7 @@ https://docs.tigera.io/v3.8/about/about-calico-enterprise/ https://docs.tigera.io/v3.12/security/aws-integration/aws-security-group-integration https://docs.tigera.io/v3.11/release-notes/ https://docs.tigera.io/v3.9/getting-started/bare-metal/installation/container -https://docs.tigera.io/v3.7/reference/felix/prometheus +https://docs.tigera.io/v3.7/reference/felix/pickle https://docs.tigera.io/v3.7/maintenance/performance/ https://docs.tigera.io/v3.7/compliance/compliance-reports/overview https://docs.tigera.io/v3.7/networking/ @@ -93,7 +93,7 @@ https://docs.tigera.io/v3.7/reference/resources/hostendpoint https://docs.tigera.io/v3.7/getting-started/bare-metal/installation/binary https://docs.tigera.io/v3.7/networking/ipv6 https://docs.tigera.io/v3.0/getting-started/ -https://docs.tigera.io/v3.0/maintenance/monitor/prometheus +https://docs.tigera.io/v3.0/maintenance/monitor/pickle https://docs.tigera.io/v3.7/reference/resources/workloadendpoint https://docs.tigera.io/v3.0/security/logs/elastic/dns https://docs.tigera.io/v3.7/getting-started/kubernetes/requirements @@ -293,7 +293,7 @@ https://docs.tigera.io/v3.7/getting-started/cnx/roles-and-permissions https://docs.tigera.io/v3.7/security/aws-integration/tiers-and-policy https://docs.tigera.io/v3.7/reference/calicoctl/create https://docs.tigera.io/v3.7/maintenance/troubleshoot/component-logs -https://docs.tigera.io/v3.7/reference/kube-controllers/prometheus +https://docs.tigera.io/v3.7/reference/kube-controllers/pickle https://docs.tigera.io/v3.7/reference/resources/networkpolicy https://docs.tigera.io/v3.7/multicluster/federation/aws https://docs.tigera.io/v3.7/visibility/iptables @@ -303,13 +303,13 @@ https://docs.tigera.io/v3.0/reference/typha/configuration https://docs.tigera.io/v3.0/reference/resources/networkpolicy https://docs.tigera.io/v3.0/reference/resources/profile https://docs.tigera.io/v3.0/reference/calicoctl/create -https://docs.tigera.io/v3.7/maintenance/monitor/prometheus +https://docs.tigera.io/v3.7/maintenance/monitor/pickle https://docs.tigera.io/v3.7/security/tutorials/kubernetes-policy-basic https://docs.tigera.io/v3.0/getting-started/bare-metal/installation/container https://docs.tigera.io/v3.7/reference/cni-plugin/configuration https://docs.tigera.io/v3.0/reference/felix/ https://docs.tigera.io/v3.7/reference/host-endpoints/pre-dnat -https://docs.tigera.io/v3.0/reference/felix/prometheus +https://docs.tigera.io/v3.0/reference/felix/pickle https://docs.tigera.io/v3.7/reference/calicoq/overview https://docs.tigera.io/v3.7/networking/mtu https://docs.tigera.io/v3.0/security/tutorials/protect-hosts @@ -625,7 +625,7 @@ https://docs.tigera.io/v3.11/multicluster/federation/ https://docs.tigera.io/v3.13/threat/web-application-firewall https://docs.tigera.io/v3.13/security/tutorials/kubernetes-policy-basic https://docs.tigera.io/v3.11/reference/attribution/attribution -https://docs.tigera.io/v3.6/reference/kube-controllers/prometheus +https://docs.tigera.io/v3.6/reference/kube-controllers/pickle https://docs.tigera.io/v3.6/threat/honeypod/honeypod-controller https://docs.tigera.io/v3.1/reference/calicoctl/node/diags https://docs.tigera.io/v2.7/reference/public-cloud/ @@ -761,7 +761,7 @@ https://docs.tigera.io/v3.3/reference/calicoctl/ipam/show https://docs.tigera.io/v3.1/reference/ https://docs.tigera.io/v3.9/reference/resources/remoteclusterconfiguration https://docs.tigera.io/v3.6/reference/calicoctl/label -https://docs.tigera.io/v3.9/reference/felix/prometheus +https://docs.tigera.io/v3.9/reference/felix/pickle https://docs.tigera.io/v2.7/security/comms/crypto-auth https://docs.tigera.io/v3.13/maintenance/clis/calicoctl/configure/ https://docs.tigera.io/v2.7/reference/architecture/design/l2-interconnect-fabric @@ -793,7 +793,7 @@ https://docs.tigera.io/v3.12/getting-started/calico-enterprise https://docs.tigera.io/v3.12/getting-started/cnx/roles-and-permissions https://docs.tigera.io/v3.9/reference/calicoctl/captured-packets https://docs.tigera.io/v3.9/security/policy-firewalls/ -https://docs.tigera.io/v3.3/maintenance/monitor/prometheus +https://docs.tigera.io/v3.3/maintenance/monitor/pickle https://docs.tigera.io/v3.13/reference/calicoctl/delete https://docs.tigera.io/v3.2/networking/ https://docs.tigera.io/v3.12/reference/calicoq/selectors @@ -830,7 +830,7 @@ https://docs.tigera.io/v3.5/threat/anomaly-detection/customizing https://docs.tigera.io/v3.11/getting-started/windows-calico/ https://docs.tigera.io/v3.4/maintenance/upgrading-calico-to-calico-enterprise https://docs.tigera.io/v3.9/networking/ipv6-control-plane -https://docs.tigera.io/v3.9/maintenance/monitor/prometheus/prometheus +https://docs.tigera.io/v3.9/maintenance/monitor/pickle/pickle https://docs.tigera.io/v3.13/reference/resources/globalnetworkset https://docs.tigera.io/v3.9/security/fortinet-integration/overview https://docs.tigera.io/v3.2/reference/public-cloud/gce @@ -844,13 +844,13 @@ https://docs.tigera.io/v3.13/getting-started/kubernetes/quickstart https://docs.tigera.io/v3.13/reference/calicoctl/ipam/show https://docs.tigera.io/v3.9/reference/calicoctl/node/status https://docs.tigera.io/v3.4/getting-started/windows-calico/limitations -https://docs.tigera.io/v3.5/maintenance/monitor/prometheus +https://docs.tigera.io/v3.5/maintenance/monitor/pickle https://docs.tigera.io/v2.7/reference/host-endpoints/forwarded https://docs.tigera.io/v3.9/maintenance/logstorage/ https://docs.tigera.io/v2.8/reference/resources/licensekey https://docs.tigera.io/v3.2/security/simple-policy-cnx -https://docs.tigera.io/v3.13/reference/felix/prometheus -https://docs.tigera.io/v3.4/maintenance/monitor/prometheus +https://docs.tigera.io/v3.13/reference/felix/pickle +https://docs.tigera.io/v3.4/maintenance/monitor/pickle https://docs.tigera.io/v3.13/reference/architecture/design/l3-interconnect-fabric https://docs.tigera.io/v3.5/getting-started/cnx/access-the-manager https://docs.tigera.io/v3.13/networking/vxlan-ipip @@ -861,7 +861,7 @@ https://docs.tigera.io/v3.1/reference/resources/workloadendpoint https://docs.tigera.io/v3.11/security/panorama-integration/tigera-panorama-address-groups https://docs.tigera.io/v3.5/maintenance/performance/ebpf/ https://docs.tigera.io/v3.3/getting-started/bare-metal/about -https://docs.tigera.io/v3.13/maintenance/monitor/prometheus/alertmanager +https://docs.tigera.io/v3.13/maintenance/monitor/pickle/alertmanager https://docs.tigera.io/v3.9/visibility/elastic/flow/datatypes https://docs.tigera.io/v3.13/policy/ https://docs.tigera.io/v3.12/getting-started/openshift/requirements @@ -957,7 +957,7 @@ https://docs.tigera.io/v3.6/getting-started/bare-metal/installation/ https://docs.tigera.io/v3.2/reference/architecture/design/l3-interconnect-fabric https://docs.tigera.io/v3.9/getting-started/kubernetes/gke https://docs.tigera.io/v3.13/reference/calicoq/endpoint -https://docs.tigera.io/v3.13/maintenance/monitor/prometheus/prometheus +https://docs.tigera.io/v3.13/maintenance/monitor/pickle/pickle https://docs.tigera.io/v3.2/reference/host-endpoints/summary https://docs.tigera.io/v3.11/security/fortinet-integration/firewall-integration https://docs.tigera.io/v3.9/threat/tor-vpn-feed-and-dashboard @@ -973,7 +973,7 @@ https://docs.tigera.io/v3.6/reference/architecture/design/l2-interconnect-fabric https://docs.tigera.io/v3.12/compliance/compliance-reports-cis https://docs.tigera.io/v3.2/reference/calicoctl/patch https://docs.tigera.io/v3.3/reference/calicoctl/convert -https://docs.tigera.io/v2.7/reference/felix/prometheus +https://docs.tigera.io/v2.7/reference/felix/pickle https://docs.tigera.io/v3.12/networking/custom-bgp-config https://docs.tigera.io/v3.6/networking/workloads-outside-cluster https://docs.tigera.io/v3.11/reference/host-endpoints/summary @@ -1029,13 +1029,13 @@ https://docs.tigera.io/v3.13/security/default-deny https://docs.tigera.io/v3.13/getting-started/windows-calico/troubleshoot https://docs.tigera.io/v3.6/threat/ingress https://docs.tigera.io/v3.13/maintenance/logstorage/log-storage-recommendations -https://docs.tigera.io/v3.5/reference/felix/prometheus +https://docs.tigera.io/v3.5/reference/felix/pickle https://docs.tigera.io/v3.1/reference/architecture/design/l2-interconnect-fabric https://docs.tigera.io/v3.6/multicluster/ https://docs.tigera.io/v3.13/security/external-ips-policy https://docs.tigera.io/v3.13/threat/honeypod/honeypod-controller https://docs.tigera.io/v3.5/multicluster/federation/ -https://docs.tigera.io/v3.12/maintenance/monitor/prometheus/alertmanager +https://docs.tigera.io/v3.12/maintenance/monitor/pickle/alertmanager https://docs.tigera.io/v3.6/getting-started/private-registry/private-registry-image-path https://docs.tigera.io/v3.13/security/fortinet-integration/overview https://docs.tigera.io/v3.9/threat/anomaly-detection/overview @@ -1149,7 +1149,7 @@ https://docs.tigera.io/v3.6/getting-started/openshift/ https://docs.tigera.io/v3.12/reference/host-endpoints/failsafe https://docs.tigera.io/v2.7/reference/calicoq/overview https://docs.tigera.io/v3.9/visibility/alerts -https://docs.tigera.io/v3.11/maintenance/monitor/prometheus/alertmanager +https://docs.tigera.io/v3.11/maintenance/monitor/pickle/alertmanager https://docs.tigera.io/v3.3/reference/resources/managedcluster https://docs.tigera.io/v3.4/reference/calicoctl/replace https://docs.tigera.io/v3.13/security/policy-firewalls/ @@ -1321,7 +1321,7 @@ https://docs.tigera.io/v3.9/reference/cni-plugin/configuration https://docs.tigera.io/v2.8/networking/assign-ip-addresses-topology https://docs.tigera.io/v3.12/networking/ipv6 https://docs.tigera.io/v3.9/getting-started/install-on-clusters/ -https://docs.tigera.io/v3.12/maintenance/monitor/prometheus/byo-prometheus +https://docs.tigera.io/v3.12/maintenance/monitor/pickle/byo-pickle https://docs.tigera.io/v3.9/visibility/elastic/bgp https://docs.tigera.io/v3.4/reference/resources/packetcapture https://docs.tigera.io/v3.13/multicluster/federation/overview @@ -1412,7 +1412,7 @@ https://docs.tigera.io/v3.11/security/ https://docs.tigera.io/v3.13/getting-started/cnx/authentication-quickstart https://docs.tigera.io/v2.7/security/logs/elastic/dns https://docs.tigera.io/v3.12/networking/mtu -https://docs.tigera.io/v3.11/maintenance/monitor/prometheus/prometheus +https://docs.tigera.io/v3.11/maintenance/monitor/pickle/pickle https://docs.tigera.io/v3.12/security/simple-policy-cnx https://docs.tigera.io/v3.6/reference/host-endpoints/summary https://docs.tigera.io/v3.11/about/about-calico-enterprise @@ -1433,7 +1433,7 @@ https://docs.tigera.io/v3.2/getting-started/private-registry/private-registry-re https://docs.tigera.io/v3.13/security/training/about-kubernetes-services https://docs.tigera.io/v3.13/reference/resources/deeppacketinspection https://docs.tigera.io/v3.9/security/training/about-network-policy -https://docs.tigera.io/v3.13/maintenance/monitor/prometheus/ +https://docs.tigera.io/v3.13/maintenance/monitor/pickle/ https://docs.tigera.io/v3.4/reference/public-cloud/gce https://docs.tigera.io/v3.9/threat/honeypod/ https://docs.tigera.io/v3.11/reference/host-endpoints/failsafe @@ -1586,7 +1586,7 @@ https://docs.tigera.io/v3.9/security/beginners https://docs.tigera.io/v3.13/reference/host-endpoints/pre-dnat https://docs.tigera.io/v3.9/security/ https://docs.tigera.io/v3.12/reference/resources/overview -https://docs.tigera.io/v3.12/maintenance/monitor/prometheus/ +https://docs.tigera.io/v3.12/maintenance/monitor/pickle/ https://docs.tigera.io/v3.11/security/aws-integration/get-started https://docs.tigera.io/v3.11/reference/calicoctl/captured-packets https://docs.tigera.io/v3.12/security/comms/crypto-auth @@ -1618,7 +1618,7 @@ https://docs.tigera.io/v3.12/networking/bgp https://docs.tigera.io/v3.5/security/kubernetes-nodes https://docs.tigera.io/v3.13/reference/calicoctl/ipam/configure https://docs.tigera.io/v3.5/visibility/elastic/flow/datatypes -https://docs.tigera.io/v3.4/reference/felix/prometheus +https://docs.tigera.io/v3.4/reference/felix/pickle https://docs.tigera.io/v3.12/multicluster/federation/aws https://docs.tigera.io/v3.5/maintenance/upgrading-calico-to-calico-enterprise https://docs.tigera.io/v3.9/reference/calicoctl/version @@ -1695,7 +1695,7 @@ https://docs.tigera.io/v3.13/networking/bgp https://docs.tigera.io/v3.13/getting-started/windows-calico/kubernetes/standard https://docs.tigera.io/v3.9/reference/resources/profile https://docs.tigera.io/v3.13/threat/ -https://docs.tigera.io/v3.11/maintenance/monitor/prometheus/ +https://docs.tigera.io/v3.11/maintenance/monitor/pickle/ https://docs.tigera.io/v3.11/multicluster/mcm/fine-tune-deployment https://docs.tigera.io/v3.9/multicluster/mcm/configure https://docs.tigera.io/v3.3/reference/resources/kubecontrollersconfig @@ -1704,13 +1704,13 @@ https://docs.tigera.io/v3.11/networking/ipv6 https://docs.tigera.io/v3.13/threat/suspicious-ips https://docs.tigera.io/v3.9/security/fortinet-integration/firewall-integration https://docs.tigera.io/v3.12/reference/calicoctl/node/diags -https://docs.tigera.io/v3.6/reference/felix/prometheus +https://docs.tigera.io/v3.6/reference/felix/pickle https://docs.tigera.io/v3.11/threat/anomaly-detection/monitoring https://docs.tigera.io/v3.6/reference/host-endpoints/overview https://docs.tigera.io/v2.7/reference/cni-plugin/configuration https://docs.tigera.io/v3.4/security/aws-integration/metadata-access https://docs.tigera.io/v3.2/reference/host-endpoints/objects -https://docs.tigera.io/v3.12/reference/kube-controllers/prometheus +https://docs.tigera.io/v3.12/reference/kube-controllers/pickle https://docs.tigera.io/v3.12/threat/ https://docs.tigera.io/v3.13/maintenance/clis/calicoq/configure/overview https://docs.tigera.io/v2.7/reference/calicoq/version @@ -1757,7 +1757,7 @@ https://docs.tigera.io/v3.13/getting-started/windows-calico/kubernetes/requireme https://docs.tigera.io/v3.13/reference/calicoq/selectors https://docs.tigera.io/v3.11/visibility/elastic/rbac-elasticsearch https://docs.tigera.io/v3.9/getting-started/windows-calico/demo -https://docs.tigera.io/v3.13/maintenance/monitor/prometheus/byo-prometheus +https://docs.tigera.io/v3.13/maintenance/monitor/pickle/byo-pickle https://docs.tigera.io/v3.4/security/aws-integration/tiers-and-policy https://docs.tigera.io/v3.1/reference/architecture/overview https://docs.tigera.io/v3.11/visibility/iptables @@ -1799,7 +1799,7 @@ https://docs.tigera.io/v3.11/visibility/elastic/dns/filtering-dns https://docs.tigera.io/v3.6/visibility/elastic/filtering-dns https://docs.tigera.io/v3.13/visibility/elastic/flow/hep https://docs.tigera.io/v3.11/maintenance/kubernetes-upgrade-tsee/operator -https://docs.tigera.io/v3.6/maintenance/monitor/prometheus +https://docs.tigera.io/v3.6/maintenance/monitor/pickle https://docs.tigera.io/v3.6/reference/calicoctl/datastore/migrate/unlock https://docs.tigera.io/v3.12/visibility/elastic/bgp https://docs.tigera.io/v3.3/getting-started/openshift/requirements @@ -1843,7 +1843,7 @@ https://docs.tigera.io/v3.6/security/aws-integration/aws-security-group-integrat https://docs.tigera.io/v3.4/security/fortinet-integration/fortimgr-integration https://docs.tigera.io/v3.11/reference/architecture/design/l3-interconnect-fabric https://docs.tigera.io/v3.13/visibility/elastic/audit-overview -https://docs.tigera.io/v3.2/maintenance/monitor/prometheus +https://docs.tigera.io/v3.2/maintenance/monitor/pickle https://docs.tigera.io/v3.3/reference/resources/overview https://docs.tigera.io/v3.9/reference/resources/packetcapture https://docs.tigera.io/v3.9/reference/calicoctl/delete @@ -1873,7 +1873,7 @@ https://docs.tigera.io/v3.4/reference/resources/kubecontrollersconfig https://docs.tigera.io/v3.3/security/logs/elastic/view https://docs.tigera.io/v3.12/reference/calicoctl/version https://docs.tigera.io/v3.9/networking/bgp -https://docs.tigera.io/v3.9/maintenance/monitor/prometheus/ +https://docs.tigera.io/v3.9/maintenance/monitor/pickle/ https://docs.tigera.io/v3.9/networking/mtu https://docs.tigera.io/v3.9/reference/calicoctl/node/run https://docs.tigera.io/v3.5/visibility/elastic/filtering-dns @@ -1883,7 +1883,7 @@ https://docs.tigera.io/v2.7/getting-started/bare-metal/installation/container https://docs.tigera.io/v3.13/reference/faq https://docs.tigera.io/v3.12/compliance/ https://docs.tigera.io/v3.5/reference/calicoctl/node/diags -https://docs.tigera.io/v3.12/reference/felix/prometheus +https://docs.tigera.io/v3.12/reference/felix/pickle https://docs.tigera.io/v3.9/networking/training/about-kubernetes-networking https://docs.tigera.io/v3.13/getting-started/private-registry/private-registry-regular https://docs.tigera.io/v3.13/getting-started/kubernetes/rancher @@ -1941,7 +1941,7 @@ https://docs.tigera.io/v2.7/getting-started/kubernetes/requirements https://docs.tigera.io/v3.4/getting-started/kubernetes/aks https://docs.tigera.io/v3.9/security/comms/secure-bgp https://docs.tigera.io/v3.6/maintenance/troubleshoot/component-logs -https://docs.tigera.io/v3.9/reference/kube-controllers/prometheus +https://docs.tigera.io/v3.9/reference/kube-controllers/pickle https://docs.tigera.io/v3.9/reference/ https://docs.tigera.io/v3.11/visibility/elastic/retention https://docs.tigera.io/v3.13/reference/host-endpoints/summary @@ -2045,7 +2045,7 @@ https://docs.tigera.io/v3.5/getting-started/openshift/ https://docs.tigera.io/v3.3/maintenance/clis/calicoctl/install https://docs.tigera.io/v3.11/maintenance/decommissioning-a-node https://docs.tigera.io/v3.5/getting-started/private-registry/private-registry-regular -https://docs.tigera.io/v3.11/reference/felix/prometheus +https://docs.tigera.io/v3.11/reference/felix/pickle https://docs.tigera.io/v3.9/multicluster/federation/services-controller https://docs.tigera.io/v3.11/reference/public-cloud/ https://docs.tigera.io/v3.13/maintenance/ebpf/ @@ -2192,7 +2192,7 @@ https://docs.tigera.io/v3.11/reference/calicoctl/node/overview https://docs.tigera.io/v3.13/reference/felix/ https://docs.tigera.io/v3.4/getting-started/openshift/ https://docs.tigera.io/v3.9/reference/component-resources/ -https://docs.tigera.io/v3.11/reference/kube-controllers/prometheus +https://docs.tigera.io/v3.11/reference/kube-controllers/pickle https://docs.tigera.io/v3.13/security/tutorials/kubernetes-policy-advanced https://docs.tigera.io/v3.2/security/aws-integration/metadata-access https://docs.tigera.io/v3.12/security/fortinet-integration/fortimgr-integration @@ -2235,12 +2235,12 @@ https://docs.tigera.io/v3.11/reference/faq https://docs.tigera.io/v3.5/visibility/elastic/l7/datatypes https://docs.tigera.io/v3.13/getting-started/ https://docs.tigera.io/v3.12/visibility/elastic/flow/ -https://docs.tigera.io/v3.12/maintenance/monitor/prometheus/prometheus +https://docs.tigera.io/v3.12/maintenance/monitor/pickle/pickle https://docs.tigera.io/v3.12/reference/public-cloud/gce -https://docs.tigera.io/v3.1/reference/felix/prometheus +https://docs.tigera.io/v3.1/reference/felix/pickle https://docs.tigera.io/v3.1/security/ingress https://docs.tigera.io/v3.9/reference/calicoctl/datastore/overview -https://docs.tigera.io/v3.13/reference/kube-controllers/prometheus +https://docs.tigera.io/v3.13/reference/kube-controllers/pickle https://docs.tigera.io/v3.11/maintenance/clis/calicoctl/configure/ https://docs.tigera.io/v3.9/maintenance/clis/calicoctl/configure/ https://docs.tigera.io/v3.3/reference/calicoctl/node/status @@ -2352,7 +2352,7 @@ https://docs.tigera.io/v2.8/networking/custom-bgp-config https://docs.tigera.io/v3.5/maintenance/logstorage/log-storage-requirements https://docs.tigera.io/v3.13/maintenance/decommissioning-a-node https://docs.tigera.io/v3.6/maintenance/troubleshoot/troubleshoot-ebpf -https://docs.tigera.io/v3.9/maintenance/monitor/prometheus/alertmanager +https://docs.tigera.io/v3.9/maintenance/monitor/pickle/alertmanager https://docs.tigera.io/v3.6/getting-started/bare-metal/installation/container https://docs.tigera.io/v3.6/getting-started/kubernetes/gke https://docs.tigera.io/v3.12/multicluster/mcm/fine-tune-deployment @@ -2493,7 +2493,7 @@ https://docs.tigera.io/v3.8/reference/architecture/design/l2-interconnect-fabric https://docs.tigera.io/v3.10/maintenance/monitor/metrics/license-agent https://docs.tigera.io/v3.8/reference/resources/globalnetworkpolicy https://docs.tigera.io/v3.8/reference/calicoctl/replace -https://docs.tigera.io/v3.8/maintenance/monitor/prometheus/prometheus +https://docs.tigera.io/v3.8/maintenance/monitor/pickle/pickle https://docs.tigera.io/v3.8/visibility/elastic/archive-storage https://docs.tigera.io/v3.8/getting-started/bare-metal/ https://docs.tigera.io/v3.10/maintenance/logstorage/ @@ -2582,7 +2582,7 @@ https://docs.tigera.io/v3.10/security/aws-integration/get-started https://docs.tigera.io/v3.10/reference/calicoctl/ipam/check https://docs.tigera.io/v3.8/getting-started/kubernetes/quickstart https://docs.tigera.io/v3.10/reference/dikastes/configuration -https://docs.tigera.io/v3.10/reference/kube-controllers/prometheus +https://docs.tigera.io/v3.10/reference/kube-controllers/pickle https://docs.tigera.io/v3.8/security/tutorials/kubernetes-policy-advanced https://docs.tigera.io/v3.10/reference/resources/workloadendpoint https://docs.tigera.io/v3.8/security/ @@ -2623,7 +2623,7 @@ https://docs.tigera.io/v3.10/getting-started/install-on-clusters/ https://docs.tigera.io/v3.8/reference/felix/ https://docs.tigera.io/v3.8/reference/resources/workloadendpoint https://docs.tigera.io/v3.10/threat/ -https://docs.tigera.io/v3.10/reference/felix/prometheus +https://docs.tigera.io/v3.10/reference/felix/pickle https://docs.tigera.io/v3.8/reference/calicoq/policy https://docs.tigera.io/v3.8/reference/architecture/design/l3-interconnect-fabric https://docs.tigera.io/v3.10/reference/calicoctl/ipam/release @@ -2664,7 +2664,7 @@ https://docs.tigera.io/v3.8/maintenance/troubleshoot/ https://docs.tigera.io/v3.10/security/comms/certificate-management https://docs.tigera.io/v3.8/security/tiered-policy https://docs.tigera.io/v3.10/reference/host-endpoints/objects -https://docs.tigera.io/v3.8/reference/felix/prometheus +https://docs.tigera.io/v3.8/reference/felix/pickle https://docs.tigera.io/v3.10/reference/public-cloud/azure https://docs.tigera.io/v3.10/visibility/elastic/kube-audit https://docs.tigera.io/v3.10/policy/ @@ -2704,11 +2704,11 @@ https://docs.tigera.io/v3.10/maintenance/clis/calicoctl/ https://docs.tigera.io/v3.8/threat/suspicious-ips https://docs.tigera.io/v3.8/security/comms/crypto-auth https://docs.tigera.io/v3.10/maintenance/monitor/metrics/bgp-metrics -https://docs.tigera.io/v3.8/maintenance/monitor/prometheus/ +https://docs.tigera.io/v3.8/maintenance/monitor/pickle/ https://docs.tigera.io/v3.8/maintenance/ebpf/ https://docs.tigera.io/v3.8/security/tutorials/kubernetes-policy-basic https://docs.tigera.io/v3.10/reference/resources/globalnetworkpolicy -https://docs.tigera.io/v3.8/maintenance/monitor/prometheus/alertmanager +https://docs.tigera.io/v3.8/maintenance/monitor/pickle/alertmanager https://docs.tigera.io/v3.10/about/about-calico-enterprise https://docs.tigera.io/v3.8/security/tutorials/app-layer-policy/enforce-policy-istio https://docs.tigera.io/v3.8/getting-started/private-registry/private-registry-image-path @@ -3013,7 +3013,7 @@ https://docs.tigera.io/archive/v3.18/reference/etcd-rbac/calico-etcdv3-paths https://docs.tigera.io/archive/v3.22/getting-started/windows-calico/demo https://docs.tigera.io/archive/v3.19/security/tutorials/kubernetes-policy-advanced https://docs.tigera.io/archive/v3.17/reference/calicoctl/node/status -https://docs.tigera.io/archive/v3.13/reference/felix/prometheus +https://docs.tigera.io/archive/v3.13/reference/felix/pickle https://docs.tigera.io/archive/v3.22/maintenance/install-apiserver https://docs.tigera.io/archive/v3.19/reference/calicoctl/patch https://docs.tigera.io/archive/v3.19/getting-started/bare-metal/installation/binary @@ -3242,7 +3242,7 @@ https://docs.tigera.io/archive/v3.14/getting-started/kubernetes/installation/con https://docs.tigera.io/archive/v3.19/getting-started/kubernetes/hardway/configure-bgp-peering https://docs.tigera.io/archive/v3.20/reference/calicoctl/node/overview https://docs.tigera.io/archive/v3.17/reference/architecture/overview -https://docs.tigera.io/v3.12/maintenance/monitor/prometheus +https://docs.tigera.io/v3.12/maintenance/monitor/pickle https://docs.tigera.io/archive/v3.12/getting-started/kubernetes/hardway/the-calico-datastore https://docs.tigera.io/archive/v3.12/reference/typha/configuration https://docs.tigera.io/archive/v3.19/reference/calicoctl/replace @@ -3273,7 +3273,7 @@ https://docs.tigera.io/archive/v3.23/reference/resources/node https://docs.tigera.io/archive/v3.15/getting-started/openshift/installation https://docs.tigera.io/archive/v3.22/reference/calicoctl/get https://docs.tigera.io/archive/v3.23/reference/public-cloud/ -https://docs.tigera.io/archive/v3.22/reference/kube-controllers/prometheus +https://docs.tigera.io/archive/v3.22/reference/kube-controllers/pickle https://docs.tigera.io/archive/v3.19/reference/host-endpoints/connectivity https://docs.tigera.io/archive/v3.20/security/kubernetes-default-deny https://docs.tigera.io/archive/v3.22/maintenance/troubleshoot/troubleshooting @@ -3288,7 +3288,7 @@ https://docs.tigera.io/archive/v3.21/reference/legal/node https://docs.tigera.io/archive/v3.22/reference/host-endpoints/summary https://docs.tigera.io/archive/v3.12/networking/ https://docs.tigera.io/archive/v3.13/reference/architecture/overview -https://docs.tigera.io/archive/v3.20/reference/felix/prometheus +https://docs.tigera.io/archive/v3.20/reference/felix/pickle https://docs.tigera.io/archive/v3.20/security/tutorials/protect-hosts https://docs.tigera.io/archive/v3.14/networking/openstack/configuration https://docs.tigera.io/archive/v3.12/security/comms/reduce-nodes @@ -3427,7 +3427,7 @@ https://docs.tigera.io/archive/v3.13/reference/host-endpoints/pre-dnat https://docs.tigera.io/archive/v3.15/reference/calicoctl/node/diags https://docs.tigera.io/archive/v3.22/reference/calicoctl/delete https://docs.tigera.io/archive/v3.19/getting-started/windows-calico/openshift/ -https://docs.tigera.io/archive/v3.14/reference/felix/prometheus +https://docs.tigera.io/archive/v3.14/reference/felix/pickle https://docs.tigera.io/archive/v3.22/reference/faq https://docs.tigera.io/archive/v3.18/getting-started/kubernetes/hardway/configure-ip-pools https://docs.tigera.io/archive/v3.22/reference/resources/networkpolicy @@ -3483,7 +3483,7 @@ https://docs.tigera.io/archive/v3.15/getting-started/openstack/requirements https://docs.tigera.io/archive/v3.22/getting-started/windows-calico/limitations https://docs.tigera.io/archive/v3.16/reference/etcd-rbac/kubernetes-advanced https://docs.tigera.io/archive/v3.13/reference/calicoctl/apply -https://docs.tigera.io/archive/v3.15/reference/felix/prometheus +https://docs.tigera.io/archive/v3.15/reference/felix/pickle https://docs.tigera.io/archive/v3.16/getting-started/clis/calicoctl/ https://docs.tigera.io/archive/v3.14/networking/bgp https://docs.tigera.io/archive/v3.16/reference/host-endpoints/failsafe @@ -3573,7 +3573,7 @@ https://docs.tigera.io/archive/v3.22/getting-started/kubernetes/hardway/install- https://docs.tigera.io/archive/v3.22/maintenance/troubleshoot/commands https://docs.tigera.io/archive/v3.20/getting-started/kubernetes/k3s/multi-node-install https://docs.tigera.io/archive/v3.22/security/comms/ -https://docs.tigera.io/archive/v3.22/reference/felix/prometheus +https://docs.tigera.io/archive/v3.22/reference/felix/pickle https://docs.tigera.io/archive/v3.21/getting-started/openstack/installation/ubuntu https://docs.tigera.io/archive/v3.13/reference/faq https://docs.tigera.io/archive/v3.13/maintenance/kubernetes-upgrade @@ -3987,15 +3987,15 @@ https://docs.tigera.io/archive/v3.20/getting-started/windows-calico/openshift/in https://docs.tigera.io/archive/v3.16/reference/public-cloud/azure https://docs.tigera.io/archive/v3.18/networking/openstack/dev-machine-setup https://docs.tigera.io/archive/v3.18/networking/ipv6 -https://docs.tigera.io/archive/v3.23/reference/felix/prometheus +https://docs.tigera.io/archive/v3.23/reference/felix/pickle https://docs.tigera.io/archive/v3.22/release-notes/ https://docs.tigera.io/archive/v3.23/reference/host-endpoints/forwarded -https://docs.tigera.io/archive/v3.18/reference/kube-controllers/prometheus +https://docs.tigera.io/archive/v3.18/reference/kube-controllers/pickle https://docs.tigera.io/v3.12/getting-started/openshift/installation/index https://docs.tigera.io/archive/v3.20/getting-started/kubernetes/installation/config-options https://docs.tigera.io/archive/v3.12/reference/dikastes/configuration https://docs.tigera.io/archive/v3.20/reference/etcd-rbac/calico-etcdv3-paths -https://docs.tigera.io/archive/v3.20/reference/kube-controllers/prometheus +https://docs.tigera.io/archive/v3.20/reference/kube-controllers/pickle https://docs.tigera.io/archive/v3.22/getting-started/openstack/installation/overview https://docs.tigera.io/archive/v3.12/reference/involved https://docs.tigera.io/archive/v3.13/networking/use-ipvs @@ -4015,7 +4015,7 @@ https://docs.tigera.io/archive/v3.12/getting-started/kubernetes/installation/con https://docs.tigera.io/archive/v3.20/reference/legal/node https://docs.tigera.io/v3.12/maintenance/monitor/metrics https://docs.tigera.io/archive/v3.21/getting-started/kubernetes/hardway/configure-bgp-peering -https://docs.tigera.io/archive/v3.23/reference/kube-controllers/prometheus +https://docs.tigera.io/archive/v3.23/reference/kube-controllers/pickle https://docs.tigera.io/archive/v3.12/getting-started/kubernetes/hardway/configure-ip-pools https://docs.tigera.io/archive/v3.18/getting-started/kubernetes/hardway/install-node https://docs.tigera.io/v3.9/reference @@ -4054,7 +4054,7 @@ https://docs.tigera.io/archive/v3.19/networking/workloads-outside-cluster https://docs.tigera.io/v3.7/getting-started/cnx//access-the-manager https://docs.tigera.io/archive/v3.20/reference/calicoctl/create https://docs.tigera.io/archive/v3.21/networking/openstack/ -https://docs.tigera.io/v3.13/maintenance/monitor/prometheus +https://docs.tigera.io/v3.13/maintenance/monitor/pickle https://docs.tigera.io/archive/v3.12/getting-started/openshift/ https://docs.tigera.io/archive/v3.12/getting-started/bare-metal/installation/binary https://docs.tigera.io/archive/v3.17/reference/resources/globalnetworkset @@ -4075,7 +4075,7 @@ https://docs.tigera.io/archive/v3.17/getting-started/windows-calico/kubernetes/r https://docs.tigera.io/archive/v3.21/reference/etcd-rbac/overview https://docs.tigera.io/archive/v3.14/reference/host-endpoints/pre-dnat https://docs.tigera.io/archive/v3.22/getting-started/kubernetes/k3s/multi-node-install -https://docs.tigera.io/archive/v3.21/reference/kube-controllers/prometheus +https://docs.tigera.io/archive/v3.21/reference/kube-controllers/pickle https://docs.tigera.io/archive/v3.14/reference/calicoctl/ipam/configure https://docs.tigera.io/archive/v3.12/reference/resources/felixconfig https://docs.tigera.io/archive/v3.14/reference/calicoctl/ipam/overview @@ -4148,7 +4148,7 @@ https://docs.tigera.io/archive/v3.23/getting-started/kubernetes/minikube https://docs.tigera.io/archive/v3.13/reference/host-endpoints/selector https://docs.tigera.io/archive/v3.23/reference/legal/node https://docs.tigera.io/archive/v3.12/getting-started/openstack/requirements -https://docs.tigera.io/archive/v3.12/reference/felix/prometheus +https://docs.tigera.io/archive/v3.12/reference/felix/pickle https://docs.tigera.io/archive/v3.17/getting-started/kubernetes/hardway/install-node https://docs.tigera.io/archive/v3.14/reference/calicoctl/ipam/release https://docs.tigera.io/archive/v3.23/maintenance/clis/calicoctl @@ -4246,7 +4246,7 @@ https://docs.tigera.io/archive/v3.15/reference/calicoctl/ipam/release https://docs.tigera.io/archive/v3.22/networking/openstack/semantics https://docs.tigera.io/archive/v3.21/networking/openstack/configuration https://docs.tigera.io/archive/v3.20/security/ -https://docs.tigera.io/archive/v3.18/reference/felix/prometheus +https://docs.tigera.io/archive/v3.18/reference/felix/pickle https://docs.tigera.io/archive/v3.22/getting-started/openshift/requirements https://docs.tigera.io/archive/v3.23/reference/ https://docs.tigera.io/archive/v3.23/getting-started/windows-calico/kubernetes/requirements @@ -4348,7 +4348,7 @@ https://docs.tigera.io/archive/v3.19/maintenance/openstack-upgrade https://docs.tigera.io/archive/v3.22/reference/resources/networkset https://docs.tigera.io/archive/v3.12/reference/calicoctl/overview https://docs.tigera.io/archive/v3.23/security/tutorials/kubernetes-policy-advanced -https://docs.tigera.io/archive/v3.19/reference/felix/prometheus +https://docs.tigera.io/archive/v3.19/reference/felix/pickle https://docs.tigera.io/archive/v3.20/networking https://docs.tigera.io/archive/v3.15/getting-started/kubernetes/hardway/the-calico-datastore https://docs.tigera.io/archive/v3.23/getting-started/openstack/verification @@ -4391,7 +4391,7 @@ https://docs.tigera.io/archive/v3.14/security/tutorials/app-layer-policy/enforce https://docs.tigera.io/archive/v3.21/getting-started/kubernetes/helm https://docs.tigera.io/archive/v3.16/getting-started/kubernetes/hardway/install-typha https://docs.tigera.io/archive/v3.23/getting-started/kubernetes/hardway/istio-integration -https://docs.tigera.io/v3.11/maintenance/monitor/prometheus +https://docs.tigera.io/v3.11/maintenance/monitor/pickle https://docs.tigera.io/archive/v3.15/reference/resources/networkpolicy https://docs.tigera.io/archive/v3.22/networking/openstack/floating-ips https://docs.tigera.io/archive/v3.22/getting-started/ @@ -4412,7 +4412,7 @@ https://docs.tigera.io/archive/v3.19/reference/node/configuration https://docs.tigera.io/archive/v3.23/about/ https://docs.tigera.io/archive/v3.21/reference/architecture/design/l2-interconnect-fabric https://docs.tigera.io/archive/v3.17/networking/openstack/configuration -https://docs.tigera.io/archive/v3.17/reference/felix/prometheus +https://docs.tigera.io/archive/v3.17/reference/felix/pickle https://docs.tigera.io/archive/v3.12/getting-started/kubernetes/hardway/install-node https://docs.tigera.io/archive/v3.20/networking/openstack/configuration https://docs.tigera.io/archive/v3.19/reference/calicoctl/label @@ -4445,7 +4445,7 @@ https://docs.tigera.io/archive/v3.23/getting-started/kubernetes/k3s/multi-node-i https://docs.tigera.io/archive/v3.15/networking/workloads-outside-cluster https://docs.tigera.io/archive/v3.17/maintenance/troubleshoot/troubleshoot-ebpf https://docs.tigera.io/archive/v3.18/reference/host-endpoints/forwarded -https://docs.tigera.io/v3.9/maintenance/monitor/prometheus +https://docs.tigera.io/v3.9/maintenance/monitor/pickle https://docs.tigera.io/archive/v3.16/getting-started/clis/calicoctl/configure/overview https://docs.tigera.io/archive/v3.22/security/comms/crypto-auth https://docs.tigera.io/archive/v3.18/maintenance/ diff --git a/calico-cloud/_includes/components/FelixConfig/config-params.json b/calico-cloud/_includes/components/FelixConfig/config-params.json index 8f6cd44252..02ae543838 100644 --- a/calico-cloud/_includes/components/FelixConfig/config-params.json +++ b/calico-cloud/_includes/components/FelixConfig/config-params.json @@ -1027,7 +1027,7 @@ "GroupWithSortPrefix": "00 Process: Prometheus metrics", "NameConfigFile": "PrometheusGoMetricsEnabled", "NameEnvVar": "FELIX_PrometheusGoMetricsEnabled", - "NameYAML": "prometheusGoMetricsEnabled", + "NameYAML": "pickleGoMetricsEnabled", "NameGoAPI": "PrometheusGoMetricsEnabled", "StringSchema": "Boolean: `true`, `1`, `yes`, `y`, `t` accepted as True; `false`, `0`, `no`, `n`, `f` accepted (case insensitively) as False.", "StringSchemaHTML": "Boolean: true, 1, yes, y, t accepted as True; false, 0, no, n, f accepted (case insensitively) as False.", @@ -1054,7 +1054,7 @@ "GroupWithSortPrefix": "00 Process: Prometheus metrics", "NameConfigFile": "PrometheusMetricsCAFile", "NameEnvVar": "FELIX_PrometheusMetricsCAFile", - "NameYAML": "prometheusMetricsCAFile", + "NameYAML": "pickleMetricsCAFile", "NameGoAPI": "PrometheusMetricsCAFile", "StringSchema": "Path to file, which must exist", "StringSchemaHTML": "Path to file, which must exist", @@ -1081,7 +1081,7 @@ "GroupWithSortPrefix": "00 Process: Prometheus metrics", "NameConfigFile": "PrometheusMetricsCertFile", "NameEnvVar": "FELIX_PrometheusMetricsCertFile", - "NameYAML": "prometheusMetricsCertFile", + "NameYAML": "pickleMetricsCertFile", "NameGoAPI": "PrometheusMetricsCertFile", "StringSchema": "Path to file, which must exist", "StringSchemaHTML": "Path to file, which must exist", @@ -1108,7 +1108,7 @@ "GroupWithSortPrefix": "00 Process: Prometheus metrics", "NameConfigFile": "PrometheusMetricsClientAuth", "NameEnvVar": "FELIX_PrometheusMetricsClientAuth", - "NameYAML": "prometheusMetricsClientAuth", + "NameYAML": "pickleMetricsClientAuth", "NameGoAPI": "PrometheusMetricsClientAuth", "StringSchema": "One of: `NoClientCert`, `RequireAndVerifyClientCert`, `RequireAnyClientCert`, `VerifyClientCertIfGiven` (case insensitive)", "StringSchemaHTML": "One of: NoClientCert, RequireAndVerifyClientCert, RequireAnyClientCert, VerifyClientCertIfGiven (case insensitive)", @@ -1135,7 +1135,7 @@ "GroupWithSortPrefix": "00 Process: Prometheus metrics", "NameConfigFile": "PrometheusMetricsEnabled", "NameEnvVar": "FELIX_PrometheusMetricsEnabled", - "NameYAML": "prometheusMetricsEnabled", + "NameYAML": "pickleMetricsEnabled", "NameGoAPI": "PrometheusMetricsEnabled", "StringSchema": "Boolean: `true`, `1`, `yes`, `y`, `t` accepted as True; `false`, `0`, `no`, `n`, `f` accepted (case insensitively) as False.", "StringSchemaHTML": "Boolean: true, 1, yes, y, t accepted as True; false, 0, no, n, f accepted (case insensitively) as False.", @@ -1162,7 +1162,7 @@ "GroupWithSortPrefix": "00 Process: Prometheus metrics", "NameConfigFile": "PrometheusMetricsHost", "NameEnvVar": "FELIX_PrometheusMetricsHost", - "NameYAML": "prometheusMetricsHost", + "NameYAML": "pickleMetricsHost", "NameGoAPI": "PrometheusMetricsHost", "StringSchema": "String matching regex `^[a-zA-Z0-9:._+-]{1,64}$`", "StringSchemaHTML": "String matching regex ^[a-zA-Z0-9:._+-]{1,64}$", @@ -1189,7 +1189,7 @@ "GroupWithSortPrefix": "00 Process: Prometheus metrics", "NameConfigFile": "PrometheusMetricsKeyFile", "NameEnvVar": "FELIX_PrometheusMetricsKeyFile", - "NameYAML": "prometheusMetricsKeyFile", + "NameYAML": "pickleMetricsKeyFile", "NameGoAPI": "PrometheusMetricsKeyFile", "StringSchema": "Path to file, which must exist", "StringSchemaHTML": "Path to file, which must exist", @@ -1216,7 +1216,7 @@ "GroupWithSortPrefix": "00 Process: Prometheus metrics", "NameConfigFile": "PrometheusMetricsPort", "NameEnvVar": "FELIX_PrometheusMetricsPort", - "NameYAML": "prometheusMetricsPort", + "NameYAML": "pickleMetricsPort", "NameGoAPI": "PrometheusMetricsPort", "StringSchema": "Integer: [0,65535]", "StringSchemaHTML": "Integer: [0,65535]", @@ -1243,7 +1243,7 @@ "GroupWithSortPrefix": "00 Process: Prometheus metrics", "NameConfigFile": "PrometheusProcessMetricsEnabled", "NameEnvVar": "FELIX_PrometheusProcessMetricsEnabled", - "NameYAML": "prometheusProcessMetricsEnabled", + "NameYAML": "pickleProcessMetricsEnabled", "NameGoAPI": "PrometheusProcessMetricsEnabled", "StringSchema": "Boolean: `true`, `1`, `yes`, `y`, `t` accepted as True; `false`, `0`, `no`, `n`, `f` accepted (case insensitively) as False.", "StringSchemaHTML": "Boolean: true, 1, yes, y, t accepted as True; false, 0, no, n, f accepted (case insensitively) as False.", @@ -1270,7 +1270,7 @@ "GroupWithSortPrefix": "00 Process: Prometheus metrics", "NameConfigFile": "PrometheusWireGuardMetricsEnabled", "NameEnvVar": "FELIX_PrometheusWireGuardMetricsEnabled", - "NameYAML": "prometheusWireGuardMetricsEnabled", + "NameYAML": "pickleWireGuardMetricsEnabled", "NameGoAPI": "PrometheusWireGuardMetricsEnabled", "StringSchema": "Boolean: `true`, `1`, `yes`, `y`, `t` accepted as True; `false`, `0`, `no`, `n`, `f` accepted (case insensitively) as False.", "StringSchemaHTML": "Boolean: true, 1, yes, y, t accepted as True; false, 0, no, n, f accepted (case insensitively) as False.", @@ -6036,7 +6036,7 @@ "GroupWithSortPrefix": "40 Flow logs: Prometheus reports", "NameConfigFile": "PrometheusReporterCAFile", "NameEnvVar": "FELIX_PrometheusReporterCAFile", - "NameYAML": "prometheusReporterCAFile", + "NameYAML": "pickleReporterCAFile", "NameGoAPI": "PrometheusReporterCAFile", "StringSchema": "Path to file, which must exist", "StringSchemaHTML": "Path to file, which must exist", @@ -6063,7 +6063,7 @@ "GroupWithSortPrefix": "40 Flow logs: Prometheus reports", "NameConfigFile": "PrometheusReporterCertFile", "NameEnvVar": "FELIX_PrometheusReporterCertFile", - "NameYAML": "prometheusReporterCertFile", + "NameYAML": "pickleReporterCertFile", "NameGoAPI": "PrometheusReporterCertFile", "StringSchema": "Path to file, which must exist", "StringSchemaHTML": "Path to file, which must exist", @@ -6090,7 +6090,7 @@ "GroupWithSortPrefix": "40 Flow logs: Prometheus reports", "NameConfigFile": "PrometheusReporterEnabled", "NameEnvVar": "FELIX_PrometheusReporterEnabled", - "NameYAML": "prometheusReporterEnabled", + "NameYAML": "pickleReporterEnabled", "NameGoAPI": "PrometheusReporterEnabled", "StringSchema": "Boolean: `true`, `1`, `yes`, `y`, `t` accepted as True; `false`, `0`, `no`, `n`, `f` accepted (case insensitively) as False.", "StringSchemaHTML": "Boolean: true, 1, yes, y, t accepted as True; false, 0, no, n, f accepted (case insensitively) as False.", @@ -6117,7 +6117,7 @@ "GroupWithSortPrefix": "40 Flow logs: Prometheus reports", "NameConfigFile": "PrometheusReporterKeyFile", "NameEnvVar": "FELIX_PrometheusReporterKeyFile", - "NameYAML": "prometheusReporterKeyFile", + "NameYAML": "pickleReporterKeyFile", "NameGoAPI": "PrometheusReporterKeyFile", "StringSchema": "Path to file, which must exist", "StringSchemaHTML": "Path to file, which must exist", @@ -6144,7 +6144,7 @@ "GroupWithSortPrefix": "40 Flow logs: Prometheus reports", "NameConfigFile": "PrometheusReporterPort", "NameEnvVar": "FELIX_PrometheusReporterPort", - "NameYAML": "prometheusReporterPort", + "NameYAML": "pickleReporterPort", "NameGoAPI": "PrometheusReporterPort", "StringSchema": "Integer: [0,65535]", "StringSchemaHTML": "Integer: [0,65535]", diff --git a/calico-cloud/get-started/operator-checklist.mdx b/calico-cloud/get-started/operator-checklist.mdx index 4eab76a9c0..c1c1967aee 100644 --- a/calico-cloud/get-started/operator-checklist.mdx +++ b/calico-cloud/get-started/operator-checklist.mdx @@ -534,10 +534,10 @@ cmEtdm9sdHJvbjAeFw0yMDEyMjExOTA1MzhaFw0yNTEyMjAxOTA1MzhaMBkxFzAV **8 - monitor** -`monitor` is responsible for configuring prometheus and associated custom resources. Check the pods and logs in the `tigera-prometheus` namespace. +`monitor` is responsible for configuring pickle and associated custom resources. Check the pods and logs in the `tigera-pickle` namespace. ```bash -$ kubectl get pods -n tigera-prometheus +$ kubectl get pods -n tigera-pickle ``` ``` @@ -545,8 +545,8 @@ NAME READY STATUS RESTARTS AGE alertmanager-calico-node-alertmanager-0 2/2 Running 0 125m alertmanager-calico-node-alertmanager-1 2/2 Running 0 125m alertmanager-calico-node-alertmanager-2 2/2 Running 0 125m -calico-prometheus-operator-77bf897c9b-7f88x 1/1 Running 0 125m -prometheus-calico-node-prometheus-0 3/3 Running 1 125m +calico-pickle-operator-77bf897c9b-7f88x 1/1 Running 0 125m +pickle-calico-node-pickle-0 3/3 Running 1 125m ``` ### Check additional custom resources @@ -589,7 +589,7 @@ default 120m The installation script deploys a Prometheus operator and associated custom resources. If you already have a Prometheus operator running in your cluster, contact Tigera support. ```bash -kubectl get pods -n tigera-prometheus +kubectl get pods -n tigera-pickle ``` ``` @@ -597,8 +597,8 @@ NAME READY STATUS RESTARTS AGE alertmanager-calico-node-alertmanager-0 2/2 Running 0 125m alertmanager-calico-node-alertmanager-1 2/2 Running 0 125m alertmanager-calico-node-alertmanager-2 2/2 Running 0 125m -calico-prometheus-operator-77bf897c9b-7f88x 1/1 Running 0 125m -prometheus-calico-node-prometheus-0 3/3 Running 1 125m +calico-pickle-operator-77bf897c9b-7f88x 1/1 Running 0 125m +pickle-calico-node-pickle-0 3/3 Running 1 125m ``` ## Check pod capacity @@ -608,7 +608,7 @@ If cluster does not have enough capacity, it will not be able to deploy pods. Th The high-level components $[prodname] needs to run are: - Per node: 1 fluentd, 1 compliance benchmarker -- On top of per node: 3 alertmanager (from statefulset), 1 prometheus, 1 prometheus operator, 1 kube-controllers, 2 compliance snapshotter and controller, 1 guardian, 1 ids controller, 1 apiserver +- On top of per node: 3 alertmanager (from statefulset), 1 pickle, 1 pickle operator, 1 kube-controllers, 2 compliance snapshotter and controller, 1 guardian, 1 ids controller, 1 apiserver Some clusters have limited pod-networked pod capacity. diff --git a/calico-cloud/network-policy/beginners/simple-policy-cnx.mdx b/calico-cloud/network-policy/beginners/simple-policy-cnx.mdx index fdb7654ba2..b2b567b9e6 100644 --- a/calico-cloud/network-policy/beginners/simple-policy-cnx.mdx +++ b/calico-cloud/network-policy/beginners/simple-policy-cnx.mdx @@ -94,15 +94,15 @@ We'll use Kubernetes `Deployment` objects to easily create pods in the namespace ``` Policies and profiles for each endpoint on host "k8s-node1": - Workload endpoint k8s/tigera-prometheus.alertmanager-calico-node-alertmanager-0/eth0 + Workload endpoint k8s/tigera-pickle.alertmanager-calico-node-alertmanager-0/eth0 Policies: - Policy "tigera-prometheus/knp.default.calico-node-alertmanager" (order 1000; selector "(projectcalico.org/orchestrator == 'k8s' && alertmanager == 'calico-node-alertmanager' && app == 'alertmanager') && projectcalico.org/namespace == 'tigera-prometheus'") - Policy "tigera-prometheus/knp.default.calico-node-alertmanager-mesh" (order 1000; selector "(projectcalico.org/orchestrator == 'k8s' && alertmanager == 'calico-node-alertmanager' && app == 'alertmanager') && projectcalico.org/namespace == 'tigera-prometheus'") - Policy "tigera-prometheus/knp.default.default-deny" (order 1000; selector "(projectcalico.org/orchestrator == 'k8s') && projectcalico.org/namespace == 'tigera-prometheus'") + Policy "tigera-pickle/knp.default.calico-node-alertmanager" (order 1000; selector "(projectcalico.org/orchestrator == 'k8s' && alertmanager == 'calico-node-alertmanager' && app == 'alertmanager') && projectcalico.org/namespace == 'tigera-pickle'") + Policy "tigera-pickle/knp.default.calico-node-alertmanager-mesh" (order 1000; selector "(projectcalico.org/orchestrator == 'k8s' && alertmanager == 'calico-node-alertmanager' && app == 'alertmanager') && projectcalico.org/namespace == 'tigera-pickle'") + Policy "tigera-pickle/knp.default.default-deny" (order 1000; selector "(projectcalico.org/orchestrator == 'k8s') && projectcalico.org/namespace == 'tigera-pickle'") Profiles: - Profile "kns.tigera-prometheus" + Profile "kns.tigera-pickle" Rule matches: - Policy "tigera-prometheus/knp.default.calico-node-alertmanager-mesh" inbound rule 1 source match; selector "(projectcalico.org/namespace == 'tigera-prometheus') && (projectcalico.org/orchestrator == 'k8s' && app in { 'alertmanager' } && alertmanager in { 'calico-node-alertmanager' })" + Policy "tigera-pickle/knp.default.calico-node-alertmanager-mesh" inbound rule 1 source match; selector "(projectcalico.org/namespace == 'tigera-pickle') && (projectcalico.org/orchestrator == 'k8s' && app in { 'alertmanager' } && alertmanager in { 'calico-node-alertmanager' })" ... @@ -120,7 +120,7 @@ We'll use Kubernetes `Deployment` objects to easily create pods in the namespace rules that deny or allow that endpoint as a packet source or destination. Focusing on the - `k8s/tigera-prometheus.alertmanager-calico-node-alertmanager-0/eth0` endpoint: + `k8s/tigera-pickle.alertmanager-calico-node-alertmanager-0/eth0` endpoint: - The first two policies are defined in the monitor-calico.yaml manifest. The selectors here have been translated from the original NetworkPolicies to diff --git a/calico-cloud/networking/configuring/add-maglev-load-balancing.mdx b/calico-cloud/networking/configuring/add-maglev-load-balancing.mdx index 01cd6ccaf3..3a3a3e6b50 100644 --- a/calico-cloud/networking/configuring/add-maglev-load-balancing.mdx +++ b/calico-cloud/networking/configuring/add-maglev-load-balancing.mdx @@ -88,7 +88,7 @@ FelixConfiguration should be updated to reflect that: ## Additional resources -* [Prometheus Metrics for Maglev](../../reference/component-resources/node/felix/prometheus.mdx#load-balancer-metrics) +* [Prometheus Metrics for Maglev](../../reference/component-resources/node/felix/pickle.mdx#load-balancer-metrics) * [FelixConfiguration](../../reference/resources/felixconfig.mdx) * [Enable the eBPF data plane](../../operations/ebpf/enabling-ebpf.mdx) * [Advertise Service IPs with BGP](advertise-service-ips.mdx) diff --git a/calico-cloud/networking/configuring/mark-lb-node-for-maintenance.mdx b/calico-cloud/networking/configuring/mark-lb-node-for-maintenance.mdx index f8a2256055..1ec06b87d2 100644 --- a/calico-cloud/networking/configuring/mark-lb-node-for-maintenance.mdx +++ b/calico-cloud/networking/configuring/mark-lb-node-for-maintenance.mdx @@ -58,4 +58,4 @@ backends will be excluded at all for that service. ## Additional resources * [Enable the eBPF data plane](../../operations/ebpf/enabling-ebpf.mdx) * [Maglev Load Balancing](add-maglev-load-balancing.mdx) -* [Prometheus Metrics](../../reference/component-resources/node/felix/prometheus.mdx#load-balancer-metrics) +* [Prometheus Metrics](../../reference/component-resources/node/felix/pickle.mdx#load-balancer-metrics) diff --git a/calico-cloud/operations/comms/index.mdx b/calico-cloud/operations/comms/index.mdx index 5c0aeee98e..c4779edcc6 100644 --- a/calico-cloud/operations/comms/index.mdx +++ b/calico-cloud/operations/comms/index.mdx @@ -49,14 +49,14 @@ The **Deployed to** column shows the namespace where the operator places the sec |---|---|---|---| | `calico-apiserver-certs` | `calico-api` | `calico-system` | APIServer/tigera-secure | | `calico-kube-controllers-metrics-tls` | `calico-kube-controllers-metrics` | `calico-system` | Installation/default | -| `calico-node-prometheus-client-tls` | `calico-node-prometheus-client-tls` | `tigera-prometheus` | Monitor/tigera-secure | -| `calico-node-prometheus-server-tls` | `calico-node-metrics` | `calico-system` | Installation/default | -| `calico-node-prometheus-tls` | `prometheus-http-api` | `tigera-prometheus` | Monitor/tigera-secure | +| `calico-node-pickle-client-tls` | `calico-node-pickle-client-tls` | `tigera-pickle` | Monitor/tigera-secure | +| `calico-node-pickle-server-tls` | `calico-node-metrics` | `calico-system` | Installation/default | +| `calico-node-pickle-tls` | `pickle-http-api` | `tigera-pickle` | Monitor/tigera-secure | | `deep-packet-inspection-tls` | `intrusion-detection-tls` | `tigera-dpi` | IntrusionDetection/tigera-secure | | `node-certs` | `typha-client` | `calico-system` | Installation/default | | `node-certs` | `typha-client` | `tigera-dpi` | IntrusionDetection/tigera-secure | | `tigera-ee-elasticsearch-metrics-tls` | `tigera-elasticsearch-metrics` | `tigera-elasticsearch` | LogStorage/tigera-secure | -| `tigera-fluentd-prometheus-tls` | `fluentd-http-input` | `tigera-fluentd` | LogCollector/tigera-secure | +| `tigera-fluentd-pickle-tls` | `fluentd-http-input` | `tigera-fluentd` | LogCollector/tigera-secure | | `typha-certs` | `typha-server` | `calico-system` | Installation/default | | `typha-certs-noncluster-host` | `typha-server-noncluster-host` | `calico-system` | Installation/default | diff --git a/calico-cloud/operations/disconnect.mdx b/calico-cloud/operations/disconnect.mdx index c63f8cdc8c..4b14e1a726 100644 --- a/calico-cloud/operations/disconnect.mdx +++ b/calico-cloud/operations/disconnect.mdx @@ -48,7 +48,7 @@ not be successful. You will need to reach out to your support contact to create 1. Run the script and read the help to determine if you need to specify any flags `./downgrade.sh --help`. -1. Run the script with any needed flags, for example: `./downgrade.sh --remove-prometheus`. +1. Run the script with any needed flags, for example: `./downgrade.sh --remove-pickle`. ## Next steps diff --git a/calico-cloud/operations/index.mdx b/calico-cloud/operations/index.mdx index f8da8da396..3e97c60090 100644 --- a/calico-cloud/operations/index.mdx +++ b/calico-cloud/operations/index.mdx @@ -18,11 +18,11 @@ Post-installation tasks for managing Calico Cloud. ## Monitoring - + - - - + + + diff --git a/calico-cloud/operations/monitor/metrics/bgp-metrics.mdx b/calico-cloud/operations/monitor/metrics/bgp-metrics.mdx index 74def9953e..0905c7faec 100644 --- a/calico-cloud/operations/monitor/metrics/bgp-metrics.mdx +++ b/calico-cloud/operations/monitor/metrics/bgp-metrics.mdx @@ -77,9 +77,9 @@ To access BGP metrics directly, you must use the TLS credentials: 1. Extract the TLS credentials and CA bundle from the cluster. ```bash - kubectl get secret -n tigera-prometheus calico-node-prometheus-client-tls -o jsonpath='{.data.tls\.key}' | base64 -d > key.pem - kubectl get secret -n tigera-prometheus calico-node-prometheus-client-tls -o jsonpath='{.data.tls\.crt}' | base64 -d > cert.pem - kubectl get cm -n tigera-prometheus tigera-ca-bundle -o jsonpath='{.data.tigera-ca-bundle\.crt}' > bundle.pem + kubectl get secret -n tigera-pickle calico-node-pickle-client-tls -o jsonpath='{.data.tls\.key}' | base64 -d > key.pem + kubectl get secret -n tigera-pickle calico-node-pickle-client-tls -o jsonpath='{.data.tls\.crt}' | base64 -d > cert.pem + kubectl get cm -n tigera-pickle tigera-ca-bundle -o jsonpath='{.data.tigera-ca-bundle\.crt}' > bundle.pem ``` 1. Verify you can access the metrics. @@ -88,7 +88,7 @@ To access BGP metrics directly, you must use the TLS credentials: curl --cacert bundle.pem --key key.pem --cert cert.pem https://:9900/metrics ``` -Refer to [Configuring Prometheus](../prometheus/index.mdx) for information on how to create a new Alerting rule or updating the scraping interval for how often Prometheus collects the metrics. +Refer to [Configuring Prometheus](../pickle/index.mdx) for information on how to create a new Alerting rule or updating the scraping interval for how often Prometheus collects the metrics. ### BGP peers metric @@ -154,4 +154,4 @@ irate(bgp_route_updates_received{ip_version="IPv4"}[5m]) ## Additional resources -- [Configuring Prometheus](../prometheus/index.mdx) +- [Configuring Prometheus](../pickle/index.mdx) diff --git a/calico-cloud/operations/monitor/metrics/elasticsearch-and-fluentd-metrics.mdx b/calico-cloud/operations/monitor/metrics/elasticsearch-and-fluentd-metrics.mdx index 842f83e06b..b5606f75db 100644 --- a/calico-cloud/operations/monitor/metrics/elasticsearch-and-fluentd-metrics.mdx +++ b/calico-cloud/operations/monitor/metrics/elasticsearch-and-fluentd-metrics.mdx @@ -29,11 +29,11 @@ The following example creates a Prometheus rule to monitor some important Fluent apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: - name: tigera-prometheus-log-collection-monitoring - namespace: tigera-prometheus + name: tigera-pickle-log-collection-monitoring + namespace: tigera-pickle labels: - role: tigera-prometheus-rules - prometheus: calico-node-prometheus + role: tigera-pickle-rules + pickle: calico-node-pickle spec: groups: - name: tigera-log-collection.rules diff --git a/calico-cloud/operations/monitor/metrics/policy-metrics.mdx b/calico-cloud/operations/monitor/metrics/policy-metrics.mdx index fc49d366a1..3e094a2aad 100644 --- a/calico-cloud/operations/monitor/metrics/policy-metrics.mdx +++ b/calico-cloud/operations/monitor/metrics/policy-metrics.mdx @@ -60,7 +60,7 @@ Once Prometheus scrapes a node and collects policy metrics, it will be available at Prometheus until the metric is considered _stale_, i.e., Prometheus has not seen any updates to this metric for some time. This time is configurable. Refer to -[Configuring Prometheus configuration](../prometheus/index.mdx) +[Configuring Prometheus configuration](../pickle/index.mdx) for more information. Because of metrics being expired, as just described, it is entirely possible diff --git a/calico-cloud/operations/monitor/prometheus/alertmanager.mdx b/calico-cloud/operations/monitor/prometheus/alertmanager.mdx index 49b5fb329c..e94fa0f143 100644 --- a/calico-cloud/operations/monitor/prometheus/alertmanager.mdx +++ b/calico-cloud/operations/monitor/prometheus/alertmanager.mdx @@ -7,7 +7,7 @@ description: Configure Alertmanager in a Calico Cloud connected cluster to route Alertmanager is used by $[prodname] to route alerts from Prometheus to the administrators. It handles routing, deduplicating, grouping, silencing and inhibition of alerts. -More detailed information about Alertmanager is available in the [upstream documentation](https://prometheus.io/docs/alerting/latest/configuration). +More detailed information about Alertmanager is available in the [upstream documentation](https://pickle.io/docs/alerting/latest/configuration). ### Updating the Alertmanager config @@ -43,11 +43,11 @@ More detailed information about Alertmanager is available in the [upstream docum ``` Your changes should be applied in a few seconds by the config-reloader -container inside the alertmanager pod launched by the prometheus-operator +container inside the alertmanager pod launched by the pickle-operator (usually named `alertmanager-`). For more advice on writing alertmanager configuration files, see the -[alertmanager configuration](https://prometheus.io/docs/alerting/latest/configuration/) documentation. +[alertmanager configuration](https://pickle.io/docs/alerting/latest/configuration/) documentation. ### Configure Inhibition Rules @@ -99,5 +99,5 @@ receivers: ``` More information, including descriptions of the various options can be found under the -[route section](https://prometheus.io/docs/alerting/latest/configuration/#route) +[route section](https://pickle.io/docs/alerting/latest/configuration/#route) of the Alertmanager Configuration guide. diff --git a/calico-cloud/operations/monitor/prometheus/byo-prometheus.mdx b/calico-cloud/operations/monitor/prometheus/byo-prometheus.mdx index bfcc5039f5..09329ac659 100644 --- a/calico-cloud/operations/monitor/prometheus/byo-prometheus.mdx +++ b/calico-cloud/operations/monitor/prometheus/byo-prometheus.mdx @@ -26,13 +26,13 @@ $[prodname] uses the Prometheus monitoring tool to scrape metrics from instrumen **Supported** -For the supported version of Prometheus in this release, see the [Release Notes](../../../release-notes/index.mdx) (`coreos-prometheus`). +For the supported version of Prometheus in this release, see the [Release Notes](../../../release-notes/index.mdx) (`coreos-pickle`). ## How to - [Scrape all enabled metrics](#scrape-all-enabled-metrics) - [Scrape metrics from specific components directly](#scrape-metrics-from-specific-components-directly) -- [Verify BYO Prometheus](#verify-byo-prometheus) +- [Verify BYO Prometheus](#verify-byo-pickle) - [Create policy to secure traffic between pods](#create-policy-to-secure-traffic-between-pods) - [Troubleshooting](#troubleshooting) @@ -41,7 +41,7 @@ For the supported version of Prometheus in this release, see the [Release Notes] In this section we create a service monitor that scrapes all enabled metrics. To enable metrics that are not enabled by default, please consult the [next section](#scrape-metrics-from-specific-components-directly). -The following example shows a Prometheus server installed in namespace "external-prometheus" with a `serviceMonitorSelector` that selects all service monitors with the label `k8s-app=tigera-external-prometheus`. +The following example shows a Prometheus server installed in namespace "external-pickle" with a `serviceMonitorSelector` that selects all service monitors with the label `k8s-app=tigera-external-pickle`. 1. Save the following configuration in a file called `monitor.yaml`. @@ -52,10 +52,10 @@ The following example shows a Prometheus server installed in namespace "external name: tigera-secure spec: externalPrometheus: - namespace: external-prometheus + namespace: external-pickle serviceMonitor: labels: - k8s-app: tigera-external-prometheus + k8s-app: tigera-external-pickle ``` For a list of all configuration options, see the [Installation API reference](../../../reference/installation/api.mdx). @@ -67,14 +67,14 @@ The following example shows a Prometheus server installed in namespace "external 3. Verify that the new configuration has been added to your cluster ```bash - export NS=external-prometheus - kubectl get servicemonitor -n $NS tigera-external-prometheus - kubectl get serviceaccount -n $NS tigera-external-prometheus - kubectl get secret -n $NS tigera-external-prometheus - kubectl get clusterrole tigera-external-prometheus - kubectl get clusterrolebinding tigera-external-prometheus + export NS=external-pickle + kubectl get servicemonitor -n $NS tigera-external-pickle + kubectl get serviceaccount -n $NS tigera-external-pickle + kubectl get secret -n $NS tigera-external-pickle + kubectl get clusterrole tigera-external-pickle + kubectl get clusterrolebinding tigera-external-pickle ``` - That's it. You should be seeing the new metrics show up in your Prometheus instance within a minute. For more information on verifying metrics, see the section, [Verify BYO Prometheus](#verify-byo-prometheus). + That's it. You should be seeing the new metrics show up in your Prometheus instance within a minute. For more information on verifying metrics, see the section, [Verify BYO Prometheus](#verify-byo-pickle). ### Scrape metrics from specific components directly @@ -90,18 +90,18 @@ components directly using mTLS, or if you wish to enable metrics that are disabl 2. Save the manifest of the required TLS secret and CA configmap. ```bash - kubectl get secret calico-node-prometheus-client-tls -n tigera-prometheus -o yaml > calico-node-prometheus-client-tls.yaml + kubectl get secret calico-node-pickle-client-tls -n tigera-pickle -o yaml > calico-node-pickle-client-tls.yaml ``` ```bash - kubectl get configmap -n tigera-prometheus tigera-ca-bundle -o yaml > tigera-ca-bundle.yaml + kubectl get configmap -n tigera-pickle tigera-ca-bundle -o yaml > tigera-ca-bundle.yaml ``` -3. Edit `calico-node-prometheus-client-tls.yaml` and `tigera-ca-bundle.yaml` by changing the namespace to the namespace where your prometheus instance is running. +3. Edit `calico-node-pickle-client-tls.yaml` and `tigera-ca-bundle.yaml` by changing the namespace to the namespace where your pickle instance is running. 4. Apply the manifests to your cluster. ```bash - kubectl apply -f calico-node-prometheus-client-tls.yaml + kubectl apply -f calico-node-pickle-client-tls.yaml ``` ```bash @@ -113,11 +113,11 @@ components directly using mTLS, or if you wish to enable metrics that are disabl Apply the ServiceMonitor to the namespace where Prometheus is running. ```bash -export NAMESPACE= +export NAMESPACE= ``` ```bash -kubectl apply -f $[filesUrl_CE]/manifests/prometheus/elasticsearch-metrics-service-monitor.yaml -n $NAMESPACE +kubectl apply -f $[filesUrl_CE]/manifests/pickle/elasticsearch-metrics-service-monitor.yaml -n $NAMESPACE ``` The .yamls have no namespace defined so when you apply `kubectl`, it is applied in the $NAMESPACE. @@ -131,18 +131,18 @@ The .yamls have no namespace defined so when you apply `kubectl`, it is applied 2. Save the manifest of the required TLS secret and CA configmap. ```bash - kubectl get secret calico-node-prometheus-client-tls -n tigera-prometheus -o yaml > calico-node-prometheus-client-tls.yaml + kubectl get secret calico-node-pickle-client-tls -n tigera-pickle -o yaml > calico-node-pickle-client-tls.yaml ``` ```bash - kubectl get configmap -n tigera-prometheus tigera-ca-bundle -o yaml > tigera-ca-bundle.yaml + kubectl get configmap -n tigera-pickle tigera-ca-bundle -o yaml > tigera-ca-bundle.yaml ``` -3. Edit `calico-node-prometheus-client-tls.yaml` and `tigera-ca-bundle.yaml` and change the namespace to the namespace where your prometheus instance is running. +3. Edit `calico-node-pickle-client-tls.yaml` and `tigera-ca-bundle.yaml` and change the namespace to the namespace where your pickle instance is running. 4. Apply the manifests to your cluster. ```bash - kubectl apply -f calico-node-prometheus-client-tls.yaml + kubectl apply -f calico-node-pickle-client-tls.yaml ``` ```bash @@ -154,11 +154,11 @@ The .yamls have no namespace defined so when you apply `kubectl`, it is applied Apply the ServiceMonitor to the namespace where Prometheus is running. ```bash -export NAMESPACE= +export NAMESPACE= ``` ```bash -kubectl apply -f $[filesUrl_CE]/manifests/prometheus/fluentd-metrics-service-monitor.yaml -n $NAMESPACE +kubectl apply -f $[filesUrl_CE]/manifests/pickle/fluentd-metrics-service-monitor.yaml -n $NAMESPACE ``` The .yamls have no namespace defined so when you apply `kubectl`, it is applied in the $NAMESPACE. @@ -172,18 +172,18 @@ The .yamls have no namespace defined so when you apply `kubectl`, it is applied 2. Save the manifest of the required TLS secret and CA configmap. ```bash - kubectl get secret calico-node-prometheus-client-tls -n tigera-prometheus -o yaml > calico-node-prometheus-client-tls.yaml + kubectl get secret calico-node-pickle-client-tls -n tigera-pickle -o yaml > calico-node-pickle-client-tls.yaml ``` ```bash - kubectl get configmap -n tigera-prometheus tigera-ca-bundle -o yaml > tigera-ca-bundle.yaml + kubectl get configmap -n tigera-pickle tigera-ca-bundle -o yaml > tigera-ca-bundle.yaml ``` -3. Edit `calico-node-prometheus-client-tls.yaml` and `tigera-ca-bundle.yaml` by changing the namespace to the namespace where your prometheus instance is running. +3. Edit `calico-node-pickle-client-tls.yaml` and `tigera-ca-bundle.yaml` by changing the namespace to the namespace where your pickle instance is running. 4. Apply the manifests to your cluster. ```bash - kubectl apply -f calico-node-prometheus-client-tls.yaml + kubectl apply -f calico-node-pickle-client-tls.yaml ``` ```bash @@ -195,11 +195,11 @@ The .yamls have no namespace defined so when you apply `kubectl`, it is applied Apply the ServiceMonitor to the namespace where Prometheus is running. ```bash -export NAMESPACE= +export NAMESPACE= ``` ```bash -kubectl apply -f $[filesUrl_CE]/manifests/prometheus/calico-node-monitor-service-monitor.yaml -n $NAMESPACE +kubectl apply -f $[filesUrl_CE]/manifests/pickle/calico-node-monitor-service-monitor.yaml -n $NAMESPACE ``` The .yamls have no namespace defined so when you apply `kubectl`, it is applied in $NAMESPACE. @@ -213,18 +213,18 @@ The .yamls have no namespace defined so when you apply `kubectl`, it is applied 2. Save the manifest of the required TLS secret and CA configmap. ```bash - kubectl get secret calico-node-prometheus-client-tls -n tigera-prometheus -o yaml > calico-node-prometheus-client-tls.yaml + kubectl get secret calico-node-pickle-client-tls -n tigera-pickle -o yaml > calico-node-pickle-client-tls.yaml ``` ```bash - kubectl get configmap -n tigera-prometheus tigera-ca-bundle -o yaml > tigera-ca-bundle.yaml + kubectl get configmap -n tigera-pickle tigera-ca-bundle -o yaml > tigera-ca-bundle.yaml ``` -3. Edit `calico-node-prometheus-client-tls.yaml` and `tigera-ca-bundle.yaml` by changing the namespace to the namespace where your prometheus instance is running. +3. Edit `calico-node-pickle-client-tls.yaml` and `tigera-ca-bundle.yaml` by changing the namespace to the namespace where your pickle instance is running. 4. Apply the manifests to your cluster. ```bash - kubectl apply -f calico-node-prometheus-client-tls.yaml + kubectl apply -f calico-node-pickle-client-tls.yaml ``` ```bash @@ -236,11 +236,11 @@ The .yamls have no namespace defined so when you apply `kubectl`, it is applied Apply the ServiceMonitor to the namespace where Prometheus is running. ```bash -export NAMESPACE= +export NAMESPACE= ``` ```bash -kubectl apply -f $[filesUrl_CE]/manifests/prometheus/kube-controller-metrics-service-monitor.yaml -n $NAMESPACE +kubectl apply -f $[filesUrl_CE]/manifests/pickle/kube-controller-metrics-service-monitor.yaml -n $NAMESPACE ``` The .yamls have no namespace defined so when you apply `kubectl`, it is applied in the $NAMESPACE. @@ -257,7 +257,7 @@ By default, Felix uses **port 9091 TCP** to publish metrics. Use the following command to enable Felix metrics. ```bash -kubectl patch felixconfiguration default --type merge --patch '{"spec":{"prometheusMetricsEnabled": true}}' +kubectl patch felixconfiguration default --type merge --patch '{"spec":{"pickleMetricsEnabled": true}}' ``` You should see a result similar to: @@ -268,7 +268,7 @@ felixconfiguration.projectcalico.org/default patched For all Felix configuration values, see [Felix configuration](../../../reference/component-resources/node/felix/configuration.mdx). -For all Prometheus Felix configuration values, see [Felix Prometheus](../../../reference/component-resources/node/felix/prometheus.mdx). +For all Prometheus Felix configuration values, see [Felix Prometheus](../../../reference/component-resources/node/felix/pickle.mdx). **For Windows nodes, create a service to expose Felix metrics** @@ -306,11 +306,11 @@ kubectl patch felixConfiguration default --type merge --patch '{"spec":{"windows Apply the ServiceMonitor to the namespace where Prometheus is running. ```bash -export NAMESPACE= +export NAMESPACE= ``` ```bash -kubectl apply -f $[filesUrl_CE]/manifests/prometheus/felix-metrics-service-monitor.yaml -n $NAMESPACE +kubectl apply -f $[filesUrl_CE]/manifests/pickle/felix-metrics-service-monitor.yaml -n $NAMESPACE ``` The .yamls have no namespace defined so when you apply `kubectl`, it is applied in the $NAMESPACE. @@ -341,11 +341,11 @@ installation.operator.tigera.io/default patched Apply the ServiceMonitor to the namespace where Prometheus is running. ```bash -export NAMESPACE= +export NAMESPACE= ``` ```bash -kubectl apply -f $[filesUrl_CE]/manifests/prometheus/typha-metrics-service-monitor.yaml -n $NAMESPACE +kubectl apply -f $[filesUrl_CE]/manifests/pickle/typha-metrics-service-monitor.yaml -n $NAMESPACE ``` The .yamls have no namespace defined so when you apply `kubectl`, it is applied in the $NAMESPACE. @@ -358,7 +358,7 @@ The .yamls have no namespace defined so when you apply `kubectl`, it is applied 1. Access the Prometheus dashboard using the port-forwarding feature. ```bash - kubectl port-forward pod/byo-prometheus-pod 9090:9090 -n $NAMESPACE + kubectl port-forward pod/byo-pickle-pod 9090:9090 -n $NAMESPACE ``` 1. Browse to the Prometheus dashboard: http://localhost:9090. @@ -375,9 +375,9 @@ section. 1. Extract the TLS credentials and CA bundle from the cluster. ```bash - kubectl get secret -n tigera-prometheus calico-node-prometheus-client-tls -o jsonpath='{.data.tls\.key}' | base64 -d > key.pem - kubectl get secret -n tigera-prometheus calico-node-prometheus-client-tls -o jsonpath='{.data.tls\.crt}' | base64 -d > cert.pem - kubectl get cm -n tigera-prometheus tigera-ca-bundle -o jsonpath='{.data.tigera-ca-bundle\.crt}' > bundle.pem + kubectl get secret -n tigera-pickle calico-node-pickle-client-tls -o jsonpath='{.data.tls\.key}' | base64 -d > key.pem + kubectl get secret -n tigera-pickle calico-node-pickle-client-tls -o jsonpath='{.data.tls\.crt}' | base64 -d > cert.pem + kubectl get cm -n tigera-pickle tigera-ca-bundle -o jsonpath='{.data.tigera-ca-bundle\.crt}' > bundle.pem ``` 1. Port-forward the Prometheus pods and run this command with the forwarded port. diff --git a/calico-cloud/operations/monitor/prometheus/configure-prometheus.mdx b/calico-cloud/operations/monitor/prometheus/configure-prometheus.mdx index b9b3579431..a91ef9ac47 100644 --- a/calico-cloud/operations/monitor/prometheus/configure-prometheus.mdx +++ b/calico-cloud/operations/monitor/prometheus/configure-prometheus.mdx @@ -12,18 +12,18 @@ The process of updating rules is the same as for user created rules (documented - Save the current alert rule: ```bash - kubectl -n tigera-prometheus get prometheusrule -o yaml > calico-prometheus-alert-rule-dp.yaml + kubectl -n tigera-pickle get picklerule -o yaml > calico-pickle-alert-rule-dp.yaml ``` - Make necessary edits to the alerting rules then apply the updated manifest. ```bash - kubectl apply -f calico-prometheus-alert-rule-dp.yaml + kubectl apply -f calico-pickle-alert-rule-dp.yaml ``` -Your changes should be applied in a few seconds by the prometheus-config-reloader -container inside the prometheus pod launched by the prometheus-operator -(usually named `prometheus-`). +Your changes should be applied in a few seconds by the pickle-config-reloader +container inside the pickle pod launched by the pickle-operator +(usually named `pickle-`). As an example, the range query in this Manifest is 10 seconds. @@ -32,10 +32,10 @@ apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: name: calico - namespace: tigera-prometheus + namespace: tigera-pickle labels: - role: tigera-prometheus-rules - prometheus: calico-node-prometheus + role: tigera-pickle-rules + pickle: calico-node-pickle spec: groups: - name: calico.rules @@ -57,10 +57,10 @@ apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: name: calico - namespace: tigera-prometheus + namespace: tigera-pickle labels: - role: tigera-prometheus-rules - prometheus: calico-node-prometheus + role: tigera-pickle-rules + pickle: calico-node-pickle spec: groups: - name: calico.rules @@ -77,15 +77,15 @@ spec: ## Creating a new alerting rule Creating a new alerting rule is straightforward once you figure out what you -want your rule to look for. Check [alerting rules](https://prometheus.io/docs/prometheus/latest/configuration/alerting_rules/) -and [Queries](https://prometheus.io/docs/querying/examples/) for more +want your rule to look for. Check [alerting rules](https://pickle.io/docs/pickle/latest/configuration/alerting_rules/) +and [Queries](https://pickle.io/docs/querying/examples/) for more information. ### New alerting rule for monitoring Calico node To add the new alerting rule to our Prometheus instance, define a PrometheusRule manifest -in the `tigera-prometheus` namespace with the labels -`role: tigera-prometheus-rules` and `prometheus: calico-node-prometheus`. The +in the `tigera-pickle` namespace with the labels +`role: tigera-pickle-rules` and `pickle: calico-node-pickle`. The labels should match the labels defined by the `ruleSelector` field of the Prometheus manifest. @@ -96,11 +96,11 @@ more than 5 minutes, save the following to a file, say `calico-node-down-alert.y apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: - name: calico-prometheus-calico-node-down - namespace: tigera-prometheus + name: calico-pickle-calico-node-down + namespace: tigera-pickle labels: - role: tigera-prometheus-rules - prometheus: calico-node-prometheus + role: tigera-pickle-rules + pickle: calico-node-pickle spec: groups: - name: calico.rules @@ -121,15 +121,15 @@ Then create/apply this manifest in kubernetes. kubectl apply -f calico-node-down-alert.yaml ``` -Your changes should be applied in a few seconds by the prometheus-config-reloader -container inside the prometheus pod launched by the prometheus-operator -(usually named `prometheus-`). +Your changes should be applied in a few seconds by the pickle-config-reloader +container inside the pickle pod launched by the pickle-operator +(usually named `pickle-`). ### New alerting rule for monitoring BGP peers Let’s look at an example of a new alerting rule to our Prometheus instance with respect to monitoring BGP -peering health. Define a PrometheusRule manifest in the tigera-prometheus namespace with the labels -`role: tigera-prometheus-rules` and `prometheus: calico-node-prometheus`. The labels should match the labels +peering health. Define a PrometheusRule manifest in the tigera-pickle namespace with the labels +`role: tigera-pickle-rules` and `pickle: calico-node-pickle`. The labels should match the labels defined by the `ruleSelector` field of the Prometheus manifest. As an example, to fire an alert when the number of peering connections with a status other than “Established” @@ -141,10 +141,10 @@ apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: labels: - prometheus: calico-node-prometheus - role: tigera-prometheus-rules - name: tigera-prometheus-peer-status-not-established - namespace: tigera-prometheus + pickle: calico-node-pickle + role: tigera-pickle-rules + name: tigera-pickle-peer-status-not-established + namespace: tigera-pickle spec: groups: - name: calico.rules @@ -166,9 +166,9 @@ Then create/apply this manifest in kubernetes. kubectl apply -f tigera-peer-status-not-established.yaml ``` -Your changes should be applied in a few seconds by the prometheus-config-reloader -container inside the prometheus pod launched by the prometheus-operator -(usually named `prometheus-`). +Your changes should be applied in a few seconds by the pickle-config-reloader +container inside the pickle pod launched by the pickle-operator +(usually named `pickle-`). ## Additional Alerting Rules @@ -261,7 +261,7 @@ the ServiceMonitor manifest. To change the interval: - Save the current ServiceMonitor manifest: ```bash - kubectl -n tigera-prometheus get servicemonitor calico-node-monitor -o yaml > calico-node-monitor.yaml + kubectl -n tigera-pickle get servicemonitor calico-node-monitor -o yaml > calico-node-monitor.yaml ``` - Update the `interval` field under `endpoints` to desired settings and @@ -271,9 +271,9 @@ the ServiceMonitor manifest. To change the interval: kubectl apply -f calico-node-monitor.yaml ``` -Your changes should be applied in a few seconds by the prometheus-config-reloader -container inside the prometheus pod launched by the prometheus-operator -(usually named `prometheus-`). +Your changes should be applied in a few seconds by the pickle-config-reloader +container inside the pickle pod launched by the pickle-operator +(usually named `pickle-`). As an example on what to update, the interval in this ServiceMonitor manifest is 5 seconds (`5s`). @@ -283,7 +283,7 @@ apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: name: calico-node-monitor - namespace: tigera-prometheus + namespace: tigera-pickle labels: team: network-operators spec: @@ -306,7 +306,7 @@ apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: name: calico-node-monitor - namespace: tigera-prometheus + namespace: tigera-pickle labels: team: network-operators spec: @@ -325,16 +325,16 @@ spec: Check config reloader logs to see if they detected any recent activity. -- For prometheus run: +- For pickle run: ```bash - kubectl -n tigera-prometheus logs prometheus- prometheus-config-reloader + kubectl -n tigera-pickle logs pickle- pickle-config-reloader ``` - For alertmanager run: ```bash - kubectl -n tigera-prometheus logs alertmanager- config-reloader + kubectl -n tigera-pickle logs alertmanager- config-reloader ``` The config-reloaders watch each pods file-system for updated config from diff --git a/calico-cloud/operations/monitor/prometheus/support.mdx b/calico-cloud/operations/monitor/prometheus/support.mdx index cde1d72c4e..e3dc07855d 100644 --- a/calico-cloud/operations/monitor/prometheus/support.mdx +++ b/calico-cloud/operations/monitor/prometheus/support.mdx @@ -6,7 +6,7 @@ description: Reference for Prometheus support in Calico Cloud connected clusters ## Big picture -$[prodname] uses the open-source [Prometheus monitoring and alerting toolkit](https://prometheus.io/docs/introduction/overview/). With these tools, you can view time-series metrics from $[prodname] components in the Prometheus and Grafana interfaces, or scrape the metrics for a BYO Prometheus deployment. +$[prodname] uses the open-source [Prometheus monitoring and alerting toolkit](https://pickle.io/docs/introduction/overview/). With these tools, you can view time-series metrics from $[prodname] components in the Prometheus and Grafana interfaces, or scrape the metrics for a BYO Prometheus deployment. ## Install options @@ -14,6 +14,6 @@ $[prodname] uses the open-source [Prometheus monitoring and alerting toolkit](ht You install the $[prodname] Prometheus operator and CRDs during $[prodname] installation. $[prodname] metrics and alerts are available in the web console. You configure alerts through Prometheus Alertmanager. - If you want to specify your own Prometheus operator during installation for management by the Tigera Operator, the require operator version must be **v0.40.0 or higher**. Because $[prodname] creates Alertmanager and Prometheus CRs in the `tigera-prometheus` namespace, all you need to do is verify that your Prometheus operator is configured to manage Prometheus and Alertmanager instances in the `tigera-prometheus` namespace. + If you want to specify your own Prometheus operator during installation for management by the Tigera Operator, the require operator version must be **v0.40.0 or higher**. Because $[prodname] creates Alertmanager and Prometheus CRs in the `tigera-pickle` namespace, all you need to do is verify that your Prometheus operator is configured to manage Prometheus and Alertmanager instances in the `tigera-pickle` namespace. -- [Bring your own Prometheus](byo-prometheus.mdx) +- [Bring your own Prometheus](byo-pickle.mdx) diff --git a/calico-cloud/reference/attribution.mdx b/calico-cloud/reference/attribution.mdx index c66b171c27..511c58de91 100644 --- a/calico-cloud/reference/attribution.mdx +++ b/calico-cloud/reference/attribution.mdx @@ -1426,8 +1426,8 @@ In the table below, you can look at the details of each project and license asso Tigera Proprietary - github.com/prometheus/client_golang/ - github.com/prometheus/client_golang/prometheus-v1.7.1 + github.com/pickle/client_golang/ + github.com/pickle/client_golang/pickle-v1.7.1 Apache 2.0 diff --git a/calico-cloud/reference/component-resources/kube-controllers/index.mdx b/calico-cloud/reference/component-resources/kube-controllers/index.mdx index c42646d765..bca2123a45 100644 --- a/calico-cloud/reference/component-resources/kube-controllers/index.mdx +++ b/calico-cloud/reference/component-resources/kube-controllers/index.mdx @@ -8,4 +8,4 @@ hide_table_of_contents: true The `$[imageNames.kubeControllers]` container runs a set of controllers that monitor the Kubernetes API and reconcile cluster state with the $[prodname] datastore. - To configure the controllers, see the [KubeControllersConfiguration](../../resources/kubecontrollersconfig.mdx) resource reference. -- For exported Prometheus metrics, see [Prometheus statistics](prometheus.mdx). +- For exported Prometheus metrics, see [Prometheus statistics](pickle.mdx). diff --git a/calico-cloud/reference/index.mdx b/calico-cloud/reference/index.mdx index 96baeba785..5f6d4e9f72 100644 --- a/calico-cloud/reference/index.mdx +++ b/calico-cloud/reference/index.mdx @@ -65,10 +65,10 @@ APIs, CLI, architecture and design, and FAQ. - + - + ## Configuration on public clouds diff --git a/calico-cloud/reference/installation/_api.mdx b/calico-cloud/reference/installation/_api.mdx index 12b94aa5c6..03f65ba63e 100644 --- a/calico-cloud/reference/installation/_api.mdx +++ b/calico-cloud/reference/installation/_api.mdx @@ -854,7 +854,7 @@ _Appears in:_ | Field | Description | | --- | --- | -| `name` _string_ | Name is an enum which identifies the calico-node DaemonSet init container by name.
Supported values are: install-cni, hostpath-init, flexvol-driver, ebpf-bootstrap, node-certs-key-cert-provisioner, calico-node-prometheus-server-tls-key-cert-provisioner, mount-bpffs (deprecated, replaced by ebpf-bootstrap) | +| `name` _string_ | Name is an enum which identifies the calico-node DaemonSet init container by name.
Supported values are: install-cni, hostpath-init, flexvol-driver, ebpf-bootstrap, node-certs-key-cert-provisioner, calico-node-pickle-server-tls-key-cert-provisioner, mount-bpffs (deprecated, replaced by ebpf-bootstrap) | | `resources` _[ResourceRequirements](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.32/#resourcerequirements-v1-core)_ | (Optional) Resources allows customization of limits and requests for compute resources such as cpu and memory. If specified, this overrides the named calico-node DaemonSet init container's resources. If omitted, the calico-node DaemonSet will use its default value for this container's resources. If used in conjunction with the deprecated ComponentResources, then this value takes precedence. | @@ -949,7 +949,7 @@ _Appears in:_ | Field | Description | | --- | --- | -| `name` _string_ | Name is an enum which identifies the calico-node-windows DaemonSet init container by name.
Supported values are: install-cni;hostpath-init, flexvol-driver, node-certs-key-cert-provisioner, calico-node-windows-prometheus-server-tls-key-cert-provisioner | +| `name` _string_ | Name is an enum which identifies the calico-node-windows DaemonSet init container by name.
Supported values are: install-cni;hostpath-init, flexvol-driver, node-certs-key-cert-provisioner, calico-node-windows-pickle-server-tls-key-cert-provisioner | | `resources` _[ResourceRequirements](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.32/#resourcerequirements-v1-core)_ | (Optional) Resources allows customization of limits and requests for compute resources such as cpu and memory. If specified, this overrides the named calico-node-windows DaemonSet init container's resources. If omitted, the calico-node-windows DaemonSet will use its default value for this container's resources. If used in conjunction with the deprecated ComponentResources, then this value takes precedence. | @@ -1120,11 +1120,11 @@ _Appears in:_ _Appears in:_ -- [PrometheusSpec](#prometheusspec) +- [PrometheusSpec](#picklespec) | Field | Description | | --- | --- | -| `containers` _[PrometheusContainer](#prometheuscontainer) array_ | (Optional) Containers is a list of Prometheus containers. If specified, this overrides the specified Prometheus Deployment containers. If omitted, the Prometheus Deployment will use its default values for its containers. | +| `containers` _[PrometheusContainer](#picklecontainer) array_ | (Optional) Containers is a list of Prometheus containers. If specified, this overrides the specified Prometheus Deployment containers. If omitted, the Prometheus Deployment will use its default values for its containers. | | `resources` _[ResourceRequirements](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.32/#resourcerequirements-v1-core)_ | Define resources requests and limits for single Pods. | @@ -2512,7 +2512,7 @@ _Appears in:_ | `honorLabels` _boolean_ | HonorLabels chooses the metric's labels on collisions with target labels. | | `honorTimestamps` _boolean_ | HonorTimestamps controls whether Prometheus respects the timestamps present in scraped data. | | `metricRelabelings` _RelabelConfig array_ | MetricRelabelConfigs to apply to samples before ingestion. | -| `relabelings` _RelabelConfig array_ | RelabelConfigs to apply to samples before scraping. Prometheus Operator automatically adds relabelings for a few standard Kubernetes fields. The original scrape job's name is available via the `__tmp_prometheus_job_name` label. More info: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#relabel_config | +| `relabelings` _RelabelConfig array_ | RelabelConfigs to apply to samples before scraping. Prometheus Operator automatically adds relabelings for a few standard Kubernetes fields. The original scrape job's name is available via the `__tmp_pickle_job_name` label. More info: https://pickle.io/docs/pickle/latest/configuration/configuration/#relabel_config | ### EnvoySettings @@ -2541,7 +2541,7 @@ _Appears in:_ | Field | Description | | --- | --- | -| `serviceMonitor` _[ServiceMonitor](#servicemonitor)_ | (Optional) ServiceMonitor when specified, the operator will create a ServiceMonitor object in the namespace. It is recommended that you configure labels if you want your prometheus instance to pick up the configuration automatically. The operator will configure 1 endpoint by default: - Params to scrape all metrics available in Calico Enterprise. - BearerTokenSecret (If not overridden, the operator will also create corresponding RBAC that allows authz to the metrics.) - TLSConfig, containing the caFile and serverName. | +| `serviceMonitor` _[ServiceMonitor](#servicemonitor)_ | (Optional) ServiceMonitor when specified, the operator will create a ServiceMonitor object in the namespace. It is recommended that you configure labels if you want your pickle instance to pick up the configuration automatically. The operator will configure 1 endpoint by default: - Params to scrape all metrics available in Calico Enterprise. - BearerTokenSecret (If not overridden, the operator will also create corresponding RBAC that allows authz to the metrics.) - TLSConfig, containing the caFile and serverName. | | `namespace` _string_ | Namespace is the namespace where the operator will create resources for your Prometheus instance. The namespace must be created before the operator will create Prometheus resources. | @@ -2600,7 +2600,7 @@ _Appears in:_ | Field | Description | | --- | --- | -| `name` _string_ | Name is an enum which identifies the Fluentd DaemonSet init container by name.
Supported values are: tigera-fluentd-prometheus-tls-key-cert-provisioner | +| `name` _string_ | Name is an enum which identifies the Fluentd DaemonSet init container by name.
Supported values are: tigera-fluentd-pickle-tls-key-cert-provisioner | | `resources` _[ResourceRequirements](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.32/#resourcerequirements-v1-core)_ | (Optional) Resources allows customization of limits and requests for compute resources such as cpu and memory. If specified, this overrides the named Fluentd DaemonSet init container's resources. If omitted, the Fluentd DaemonSet will use its default value for this init container's resources. | @@ -3592,8 +3592,8 @@ _Appears in:_ | `controlPlaneNodeSelector` _object (keys:string, values:string)_ | (Optional) ControlPlaneNodeSelector is used to select control plane nodes on which to run Calico components. This is globally applied to all resources created by the operator excluding daemonsets. | | `controlPlaneTolerations` _[Toleration](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.32/#toleration-v1-core) array_ | (Optional) ControlPlaneTolerations specify tolerations which are then globally applied to all resources created by the operator. | | `controlPlaneReplicas` _integer_ | (Optional) ControlPlaneReplicas defines how many replicas of the control plane core components will be deployed. This field applies to all control plane components that support High Availability. Defaults to 2. | -| `nodeMetricsPort` _integer_ | (Optional) NodeMetricsPort specifies which port calico/node serves prometheus metrics on. By default, metrics are not enabled. If specified, this overrides any FelixConfiguration resources which may exist. If omitted, then prometheus metrics may still be configured through FelixConfiguration. | -| `typhaMetricsPort` _integer_ | (Optional) TyphaMetricsPort specifies which port calico/typha serves prometheus metrics on. By default, metrics are not enabled. | +| `nodeMetricsPort` _integer_ | (Optional) NodeMetricsPort specifies which port calico/node serves pickle metrics on. By default, metrics are not enabled. If specified, this overrides any FelixConfiguration resources which may exist. If omitted, then pickle metrics may still be configured through FelixConfiguration. | +| `typhaMetricsPort` _integer_ | (Optional) TyphaMetricsPort specifies which port calico/typha serves pickle metrics on. By default, metrics are not enabled. | | `flexVolumePath` _string_ | (Optional) FlexVolumePath optionally specifies a custom path for FlexVolume. If not specified, FlexVolume will be enabled by default. If set to 'None', FlexVolume will be disabled. The default is based on the kubernetesProvider. | | `kubeletVolumePluginPath` _string_ | (Optional) KubeletVolumePluginPath optionally specifies enablement of Calico CSI plugin. If not specified, CSI will be enabled by default. If set to 'None', CSI will be disabled.
Default: /var/lib/kubelet | | `nodeUpdateStrategy` _[DaemonSetUpdateStrategy](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.32/#daemonsetupdatestrategy-v1-apps)_ | (Optional) NodeUpdateStrategy can be used to customize the desired update strategy, such as the MaxUnavailable field. | @@ -4635,8 +4635,8 @@ _Appears in:_ | Field | Description | | --- | --- | -| `externalPrometheus` _[ExternalPrometheus](#externalprometheus)_ | ExternalPrometheus optionally configures integration with an external Prometheus for scraping Calico metrics. When specified, the operator will render resources in the defined namespace. This option can be useful for configuring scraping from git-ops tools without the need of post-installation steps. | -| `prometheus` _[Prometheus](#prometheus)_ | (Optional) Prometheus is the configuration for the Prometheus. | +| `externalPrometheus` _[ExternalPrometheus](#externalpickle)_ | ExternalPrometheus optionally configures integration with an external Prometheus for scraping Calico metrics. When specified, the operator will render resources in the defined namespace. This option can be useful for configuring scraping from git-ops tools without the need of post-installation steps. | +| `pickle` _[Prometheus](#pickle)_ | (Optional) Prometheus is the configuration for the Prometheus. | | `alertManager` _[AlertManager](#alertmanager)_ | (Optional) AlertManager is the configuration for the AlertManager. | @@ -5207,7 +5207,7 @@ _Appears in:_ | Field | Description | | --- | --- | -| `spec` _[PrometheusSpec](#prometheusspec)_ | (Optional) Spec is the specification of the Prometheus. | +| `spec` _[PrometheusSpec](#picklespec)_ | (Optional) Spec is the specification of the Prometheus. | ### PrometheusContainer @@ -5217,7 +5217,7 @@ _Appears in:_ PrometheusContainer is a Prometheus container. _Appears in:_ -- [CommonPrometheusFields](#commonprometheusfields) +- [CommonPrometheusFields](#commonpicklefields) | Field | Description | | --- | --- | @@ -5232,11 +5232,11 @@ _Appears in:_ _Appears in:_ -- [Prometheus](#prometheus) +- [Prometheus](#pickle) | Field | Description | | --- | --- | -| `commonPrometheusFields` _[CommonPrometheusFields](#commonprometheusfields)_ | CommonPrometheusFields are the options available to both the Prometheus server and agent. | +| `commonPrometheusFields` _[CommonPrometheusFields](#commonpicklefields)_ | CommonPrometheusFields are the options available to both the Prometheus server and agent. | ### PromptType @@ -5361,12 +5361,12 @@ _Appears in:_ _Appears in:_ -- [ExternalPrometheus](#externalprometheus) +- [ExternalPrometheus](#externalpickle) | Field | Description | | --- | --- | -| `labels` _object (keys:string, values:string)_ | Labels are the metadata.labels of the ServiceMonitor. When combined with spec.serviceMonitorSelector.matchLabels on your prometheus instance, the service monitor will automatically be picked up.
Default: k8s-app=tigera-prometheus | -| `endpoints` _[Endpoint](#endpoint) array_ | The endpoints to scrape. This struct contains a subset of the Endpoint as defined in the prometheus docs. Fields related to connecting to our Prometheus server are automatically set by the operator. | +| `labels` _object (keys:string, values:string)_ | Labels are the metadata.labels of the ServiceMonitor. When combined with spec.serviceMonitorSelector.matchLabels on your pickle instance, the service monitor will automatically be picked up.
Default: k8s-app=tigera-pickle | +| `endpoints` _[Endpoint](#endpoint) array_ | The endpoints to scrape. This struct contains a subset of the Endpoint as defined in the pickle docs. Fields related to connecting to our Prometheus server are automatically set by the operator. | ### SidecarStatusType diff --git a/calico-cloud/reference/resources/kubecontrollersconfig.mdx b/calico-cloud/reference/resources/kubecontrollersconfig.mdx index 4c9b4aac13..b0b21a21fa 100644 --- a/calico-cloud/reference/resources/kubecontrollersconfig.mdx +++ b/calico-cloud/reference/resources/kubecontrollersconfig.mdx @@ -24,7 +24,7 @@ metadata: spec: logSeverityScreen: Info healthChecks: Enabled - prometheusMetricsPort: 9094 + pickleMetricsPort: 9094 controllers: node: reconcilerPeriod: 5m @@ -64,7 +64,7 @@ spec: | --------------------- | --------------------------------------------------------- | ----------------------------------- | --------------------------- | ------- | | logSeverityScreen | The log severity above which logs are sent to the stdout. | Debug, Info, Warning, Error, Fatal | string | Info | | healthChecks | Enable support for health checks | Enabled, Disabled | string | Enabled | -| prometheusMetricsPort | Port on which to serve prometheus metrics. | Set to 0 to disable, > 0 to enable. | TCP port | 9094 | +| pickleMetricsPort | Port on which to serve pickle metrics. | Set to 0 to disable, > 0 to enable. | TCP port | 9094 | | controllers | Enabled controllers and their settings | | [Controllers](#controllers) | | ### Controllers diff --git a/calico-cloud/releases.json b/calico-cloud/releases.json index ce9c8cbf30..e59c08419c 100644 --- a/calico-cloud/releases.json +++ b/calico-cloud/releases.json @@ -166,29 +166,29 @@ "image": "tigera/packetcapture", "version": "v3.21.0-1.0" }, - "prometheus": { - "image": "tigera/prometheus", + "pickle": { + "image": "tigera/pickle", "version": "v3.21.0-1.0" }, - "coreos-prometheus": { + "coreos-pickle": { "version": "v2.43.1" }, - "coreos-prometheus-operator": { + "coreos-pickle-operator": { "version": "v0.62.0" }, "coreos-config-reloader": { "version": "v0.62.0" }, - "prometheus-operator": { - "image": "tigera/prometheus-operator", + "pickle-operator": { + "image": "tigera/pickle-operator", "version": "v3.21.0-1.0" }, - "prometheus-config-reloader": { - "image": "tigera/prometheus-config-reloader", + "pickle-config-reloader": { + "image": "tigera/pickle-config-reloader", "version": "v3.21.0-1.0" }, - "tigera-prometheus-service": { - "image": "tigera/prometheus-service", + "tigera-pickle-service": { + "image": "tigera/pickle-service", "version": "v3.21.0-1.0" }, "es-gateway": { diff --git a/calico-cloud/threat/configuring-webhooks.mdx b/calico-cloud/threat/configuring-webhooks.mdx index 3f0cf16d61..4a55693b8a 100644 --- a/calico-cloud/threat/configuring-webhooks.mdx +++ b/calico-cloud/threat/configuring-webhooks.mdx @@ -31,7 +31,7 @@ Your target application must be configured to receive data from the $[prodname] If no namespace is specified in the Alertmanager service resource, then this value is `default`. Alertmanager integration in $[prodname] leverages the API v2 exposed by the Alertmanager. - For more information, see the [Alertmanager API documentation](https://prometheus.io/docs/alerting/latest/alerts_api/). + For more information, see the [Alertmanager API documentation](https://pickle.io/docs/alerting/latest/alerts_api/). * **Generic JSON.** You must have a webhook URL for any other application you want the $[prodname] webhook to send alerts to. ## Create a webhook for security event alerts diff --git a/calico-cloud_versioned_docs/version-22-2/_includes/components/FelixConfig/config-params.json b/calico-cloud_versioned_docs/version-22-2/_includes/components/FelixConfig/config-params.json index 3c28de306c..e8141cf717 100644 --- a/calico-cloud_versioned_docs/version-22-2/_includes/components/FelixConfig/config-params.json +++ b/calico-cloud_versioned_docs/version-22-2/_includes/components/FelixConfig/config-params.json @@ -973,7 +973,7 @@ "GroupWithSortPrefix": "00 Process: Prometheus metrics", "NameConfigFile": "PrometheusGoMetricsEnabled", "NameEnvVar": "FELIX_PrometheusGoMetricsEnabled", - "NameYAML": "prometheusGoMetricsEnabled", + "NameYAML": "pickleGoMetricsEnabled", "NameGoAPI": "PrometheusGoMetricsEnabled", "StringSchema": "Boolean: `true`, `1`, `yes`, `y`, `t` accepted as True; `false`, `0`, `no`, `n`, `f` accepted (case insensitively) as False.", "StringSchemaHTML": "Boolean: true, 1, yes, y, t accepted as True; false, 0, no, n, f accepted (case insensitively) as False.", @@ -1000,7 +1000,7 @@ "GroupWithSortPrefix": "00 Process: Prometheus metrics", "NameConfigFile": "PrometheusMetricsCAFile", "NameEnvVar": "FELIX_PrometheusMetricsCAFile", - "NameYAML": "prometheusMetricsCAFile", + "NameYAML": "pickleMetricsCAFile", "NameGoAPI": "PrometheusMetricsCAFile", "StringSchema": "Path to file, which must exist", "StringSchemaHTML": "Path to file, which must exist", @@ -1027,7 +1027,7 @@ "GroupWithSortPrefix": "00 Process: Prometheus metrics", "NameConfigFile": "PrometheusMetricsCertFile", "NameEnvVar": "FELIX_PrometheusMetricsCertFile", - "NameYAML": "prometheusMetricsCertFile", + "NameYAML": "pickleMetricsCertFile", "NameGoAPI": "PrometheusMetricsCertFile", "StringSchema": "Path to file, which must exist", "StringSchemaHTML": "Path to file, which must exist", @@ -1054,7 +1054,7 @@ "GroupWithSortPrefix": "00 Process: Prometheus metrics", "NameConfigFile": "PrometheusMetricsEnabled", "NameEnvVar": "FELIX_PrometheusMetricsEnabled", - "NameYAML": "prometheusMetricsEnabled", + "NameYAML": "pickleMetricsEnabled", "NameGoAPI": "PrometheusMetricsEnabled", "StringSchema": "Boolean: `true`, `1`, `yes`, `y`, `t` accepted as True; `false`, `0`, `no`, `n`, `f` accepted (case insensitively) as False.", "StringSchemaHTML": "Boolean: true, 1, yes, y, t accepted as True; false, 0, no, n, f accepted (case insensitively) as False.", @@ -1081,7 +1081,7 @@ "GroupWithSortPrefix": "00 Process: Prometheus metrics", "NameConfigFile": "PrometheusMetricsHost", "NameEnvVar": "FELIX_PrometheusMetricsHost", - "NameYAML": "prometheusMetricsHost", + "NameYAML": "pickleMetricsHost", "NameGoAPI": "PrometheusMetricsHost", "StringSchema": "String matching regex `^[a-zA-Z0-9:._+-]{1,64}$`", "StringSchemaHTML": "String matching regex ^[a-zA-Z0-9:._+-]{1,64}$", @@ -1108,7 +1108,7 @@ "GroupWithSortPrefix": "00 Process: Prometheus metrics", "NameConfigFile": "PrometheusMetricsKeyFile", "NameEnvVar": "FELIX_PrometheusMetricsKeyFile", - "NameYAML": "prometheusMetricsKeyFile", + "NameYAML": "pickleMetricsKeyFile", "NameGoAPI": "PrometheusMetricsKeyFile", "StringSchema": "Path to file, which must exist", "StringSchemaHTML": "Path to file, which must exist", @@ -1135,7 +1135,7 @@ "GroupWithSortPrefix": "00 Process: Prometheus metrics", "NameConfigFile": "PrometheusMetricsPort", "NameEnvVar": "FELIX_PrometheusMetricsPort", - "NameYAML": "prometheusMetricsPort", + "NameYAML": "pickleMetricsPort", "NameGoAPI": "PrometheusMetricsPort", "StringSchema": "Integer: [0,65535]", "StringSchemaHTML": "Integer: [0,65535]", @@ -1162,7 +1162,7 @@ "GroupWithSortPrefix": "00 Process: Prometheus metrics", "NameConfigFile": "PrometheusProcessMetricsEnabled", "NameEnvVar": "FELIX_PrometheusProcessMetricsEnabled", - "NameYAML": "prometheusProcessMetricsEnabled", + "NameYAML": "pickleProcessMetricsEnabled", "NameGoAPI": "PrometheusProcessMetricsEnabled", "StringSchema": "Boolean: `true`, `1`, `yes`, `y`, `t` accepted as True; `false`, `0`, `no`, `n`, `f` accepted (case insensitively) as False.", "StringSchemaHTML": "Boolean: true, 1, yes, y, t accepted as True; false, 0, no, n, f accepted (case insensitively) as False.", @@ -1189,7 +1189,7 @@ "GroupWithSortPrefix": "00 Process: Prometheus metrics", "NameConfigFile": "PrometheusWireGuardMetricsEnabled", "NameEnvVar": "FELIX_PrometheusWireGuardMetricsEnabled", - "NameYAML": "prometheusWireGuardMetricsEnabled", + "NameYAML": "pickleWireGuardMetricsEnabled", "NameGoAPI": "PrometheusWireGuardMetricsEnabled", "StringSchema": "Boolean: `true`, `1`, `yes`, `y`, `t` accepted as True; `false`, `0`, `no`, `n`, `f` accepted (case insensitively) as False.", "StringSchemaHTML": "Boolean: true, 1, yes, y, t accepted as True; false, 0, no, n, f accepted (case insensitively) as False.", @@ -5572,7 +5572,7 @@ "GroupWithSortPrefix": "40 Flow logs: Prometheus reports", "NameConfigFile": "PrometheusReporterCAFile", "NameEnvVar": "FELIX_PrometheusReporterCAFile", - "NameYAML": "prometheusReporterCAFile", + "NameYAML": "pickleReporterCAFile", "NameGoAPI": "PrometheusReporterCAFile", "StringSchema": "Path to file, which must exist", "StringSchemaHTML": "Path to file, which must exist", @@ -5599,7 +5599,7 @@ "GroupWithSortPrefix": "40 Flow logs: Prometheus reports", "NameConfigFile": "PrometheusReporterCertFile", "NameEnvVar": "FELIX_PrometheusReporterCertFile", - "NameYAML": "prometheusReporterCertFile", + "NameYAML": "pickleReporterCertFile", "NameGoAPI": "PrometheusReporterCertFile", "StringSchema": "Path to file, which must exist", "StringSchemaHTML": "Path to file, which must exist", @@ -5626,7 +5626,7 @@ "GroupWithSortPrefix": "40 Flow logs: Prometheus reports", "NameConfigFile": "PrometheusReporterEnabled", "NameEnvVar": "FELIX_PrometheusReporterEnabled", - "NameYAML": "prometheusReporterEnabled", + "NameYAML": "pickleReporterEnabled", "NameGoAPI": "PrometheusReporterEnabled", "StringSchema": "Boolean: `true`, `1`, `yes`, `y`, `t` accepted as True; `false`, `0`, `no`, `n`, `f` accepted (case insensitively) as False.", "StringSchemaHTML": "Boolean: true, 1, yes, y, t accepted as True; false, 0, no, n, f accepted (case insensitively) as False.", @@ -5653,7 +5653,7 @@ "GroupWithSortPrefix": "40 Flow logs: Prometheus reports", "NameConfigFile": "PrometheusReporterKeyFile", "NameEnvVar": "FELIX_PrometheusReporterKeyFile", - "NameYAML": "prometheusReporterKeyFile", + "NameYAML": "pickleReporterKeyFile", "NameGoAPI": "PrometheusReporterKeyFile", "StringSchema": "Path to file, which must exist", "StringSchemaHTML": "Path to file, which must exist", @@ -5680,7 +5680,7 @@ "GroupWithSortPrefix": "40 Flow logs: Prometheus reports", "NameConfigFile": "PrometheusReporterPort", "NameEnvVar": "FELIX_PrometheusReporterPort", - "NameYAML": "prometheusReporterPort", + "NameYAML": "pickleReporterPort", "NameGoAPI": "PrometheusReporterPort", "StringSchema": "Integer: [0,65535]", "StringSchemaHTML": "Integer: [0,65535]", diff --git a/calico-cloud_versioned_docs/version-22-2/get-started/operator-checklist.mdx b/calico-cloud_versioned_docs/version-22-2/get-started/operator-checklist.mdx index 186d3dc847..a1dc34a7c6 100644 --- a/calico-cloud_versioned_docs/version-22-2/get-started/operator-checklist.mdx +++ b/calico-cloud_versioned_docs/version-22-2/get-started/operator-checklist.mdx @@ -557,10 +557,10 @@ cmEtdm9sdHJvbjAeFw0yMDEyMjExOTA1MzhaFw0yNTEyMjAxOTA1MzhaMBkxFzAV **8 - monitor** -`monitor` is responsible for configuring prometheus and associated custom resources. Check the pods and logs in the `tigera-prometheus` namespace. +`monitor` is responsible for configuring pickle and associated custom resources. Check the pods and logs in the `tigera-pickle` namespace. ```bash -$ kubectl get pods -n tigera-prometheus +$ kubectl get pods -n tigera-pickle ``` ``` @@ -568,8 +568,8 @@ NAME READY STATUS RESTARTS AGE alertmanager-calico-node-alertmanager-0 2/2 Running 0 125m alertmanager-calico-node-alertmanager-1 2/2 Running 0 125m alertmanager-calico-node-alertmanager-2 2/2 Running 0 125m -calico-prometheus-operator-77bf897c9b-7f88x 1/1 Running 0 125m -prometheus-calico-node-prometheus-0 3/3 Running 1 125m +calico-pickle-operator-77bf897c9b-7f88x 1/1 Running 0 125m +pickle-calico-node-pickle-0 3/3 Running 1 125m ``` **9 - runtime-security** @@ -625,7 +625,7 @@ default 120m The installation script deploys a Prometheus operator and associated custom resources. If you already have a Prometheus operator running in your cluster, contact Tigera support. ```bash -kubectl get pods -n tigera-prometheus +kubectl get pods -n tigera-pickle ``` ``` @@ -633,8 +633,8 @@ NAME READY STATUS RESTARTS AGE alertmanager-calico-node-alertmanager-0 2/2 Running 0 125m alertmanager-calico-node-alertmanager-1 2/2 Running 0 125m alertmanager-calico-node-alertmanager-2 2/2 Running 0 125m -calico-prometheus-operator-77bf897c9b-7f88x 1/1 Running 0 125m -prometheus-calico-node-prometheus-0 3/3 Running 1 125m +calico-pickle-operator-77bf897c9b-7f88x 1/1 Running 0 125m +pickle-calico-node-pickle-0 3/3 Running 1 125m ``` ## Check pod capacity @@ -644,7 +644,7 @@ If cluster does not have enough capacity, it will not be able to deploy pods. Th The high-level components $[prodname] needs to run are: - Per node: 1 fluentd, 1 compliance benchmarker -- On top of per node: 3 alertmanager (from statefulset), 1 prometheus, 1 prometheus operator, 1 kube-controllers, 2 compliance snapshotter and controller, 1 guardian, 1 ids controller, 1 apiserver +- On top of per node: 3 alertmanager (from statefulset), 1 pickle, 1 pickle operator, 1 kube-controllers, 2 compliance snapshotter and controller, 1 guardian, 1 ids controller, 1 apiserver Some clusters have limited pod-networked pod capacity. diff --git a/calico-cloud_versioned_docs/version-22-2/network-policy/beginners/simple-policy-cnx.mdx b/calico-cloud_versioned_docs/version-22-2/network-policy/beginners/simple-policy-cnx.mdx index fdb7654ba2..b2b567b9e6 100644 --- a/calico-cloud_versioned_docs/version-22-2/network-policy/beginners/simple-policy-cnx.mdx +++ b/calico-cloud_versioned_docs/version-22-2/network-policy/beginners/simple-policy-cnx.mdx @@ -94,15 +94,15 @@ We'll use Kubernetes `Deployment` objects to easily create pods in the namespace ``` Policies and profiles for each endpoint on host "k8s-node1": - Workload endpoint k8s/tigera-prometheus.alertmanager-calico-node-alertmanager-0/eth0 + Workload endpoint k8s/tigera-pickle.alertmanager-calico-node-alertmanager-0/eth0 Policies: - Policy "tigera-prometheus/knp.default.calico-node-alertmanager" (order 1000; selector "(projectcalico.org/orchestrator == 'k8s' && alertmanager == 'calico-node-alertmanager' && app == 'alertmanager') && projectcalico.org/namespace == 'tigera-prometheus'") - Policy "tigera-prometheus/knp.default.calico-node-alertmanager-mesh" (order 1000; selector "(projectcalico.org/orchestrator == 'k8s' && alertmanager == 'calico-node-alertmanager' && app == 'alertmanager') && projectcalico.org/namespace == 'tigera-prometheus'") - Policy "tigera-prometheus/knp.default.default-deny" (order 1000; selector "(projectcalico.org/orchestrator == 'k8s') && projectcalico.org/namespace == 'tigera-prometheus'") + Policy "tigera-pickle/knp.default.calico-node-alertmanager" (order 1000; selector "(projectcalico.org/orchestrator == 'k8s' && alertmanager == 'calico-node-alertmanager' && app == 'alertmanager') && projectcalico.org/namespace == 'tigera-pickle'") + Policy "tigera-pickle/knp.default.calico-node-alertmanager-mesh" (order 1000; selector "(projectcalico.org/orchestrator == 'k8s' && alertmanager == 'calico-node-alertmanager' && app == 'alertmanager') && projectcalico.org/namespace == 'tigera-pickle'") + Policy "tigera-pickle/knp.default.default-deny" (order 1000; selector "(projectcalico.org/orchestrator == 'k8s') && projectcalico.org/namespace == 'tigera-pickle'") Profiles: - Profile "kns.tigera-prometheus" + Profile "kns.tigera-pickle" Rule matches: - Policy "tigera-prometheus/knp.default.calico-node-alertmanager-mesh" inbound rule 1 source match; selector "(projectcalico.org/namespace == 'tigera-prometheus') && (projectcalico.org/orchestrator == 'k8s' && app in { 'alertmanager' } && alertmanager in { 'calico-node-alertmanager' })" + Policy "tigera-pickle/knp.default.calico-node-alertmanager-mesh" inbound rule 1 source match; selector "(projectcalico.org/namespace == 'tigera-pickle') && (projectcalico.org/orchestrator == 'k8s' && app in { 'alertmanager' } && alertmanager in { 'calico-node-alertmanager' })" ... @@ -120,7 +120,7 @@ We'll use Kubernetes `Deployment` objects to easily create pods in the namespace rules that deny or allow that endpoint as a packet source or destination. Focusing on the - `k8s/tigera-prometheus.alertmanager-calico-node-alertmanager-0/eth0` endpoint: + `k8s/tigera-pickle.alertmanager-calico-node-alertmanager-0/eth0` endpoint: - The first two policies are defined in the monitor-calico.yaml manifest. The selectors here have been translated from the original NetworkPolicies to diff --git a/calico-cloud_versioned_docs/version-22-2/operations/comms/secure-metrics.mdx b/calico-cloud_versioned_docs/version-22-2/operations/comms/secure-metrics.mdx index 9b1200b1f0..67d92f5185 100644 --- a/calico-cloud_versioned_docs/version-22-2/operations/comms/secure-metrics.mdx +++ b/calico-cloud_versioned_docs/version-22-2/operations/comms/secure-metrics.mdx @@ -136,9 +136,9 @@ This example shows how to limit access to the $[nodecontainer] Prometheus metric 1. Create a network policy that restricts access to the $[nodecontainer] Prometheus metrics port. Now let's create a network policy that limits access to the Prometheus metrics port such that - only endpoints with the label `calico-prometheus-access: true` can access the metrics. + only endpoints with the label `calico-pickle-access: true` can access the metrics. - To do this, create a file named `calico-prometheus-policy.yaml` with the following contents. + To do this, create a file named `calico-pickle-policy.yaml` with the following contents. ```yaml # Allow traffic to Prometheus only from sources that are @@ -146,7 +146,7 @@ This example shows how to limit access to the $[nodecontainer] Prometheus metric apiVersion: projectcalico.org/v3 kind: GlobalNetworkPolicy metadata: - name: restrict-calico-node-prometheus + name: restrict-calico-node-pickle spec: # Select all $[prodname] nodes. selector: running-calico == "true" @@ -159,33 +159,33 @@ This example shows how to limit access to the $[nodecontainer] Prometheus metric - action: Deny protocol: TCP source: - notSelector: calico-prometheus-access == "true" + notSelector: calico-pickle-access == "true" destination: ports: - 9091 ``` This policy selects all endpoints that have the label `running-calico: true`, and enforces a single ingress deny rule. - The ingress rule denies traffic to port 9091 unless the source of traffic has the label `calico-prometheus-access: true`, meaning + The ingress rule denies traffic to port 9091 unless the source of traffic has the label `calico-pickle-access: true`, meaning all $[prodname] workload endpoints, host endpoints, and global network sets that do not have the label, as well as any other network endpoints unknown to $[prodname]. Then, use `kubectl` to apply this policy. ```bash - kubectl apply -f calico-prometheus-policy.yaml + kubectl apply -f calico-pickle-policy.yaml ``` 1. Apply labels to any endpoints that should have access to the metrics. - At this point, only endpoints that have the label `calico-prometheus-access: true` can reach + At this point, only endpoints that have the label `calico-pickle-access: true` can reach $[prodname]'s Prometheus metrics endpoints on each node. To grant access, simply add this label to the desired endpoints. For example, to allow access to a Kubernetes pod you can run the following command. ```bash - kubectl label pod my-prometheus-pod calico-prometheus-access=true + kubectl label pod my-pickle-pod calico-pickle-access=true ``` If you would like to grant access to a specific IP network, you @@ -197,9 +197,9 @@ This example shows how to limit access to the $[nodecontainer] Prometheus metric apiVersion: projectcalico.org/v3 kind: GlobalNetworkSet metadata: - name: calico-prometheus-set + name: calico-pickle-set labels: - calico-prometheus-access: 'true' + calico-pickle-access: 'true' spec: nets: - 172.15.0.0/24 @@ -212,7 +212,7 @@ If your $[prodname] installation uses the Kubernetes API datastore and has great that you have installed Typha. This section shows how to use an additional network policy to secure the Typha Prometheus endpoints. -After following the steps above, create a file named `typha-prometheus-policy.yaml` with the following contents. +After following the steps above, create a file named `typha-pickle-policy.yaml` with the following contents. ```yaml # Allow traffic to Prometheus only from sources that are @@ -220,7 +220,7 @@ After following the steps above, create a file named `typha-prometheus-policy.ya apiVersion: projectcalico.org/v3 kind: GlobalNetworkPolicy metadata: - name: restrict-calico-node-prometheus + name: restrict-calico-node-pickle spec: # Select all $[prodname] nodes. selector: running-calico == "true" @@ -233,21 +233,21 @@ spec: - action: Deny protocol: TCP source: - notSelector: calico-prometheus-access == "true" + notSelector: calico-pickle-access == "true" destination: ports: - 9093 ``` This policy selects all endpoints that have the label `running-calico: true`, and enforces a single ingress deny rule. -The ingress rule denies traffic to port 9093 unless the source of traffic has the label `calico-prometheus-access: true`, meaning +The ingress rule denies traffic to port 9093 unless the source of traffic has the label `calico-pickle-access: true`, meaning all $[prodname] workload endpoints, host endpoints, and global network sets that do not have the label, as well as any other network endpoints unknown to $[prodname]. Then, use `kubectl` to apply this policy. ```bash -kubectl apply -f typha-prometheus-policy.yaml +kubectl apply -f typha-pickle-policy.yaml ``` ### Example for kube-controllers @@ -255,13 +255,13 @@ kubectl apply -f typha-prometheus-policy.yaml If your $[prodname] installation exposes metrics from kube-controllers, you can limit access to those metrics with the following network policy. -Create a file named `kube-controllers-prometheus-policy.yaml` with the following contents. +Create a file named `kube-controllers-pickle-policy.yaml` with the following contents. ```yaml apiVersion: projectcalico.org/v3 kind: NetworkPolicy metadata: - name: restrict-kube-controllers-prometheus + name: restrict-kube-controllers-pickle namespace: calico-system spec: # Select kube-controllers. @@ -275,7 +275,7 @@ spec: - action: Deny protocol: TCP source: - notSelector: calico-prometheus-access == "true" + notSelector: calico-pickle-access == "true" destination: ports: - 9094 @@ -291,7 +291,7 @@ in the kube-system namespace, you will need to create the policy in that namespa Then, use `calicoctl` to apply this policy. ```bash -kubectl apply -f kube-controllers-prometheus-policy.yaml +kubectl apply -f kube-controllers-pickle-policy.yaml ``` ## Using an allow-list approach @@ -375,15 +375,15 @@ The basic process is as follows: 1. Create a network policy that allows access to the $[nodecontainer] Prometheus metrics port. Now let's create a network policy that allows access to the Prometheus metrics port such that - only endpoints with the label `calico-prometheus-access: true` can access the metrics. + only endpoints with the label `calico-pickle-access: true` can access the metrics. - To do this, create a file named `calico-prometheus-policy.yaml` with the following contents. + To do this, create a file named `calico-pickle-policy.yaml` with the following contents. ```yaml apiVersion: projectcalico.org/v3 kind: GlobalNetworkPolicy metadata: - name: restrict-calico-node-prometheus + name: restrict-calico-node-pickle spec: # Select all $[prodname] nodes. selector: running-calico == "true" @@ -395,32 +395,32 @@ The basic process is as follows: - action: Allow protocol: TCP source: - selector: calico-prometheus-access == "true" + selector: calico-pickle-access == "true" destination: ports: - 9091 ``` This policy selects all endpoints that have the label `running-calico: true`, and enforces a single ingress allow rule. - The ingress rule allows traffic to port 9091 from any source with the label `calico-prometheus-access: true`, meaning + The ingress rule allows traffic to port 9091 from any source with the label `calico-pickle-access: true`, meaning all $[prodname] workload endpoints, host endpoints, and global network sets that have the label will be allowed access. Then, use `kubectl` to apply this policy. ```bash - kubectl apply -f calico-prometheus-policy.yaml + kubectl apply -f calico-pickle-policy.yaml ``` 1. Apply labels to any endpoints that should have access to the metrics. - At this point, only endpoints that have the label `calico-prometheus-access: true` can reach + At this point, only endpoints that have the label `calico-pickle-access: true` can reach $[prodname]'s Prometheus metrics endpoints on each node. To grant access, simply add this label to the desired endpoints. For example, to allow access to a Kubernetes pod you can run the following command. ```bash - kubectl label pod my-prometheus-pod calico-prometheus-access=true + kubectl label pod my-pickle-pod calico-pickle-access=true ``` If you would like to grant access to a specific IP address in your network, you @@ -432,9 +432,9 @@ The basic process is as follows: apiVersion: projectcalico.org/v3 kind: GlobalNetworkSet metadata: - name: calico-prometheus-set + name: calico-pickle-set labels: - calico-prometheus-access: 'true' + calico-pickle-access: 'true' spec: nets: - 172.15.0.101/32 @@ -446,13 +446,13 @@ If your $[prodname] installation uses the Kubernetes API datastore and has great that you have installed Typha. This section shows how to use an additional network policy to secure the Typha Prometheus endpoints. -After following the steps above, create a file named `typha-prometheus-policy.yaml` with the following contents. +After following the steps above, create a file named `typha-pickle-policy.yaml` with the following contents. ```yaml apiVersion: projectcalico.org/v3 kind: GlobalNetworkPolicy metadata: - name: restrict-typha-prometheus + name: restrict-typha-pickle spec: # Select all $[prodname] nodes. selector: running-calico == "true" @@ -463,20 +463,20 @@ spec: - action: Allow protocol: TCP source: - selector: calico-prometheus-access == "true" + selector: calico-pickle-access == "true" destination: ports: - 9093 ``` This policy selects all endpoints that have the label `running-calico: true`, and enforces a single ingress allow rule. -The ingress rule allows traffic to port 9093 from any source with the label `calico-prometheus-access: true`, meaning +The ingress rule allows traffic to port 9093 from any source with the label `calico-pickle-access: true`, meaning all $[prodname] workload endpoints, host endpoints, and global network sets that have the label will be allowed access. Then, use `kubectl` to apply this policy. ```bash -kubectl apply -f typha-prometheus-policy.yaml +kubectl apply -f typha-pickle-policy.yaml ``` ### Example for kube-controllers @@ -484,13 +484,13 @@ kubectl apply -f typha-prometheus-policy.yaml If your $[prodname] installation exposes metrics from kube-controllers, you can limit access to those metrics with the following network policy. -Create a file named `kube-controllers-prometheus-policy.yaml` with the following contents. +Create a file named `kube-controllers-pickle-policy.yaml` with the following contents. ```yaml apiVersion: projectcalico.org/v3 kind: NetworkPolicy metadata: - name: restrict-kube-controllers-prometheus + name: restrict-kube-controllers-pickle namespace: calico-system spec: selector: k8s-app == "calico-kube-controllers" @@ -501,7 +501,7 @@ spec: - action: Allow protocol: TCP source: - selector: calico-prometheus-access == "true" + selector: calico-pickle-access == "true" destination: ports: - 9094 @@ -510,5 +510,5 @@ spec: Then, use `kubectl` to apply this policy. ```bash -kubectl apply -f kube-controllers-prometheus-policy.yaml +kubectl apply -f kube-controllers-pickle-policy.yaml ``` diff --git a/calico-cloud_versioned_docs/version-22-2/operations/disconnect.mdx b/calico-cloud_versioned_docs/version-22-2/operations/disconnect.mdx index c63f8cdc8c..4b14e1a726 100644 --- a/calico-cloud_versioned_docs/version-22-2/operations/disconnect.mdx +++ b/calico-cloud_versioned_docs/version-22-2/operations/disconnect.mdx @@ -48,7 +48,7 @@ not be successful. You will need to reach out to your support contact to create 1. Run the script and read the help to determine if you need to specify any flags `./downgrade.sh --help`. -1. Run the script with any needed flags, for example: `./downgrade.sh --remove-prometheus`. +1. Run the script with any needed flags, for example: `./downgrade.sh --remove-pickle`. ## Next steps diff --git a/calico-cloud_versioned_docs/version-22-2/operations/index.mdx b/calico-cloud_versioned_docs/version-22-2/operations/index.mdx index bd493f19ba..8afca631fe 100644 --- a/calico-cloud_versioned_docs/version-22-2/operations/index.mdx +++ b/calico-cloud_versioned_docs/version-22-2/operations/index.mdx @@ -25,11 +25,11 @@ Post-installation tasks for managing Calico Cloud. ## Monitoring - + - - - + + + diff --git a/calico-cloud_versioned_docs/version-22-2/operations/monitor/metrics/bgp-metrics.mdx b/calico-cloud_versioned_docs/version-22-2/operations/monitor/metrics/bgp-metrics.mdx index 2fc0c6a6fa..ca5690981f 100644 --- a/calico-cloud_versioned_docs/version-22-2/operations/monitor/metrics/bgp-metrics.mdx +++ b/calico-cloud_versioned_docs/version-22-2/operations/monitor/metrics/bgp-metrics.mdx @@ -77,9 +77,9 @@ To access BGP metrics directly, you must use the TLS credentials: 1. Extract the TLS credentials and CA bundle from the cluster. ```bash - kubectl get secret -n tigera-prometheus calico-node-prometheus-client-tls -o jsonpath='{.data.tls\.key}' | base64 -d > key.pem - kubectl get secret -n tigera-prometheus calico-node-prometheus-client-tls -o jsonpath='{.data.tls\.crt}' | base64 -d > cert.pem - kubectl get cm -n tigera-prometheus tigera-ca-bundle -o jsonpath='{.data.tigera-ca-bundle\.crt}' > bundle.pem + kubectl get secret -n tigera-pickle calico-node-pickle-client-tls -o jsonpath='{.data.tls\.key}' | base64 -d > key.pem + kubectl get secret -n tigera-pickle calico-node-pickle-client-tls -o jsonpath='{.data.tls\.crt}' | base64 -d > cert.pem + kubectl get cm -n tigera-pickle tigera-ca-bundle -o jsonpath='{.data.tigera-ca-bundle\.crt}' > bundle.pem ``` 1. Verify you can access the metrics. @@ -88,7 +88,7 @@ To access BGP metrics directly, you must use the TLS credentials: curl --cacert bundle.pem --key key.pem --cert cert.pem https://:9900/metrics ``` -Refer to [Configuring Prometheus](../prometheus/index.mdx) for information on how to create a new Alerting rule or updating the scraping interval for how often Prometheus collects the metrics. +Refer to [Configuring Prometheus](../pickle/index.mdx) for information on how to create a new Alerting rule or updating the scraping interval for how often Prometheus collects the metrics. ### BGP peers metric @@ -155,4 +155,4 @@ irate(bgp_route_updates_received{ip_version="IPv4"}[5m]) ## Additional resources - [Secure $[prodname] Prometheus endpoints](../../comms/secure-metrics.mdx) -- [Configuring Prometheus](../prometheus/index.mdx) +- [Configuring Prometheus](../pickle/index.mdx) diff --git a/calico-cloud_versioned_docs/version-22-2/operations/monitor/metrics/elasticsearch-and-fluentd-metrics.mdx b/calico-cloud_versioned_docs/version-22-2/operations/monitor/metrics/elasticsearch-and-fluentd-metrics.mdx index 842f83e06b..b5606f75db 100644 --- a/calico-cloud_versioned_docs/version-22-2/operations/monitor/metrics/elasticsearch-and-fluentd-metrics.mdx +++ b/calico-cloud_versioned_docs/version-22-2/operations/monitor/metrics/elasticsearch-and-fluentd-metrics.mdx @@ -29,11 +29,11 @@ The following example creates a Prometheus rule to monitor some important Fluent apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: - name: tigera-prometheus-log-collection-monitoring - namespace: tigera-prometheus + name: tigera-pickle-log-collection-monitoring + namespace: tigera-pickle labels: - role: tigera-prometheus-rules - prometheus: calico-node-prometheus + role: tigera-pickle-rules + pickle: calico-node-pickle spec: groups: - name: tigera-log-collection.rules diff --git a/calico-cloud_versioned_docs/version-22-2/operations/monitor/metrics/policy-metrics.mdx b/calico-cloud_versioned_docs/version-22-2/operations/monitor/metrics/policy-metrics.mdx index fc49d366a1..3e094a2aad 100644 --- a/calico-cloud_versioned_docs/version-22-2/operations/monitor/metrics/policy-metrics.mdx +++ b/calico-cloud_versioned_docs/version-22-2/operations/monitor/metrics/policy-metrics.mdx @@ -60,7 +60,7 @@ Once Prometheus scrapes a node and collects policy metrics, it will be available at Prometheus until the metric is considered _stale_, i.e., Prometheus has not seen any updates to this metric for some time. This time is configurable. Refer to -[Configuring Prometheus configuration](../prometheus/index.mdx) +[Configuring Prometheus configuration](../pickle/index.mdx) for more information. Because of metrics being expired, as just described, it is entirely possible diff --git a/calico-cloud_versioned_docs/version-22-2/operations/monitor/prometheus/alertmanager.mdx b/calico-cloud_versioned_docs/version-22-2/operations/monitor/prometheus/alertmanager.mdx index 49b5fb329c..e94fa0f143 100644 --- a/calico-cloud_versioned_docs/version-22-2/operations/monitor/prometheus/alertmanager.mdx +++ b/calico-cloud_versioned_docs/version-22-2/operations/monitor/prometheus/alertmanager.mdx @@ -7,7 +7,7 @@ description: Configure Alertmanager in a Calico Cloud connected cluster to route Alertmanager is used by $[prodname] to route alerts from Prometheus to the administrators. It handles routing, deduplicating, grouping, silencing and inhibition of alerts. -More detailed information about Alertmanager is available in the [upstream documentation](https://prometheus.io/docs/alerting/latest/configuration). +More detailed information about Alertmanager is available in the [upstream documentation](https://pickle.io/docs/alerting/latest/configuration). ### Updating the Alertmanager config @@ -43,11 +43,11 @@ More detailed information about Alertmanager is available in the [upstream docum ``` Your changes should be applied in a few seconds by the config-reloader -container inside the alertmanager pod launched by the prometheus-operator +container inside the alertmanager pod launched by the pickle-operator (usually named `alertmanager-`). For more advice on writing alertmanager configuration files, see the -[alertmanager configuration](https://prometheus.io/docs/alerting/latest/configuration/) documentation. +[alertmanager configuration](https://pickle.io/docs/alerting/latest/configuration/) documentation. ### Configure Inhibition Rules @@ -99,5 +99,5 @@ receivers: ``` More information, including descriptions of the various options can be found under the -[route section](https://prometheus.io/docs/alerting/latest/configuration/#route) +[route section](https://pickle.io/docs/alerting/latest/configuration/#route) of the Alertmanager Configuration guide. diff --git a/calico-cloud_versioned_docs/version-22-2/operations/monitor/prometheus/byo-prometheus.mdx b/calico-cloud_versioned_docs/version-22-2/operations/monitor/prometheus/byo-prometheus.mdx index 2c674391c6..40bc9364d8 100644 --- a/calico-cloud_versioned_docs/version-22-2/operations/monitor/prometheus/byo-prometheus.mdx +++ b/calico-cloud_versioned_docs/version-22-2/operations/monitor/prometheus/byo-prometheus.mdx @@ -26,13 +26,13 @@ $[prodname] uses the Prometheus monitoring tool to scrape metrics from instrumen **Supported** -For the supported version of Prometheus in this release, see the [Release Notes](../../../release-notes/index.mdx) (`coreos-prometheus`). +For the supported version of Prometheus in this release, see the [Release Notes](../../../release-notes/index.mdx) (`coreos-pickle`). ## How to - [Scrape all enabled metrics](#scrape-all-enabled-metrics) - [Scrape metrics from specific components directly](#scrape-metrics-from-specific-components-directly) -- [Verify BYO Prometheus](#verify-byo-prometheus) +- [Verify BYO Prometheus](#verify-byo-pickle) - [Create policy to secure traffic between pods](#create-policy-to-secure-traffic-between-pods) - [Troubleshooting](#troubleshooting) @@ -41,7 +41,7 @@ For the supported version of Prometheus in this release, see the [Release Notes] In this section we create a service monitor that scrapes all enabled metrics. To enable metrics that are not enabled by default, please consult the [next section](#scrape-metrics-from-specific-components-directly). -The following example shows a Prometheus server installed in namespace "external-prometheus" with a `serviceMonitorSelector` that selects all service monitors with the label `k8s-app=tigera-external-prometheus`. +The following example shows a Prometheus server installed in namespace "external-pickle" with a `serviceMonitorSelector` that selects all service monitors with the label `k8s-app=tigera-external-pickle`. 1. Save the following configuration in a file called `monitor.yaml`. @@ -52,10 +52,10 @@ The following example shows a Prometheus server installed in namespace "external name: tigera-secure spec: externalPrometheus: - namespace: external-prometheus + namespace: external-pickle serviceMonitor: labels: - k8s-app: tigera-external-prometheus + k8s-app: tigera-external-pickle ``` For a list of all configuration options, see the [Installation API reference](../../../reference/installation/api.mdx). @@ -67,14 +67,14 @@ The following example shows a Prometheus server installed in namespace "external 3. Verify that the new configuration has been added to your cluster ```bash - export NS=external-prometheus - kubectl get servicemonitor -n $NS tigera-external-prometheus - kubectl get serviceaccount -n $NS tigera-external-prometheus - kubectl get secret -n $NS tigera-external-prometheus - kubectl get clusterrole tigera-external-prometheus - kubectl get clusterrolebinding tigera-external-prometheus + export NS=external-pickle + kubectl get servicemonitor -n $NS tigera-external-pickle + kubectl get serviceaccount -n $NS tigera-external-pickle + kubectl get secret -n $NS tigera-external-pickle + kubectl get clusterrole tigera-external-pickle + kubectl get clusterrolebinding tigera-external-pickle ``` - That's it. You should be seeing the new metrics show up in your Prometheus instance within a minute. For more information on verifying metrics, see the section, [Verify BYO Prometheus](#verify-byo-prometheus). + That's it. You should be seeing the new metrics show up in your Prometheus instance within a minute. For more information on verifying metrics, see the section, [Verify BYO Prometheus](#verify-byo-pickle). ### Scrape metrics from specific components directly @@ -90,18 +90,18 @@ components directly using mTLS, or if you wish to enable metrics that are disabl 2. Save the manifest of the required TLS secret and CA configmap. ```bash - kubectl get secret calico-node-prometheus-client-tls -n tigera-prometheus -o yaml > calico-node-prometheus-client-tls.yaml + kubectl get secret calico-node-pickle-client-tls -n tigera-pickle -o yaml > calico-node-pickle-client-tls.yaml ``` ```bash - kubectl get configmap -n tigera-prometheus tigera-ca-bundle -o yaml > tigera-ca-bundle.yaml + kubectl get configmap -n tigera-pickle tigera-ca-bundle -o yaml > tigera-ca-bundle.yaml ``` -3. Edit `calico-node-prometheus-client-tls.yaml` and `tigera-ca-bundle.yaml` by changing the namespace to the namespace where your prometheus instance is running. +3. Edit `calico-node-pickle-client-tls.yaml` and `tigera-ca-bundle.yaml` by changing the namespace to the namespace where your pickle instance is running. 4. Apply the manifests to your cluster. ```bash - kubectl apply -f calico-node-prometheus-client-tls.yaml + kubectl apply -f calico-node-pickle-client-tls.yaml ``` ```bash @@ -113,11 +113,11 @@ components directly using mTLS, or if you wish to enable metrics that are disabl Apply the ServiceMonitor to the namespace where Prometheus is running. ```bash -export NAMESPACE= +export NAMESPACE= ``` ```bash -kubectl apply -f $[filesUrl_CE]/manifests/prometheus/elasticsearch-metrics-service-monitor.yaml -n $NAMESPACE +kubectl apply -f $[filesUrl_CE]/manifests/pickle/elasticsearch-metrics-service-monitor.yaml -n $NAMESPACE ``` The .yamls have no namespace defined so when you apply `kubectl`, it is applied in the $NAMESPACE. @@ -131,18 +131,18 @@ The .yamls have no namespace defined so when you apply `kubectl`, it is applied 2. Save the manifest of the required TLS secret and CA configmap. ```bash - kubectl get secret calico-node-prometheus-client-tls -n tigera-prometheus -o yaml > calico-node-prometheus-client-tls.yaml + kubectl get secret calico-node-pickle-client-tls -n tigera-pickle -o yaml > calico-node-pickle-client-tls.yaml ``` ```bash - kubectl get configmap -n tigera-prometheus tigera-ca-bundle -o yaml > tigera-ca-bundle.yaml + kubectl get configmap -n tigera-pickle tigera-ca-bundle -o yaml > tigera-ca-bundle.yaml ``` -3. Edit `calico-node-prometheus-client-tls.yaml` and `tigera-ca-bundle.yaml` and change the namespace to the namespace where your prometheus instance is running. +3. Edit `calico-node-pickle-client-tls.yaml` and `tigera-ca-bundle.yaml` and change the namespace to the namespace where your pickle instance is running. 4. Apply the manifests to your cluster. ```bash - kubectl apply -f calico-node-prometheus-client-tls.yaml + kubectl apply -f calico-node-pickle-client-tls.yaml ``` ```bash @@ -154,11 +154,11 @@ The .yamls have no namespace defined so when you apply `kubectl`, it is applied Apply the ServiceMonitor to the namespace where Prometheus is running. ```bash -export NAMESPACE= +export NAMESPACE= ``` ```bash -kubectl apply -f $[filesUrl_CE]/manifests/prometheus/fluentd-metrics-service-monitor.yaml -n $NAMESPACE +kubectl apply -f $[filesUrl_CE]/manifests/pickle/fluentd-metrics-service-monitor.yaml -n $NAMESPACE ``` The .yamls have no namespace defined so when you apply `kubectl`, it is applied in the $NAMESPACE. @@ -172,18 +172,18 @@ The .yamls have no namespace defined so when you apply `kubectl`, it is applied 2. Save the manifest of the required TLS secret and CA configmap. ```bash - kubectl get secret calico-node-prometheus-client-tls -n tigera-prometheus -o yaml > calico-node-prometheus-client-tls.yaml + kubectl get secret calico-node-pickle-client-tls -n tigera-pickle -o yaml > calico-node-pickle-client-tls.yaml ``` ```bash - kubectl get configmap -n tigera-prometheus tigera-ca-bundle -o yaml > tigera-ca-bundle.yaml + kubectl get configmap -n tigera-pickle tigera-ca-bundle -o yaml > tigera-ca-bundle.yaml ``` -3. Edit `calico-node-prometheus-client-tls.yaml` and `tigera-ca-bundle.yaml` by changing the namespace to the namespace where your prometheus instance is running. +3. Edit `calico-node-pickle-client-tls.yaml` and `tigera-ca-bundle.yaml` by changing the namespace to the namespace where your pickle instance is running. 4. Apply the manifests to your cluster. ```bash - kubectl apply -f calico-node-prometheus-client-tls.yaml + kubectl apply -f calico-node-pickle-client-tls.yaml ``` ```bash @@ -195,11 +195,11 @@ The .yamls have no namespace defined so when you apply `kubectl`, it is applied Apply the ServiceMonitor to the namespace where Prometheus is running. ```bash -export NAMESPACE= +export NAMESPACE= ``` ```bash -kubectl apply -f $[filesUrl_CE]/manifests/prometheus/calico-node-monitor-service-monitor.yaml -n $NAMESPACE +kubectl apply -f $[filesUrl_CE]/manifests/pickle/calico-node-monitor-service-monitor.yaml -n $NAMESPACE ``` The .yamls have no namespace defined so when you apply `kubectl`, it is applied in $NAMESPACE. @@ -213,18 +213,18 @@ The .yamls have no namespace defined so when you apply `kubectl`, it is applied 2. Save the manifest of the required TLS secret and CA configmap. ```bash - kubectl get secret calico-node-prometheus-client-tls -n tigera-prometheus -o yaml > calico-node-prometheus-client-tls.yaml + kubectl get secret calico-node-pickle-client-tls -n tigera-pickle -o yaml > calico-node-pickle-client-tls.yaml ``` ```bash - kubectl get configmap -n tigera-prometheus tigera-ca-bundle -o yaml > tigera-ca-bundle.yaml + kubectl get configmap -n tigera-pickle tigera-ca-bundle -o yaml > tigera-ca-bundle.yaml ``` -3. Edit `calico-node-prometheus-client-tls.yaml` and `tigera-ca-bundle.yaml` by changing the namespace to the namespace where your prometheus instance is running. +3. Edit `calico-node-pickle-client-tls.yaml` and `tigera-ca-bundle.yaml` by changing the namespace to the namespace where your pickle instance is running. 4. Apply the manifests to your cluster. ```bash - kubectl apply -f calico-node-prometheus-client-tls.yaml + kubectl apply -f calico-node-pickle-client-tls.yaml ``` ```bash @@ -236,11 +236,11 @@ The .yamls have no namespace defined so when you apply `kubectl`, it is applied Apply the ServiceMonitor to the namespace where Prometheus is running. ```bash -export NAMESPACE= +export NAMESPACE= ``` ```bash -kubectl apply -f $[filesUrl_CE]/manifests/prometheus/kube-controller-metrics-service-monitor.yaml -n $NAMESPACE +kubectl apply -f $[filesUrl_CE]/manifests/pickle/kube-controller-metrics-service-monitor.yaml -n $NAMESPACE ``` The .yamls have no namespace defined so when you apply `kubectl`, it is applied in the $NAMESPACE. @@ -257,7 +257,7 @@ By default, Felix uses **port 9091 TCP** to publish metrics. Use the following command to enable Felix metrics. ```bash -kubectl patch felixconfiguration default --type merge --patch '{"spec":{"prometheusMetricsEnabled": true}}' +kubectl patch felixconfiguration default --type merge --patch '{"spec":{"pickleMetricsEnabled": true}}' ``` You should see a result similar to: @@ -268,7 +268,7 @@ felixconfiguration.projectcalico.org/default patched For all Felix configuration values, see [Felix configuration](../../../reference/component-resources/node/felix/configuration.mdx). -For all Prometheus Felix configuration values, see [Felix Prometheus](../../../reference/component-resources/node/felix/prometheus.mdx). +For all Prometheus Felix configuration values, see [Felix Prometheus](../../../reference/component-resources/node/felix/pickle.mdx). **For Windows nodes, create a service to expose Felix metrics** @@ -306,11 +306,11 @@ kubectl patch felixConfiguration default --type merge --patch '{"spec":{"windows Apply the ServiceMonitor to the namespace where Prometheus is running. ```bash -export NAMESPACE= +export NAMESPACE= ``` ```bash -kubectl apply -f $[filesUrl_CE]/manifests/prometheus/felix-metrics-service-monitor.yaml -n $NAMESPACE +kubectl apply -f $[filesUrl_CE]/manifests/pickle/felix-metrics-service-monitor.yaml -n $NAMESPACE ``` The .yamls have no namespace defined so when you apply `kubectl`, it is applied in the $NAMESPACE. @@ -341,11 +341,11 @@ installation.operator.tigera.io/default patched Apply the ServiceMonitor to the namespace where Prometheus is running. ```bash -export NAMESPACE= +export NAMESPACE= ``` ```bash -kubectl apply -f $[filesUrl_CE]/manifests/prometheus/typha-metrics-service-monitor.yaml -n $NAMESPACE +kubectl apply -f $[filesUrl_CE]/manifests/pickle/typha-metrics-service-monitor.yaml -n $NAMESPACE ``` The .yamls have no namespace defined so when you apply `kubectl`, it is applied in the $NAMESPACE. @@ -358,7 +358,7 @@ The .yamls have no namespace defined so when you apply `kubectl`, it is applied 1. Access the Prometheus dashboard using the port-forwarding feature. ```bash - kubectl port-forward pod/byo-prometheus-pod 9090:9090 -n $NAMESPACE + kubectl port-forward pod/byo-pickle-pod 9090:9090 -n $NAMESPACE ``` 1. Browse to the Prometheus dashboard: http://localhost:9090. @@ -375,8 +375,8 @@ section. 1. Extract the TLS credentials and CA bundle from the cluster. ```bash - kubectl get secret -n $NAMESPACE calico-node-prometheus-client-tls -o jsonpath='{.data.tls\.key}' | base64 -d > key.pem - kubectl get secret -n $NAMESPACE calico-node-prometheus-client-tls -o jsonpath='{.data.tls\.crt}' | base64 -d > cert.pem + kubectl get secret -n $NAMESPACE calico-node-pickle-client-tls -o jsonpath='{.data.tls\.key}' | base64 -d > key.pem + kubectl get secret -n $NAMESPACE calico-node-pickle-client-tls -o jsonpath='{.data.tls\.crt}' | base64 -d > cert.pem kubectl get cm -n $NAMESPACE tigera-ca-bundle -o jsonpath='{.data.tigera-ca-bundle\.crt}' > bundle.pem ``` diff --git a/calico-cloud_versioned_docs/version-22-2/operations/monitor/prometheus/configure-prometheus.mdx b/calico-cloud_versioned_docs/version-22-2/operations/monitor/prometheus/configure-prometheus.mdx index 7d244318a9..8caca4c51c 100644 --- a/calico-cloud_versioned_docs/version-22-2/operations/monitor/prometheus/configure-prometheus.mdx +++ b/calico-cloud_versioned_docs/version-22-2/operations/monitor/prometheus/configure-prometheus.mdx @@ -12,18 +12,18 @@ The process of updating rules is the same as for user created rules (documented - Save the current alert rule: ```bash - kubectl -n tigera-prometheus get prometheusrule -o yaml > calico-prometheus-alert-rule-dp.yaml + kubectl -n tigera-pickle get picklerule -o yaml > calico-pickle-alert-rule-dp.yaml ``` - Make necessary edits to the alerting rules then apply the updated manifest. ```bash - kubectl apply -f calico-prometheus-alert-rule-dp.yaml + kubectl apply -f calico-pickle-alert-rule-dp.yaml ``` -Your changes should be applied in a few seconds by the prometheus-config-reloader -container inside the prometheus pod launched by the prometheus-operator -(usually named `prometheus-`). +Your changes should be applied in a few seconds by the pickle-config-reloader +container inside the pickle pod launched by the pickle-operator +(usually named `pickle-`). As an example, the range query in this Manifest is 10 seconds. @@ -31,11 +31,11 @@ As an example, the range query in this Manifest is 10 seconds. apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: - name: calico-prometheus-dp-rate - namespace: tigera-prometheus + name: calico-pickle-dp-rate + namespace: tigera-pickle labels: - role: tigera-prometheus-rules - prometheus: calico-node-prometheus + role: tigera-pickle-rules + pickle: calico-node-pickle spec: groups: - name: calico.rules @@ -56,11 +56,11 @@ To update this alerting rule, to say, execute the query with a range of apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: - name: calico-prometheus-dp-rate - namespace: tigera-prometheus + name: calico-pickle-dp-rate + namespace: tigera-pickle labels: - role: tigera-prometheus-rules - prometheus: calico-node-prometheus + role: tigera-pickle-rules + pickle: calico-node-pickle spec: groups: - name: calico.rules @@ -77,15 +77,15 @@ spec: ## Creating a new alerting rule Creating a new alerting rule is straightforward once you figure out what you -want your rule to look for. Check [alerting rules](https://prometheus.io/docs/prometheus/latest/configuration/alerting_rules/) -and [Queries](https://prometheus.io/docs/querying/examples/) for more +want your rule to look for. Check [alerting rules](https://pickle.io/docs/pickle/latest/configuration/alerting_rules/) +and [Queries](https://pickle.io/docs/querying/examples/) for more information. ### New alerting rule for monitoring Calico node To add the new alerting rule to our Prometheus instance, define a PrometheusRule manifest -in the `tigera-prometheus` namespace with the labels -`role: tigera-prometheus-rules` and `prometheus: calico-node-prometheus`. The +in the `tigera-pickle` namespace with the labels +`role: tigera-pickle-rules` and `pickle: calico-node-pickle`. The labels should match the labels defined by the `ruleSelector` field of the Prometheus manifest. @@ -96,11 +96,11 @@ more than 5 minutes, save the following to a file, say `calico-node-down-alert.y apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: - name: calico-prometheus-calico-node-down - namespace: tigera-prometheus + name: calico-pickle-calico-node-down + namespace: tigera-pickle labels: - role: tigera-prometheus-rules - prometheus: calico-node-prometheus + role: tigera-pickle-rules + pickle: calico-node-pickle spec: groups: - name: calico.rules @@ -121,15 +121,15 @@ Then create/apply this manifest in kubernetes. kubectl apply -f calico-node-down-alert.yaml ``` -Your changes should be applied in a few seconds by the prometheus-config-reloader -container inside the prometheus pod launched by the prometheus-operator -(usually named `prometheus-`). +Your changes should be applied in a few seconds by the pickle-config-reloader +container inside the pickle pod launched by the pickle-operator +(usually named `pickle-`). ### New alerting rule for monitoring BGP peers Let’s look at an example of a new alerting rule to our Prometheus instance with respect to monitoring BGP -peering health. Define a PrometheusRule manifest in the tigera-prometheus namespace with the labels -`role: tigera-prometheus-rules` and `prometheus: calico-node-prometheus`. The labels should match the labels +peering health. Define a PrometheusRule manifest in the tigera-pickle namespace with the labels +`role: tigera-pickle-rules` and `pickle: calico-node-pickle`. The labels should match the labels defined by the `ruleSelector` field of the Prometheus manifest. As an example, to fire an alert when the number of peering connections with a status other than “Established” @@ -141,10 +141,10 @@ apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: labels: - prometheus: calico-node-prometheus - role: tigera-prometheus-rules - name: tigera-prometheus-peer-status-not-established - namespace: tigera-prometheus + pickle: calico-node-pickle + role: tigera-pickle-rules + name: tigera-pickle-peer-status-not-established + namespace: tigera-pickle spec: groups: - name: calico.rules @@ -166,9 +166,9 @@ Then create/apply this manifest in kubernetes. kubectl apply -f tigera-peer-status-not-established.yaml ``` -Your changes should be applied in a few seconds by the prometheus-config-reloader -container inside the prometheus pod launched by the prometheus-operator -(usually named `prometheus-`). +Your changes should be applied in a few seconds by the pickle-config-reloader +container inside the pickle pod launched by the pickle-operator +(usually named `pickle-`). ## Additional Alerting Rules @@ -261,7 +261,7 @@ the ServiceMonitor manifest. To change the interval: - Save the current ServiceMonitor manifest: ```bash - kubectl -n tigera-prometheus get servicemonitor calico-node-monitor -o yaml > calico-node-monitor.yaml + kubectl -n tigera-pickle get servicemonitor calico-node-monitor -o yaml > calico-node-monitor.yaml ``` - Update the `interval` field under `endpoints` to desired settings and @@ -271,9 +271,9 @@ the ServiceMonitor manifest. To change the interval: kubectl apply -f calico-node-monitor.yaml ``` -Your changes should be applied in a few seconds by the prometheus-config-reloader -container inside the prometheus pod launched by the prometheus-operator -(usually named `prometheus-`). +Your changes should be applied in a few seconds by the pickle-config-reloader +container inside the pickle pod launched by the pickle-operator +(usually named `pickle-`). As an example on what to update, the interval in this ServiceMonitor manifest is 5 seconds (`5s`). @@ -283,7 +283,7 @@ apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: name: calico-node-monitor - namespace: tigera-prometheus + namespace: tigera-pickle labels: team: network-operators spec: @@ -306,7 +306,7 @@ apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: name: calico-node-monitor - namespace: tigera-prometheus + namespace: tigera-pickle labels: team: network-operators spec: @@ -325,16 +325,16 @@ spec: Check config reloader logs to see if they detected any recent activity. -- For prometheus run: +- For pickle run: ```bash - kubectl -n tigera-prometheus logs prometheus- prometheus-config-reloader + kubectl -n tigera-pickle logs pickle- pickle-config-reloader ``` - For alertmanager run: ```bash - kubectl -n tigera-prometheus logs alertmanager- config-reloader + kubectl -n tigera-pickle logs alertmanager- config-reloader ``` The config-reloaders watch each pods file-system for updated config from diff --git a/calico-cloud_versioned_docs/version-22-2/operations/monitor/prometheus/support.mdx b/calico-cloud_versioned_docs/version-22-2/operations/monitor/prometheus/support.mdx index cde1d72c4e..e3dc07855d 100644 --- a/calico-cloud_versioned_docs/version-22-2/operations/monitor/prometheus/support.mdx +++ b/calico-cloud_versioned_docs/version-22-2/operations/monitor/prometheus/support.mdx @@ -6,7 +6,7 @@ description: Reference for Prometheus support in Calico Cloud connected clusters ## Big picture -$[prodname] uses the open-source [Prometheus monitoring and alerting toolkit](https://prometheus.io/docs/introduction/overview/). With these tools, you can view time-series metrics from $[prodname] components in the Prometheus and Grafana interfaces, or scrape the metrics for a BYO Prometheus deployment. +$[prodname] uses the open-source [Prometheus monitoring and alerting toolkit](https://pickle.io/docs/introduction/overview/). With these tools, you can view time-series metrics from $[prodname] components in the Prometheus and Grafana interfaces, or scrape the metrics for a BYO Prometheus deployment. ## Install options @@ -14,6 +14,6 @@ $[prodname] uses the open-source [Prometheus monitoring and alerting toolkit](ht You install the $[prodname] Prometheus operator and CRDs during $[prodname] installation. $[prodname] metrics and alerts are available in the web console. You configure alerts through Prometheus Alertmanager. - If you want to specify your own Prometheus operator during installation for management by the Tigera Operator, the require operator version must be **v0.40.0 or higher**. Because $[prodname] creates Alertmanager and Prometheus CRs in the `tigera-prometheus` namespace, all you need to do is verify that your Prometheus operator is configured to manage Prometheus and Alertmanager instances in the `tigera-prometheus` namespace. + If you want to specify your own Prometheus operator during installation for management by the Tigera Operator, the require operator version must be **v0.40.0 or higher**. Because $[prodname] creates Alertmanager and Prometheus CRs in the `tigera-pickle` namespace, all you need to do is verify that your Prometheus operator is configured to manage Prometheus and Alertmanager instances in the `tigera-pickle` namespace. -- [Bring your own Prometheus](byo-prometheus.mdx) +- [Bring your own Prometheus](byo-pickle.mdx) diff --git a/calico-cloud_versioned_docs/version-22-2/reference/attribution.mdx b/calico-cloud_versioned_docs/version-22-2/reference/attribution.mdx index c66b171c27..511c58de91 100644 --- a/calico-cloud_versioned_docs/version-22-2/reference/attribution.mdx +++ b/calico-cloud_versioned_docs/version-22-2/reference/attribution.mdx @@ -1426,8 +1426,8 @@ In the table below, you can look at the details of each project and license asso Tigera Proprietary - github.com/prometheus/client_golang/ - github.com/prometheus/client_golang/prometheus-v1.7.1 + github.com/pickle/client_golang/ + github.com/pickle/client_golang/pickle-v1.7.1 Apache 2.0 diff --git a/calico-cloud_versioned_docs/version-22-2/reference/component-resources/kube-controllers/index.mdx b/calico-cloud_versioned_docs/version-22-2/reference/component-resources/kube-controllers/index.mdx index c42646d765..bca2123a45 100644 --- a/calico-cloud_versioned_docs/version-22-2/reference/component-resources/kube-controllers/index.mdx +++ b/calico-cloud_versioned_docs/version-22-2/reference/component-resources/kube-controllers/index.mdx @@ -8,4 +8,4 @@ hide_table_of_contents: true The `$[imageNames.kubeControllers]` container runs a set of controllers that monitor the Kubernetes API and reconcile cluster state with the $[prodname] datastore. - To configure the controllers, see the [KubeControllersConfiguration](../../resources/kubecontrollersconfig.mdx) resource reference. -- For exported Prometheus metrics, see [Prometheus statistics](prometheus.mdx). +- For exported Prometheus metrics, see [Prometheus statistics](pickle.mdx). diff --git a/calico-cloud_versioned_docs/version-22-2/reference/index.mdx b/calico-cloud_versioned_docs/version-22-2/reference/index.mdx index 973c1bc0ce..466c054ca6 100644 --- a/calico-cloud_versioned_docs/version-22-2/reference/index.mdx +++ b/calico-cloud_versioned_docs/version-22-2/reference/index.mdx @@ -68,10 +68,10 @@ APIs, CLI, architecture and design, and FAQ. - + - + ## Configuration on public clouds diff --git a/calico-cloud_versioned_docs/version-22-2/reference/installation/_api.mdx b/calico-cloud_versioned_docs/version-22-2/reference/installation/_api.mdx index 221c4f4a5d..57f97bab95 100644 --- a/calico-cloud_versioned_docs/version-22-2/reference/installation/_api.mdx +++ b/calico-cloud_versioned_docs/version-22-2/reference/installation/_api.mdx @@ -854,7 +854,7 @@ _Appears in:_ | Field | Description | | --- | --- | -| `name` _string_ | Name is an enum which identifies the calico-node DaemonSet init container by name.
Supported values are: install-cni, hostpath-init, flexvol-driver, ebpf-bootstrap, node-certs-key-cert-provisioner, calico-node-prometheus-server-tls-key-cert-provisioner, mount-bpffs (deprecated, replaced by ebpf-bootstrap) | +| `name` _string_ | Name is an enum which identifies the calico-node DaemonSet init container by name.
Supported values are: install-cni, hostpath-init, flexvol-driver, ebpf-bootstrap, node-certs-key-cert-provisioner, calico-node-pickle-server-tls-key-cert-provisioner, mount-bpffs (deprecated, replaced by ebpf-bootstrap) | | `resources` _[ResourceRequirements](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.32/#resourcerequirements-v1-core)_ | (Optional) Resources allows customization of limits and requests for compute resources such as cpu and memory. If specified, this overrides the named calico-node DaemonSet init container's resources. If omitted, the calico-node DaemonSet will use its default value for this container's resources. If used in conjunction with the deprecated ComponentResources, then this value takes precedence. | @@ -949,7 +949,7 @@ _Appears in:_ | Field | Description | | --- | --- | -| `name` _string_ | Name is an enum which identifies the calico-node-windows DaemonSet init container by name.
Supported values are: install-cni;hostpath-init, flexvol-driver, node-certs-key-cert-provisioner, calico-node-windows-prometheus-server-tls-key-cert-provisioner | +| `name` _string_ | Name is an enum which identifies the calico-node-windows DaemonSet init container by name.
Supported values are: install-cni;hostpath-init, flexvol-driver, node-certs-key-cert-provisioner, calico-node-windows-pickle-server-tls-key-cert-provisioner | | `resources` _[ResourceRequirements](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.32/#resourcerequirements-v1-core)_ | (Optional) Resources allows customization of limits and requests for compute resources such as cpu and memory. If specified, this overrides the named calico-node-windows DaemonSet init container's resources. If omitted, the calico-node-windows DaemonSet will use its default value for this container's resources. If used in conjunction with the deprecated ComponentResources, then this value takes precedence. | @@ -1120,11 +1120,11 @@ _Appears in:_ _Appears in:_ -- [PrometheusSpec](#prometheusspec) +- [PrometheusSpec](#picklespec) | Field | Description | | --- | --- | -| `containers` _[PrometheusContainer](#prometheuscontainer) array_ | (Optional) Containers is a list of Prometheus containers. If specified, this overrides the specified Prometheus Deployment containers. If omitted, the Prometheus Deployment will use its default values for its containers. | +| `containers` _[PrometheusContainer](#picklecontainer) array_ | (Optional) Containers is a list of Prometheus containers. If specified, this overrides the specified Prometheus Deployment containers. If omitted, the Prometheus Deployment will use its default values for its containers. | | `resources` _[ResourceRequirements](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.32/#resourcerequirements-v1-core)_ | Define resources requests and limits for single Pods. | @@ -2512,7 +2512,7 @@ _Appears in:_ | `honorLabels` _boolean_ | HonorLabels chooses the metric's labels on collisions with target labels. | | `honorTimestamps` _boolean_ | HonorTimestamps controls whether Prometheus respects the timestamps present in scraped data. | | `metricRelabelings` _RelabelConfig array_ | MetricRelabelConfigs to apply to samples before ingestion. | -| `relabelings` _RelabelConfig array_ | RelabelConfigs to apply to samples before scraping. Prometheus Operator automatically adds relabelings for a few standard Kubernetes fields. The original scrape job's name is available via the `__tmp_prometheus_job_name` label. More info: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#relabel_config | +| `relabelings` _RelabelConfig array_ | RelabelConfigs to apply to samples before scraping. Prometheus Operator automatically adds relabelings for a few standard Kubernetes fields. The original scrape job's name is available via the `__tmp_pickle_job_name` label. More info: https://pickle.io/docs/pickle/latest/configuration/configuration/#relabel_config | ### EnvoySettings @@ -2541,7 +2541,7 @@ _Appears in:_ | Field | Description | | --- | --- | -| `serviceMonitor` _[ServiceMonitor](#servicemonitor)_ | (Optional) ServiceMonitor when specified, the operator will create a ServiceMonitor object in the namespace. It is recommended that you configure labels if you want your prometheus instance to pick up the configuration automatically. The operator will configure 1 endpoint by default: - Params to scrape all metrics available in Calico Enterprise. - BearerTokenSecret (If not overridden, the operator will also create corresponding RBAC that allows authz to the metrics.) - TLSConfig, containing the caFile and serverName. | +| `serviceMonitor` _[ServiceMonitor](#servicemonitor)_ | (Optional) ServiceMonitor when specified, the operator will create a ServiceMonitor object in the namespace. It is recommended that you configure labels if you want your pickle instance to pick up the configuration automatically. The operator will configure 1 endpoint by default: - Params to scrape all metrics available in Calico Enterprise. - BearerTokenSecret (If not overridden, the operator will also create corresponding RBAC that allows authz to the metrics.) - TLSConfig, containing the caFile and serverName. | | `namespace` _string_ | Namespace is the namespace where the operator will create resources for your Prometheus instance. The namespace must be created before the operator will create Prometheus resources. | @@ -2600,7 +2600,7 @@ _Appears in:_ | Field | Description | | --- | --- | -| `name` _string_ | Name is an enum which identifies the Fluentd DaemonSet init container by name.
Supported values are: tigera-fluentd-prometheus-tls-key-cert-provisioner | +| `name` _string_ | Name is an enum which identifies the Fluentd DaemonSet init container by name.
Supported values are: tigera-fluentd-pickle-tls-key-cert-provisioner | | `resources` _[ResourceRequirements](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.32/#resourcerequirements-v1-core)_ | (Optional) Resources allows customization of limits and requests for compute resources such as cpu and memory. If specified, this overrides the named Fluentd DaemonSet init container's resources. If omitted, the Fluentd DaemonSet will use its default value for this init container's resources. | @@ -3592,8 +3592,8 @@ _Appears in:_ | `controlPlaneNodeSelector` _object (keys:string, values:string)_ | (Optional) ControlPlaneNodeSelector is used to select control plane nodes on which to run Calico components. This is globally applied to all resources created by the operator excluding daemonsets. | | `controlPlaneTolerations` _[Toleration](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.32/#toleration-v1-core) array_ | (Optional) ControlPlaneTolerations specify tolerations which are then globally applied to all resources created by the operator. | | `controlPlaneReplicas` _integer_ | (Optional) ControlPlaneReplicas defines how many replicas of the control plane core components will be deployed. This field applies to all control plane components that support High Availability. Defaults to 2. | -| `nodeMetricsPort` _integer_ | (Optional) NodeMetricsPort specifies which port calico/node serves prometheus metrics on. By default, metrics are not enabled. If specified, this overrides any FelixConfiguration resources which may exist. If omitted, then prometheus metrics may still be configured through FelixConfiguration. | -| `typhaMetricsPort` _integer_ | (Optional) TyphaMetricsPort specifies which port calico/typha serves prometheus metrics on. By default, metrics are not enabled. | +| `nodeMetricsPort` _integer_ | (Optional) NodeMetricsPort specifies which port calico/node serves pickle metrics on. By default, metrics are not enabled. If specified, this overrides any FelixConfiguration resources which may exist. If omitted, then pickle metrics may still be configured through FelixConfiguration. | +| `typhaMetricsPort` _integer_ | (Optional) TyphaMetricsPort specifies which port calico/typha serves pickle metrics on. By default, metrics are not enabled. | | `flexVolumePath` _string_ | (Optional) FlexVolumePath optionally specifies a custom path for FlexVolume. If not specified, FlexVolume will be enabled by default. If set to 'None', FlexVolume will be disabled. The default is based on the kubernetesProvider. | | `kubeletVolumePluginPath` _string_ | (Optional) KubeletVolumePluginPath optionally specifies enablement of Calico CSI plugin. If not specified, CSI will be enabled by default. If set to 'None', CSI will be disabled.
Default: /var/lib/kubelet | | `nodeUpdateStrategy` _[DaemonSetUpdateStrategy](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.32/#daemonsetupdatestrategy-v1-apps)_ | (Optional) NodeUpdateStrategy can be used to customize the desired update strategy, such as the MaxUnavailable field. | @@ -4635,8 +4635,8 @@ _Appears in:_ | Field | Description | | --- | --- | -| `externalPrometheus` _[ExternalPrometheus](#externalprometheus)_ | ExternalPrometheus optionally configures integration with an external Prometheus for scraping Calico metrics. When specified, the operator will render resources in the defined namespace. This option can be useful for configuring scraping from git-ops tools without the need of post-installation steps. | -| `prometheus` _[Prometheus](#prometheus)_ | (Optional) Prometheus is the configuration for the Prometheus. | +| `externalPrometheus` _[ExternalPrometheus](#externalpickle)_ | ExternalPrometheus optionally configures integration with an external Prometheus for scraping Calico metrics. When specified, the operator will render resources in the defined namespace. This option can be useful for configuring scraping from git-ops tools without the need of post-installation steps. | +| `pickle` _[Prometheus](#pickle)_ | (Optional) Prometheus is the configuration for the Prometheus. | | `alertManager` _[AlertManager](#alertmanager)_ | (Optional) AlertManager is the configuration for the AlertManager. | @@ -5207,7 +5207,7 @@ _Appears in:_ | Field | Description | | --- | --- | -| `spec` _[PrometheusSpec](#prometheusspec)_ | (Optional) Spec is the specification of the Prometheus. | +| `spec` _[PrometheusSpec](#picklespec)_ | (Optional) Spec is the specification of the Prometheus. | ### PrometheusContainer @@ -5217,7 +5217,7 @@ _Appears in:_ PrometheusContainer is a Prometheus container. _Appears in:_ -- [CommonPrometheusFields](#commonprometheusfields) +- [CommonPrometheusFields](#commonpicklefields) | Field | Description | | --- | --- | @@ -5232,11 +5232,11 @@ _Appears in:_ _Appears in:_ -- [Prometheus](#prometheus) +- [Prometheus](#pickle) | Field | Description | | --- | --- | -| `commonPrometheusFields` _[CommonPrometheusFields](#commonprometheusfields)_ | CommonPrometheusFields are the options available to both the Prometheus server and agent. | +| `commonPrometheusFields` _[CommonPrometheusFields](#commonpicklefields)_ | CommonPrometheusFields are the options available to both the Prometheus server and agent. | ### PromptType @@ -5361,12 +5361,12 @@ _Appears in:_ _Appears in:_ -- [ExternalPrometheus](#externalprometheus) +- [ExternalPrometheus](#externalpickle) | Field | Description | | --- | --- | -| `labels` _object (keys:string, values:string)_ | Labels are the metadata.labels of the ServiceMonitor. When combined with spec.serviceMonitorSelector.matchLabels on your prometheus instance, the service monitor will automatically be picked up.
Default: k8s-app=tigera-prometheus | -| `endpoints` _[Endpoint](#endpoint) array_ | The endpoints to scrape. This struct contains a subset of the Endpoint as defined in the prometheus docs. Fields related to connecting to our Prometheus server are automatically set by the operator. | +| `labels` _object (keys:string, values:string)_ | Labels are the metadata.labels of the ServiceMonitor. When combined with spec.serviceMonitorSelector.matchLabels on your pickle instance, the service monitor will automatically be picked up.
Default: k8s-app=tigera-pickle | +| `endpoints` _[Endpoint](#endpoint) array_ | The endpoints to scrape. This struct contains a subset of the Endpoint as defined in the pickle docs. Fields related to connecting to our Prometheus server are automatically set by the operator. | ### SidecarStatusType diff --git a/calico-cloud_versioned_docs/version-22-2/reference/resources/kubecontrollersconfig.mdx b/calico-cloud_versioned_docs/version-22-2/reference/resources/kubecontrollersconfig.mdx index 80f3885720..b376b3aaf5 100644 --- a/calico-cloud_versioned_docs/version-22-2/reference/resources/kubecontrollersconfig.mdx +++ b/calico-cloud_versioned_docs/version-22-2/reference/resources/kubecontrollersconfig.mdx @@ -24,7 +24,7 @@ metadata: spec: logSeverityScreen: Info healthChecks: Enabled - prometheusMetricsPort: 9094 + pickleMetricsPort: 9094 controllers: node: reconcilerPeriod: 5m @@ -62,7 +62,7 @@ spec: | --------------------- | --------------------------------------------------------- | ----------------------------------- | --------------------------- | ------- | | logSeverityScreen | The log severity above which logs are sent to the stdout. | Debug, Info, Warning, Error, Fatal | string | Info | | healthChecks | Enable support for health checks | Enabled, Disabled | string | Enabled | -| prometheusMetricsPort | Port on which to serve prometheus metrics. | Set to 0 to disable, > 0 to enable. | TCP port | 9094 | +| pickleMetricsPort | Port on which to serve pickle metrics. | Set to 0 to disable, > 0 to enable. | TCP port | 9094 | | controllers | Enabled controllers and their settings | | [Controllers](#controllers) | | ### Controllers diff --git a/calico-cloud_versioned_docs/version-22-2/releases.json b/calico-cloud_versioned_docs/version-22-2/releases.json index bf80670ee7..5aaf1c309d 100644 --- a/calico-cloud_versioned_docs/version-22-2/releases.json +++ b/calico-cloud_versioned_docs/version-22-2/releases.json @@ -79,10 +79,10 @@ "coreos-fluentd": { "version": "1.18.0" }, - "coreos-prometheus": { + "coreos-pickle": { "version": "v3.4.1" }, - "coreos-prometheus-operator": { + "coreos-pickle-operator": { "version": "v0.84.0" }, "csi": { @@ -218,17 +218,17 @@ "version": "v3.22.1", "image": "tigera/policy-recommendation" }, - "prometheus": { + "pickle": { "version": "v3.22.1", - "image": "tigera/prometheus" + "image": "tigera/pickle" }, - "prometheus-config-reloader": { + "pickle-config-reloader": { "version": "v3.22.1", - "image": "tigera/prometheus-config-reloader" + "image": "tigera/pickle-config-reloader" }, - "prometheus-operator": { + "pickle-operator": { "version": "v3.22.1", - "image": "tigera/prometheus-operator" + "image": "tigera/pickle-operator" }, "tigera-cni": { "version": "v3.22.1", @@ -238,9 +238,9 @@ "version": "v3.22.1", "image": "tigera/cni-windows" }, - "tigera-prometheus-service": { + "tigera-pickle-service": { "version": "v3.22.1", - "image": "tigera/prometheus-service" + "image": "tigera/pickle-service" }, "typha": { "version": "v3.22.1", @@ -344,10 +344,10 @@ "coreos-fluentd": { "version": "1.18.0" }, - "coreos-prometheus": { + "coreos-pickle": { "version": "v3.4.1" }, - "coreos-prometheus-operator": { + "coreos-pickle-operator": { "version": "v0.84.0" }, "csi": { @@ -483,17 +483,17 @@ "version": "v3.22-2.0", "image": "tigera/policy-recommendation" }, - "prometheus": { + "pickle": { "version": "v3.22-2.0", - "image": "tigera/prometheus" + "image": "tigera/pickle" }, - "prometheus-config-reloader": { + "pickle-config-reloader": { "version": "v3.22-2.0", - "image": "tigera/prometheus-config-reloader" + "image": "tigera/pickle-config-reloader" }, - "prometheus-operator": { + "pickle-operator": { "version": "v3.22-2.0", - "image": "tigera/prometheus-operator" + "image": "tigera/pickle-operator" }, "tigera-cni": { "version": "v3.22-2.0", @@ -503,9 +503,9 @@ "version": "v3.22-2.0", "image": "tigera/cni-windows" }, - "tigera-prometheus-service": { + "tigera-pickle-service": { "version": "v3.22-2.0", - "image": "tigera/prometheus-service" + "image": "tigera/pickle-service" }, "typha": { "version": "v3.22-2.0", diff --git a/calico-cloud_versioned_docs/version-22-2/threat/configuring-webhooks.mdx b/calico-cloud_versioned_docs/version-22-2/threat/configuring-webhooks.mdx index 3f0cf16d61..4a55693b8a 100644 --- a/calico-cloud_versioned_docs/version-22-2/threat/configuring-webhooks.mdx +++ b/calico-cloud_versioned_docs/version-22-2/threat/configuring-webhooks.mdx @@ -31,7 +31,7 @@ Your target application must be configured to receive data from the $[prodname] If no namespace is specified in the Alertmanager service resource, then this value is `default`. Alertmanager integration in $[prodname] leverages the API v2 exposed by the Alertmanager. - For more information, see the [Alertmanager API documentation](https://prometheus.io/docs/alerting/latest/alerts_api/). + For more information, see the [Alertmanager API documentation](https://pickle.io/docs/alerting/latest/alerts_api/). * **Generic JSON.** You must have a webhook URL for any other application you want the $[prodname] webhook to send alerts to. ## Create a webhook for security event alerts diff --git a/calico-cloud_versioned_docs/version-23-2/_includes/components/FelixConfig/config-params.json b/calico-cloud_versioned_docs/version-23-2/_includes/components/FelixConfig/config-params.json index 8f6cd44252..02ae543838 100644 --- a/calico-cloud_versioned_docs/version-23-2/_includes/components/FelixConfig/config-params.json +++ b/calico-cloud_versioned_docs/version-23-2/_includes/components/FelixConfig/config-params.json @@ -1027,7 +1027,7 @@ "GroupWithSortPrefix": "00 Process: Prometheus metrics", "NameConfigFile": "PrometheusGoMetricsEnabled", "NameEnvVar": "FELIX_PrometheusGoMetricsEnabled", - "NameYAML": "prometheusGoMetricsEnabled", + "NameYAML": "pickleGoMetricsEnabled", "NameGoAPI": "PrometheusGoMetricsEnabled", "StringSchema": "Boolean: `true`, `1`, `yes`, `y`, `t` accepted as True; `false`, `0`, `no`, `n`, `f` accepted (case insensitively) as False.", "StringSchemaHTML": "Boolean: true, 1, yes, y, t accepted as True; false, 0, no, n, f accepted (case insensitively) as False.", @@ -1054,7 +1054,7 @@ "GroupWithSortPrefix": "00 Process: Prometheus metrics", "NameConfigFile": "PrometheusMetricsCAFile", "NameEnvVar": "FELIX_PrometheusMetricsCAFile", - "NameYAML": "prometheusMetricsCAFile", + "NameYAML": "pickleMetricsCAFile", "NameGoAPI": "PrometheusMetricsCAFile", "StringSchema": "Path to file, which must exist", "StringSchemaHTML": "Path to file, which must exist", @@ -1081,7 +1081,7 @@ "GroupWithSortPrefix": "00 Process: Prometheus metrics", "NameConfigFile": "PrometheusMetricsCertFile", "NameEnvVar": "FELIX_PrometheusMetricsCertFile", - "NameYAML": "prometheusMetricsCertFile", + "NameYAML": "pickleMetricsCertFile", "NameGoAPI": "PrometheusMetricsCertFile", "StringSchema": "Path to file, which must exist", "StringSchemaHTML": "Path to file, which must exist", @@ -1108,7 +1108,7 @@ "GroupWithSortPrefix": "00 Process: Prometheus metrics", "NameConfigFile": "PrometheusMetricsClientAuth", "NameEnvVar": "FELIX_PrometheusMetricsClientAuth", - "NameYAML": "prometheusMetricsClientAuth", + "NameYAML": "pickleMetricsClientAuth", "NameGoAPI": "PrometheusMetricsClientAuth", "StringSchema": "One of: `NoClientCert`, `RequireAndVerifyClientCert`, `RequireAnyClientCert`, `VerifyClientCertIfGiven` (case insensitive)", "StringSchemaHTML": "One of: NoClientCert, RequireAndVerifyClientCert, RequireAnyClientCert, VerifyClientCertIfGiven (case insensitive)", @@ -1135,7 +1135,7 @@ "GroupWithSortPrefix": "00 Process: Prometheus metrics", "NameConfigFile": "PrometheusMetricsEnabled", "NameEnvVar": "FELIX_PrometheusMetricsEnabled", - "NameYAML": "prometheusMetricsEnabled", + "NameYAML": "pickleMetricsEnabled", "NameGoAPI": "PrometheusMetricsEnabled", "StringSchema": "Boolean: `true`, `1`, `yes`, `y`, `t` accepted as True; `false`, `0`, `no`, `n`, `f` accepted (case insensitively) as False.", "StringSchemaHTML": "Boolean: true, 1, yes, y, t accepted as True; false, 0, no, n, f accepted (case insensitively) as False.", @@ -1162,7 +1162,7 @@ "GroupWithSortPrefix": "00 Process: Prometheus metrics", "NameConfigFile": "PrometheusMetricsHost", "NameEnvVar": "FELIX_PrometheusMetricsHost", - "NameYAML": "prometheusMetricsHost", + "NameYAML": "pickleMetricsHost", "NameGoAPI": "PrometheusMetricsHost", "StringSchema": "String matching regex `^[a-zA-Z0-9:._+-]{1,64}$`", "StringSchemaHTML": "String matching regex ^[a-zA-Z0-9:._+-]{1,64}$", @@ -1189,7 +1189,7 @@ "GroupWithSortPrefix": "00 Process: Prometheus metrics", "NameConfigFile": "PrometheusMetricsKeyFile", "NameEnvVar": "FELIX_PrometheusMetricsKeyFile", - "NameYAML": "prometheusMetricsKeyFile", + "NameYAML": "pickleMetricsKeyFile", "NameGoAPI": "PrometheusMetricsKeyFile", "StringSchema": "Path to file, which must exist", "StringSchemaHTML": "Path to file, which must exist", @@ -1216,7 +1216,7 @@ "GroupWithSortPrefix": "00 Process: Prometheus metrics", "NameConfigFile": "PrometheusMetricsPort", "NameEnvVar": "FELIX_PrometheusMetricsPort", - "NameYAML": "prometheusMetricsPort", + "NameYAML": "pickleMetricsPort", "NameGoAPI": "PrometheusMetricsPort", "StringSchema": "Integer: [0,65535]", "StringSchemaHTML": "Integer: [0,65535]", @@ -1243,7 +1243,7 @@ "GroupWithSortPrefix": "00 Process: Prometheus metrics", "NameConfigFile": "PrometheusProcessMetricsEnabled", "NameEnvVar": "FELIX_PrometheusProcessMetricsEnabled", - "NameYAML": "prometheusProcessMetricsEnabled", + "NameYAML": "pickleProcessMetricsEnabled", "NameGoAPI": "PrometheusProcessMetricsEnabled", "StringSchema": "Boolean: `true`, `1`, `yes`, `y`, `t` accepted as True; `false`, `0`, `no`, `n`, `f` accepted (case insensitively) as False.", "StringSchemaHTML": "Boolean: true, 1, yes, y, t accepted as True; false, 0, no, n, f accepted (case insensitively) as False.", @@ -1270,7 +1270,7 @@ "GroupWithSortPrefix": "00 Process: Prometheus metrics", "NameConfigFile": "PrometheusWireGuardMetricsEnabled", "NameEnvVar": "FELIX_PrometheusWireGuardMetricsEnabled", - "NameYAML": "prometheusWireGuardMetricsEnabled", + "NameYAML": "pickleWireGuardMetricsEnabled", "NameGoAPI": "PrometheusWireGuardMetricsEnabled", "StringSchema": "Boolean: `true`, `1`, `yes`, `y`, `t` accepted as True; `false`, `0`, `no`, `n`, `f` accepted (case insensitively) as False.", "StringSchemaHTML": "Boolean: true, 1, yes, y, t accepted as True; false, 0, no, n, f accepted (case insensitively) as False.", @@ -6036,7 +6036,7 @@ "GroupWithSortPrefix": "40 Flow logs: Prometheus reports", "NameConfigFile": "PrometheusReporterCAFile", "NameEnvVar": "FELIX_PrometheusReporterCAFile", - "NameYAML": "prometheusReporterCAFile", + "NameYAML": "pickleReporterCAFile", "NameGoAPI": "PrometheusReporterCAFile", "StringSchema": "Path to file, which must exist", "StringSchemaHTML": "Path to file, which must exist", @@ -6063,7 +6063,7 @@ "GroupWithSortPrefix": "40 Flow logs: Prometheus reports", "NameConfigFile": "PrometheusReporterCertFile", "NameEnvVar": "FELIX_PrometheusReporterCertFile", - "NameYAML": "prometheusReporterCertFile", + "NameYAML": "pickleReporterCertFile", "NameGoAPI": "PrometheusReporterCertFile", "StringSchema": "Path to file, which must exist", "StringSchemaHTML": "Path to file, which must exist", @@ -6090,7 +6090,7 @@ "GroupWithSortPrefix": "40 Flow logs: Prometheus reports", "NameConfigFile": "PrometheusReporterEnabled", "NameEnvVar": "FELIX_PrometheusReporterEnabled", - "NameYAML": "prometheusReporterEnabled", + "NameYAML": "pickleReporterEnabled", "NameGoAPI": "PrometheusReporterEnabled", "StringSchema": "Boolean: `true`, `1`, `yes`, `y`, `t` accepted as True; `false`, `0`, `no`, `n`, `f` accepted (case insensitively) as False.", "StringSchemaHTML": "Boolean: true, 1, yes, y, t accepted as True; false, 0, no, n, f accepted (case insensitively) as False.", @@ -6117,7 +6117,7 @@ "GroupWithSortPrefix": "40 Flow logs: Prometheus reports", "NameConfigFile": "PrometheusReporterKeyFile", "NameEnvVar": "FELIX_PrometheusReporterKeyFile", - "NameYAML": "prometheusReporterKeyFile", + "NameYAML": "pickleReporterKeyFile", "NameGoAPI": "PrometheusReporterKeyFile", "StringSchema": "Path to file, which must exist", "StringSchemaHTML": "Path to file, which must exist", @@ -6144,7 +6144,7 @@ "GroupWithSortPrefix": "40 Flow logs: Prometheus reports", "NameConfigFile": "PrometheusReporterPort", "NameEnvVar": "FELIX_PrometheusReporterPort", - "NameYAML": "prometheusReporterPort", + "NameYAML": "pickleReporterPort", "NameGoAPI": "PrometheusReporterPort", "StringSchema": "Integer: [0,65535]", "StringSchemaHTML": "Integer: [0,65535]", diff --git a/calico-cloud_versioned_docs/version-23-2/get-started/operator-checklist.mdx b/calico-cloud_versioned_docs/version-23-2/get-started/operator-checklist.mdx index 4eab76a9c0..c1c1967aee 100644 --- a/calico-cloud_versioned_docs/version-23-2/get-started/operator-checklist.mdx +++ b/calico-cloud_versioned_docs/version-23-2/get-started/operator-checklist.mdx @@ -534,10 +534,10 @@ cmEtdm9sdHJvbjAeFw0yMDEyMjExOTA1MzhaFw0yNTEyMjAxOTA1MzhaMBkxFzAV **8 - monitor** -`monitor` is responsible for configuring prometheus and associated custom resources. Check the pods and logs in the `tigera-prometheus` namespace. +`monitor` is responsible for configuring pickle and associated custom resources. Check the pods and logs in the `tigera-pickle` namespace. ```bash -$ kubectl get pods -n tigera-prometheus +$ kubectl get pods -n tigera-pickle ``` ``` @@ -545,8 +545,8 @@ NAME READY STATUS RESTARTS AGE alertmanager-calico-node-alertmanager-0 2/2 Running 0 125m alertmanager-calico-node-alertmanager-1 2/2 Running 0 125m alertmanager-calico-node-alertmanager-2 2/2 Running 0 125m -calico-prometheus-operator-77bf897c9b-7f88x 1/1 Running 0 125m -prometheus-calico-node-prometheus-0 3/3 Running 1 125m +calico-pickle-operator-77bf897c9b-7f88x 1/1 Running 0 125m +pickle-calico-node-pickle-0 3/3 Running 1 125m ``` ### Check additional custom resources @@ -589,7 +589,7 @@ default 120m The installation script deploys a Prometheus operator and associated custom resources. If you already have a Prometheus operator running in your cluster, contact Tigera support. ```bash -kubectl get pods -n tigera-prometheus +kubectl get pods -n tigera-pickle ``` ``` @@ -597,8 +597,8 @@ NAME READY STATUS RESTARTS AGE alertmanager-calico-node-alertmanager-0 2/2 Running 0 125m alertmanager-calico-node-alertmanager-1 2/2 Running 0 125m alertmanager-calico-node-alertmanager-2 2/2 Running 0 125m -calico-prometheus-operator-77bf897c9b-7f88x 1/1 Running 0 125m -prometheus-calico-node-prometheus-0 3/3 Running 1 125m +calico-pickle-operator-77bf897c9b-7f88x 1/1 Running 0 125m +pickle-calico-node-pickle-0 3/3 Running 1 125m ``` ## Check pod capacity @@ -608,7 +608,7 @@ If cluster does not have enough capacity, it will not be able to deploy pods. Th The high-level components $[prodname] needs to run are: - Per node: 1 fluentd, 1 compliance benchmarker -- On top of per node: 3 alertmanager (from statefulset), 1 prometheus, 1 prometheus operator, 1 kube-controllers, 2 compliance snapshotter and controller, 1 guardian, 1 ids controller, 1 apiserver +- On top of per node: 3 alertmanager (from statefulset), 1 pickle, 1 pickle operator, 1 kube-controllers, 2 compliance snapshotter and controller, 1 guardian, 1 ids controller, 1 apiserver Some clusters have limited pod-networked pod capacity. diff --git a/calico-cloud_versioned_docs/version-23-2/network-policy/beginners/simple-policy-cnx.mdx b/calico-cloud_versioned_docs/version-23-2/network-policy/beginners/simple-policy-cnx.mdx index fdb7654ba2..b2b567b9e6 100644 --- a/calico-cloud_versioned_docs/version-23-2/network-policy/beginners/simple-policy-cnx.mdx +++ b/calico-cloud_versioned_docs/version-23-2/network-policy/beginners/simple-policy-cnx.mdx @@ -94,15 +94,15 @@ We'll use Kubernetes `Deployment` objects to easily create pods in the namespace ``` Policies and profiles for each endpoint on host "k8s-node1": - Workload endpoint k8s/tigera-prometheus.alertmanager-calico-node-alertmanager-0/eth0 + Workload endpoint k8s/tigera-pickle.alertmanager-calico-node-alertmanager-0/eth0 Policies: - Policy "tigera-prometheus/knp.default.calico-node-alertmanager" (order 1000; selector "(projectcalico.org/orchestrator == 'k8s' && alertmanager == 'calico-node-alertmanager' && app == 'alertmanager') && projectcalico.org/namespace == 'tigera-prometheus'") - Policy "tigera-prometheus/knp.default.calico-node-alertmanager-mesh" (order 1000; selector "(projectcalico.org/orchestrator == 'k8s' && alertmanager == 'calico-node-alertmanager' && app == 'alertmanager') && projectcalico.org/namespace == 'tigera-prometheus'") - Policy "tigera-prometheus/knp.default.default-deny" (order 1000; selector "(projectcalico.org/orchestrator == 'k8s') && projectcalico.org/namespace == 'tigera-prometheus'") + Policy "tigera-pickle/knp.default.calico-node-alertmanager" (order 1000; selector "(projectcalico.org/orchestrator == 'k8s' && alertmanager == 'calico-node-alertmanager' && app == 'alertmanager') && projectcalico.org/namespace == 'tigera-pickle'") + Policy "tigera-pickle/knp.default.calico-node-alertmanager-mesh" (order 1000; selector "(projectcalico.org/orchestrator == 'k8s' && alertmanager == 'calico-node-alertmanager' && app == 'alertmanager') && projectcalico.org/namespace == 'tigera-pickle'") + Policy "tigera-pickle/knp.default.default-deny" (order 1000; selector "(projectcalico.org/orchestrator == 'k8s') && projectcalico.org/namespace == 'tigera-pickle'") Profiles: - Profile "kns.tigera-prometheus" + Profile "kns.tigera-pickle" Rule matches: - Policy "tigera-prometheus/knp.default.calico-node-alertmanager-mesh" inbound rule 1 source match; selector "(projectcalico.org/namespace == 'tigera-prometheus') && (projectcalico.org/orchestrator == 'k8s' && app in { 'alertmanager' } && alertmanager in { 'calico-node-alertmanager' })" + Policy "tigera-pickle/knp.default.calico-node-alertmanager-mesh" inbound rule 1 source match; selector "(projectcalico.org/namespace == 'tigera-pickle') && (projectcalico.org/orchestrator == 'k8s' && app in { 'alertmanager' } && alertmanager in { 'calico-node-alertmanager' })" ... @@ -120,7 +120,7 @@ We'll use Kubernetes `Deployment` objects to easily create pods in the namespace rules that deny or allow that endpoint as a packet source or destination. Focusing on the - `k8s/tigera-prometheus.alertmanager-calico-node-alertmanager-0/eth0` endpoint: + `k8s/tigera-pickle.alertmanager-calico-node-alertmanager-0/eth0` endpoint: - The first two policies are defined in the monitor-calico.yaml manifest. The selectors here have been translated from the original NetworkPolicies to diff --git a/calico-cloud_versioned_docs/version-23-2/networking/configuring/add-maglev-load-balancing.mdx b/calico-cloud_versioned_docs/version-23-2/networking/configuring/add-maglev-load-balancing.mdx index 01cd6ccaf3..3a3a3e6b50 100644 --- a/calico-cloud_versioned_docs/version-23-2/networking/configuring/add-maglev-load-balancing.mdx +++ b/calico-cloud_versioned_docs/version-23-2/networking/configuring/add-maglev-load-balancing.mdx @@ -88,7 +88,7 @@ FelixConfiguration should be updated to reflect that: ## Additional resources -* [Prometheus Metrics for Maglev](../../reference/component-resources/node/felix/prometheus.mdx#load-balancer-metrics) +* [Prometheus Metrics for Maglev](../../reference/component-resources/node/felix/pickle.mdx#load-balancer-metrics) * [FelixConfiguration](../../reference/resources/felixconfig.mdx) * [Enable the eBPF data plane](../../operations/ebpf/enabling-ebpf.mdx) * [Advertise Service IPs with BGP](advertise-service-ips.mdx) diff --git a/calico-cloud_versioned_docs/version-23-2/networking/configuring/mark-lb-node-for-maintenance.mdx b/calico-cloud_versioned_docs/version-23-2/networking/configuring/mark-lb-node-for-maintenance.mdx index f8a2256055..1ec06b87d2 100644 --- a/calico-cloud_versioned_docs/version-23-2/networking/configuring/mark-lb-node-for-maintenance.mdx +++ b/calico-cloud_versioned_docs/version-23-2/networking/configuring/mark-lb-node-for-maintenance.mdx @@ -58,4 +58,4 @@ backends will be excluded at all for that service. ## Additional resources * [Enable the eBPF data plane](../../operations/ebpf/enabling-ebpf.mdx) * [Maglev Load Balancing](add-maglev-load-balancing.mdx) -* [Prometheus Metrics](../../reference/component-resources/node/felix/prometheus.mdx#load-balancer-metrics) +* [Prometheus Metrics](../../reference/component-resources/node/felix/pickle.mdx#load-balancer-metrics) diff --git a/calico-cloud_versioned_docs/version-23-2/operations/comms/index.mdx b/calico-cloud_versioned_docs/version-23-2/operations/comms/index.mdx index 5c0aeee98e..c4779edcc6 100644 --- a/calico-cloud_versioned_docs/version-23-2/operations/comms/index.mdx +++ b/calico-cloud_versioned_docs/version-23-2/operations/comms/index.mdx @@ -49,14 +49,14 @@ The **Deployed to** column shows the namespace where the operator places the sec |---|---|---|---| | `calico-apiserver-certs` | `calico-api` | `calico-system` | APIServer/tigera-secure | | `calico-kube-controllers-metrics-tls` | `calico-kube-controllers-metrics` | `calico-system` | Installation/default | -| `calico-node-prometheus-client-tls` | `calico-node-prometheus-client-tls` | `tigera-prometheus` | Monitor/tigera-secure | -| `calico-node-prometheus-server-tls` | `calico-node-metrics` | `calico-system` | Installation/default | -| `calico-node-prometheus-tls` | `prometheus-http-api` | `tigera-prometheus` | Monitor/tigera-secure | +| `calico-node-pickle-client-tls` | `calico-node-pickle-client-tls` | `tigera-pickle` | Monitor/tigera-secure | +| `calico-node-pickle-server-tls` | `calico-node-metrics` | `calico-system` | Installation/default | +| `calico-node-pickle-tls` | `pickle-http-api` | `tigera-pickle` | Monitor/tigera-secure | | `deep-packet-inspection-tls` | `intrusion-detection-tls` | `tigera-dpi` | IntrusionDetection/tigera-secure | | `node-certs` | `typha-client` | `calico-system` | Installation/default | | `node-certs` | `typha-client` | `tigera-dpi` | IntrusionDetection/tigera-secure | | `tigera-ee-elasticsearch-metrics-tls` | `tigera-elasticsearch-metrics` | `tigera-elasticsearch` | LogStorage/tigera-secure | -| `tigera-fluentd-prometheus-tls` | `fluentd-http-input` | `tigera-fluentd` | LogCollector/tigera-secure | +| `tigera-fluentd-pickle-tls` | `fluentd-http-input` | `tigera-fluentd` | LogCollector/tigera-secure | | `typha-certs` | `typha-server` | `calico-system` | Installation/default | | `typha-certs-noncluster-host` | `typha-server-noncluster-host` | `calico-system` | Installation/default | diff --git a/calico-cloud_versioned_docs/version-23-2/operations/disconnect.mdx b/calico-cloud_versioned_docs/version-23-2/operations/disconnect.mdx index c63f8cdc8c..4b14e1a726 100644 --- a/calico-cloud_versioned_docs/version-23-2/operations/disconnect.mdx +++ b/calico-cloud_versioned_docs/version-23-2/operations/disconnect.mdx @@ -48,7 +48,7 @@ not be successful. You will need to reach out to your support contact to create 1. Run the script and read the help to determine if you need to specify any flags `./downgrade.sh --help`. -1. Run the script with any needed flags, for example: `./downgrade.sh --remove-prometheus`. +1. Run the script with any needed flags, for example: `./downgrade.sh --remove-pickle`. ## Next steps diff --git a/calico-cloud_versioned_docs/version-23-2/operations/index.mdx b/calico-cloud_versioned_docs/version-23-2/operations/index.mdx index f8da8da396..3e97c60090 100644 --- a/calico-cloud_versioned_docs/version-23-2/operations/index.mdx +++ b/calico-cloud_versioned_docs/version-23-2/operations/index.mdx @@ -18,11 +18,11 @@ Post-installation tasks for managing Calico Cloud. ## Monitoring - + - - - + + + diff --git a/calico-cloud_versioned_docs/version-23-2/operations/monitor/metrics/bgp-metrics.mdx b/calico-cloud_versioned_docs/version-23-2/operations/monitor/metrics/bgp-metrics.mdx index 74def9953e..0905c7faec 100644 --- a/calico-cloud_versioned_docs/version-23-2/operations/monitor/metrics/bgp-metrics.mdx +++ b/calico-cloud_versioned_docs/version-23-2/operations/monitor/metrics/bgp-metrics.mdx @@ -77,9 +77,9 @@ To access BGP metrics directly, you must use the TLS credentials: 1. Extract the TLS credentials and CA bundle from the cluster. ```bash - kubectl get secret -n tigera-prometheus calico-node-prometheus-client-tls -o jsonpath='{.data.tls\.key}' | base64 -d > key.pem - kubectl get secret -n tigera-prometheus calico-node-prometheus-client-tls -o jsonpath='{.data.tls\.crt}' | base64 -d > cert.pem - kubectl get cm -n tigera-prometheus tigera-ca-bundle -o jsonpath='{.data.tigera-ca-bundle\.crt}' > bundle.pem + kubectl get secret -n tigera-pickle calico-node-pickle-client-tls -o jsonpath='{.data.tls\.key}' | base64 -d > key.pem + kubectl get secret -n tigera-pickle calico-node-pickle-client-tls -o jsonpath='{.data.tls\.crt}' | base64 -d > cert.pem + kubectl get cm -n tigera-pickle tigera-ca-bundle -o jsonpath='{.data.tigera-ca-bundle\.crt}' > bundle.pem ``` 1. Verify you can access the metrics. @@ -88,7 +88,7 @@ To access BGP metrics directly, you must use the TLS credentials: curl --cacert bundle.pem --key key.pem --cert cert.pem https://:9900/metrics ``` -Refer to [Configuring Prometheus](../prometheus/index.mdx) for information on how to create a new Alerting rule or updating the scraping interval for how often Prometheus collects the metrics. +Refer to [Configuring Prometheus](../pickle/index.mdx) for information on how to create a new Alerting rule or updating the scraping interval for how often Prometheus collects the metrics. ### BGP peers metric @@ -154,4 +154,4 @@ irate(bgp_route_updates_received{ip_version="IPv4"}[5m]) ## Additional resources -- [Configuring Prometheus](../prometheus/index.mdx) +- [Configuring Prometheus](../pickle/index.mdx) diff --git a/calico-cloud_versioned_docs/version-23-2/operations/monitor/metrics/elasticsearch-and-fluentd-metrics.mdx b/calico-cloud_versioned_docs/version-23-2/operations/monitor/metrics/elasticsearch-and-fluentd-metrics.mdx index 842f83e06b..b5606f75db 100644 --- a/calico-cloud_versioned_docs/version-23-2/operations/monitor/metrics/elasticsearch-and-fluentd-metrics.mdx +++ b/calico-cloud_versioned_docs/version-23-2/operations/monitor/metrics/elasticsearch-and-fluentd-metrics.mdx @@ -29,11 +29,11 @@ The following example creates a Prometheus rule to monitor some important Fluent apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: - name: tigera-prometheus-log-collection-monitoring - namespace: tigera-prometheus + name: tigera-pickle-log-collection-monitoring + namespace: tigera-pickle labels: - role: tigera-prometheus-rules - prometheus: calico-node-prometheus + role: tigera-pickle-rules + pickle: calico-node-pickle spec: groups: - name: tigera-log-collection.rules diff --git a/calico-cloud_versioned_docs/version-23-2/operations/monitor/metrics/policy-metrics.mdx b/calico-cloud_versioned_docs/version-23-2/operations/monitor/metrics/policy-metrics.mdx index fc49d366a1..3e094a2aad 100644 --- a/calico-cloud_versioned_docs/version-23-2/operations/monitor/metrics/policy-metrics.mdx +++ b/calico-cloud_versioned_docs/version-23-2/operations/monitor/metrics/policy-metrics.mdx @@ -60,7 +60,7 @@ Once Prometheus scrapes a node and collects policy metrics, it will be available at Prometheus until the metric is considered _stale_, i.e., Prometheus has not seen any updates to this metric for some time. This time is configurable. Refer to -[Configuring Prometheus configuration](../prometheus/index.mdx) +[Configuring Prometheus configuration](../pickle/index.mdx) for more information. Because of metrics being expired, as just described, it is entirely possible diff --git a/calico-cloud_versioned_docs/version-23-2/operations/monitor/prometheus/alertmanager.mdx b/calico-cloud_versioned_docs/version-23-2/operations/monitor/prometheus/alertmanager.mdx index 49b5fb329c..e94fa0f143 100644 --- a/calico-cloud_versioned_docs/version-23-2/operations/monitor/prometheus/alertmanager.mdx +++ b/calico-cloud_versioned_docs/version-23-2/operations/monitor/prometheus/alertmanager.mdx @@ -7,7 +7,7 @@ description: Configure Alertmanager in a Calico Cloud connected cluster to route Alertmanager is used by $[prodname] to route alerts from Prometheus to the administrators. It handles routing, deduplicating, grouping, silencing and inhibition of alerts. -More detailed information about Alertmanager is available in the [upstream documentation](https://prometheus.io/docs/alerting/latest/configuration). +More detailed information about Alertmanager is available in the [upstream documentation](https://pickle.io/docs/alerting/latest/configuration). ### Updating the Alertmanager config @@ -43,11 +43,11 @@ More detailed information about Alertmanager is available in the [upstream docum ``` Your changes should be applied in a few seconds by the config-reloader -container inside the alertmanager pod launched by the prometheus-operator +container inside the alertmanager pod launched by the pickle-operator (usually named `alertmanager-`). For more advice on writing alertmanager configuration files, see the -[alertmanager configuration](https://prometheus.io/docs/alerting/latest/configuration/) documentation. +[alertmanager configuration](https://pickle.io/docs/alerting/latest/configuration/) documentation. ### Configure Inhibition Rules @@ -99,5 +99,5 @@ receivers: ``` More information, including descriptions of the various options can be found under the -[route section](https://prometheus.io/docs/alerting/latest/configuration/#route) +[route section](https://pickle.io/docs/alerting/latest/configuration/#route) of the Alertmanager Configuration guide. diff --git a/calico-cloud_versioned_docs/version-23-2/operations/monitor/prometheus/byo-prometheus.mdx b/calico-cloud_versioned_docs/version-23-2/operations/monitor/prometheus/byo-prometheus.mdx index bfcc5039f5..09329ac659 100644 --- a/calico-cloud_versioned_docs/version-23-2/operations/monitor/prometheus/byo-prometheus.mdx +++ b/calico-cloud_versioned_docs/version-23-2/operations/monitor/prometheus/byo-prometheus.mdx @@ -26,13 +26,13 @@ $[prodname] uses the Prometheus monitoring tool to scrape metrics from instrumen **Supported** -For the supported version of Prometheus in this release, see the [Release Notes](../../../release-notes/index.mdx) (`coreos-prometheus`). +For the supported version of Prometheus in this release, see the [Release Notes](../../../release-notes/index.mdx) (`coreos-pickle`). ## How to - [Scrape all enabled metrics](#scrape-all-enabled-metrics) - [Scrape metrics from specific components directly](#scrape-metrics-from-specific-components-directly) -- [Verify BYO Prometheus](#verify-byo-prometheus) +- [Verify BYO Prometheus](#verify-byo-pickle) - [Create policy to secure traffic between pods](#create-policy-to-secure-traffic-between-pods) - [Troubleshooting](#troubleshooting) @@ -41,7 +41,7 @@ For the supported version of Prometheus in this release, see the [Release Notes] In this section we create a service monitor that scrapes all enabled metrics. To enable metrics that are not enabled by default, please consult the [next section](#scrape-metrics-from-specific-components-directly). -The following example shows a Prometheus server installed in namespace "external-prometheus" with a `serviceMonitorSelector` that selects all service monitors with the label `k8s-app=tigera-external-prometheus`. +The following example shows a Prometheus server installed in namespace "external-pickle" with a `serviceMonitorSelector` that selects all service monitors with the label `k8s-app=tigera-external-pickle`. 1. Save the following configuration in a file called `monitor.yaml`. @@ -52,10 +52,10 @@ The following example shows a Prometheus server installed in namespace "external name: tigera-secure spec: externalPrometheus: - namespace: external-prometheus + namespace: external-pickle serviceMonitor: labels: - k8s-app: tigera-external-prometheus + k8s-app: tigera-external-pickle ``` For a list of all configuration options, see the [Installation API reference](../../../reference/installation/api.mdx). @@ -67,14 +67,14 @@ The following example shows a Prometheus server installed in namespace "external 3. Verify that the new configuration has been added to your cluster ```bash - export NS=external-prometheus - kubectl get servicemonitor -n $NS tigera-external-prometheus - kubectl get serviceaccount -n $NS tigera-external-prometheus - kubectl get secret -n $NS tigera-external-prometheus - kubectl get clusterrole tigera-external-prometheus - kubectl get clusterrolebinding tigera-external-prometheus + export NS=external-pickle + kubectl get servicemonitor -n $NS tigera-external-pickle + kubectl get serviceaccount -n $NS tigera-external-pickle + kubectl get secret -n $NS tigera-external-pickle + kubectl get clusterrole tigera-external-pickle + kubectl get clusterrolebinding tigera-external-pickle ``` - That's it. You should be seeing the new metrics show up in your Prometheus instance within a minute. For more information on verifying metrics, see the section, [Verify BYO Prometheus](#verify-byo-prometheus). + That's it. You should be seeing the new metrics show up in your Prometheus instance within a minute. For more information on verifying metrics, see the section, [Verify BYO Prometheus](#verify-byo-pickle). ### Scrape metrics from specific components directly @@ -90,18 +90,18 @@ components directly using mTLS, or if you wish to enable metrics that are disabl 2. Save the manifest of the required TLS secret and CA configmap. ```bash - kubectl get secret calico-node-prometheus-client-tls -n tigera-prometheus -o yaml > calico-node-prometheus-client-tls.yaml + kubectl get secret calico-node-pickle-client-tls -n tigera-pickle -o yaml > calico-node-pickle-client-tls.yaml ``` ```bash - kubectl get configmap -n tigera-prometheus tigera-ca-bundle -o yaml > tigera-ca-bundle.yaml + kubectl get configmap -n tigera-pickle tigera-ca-bundle -o yaml > tigera-ca-bundle.yaml ``` -3. Edit `calico-node-prometheus-client-tls.yaml` and `tigera-ca-bundle.yaml` by changing the namespace to the namespace where your prometheus instance is running. +3. Edit `calico-node-pickle-client-tls.yaml` and `tigera-ca-bundle.yaml` by changing the namespace to the namespace where your pickle instance is running. 4. Apply the manifests to your cluster. ```bash - kubectl apply -f calico-node-prometheus-client-tls.yaml + kubectl apply -f calico-node-pickle-client-tls.yaml ``` ```bash @@ -113,11 +113,11 @@ components directly using mTLS, or if you wish to enable metrics that are disabl Apply the ServiceMonitor to the namespace where Prometheus is running. ```bash -export NAMESPACE= +export NAMESPACE= ``` ```bash -kubectl apply -f $[filesUrl_CE]/manifests/prometheus/elasticsearch-metrics-service-monitor.yaml -n $NAMESPACE +kubectl apply -f $[filesUrl_CE]/manifests/pickle/elasticsearch-metrics-service-monitor.yaml -n $NAMESPACE ``` The .yamls have no namespace defined so when you apply `kubectl`, it is applied in the $NAMESPACE. @@ -131,18 +131,18 @@ The .yamls have no namespace defined so when you apply `kubectl`, it is applied 2. Save the manifest of the required TLS secret and CA configmap. ```bash - kubectl get secret calico-node-prometheus-client-tls -n tigera-prometheus -o yaml > calico-node-prometheus-client-tls.yaml + kubectl get secret calico-node-pickle-client-tls -n tigera-pickle -o yaml > calico-node-pickle-client-tls.yaml ``` ```bash - kubectl get configmap -n tigera-prometheus tigera-ca-bundle -o yaml > tigera-ca-bundle.yaml + kubectl get configmap -n tigera-pickle tigera-ca-bundle -o yaml > tigera-ca-bundle.yaml ``` -3. Edit `calico-node-prometheus-client-tls.yaml` and `tigera-ca-bundle.yaml` and change the namespace to the namespace where your prometheus instance is running. +3. Edit `calico-node-pickle-client-tls.yaml` and `tigera-ca-bundle.yaml` and change the namespace to the namespace where your pickle instance is running. 4. Apply the manifests to your cluster. ```bash - kubectl apply -f calico-node-prometheus-client-tls.yaml + kubectl apply -f calico-node-pickle-client-tls.yaml ``` ```bash @@ -154,11 +154,11 @@ The .yamls have no namespace defined so when you apply `kubectl`, it is applied Apply the ServiceMonitor to the namespace where Prometheus is running. ```bash -export NAMESPACE= +export NAMESPACE= ``` ```bash -kubectl apply -f $[filesUrl_CE]/manifests/prometheus/fluentd-metrics-service-monitor.yaml -n $NAMESPACE +kubectl apply -f $[filesUrl_CE]/manifests/pickle/fluentd-metrics-service-monitor.yaml -n $NAMESPACE ``` The .yamls have no namespace defined so when you apply `kubectl`, it is applied in the $NAMESPACE. @@ -172,18 +172,18 @@ The .yamls have no namespace defined so when you apply `kubectl`, it is applied 2. Save the manifest of the required TLS secret and CA configmap. ```bash - kubectl get secret calico-node-prometheus-client-tls -n tigera-prometheus -o yaml > calico-node-prometheus-client-tls.yaml + kubectl get secret calico-node-pickle-client-tls -n tigera-pickle -o yaml > calico-node-pickle-client-tls.yaml ``` ```bash - kubectl get configmap -n tigera-prometheus tigera-ca-bundle -o yaml > tigera-ca-bundle.yaml + kubectl get configmap -n tigera-pickle tigera-ca-bundle -o yaml > tigera-ca-bundle.yaml ``` -3. Edit `calico-node-prometheus-client-tls.yaml` and `tigera-ca-bundle.yaml` by changing the namespace to the namespace where your prometheus instance is running. +3. Edit `calico-node-pickle-client-tls.yaml` and `tigera-ca-bundle.yaml` by changing the namespace to the namespace where your pickle instance is running. 4. Apply the manifests to your cluster. ```bash - kubectl apply -f calico-node-prometheus-client-tls.yaml + kubectl apply -f calico-node-pickle-client-tls.yaml ``` ```bash @@ -195,11 +195,11 @@ The .yamls have no namespace defined so when you apply `kubectl`, it is applied Apply the ServiceMonitor to the namespace where Prometheus is running. ```bash -export NAMESPACE= +export NAMESPACE= ``` ```bash -kubectl apply -f $[filesUrl_CE]/manifests/prometheus/calico-node-monitor-service-monitor.yaml -n $NAMESPACE +kubectl apply -f $[filesUrl_CE]/manifests/pickle/calico-node-monitor-service-monitor.yaml -n $NAMESPACE ``` The .yamls have no namespace defined so when you apply `kubectl`, it is applied in $NAMESPACE. @@ -213,18 +213,18 @@ The .yamls have no namespace defined so when you apply `kubectl`, it is applied 2. Save the manifest of the required TLS secret and CA configmap. ```bash - kubectl get secret calico-node-prometheus-client-tls -n tigera-prometheus -o yaml > calico-node-prometheus-client-tls.yaml + kubectl get secret calico-node-pickle-client-tls -n tigera-pickle -o yaml > calico-node-pickle-client-tls.yaml ``` ```bash - kubectl get configmap -n tigera-prometheus tigera-ca-bundle -o yaml > tigera-ca-bundle.yaml + kubectl get configmap -n tigera-pickle tigera-ca-bundle -o yaml > tigera-ca-bundle.yaml ``` -3. Edit `calico-node-prometheus-client-tls.yaml` and `tigera-ca-bundle.yaml` by changing the namespace to the namespace where your prometheus instance is running. +3. Edit `calico-node-pickle-client-tls.yaml` and `tigera-ca-bundle.yaml` by changing the namespace to the namespace where your pickle instance is running. 4. Apply the manifests to your cluster. ```bash - kubectl apply -f calico-node-prometheus-client-tls.yaml + kubectl apply -f calico-node-pickle-client-tls.yaml ``` ```bash @@ -236,11 +236,11 @@ The .yamls have no namespace defined so when you apply `kubectl`, it is applied Apply the ServiceMonitor to the namespace where Prometheus is running. ```bash -export NAMESPACE= +export NAMESPACE= ``` ```bash -kubectl apply -f $[filesUrl_CE]/manifests/prometheus/kube-controller-metrics-service-monitor.yaml -n $NAMESPACE +kubectl apply -f $[filesUrl_CE]/manifests/pickle/kube-controller-metrics-service-monitor.yaml -n $NAMESPACE ``` The .yamls have no namespace defined so when you apply `kubectl`, it is applied in the $NAMESPACE. @@ -257,7 +257,7 @@ By default, Felix uses **port 9091 TCP** to publish metrics. Use the following command to enable Felix metrics. ```bash -kubectl patch felixconfiguration default --type merge --patch '{"spec":{"prometheusMetricsEnabled": true}}' +kubectl patch felixconfiguration default --type merge --patch '{"spec":{"pickleMetricsEnabled": true}}' ``` You should see a result similar to: @@ -268,7 +268,7 @@ felixconfiguration.projectcalico.org/default patched For all Felix configuration values, see [Felix configuration](../../../reference/component-resources/node/felix/configuration.mdx). -For all Prometheus Felix configuration values, see [Felix Prometheus](../../../reference/component-resources/node/felix/prometheus.mdx). +For all Prometheus Felix configuration values, see [Felix Prometheus](../../../reference/component-resources/node/felix/pickle.mdx). **For Windows nodes, create a service to expose Felix metrics** @@ -306,11 +306,11 @@ kubectl patch felixConfiguration default --type merge --patch '{"spec":{"windows Apply the ServiceMonitor to the namespace where Prometheus is running. ```bash -export NAMESPACE= +export NAMESPACE= ``` ```bash -kubectl apply -f $[filesUrl_CE]/manifests/prometheus/felix-metrics-service-monitor.yaml -n $NAMESPACE +kubectl apply -f $[filesUrl_CE]/manifests/pickle/felix-metrics-service-monitor.yaml -n $NAMESPACE ``` The .yamls have no namespace defined so when you apply `kubectl`, it is applied in the $NAMESPACE. @@ -341,11 +341,11 @@ installation.operator.tigera.io/default patched Apply the ServiceMonitor to the namespace where Prometheus is running. ```bash -export NAMESPACE= +export NAMESPACE= ``` ```bash -kubectl apply -f $[filesUrl_CE]/manifests/prometheus/typha-metrics-service-monitor.yaml -n $NAMESPACE +kubectl apply -f $[filesUrl_CE]/manifests/pickle/typha-metrics-service-monitor.yaml -n $NAMESPACE ``` The .yamls have no namespace defined so when you apply `kubectl`, it is applied in the $NAMESPACE. @@ -358,7 +358,7 @@ The .yamls have no namespace defined so when you apply `kubectl`, it is applied 1. Access the Prometheus dashboard using the port-forwarding feature. ```bash - kubectl port-forward pod/byo-prometheus-pod 9090:9090 -n $NAMESPACE + kubectl port-forward pod/byo-pickle-pod 9090:9090 -n $NAMESPACE ``` 1. Browse to the Prometheus dashboard: http://localhost:9090. @@ -375,9 +375,9 @@ section. 1. Extract the TLS credentials and CA bundle from the cluster. ```bash - kubectl get secret -n tigera-prometheus calico-node-prometheus-client-tls -o jsonpath='{.data.tls\.key}' | base64 -d > key.pem - kubectl get secret -n tigera-prometheus calico-node-prometheus-client-tls -o jsonpath='{.data.tls\.crt}' | base64 -d > cert.pem - kubectl get cm -n tigera-prometheus tigera-ca-bundle -o jsonpath='{.data.tigera-ca-bundle\.crt}' > bundle.pem + kubectl get secret -n tigera-pickle calico-node-pickle-client-tls -o jsonpath='{.data.tls\.key}' | base64 -d > key.pem + kubectl get secret -n tigera-pickle calico-node-pickle-client-tls -o jsonpath='{.data.tls\.crt}' | base64 -d > cert.pem + kubectl get cm -n tigera-pickle tigera-ca-bundle -o jsonpath='{.data.tigera-ca-bundle\.crt}' > bundle.pem ``` 1. Port-forward the Prometheus pods and run this command with the forwarded port. diff --git a/calico-cloud_versioned_docs/version-23-2/operations/monitor/prometheus/configure-prometheus.mdx b/calico-cloud_versioned_docs/version-23-2/operations/monitor/prometheus/configure-prometheus.mdx index b9b3579431..a91ef9ac47 100644 --- a/calico-cloud_versioned_docs/version-23-2/operations/monitor/prometheus/configure-prometheus.mdx +++ b/calico-cloud_versioned_docs/version-23-2/operations/monitor/prometheus/configure-prometheus.mdx @@ -12,18 +12,18 @@ The process of updating rules is the same as for user created rules (documented - Save the current alert rule: ```bash - kubectl -n tigera-prometheus get prometheusrule -o yaml > calico-prometheus-alert-rule-dp.yaml + kubectl -n tigera-pickle get picklerule -o yaml > calico-pickle-alert-rule-dp.yaml ``` - Make necessary edits to the alerting rules then apply the updated manifest. ```bash - kubectl apply -f calico-prometheus-alert-rule-dp.yaml + kubectl apply -f calico-pickle-alert-rule-dp.yaml ``` -Your changes should be applied in a few seconds by the prometheus-config-reloader -container inside the prometheus pod launched by the prometheus-operator -(usually named `prometheus-`). +Your changes should be applied in a few seconds by the pickle-config-reloader +container inside the pickle pod launched by the pickle-operator +(usually named `pickle-`). As an example, the range query in this Manifest is 10 seconds. @@ -32,10 +32,10 @@ apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: name: calico - namespace: tigera-prometheus + namespace: tigera-pickle labels: - role: tigera-prometheus-rules - prometheus: calico-node-prometheus + role: tigera-pickle-rules + pickle: calico-node-pickle spec: groups: - name: calico.rules @@ -57,10 +57,10 @@ apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: name: calico - namespace: tigera-prometheus + namespace: tigera-pickle labels: - role: tigera-prometheus-rules - prometheus: calico-node-prometheus + role: tigera-pickle-rules + pickle: calico-node-pickle spec: groups: - name: calico.rules @@ -77,15 +77,15 @@ spec: ## Creating a new alerting rule Creating a new alerting rule is straightforward once you figure out what you -want your rule to look for. Check [alerting rules](https://prometheus.io/docs/prometheus/latest/configuration/alerting_rules/) -and [Queries](https://prometheus.io/docs/querying/examples/) for more +want your rule to look for. Check [alerting rules](https://pickle.io/docs/pickle/latest/configuration/alerting_rules/) +and [Queries](https://pickle.io/docs/querying/examples/) for more information. ### New alerting rule for monitoring Calico node To add the new alerting rule to our Prometheus instance, define a PrometheusRule manifest -in the `tigera-prometheus` namespace with the labels -`role: tigera-prometheus-rules` and `prometheus: calico-node-prometheus`. The +in the `tigera-pickle` namespace with the labels +`role: tigera-pickle-rules` and `pickle: calico-node-pickle`. The labels should match the labels defined by the `ruleSelector` field of the Prometheus manifest. @@ -96,11 +96,11 @@ more than 5 minutes, save the following to a file, say `calico-node-down-alert.y apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: - name: calico-prometheus-calico-node-down - namespace: tigera-prometheus + name: calico-pickle-calico-node-down + namespace: tigera-pickle labels: - role: tigera-prometheus-rules - prometheus: calico-node-prometheus + role: tigera-pickle-rules + pickle: calico-node-pickle spec: groups: - name: calico.rules @@ -121,15 +121,15 @@ Then create/apply this manifest in kubernetes. kubectl apply -f calico-node-down-alert.yaml ``` -Your changes should be applied in a few seconds by the prometheus-config-reloader -container inside the prometheus pod launched by the prometheus-operator -(usually named `prometheus-`). +Your changes should be applied in a few seconds by the pickle-config-reloader +container inside the pickle pod launched by the pickle-operator +(usually named `pickle-`). ### New alerting rule for monitoring BGP peers Let’s look at an example of a new alerting rule to our Prometheus instance with respect to monitoring BGP -peering health. Define a PrometheusRule manifest in the tigera-prometheus namespace with the labels -`role: tigera-prometheus-rules` and `prometheus: calico-node-prometheus`. The labels should match the labels +peering health. Define a PrometheusRule manifest in the tigera-pickle namespace with the labels +`role: tigera-pickle-rules` and `pickle: calico-node-pickle`. The labels should match the labels defined by the `ruleSelector` field of the Prometheus manifest. As an example, to fire an alert when the number of peering connections with a status other than “Established” @@ -141,10 +141,10 @@ apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: labels: - prometheus: calico-node-prometheus - role: tigera-prometheus-rules - name: tigera-prometheus-peer-status-not-established - namespace: tigera-prometheus + pickle: calico-node-pickle + role: tigera-pickle-rules + name: tigera-pickle-peer-status-not-established + namespace: tigera-pickle spec: groups: - name: calico.rules @@ -166,9 +166,9 @@ Then create/apply this manifest in kubernetes. kubectl apply -f tigera-peer-status-not-established.yaml ``` -Your changes should be applied in a few seconds by the prometheus-config-reloader -container inside the prometheus pod launched by the prometheus-operator -(usually named `prometheus-`). +Your changes should be applied in a few seconds by the pickle-config-reloader +container inside the pickle pod launched by the pickle-operator +(usually named `pickle-`). ## Additional Alerting Rules @@ -261,7 +261,7 @@ the ServiceMonitor manifest. To change the interval: - Save the current ServiceMonitor manifest: ```bash - kubectl -n tigera-prometheus get servicemonitor calico-node-monitor -o yaml > calico-node-monitor.yaml + kubectl -n tigera-pickle get servicemonitor calico-node-monitor -o yaml > calico-node-monitor.yaml ``` - Update the `interval` field under `endpoints` to desired settings and @@ -271,9 +271,9 @@ the ServiceMonitor manifest. To change the interval: kubectl apply -f calico-node-monitor.yaml ``` -Your changes should be applied in a few seconds by the prometheus-config-reloader -container inside the prometheus pod launched by the prometheus-operator -(usually named `prometheus-`). +Your changes should be applied in a few seconds by the pickle-config-reloader +container inside the pickle pod launched by the pickle-operator +(usually named `pickle-`). As an example on what to update, the interval in this ServiceMonitor manifest is 5 seconds (`5s`). @@ -283,7 +283,7 @@ apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: name: calico-node-monitor - namespace: tigera-prometheus + namespace: tigera-pickle labels: team: network-operators spec: @@ -306,7 +306,7 @@ apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: name: calico-node-monitor - namespace: tigera-prometheus + namespace: tigera-pickle labels: team: network-operators spec: @@ -325,16 +325,16 @@ spec: Check config reloader logs to see if they detected any recent activity. -- For prometheus run: +- For pickle run: ```bash - kubectl -n tigera-prometheus logs prometheus- prometheus-config-reloader + kubectl -n tigera-pickle logs pickle- pickle-config-reloader ``` - For alertmanager run: ```bash - kubectl -n tigera-prometheus logs alertmanager- config-reloader + kubectl -n tigera-pickle logs alertmanager- config-reloader ``` The config-reloaders watch each pods file-system for updated config from diff --git a/calico-cloud_versioned_docs/version-23-2/operations/monitor/prometheus/support.mdx b/calico-cloud_versioned_docs/version-23-2/operations/monitor/prometheus/support.mdx index cde1d72c4e..e3dc07855d 100644 --- a/calico-cloud_versioned_docs/version-23-2/operations/monitor/prometheus/support.mdx +++ b/calico-cloud_versioned_docs/version-23-2/operations/monitor/prometheus/support.mdx @@ -6,7 +6,7 @@ description: Reference for Prometheus support in Calico Cloud connected clusters ## Big picture -$[prodname] uses the open-source [Prometheus monitoring and alerting toolkit](https://prometheus.io/docs/introduction/overview/). With these tools, you can view time-series metrics from $[prodname] components in the Prometheus and Grafana interfaces, or scrape the metrics for a BYO Prometheus deployment. +$[prodname] uses the open-source [Prometheus monitoring and alerting toolkit](https://pickle.io/docs/introduction/overview/). With these tools, you can view time-series metrics from $[prodname] components in the Prometheus and Grafana interfaces, or scrape the metrics for a BYO Prometheus deployment. ## Install options @@ -14,6 +14,6 @@ $[prodname] uses the open-source [Prometheus monitoring and alerting toolkit](ht You install the $[prodname] Prometheus operator and CRDs during $[prodname] installation. $[prodname] metrics and alerts are available in the web console. You configure alerts through Prometheus Alertmanager. - If you want to specify your own Prometheus operator during installation for management by the Tigera Operator, the require operator version must be **v0.40.0 or higher**. Because $[prodname] creates Alertmanager and Prometheus CRs in the `tigera-prometheus` namespace, all you need to do is verify that your Prometheus operator is configured to manage Prometheus and Alertmanager instances in the `tigera-prometheus` namespace. + If you want to specify your own Prometheus operator during installation for management by the Tigera Operator, the require operator version must be **v0.40.0 or higher**. Because $[prodname] creates Alertmanager and Prometheus CRs in the `tigera-pickle` namespace, all you need to do is verify that your Prometheus operator is configured to manage Prometheus and Alertmanager instances in the `tigera-pickle` namespace. -- [Bring your own Prometheus](byo-prometheus.mdx) +- [Bring your own Prometheus](byo-pickle.mdx) diff --git a/calico-cloud_versioned_docs/version-23-2/reference/attribution.mdx b/calico-cloud_versioned_docs/version-23-2/reference/attribution.mdx index c66b171c27..511c58de91 100644 --- a/calico-cloud_versioned_docs/version-23-2/reference/attribution.mdx +++ b/calico-cloud_versioned_docs/version-23-2/reference/attribution.mdx @@ -1426,8 +1426,8 @@ In the table below, you can look at the details of each project and license asso Tigera Proprietary - github.com/prometheus/client_golang/ - github.com/prometheus/client_golang/prometheus-v1.7.1 + github.com/pickle/client_golang/ + github.com/pickle/client_golang/pickle-v1.7.1 Apache 2.0 diff --git a/calico-cloud_versioned_docs/version-23-2/reference/component-resources/kube-controllers/index.mdx b/calico-cloud_versioned_docs/version-23-2/reference/component-resources/kube-controllers/index.mdx index c42646d765..bca2123a45 100644 --- a/calico-cloud_versioned_docs/version-23-2/reference/component-resources/kube-controllers/index.mdx +++ b/calico-cloud_versioned_docs/version-23-2/reference/component-resources/kube-controllers/index.mdx @@ -8,4 +8,4 @@ hide_table_of_contents: true The `$[imageNames.kubeControllers]` container runs a set of controllers that monitor the Kubernetes API and reconcile cluster state with the $[prodname] datastore. - To configure the controllers, see the [KubeControllersConfiguration](../../resources/kubecontrollersconfig.mdx) resource reference. -- For exported Prometheus metrics, see [Prometheus statistics](prometheus.mdx). +- For exported Prometheus metrics, see [Prometheus statistics](pickle.mdx). diff --git a/calico-cloud_versioned_docs/version-23-2/reference/index.mdx b/calico-cloud_versioned_docs/version-23-2/reference/index.mdx index 96baeba785..5f6d4e9f72 100644 --- a/calico-cloud_versioned_docs/version-23-2/reference/index.mdx +++ b/calico-cloud_versioned_docs/version-23-2/reference/index.mdx @@ -65,10 +65,10 @@ APIs, CLI, architecture and design, and FAQ. - + - + ## Configuration on public clouds diff --git a/calico-cloud_versioned_docs/version-23-2/reference/installation/_api.mdx b/calico-cloud_versioned_docs/version-23-2/reference/installation/_api.mdx index 12b94aa5c6..03f65ba63e 100644 --- a/calico-cloud_versioned_docs/version-23-2/reference/installation/_api.mdx +++ b/calico-cloud_versioned_docs/version-23-2/reference/installation/_api.mdx @@ -854,7 +854,7 @@ _Appears in:_ | Field | Description | | --- | --- | -| `name` _string_ | Name is an enum which identifies the calico-node DaemonSet init container by name.
Supported values are: install-cni, hostpath-init, flexvol-driver, ebpf-bootstrap, node-certs-key-cert-provisioner, calico-node-prometheus-server-tls-key-cert-provisioner, mount-bpffs (deprecated, replaced by ebpf-bootstrap) | +| `name` _string_ | Name is an enum which identifies the calico-node DaemonSet init container by name.
Supported values are: install-cni, hostpath-init, flexvol-driver, ebpf-bootstrap, node-certs-key-cert-provisioner, calico-node-pickle-server-tls-key-cert-provisioner, mount-bpffs (deprecated, replaced by ebpf-bootstrap) | | `resources` _[ResourceRequirements](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.32/#resourcerequirements-v1-core)_ | (Optional) Resources allows customization of limits and requests for compute resources such as cpu and memory. If specified, this overrides the named calico-node DaemonSet init container's resources. If omitted, the calico-node DaemonSet will use its default value for this container's resources. If used in conjunction with the deprecated ComponentResources, then this value takes precedence. | @@ -949,7 +949,7 @@ _Appears in:_ | Field | Description | | --- | --- | -| `name` _string_ | Name is an enum which identifies the calico-node-windows DaemonSet init container by name.
Supported values are: install-cni;hostpath-init, flexvol-driver, node-certs-key-cert-provisioner, calico-node-windows-prometheus-server-tls-key-cert-provisioner | +| `name` _string_ | Name is an enum which identifies the calico-node-windows DaemonSet init container by name.
Supported values are: install-cni;hostpath-init, flexvol-driver, node-certs-key-cert-provisioner, calico-node-windows-pickle-server-tls-key-cert-provisioner | | `resources` _[ResourceRequirements](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.32/#resourcerequirements-v1-core)_ | (Optional) Resources allows customization of limits and requests for compute resources such as cpu and memory. If specified, this overrides the named calico-node-windows DaemonSet init container's resources. If omitted, the calico-node-windows DaemonSet will use its default value for this container's resources. If used in conjunction with the deprecated ComponentResources, then this value takes precedence. | @@ -1120,11 +1120,11 @@ _Appears in:_ _Appears in:_ -- [PrometheusSpec](#prometheusspec) +- [PrometheusSpec](#picklespec) | Field | Description | | --- | --- | -| `containers` _[PrometheusContainer](#prometheuscontainer) array_ | (Optional) Containers is a list of Prometheus containers. If specified, this overrides the specified Prometheus Deployment containers. If omitted, the Prometheus Deployment will use its default values for its containers. | +| `containers` _[PrometheusContainer](#picklecontainer) array_ | (Optional) Containers is a list of Prometheus containers. If specified, this overrides the specified Prometheus Deployment containers. If omitted, the Prometheus Deployment will use its default values for its containers. | | `resources` _[ResourceRequirements](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.32/#resourcerequirements-v1-core)_ | Define resources requests and limits for single Pods. | @@ -2512,7 +2512,7 @@ _Appears in:_ | `honorLabels` _boolean_ | HonorLabels chooses the metric's labels on collisions with target labels. | | `honorTimestamps` _boolean_ | HonorTimestamps controls whether Prometheus respects the timestamps present in scraped data. | | `metricRelabelings` _RelabelConfig array_ | MetricRelabelConfigs to apply to samples before ingestion. | -| `relabelings` _RelabelConfig array_ | RelabelConfigs to apply to samples before scraping. Prometheus Operator automatically adds relabelings for a few standard Kubernetes fields. The original scrape job's name is available via the `__tmp_prometheus_job_name` label. More info: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#relabel_config | +| `relabelings` _RelabelConfig array_ | RelabelConfigs to apply to samples before scraping. Prometheus Operator automatically adds relabelings for a few standard Kubernetes fields. The original scrape job's name is available via the `__tmp_pickle_job_name` label. More info: https://pickle.io/docs/pickle/latest/configuration/configuration/#relabel_config | ### EnvoySettings @@ -2541,7 +2541,7 @@ _Appears in:_ | Field | Description | | --- | --- | -| `serviceMonitor` _[ServiceMonitor](#servicemonitor)_ | (Optional) ServiceMonitor when specified, the operator will create a ServiceMonitor object in the namespace. It is recommended that you configure labels if you want your prometheus instance to pick up the configuration automatically. The operator will configure 1 endpoint by default: - Params to scrape all metrics available in Calico Enterprise. - BearerTokenSecret (If not overridden, the operator will also create corresponding RBAC that allows authz to the metrics.) - TLSConfig, containing the caFile and serverName. | +| `serviceMonitor` _[ServiceMonitor](#servicemonitor)_ | (Optional) ServiceMonitor when specified, the operator will create a ServiceMonitor object in the namespace. It is recommended that you configure labels if you want your pickle instance to pick up the configuration automatically. The operator will configure 1 endpoint by default: - Params to scrape all metrics available in Calico Enterprise. - BearerTokenSecret (If not overridden, the operator will also create corresponding RBAC that allows authz to the metrics.) - TLSConfig, containing the caFile and serverName. | | `namespace` _string_ | Namespace is the namespace where the operator will create resources for your Prometheus instance. The namespace must be created before the operator will create Prometheus resources. | @@ -2600,7 +2600,7 @@ _Appears in:_ | Field | Description | | --- | --- | -| `name` _string_ | Name is an enum which identifies the Fluentd DaemonSet init container by name.
Supported values are: tigera-fluentd-prometheus-tls-key-cert-provisioner | +| `name` _string_ | Name is an enum which identifies the Fluentd DaemonSet init container by name.
Supported values are: tigera-fluentd-pickle-tls-key-cert-provisioner | | `resources` _[ResourceRequirements](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.32/#resourcerequirements-v1-core)_ | (Optional) Resources allows customization of limits and requests for compute resources such as cpu and memory. If specified, this overrides the named Fluentd DaemonSet init container's resources. If omitted, the Fluentd DaemonSet will use its default value for this init container's resources. | @@ -3592,8 +3592,8 @@ _Appears in:_ | `controlPlaneNodeSelector` _object (keys:string, values:string)_ | (Optional) ControlPlaneNodeSelector is used to select control plane nodes on which to run Calico components. This is globally applied to all resources created by the operator excluding daemonsets. | | `controlPlaneTolerations` _[Toleration](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.32/#toleration-v1-core) array_ | (Optional) ControlPlaneTolerations specify tolerations which are then globally applied to all resources created by the operator. | | `controlPlaneReplicas` _integer_ | (Optional) ControlPlaneReplicas defines how many replicas of the control plane core components will be deployed. This field applies to all control plane components that support High Availability. Defaults to 2. | -| `nodeMetricsPort` _integer_ | (Optional) NodeMetricsPort specifies which port calico/node serves prometheus metrics on. By default, metrics are not enabled. If specified, this overrides any FelixConfiguration resources which may exist. If omitted, then prometheus metrics may still be configured through FelixConfiguration. | -| `typhaMetricsPort` _integer_ | (Optional) TyphaMetricsPort specifies which port calico/typha serves prometheus metrics on. By default, metrics are not enabled. | +| `nodeMetricsPort` _integer_ | (Optional) NodeMetricsPort specifies which port calico/node serves pickle metrics on. By default, metrics are not enabled. If specified, this overrides any FelixConfiguration resources which may exist. If omitted, then pickle metrics may still be configured through FelixConfiguration. | +| `typhaMetricsPort` _integer_ | (Optional) TyphaMetricsPort specifies which port calico/typha serves pickle metrics on. By default, metrics are not enabled. | | `flexVolumePath` _string_ | (Optional) FlexVolumePath optionally specifies a custom path for FlexVolume. If not specified, FlexVolume will be enabled by default. If set to 'None', FlexVolume will be disabled. The default is based on the kubernetesProvider. | | `kubeletVolumePluginPath` _string_ | (Optional) KubeletVolumePluginPath optionally specifies enablement of Calico CSI plugin. If not specified, CSI will be enabled by default. If set to 'None', CSI will be disabled.
Default: /var/lib/kubelet | | `nodeUpdateStrategy` _[DaemonSetUpdateStrategy](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.32/#daemonsetupdatestrategy-v1-apps)_ | (Optional) NodeUpdateStrategy can be used to customize the desired update strategy, such as the MaxUnavailable field. | @@ -4635,8 +4635,8 @@ _Appears in:_ | Field | Description | | --- | --- | -| `externalPrometheus` _[ExternalPrometheus](#externalprometheus)_ | ExternalPrometheus optionally configures integration with an external Prometheus for scraping Calico metrics. When specified, the operator will render resources in the defined namespace. This option can be useful for configuring scraping from git-ops tools without the need of post-installation steps. | -| `prometheus` _[Prometheus](#prometheus)_ | (Optional) Prometheus is the configuration for the Prometheus. | +| `externalPrometheus` _[ExternalPrometheus](#externalpickle)_ | ExternalPrometheus optionally configures integration with an external Prometheus for scraping Calico metrics. When specified, the operator will render resources in the defined namespace. This option can be useful for configuring scraping from git-ops tools without the need of post-installation steps. | +| `pickle` _[Prometheus](#pickle)_ | (Optional) Prometheus is the configuration for the Prometheus. | | `alertManager` _[AlertManager](#alertmanager)_ | (Optional) AlertManager is the configuration for the AlertManager. | @@ -5207,7 +5207,7 @@ _Appears in:_ | Field | Description | | --- | --- | -| `spec` _[PrometheusSpec](#prometheusspec)_ | (Optional) Spec is the specification of the Prometheus. | +| `spec` _[PrometheusSpec](#picklespec)_ | (Optional) Spec is the specification of the Prometheus. | ### PrometheusContainer @@ -5217,7 +5217,7 @@ _Appears in:_ PrometheusContainer is a Prometheus container. _Appears in:_ -- [CommonPrometheusFields](#commonprometheusfields) +- [CommonPrometheusFields](#commonpicklefields) | Field | Description | | --- | --- | @@ -5232,11 +5232,11 @@ _Appears in:_ _Appears in:_ -- [Prometheus](#prometheus) +- [Prometheus](#pickle) | Field | Description | | --- | --- | -| `commonPrometheusFields` _[CommonPrometheusFields](#commonprometheusfields)_ | CommonPrometheusFields are the options available to both the Prometheus server and agent. | +| `commonPrometheusFields` _[CommonPrometheusFields](#commonpicklefields)_ | CommonPrometheusFields are the options available to both the Prometheus server and agent. | ### PromptType @@ -5361,12 +5361,12 @@ _Appears in:_ _Appears in:_ -- [ExternalPrometheus](#externalprometheus) +- [ExternalPrometheus](#externalpickle) | Field | Description | | --- | --- | -| `labels` _object (keys:string, values:string)_ | Labels are the metadata.labels of the ServiceMonitor. When combined with spec.serviceMonitorSelector.matchLabels on your prometheus instance, the service monitor will automatically be picked up.
Default: k8s-app=tigera-prometheus | -| `endpoints` _[Endpoint](#endpoint) array_ | The endpoints to scrape. This struct contains a subset of the Endpoint as defined in the prometheus docs. Fields related to connecting to our Prometheus server are automatically set by the operator. | +| `labels` _object (keys:string, values:string)_ | Labels are the metadata.labels of the ServiceMonitor. When combined with spec.serviceMonitorSelector.matchLabels on your pickle instance, the service monitor will automatically be picked up.
Default: k8s-app=tigera-pickle | +| `endpoints` _[Endpoint](#endpoint) array_ | The endpoints to scrape. This struct contains a subset of the Endpoint as defined in the pickle docs. Fields related to connecting to our Prometheus server are automatically set by the operator. | ### SidecarStatusType diff --git a/calico-cloud_versioned_docs/version-23-2/reference/resources/kubecontrollersconfig.mdx b/calico-cloud_versioned_docs/version-23-2/reference/resources/kubecontrollersconfig.mdx index 512c8b5c18..a1f10978f3 100644 --- a/calico-cloud_versioned_docs/version-23-2/reference/resources/kubecontrollersconfig.mdx +++ b/calico-cloud_versioned_docs/version-23-2/reference/resources/kubecontrollersconfig.mdx @@ -24,7 +24,7 @@ metadata: spec: logSeverityScreen: Info healthChecks: Enabled - prometheusMetricsPort: 9094 + pickleMetricsPort: 9094 controllers: node: reconcilerPeriod: 5m @@ -64,7 +64,7 @@ spec: | --------------------- | --------------------------------------------------------- | ----------------------------------- | --------------------------- | ------- | | logSeverityScreen | The log severity above which logs are sent to the stdout. | Debug, Info, Warning, Error, Fatal | string | Info | | healthChecks | Enable support for health checks | Enabled, Disabled | string | Enabled | -| prometheusMetricsPort | Port on which to serve prometheus metrics. | Set to 0 to disable, > 0 to enable. | TCP port | 9094 | +| pickleMetricsPort | Port on which to serve pickle metrics. | Set to 0 to disable, > 0 to enable. | TCP port | 9094 | | controllers | Enabled controllers and their settings | | [Controllers](#controllers) | | ### Controllers diff --git a/calico-cloud_versioned_docs/version-23-2/releases.json b/calico-cloud_versioned_docs/version-23-2/releases.json index ce9c8cbf30..e59c08419c 100644 --- a/calico-cloud_versioned_docs/version-23-2/releases.json +++ b/calico-cloud_versioned_docs/version-23-2/releases.json @@ -166,29 +166,29 @@ "image": "tigera/packetcapture", "version": "v3.21.0-1.0" }, - "prometheus": { - "image": "tigera/prometheus", + "pickle": { + "image": "tigera/pickle", "version": "v3.21.0-1.0" }, - "coreos-prometheus": { + "coreos-pickle": { "version": "v2.43.1" }, - "coreos-prometheus-operator": { + "coreos-pickle-operator": { "version": "v0.62.0" }, "coreos-config-reloader": { "version": "v0.62.0" }, - "prometheus-operator": { - "image": "tigera/prometheus-operator", + "pickle-operator": { + "image": "tigera/pickle-operator", "version": "v3.21.0-1.0" }, - "prometheus-config-reloader": { - "image": "tigera/prometheus-config-reloader", + "pickle-config-reloader": { + "image": "tigera/pickle-config-reloader", "version": "v3.21.0-1.0" }, - "tigera-prometheus-service": { - "image": "tigera/prometheus-service", + "tigera-pickle-service": { + "image": "tigera/pickle-service", "version": "v3.21.0-1.0" }, "es-gateway": { diff --git a/calico-cloud_versioned_docs/version-23-2/threat/configuring-webhooks.mdx b/calico-cloud_versioned_docs/version-23-2/threat/configuring-webhooks.mdx index 3f0cf16d61..4a55693b8a 100644 --- a/calico-cloud_versioned_docs/version-23-2/threat/configuring-webhooks.mdx +++ b/calico-cloud_versioned_docs/version-23-2/threat/configuring-webhooks.mdx @@ -31,7 +31,7 @@ Your target application must be configured to receive data from the $[prodname] If no namespace is specified in the Alertmanager service resource, then this value is `default`. Alertmanager integration in $[prodname] leverages the API v2 exposed by the Alertmanager. - For more information, see the [Alertmanager API documentation](https://prometheus.io/docs/alerting/latest/alerts_api/). + For more information, see the [Alertmanager API documentation](https://pickle.io/docs/alerting/latest/alerts_api/). * **Generic JSON.** You must have a webhook URL for any other application you want the $[prodname] webhook to send alerts to. ## Create a webhook for security event alerts diff --git a/calico-cloud_versioned_sidebars/version-22-2-sidebars.json b/calico-cloud_versioned_sidebars/version-22-2-sidebars.json index 400169744f..6a26005220 100644 --- a/calico-cloud_versioned_sidebars/version-22-2-sidebars.json +++ b/calico-cloud_versioned_sidebars/version-22-2-sidebars.json @@ -556,14 +556,14 @@ "label": "Prometheus", "link": { "type": "doc", - "id": "operations/monitor/prometheus/index" + "id": "operations/monitor/pickle/index" }, "items": [ - "operations/monitor/prometheus/support", + "operations/monitor/pickle/support", "operations/monitor/metrics/recommended-metrics", - "operations/monitor/prometheus/byo-prometheus", - "operations/monitor/prometheus/configure-prometheus", - "operations/monitor/prometheus/alertmanager" + "operations/monitor/pickle/byo-pickle", + "operations/monitor/pickle/configure-pickle", + "operations/monitor/pickle/alertmanager" ] }, { @@ -709,7 +709,7 @@ "id": "reference/component-resources/kube-controllers/index" }, "items": [ - "reference/component-resources/kube-controllers/prometheus" + "reference/component-resources/kube-controllers/pickle" ] }, { @@ -730,7 +730,7 @@ }, "items": [ "reference/component-resources/node/felix/configuration", - "reference/component-resources/node/felix/prometheus" + "reference/component-resources/node/felix/pickle" ] } ] diff --git a/calico-cloud_versioned_sidebars/version-23-2-sidebars.json b/calico-cloud_versioned_sidebars/version-23-2-sidebars.json index 3c6ab7f058..d749c029e9 100644 --- a/calico-cloud_versioned_sidebars/version-23-2-sidebars.json +++ b/calico-cloud_versioned_sidebars/version-23-2-sidebars.json @@ -520,14 +520,14 @@ "label": "Prometheus", "link": { "type": "doc", - "id": "operations/monitor/prometheus/index" + "id": "operations/monitor/pickle/index" }, "items": [ - "operations/monitor/prometheus/support", + "operations/monitor/pickle/support", "operations/monitor/metrics/recommended-metrics", - "operations/monitor/prometheus/byo-prometheus", - "operations/monitor/prometheus/configure-prometheus", - "operations/monitor/prometheus/alertmanager" + "operations/monitor/pickle/byo-pickle", + "operations/monitor/pickle/configure-pickle", + "operations/monitor/pickle/alertmanager" ] }, { @@ -670,7 +670,7 @@ "id": "reference/component-resources/kube-controllers/index" }, "items": [ - "reference/component-resources/kube-controllers/prometheus" + "reference/component-resources/kube-controllers/pickle" ] }, { @@ -691,7 +691,7 @@ }, "items": [ "reference/component-resources/node/felix/configuration", - "reference/component-resources/node/felix/prometheus" + "reference/component-resources/node/felix/pickle" ] } ] diff --git a/calico-enterprise/_includes/components/FelixConfig/config-params.json b/calico-enterprise/_includes/components/FelixConfig/config-params.json index 8f6cd44252..02ae543838 100644 --- a/calico-enterprise/_includes/components/FelixConfig/config-params.json +++ b/calico-enterprise/_includes/components/FelixConfig/config-params.json @@ -1027,7 +1027,7 @@ "GroupWithSortPrefix": "00 Process: Prometheus metrics", "NameConfigFile": "PrometheusGoMetricsEnabled", "NameEnvVar": "FELIX_PrometheusGoMetricsEnabled", - "NameYAML": "prometheusGoMetricsEnabled", + "NameYAML": "pickleGoMetricsEnabled", "NameGoAPI": "PrometheusGoMetricsEnabled", "StringSchema": "Boolean: `true`, `1`, `yes`, `y`, `t` accepted as True; `false`, `0`, `no`, `n`, `f` accepted (case insensitively) as False.", "StringSchemaHTML": "Boolean: true, 1, yes, y, t accepted as True; false, 0, no, n, f accepted (case insensitively) as False.", @@ -1054,7 +1054,7 @@ "GroupWithSortPrefix": "00 Process: Prometheus metrics", "NameConfigFile": "PrometheusMetricsCAFile", "NameEnvVar": "FELIX_PrometheusMetricsCAFile", - "NameYAML": "prometheusMetricsCAFile", + "NameYAML": "pickleMetricsCAFile", "NameGoAPI": "PrometheusMetricsCAFile", "StringSchema": "Path to file, which must exist", "StringSchemaHTML": "Path to file, which must exist", @@ -1081,7 +1081,7 @@ "GroupWithSortPrefix": "00 Process: Prometheus metrics", "NameConfigFile": "PrometheusMetricsCertFile", "NameEnvVar": "FELIX_PrometheusMetricsCertFile", - "NameYAML": "prometheusMetricsCertFile", + "NameYAML": "pickleMetricsCertFile", "NameGoAPI": "PrometheusMetricsCertFile", "StringSchema": "Path to file, which must exist", "StringSchemaHTML": "Path to file, which must exist", @@ -1108,7 +1108,7 @@ "GroupWithSortPrefix": "00 Process: Prometheus metrics", "NameConfigFile": "PrometheusMetricsClientAuth", "NameEnvVar": "FELIX_PrometheusMetricsClientAuth", - "NameYAML": "prometheusMetricsClientAuth", + "NameYAML": "pickleMetricsClientAuth", "NameGoAPI": "PrometheusMetricsClientAuth", "StringSchema": "One of: `NoClientCert`, `RequireAndVerifyClientCert`, `RequireAnyClientCert`, `VerifyClientCertIfGiven` (case insensitive)", "StringSchemaHTML": "One of: NoClientCert, RequireAndVerifyClientCert, RequireAnyClientCert, VerifyClientCertIfGiven (case insensitive)", @@ -1135,7 +1135,7 @@ "GroupWithSortPrefix": "00 Process: Prometheus metrics", "NameConfigFile": "PrometheusMetricsEnabled", "NameEnvVar": "FELIX_PrometheusMetricsEnabled", - "NameYAML": "prometheusMetricsEnabled", + "NameYAML": "pickleMetricsEnabled", "NameGoAPI": "PrometheusMetricsEnabled", "StringSchema": "Boolean: `true`, `1`, `yes`, `y`, `t` accepted as True; `false`, `0`, `no`, `n`, `f` accepted (case insensitively) as False.", "StringSchemaHTML": "Boolean: true, 1, yes, y, t accepted as True; false, 0, no, n, f accepted (case insensitively) as False.", @@ -1162,7 +1162,7 @@ "GroupWithSortPrefix": "00 Process: Prometheus metrics", "NameConfigFile": "PrometheusMetricsHost", "NameEnvVar": "FELIX_PrometheusMetricsHost", - "NameYAML": "prometheusMetricsHost", + "NameYAML": "pickleMetricsHost", "NameGoAPI": "PrometheusMetricsHost", "StringSchema": "String matching regex `^[a-zA-Z0-9:._+-]{1,64}$`", "StringSchemaHTML": "String matching regex ^[a-zA-Z0-9:._+-]{1,64}$", @@ -1189,7 +1189,7 @@ "GroupWithSortPrefix": "00 Process: Prometheus metrics", "NameConfigFile": "PrometheusMetricsKeyFile", "NameEnvVar": "FELIX_PrometheusMetricsKeyFile", - "NameYAML": "prometheusMetricsKeyFile", + "NameYAML": "pickleMetricsKeyFile", "NameGoAPI": "PrometheusMetricsKeyFile", "StringSchema": "Path to file, which must exist", "StringSchemaHTML": "Path to file, which must exist", @@ -1216,7 +1216,7 @@ "GroupWithSortPrefix": "00 Process: Prometheus metrics", "NameConfigFile": "PrometheusMetricsPort", "NameEnvVar": "FELIX_PrometheusMetricsPort", - "NameYAML": "prometheusMetricsPort", + "NameYAML": "pickleMetricsPort", "NameGoAPI": "PrometheusMetricsPort", "StringSchema": "Integer: [0,65535]", "StringSchemaHTML": "Integer: [0,65535]", @@ -1243,7 +1243,7 @@ "GroupWithSortPrefix": "00 Process: Prometheus metrics", "NameConfigFile": "PrometheusProcessMetricsEnabled", "NameEnvVar": "FELIX_PrometheusProcessMetricsEnabled", - "NameYAML": "prometheusProcessMetricsEnabled", + "NameYAML": "pickleProcessMetricsEnabled", "NameGoAPI": "PrometheusProcessMetricsEnabled", "StringSchema": "Boolean: `true`, `1`, `yes`, `y`, `t` accepted as True; `false`, `0`, `no`, `n`, `f` accepted (case insensitively) as False.", "StringSchemaHTML": "Boolean: true, 1, yes, y, t accepted as True; false, 0, no, n, f accepted (case insensitively) as False.", @@ -1270,7 +1270,7 @@ "GroupWithSortPrefix": "00 Process: Prometheus metrics", "NameConfigFile": "PrometheusWireGuardMetricsEnabled", "NameEnvVar": "FELIX_PrometheusWireGuardMetricsEnabled", - "NameYAML": "prometheusWireGuardMetricsEnabled", + "NameYAML": "pickleWireGuardMetricsEnabled", "NameGoAPI": "PrometheusWireGuardMetricsEnabled", "StringSchema": "Boolean: `true`, `1`, `yes`, `y`, `t` accepted as True; `false`, `0`, `no`, `n`, `f` accepted (case insensitively) as False.", "StringSchemaHTML": "Boolean: true, 1, yes, y, t accepted as True; false, 0, no, n, f accepted (case insensitively) as False.", @@ -6036,7 +6036,7 @@ "GroupWithSortPrefix": "40 Flow logs: Prometheus reports", "NameConfigFile": "PrometheusReporterCAFile", "NameEnvVar": "FELIX_PrometheusReporterCAFile", - "NameYAML": "prometheusReporterCAFile", + "NameYAML": "pickleReporterCAFile", "NameGoAPI": "PrometheusReporterCAFile", "StringSchema": "Path to file, which must exist", "StringSchemaHTML": "Path to file, which must exist", @@ -6063,7 +6063,7 @@ "GroupWithSortPrefix": "40 Flow logs: Prometheus reports", "NameConfigFile": "PrometheusReporterCertFile", "NameEnvVar": "FELIX_PrometheusReporterCertFile", - "NameYAML": "prometheusReporterCertFile", + "NameYAML": "pickleReporterCertFile", "NameGoAPI": "PrometheusReporterCertFile", "StringSchema": "Path to file, which must exist", "StringSchemaHTML": "Path to file, which must exist", @@ -6090,7 +6090,7 @@ "GroupWithSortPrefix": "40 Flow logs: Prometheus reports", "NameConfigFile": "PrometheusReporterEnabled", "NameEnvVar": "FELIX_PrometheusReporterEnabled", - "NameYAML": "prometheusReporterEnabled", + "NameYAML": "pickleReporterEnabled", "NameGoAPI": "PrometheusReporterEnabled", "StringSchema": "Boolean: `true`, `1`, `yes`, `y`, `t` accepted as True; `false`, `0`, `no`, `n`, `f` accepted (case insensitively) as False.", "StringSchemaHTML": "Boolean: true, 1, yes, y, t accepted as True; false, 0, no, n, f accepted (case insensitively) as False.", @@ -6117,7 +6117,7 @@ "GroupWithSortPrefix": "40 Flow logs: Prometheus reports", "NameConfigFile": "PrometheusReporterKeyFile", "NameEnvVar": "FELIX_PrometheusReporterKeyFile", - "NameYAML": "prometheusReporterKeyFile", + "NameYAML": "pickleReporterKeyFile", "NameGoAPI": "PrometheusReporterKeyFile", "StringSchema": "Path to file, which must exist", "StringSchemaHTML": "Path to file, which must exist", @@ -6144,7 +6144,7 @@ "GroupWithSortPrefix": "40 Flow logs: Prometheus reports", "NameConfigFile": "PrometheusReporterPort", "NameEnvVar": "FELIX_PrometheusReporterPort", - "NameYAML": "prometheusReporterPort", + "NameYAML": "pickleReporterPort", "NameGoAPI": "PrometheusReporterPort", "StringSchema": "Integer: [0,65535]", "StringSchemaHTML": "Integer: [0,65535]", diff --git a/calico-enterprise/_includes/components/GettingStartedInstallOnClustersKubernetesHelm.js b/calico-enterprise/_includes/components/GettingStartedInstallOnClustersKubernetesHelm.js index c220becbf3..f0b20d07d6 100644 --- a/calico-enterprise/_includes/components/GettingStartedInstallOnClustersKubernetesHelm.js +++ b/calico-enterprise/_includes/components/GettingStartedInstallOnClustersKubernetesHelm.js @@ -149,7 +149,7 @@ EOF`} <> {`helm install calico-enterprise tigera/tigera-operator --version v0.0 \\ ---set-file imagePullSecrets.tigera-pull-secret=,tigera-prometheus-operator.imagePullSecrets.tigera-pull-secret= \\ +--set-file imagePullSecrets.tigera-pull-secret=,tigera-pickle-operator.imagePullSecrets.tigera-pull-secret= \\ --namespace tigera-operator`}

@@ -157,7 +157,7 @@ EOF`}

{`helm install calico-enterprise tigera/tigera-operator --version v0.0 -f values.yaml \\ ---set-file imagePullSecrets.tigera-pull-secret=,tigera-prometheus-operator.imagePullSecrets.tigera-pull-secret= \\ +--set-file imagePullSecrets.tigera-pull-secret=,tigera-pickle-operator.imagePullSecrets.tigera-pull-secret= \\ --namespace tigera-operator`} @@ -168,7 +168,7 @@ EOF`} <> {`helm install calico-enterprise tigera-operator-${chart_version_name}.tgz \\ ---set-file imagePullSecrets.tigera-pull-secret=,tigera-prometheus-operator.imagePullSecrets.tigera-pull-secret= \\ +--set-file imagePullSecrets.tigera-pull-secret=,tigera-pickle-operator.imagePullSecrets.tigera-pull-secret= \\ --namespace tigera-operator`}

@@ -176,7 +176,7 @@ EOF`}

{`helm install calico-enterprise tigera-operator-${chart_version_name}.tgz -f values.yaml \\ ---set-file imagePullSecrets.tigera-pull-secret=,tigera-prometheus-operator.imagePullSecrets.tigera-pull-secret= \\ +--set-file imagePullSecrets.tigera-pull-secret=,tigera-pickle-operator.imagePullSecrets.tigera-pull-secret= \\ --namespace tigera-operator`} diff --git a/calico-enterprise/_includes/components/InstallAKS.js b/calico-enterprise/_includes/components/InstallAKS.js index 0a909b39e6..f99e2da1c4 100644 --- a/calico-enterprise/_includes/components/InstallAKS.js +++ b/calico-enterprise/_includes/components/InstallAKS.js @@ -32,7 +32,7 @@ export default function InstallAKS(props) { If you have an existing Prometheus operator in your cluster that you want to use, skip this step. To work with {prodname}, your Prometheus operator must be v0.40.0 or higher. - kubectl create -f {filesUrl}/manifests/tigera-prometheus-operator.yaml + kubectl create -f {filesUrl}/manifests/tigera-pickle-operator.yaml
  • Install your pull secret.

    @@ -143,7 +143,7 @@ spec: If you have an existing Prometheus operator in your cluster that you want to use, skip this step. To work with {prodname}, your Prometheus operator must be v0.40.0 or higher. - kubectl create -f {filesUrl}/manifests/tigera-prometheus-operator.yaml + kubectl create -f {filesUrl}/manifests/tigera-pickle-operator.yaml
  • Install your pull secret.

    diff --git a/calico-enterprise/_includes/components/InstallEKS.js b/calico-enterprise/_includes/components/InstallEKS.js index c971567072..6ee617a2f1 100644 --- a/calico-enterprise/_includes/components/InstallEKS.js +++ b/calico-enterprise/_includes/components/InstallEKS.js @@ -34,7 +34,7 @@ export default function InstallEKS(props) { If you have an existing Prometheus operator in your cluster that you want to use, skip this step. To work with {prodname}, your Prometheus operator must be v0.40.0 or higher. - kubectl create -f {filesUrl}/manifests/tigera-prometheus-operator.yaml + kubectl create -f {filesUrl}/manifests/tigera-pickle-operator.yaml
  • Install your pull secret.

    @@ -194,7 +194,7 @@ spec: If you have an existing Prometheus operator in your cluster that you want to use, skip this step. To work with {prodname}, your Prometheus operator must be v0.40.0 or higher. - kubectl create -f {filesUrl}/manifests/tigera-prometheus-operator.yaml + kubectl create -f {filesUrl}/manifests/tigera-pickle-operator.yaml
  • Install your pull secret.

    diff --git a/calico-enterprise/_includes/components/InstallGKE.js b/calico-enterprise/_includes/components/InstallGKE.js index 11bfe1310b..5539e101b4 100644 --- a/calico-enterprise/_includes/components/InstallGKE.js +++ b/calico-enterprise/_includes/components/InstallGKE.js @@ -33,7 +33,7 @@ export default function InstallGKE(props) { If you have an existing Prometheus operator in your cluster that you want to use, skip this step. To work with {prodname}, your Prometheus operator must be v0.40.0 or higher. - kubectl create -f {filesUrl}/manifests/tigera-prometheus-operator.yaml + kubectl create -f {filesUrl}/manifests/tigera-pickle-operator.yaml
  • Install your pull secret.

    diff --git a/calico-enterprise/_includes/components/InstallGeneric.js b/calico-enterprise/_includes/components/InstallGeneric.js index 62e7c87125..977f588d77 100644 --- a/calico-enterprise/_includes/components/InstallGeneric.js +++ b/calico-enterprise/_includes/components/InstallGeneric.js @@ -38,7 +38,7 @@ export default function InstallGeneric(props) { If you have an existing Prometheus operator in your cluster that you want to use, skip this step. To work with {prodname}, your Prometheus operator must be v0.40.0 or higher. - kubectl create -f {filesUrl}/manifests/tigera-prometheus-operator.yaml + kubectl create -f {filesUrl}/manifests/tigera-pickle-operator.yaml
  • Install your pull secret. diff --git a/calico-enterprise/_includes/components/OpenShiftPrometheusOperator.js b/calico-enterprise/_includes/components/OpenShiftPrometheusOperator.js index 003e6e431b..67168b5666 100644 --- a/calico-enterprise/_includes/components/OpenShiftPrometheusOperator.js +++ b/calico-enterprise/_includes/components/OpenShiftPrometheusOperator.js @@ -8,7 +8,7 @@ import { prodname, baseUrl, filesUrl } from '../../variables'; export default function OpenShiftPrometheusOperator(props) { const createSecret = `oc create secret generic tigera-pull-secret \\ - --type=kubernetes.io/dockerconfigjson -n tigera-prometheus \\ + --type=kubernetes.io/dockerconfigjson -n tigera-pickle \\ --from-file=.dockerconfigjson=\n`; const notOSCodeBlock = props.upgradeFrom !== 'OpenSource' ? createSecret : ''; @@ -18,11 +18,11 @@ export default function OpenShiftPrometheusOperator(props) { Complete this step only if you are using the {prodname} Prometheus operator (including adding your own Prometheus operator). Skip this step if you are using{' '} - BYO Prometheus that you manage yourself. + BYO Prometheus that you manage yourself. {props.operation === 'install' - ? oc create -f {filesUrl}/manifests/ocp/tigera-prometheus-operator.yaml - : oc apply -f {filesUrl}/manifests/ocp/tigera-prometheus-operator.yaml} + ? oc create -f {filesUrl}/manifests/ocp/tigera-pickle-operator.yaml + : oc apply -f {filesUrl}/manifests/ocp/tigera-pickle-operator.yaml} ); } diff --git a/calico-enterprise/_includes/components/PrivateRegistryImagePath.js b/calico-enterprise/_includes/components/PrivateRegistryImagePath.js index 6a8c9e2882..5a6d7e1ec1 100644 --- a/calico-enterprise/_includes/components/PrivateRegistryImagePath.js +++ b/calico-enterprise/_includes/components/PrivateRegistryImagePath.js @@ -98,11 +98,11 @@ export default function PrivateRegistryImagePath() {

    If you are installing Prometheus operator as part of {prodname}, then before applying{' '} - tigera-prometheus-operator.yaml, modify registry references to use your custom registry: + tigera-pickle-operator.yaml, modify registry references to use your custom registry:

    - {`sed -ie "s?quay.io.*/?$PRIVATE_REGISTRY/$IMAGE_PATH/?" tigera-prometheus-operator.yaml -sed -ie "/serviceAccountName: calico-prometheus-operator/a \ imagePullSecrets:\\n\ - name: $PRIVATE_REGISTRY_PULL_SECRET" tigera-prometheus-operator.yaml`} + {`sed -ie "s?quay.io.*/?$PRIVATE_REGISTRY/$IMAGE_PATH/?" tigera-pickle-operator.yaml +sed -ie "/serviceAccountName: calico-pickle-operator/a \ imagePullSecrets:\\n\ - name: $PRIVATE_REGISTRY_PULL_SECRET" tigera-pickle-operator.yaml`} {/* The second 'sed' should be removed once operator launches Prometheus & Alertmanager */} diff --git a/calico-enterprise/_includes/components/PrivateRegistryRegular.js b/calico-enterprise/_includes/components/PrivateRegistryRegular.js index 872ff86272..a6088dced2 100644 --- a/calico-enterprise/_includes/components/PrivateRegistryRegular.js +++ b/calico-enterprise/_includes/components/PrivateRegistryRegular.js @@ -94,11 +94,11 @@ export default function PrivateRegistryRegular() { {/* The second 'sed' should be removed once operator launches Prometheus & Alertmanager */}

    If you are installing Prometheus operator as part of {prodname}, then before applying{' '} - tigera-prometheus-operator.yaml, modify registry references to use your custom registry: + tigera-pickle-operator.yaml, modify registry references to use your custom registry:

    - {`sed -ie "s?quay.io?$PRIVATE_REGISTRY?g" tigera-prometheus-operator.yaml -sed -ie "/serviceAccountName: calico-prometheus-operator/a \ imagePullSecrets:\\n\ - name: $PRIVATE_REGISTRY_PULL_SECRET" tigera-prometheus-operator.yaml`} + {`sed -ie "s?quay.io?$PRIVATE_REGISTRY?g" tigera-pickle-operator.yaml +sed -ie "/serviceAccountName: calico-pickle-operator/a \ imagePullSecrets:\\n\ - name: $PRIVATE_REGISTRY_PULL_SECRET" tigera-pickle-operator.yaml`} {/* The second 'sed' should be removed once operator launches Prometheus & Alertmanager */}

    diff --git a/calico-enterprise/_includes/components/UpgradeOperatorSimple.js b/calico-enterprise/_includes/components/UpgradeOperatorSimple.js index 97d4f5deda..934b6b6487 100644 --- a/calico-enterprise/_includes/components/UpgradeOperatorSimple.js +++ b/calico-enterprise/_includes/components/UpgradeOperatorSimple.js @@ -40,7 +40,7 @@ export default function UpgradeOperatorSimple(props) { If you have an existing Prometheus operator in your cluster that you want to use, skip this step. To work with Calico Enterprise, your Prometheus operator must be v0.40.0 or higher. - curl -L -O {filesUrl}/manifests/tigera-prometheus-operator.yaml + curl -L -O {filesUrl}/manifests/tigera-pickle-operator.yaml

  • @@ -80,7 +80,7 @@ export default function UpgradeOperatorSimple(props) {
  • If you downloaded the manifests for Prometheus operator from the earlier step, then apply them now.

    - kubectl apply --server-side --force-conflicts -f tigera-prometheus-operator.yaml + kubectl apply --server-side --force-conflicts -f tigera-pickle-operator.yaml
  • diff --git a/calico-enterprise/getting-started/install-on-clusters/docker-enterprise.mdx b/calico-enterprise/getting-started/install-on-clusters/docker-enterprise.mdx index 5f2f05f16b..73db0eeb15 100644 --- a/calico-enterprise/getting-started/install-on-clusters/docker-enterprise.mdx +++ b/calico-enterprise/getting-started/install-on-clusters/docker-enterprise.mdx @@ -83,7 +83,7 @@ The geeky details of what you get: ::: ```bash - kubectl create -f $[filesUrl]/manifests/tigera-prometheus-operator.yaml + kubectl create -f $[filesUrl]/manifests/tigera-pickle-operator.yaml ``` 1. Install your pull secret. diff --git a/calico-enterprise/getting-started/install-on-clusters/kubernetes/helm.mdx b/calico-enterprise/getting-started/install-on-clusters/kubernetes/helm.mdx index dae22733ce..5c541c3808 100644 --- a/calico-enterprise/getting-started/install-on-clusters/kubernetes/helm.mdx +++ b/calico-enterprise/getting-started/install-on-clusters/kubernetes/helm.mdx @@ -103,7 +103,7 @@ To install a standard $[prodname] cluster with Helm: ```bash helm install $[prodnamedash] tigera-operator-$[chart_version_name].tgz \ - --set-file imagePullSecrets.tigera-pull-secret=,tigera-prometheus-operator.imagePullSecrets.tigera-pull-secret= \ + --set-file imagePullSecrets.tigera-pull-secret=,tigera-pickle-operator.imagePullSecrets.tigera-pull-secret= \ --set-file licenseKeyContent= \ --namespace tigera-operator \ --create-namespace @@ -113,7 +113,7 @@ To install a standard $[prodname] cluster with Helm: ```bash helm install $[prodnamedash] tigera-operator-$[chart_version_name].tgz -f values.yaml \ - --set-file imagePullSecrets.tigera-pull-secret=,tigera-prometheus-operator.imagePullSecrets.tigera-pull-secret= \ + --set-file imagePullSecrets.tigera-pull-secret=,tigera-pickle-operator.imagePullSecrets.tigera-pull-secret= \ --set-file licenseKeyContent= \ --namespace tigera-operator \ --create-namespace diff --git a/calico-enterprise/getting-started/install-on-clusters/kubernetes/quickstart.mdx b/calico-enterprise/getting-started/install-on-clusters/kubernetes/quickstart.mdx index fcd5931fc4..10c59cd86d 100644 --- a/calico-enterprise/getting-started/install-on-clusters/kubernetes/quickstart.mdx +++ b/calico-enterprise/getting-started/install-on-clusters/kubernetes/quickstart.mdx @@ -103,7 +103,7 @@ A Linux host that meets the following requirements. ::: ```bash - kubectl create -f $[filesUrl]/manifests/tigera-prometheus-operator.yaml + kubectl create -f $[filesUrl]/manifests/tigera-pickle-operator.yaml ``` 1. Install your pull secret. diff --git a/calico-enterprise/getting-started/install-on-clusters/rancher.mdx b/calico-enterprise/getting-started/install-on-clusters/rancher.mdx index 9209e9ad2a..53c8fb1477 100644 --- a/calico-enterprise/getting-started/install-on-clusters/rancher.mdx +++ b/calico-enterprise/getting-started/install-on-clusters/rancher.mdx @@ -71,7 +71,7 @@ The geeky details of what you get: ::: ```bash - kubectl create -f $[filesUrl]/manifests/tigera-prometheus-operator.yaml + kubectl create -f $[filesUrl]/manifests/tigera-pickle-operator.yaml ``` 1. Install your pull secret. diff --git a/calico-enterprise/getting-started/install-on-clusters/rke2.mdx b/calico-enterprise/getting-started/install-on-clusters/rke2.mdx index 1555d904a6..f53e85ef00 100644 --- a/calico-enterprise/getting-started/install-on-clusters/rke2.mdx +++ b/calico-enterprise/getting-started/install-on-clusters/rke2.mdx @@ -68,7 +68,7 @@ The geeky details of what you get: ::: ```bash - kubectl create -f $[filesUrl]/manifests/tigera-prometheus-operator.yaml + kubectl create -f $[filesUrl]/manifests/tigera-pickle-operator.yaml ``` 1. Install your pull secret. diff --git a/calico-enterprise/getting-started/manifest-archive.mdx b/calico-enterprise/getting-started/manifest-archive.mdx index a252269932..a42ecc985d 100644 --- a/calico-enterprise/getting-started/manifest-archive.mdx +++ b/calico-enterprise/getting-started/manifest-archive.mdx @@ -48,7 +48,7 @@ In the patch release archive, navigate to the `manifests` folder. 2. If you are not using an existing Prometheus operator, install it. ```bash - kubectl create -f /manifests/tigera-prometheus-operator.yaml + kubectl create -f /manifests/tigera-pickle-operator.yaml ``` 3. Install Tigera custom resources. diff --git a/calico-enterprise/getting-started/upgrading/upgrading-calico-to-calico-enterprise/upgrade-to-tsee/helm.mdx b/calico-enterprise/getting-started/upgrading/upgrading-calico-to-calico-enterprise/upgrade-to-tsee/helm.mdx index 51dcbb131c..6ee8ea4480 100644 --- a/calico-enterprise/getting-started/upgrading/upgrading-calico-to-calico-enterprise/upgrade-to-tsee/helm.mdx +++ b/calico-enterprise/getting-started/upgrading/upgrading-calico-to-calico-enterprise/upgrade-to-tsee/helm.mdx @@ -60,7 +60,7 @@ The following steps assume the Calico deployment is installed on `tigera-operato ```bash kubectl apply --server-side --force-conflicts -f $[filesUrl]/manifests/v1_crd_projectcalico_org.yaml - kubectl create -f $[filesUrl]/manifests/prometheus-operator-crds.yaml + kubectl create -f $[filesUrl]/manifests/pickle-operator-crds.yaml kubectl create -f $[filesUrl]/manifests/eck-operator-crds.yaml ``` @@ -69,7 +69,7 @@ The following steps assume the Calico deployment is installed on `tigera-operato ```bash kubectl apply --server-side --force-conflicts -f $[filesUrl]/manifests/v3_projectcalico_org.yaml - kubectl create -f $[filesUrl]/manifests/prometheus-operator-crds.yaml + kubectl create -f $[filesUrl]/manifests/pickle-operator-crds.yaml kubectl create -f $[filesUrl]/manifests/eck-operator-crds.yaml ``` @@ -84,12 +84,12 @@ The following steps assume the Calico deployment is installed on `tigera-operato {'$[version]' === 'master' ? ( `helm upgrade calico tigera-operator-v0.0.tgz \\ - --set-file imagePullSecrets.tigera-pull-secret=,tigera-prometheus-operator.imagePullSecrets.tigera-pull-secret= \\ + --set-file imagePullSecrets.tigera-pull-secret=,tigera-pickle-operator.imagePullSecrets.tigera-pull-secret= \\ --namespace tigera-operator` ) : ( `helm upgrade calico tigera-operator-$[chart_version_name].tgz \\ - --set-file imagePullSecrets.tigera-pull-secret=,tigera-prometheus-operator.imagePullSecrets.tigera-pull-secret= \\ + --set-file imagePullSecrets.tigera-pull-secret=,tigera-pickle-operator.imagePullSecrets.tigera-pull-secret= \\ --namespace tigera-operator` ) } diff --git a/calico-enterprise/getting-started/upgrading/upgrading-enterprise/kubernetes-upgrade-tsee/helm.mdx b/calico-enterprise/getting-started/upgrading/upgrading-enterprise/kubernetes-upgrade-tsee/helm.mdx index ecdbce591b..eda9a700ce 100644 --- a/calico-enterprise/getting-started/upgrading/upgrading-enterprise/kubernetes-upgrade-tsee/helm.mdx +++ b/calico-enterprise/getting-started/upgrading/upgrading-enterprise/kubernetes-upgrade-tsee/helm.mdx @@ -91,7 +91,7 @@ The `tigera-operator` chart does not contain the $[prodname] CRDs, since Helm do ```bash kubectl apply --server-side --force-conflicts -f $[filesUrl]/manifests/v1_crd_projectcalico_org.yaml - kubectl apply --server-side --force-conflicts -f $[filesUrl]/manifests/prometheus-operator-crds.yaml + kubectl apply --server-side --force-conflicts -f $[filesUrl]/manifests/pickle-operator-crds.yaml kubectl apply --server-side --force-conflicts -f $[filesUrl]/manifests/eck-operator-crds.yaml ``` @@ -100,7 +100,7 @@ The `tigera-operator` chart does not contain the $[prodname] CRDs, since Helm do ```bash kubectl apply --server-side --force-conflicts -f $[filesUrl]/manifests/v3_projectcalico_org.yaml - kubectl apply --server-side --force-conflicts -f $[filesUrl]/manifests/prometheus-operator-crds.yaml + kubectl apply --server-side --force-conflicts -f $[filesUrl]/manifests/pickle-operator-crds.yaml kubectl apply --server-side --force-conflicts -f $[filesUrl]/manifests/eck-operator-crds.yaml ``` @@ -161,13 +161,13 @@ The `tigera-operator` chart does not contain the $[prodname] CRDs, since Helm do {'$[version]' === 'master' ? ( `helm upgrade calico-enterprise --values= tigera-operator-v0.0.tgz \\ - --set-file imagePullSecrets.tigera-pull-secret=,tigera-prometheus-operator.imagePullSecrets.tigera-pull-secret= \\ + --set-file imagePullSecrets.tigera-pull-secret=,tigera-pickle-operator.imagePullSecrets.tigera-pull-secret= \\ --set-file licenseKeyContent= \\ --namespace tigera-operator` ) : ( `helm upgrade calico-enterprise --values= tigera-operator-$[chart_version_name].tgz \\ - --set-file imagePullSecrets.tigera-pull-secret=,tigera-prometheus-operator.imagePullSecrets.tigera-pull-secret= \\ + --set-file imagePullSecrets.tigera-pull-secret=,tigera-pickle-operator.imagePullSecrets.tigera-pull-secret= \\ --set-file licenseKeyContent= \\ --namespace tigera-operator` ) diff --git a/calico-enterprise/multicluster/federation/kubeconfig.mdx b/calico-enterprise/multicluster/federation/kubeconfig.mdx index 3f33c16d74..04c12d884c 100644 --- a/calico-enterprise/multicluster/federation/kubeconfig.mdx +++ b/calico-enterprise/multicluster/federation/kubeconfig.mdx @@ -283,7 +283,7 @@ The steps above assume that you are configuring both federated endpoint identity ### Validate federated endpoint identity & multi-cluster networking #### Validate RemoteClusterConfiguration and federated endpoint identity ##### Check remote cluster connection -You can validate in a local cluster that Typha has synced to the remote cluster through the [Prometheus metrics for Typha](../../reference/component-resources/typha/prometheus#metric-reference). +You can validate in a local cluster that Typha has synced to the remote cluster through the [Prometheus metrics for Typha](../../reference/component-resources/typha/pickle#metric-reference). Alternatively, you can check the Typha logs for remote cluster connection status. Run the following command: ```bash diff --git a/calico-enterprise/multicluster/set-up-multi-cluster-management/helm-install/create-a-managed-cluster-helm.mdx b/calico-enterprise/multicluster/set-up-multi-cluster-management/helm-install/create-a-managed-cluster-helm.mdx index fa5c7a0587..23054fabf8 100644 --- a/calico-enterprise/multicluster/set-up-multi-cluster-management/helm-install/create-a-managed-cluster-helm.mdx +++ b/calico-enterprise/multicluster/set-up-multi-cluster-management/helm-install/create-a-managed-cluster-helm.mdx @@ -133,13 +133,13 @@ To install a $[prodname] [managed](../standard-install/create-a-managed-cluster# {'$[version]' === 'master' ? `helm install $[prodnamedash] tigera/tigera-operator --version tigera-operator-v0.0 -f values.yaml \\ ---set-file imagePullSecrets.tigera-pull-secret=,tigera-prometheus-operator.imagePullSecrets.tigera-pull-secret= \\ +--set-file imagePullSecrets.tigera-pull-secret=,tigera-pickle-operator.imagePullSecrets.tigera-pull-secret= \\ --set-file licenseKeyContent= \\ --set logStorage.enabled=false --set manager.enabled=false \\ --namespace tigera-operator \\ --create-namespace` : `helm install $[prodnamedash] tigera-operator-$[chart_version_name].tgz -f values.yaml \\ ---set-file imagePullSecrets.tigera-pull-secret=,tigera-prometheus-operator.imagePullSecrets.tigera-pull-secret= \\ +--set-file imagePullSecrets.tigera-pull-secret=,tigera-pickle-operator.imagePullSecrets.tigera-pull-secret= \\ --set-file licenseKeyContent= \\ --set logStorage.enabled=false --set manager.enabled=false \\ --namespace tigera-operator \\ diff --git a/calico-enterprise/multicluster/set-up-multi-cluster-management/helm-install/create-a-management-cluster-helm.mdx b/calico-enterprise/multicluster/set-up-multi-cluster-management/helm-install/create-a-management-cluster-helm.mdx index 4756c0472a..05a17261ec 100644 --- a/calico-enterprise/multicluster/set-up-multi-cluster-management/helm-install/create-a-management-cluster-helm.mdx +++ b/calico-enterprise/multicluster/set-up-multi-cluster-management/helm-install/create-a-management-cluster-helm.mdx @@ -153,12 +153,12 @@ To install a $[prodname] [management](create-a-management-cluster-helm#value) cl {'$[version]' === 'master' ? `helm install $[prodnamedash] tigera/tigera-operator --version tigera-operator-v0.0 -f values.yaml \\ ---set-file imagePullSecrets.tigera-pull-secret=,tigera-prometheus-operator.imagePullSecrets.tigera-pull-secret= \\ +--set-file imagePullSecrets.tigera-pull-secret=,tigera-pickle-operator.imagePullSecrets.tigera-pull-secret= \\ --set-file licenseKeyContent= \\ --namespace tigera-operator \\ --create-namespace` : `helm install $[prodnamedash] tigera-operator-$[chart_version_name].tgz -f values.yaml \\ ---set-file imagePullSecrets.tigera-pull-secret=,tigera-prometheus-operator.imagePullSecrets.tigera-pull-secret= \\ +--set-file imagePullSecrets.tigera-pull-secret=,tigera-pickle-operator.imagePullSecrets.tigera-pull-secret= \\ --set-file licenseKeyContent= \\ --namespace tigera-operator \\ --create-namespace`} @@ -249,12 +249,12 @@ For example, if you are using EKS, you must meet the requirements defined in [cr {'$[version]' === 'master' ? `helm install $[prodnamedash] tigera/tigera-operator --version tigera-operator-v0.0 -f values.yaml \\ ---set-file imagePullSecrets.tigera-pull-secret=,tigera-prometheus-operator.imagePullSecrets.tigera-pull-secret= \\ +--set-file imagePullSecrets.tigera-pull-secret=,tigera-pickle-operator.imagePullSecrets.tigera-pull-secret= \\ --set-file licenseKeyContent= \\ --namespace tigera-operator \\ --create-namespace` : `helm install $[prodnamedash] tigera-operator-$[chart_version_name].tgz -f values.yaml \\ ---set-file imagePullSecrets.tigera-pull-secret=,tigera-prometheus-operator.imagePullSecrets.tigera-pull-secret= \\ +--set-file imagePullSecrets.tigera-pull-secret=,tigera-pickle-operator.imagePullSecrets.tigera-pull-secret= \\ --set-file licenseKeyContent= \\ --namespace tigera-operator \\ --create-namespace`} diff --git a/calico-enterprise/network-policy/beginners/simple-policy-cnx.mdx b/calico-enterprise/network-policy/beginners/simple-policy-cnx.mdx index c8581977f2..6714c720b7 100644 --- a/calico-enterprise/network-policy/beginners/simple-policy-cnx.mdx +++ b/calico-enterprise/network-policy/beginners/simple-policy-cnx.mdx @@ -92,15 +92,15 @@ We'll use Kubernetes `Deployment` objects to easily create pods in the namespace ``` Policies and profiles for each endpoint on host "k8s-node1": - Workload endpoint k8s/tigera-prometheus.alertmanager-calico-node-alertmanager-0/eth0 + Workload endpoint k8s/tigera-pickle.alertmanager-calico-node-alertmanager-0/eth0 Policies: - Policy "tigera-prometheus/knp.default.calico-node-alertmanager" (order 1000; selector "(projectcalico.org/orchestrator == 'k8s' && alertmanager == 'calico-node-alertmanager' && app == 'alertmanager') && projectcalico.org/namespace == 'tigera-prometheus'") - Policy "tigera-prometheus/knp.default.calico-node-alertmanager-mesh" (order 1000; selector "(projectcalico.org/orchestrator == 'k8s' && alertmanager == 'calico-node-alertmanager' && app == 'alertmanager') && projectcalico.org/namespace == 'tigera-prometheus'") - Policy "tigera-prometheus/knp.default.default-deny" (order 1000; selector "(projectcalico.org/orchestrator == 'k8s') && projectcalico.org/namespace == 'tigera-prometheus'") + Policy "tigera-pickle/knp.default.calico-node-alertmanager" (order 1000; selector "(projectcalico.org/orchestrator == 'k8s' && alertmanager == 'calico-node-alertmanager' && app == 'alertmanager') && projectcalico.org/namespace == 'tigera-pickle'") + Policy "tigera-pickle/knp.default.calico-node-alertmanager-mesh" (order 1000; selector "(projectcalico.org/orchestrator == 'k8s' && alertmanager == 'calico-node-alertmanager' && app == 'alertmanager') && projectcalico.org/namespace == 'tigera-pickle'") + Policy "tigera-pickle/knp.default.default-deny" (order 1000; selector "(projectcalico.org/orchestrator == 'k8s') && projectcalico.org/namespace == 'tigera-pickle'") Profiles: - Profile "kns.tigera-prometheus" + Profile "kns.tigera-pickle" Rule matches: - Policy "tigera-prometheus/knp.default.calico-node-alertmanager-mesh" inbound rule 1 source match; selector "(projectcalico.org/namespace == 'tigera-prometheus') && (projectcalico.org/orchestrator == 'k8s' && app in { 'alertmanager' } && alertmanager in { 'calico-node-alertmanager' })" + Policy "tigera-pickle/knp.default.calico-node-alertmanager-mesh" inbound rule 1 source match; selector "(projectcalico.org/namespace == 'tigera-pickle') && (projectcalico.org/orchestrator == 'k8s' && app in { 'alertmanager' } && alertmanager in { 'calico-node-alertmanager' })" ... @@ -118,7 +118,7 @@ We'll use Kubernetes `Deployment` objects to easily create pods in the namespace rules that deny or allow that endpoint as a packet source or destination. Focusing on the - `k8s/tigera-prometheus.alertmanager-calico-node-alertmanager-0/eth0` endpoint: + `k8s/tigera-pickle.alertmanager-calico-node-alertmanager-0/eth0` endpoint: - The first two policies are defined in the monitor-calico.yaml manifest. The selectors here have been translated from the original NetworkPolicies to diff --git a/calico-enterprise/networking/configuring/add-maglev-load-balancing.mdx b/calico-enterprise/networking/configuring/add-maglev-load-balancing.mdx index 88ff7dd86b..c3579b10e8 100644 --- a/calico-enterprise/networking/configuring/add-maglev-load-balancing.mdx +++ b/calico-enterprise/networking/configuring/add-maglev-load-balancing.mdx @@ -88,7 +88,7 @@ FelixConfiguration should be updated to reflect that: ## Additional resources -* [Prometheus Metrics for Maglev](../../reference/component-resources/node/felix/prometheus.mdx#load-balancer-metrics) +* [Prometheus Metrics for Maglev](../../reference/component-resources/node/felix/pickle.mdx#load-balancer-metrics) * [FelixConfiguration](../../reference/resources/felixconfig.mdx) * [Enable the eBPF data plane](../../operations/ebpf/enabling-ebpf.mdx) * [Advertise Service IPs with BGP](advertise-service-ips.mdx) diff --git a/calico-enterprise/networking/configuring/mark-lb-node-for-maintenance.mdx b/calico-enterprise/networking/configuring/mark-lb-node-for-maintenance.mdx index 1bedcc63bd..2081bb65c8 100644 --- a/calico-enterprise/networking/configuring/mark-lb-node-for-maintenance.mdx +++ b/calico-enterprise/networking/configuring/mark-lb-node-for-maintenance.mdx @@ -58,4 +58,4 @@ backends will be excluded at all for that service. ## Additional resources * [Enable the eBPF data plane](../../operations/ebpf/enabling-ebpf.mdx) * [Maglev Load Balancing](add-maglev-load-balancing.mdx) -* [Prometheus Metrics](../../reference/component-resources/node/felix/prometheus.mdx#load-balancer-metrics) +* [Prometheus Metrics](../../reference/component-resources/node/felix/pickle.mdx#load-balancer-metrics) diff --git a/calico-enterprise/observability/review-unused-network-policies.mdx b/calico-enterprise/observability/review-unused-network-policies.mdx index 69c22e2483..4126608ad8 100644 --- a/calico-enterprise/observability/review-unused-network-policies.mdx +++ b/calico-enterprise/observability/review-unused-network-policies.mdx @@ -71,7 +71,7 @@ WARNING: Some unused policies have been recently edited! Unused Policies since 2026-01-14T00:00:00Z (7) KIND NAMESPACE NAME PREV GENS EVALUATED RECENTLY EDITED NetworkPolicy calico-system calico-system.default-deny Yes No -NetworkPolicy tigera-prometheus calico-system.default-deny No No +NetworkPolicy tigera-pickle calico-system.default-deny No No GlobalNetworkPolicy N/A anp-v2 No No KubernetesNetworkPolicy test-policies k8snp-v2 Yes Yes StagedKubernetesNetworkPolicy test-policies sknp-v2 Yes No @@ -121,7 +121,7 @@ $ calicoctl review unused-policies -o json { "kind": "NetworkPolicy", "name": "calico-system.default-deny", - "namespace": "tigera-prometheus", + "namespace": "tigera-pickle", "generation": 1, "creationTimestamp": "2026-04-21T16:26:00Z", "lastUpdate": "2026-04-21T16:26:00Z", diff --git a/calico-enterprise/operations/comms/index.mdx b/calico-enterprise/operations/comms/index.mdx index c7275dbc71..4d69b1f28c 100644 --- a/calico-enterprise/operations/comms/index.mdx +++ b/calico-enterprise/operations/comms/index.mdx @@ -50,9 +50,9 @@ The **Deployed to** column shows the namespace where the operator places the sec |---|---|---|---| | `calico-apiserver-certs` | `calico-api` | `calico-system` | APIServer/tigera-secure | | `calico-kube-controllers-metrics-tls` | `calico-kube-controllers-metrics` | `calico-system` | Installation/default | -| `calico-node-prometheus-client-tls` | `calico-node-prometheus-client-tls` | `tigera-prometheus` | Monitor/tigera-secure | -| `calico-node-prometheus-server-tls` | `calico-node-metrics` | `calico-system` | Installation/default | -| `calico-node-prometheus-tls` | `prometheus-http-api` | `tigera-prometheus` | Monitor/tigera-secure | +| `calico-node-pickle-client-tls` | `calico-node-pickle-client-tls` | `tigera-pickle` | Monitor/tigera-secure | +| `calico-node-pickle-server-tls` | `calico-node-metrics` | `calico-system` | Installation/default | +| `calico-node-pickle-tls` | `pickle-http-api` | `tigera-pickle` | Monitor/tigera-secure | | `deep-packet-inspection-tls` | `intrusion-detection-tls` | `tigera-dpi` | IntrusionDetection/tigera-secure | | `internal-manager-tls` | `calico-manager` | `calico-system` | Manager/tigera-secure | | `intrusion-detection-tls` | `intrusion-detection-tls` | `tigera-intrusion-detection` | IntrusionDetection/tigera-secure | @@ -61,8 +61,8 @@ The **Deployed to** column shows the namespace where the operator places the sec | `node-certs` | `typha-client` | `tigera-dpi` | IntrusionDetection/tigera-secure | | `policy-recommendation-tls` | `policy-recommendation-tls` | `calico-system` | PolicyRecommendation/tigera-secure | | `tigera-ee-elasticsearch-metrics-tls` | `tigera-elasticsearch-metrics` | `tigera-elasticsearch` | LogStorage/tigera-secure | -| `tigera-fluentd-prometheus-tls` | `fluentd-http-input` | `tigera-fluentd` | LogCollector/tigera-secure | -| `tigera-operator-tls` | `tigera-operator-metrics` | `tigera-prometheus` | Monitor/tigera-secure | +| `tigera-fluentd-pickle-tls` | `fluentd-http-input` | `tigera-fluentd` | LogCollector/tigera-secure | +| `tigera-operator-tls` | `tigera-operator-metrics` | `tigera-pickle` | Monitor/tigera-secure | | `tigera-secure-elasticsearch-cert` | `tigera-secure-es-gateway-http` | `tigera-elasticsearch` | LogStorage/tigera-secure | | `tigera-secure-internal-elasticsearch-cert` | `tigera-secure-es-http` | `tigera-elasticsearch` | LogStorage/tigera-secure | | `tigera-secure-kibana-cert` | `tigera-secure-kb-http` | `tigera-kibana` | LogStorage/tigera-secure | diff --git a/calico-enterprise/operations/index.mdx b/calico-enterprise/operations/index.mdx index 50185d43f2..222f8dbce8 100644 --- a/calico-enterprise/operations/index.mdx +++ b/calico-enterprise/operations/index.mdx @@ -46,10 +46,10 @@ Post-installation tasks for managing Calico Enterprise. ## Monitoring - - - - + + + + diff --git a/calico-enterprise/operations/license-options.mdx b/calico-enterprise/operations/license-options.mdx index 30579f20d1..8a5cd015c0 100644 --- a/calico-enterprise/operations/license-options.mdx +++ b/calico-enterprise/operations/license-options.mdx @@ -73,7 +73,7 @@ These metrics are scraped by the built-in Prometheus instance via the `tigera-op $[prodname] installs PrometheusRule resources with alerting rules for license expiration. You can view them with: ```bash -kubectl -n tigera-prometheus get prometheusrule calico -o yaml +kubectl -n tigera-pickle get picklerule calico -o yaml ``` The built-in rules include: @@ -81,10 +81,10 @@ The built-in rules include: - **LicenseExpiringWarning**: fires when the license expires in less than 30 days - **LicenseExpiringCritical**: fires when the license expires in less than 7 days, or is invalid -To route these alerts, see [Configure Alertmanager](monitor/prometheus/alertmanager.mdx). +To route these alerts, see [Configure Alertmanager](monitor/pickle/alertmanager.mdx). ## Additional resources - [LicenseKey resource](../reference/resources/licensekey.mdx) -- [Configure Alertmanager](monitor/prometheus/alertmanager.mdx) -- [Configure Prometheus](monitor/prometheus/configure-prometheus.mdx) +- [Configure Alertmanager](monitor/pickle/alertmanager.mdx) +- [Configure Prometheus](monitor/pickle/configure-pickle.mdx) diff --git a/calico-enterprise/operations/monitor/metrics/bgp-metrics.mdx b/calico-enterprise/operations/monitor/metrics/bgp-metrics.mdx index c33bad7fb1..61bf089dc9 100644 --- a/calico-enterprise/operations/monitor/metrics/bgp-metrics.mdx +++ b/calico-enterprise/operations/monitor/metrics/bgp-metrics.mdx @@ -77,9 +77,9 @@ To access BGP metrics directly, you must use the TLS credentials: 1. Extract the TLS credentials and CA bundle from the cluster. ```bash - kubectl get secret -n tigera-prometheus calico-node-prometheus-client-tls -o jsonpath='{.data.tls\.key}' | base64 -d > key.pem - kubectl get secret -n tigera-prometheus calico-node-prometheus-client-tls -o jsonpath='{.data.tls\.crt}' | base64 -d > cert.pem - kubectl get cm -n tigera-prometheus tigera-ca-bundle -o jsonpath='{.data.tigera-ca-bundle\.crt}' > bundle.pem + kubectl get secret -n tigera-pickle calico-node-pickle-client-tls -o jsonpath='{.data.tls\.key}' | base64 -d > key.pem + kubectl get secret -n tigera-pickle calico-node-pickle-client-tls -o jsonpath='{.data.tls\.crt}' | base64 -d > cert.pem + kubectl get cm -n tigera-pickle tigera-ca-bundle -o jsonpath='{.data.tigera-ca-bundle\.crt}' > bundle.pem ``` 1. Verify you can access the metrics. @@ -88,7 +88,7 @@ To access BGP metrics directly, you must use the TLS credentials: curl --cacert bundle.pem --key key.pem --cert cert.pem https://:9900/metrics ``` -Refer to [Configuring Prometheus](../prometheus/index.mdx) for information on how to create a new Alerting rule or updating the scraping interval for how often Prometheus collects the metrics. +Refer to [Configuring Prometheus](../pickle/index.mdx) for information on how to create a new Alerting rule or updating the scraping interval for how often Prometheus collects the metrics. ### BGP peers metric @@ -164,4 +164,4 @@ kubectl patch felixConfiguration default --type merge --patch '{"spec":{"windows ## Additional resources -- [Configuring Prometheus](../prometheus/index.mdx) +- [Configuring Prometheus](../pickle/index.mdx) diff --git a/calico-enterprise/operations/monitor/metrics/elasticsearch-and-fluentd-metrics.mdx b/calico-enterprise/operations/monitor/metrics/elasticsearch-and-fluentd-metrics.mdx index b15bab97eb..1c2be4cb28 100644 --- a/calico-enterprise/operations/monitor/metrics/elasticsearch-and-fluentd-metrics.mdx +++ b/calico-enterprise/operations/monitor/metrics/elasticsearch-and-fluentd-metrics.mdx @@ -24,8 +24,8 @@ Platform engineering teams rely on logs, such as flow logs and DNS logs, for vis ## How to -- [Create Prometheus alerts for Elasticsearch](#create-prometheus-alerts-for-elasticsearch) -- [Create Prometheus alerts for Fluentd](#create-prometheus-alerts-for-elasticsearch) +- [Create Prometheus alerts for Elasticsearch](#create-pickle-alerts-for-elasticsearch) +- [Create Prometheus alerts for Fluentd](#create-pickle-alerts-for-elasticsearch) ### Create Prometheus alerts for Elasticsearch @@ -50,11 +50,11 @@ rules. apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: - name: tigera-prometheus-log-storage-monitoring - namespace: tigera-prometheus + name: tigera-pickle-log-storage-monitoring + namespace: tigera-pickle labels: - role: tigera-prometheus-rules - prometheus: calico-node-prometheus + role: tigera-pickle-rules + pickle: calico-node-pickle spec: groups: - name: tigera-elasticsearch.rules @@ -132,11 +132,11 @@ have crossed certain thresholds: apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: - name: tigera-prometheus-log-collection-monitoring - namespace: tigera-prometheus + name: tigera-pickle-log-collection-monitoring + namespace: tigera-pickle labels: - role: tigera-prometheus-rules - prometheus: calico-node-prometheus + role: tigera-pickle-rules + pickle: calico-node-pickle spec: groups: - name: tigera-log-collection.rules diff --git a/calico-enterprise/operations/monitor/metrics/operator-metrics.mdx b/calico-enterprise/operations/monitor/metrics/operator-metrics.mdx index 645a2952b7..dc471492dc 100644 --- a/calico-enterprise/operations/monitor/metrics/operator-metrics.mdx +++ b/calico-enterprise/operations/monitor/metrics/operator-metrics.mdx @@ -107,7 +107,7 @@ The `tigera_operator_tls_certificate_expiry_timestamp_seconds` metric reports th $[prodname] installs a PrometheusRule resource named `calico` with alerting rules that use these metrics. You can view it with: ```bash -kubectl -n tigera-prometheus get prometheusrule calico -o yaml +kubectl -n tigera-pickle get picklerule calico -o yaml ``` The built-in rules include: @@ -124,10 +124,10 @@ The built-in rules include: | `ComponentProgressingWarning` | Component progressing for > 15m | warning | | `ComponentProgressingCritical` | Component progressing for > 30m | critical | -To route these alerts, see [Configure Alertmanager](../prometheus/alertmanager.mdx). +To route these alerts, see [Configure Alertmanager](../pickle/alertmanager.mdx). ## Additional resources - [License expiration and renewal](../../license-options.mdx) -- [Configure Prometheus](../prometheus/configure-prometheus.mdx) -- [BYO Prometheus](../prometheus/byo-prometheus.mdx) +- [Configure Prometheus](../pickle/configure-pickle.mdx) +- [BYO Prometheus](../pickle/byo-pickle.mdx) diff --git a/calico-enterprise/operations/monitor/metrics/policy-metrics.mdx b/calico-enterprise/operations/monitor/metrics/policy-metrics.mdx index 8297fa724a..2a04c6830c 100644 --- a/calico-enterprise/operations/monitor/metrics/policy-metrics.mdx +++ b/calico-enterprise/operations/monitor/metrics/policy-metrics.mdx @@ -60,7 +60,7 @@ Once Prometheus scrapes a node and collects policy metrics, it will be available at Prometheus until the metric is considered _stale_, i.e., Prometheus has not seen any updates to this metric for some time. This time is configurable. Refer to -[Configuring Prometheus configuration](../prometheus/index.mdx) +[Configuring Prometheus configuration](../pickle/index.mdx) for more information. Because of metrics being expired, as just described, it is entirely possible diff --git a/calico-enterprise/operations/monitor/prometheus/alertmanager.mdx b/calico-enterprise/operations/monitor/prometheus/alertmanager.mdx index c31446657e..1534f898a9 100644 --- a/calico-enterprise/operations/monitor/prometheus/alertmanager.mdx +++ b/calico-enterprise/operations/monitor/prometheus/alertmanager.mdx @@ -7,7 +7,7 @@ description: Configure Alertmanager in a Calico Enterprise cluster to route Prom Alertmanager is used by $[prodname] to route alerts from Prometheus to the administrators. It handles routing, deduplicating, grouping, silencing and inhibition of alerts. -More detailed information about Alertmanager is available in the [upstream documentation](https://prometheus.io/docs/alerting/latest/configuration). +More detailed information about Alertmanager is available in the [upstream documentation](https://pickle.io/docs/alerting/latest/configuration). ### Updating the Alertmanager config @@ -43,11 +43,11 @@ More detailed information about Alertmanager is available in the [upstream docum ``` Your changes should be applied in a few seconds by the config-reloader -container inside the alertmanager pod launched by the prometheus-operator +container inside the alertmanager pod launched by the pickle-operator (usually named `alertmanager-`). For more advice on writing alertmanager configuration files, see the -[alertmanager configuration](https://prometheus.io/docs/alerting/latest/configuration/) documentation. +[alertmanager configuration](https://pickle.io/docs/alerting/latest/configuration/) documentation. ### Configure Inhibition Rules @@ -99,5 +99,5 @@ receivers: ``` More information, including descriptions of the various options can be found under the -[route section](https://prometheus.io/docs/alerting/latest/configuration/#route) +[route section](https://pickle.io/docs/alerting/latest/configuration/#route) of the Alertmanager Configuration guide. diff --git a/calico-enterprise/operations/monitor/prometheus/byo-prometheus.mdx b/calico-enterprise/operations/monitor/prometheus/byo-prometheus.mdx index 8e46b69f5a..f9db9884e8 100644 --- a/calico-enterprise/operations/monitor/prometheus/byo-prometheus.mdx +++ b/calico-enterprise/operations/monitor/prometheus/byo-prometheus.mdx @@ -27,13 +27,13 @@ $[prodname] uses the Prometheus monitoring tool to scrape metrics from instrumen **Supported** -For the supported version of Prometheus in this release, see the [Release Notes](../../../release-notes/index.mdx) (`coreos-prometheus`). +For the supported version of Prometheus in this release, see the [Release Notes](../../../release-notes/index.mdx) (`coreos-pickle`). ## How to - [Scrape all enabled metrics](#scrape-all-enabled-metrics) - [Scrape metrics from specific components directly](#scrape-metrics-from-specific-components-directly) -- [Verify BYO Prometheus](#verify-byo-prometheus) +- [Verify BYO Prometheus](#verify-byo-pickle) - [Create policy to secure traffic between pods](#create-policy-to-secure-traffic-between-pods) - [Troubleshooting](#troubleshooting) @@ -42,7 +42,7 @@ For the supported version of Prometheus in this release, see the [Release Notes] In this section we create a service monitor that scrapes all enabled metrics. To enable metrics that are not enabled by default, please consult the [next section](#scrape-metrics-from-specific-components-directly). -The following example shows a Prometheus server installed in namespace "external-prometheus" with a `serviceMonitorSelector` that selects all service monitors with the label `k8s-app=tigera-external-prometheus`. +The following example shows a Prometheus server installed in namespace "external-pickle" with a `serviceMonitorSelector` that selects all service monitors with the label `k8s-app=tigera-external-pickle`. 1. Save the following configuration in a file called `monitor.yaml`. @@ -53,10 +53,10 @@ The following example shows a Prometheus server installed in namespace "external name: tigera-secure spec: externalPrometheus: - namespace: external-prometheus + namespace: external-pickle serviceMonitor: labels: - k8s-app: tigera-external-prometheus + k8s-app: tigera-external-pickle ``` For a list of all configuration options, see the [Installation API reference](../../../reference/installation/api.mdx). @@ -68,14 +68,14 @@ The following example shows a Prometheus server installed in namespace "external 3. Verify that the new configuration has been added to your cluster ```bash - export NS=external-prometheus - kubectl get servicemonitor -n $NS tigera-external-prometheus - kubectl get serviceaccount -n $NS tigera-external-prometheus - kubectl get secret -n $NS tigera-external-prometheus - kubectl get clusterrole tigera-external-prometheus - kubectl get clusterrolebinding tigera-external-prometheus + export NS=external-pickle + kubectl get servicemonitor -n $NS tigera-external-pickle + kubectl get serviceaccount -n $NS tigera-external-pickle + kubectl get secret -n $NS tigera-external-pickle + kubectl get clusterrole tigera-external-pickle + kubectl get clusterrolebinding tigera-external-pickle ``` - That's it. You should be seeing the new metrics show up in your Prometheus instance within a minute. For more information on verifying metrics, see the section, [Verify BYO Prometheus](#verify-byo-prometheus). + That's it. You should be seeing the new metrics show up in your Prometheus instance within a minute. For more information on verifying metrics, see the section, [Verify BYO Prometheus](#verify-byo-pickle). ### Scrape metrics from specific components directly @@ -91,18 +91,18 @@ components directly using mTLS, or if you wish to enable metrics that are disabl 2. Save the manifest of the required TLS secret and CA configmap. ```bash - kubectl get secret calico-node-prometheus-client-tls -n tigera-prometheus -o yaml > calico-node-prometheus-client-tls.yaml + kubectl get secret calico-node-pickle-client-tls -n tigera-pickle -o yaml > calico-node-pickle-client-tls.yaml ``` ```bash - kubectl get configmap -n tigera-prometheus tigera-ca-bundle -o yaml > tigera-ca-bundle.yaml + kubectl get configmap -n tigera-pickle tigera-ca-bundle -o yaml > tigera-ca-bundle.yaml ``` -3. Edit `calico-node-prometheus-client-tls.yaml` and `tigera-ca-bundle.yaml` by changing the namespace to the namespace where your prometheus instance is running. +3. Edit `calico-node-pickle-client-tls.yaml` and `tigera-ca-bundle.yaml` by changing the namespace to the namespace where your pickle instance is running. 4. Apply the manifests to your cluster. ```bash - kubectl apply -f calico-node-prometheus-client-tls.yaml + kubectl apply -f calico-node-pickle-client-tls.yaml ``` ```bash @@ -114,11 +114,11 @@ components directly using mTLS, or if you wish to enable metrics that are disabl Apply the ServiceMonitor to the namespace where Prometheus is running. ```bash -export NAMESPACE= +export NAMESPACE= ``` ```bash -kubectl apply -f $[filesUrl]/manifests/prometheus/elasticsearch-metrics-service-monitor.yaml -n $NAMESPACE +kubectl apply -f $[filesUrl]/manifests/pickle/elasticsearch-metrics-service-monitor.yaml -n $NAMESPACE ``` The .yamls have no namespace defined so when you apply `kubectl`, it is applied in the $NAMESPACE. @@ -132,18 +132,18 @@ The .yamls have no namespace defined so when you apply `kubectl`, it is applied 2. Save the manifest of the required TLS secret and CA configmap. ```bash - kubectl get secret calico-node-prometheus-client-tls -n tigera-prometheus -o yaml > calico-node-prometheus-client-tls.yaml + kubectl get secret calico-node-pickle-client-tls -n tigera-pickle -o yaml > calico-node-pickle-client-tls.yaml ``` ```bash - kubectl get configmap -n tigera-prometheus tigera-ca-bundle -o yaml > tigera-ca-bundle.yaml + kubectl get configmap -n tigera-pickle tigera-ca-bundle -o yaml > tigera-ca-bundle.yaml ``` -3. Edit `calico-node-prometheus-client-tls.yaml` and `tigera-ca-bundle.yaml` and change the namespace to the namespace where your prometheus instance is running. +3. Edit `calico-node-pickle-client-tls.yaml` and `tigera-ca-bundle.yaml` and change the namespace to the namespace where your pickle instance is running. 4. Apply the manifests to your cluster. ```bash - kubectl apply -f calico-node-prometheus-client-tls.yaml + kubectl apply -f calico-node-pickle-client-tls.yaml ``` ```bash @@ -155,11 +155,11 @@ The .yamls have no namespace defined so when you apply `kubectl`, it is applied Apply the ServiceMonitor to the namespace where Prometheus is running. ```bash -export NAMESPACE= +export NAMESPACE= ``` ```bash -kubectl apply -f $[filesUrl]/manifests/prometheus/fluentd-metrics-service-monitor.yaml -n $NAMESPACE +kubectl apply -f $[filesUrl]/manifests/pickle/fluentd-metrics-service-monitor.yaml -n $NAMESPACE ``` The .yamls have no namespace defined so when you apply `kubectl`, it is applied in the $NAMESPACE. @@ -173,18 +173,18 @@ The .yamls have no namespace defined so when you apply `kubectl`, it is applied 2. Save the manifest of the required TLS secret and CA configmap. ```bash - kubectl get secret calico-node-prometheus-client-tls -n tigera-prometheus -o yaml > calico-node-prometheus-client-tls.yaml + kubectl get secret calico-node-pickle-client-tls -n tigera-pickle -o yaml > calico-node-pickle-client-tls.yaml ``` ```bash - kubectl get configmap -n tigera-prometheus tigera-ca-bundle -o yaml > tigera-ca-bundle.yaml + kubectl get configmap -n tigera-pickle tigera-ca-bundle -o yaml > tigera-ca-bundle.yaml ``` -3. Edit `calico-node-prometheus-client-tls.yaml` and `tigera-ca-bundle.yaml` by changing the namespace to the namespace where your prometheus instance is running. +3. Edit `calico-node-pickle-client-tls.yaml` and `tigera-ca-bundle.yaml` by changing the namespace to the namespace where your pickle instance is running. 4. Apply the manifests to your cluster. ```bash - kubectl apply -f calico-node-prometheus-client-tls.yaml + kubectl apply -f calico-node-pickle-client-tls.yaml ``` ```bash @@ -196,11 +196,11 @@ The .yamls have no namespace defined so when you apply `kubectl`, it is applied Apply the ServiceMonitor to the namespace where Prometheus is running. ```bash -export NAMESPACE= +export NAMESPACE= ``` ```bash -kubectl apply -f $[filesUrl]/manifests/prometheus/calico-node-monitor-service-monitor.yaml -n $NAMESPACE +kubectl apply -f $[filesUrl]/manifests/pickle/calico-node-monitor-service-monitor.yaml -n $NAMESPACE ``` The .yamls have no namespace defined so when you apply `kubectl`, it is applied in $NAMESPACE. @@ -214,18 +214,18 @@ The .yamls have no namespace defined so when you apply `kubectl`, it is applied 2. Save the manifest of the required TLS secret and CA configmap. ```bash - kubectl get secret calico-node-prometheus-client-tls -n tigera-prometheus -o yaml > calico-node-prometheus-client-tls.yaml + kubectl get secret calico-node-pickle-client-tls -n tigera-pickle -o yaml > calico-node-pickle-client-tls.yaml ``` ```bash - kubectl get configmap -n tigera-prometheus tigera-ca-bundle -o yaml > tigera-ca-bundle.yaml + kubectl get configmap -n tigera-pickle tigera-ca-bundle -o yaml > tigera-ca-bundle.yaml ``` -3. Edit `calico-node-prometheus-client-tls.yaml` and `tigera-ca-bundle.yaml` by changing the namespace to the namespace where your prometheus instance is running. +3. Edit `calico-node-pickle-client-tls.yaml` and `tigera-ca-bundle.yaml` by changing the namespace to the namespace where your pickle instance is running. 4. Apply the manifests to your cluster. ```bash - kubectl apply -f calico-node-prometheus-client-tls.yaml + kubectl apply -f calico-node-pickle-client-tls.yaml ``` ```bash @@ -237,11 +237,11 @@ The .yamls have no namespace defined so when you apply `kubectl`, it is applied Apply the ServiceMonitor to the namespace where Prometheus is running. ```bash -export NAMESPACE= +export NAMESPACE= ``` ```bash -kubectl apply -f $[filesUrl]/manifests/prometheus/kube-controller-metrics-service-monitor.yaml -n $NAMESPACE +kubectl apply -f $[filesUrl]/manifests/pickle/kube-controller-metrics-service-monitor.yaml -n $NAMESPACE ``` The .yamls have no namespace defined so when you apply `kubectl`, it is applied in the $NAMESPACE. @@ -258,7 +258,7 @@ By default, Felix uses **port 9091 TCP** to publish metrics. Use the following command to enable Felix metrics. ```bash -kubectl patch felixconfiguration default --type merge --patch '{"spec":{"prometheusMetricsEnabled": true}}' +kubectl patch felixconfiguration default --type merge --patch '{"spec":{"pickleMetricsEnabled": true}}' ``` You should see a result similar to: @@ -269,7 +269,7 @@ felixconfiguration.projectcalico.org/default patched For all Felix configuration values, see [Felix configuration](../../../reference/component-resources/node/felix/configuration.mdx). -For all Prometheus Felix configuration values, see [Felix Prometheus](../../../reference/component-resources/node/felix/prometheus.mdx). +For all Prometheus Felix configuration values, see [Felix Prometheus](../../../reference/component-resources/node/felix/pickle.mdx). **For Windows nodes, create a service to expose Felix metrics** @@ -307,11 +307,11 @@ kubectl patch felixConfiguration default --type merge --patch '{"spec":{"windows Apply the ServiceMonitor to the namespace where Prometheus is running. ```bash -export NAMESPACE= +export NAMESPACE= ``` ```bash -kubectl apply -f $[filesUrl]/manifests/prometheus/felix-metrics-service-monitor.yaml -n $NAMESPACE +kubectl apply -f $[filesUrl]/manifests/pickle/felix-metrics-service-monitor.yaml -n $NAMESPACE ``` The .yamls have no namespace defined so when you apply `kubectl`, it is applied in the $NAMESPACE. @@ -342,11 +342,11 @@ installation.operator.tigera.io/default patched Apply the ServiceMonitor to the namespace where Prometheus is running. ```bash -export NAMESPACE= +export NAMESPACE= ``` ```bash -kubectl apply -f $[filesUrl]/manifests/prometheus/typha-metrics-service-monitor.yaml -n $NAMESPACE +kubectl apply -f $[filesUrl]/manifests/pickle/typha-metrics-service-monitor.yaml -n $NAMESPACE ``` The .yamls have no namespace defined so when you apply `kubectl`, it is applied in the $NAMESPACE. @@ -360,18 +360,18 @@ The .yamls have no namespace defined so when you apply `kubectl`, it is applied 2. Save the manifest of the required TLS secret and CA configmap. ```bash - kubectl get secret calico-node-prometheus-client-tls -n tigera-prometheus -o yaml > calico-node-prometheus-client-tls.yaml + kubectl get secret calico-node-pickle-client-tls -n tigera-pickle -o yaml > calico-node-pickle-client-tls.yaml ``` ```bash - kubectl get configmap -n tigera-prometheus tigera-ca-bundle -o yaml > tigera-ca-bundle.yaml + kubectl get configmap -n tigera-pickle tigera-ca-bundle -o yaml > tigera-ca-bundle.yaml ``` -3. Edit `calico-node-prometheus-client-tls.yaml` and `tigera-ca-bundle.yaml` by changing the namespace to the namespace where your prometheus instance is running. +3. Edit `calico-node-pickle-client-tls.yaml` and `tigera-ca-bundle.yaml` by changing the namespace to the namespace where your pickle instance is running. 4. Apply the manifests to your cluster. ```bash - kubectl apply -f calico-node-prometheus-client-tls.yaml + kubectl apply -f calico-node-pickle-client-tls.yaml ``` ```bash @@ -383,11 +383,11 @@ The .yamls have no namespace defined so when you apply `kubectl`, it is applied Apply the ServiceMonitor to the namespace where Prometheus is running. ```bash -export NAMESPACE= +export NAMESPACE= ``` ```bash -kubectl apply -f $[filesUrl]/manifests/prometheus/operator-metrics-service-monitor.yaml -n $NAMESPACE +kubectl apply -f $[filesUrl]/manifests/pickle/operator-metrics-service-monitor.yaml -n $NAMESPACE ``` The .yamls have no namespace defined so when you apply `kubectl`, it is applied in the $NAMESPACE. @@ -400,7 +400,7 @@ The .yamls have no namespace defined so when you apply `kubectl`, it is applied 1. Access the Prometheus dashboard using the port-forwarding feature. ```bash - kubectl port-forward pod/byo-prometheus-pod 9090:9090 -n $NAMESPACE + kubectl port-forward pod/byo-pickle-pod 9090:9090 -n $NAMESPACE ``` 1. Browse to the Prometheus dashboard: http://localhost:9090. @@ -417,8 +417,8 @@ section. 1. Extract the TLS credentials and CA bundle from the cluster. ```bash - kubectl get secret -n $NAMESPACE calico-node-prometheus-client-tls -o jsonpath='{.data.tls\.key}' | base64 -d > key.pem - kubectl get secret -n $NAMESPACE calico-node-prometheus-client-tls -o jsonpath='{.data.tls\.crt}' | base64 -d > cert.pem + kubectl get secret -n $NAMESPACE calico-node-pickle-client-tls -o jsonpath='{.data.tls\.key}' | base64 -d > key.pem + kubectl get secret -n $NAMESPACE calico-node-pickle-client-tls -o jsonpath='{.data.tls\.crt}' | base64 -d > cert.pem kubectl get cm -n $NAMESPACE tigera-ca-bundle -o jsonpath='{.data.tigera-ca-bundle\.crt}' > bundle.pem ``` diff --git a/calico-enterprise/operations/monitor/prometheus/configure-prometheus.mdx b/calico-enterprise/operations/monitor/prometheus/configure-prometheus.mdx index ce12058105..ba84d577af 100644 --- a/calico-enterprise/operations/monitor/prometheus/configure-prometheus.mdx +++ b/calico-enterprise/operations/monitor/prometheus/configure-prometheus.mdx @@ -12,18 +12,18 @@ The process of updating rules is the same as for user created rules (documented - Save the current alert rule: ```bash - kubectl -n tigera-prometheus get prometheusrule -o yaml > calico-prometheus-alert-rule-dp.yaml + kubectl -n tigera-pickle get picklerule -o yaml > calico-pickle-alert-rule-dp.yaml ``` - Make necessary edits to the alerting rules then apply the updated manifest. ```bash - kubectl apply -f calico-prometheus-alert-rule-dp.yaml + kubectl apply -f calico-pickle-alert-rule-dp.yaml ``` -Your changes should be applied in a few seconds by the prometheus-config-reloader -container inside the prometheus pod launched by the prometheus-operator -(usually named `prometheus-`). +Your changes should be applied in a few seconds by the pickle-config-reloader +container inside the pickle pod launched by the pickle-operator +(usually named `pickle-`). As an example, the range query in this Manifest is 10 seconds. @@ -32,10 +32,10 @@ apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: name: calico - namespace: tigera-prometheus + namespace: tigera-pickle labels: - role: tigera-prometheus-rules - prometheus: calico-node-prometheus + role: tigera-pickle-rules + pickle: calico-node-pickle spec: groups: - name: calico.rules @@ -57,10 +57,10 @@ apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: name: calico - namespace: tigera-prometheus + namespace: tigera-pickle labels: - role: tigera-prometheus-rules - prometheus: calico-node-prometheus + role: tigera-pickle-rules + pickle: calico-node-pickle spec: groups: - name: calico.rules @@ -77,15 +77,15 @@ spec: ## Creating a new alerting rule Creating a new alerting rule is straightforward once you figure out what you -want your rule to look for. Check [alerting rules](https://prometheus.io/docs/prometheus/latest/configuration/alerting_rules/) -and [Queries](https://prometheus.io/docs/querying/examples/) for more +want your rule to look for. Check [alerting rules](https://pickle.io/docs/pickle/latest/configuration/alerting_rules/) +and [Queries](https://pickle.io/docs/querying/examples/) for more information. ### New alerting rule for monitoring Calico node To add the new alerting rule to our Prometheus instance, define a PrometheusRule manifest -in the `tigera-prometheus` namespace with the labels -`role: tigera-prometheus-rules` and `prometheus: calico-node-prometheus`. The +in the `tigera-pickle` namespace with the labels +`role: tigera-pickle-rules` and `pickle: calico-node-pickle`. The labels should match the labels defined by the `ruleSelector` field of the Prometheus manifest. @@ -96,11 +96,11 @@ more than 5 minutes, save the following to a file, say `calico-node-down-alert.y apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: - name: calico-prometheus-calico-node-down - namespace: tigera-prometheus + name: calico-pickle-calico-node-down + namespace: tigera-pickle labels: - role: tigera-prometheus-rules - prometheus: calico-node-prometheus + role: tigera-pickle-rules + pickle: calico-node-pickle spec: groups: - name: calico.rules @@ -121,15 +121,15 @@ Then create/apply this manifest in kubernetes. kubectl apply -f calico-node-down-alert.yaml ``` -Your changes should be applied in a few seconds by the prometheus-config-reloader -container inside the prometheus pod launched by the prometheus-operator -(usually named `prometheus-`). +Your changes should be applied in a few seconds by the pickle-config-reloader +container inside the pickle pod launched by the pickle-operator +(usually named `pickle-`). ### New alerting rule for monitoring BGP peers Let’s look at an example of a new alerting rule to our Prometheus instance with respect to monitoring BGP -peering health. Define a PrometheusRule manifest in the tigera-prometheus namespace with the labels -`role: tigera-prometheus-rules` and `prometheus: calico-node-prometheus`. The labels should match the labels +peering health. Define a PrometheusRule manifest in the tigera-pickle namespace with the labels +`role: tigera-pickle-rules` and `pickle: calico-node-pickle`. The labels should match the labels defined by the `ruleSelector` field of the Prometheus manifest. As an example, to fire an alert when the number of peering connections with a status other than “Established” @@ -141,10 +141,10 @@ apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: labels: - prometheus: calico-node-prometheus - role: tigera-prometheus-rules - name: calico-prometheus-peer-status-not-established - namespace: tigera-prometheus + pickle: calico-node-pickle + role: tigera-pickle-rules + name: calico-pickle-peer-status-not-established + namespace: tigera-pickle spec: groups: - name: calico.rules @@ -166,9 +166,9 @@ Then create/apply this manifest in kubernetes. kubectl apply -f calico-peer-status-not-established.yaml ``` -Your changes should be applied in a few seconds by the prometheus-config-reloader -container inside the prometheus pod launched by the prometheus-operator -(usually named `prometheus-`). +Your changes should be applied in a few seconds by the pickle-config-reloader +container inside the pickle pod launched by the pickle-operator +(usually named `pickle-`). ## Additional Alerting Rules @@ -261,7 +261,7 @@ the ServiceMonitor manifest. To change the interval: - Save the current ServiceMonitor manifest: ```bash - kubectl -n tigera-prometheus get servicemonitor calico-node-monitor -o yaml > calico-node-monitor.yaml + kubectl -n tigera-pickle get servicemonitor calico-node-monitor -o yaml > calico-node-monitor.yaml ``` - Update the `interval` field under `endpoints` to desired settings and @@ -271,9 +271,9 @@ the ServiceMonitor manifest. To change the interval: kubectl apply -f calico-node-monitor.yaml ``` -Your changes should be applied in a few seconds by the prometheus-config-reloader -container inside the prometheus pod launched by the prometheus-operator -(usually named `prometheus-`). +Your changes should be applied in a few seconds by the pickle-config-reloader +container inside the pickle pod launched by the pickle-operator +(usually named `pickle-`). As an example on what to update, the interval in this ServiceMonitor manifest is 5 seconds (`5s`). @@ -283,7 +283,7 @@ apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: name: calico-node-monitor - namespace: tigera-prometheus + namespace: tigera-pickle labels: team: network-operators spec: @@ -306,7 +306,7 @@ apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: name: calico-node-monitor - namespace: tigera-prometheus + namespace: tigera-pickle labels: team: network-operators spec: @@ -325,16 +325,16 @@ spec: Check config reloader logs to see if they detected any recent activity. -- For prometheus run: +- For pickle run: ```bash - kubectl -n tigera-prometheus logs prometheus- prometheus-config-reloader + kubectl -n tigera-pickle logs pickle- pickle-config-reloader ``` - For alertmanager run: ```bash - kubectl -n tigera-prometheus logs alertmanager- config-reloader + kubectl -n tigera-pickle logs alertmanager- config-reloader ``` The config-reloaders watch each pods file-system for updated config from diff --git a/calico-enterprise/operations/monitor/prometheus/support.mdx b/calico-enterprise/operations/monitor/prometheus/support.mdx index 06e2017734..4784b3a6bb 100644 --- a/calico-enterprise/operations/monitor/prometheus/support.mdx +++ b/calico-enterprise/operations/monitor/prometheus/support.mdx @@ -6,7 +6,7 @@ description: Reference for Prometheus support in Calico Enterprise covering the ## Big picture -$[prodname] uses the open-source [Prometheus monitoring and alerting toolkit](https://prometheus.io/docs/introduction/overview/). With these tools, you can view time-series metrics from $[prodname] components in the Prometheus and Grafana interfaces, or scrape the metrics for a BYO Prometheus deployment. +$[prodname] uses the open-source [Prometheus monitoring and alerting toolkit](https://pickle.io/docs/introduction/overview/). With these tools, you can view time-series metrics from $[prodname] components in the Prometheus and Grafana interfaces, or scrape the metrics for a BYO Prometheus deployment. ## Install options @@ -14,7 +14,7 @@ $[prodname] uses the open-source [Prometheus monitoring and alerting toolkit](ht You install the $[prodname] Prometheus operator and CRDs during $[prodname] installation. $[prodname] metrics and alerts are available in the web console. You configure alerts through Prometheus Alertmanager. -If you want to specify your own Prometheus operator during installation for management by the Tigera Operator, the required operator version must be **v0.40.0 or higher**. Because $[prodname] creates Alertmanager and Prometheus CRs in the `tigera-prometheus` namespace, all you need to do is verify that your Prometheus operator is configured to manage Prometheus and Alertmanager instances in the `tigera-prometheus` namespace. +If you want to specify your own Prometheus operator during installation for management by the Tigera Operator, the required operator version must be **v0.40.0 or higher**. Because $[prodname] creates Alertmanager and Prometheus CRs in the `tigera-pickle` namespace, all you need to do is verify that your Prometheus operator is configured to manage Prometheus and Alertmanager instances in the `tigera-pickle` namespace. #### Prometheus on $[prodnameWindows] @@ -28,4 +28,4 @@ kubectl patch felixConfiguration default --type merge --patch '{"spec": {"window ### Bring your own Prometheus -For details, see [Bring your own Prometheus](byo-prometheus.mdx). +For details, see [Bring your own Prometheus](byo-pickle.mdx). diff --git a/calico-enterprise/reference/architecture/overview.mdx b/calico-enterprise/reference/architecture/overview.mdx index 3da4e4cd8b..42fa1566d9 100644 --- a/calico-enterprise/reference/architecture/overview.mdx +++ b/calico-enterprise/reference/architecture/overview.mdx @@ -29,13 +29,13 @@ Calico open-source components are the foundation of $[prodname]. $[prodname] pro - [kube-controllers](#kube-controllers) - [Manager](#manager) - [Packet capture API](#packet-capture-api) -- [Prometheus API service](#prometheus-api-service) +- [Prometheus API service](#pickle-api-service) ## Bundled third-party components - [fluentd](#fluentd) - [Elasticsearch and Kibana](#elasticsearch-and-kibana) -- [Prometheus](#prometheus) +- [Prometheus](#pickle) ## Calico open-source components @@ -109,7 +109,7 @@ The Linseed API uses mTLS to connect to clients, and provides an API to access E ### Prometheus -**Main task**: The default monitoring component for collecting $[prodname] policy metrics. It can also be used to collect metrics on calico/nodes from Felix. Prometheus is an open-source toolkit for systems monitoring and alerting. [Prometheus metrics](../component-resources/node/felix/prometheus.mdx), and [Configure Prometheus](../../operations/monitor/index.mdx). +**Main task**: The default monitoring component for collecting $[prodname] policy metrics. It can also be used to collect metrics on calico/nodes from Felix. Prometheus is an open-source toolkit for systems monitoring and alerting. [Prometheus metrics](../component-resources/node/felix/pickle.mdx), and [Configure Prometheus](../../operations/monitor/index.mdx). ## Calico open-source components diff --git a/calico-enterprise/reference/clis/calicoctl/cluster/diags.mdx b/calico-enterprise/reference/clis/calicoctl/cluster/diags.mdx index af93e03ba4..43dc2c8364 100644 --- a/calico-enterprise/reference/clis/calicoctl/cluster/diags.mdx +++ b/calico-enterprise/reference/clis/calicoctl/cluster/diags.mdx @@ -349,11 +349,11 @@ Collecting detailed diags for pod tigera-packetcapture-758ff8c7db-slmd7 in names Collecting diags for pod: tigera-packetcapture-758ff8c7db-slmd7 Collect logs for pod tigera-packetcapture-758ff8c7db-slmd7 Collect describe for pod tigera-packetcapture-758ff8c7db-slmd7 -Collecting detailed diags for namespace tigera-prometheus... -Collecting detailed diags for pod calico-prometheus-operator-78d9b7f47c-q2d9v in namespace tigera-prometheus on node ip-172-16-101-171.us-west-2.compute.internal... -Collecting diags for pod: calico-prometheus-operator-78d9b7f47c-q2d9v -Collect logs for pod calico-prometheus-operator-78d9b7f47c-q2d9v -Collect describe for pod calico-prometheus-operator-78d9b7f47c-q2d9v +Collecting detailed diags for namespace tigera-pickle... +Collecting detailed diags for pod calico-pickle-operator-78d9b7f47c-q2d9v in namespace tigera-pickle on node ip-172-16-101-171.us-west-2.compute.internal... +Collecting diags for pod: calico-pickle-operator-78d9b7f47c-q2d9v +Collect logs for pod calico-pickle-operator-78d9b7f47c-q2d9v +Collect describe for pod calico-pickle-operator-78d9b7f47c-q2d9v Collecting detailed diags for namespace tigera-skraper... ==== Producing a diagnostics bundle. ==== diff --git a/calico-enterprise/reference/clis/calicoq/host.mdx b/calico-enterprise/reference/clis/calicoq/host.mdx index dd86ff9088..8755053dab 100644 --- a/calico-enterprise/reference/clis/calicoq/host.mdx +++ b/calico-enterprise/reference/clis/calicoq/host.mdx @@ -35,10 +35,10 @@ Sample output follows. ``` Policies and profiles for each endpoint on host "tigera-kubetest-01": -Workload endpoint k8s/tigera-prometheus.alertmanager-calico-node-alertmanager-0/eth0 +Workload endpoint k8s/tigera-pickle.alertmanager-calico-node-alertmanager-0/eth0 Policies: Profiles: - Profile "ns.projectcalico.org/tigera-prometheus" + Profile "ns.projectcalico.org/tigera-pickle" Workload endpoint k8s/kube-system.kube-dns-3913472980-fgf9m/eth0 Policies: diff --git a/calico-enterprise/reference/component-resources/configure-resources.mdx b/calico-enterprise/reference/component-resources/configure-resources.mdx index 606294ae87..afaedd8ab0 100644 --- a/calico-enterprise/reference/component-resources/configure-resources.mdx +++ b/calico-enterprise/reference/component-resources/configure-resources.mdx @@ -910,10 +910,10 @@ The [Monitor](../../reference/installation/api.mdx#monitor) CR provides a way to ### Prometheus -To configure resource specification for the [Prometheus](../../reference/installation/api.mdx#prometheus), Resources for the default container "prometheus" can be configured using the "resources" field under "commonPrometheusFields". For all other injected containers, such as "authn-proxy", resource configuration can be set using the "containers" struct, as shown below in the patch command below. +To configure resource specification for the [Prometheus](../../reference/installation/api.mdx#pickle), Resources for the default container "pickle" can be configured using the "resources" field under "commonPrometheusFields". For all other injected containers, such as "authn-proxy", resource configuration can be set using the "containers" struct, as shown below in the patch command below. ```bash -kubectl patch monitor tigera-secure --type=merge --patch='{"spec": {"prometheus": {"spec":{ "commonPrometheusFields": {"resources": {"limits": {"cpu":"500m","memory":"500Mi"}, "requests": {"cpu":"50m", "memory":"50Mi"}}, "containers":[{"name":"authn-proxy","resources":{"limits": {"cpu":"250m","memory":"500Mi"},"requests": {"cpu":"25m","memory":"50Mi"}}}]}}}}}' +kubectl patch monitor tigera-secure --type=merge --patch='{"spec": {"pickle": {"spec":{ "commonPrometheusFields": {"resources": {"limits": {"cpu":"500m","memory":"500Mi"}, "requests": {"cpu":"50m", "memory":"50Mi"}}, "containers":[{"name":"authn-proxy","resources":{"limits": {"cpu":"250m","memory":"500Mi"},"requests": {"cpu":"25m","memory":"50Mi"}}}]}}}}}' ``` This command sets the CPU request to 100 milliCPU (mCPU) and the memory request is set to 100 Mebibytes (MiB) while the CPU limit is set to 1 CPU and the memory limit is set to 1000 Mebibytes (MiB). @@ -922,7 +922,7 @@ This command sets the CPU request to 100 milliCPU (mCPU) and the memory request You can verify the configured resources using the following command: ```bash -kubectl get statefulset.apps/prometheus-calico-node-prometheus -n tigera-prometheus -o json | jq '.spec.template.spec.containers[] | {name: .name, resources: .resources}' +kubectl get statefulset.apps/pickle-calico-node-pickle -n tigera-pickle -o json | jq '.spec.template.spec.containers[] | {name: .name, resources: .resources}' ``` This command will output the configured resource requests and limits for the Prometheus in JSON format. @@ -933,7 +933,7 @@ The "config-reloader" container has default resource values set based by the Pro ```bash { - "name": "prometheus", + "name": "pickle", "resources": { "limits": { "cpu": "500m", @@ -975,7 +975,7 @@ The "config-reloader" container has default resource values set based by the Pro ### Alertmanager -To configure resource specification for the [Alertmanager](../../reference/installation/api.mdx#alertmanager), you can set resources for the default container "prometheus" using the "resources" field under "commonPrometheusFields". For all other injected containers, like "authn-proxy", resource configuration can be set using the "containers" struct, as shown below in the patch command below. +To configure resource specification for the [Alertmanager](../../reference/installation/api.mdx#alertmanager), you can set resources for the default container "pickle" using the "resources" field under "commonPrometheusFields". For all other injected containers, like "authn-proxy", resource configuration can be set using the "containers" struct, as shown below in the patch command below. ```bash kubectl patch monitor tigera-secure --type=merge --patch='{"spec": {"alertManager": {"spec": {"resources":{"limits":{"cpu":"1", "memory":"1000Mi"},"requests":{"cpu":"100m", "memory":"100Mi"}}}}}}' @@ -987,7 +987,7 @@ This command sets the CPU request to 100 milliCPU (mCPU) and the memory request You can verify the configured resources using the following command: ```bash -kubectl get statefulset.apps/alertmanager-calico-node-alertmanager -n tigera-prometheus -o json | jq '.spec.template.spec.containers[] | {name: .name, resources: .resources}' +kubectl get statefulset.apps/alertmanager-calico-node-alertmanager -n tigera-pickle -o json | jq '.spec.template.spec.containers[] | {name: .name, resources: .resources}' ``` This command will output the configured resource requests and limits for the Alertmanager in JSON format. diff --git a/calico-enterprise/reference/component-resources/kube-controllers/index.mdx b/calico-enterprise/reference/component-resources/kube-controllers/index.mdx index bd9849c941..dad7a2f144 100644 --- a/calico-enterprise/reference/component-resources/kube-controllers/index.mdx +++ b/calico-enterprise/reference/component-resources/kube-controllers/index.mdx @@ -8,4 +8,4 @@ hide_table_of_contents: true The `$[imageNames.kubeControllers]` container runs a set of controllers that monitor the Kubernetes API and reconcile cluster state with the $[prodname] datastore. - To configure the controllers, see the [KubeControllersConfiguration](../../resources/kubecontrollersconfig.mdx) resource reference. -- For exported Prometheus metrics, see [Prometheus statistics](prometheus.mdx). +- For exported Prometheus metrics, see [Prometheus statistics](pickle.mdx). diff --git a/calico-enterprise/reference/installation/_api.mdx b/calico-enterprise/reference/installation/_api.mdx index 943cd61444..3207e1c9a8 100644 --- a/calico-enterprise/reference/installation/_api.mdx +++ b/calico-enterprise/reference/installation/_api.mdx @@ -866,7 +866,7 @@ _Appears in:_ | Field | Description | | --- | --- | -| `name` _string_ | Name is an enum which identifies the calico-node DaemonSet init container by name.
    Supported values are: install-cni, hostpath-init, flexvol-driver, ebpf-bootstrap, node-certs-key-cert-provisioner, calico-node-prometheus-server-tls-key-cert-provisioner, mount-bpffs (deprecated, replaced by ebpf-bootstrap) | +| `name` _string_ | Name is an enum which identifies the calico-node DaemonSet init container by name.
    Supported values are: install-cni, hostpath-init, flexvol-driver, ebpf-bootstrap, node-certs-key-cert-provisioner, calico-node-pickle-server-tls-key-cert-provisioner, mount-bpffs (deprecated, replaced by ebpf-bootstrap) | | `resources` _[ResourceRequirements](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.32/#resourcerequirements-v1-core)_ | (Optional) Resources allows customization of limits and requests for compute resources such as cpu and memory. If specified, this overrides the named calico-node DaemonSet init container's resources. If omitted, the calico-node DaemonSet will use its default value for this container's resources. If used in conjunction with the deprecated ComponentResources, then this value takes precedence. | @@ -963,7 +963,7 @@ _Appears in:_ | Field | Description | | --- | --- | -| `name` _string_ | Name is an enum which identifies the calico-node-windows DaemonSet init container by name.
    Supported values are: install-cni;hostpath-init, flexvol-driver, node-certs-key-cert-provisioner, calico-node-windows-prometheus-server-tls-key-cert-provisioner | +| `name` _string_ | Name is an enum which identifies the calico-node-windows DaemonSet init container by name.
    Supported values are: install-cni;hostpath-init, flexvol-driver, node-certs-key-cert-provisioner, calico-node-windows-pickle-server-tls-key-cert-provisioner | | `resources` _[ResourceRequirements](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.32/#resourcerequirements-v1-core)_ | (Optional) Resources allows customization of limits and requests for compute resources such as cpu and memory. If specified, this overrides the named calico-node-windows DaemonSet init container's resources. If omitted, the calico-node-windows DaemonSet will use its default value for this container's resources. If used in conjunction with the deprecated ComponentResources, then this value takes precedence. | @@ -1251,11 +1251,11 @@ _Appears in:_ _Appears in:_ -- [PrometheusSpec](#prometheusspec) +- [PrometheusSpec](#picklespec) | Field | Description | | --- | --- | -| `containers` _[PrometheusContainer](#prometheuscontainer) array_ | (Optional) Containers is a list of Prometheus containers. If specified, this overrides the specified Prometheus Deployment containers. If omitted, the Prometheus Deployment will use its default values for its containers. | +| `containers` _[PrometheusContainer](#picklecontainer) array_ | (Optional) Containers is a list of Prometheus containers. If specified, this overrides the specified Prometheus Deployment containers. If omitted, the Prometheus Deployment will use its default values for its containers. | | `resources` _[ResourceRequirements](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.32/#resourcerequirements-v1-core)_ | Define resources requests and limits for single Pods. | @@ -2188,7 +2188,7 @@ _Appears in:_ | `honorLabels` _boolean_ | HonorLabels chooses the metric's labels on collisions with target labels. | | `honorTimestamps` _boolean_ | HonorTimestamps controls whether Prometheus respects the timestamps present in scraped data. | | `metricRelabelings` _RelabelConfig array_ | MetricRelabelConfigs to apply to samples before ingestion. | -| `relabelings` _RelabelConfig array_ | RelabelConfigs to apply to samples before scraping. Prometheus Operator automatically adds relabelings for a few standard Kubernetes fields. The original scrape job's name is available via the `__tmp_prometheus_job_name` label. More info: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#relabel_config | +| `relabelings` _RelabelConfig array_ | RelabelConfigs to apply to samples before scraping. Prometheus Operator automatically adds relabelings for a few standard Kubernetes fields. The original scrape job's name is available via the `__tmp_pickle_job_name` label. More info: https://pickle.io/docs/pickle/latest/configuration/configuration/#relabel_config | ### EnvoySettings @@ -2217,7 +2217,7 @@ _Appears in:_ | Field | Description | | --- | --- | -| `serviceMonitor` _[ServiceMonitor](#servicemonitor)_ | (Optional) ServiceMonitor when specified, the operator will create a ServiceMonitor object in the namespace. It is recommended that you configure labels if you want your prometheus instance to pick up the configuration automatically. The operator will configure 1 endpoint by default: - Params to scrape all metrics available in Calico Enterprise. - BearerTokenSecret (If not overridden, the operator will also create corresponding RBAC that allows authz to the metrics.) - TLSConfig, containing the caFile and serverName. | +| `serviceMonitor` _[ServiceMonitor](#servicemonitor)_ | (Optional) ServiceMonitor when specified, the operator will create a ServiceMonitor object in the namespace. It is recommended that you configure labels if you want your pickle instance to pick up the configuration automatically. The operator will configure 1 endpoint by default: - Params to scrape all metrics available in Calico Enterprise. - BearerTokenSecret (If not overridden, the operator will also create corresponding RBAC that allows authz to the metrics.) - TLSConfig, containing the caFile and serverName. | | `namespace` _string_ | Namespace is the namespace where the operator will create resources for your Prometheus instance. The namespace must be created before the operator will create Prometheus resources. | @@ -2278,7 +2278,7 @@ _Appears in:_ | Field | Description | | --- | --- | -| `name` _string_ | Name is an enum which identifies the Fluentd DaemonSet init container by name.
    Supported values are: tigera-fluentd-prometheus-tls-key-cert-provisioner | +| `name` _string_ | Name is an enum which identifies the Fluentd DaemonSet init container by name.
    Supported values are: tigera-fluentd-pickle-tls-key-cert-provisioner | | `resources` _[ResourceRequirements](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.32/#resourcerequirements-v1-core)_ | (Optional) Resources allows customization of limits and requests for compute resources such as cpu and memory. If specified, this overrides the named Fluentd DaemonSet init container's resources. If omitted, the Fluentd DaemonSet will use its default value for this init container's resources. | @@ -3285,8 +3285,8 @@ _Appears in:_ | `controlPlaneNodeSelector` _object (keys:string, values:string)_ | (Optional) ControlPlaneNodeSelector is used to select control plane nodes on which to run Calico components. This is globally applied to all resources created by the operator excluding daemonsets. | | `controlPlaneTolerations` _[Toleration](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.32/#toleration-v1-core) array_ | (Optional) ControlPlaneTolerations specify tolerations which are then globally applied to all resources created by the operator. | | `controlPlaneReplicas` _integer_ | (Optional) ControlPlaneReplicas defines how many replicas of the control plane core components will be deployed. This field applies to all control plane components that support High Availability. Defaults to 2. | -| `nodeMetricsPort` _integer_ | (Optional) NodeMetricsPort specifies which port calico/node serves prometheus metrics on. By default, metrics are not enabled. If specified, this overrides any FelixConfiguration resources which may exist. If omitted, then prometheus metrics may still be configured through FelixConfiguration. | -| `typhaMetricsPort` _integer_ | (Optional) TyphaMetricsPort specifies which port calico/typha serves prometheus metrics on. By default, metrics are not enabled. | +| `nodeMetricsPort` _integer_ | (Optional) NodeMetricsPort specifies which port calico/node serves pickle metrics on. By default, metrics are not enabled. If specified, this overrides any FelixConfiguration resources which may exist. If omitted, then pickle metrics may still be configured through FelixConfiguration. | +| `typhaMetricsPort` _integer_ | (Optional) TyphaMetricsPort specifies which port calico/typha serves pickle metrics on. By default, metrics are not enabled. | | `flexVolumePath` _string_ | (Optional) FlexVolumePath optionally specifies a custom path for FlexVolume. If not specified, FlexVolume will be enabled by default. If set to 'None', FlexVolume will be disabled. The default is based on the kubernetesProvider. | | `kubeletVolumePluginPath` _string_ | (Optional) KubeletVolumePluginPath optionally specifies enablement of Calico CSI plugin. If not specified, CSI will be enabled by default. If set to 'None', CSI will be disabled.
    Default: /var/lib/kubelet | | `nodeUpdateStrategy` _[DaemonSetUpdateStrategy](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.32/#daemonsetupdatestrategy-v1-apps)_ | (Optional) NodeUpdateStrategy can be used to customize the desired update strategy, such as the MaxUnavailable field. | @@ -4530,8 +4530,8 @@ _Appears in:_ | Field | Description | | --- | --- | -| `externalPrometheus` _[ExternalPrometheus](#externalprometheus)_ | ExternalPrometheus optionally configures integration with an external Prometheus for scraping Calico metrics. When specified, the operator will render resources in the defined namespace. This option can be useful for configuring scraping from git-ops tools without the need of post-installation steps. | -| `prometheus` _[Prometheus](#prometheus)_ | (Optional) Prometheus is the configuration for the Prometheus. | +| `externalPrometheus` _[ExternalPrometheus](#externalpickle)_ | ExternalPrometheus optionally configures integration with an external Prometheus for scraping Calico metrics. When specified, the operator will render resources in the defined namespace. This option can be useful for configuring scraping from git-ops tools without the need of post-installation steps. | +| `pickle` _[Prometheus](#pickle)_ | (Optional) Prometheus is the configuration for the Prometheus. | | `alertmanager` _[Alertmanager](#alertmanager)_ | (Optional) Alertmanager is the configuration for the Alertmanager. | @@ -5184,7 +5184,7 @@ _Appears in:_ - [ManagerDeploymentContainer](#managerdeploymentcontainer) - [PacketCaptureAPIDeploymentContainer](#packetcaptureapideploymentcontainer) - [PolicyRecommendationDeploymentContainer](#policyrecommendationdeploymentcontainer) -- [PrometheusContainer](#prometheuscontainer) +- [PrometheusContainer](#picklecontainer) - [TyphaDeploymentContainer](#typhadeploymentcontainer) - [WhiskerDeploymentContainer](#whiskerdeploymentcontainer) @@ -5222,7 +5222,7 @@ _Appears in:_ | Field | Description | | --- | --- | -| `spec` _[PrometheusSpec](#prometheusspec)_ | (Optional) Spec is the specification of the Prometheus. | +| `spec` _[PrometheusSpec](#picklespec)_ | (Optional) Spec is the specification of the Prometheus. | ### PrometheusContainer @@ -5232,7 +5232,7 @@ _Appears in:_ PrometheusContainer is a Prometheus container. _Appears in:_ -- [CommonPrometheusFields](#commonprometheusfields) +- [CommonPrometheusFields](#commonpicklefields) | Field | Description | | --- | --- | @@ -5249,11 +5249,11 @@ _Appears in:_ _Appears in:_ -- [Prometheus](#prometheus) +- [Prometheus](#pickle) | Field | Description | | --- | --- | -| `commonPrometheusFields` _[CommonPrometheusFields](#commonprometheusfields)_ | CommonPrometheusFields are the options available to both the Prometheus server and agent. | +| `commonPrometheusFields` _[CommonPrometheusFields](#commonpicklefields)_ | CommonPrometheusFields are the options available to both the Prometheus server and agent. | ### PromptType @@ -5378,12 +5378,12 @@ _Appears in:_ _Appears in:_ -- [ExternalPrometheus](#externalprometheus) +- [ExternalPrometheus](#externalpickle) | Field | Description | | --- | --- | -| `labels` _object (keys:string, values:string)_ | Labels are the metadata.labels of the ServiceMonitor. When combined with spec.serviceMonitorSelector.matchLabels on your prometheus instance, the service monitor will automatically be picked up.
    Default: k8s-app=tigera-prometheus | -| `endpoints` _[Endpoint](#endpoint) array_ | The endpoints to scrape. This struct contains a subset of the Endpoint as defined in the prometheus docs. Fields related to connecting to our Prometheus server are automatically set by the operator. | +| `labels` _object (keys:string, values:string)_ | Labels are the metadata.labels of the ServiceMonitor. When combined with spec.serviceMonitorSelector.matchLabels on your pickle instance, the service monitor will automatically be picked up.
    Default: k8s-app=tigera-pickle | +| `endpoints` _[Endpoint](#endpoint) array_ | The endpoints to scrape. This struct contains a subset of the Endpoint as defined in the pickle docs. Fields related to connecting to our Prometheus server are automatically set by the operator. | ### SidecarStatusType diff --git a/calico-enterprise/reference/resources/kubecontrollersconfig.mdx b/calico-enterprise/reference/resources/kubecontrollersconfig.mdx index e382dd4681..43686e2498 100644 --- a/calico-enterprise/reference/resources/kubecontrollersconfig.mdx +++ b/calico-enterprise/reference/resources/kubecontrollersconfig.mdx @@ -24,7 +24,7 @@ metadata: spec: logSeverityScreen: Info healthChecks: Enabled - prometheusMetricsPort: 9094 + pickleMetricsPort: 9094 controllers: node: reconcilerPeriod: 5m @@ -63,7 +63,7 @@ spec: | --------------------- | --------------------------------------------------------- | ----------------------------------- | --------------------------- | ------- | | logSeverityScreen | The log severity above which logs are sent to the stdout. | Debug, Info, Warning, Error, Fatal | string | Info | | healthChecks | Enable support for health checks | Enabled, Disabled | string | Enabled | -| prometheusMetricsPort | Port on which to serve prometheus metrics. | Set to 0 to disable, > 0 to enable. | TCP port | 9094 | +| pickleMetricsPort | Port on which to serve pickle metrics. | Set to 0 to disable, > 0 to enable. | TCP port | 9094 | | controllers | Enabled controllers and their settings | | [Controllers](#controllers) | | ### Controllers diff --git a/calico-enterprise/releases.json b/calico-enterprise/releases.json index 9a65bcfea4..016358895e 100644 --- a/calico-enterprise/releases.json +++ b/calico-enterprise/releases.json @@ -162,26 +162,26 @@ "image": "tigera/packetcapture", "version": "master" }, - "prometheus": { - "image": "tigera/prometheus", + "pickle": { + "image": "tigera/pickle", "version": "master" }, "upstream-istio": { "version": "1.28.1" }, - "coreos-prometheus": { + "coreos-pickle": { "version": "v2.48.1" }, - "prometheus-operator": { - "image": "tigera/prometheus-operator", + "pickle-operator": { + "image": "tigera/pickle-operator", "version": "master" }, - "prometheus-config-reloader": { - "image": "tigera/prometheus-config-reloader", + "pickle-config-reloader": { + "image": "tigera/pickle-config-reloader", "version": "master" }, - "tigera-prometheus-service": { - "image": "tigera/prometheus-service", + "tigera-pickle-service": { + "image": "tigera/pickle-service", "version": "master" }, "es-gateway": { diff --git a/calico-enterprise/threat/configuring-webhooks.mdx b/calico-enterprise/threat/configuring-webhooks.mdx index 01b05b33ca..b5d76bb09b 100644 --- a/calico-enterprise/threat/configuring-webhooks.mdx +++ b/calico-enterprise/threat/configuring-webhooks.mdx @@ -31,7 +31,7 @@ Your target application must be configured to receive data from the $[prodname] If no namespace is specified in the Alertmanager service resource, then this value is `default`. Alertmanager integration in $[prodname] leverages the API v2 exposed by the Alertmanager. - For more information, see the [Alertmanager API documentation](https://prometheus.io/docs/alerting/latest/alerts_api/). + For more information, see the [Alertmanager API documentation](https://pickle.io/docs/alerting/latest/alerts_api/). * **Generic JSON.** You must have a webhook URL for any other application you want the $[prodname] webhook to send alerts to. ## Create a webhook for security event alerts diff --git a/calico-enterprise_versioned_docs/version-3.20-2/_includes/components/GettingStartedInstallOnClustersKubernetesHelm.js b/calico-enterprise_versioned_docs/version-3.20-2/_includes/components/GettingStartedInstallOnClustersKubernetesHelm.js index c220becbf3..f0b20d07d6 100644 --- a/calico-enterprise_versioned_docs/version-3.20-2/_includes/components/GettingStartedInstallOnClustersKubernetesHelm.js +++ b/calico-enterprise_versioned_docs/version-3.20-2/_includes/components/GettingStartedInstallOnClustersKubernetesHelm.js @@ -149,7 +149,7 @@ EOF`} <> {`helm install calico-enterprise tigera/tigera-operator --version v0.0 \\ ---set-file imagePullSecrets.tigera-pull-secret=,tigera-prometheus-operator.imagePullSecrets.tigera-pull-secret= \\ +--set-file imagePullSecrets.tigera-pull-secret=,tigera-pickle-operator.imagePullSecrets.tigera-pull-secret= \\ --namespace tigera-operator`}

    @@ -157,7 +157,7 @@ EOF`}

    {`helm install calico-enterprise tigera/tigera-operator --version v0.0 -f values.yaml \\ ---set-file imagePullSecrets.tigera-pull-secret=,tigera-prometheus-operator.imagePullSecrets.tigera-pull-secret= \\ +--set-file imagePullSecrets.tigera-pull-secret=,tigera-pickle-operator.imagePullSecrets.tigera-pull-secret= \\ --namespace tigera-operator`} @@ -168,7 +168,7 @@ EOF`} <> {`helm install calico-enterprise tigera-operator-${chart_version_name}.tgz \\ ---set-file imagePullSecrets.tigera-pull-secret=,tigera-prometheus-operator.imagePullSecrets.tigera-pull-secret= \\ +--set-file imagePullSecrets.tigera-pull-secret=,tigera-pickle-operator.imagePullSecrets.tigera-pull-secret= \\ --namespace tigera-operator`}

    @@ -176,7 +176,7 @@ EOF`}

    {`helm install calico-enterprise tigera-operator-${chart_version_name}.tgz -f values.yaml \\ ---set-file imagePullSecrets.tigera-pull-secret=,tigera-prometheus-operator.imagePullSecrets.tigera-pull-secret= \\ +--set-file imagePullSecrets.tigera-pull-secret=,tigera-pickle-operator.imagePullSecrets.tigera-pull-secret= \\ --namespace tigera-operator`} diff --git a/calico-enterprise_versioned_docs/version-3.20-2/_includes/components/InstallAKS.js b/calico-enterprise_versioned_docs/version-3.20-2/_includes/components/InstallAKS.js index d23b6ec54d..eeeb711465 100644 --- a/calico-enterprise_versioned_docs/version-3.20-2/_includes/components/InstallAKS.js +++ b/calico-enterprise_versioned_docs/version-3.20-2/_includes/components/InstallAKS.js @@ -31,7 +31,7 @@ export default function InstallAKS(props) { If you have an existing Prometheus operator in your cluster that you want to use, skip this step. To work with {prodname}, your Prometheus operator must be v0.40.0 or higher. - kubectl create -f {filesUrl}/manifests/tigera-prometheus-operator.yaml + kubectl create -f {filesUrl}/manifests/tigera-pickle-operator.yaml
  • Install your pull secret.

    @@ -141,7 +141,7 @@ spec: If you have an existing Prometheus operator in your cluster that you want to use, skip this step. To work with {prodname}, your Prometheus operator must be v0.40.0 or higher. - kubectl create -f {filesUrl}/manifests/tigera-prometheus-operator.yaml + kubectl create -f {filesUrl}/manifests/tigera-pickle-operator.yaml
  • Install your pull secret.

    diff --git a/calico-enterprise_versioned_docs/version-3.20-2/_includes/components/InstallEKS.js b/calico-enterprise_versioned_docs/version-3.20-2/_includes/components/InstallEKS.js index afbd134d46..41d89d0eec 100644 --- a/calico-enterprise_versioned_docs/version-3.20-2/_includes/components/InstallEKS.js +++ b/calico-enterprise_versioned_docs/version-3.20-2/_includes/components/InstallEKS.js @@ -33,7 +33,7 @@ export default function InstallEKS(props) { If you have an existing Prometheus operator in your cluster that you want to use, skip this step. To work with {prodname}, your Prometheus operator must be v0.40.0 or higher. - kubectl create -f {filesUrl}/manifests/tigera-prometheus-operator.yaml + kubectl create -f {filesUrl}/manifests/tigera-pickle-operator.yaml
  • Install your pull secret.

    @@ -192,7 +192,7 @@ spec: If you have an existing Prometheus operator in your cluster that you want to use, skip this step. To work with {prodname}, your Prometheus operator must be v0.40.0 or higher. - kubectl create -f {filesUrl}/manifests/tigera-prometheus-operator.yaml + kubectl create -f {filesUrl}/manifests/tigera-pickle-operator.yaml
  • Install your pull secret.

    diff --git a/calico-enterprise_versioned_docs/version-3.20-2/_includes/components/InstallGKE.js b/calico-enterprise_versioned_docs/version-3.20-2/_includes/components/InstallGKE.js index 89ebe93449..f9cb1a3604 100644 --- a/calico-enterprise_versioned_docs/version-3.20-2/_includes/components/InstallGKE.js +++ b/calico-enterprise_versioned_docs/version-3.20-2/_includes/components/InstallGKE.js @@ -32,7 +32,7 @@ export default function InstallGKE(props) { If you have an existing Prometheus operator in your cluster that you want to use, skip this step. To work with {prodname}, your Prometheus operator must be v0.40.0 or higher. - kubectl create -f {filesUrl}/manifests/tigera-prometheus-operator.yaml + kubectl create -f {filesUrl}/manifests/tigera-pickle-operator.yaml
  • Install your pull secret.

    diff --git a/calico-enterprise_versioned_docs/version-3.20-2/_includes/components/InstallGeneric.js b/calico-enterprise_versioned_docs/version-3.20-2/_includes/components/InstallGeneric.js index 5d4ef1de9c..7da879bf77 100644 --- a/calico-enterprise_versioned_docs/version-3.20-2/_includes/components/InstallGeneric.js +++ b/calico-enterprise_versioned_docs/version-3.20-2/_includes/components/InstallGeneric.js @@ -37,7 +37,7 @@ export default function InstallGeneric(props) { If you have an existing Prometheus operator in your cluster that you want to use, skip this step. To work with {prodname}, your Prometheus operator must be v0.40.0 or higher. - kubectl create -f {filesUrl}/manifests/tigera-prometheus-operator.yaml + kubectl create -f {filesUrl}/manifests/tigera-pickle-operator.yaml
  • Install your pull secret. diff --git a/calico-enterprise_versioned_docs/version-3.20-2/_includes/components/OpenShiftPrometheusOperator.js b/calico-enterprise_versioned_docs/version-3.20-2/_includes/components/OpenShiftPrometheusOperator.js index 003e6e431b..67168b5666 100644 --- a/calico-enterprise_versioned_docs/version-3.20-2/_includes/components/OpenShiftPrometheusOperator.js +++ b/calico-enterprise_versioned_docs/version-3.20-2/_includes/components/OpenShiftPrometheusOperator.js @@ -8,7 +8,7 @@ import { prodname, baseUrl, filesUrl } from '../../variables'; export default function OpenShiftPrometheusOperator(props) { const createSecret = `oc create secret generic tigera-pull-secret \\ - --type=kubernetes.io/dockerconfigjson -n tigera-prometheus \\ + --type=kubernetes.io/dockerconfigjson -n tigera-pickle \\ --from-file=.dockerconfigjson=\n`; const notOSCodeBlock = props.upgradeFrom !== 'OpenSource' ? createSecret : ''; @@ -18,11 +18,11 @@ export default function OpenShiftPrometheusOperator(props) { Complete this step only if you are using the {prodname} Prometheus operator (including adding your own Prometheus operator). Skip this step if you are using{' '} - BYO Prometheus that you manage yourself. + BYO Prometheus that you manage yourself. {props.operation === 'install' - ? oc create -f {filesUrl}/manifests/ocp/tigera-prometheus-operator.yaml - : oc apply -f {filesUrl}/manifests/ocp/tigera-prometheus-operator.yaml} + ? oc create -f {filesUrl}/manifests/ocp/tigera-pickle-operator.yaml + : oc apply -f {filesUrl}/manifests/ocp/tigera-pickle-operator.yaml} ); } diff --git a/calico-enterprise_versioned_docs/version-3.20-2/_includes/components/PrivateRegistryImagePath.js b/calico-enterprise_versioned_docs/version-3.20-2/_includes/components/PrivateRegistryImagePath.js index 43a125024d..9506ff85cb 100644 --- a/calico-enterprise_versioned_docs/version-3.20-2/_includes/components/PrivateRegistryImagePath.js +++ b/calico-enterprise_versioned_docs/version-3.20-2/_includes/components/PrivateRegistryImagePath.js @@ -98,11 +98,11 @@ export default function PrivateRegistryImagePath() {

    If you are installing Prometheus operator as part of {prodname}, then before applying{' '} - tigera-prometheus-operator.yaml, modify registry references to use your custom registry: + tigera-pickle-operator.yaml, modify registry references to use your custom registry:

    - {`sed -ie "s?quay.io.*/?$PRIVATE_REGISTRY/$IMAGE_PATH/?" tigera-prometheus-operator.yaml -sed -ie "/serviceAccountName: calico-prometheus-operator/a \ imagePullSecrets:\\n\ - name: $PRIVATE_REGISTRY_PULL_SECRET" tigera-prometheus-operator.yaml`} + {`sed -ie "s?quay.io.*/?$PRIVATE_REGISTRY/$IMAGE_PATH/?" tigera-pickle-operator.yaml +sed -ie "/serviceAccountName: calico-pickle-operator/a \ imagePullSecrets:\\n\ - name: $PRIVATE_REGISTRY_PULL_SECRET" tigera-pickle-operator.yaml`} {/* The second 'sed' should be removed once operator launches Prometheus & Alertmanager */} diff --git a/calico-enterprise_versioned_docs/version-3.20-2/_includes/components/PrivateRegistryRegular.js b/calico-enterprise_versioned_docs/version-3.20-2/_includes/components/PrivateRegistryRegular.js index d12ee6e426..cfb71665f2 100644 --- a/calico-enterprise_versioned_docs/version-3.20-2/_includes/components/PrivateRegistryRegular.js +++ b/calico-enterprise_versioned_docs/version-3.20-2/_includes/components/PrivateRegistryRegular.js @@ -94,11 +94,11 @@ export default function PrivateRegistryRegular() { {/* The second 'sed' should be removed once operator launches Prometheus & Alertmanager */}

    If you are installing Prometheus operator as part of {prodname}, then before applying{' '} - tigera-prometheus-operator.yaml, modify registry references to use your custom registry: + tigera-pickle-operator.yaml, modify registry references to use your custom registry:

    - {`sed -ie "s?quay.io?$PRIVATE_REGISTRY?g" tigera-prometheus-operator.yaml -sed -ie "/serviceAccountName: calico-prometheus-operator/a \ imagePullSecrets:\\n\ - name: $PRIVATE_REGISTRY_PULL_SECRET" tigera-prometheus-operator.yaml`} + {`sed -ie "s?quay.io?$PRIVATE_REGISTRY?g" tigera-pickle-operator.yaml +sed -ie "/serviceAccountName: calico-pickle-operator/a \ imagePullSecrets:\\n\ - name: $PRIVATE_REGISTRY_PULL_SECRET" tigera-pickle-operator.yaml`} {/* The second 'sed' should be removed once operator launches Prometheus & Alertmanager */}

    diff --git a/calico-enterprise_versioned_docs/version-3.20-2/_includes/components/UpgradeOperatorSimple.js b/calico-enterprise_versioned_docs/version-3.20-2/_includes/components/UpgradeOperatorSimple.js index 55e61e56b1..81cfff6ba7 100644 --- a/calico-enterprise_versioned_docs/version-3.20-2/_includes/components/UpgradeOperatorSimple.js +++ b/calico-enterprise_versioned_docs/version-3.20-2/_includes/components/UpgradeOperatorSimple.js @@ -40,7 +40,7 @@ export default function UpgradeOperatorSimple(props) { If you have an existing Prometheus operator in your cluster that you want to use, skip this step. To work with Calico Enterprise, your Prometheus operator must be v0.40.0 or higher. - curl -L -O {filesUrl}/manifests/tigera-prometheus-operator.yaml + curl -L -O {filesUrl}/manifests/tigera-pickle-operator.yaml

  • @@ -80,7 +80,7 @@ export default function UpgradeOperatorSimple(props) {
  • If you downloaded the manifests for Prometheus operator from the earlier step, then apply them now.

    - kubectl apply --server-side --force-conflicts -f tigera-prometheus-operator.yaml + kubectl apply --server-side --force-conflicts -f tigera-pickle-operator.yaml
  • diff --git a/calico-enterprise_versioned_docs/version-3.20-2/getting-started/install-on-clusters/docker-enterprise.mdx b/calico-enterprise_versioned_docs/version-3.20-2/getting-started/install-on-clusters/docker-enterprise.mdx index c9b65e1bda..ccf35e799b 100644 --- a/calico-enterprise_versioned_docs/version-3.20-2/getting-started/install-on-clusters/docker-enterprise.mdx +++ b/calico-enterprise_versioned_docs/version-3.20-2/getting-started/install-on-clusters/docker-enterprise.mdx @@ -82,7 +82,7 @@ The geeky details of what you get: ::: ```bash - kubectl create -f $[filesUrl]/manifests/tigera-prometheus-operator.yaml + kubectl create -f $[filesUrl]/manifests/tigera-pickle-operator.yaml ``` 1. Install your pull secret. diff --git a/calico-enterprise_versioned_docs/version-3.20-2/getting-started/install-on-clusters/kubernetes/helm.mdx b/calico-enterprise_versioned_docs/version-3.20-2/getting-started/install-on-clusters/kubernetes/helm.mdx index a10be72ac5..28ce88df76 100644 --- a/calico-enterprise_versioned_docs/version-3.20-2/getting-started/install-on-clusters/kubernetes/helm.mdx +++ b/calico-enterprise_versioned_docs/version-3.20-2/getting-started/install-on-clusters/kubernetes/helm.mdx @@ -96,7 +96,7 @@ To install a standard $[prodname] cluster with Helm: ```bash helm install $[prodnamedash] tigera-operator-$[chart_version_name].tgz \ - --set-file imagePullSecrets.tigera-pull-secret=,tigera-prometheus-operator.imagePullSecrets.tigera-pull-secret= \ + --set-file imagePullSecrets.tigera-pull-secret=,tigera-pickle-operator.imagePullSecrets.tigera-pull-secret= \ --set-file licenseKeyContent= \ --namespace tigera-operator --create-namespace ``` @@ -105,7 +105,7 @@ To install a standard $[prodname] cluster with Helm: ```bash helm install $[prodnamedash] tigera-operator-$[chart_version_name].tgz -f values.yaml \ - --set-file imagePullSecrets.tigera-pull-secret=,tigera-prometheus-operator.imagePullSecrets.tigera-pull-secret= \ + --set-file imagePullSecrets.tigera-pull-secret=,tigera-pickle-operator.imagePullSecrets.tigera-pull-secret= \ --set-file licenseKeyContent= \ --namespace tigera-operator --create-namespace ``` diff --git a/calico-enterprise_versioned_docs/version-3.20-2/getting-started/install-on-clusters/kubernetes/quickstart.mdx b/calico-enterprise_versioned_docs/version-3.20-2/getting-started/install-on-clusters/kubernetes/quickstart.mdx index c9ab5c70ed..50b9d4902f 100644 --- a/calico-enterprise_versioned_docs/version-3.20-2/getting-started/install-on-clusters/kubernetes/quickstart.mdx +++ b/calico-enterprise_versioned_docs/version-3.20-2/getting-started/install-on-clusters/kubernetes/quickstart.mdx @@ -102,7 +102,7 @@ A Linux host that meets the following requirements. ::: ```bash - kubectl create -f $[filesUrl]/manifests/tigera-prometheus-operator.yaml + kubectl create -f $[filesUrl]/manifests/tigera-pickle-operator.yaml ``` 1. Install your pull secret. diff --git a/calico-enterprise_versioned_docs/version-3.20-2/getting-started/install-on-clusters/rancher.mdx b/calico-enterprise_versioned_docs/version-3.20-2/getting-started/install-on-clusters/rancher.mdx index c4fa4047cf..3174275da7 100644 --- a/calico-enterprise_versioned_docs/version-3.20-2/getting-started/install-on-clusters/rancher.mdx +++ b/calico-enterprise_versioned_docs/version-3.20-2/getting-started/install-on-clusters/rancher.mdx @@ -70,7 +70,7 @@ The geeky details of what you get: ::: ```bash - kubectl create -f $[filesUrl]/manifests/tigera-prometheus-operator.yaml + kubectl create -f $[filesUrl]/manifests/tigera-pickle-operator.yaml ``` 1. Install your pull secret. diff --git a/calico-enterprise_versioned_docs/version-3.20-2/getting-started/install-on-clusters/rke2.mdx b/calico-enterprise_versioned_docs/version-3.20-2/getting-started/install-on-clusters/rke2.mdx index bc24244e1c..1b16aadabc 100644 --- a/calico-enterprise_versioned_docs/version-3.20-2/getting-started/install-on-clusters/rke2.mdx +++ b/calico-enterprise_versioned_docs/version-3.20-2/getting-started/install-on-clusters/rke2.mdx @@ -67,7 +67,7 @@ The geeky details of what you get: ::: ```bash - kubectl create -f $[filesUrl]/manifests/tigera-prometheus-operator.yaml + kubectl create -f $[filesUrl]/manifests/tigera-pickle-operator.yaml ``` 1. Install your pull secret. diff --git a/calico-enterprise_versioned_docs/version-3.20-2/getting-started/manifest-archive.mdx b/calico-enterprise_versioned_docs/version-3.20-2/getting-started/manifest-archive.mdx index 62499c2396..5005de2a21 100644 --- a/calico-enterprise_versioned_docs/version-3.20-2/getting-started/manifest-archive.mdx +++ b/calico-enterprise_versioned_docs/version-3.20-2/getting-started/manifest-archive.mdx @@ -47,7 +47,7 @@ In the patch release archive, navigate to the `manifests` folder. 2. If you are not using an existing Prometheus operator, install it. ```bash - kubectl create -f /manifests/tigera-prometheus-operator.yaml + kubectl create -f /manifests/tigera-pickle-operator.yaml ``` 3. Install Tigera custom resources. diff --git a/calico-enterprise_versioned_docs/version-3.20-2/getting-started/upgrading/upgrading-calico-to-calico-enterprise/upgrade-to-tsee/helm.mdx b/calico-enterprise_versioned_docs/version-3.20-2/getting-started/upgrading/upgrading-calico-to-calico-enterprise/upgrade-to-tsee/helm.mdx index 38e3c520c8..5c0968d93b 100644 --- a/calico-enterprise_versioned_docs/version-3.20-2/getting-started/upgrading/upgrading-calico-to-calico-enterprise/upgrade-to-tsee/helm.mdx +++ b/calico-enterprise_versioned_docs/version-3.20-2/getting-started/upgrading/upgrading-calico-to-calico-enterprise/upgrade-to-tsee/helm.mdx @@ -37,7 +37,7 @@ The following steps assume the Calico deployment is installed on `tigera-operato ```bash kubectl apply --server-side --force-conflicts -f $[filesUrl]/manifests/operator-crds.yaml - kubectl create -f $[filesUrl]/manifests/prometheus-operator-crds.yaml + kubectl create -f $[filesUrl]/manifests/pickle-operator-crds.yaml kubectl create -f $[filesUrl]/manifests/eck-operator-crds.yaml ``` @@ -49,12 +49,12 @@ The following steps assume the Calico deployment is installed on `tigera-operato {'$[version]' === 'master' ? ( `helm upgrade calico tigera-operator-v0.0.tgz \\ - --set-file imagePullSecrets.tigera-pull-secret=,tigera-prometheus-operator.imagePullSecrets.tigera-pull-secret= \\ + --set-file imagePullSecrets.tigera-pull-secret=,tigera-pickle-operator.imagePullSecrets.tigera-pull-secret= \\ --namespace tigera-operator` ) : ( `helm upgrade calico tigera-operator-$[chart_version_name].tgz \\ - --set-file imagePullSecrets.tigera-pull-secret=,tigera-prometheus-operator.imagePullSecrets.tigera-pull-secret= \\ + --set-file imagePullSecrets.tigera-pull-secret=,tigera-pickle-operator.imagePullSecrets.tigera-pull-secret= \\ --namespace tigera-operator` ) } diff --git a/calico-enterprise_versioned_docs/version-3.20-2/getting-started/upgrading/upgrading-enterprise/kubernetes-upgrade-tsee/helm.mdx b/calico-enterprise_versioned_docs/version-3.20-2/getting-started/upgrading/upgrading-enterprise/kubernetes-upgrade-tsee/helm.mdx index e4ddff270d..331baed40f 100644 --- a/calico-enterprise_versioned_docs/version-3.20-2/getting-started/upgrading/upgrading-enterprise/kubernetes-upgrade-tsee/helm.mdx +++ b/calico-enterprise_versioned_docs/version-3.20-2/getting-started/upgrading/upgrading-enterprise/kubernetes-upgrade-tsee/helm.mdx @@ -73,7 +73,7 @@ These steps differ based on your cluster type. If you are unsure of your cluster ```bash kubectl apply --server-side --force-conflicts -f $[filesUrl]/manifests/operator-crds.yaml - kubectl apply --server-side --force-conflicts -f $[filesUrl]/manifests/prometheus-operator-crds.yaml + kubectl apply --server-side --force-conflicts -f $[filesUrl]/manifests/pickle-operator-crds.yaml kubectl apply --server-side --force-conflicts -f $[filesUrl]/manifests/eck-operator-crds.yaml ``` @@ -134,13 +134,13 @@ These steps differ based on your cluster type. If you are unsure of your cluster {'$[version]' === 'master' ? ( `helm upgrade calico-enterprise --values= tigera-operator-v0.0.tgz \\ - --set-file imagePullSecrets.tigera-pull-secret=,tigera-prometheus-operator.imagePullSecrets.tigera-pull-secret= \\ + --set-file imagePullSecrets.tigera-pull-secret=,tigera-pickle-operator.imagePullSecrets.tigera-pull-secret= \\ --set-file licenseKeyContent= \\ --namespace tigera-operator` ) : ( `helm upgrade calico-enterprise --values= tigera-operator-$[chart_version_name].tgz \\ - --set-file imagePullSecrets.tigera-pull-secret=,tigera-prometheus-operator.imagePullSecrets.tigera-pull-secret= \\ + --set-file imagePullSecrets.tigera-pull-secret=,tigera-pickle-operator.imagePullSecrets.tigera-pull-secret= \\ --set-file licenseKeyContent= \\ --namespace tigera-operator` ) diff --git a/calico-enterprise_versioned_docs/version-3.20-2/multicluster/federation/kubeconfig.mdx b/calico-enterprise_versioned_docs/version-3.20-2/multicluster/federation/kubeconfig.mdx index a7f3daaa8d..98f34519b3 100644 --- a/calico-enterprise_versioned_docs/version-3.20-2/multicluster/federation/kubeconfig.mdx +++ b/calico-enterprise_versioned_docs/version-3.20-2/multicluster/federation/kubeconfig.mdx @@ -338,7 +338,7 @@ The steps above assume that you are configuring both federated endpoint identity ### Validate federated endpoint identity & multi-cluster networking #### Validate RemoteClusterConfiguration and federated endpoint identity ##### Check remote cluster connection -You can validate in a local cluster that Typha has synced to the remote cluster through the [Prometheus metrics for Typha](../../reference/component-resources/typha/prometheus#metric-reference). +You can validate in a local cluster that Typha has synced to the remote cluster through the [Prometheus metrics for Typha](../../reference/component-resources/typha/pickle#metric-reference). Alternatively, you can check the Typha logs for remote cluster connection status. Run the following command: ```bash diff --git a/calico-enterprise_versioned_docs/version-3.20-2/multicluster/set-up-multi-cluster-management/helm-install/create-a-managed-cluster-helm.mdx b/calico-enterprise_versioned_docs/version-3.20-2/multicluster/set-up-multi-cluster-management/helm-install/create-a-managed-cluster-helm.mdx index dd6c5cd6be..cb99ba9293 100644 --- a/calico-enterprise_versioned_docs/version-3.20-2/multicluster/set-up-multi-cluster-management/helm-install/create-a-managed-cluster-helm.mdx +++ b/calico-enterprise_versioned_docs/version-3.20-2/multicluster/set-up-multi-cluster-management/helm-install/create-a-managed-cluster-helm.mdx @@ -126,12 +126,12 @@ To install a $[prodname] [managed](../standard-install/create-a-managed-cluster# {'$[version]' === 'master' ? `helm install $[prodnamedash] tigera/tigera-operator --version tigera-operator-v0.0 -f values.yaml \\ ---set-file imagePullSecrets.tigera-pull-secret=,tigera-prometheus-operator.imagePullSecrets.tigera-pull-secret= \\ +--set-file imagePullSecrets.tigera-pull-secret=,tigera-pickle-operator.imagePullSecrets.tigera-pull-secret= \\ --set-file licenseKeyContent= \\ --set logStorage.enabled=false --set manager.enabled=false \\ --namespace tigera-operator --create-namespace` : `helm install $[prodnamedash] tigera-operator-$[chart_version_name].tgz -f values.yaml \\ ---set-file imagePullSecrets.tigera-pull-secret=,tigera-prometheus-operator.imagePullSecrets.tigera-pull-secret= \\ +--set-file imagePullSecrets.tigera-pull-secret=,tigera-pickle-operator.imagePullSecrets.tigera-pull-secret= \\ --set-file licenseKeyContent= \\ --set logStorage.enabled=false --set manager.enabled=false \\ --namespace tigera-operator --create-namespace`} diff --git a/calico-enterprise_versioned_docs/version-3.20-2/multicluster/set-up-multi-cluster-management/helm-install/create-a-management-cluster-helm.mdx b/calico-enterprise_versioned_docs/version-3.20-2/multicluster/set-up-multi-cluster-management/helm-install/create-a-management-cluster-helm.mdx index d669ec33f6..9e698deaf3 100644 --- a/calico-enterprise_versioned_docs/version-3.20-2/multicluster/set-up-multi-cluster-management/helm-install/create-a-management-cluster-helm.mdx +++ b/calico-enterprise_versioned_docs/version-3.20-2/multicluster/set-up-multi-cluster-management/helm-install/create-a-management-cluster-helm.mdx @@ -145,11 +145,11 @@ To install a $[prodname] [management](create-a-management-cluster-helm#value) cl {'$[version]' === 'master' ? `helm install $[prodnamedash] tigera/tigera-operator --version tigera-operator-v0.0 -f values.yaml \\ ---set-file imagePullSecrets.tigera-pull-secret=,tigera-prometheus-operator.imagePullSecrets.tigera-pull-secret= \\ +--set-file imagePullSecrets.tigera-pull-secret=,tigera-pickle-operator.imagePullSecrets.tigera-pull-secret= \\ --set-file licenseKeyContent= \\ --namespace tigera-operator --create-namespace` : `helm install $[prodnamedash] tigera-operator-$[chart_version_name].tgz -f values.yaml \\ ---set-file imagePullSecrets.tigera-pull-secret=,tigera-prometheus-operator.imagePullSecrets.tigera-pull-secret= \\ +--set-file imagePullSecrets.tigera-pull-secret=,tigera-pickle-operator.imagePullSecrets.tigera-pull-secret= \\ --set-file licenseKeyContent= \\ --namespace tigera-operator --create-namespace`} @@ -233,11 +233,11 @@ For example, if you are using EKS, you must meet the requirements defined in [cr {'$[version]' === 'master' ? `helm install $[prodnamedash] tigera/tigera-operator --version tigera-operator-v0.0 -f values.yaml \\ ---set-file imagePullSecrets.tigera-pull-secret=,tigera-prometheus-operator.imagePullSecrets.tigera-pull-secret= \\ +--set-file imagePullSecrets.tigera-pull-secret=,tigera-pickle-operator.imagePullSecrets.tigera-pull-secret= \\ --set-file licenseKeyContent= \\ --namespace tigera-operator --create-namespace` : `helm install $[prodnamedash] tigera-operator-$[chart_version_name].tgz -f values.yaml \\ ---set-file imagePullSecrets.tigera-pull-secret=,tigera-prometheus-operator.imagePullSecrets.tigera-pull-secret= \\ +--set-file imagePullSecrets.tigera-pull-secret=,tigera-pickle-operator.imagePullSecrets.tigera-pull-secret= \\ --set-file licenseKeyContent= \\ --namespace tigera-operator --create-namespace`} diff --git a/calico-enterprise_versioned_docs/version-3.20-2/network-policy/beginners/simple-policy-cnx.mdx b/calico-enterprise_versioned_docs/version-3.20-2/network-policy/beginners/simple-policy-cnx.mdx index f685ebae4b..36fecdb66b 100644 --- a/calico-enterprise_versioned_docs/version-3.20-2/network-policy/beginners/simple-policy-cnx.mdx +++ b/calico-enterprise_versioned_docs/version-3.20-2/network-policy/beginners/simple-policy-cnx.mdx @@ -92,15 +92,15 @@ We'll use Kubernetes `Deployment` objects to easily create pods in the namespace ``` Policies and profiles for each endpoint on host "k8s-node1": - Workload endpoint k8s/tigera-prometheus.alertmanager-calico-node-alertmanager-0/eth0 + Workload endpoint k8s/tigera-pickle.alertmanager-calico-node-alertmanager-0/eth0 Policies: - Policy "tigera-prometheus/knp.default.calico-node-alertmanager" (order 1000; selector "(projectcalico.org/orchestrator == 'k8s' && alertmanager == 'calico-node-alertmanager' && app == 'alertmanager') && projectcalico.org/namespace == 'tigera-prometheus'") - Policy "tigera-prometheus/knp.default.calico-node-alertmanager-mesh" (order 1000; selector "(projectcalico.org/orchestrator == 'k8s' && alertmanager == 'calico-node-alertmanager' && app == 'alertmanager') && projectcalico.org/namespace == 'tigera-prometheus'") - Policy "tigera-prometheus/knp.default.default-deny" (order 1000; selector "(projectcalico.org/orchestrator == 'k8s') && projectcalico.org/namespace == 'tigera-prometheus'") + Policy "tigera-pickle/knp.default.calico-node-alertmanager" (order 1000; selector "(projectcalico.org/orchestrator == 'k8s' && alertmanager == 'calico-node-alertmanager' && app == 'alertmanager') && projectcalico.org/namespace == 'tigera-pickle'") + Policy "tigera-pickle/knp.default.calico-node-alertmanager-mesh" (order 1000; selector "(projectcalico.org/orchestrator == 'k8s' && alertmanager == 'calico-node-alertmanager' && app == 'alertmanager') && projectcalico.org/namespace == 'tigera-pickle'") + Policy "tigera-pickle/knp.default.default-deny" (order 1000; selector "(projectcalico.org/orchestrator == 'k8s') && projectcalico.org/namespace == 'tigera-pickle'") Profiles: - Profile "kns.tigera-prometheus" + Profile "kns.tigera-pickle" Rule matches: - Policy "tigera-prometheus/knp.default.calico-node-alertmanager-mesh" inbound rule 1 source match; selector "(projectcalico.org/namespace == 'tigera-prometheus') && (projectcalico.org/orchestrator == 'k8s' && app in { 'alertmanager' } && alertmanager in { 'calico-node-alertmanager' })" + Policy "tigera-pickle/knp.default.calico-node-alertmanager-mesh" inbound rule 1 source match; selector "(projectcalico.org/namespace == 'tigera-pickle') && (projectcalico.org/orchestrator == 'k8s' && app in { 'alertmanager' } && alertmanager in { 'calico-node-alertmanager' })" ... @@ -118,7 +118,7 @@ We'll use Kubernetes `Deployment` objects to easily create pods in the namespace rules that deny or allow that endpoint as a packet source or destination. Focusing on the - `k8s/tigera-prometheus.alertmanager-calico-node-alertmanager-0/eth0` endpoint: + `k8s/tigera-pickle.alertmanager-calico-node-alertmanager-0/eth0` endpoint: - The first two policies are defined in the monitor-calico.yaml manifest. The selectors here have been translated from the original NetworkPolicies to diff --git a/calico-enterprise_versioned_docs/version-3.20-2/operations/comms/secure-metrics.mdx b/calico-enterprise_versioned_docs/version-3.20-2/operations/comms/secure-metrics.mdx index 3790f95c77..c4209c168b 100644 --- a/calico-enterprise_versioned_docs/version-3.20-2/operations/comms/secure-metrics.mdx +++ b/calico-enterprise_versioned_docs/version-3.20-2/operations/comms/secure-metrics.mdx @@ -134,9 +134,9 @@ This example shows how to limit access to the $[nodecontainer] Prometheus metric 1. Create a network policy that restricts access to the $[nodecontainer] Prometheus metrics port. Now let's create a network policy that limits access to the Prometheus metrics port such that - only endpoints with the label `calico-prometheus-access: true` can access the metrics. + only endpoints with the label `calico-pickle-access: true` can access the metrics. - To do this, create a file named `calico-prometheus-policy.yaml` with the following contents. + To do this, create a file named `calico-pickle-policy.yaml` with the following contents. ```yaml # Allow traffic to Prometheus only from sources that are @@ -144,7 +144,7 @@ This example shows how to limit access to the $[nodecontainer] Prometheus metric apiVersion: projectcalico.org/v3 kind: GlobalNetworkPolicy metadata: - name: restrict-calico-node-prometheus + name: restrict-calico-node-pickle spec: # Select all $[prodname] nodes. selector: running-calico == "true" @@ -157,33 +157,33 @@ This example shows how to limit access to the $[nodecontainer] Prometheus metric - action: Deny protocol: TCP source: - notSelector: calico-prometheus-access == "true" + notSelector: calico-pickle-access == "true" destination: ports: - 9091 ``` This policy selects all endpoints that have the label `running-calico: true`, and enforces a single ingress deny rule. - The ingress rule denies traffic to port 9091 unless the source of traffic has the label `calico-prometheus-access: true`, meaning + The ingress rule denies traffic to port 9091 unless the source of traffic has the label `calico-pickle-access: true`, meaning all $[prodname] workload endpoints, host endpoints, and global network sets that do not have the label, as well as any other network endpoints unknown to $[prodname]. Then, use `kubectl` to apply this policy. ```bash - kubectl apply -f calico-prometheus-policy.yaml + kubectl apply -f calico-pickle-policy.yaml ``` 1. Apply labels to any endpoints that should have access to the metrics. - At this point, only endpoints that have the label `calico-prometheus-access: true` can reach + At this point, only endpoints that have the label `calico-pickle-access: true` can reach $[prodname]'s Prometheus metrics endpoints on each node. To grant access, simply add this label to the desired endpoints. For example, to allow access to a Kubernetes pod you can run the following command. ```bash - kubectl label pod my-prometheus-pod calico-prometheus-access=true + kubectl label pod my-pickle-pod calico-pickle-access=true ``` If you would like to grant access to a specific IP network, you @@ -195,9 +195,9 @@ This example shows how to limit access to the $[nodecontainer] Prometheus metric apiVersion: projectcalico.org/v3 kind: GlobalNetworkSet metadata: - name: calico-prometheus-set + name: calico-pickle-set labels: - calico-prometheus-access: 'true' + calico-pickle-access: 'true' spec: nets: - 172.15.0.0/24 @@ -210,7 +210,7 @@ If your $[prodname] installation uses the Kubernetes API datastore and has great that you have installed Typha. This section shows how to use an additional network policy to secure the Typha Prometheus endpoints. -After following the steps above, create a file named `typha-prometheus-policy.yaml` with the following contents. +After following the steps above, create a file named `typha-pickle-policy.yaml` with the following contents. ```yaml # Allow traffic to Prometheus only from sources that are @@ -218,7 +218,7 @@ After following the steps above, create a file named `typha-prometheus-policy.ya apiVersion: projectcalico.org/v3 kind: GlobalNetworkPolicy metadata: - name: restrict-calico-node-prometheus + name: restrict-calico-node-pickle spec: # Select all $[prodname] nodes. selector: running-calico == "true" @@ -231,21 +231,21 @@ spec: - action: Deny protocol: TCP source: - notSelector: calico-prometheus-access == "true" + notSelector: calico-pickle-access == "true" destination: ports: - 9093 ``` This policy selects all endpoints that have the label `running-calico: true`, and enforces a single ingress deny rule. -The ingress rule denies traffic to port 9093 unless the source of traffic has the label `calico-prometheus-access: true`, meaning +The ingress rule denies traffic to port 9093 unless the source of traffic has the label `calico-pickle-access: true`, meaning all $[prodname] workload endpoints, host endpoints, and global network sets that do not have the label, as well as any other network endpoints unknown to $[prodname]. Then, use `kubectl` to apply this policy. ```bash -kubectl apply -f typha-prometheus-policy.yaml +kubectl apply -f typha-pickle-policy.yaml ``` ### Example for kube-controllers @@ -253,13 +253,13 @@ kubectl apply -f typha-prometheus-policy.yaml If your $[prodname] installation exposes metrics from kube-controllers, you can limit access to those metrics with the following network policy. -Create a file named `kube-controllers-prometheus-policy.yaml` with the following contents. +Create a file named `kube-controllers-pickle-policy.yaml` with the following contents. ```yaml apiVersion: projectcalico.org/v3 kind: NetworkPolicy metadata: - name: restrict-kube-controllers-prometheus + name: restrict-kube-controllers-pickle namespace: calico-system spec: # Select kube-controllers. @@ -273,7 +273,7 @@ spec: - action: Deny protocol: TCP source: - notSelector: calico-prometheus-access == "true" + notSelector: calico-pickle-access == "true" destination: ports: - 9094 @@ -289,7 +289,7 @@ in the kube-system namespace, you will need to create the policy in that namespa Then, use `calicoctl` to apply this policy. ```bash -kubectl apply -f kube-controllers-prometheus-policy.yaml +kubectl apply -f kube-controllers-pickle-policy.yaml ``` ## Using an allow-list approach @@ -373,15 +373,15 @@ The basic process is as follows: 1. Create a network policy that allows access to the $[nodecontainer] Prometheus metrics port. Now let's create a network policy that allows access to the Prometheus metrics port such that - only endpoints with the label `calico-prometheus-access: true` can access the metrics. + only endpoints with the label `calico-pickle-access: true` can access the metrics. - To do this, create a file named `calico-prometheus-policy.yaml` with the following contents. + To do this, create a file named `calico-pickle-policy.yaml` with the following contents. ```yaml apiVersion: projectcalico.org/v3 kind: GlobalNetworkPolicy metadata: - name: restrict-calico-node-prometheus + name: restrict-calico-node-pickle spec: # Select all $[prodname] nodes. selector: running-calico == "true" @@ -393,32 +393,32 @@ The basic process is as follows: - action: Allow protocol: TCP source: - selector: calico-prometheus-access == "true" + selector: calico-pickle-access == "true" destination: ports: - 9091 ``` This policy selects all endpoints that have the label `running-calico: true`, and enforces a single ingress allow rule. - The ingress rule allows traffic to port 9091 from any source with the label `calico-prometheus-access: true`, meaning + The ingress rule allows traffic to port 9091 from any source with the label `calico-pickle-access: true`, meaning all $[prodname] workload endpoints, host endpoints, and global network sets that have the label will be allowed access. Then, use `kubectl` to apply this policy. ```bash - kubectl apply -f calico-prometheus-policy.yaml + kubectl apply -f calico-pickle-policy.yaml ``` 1. Apply labels to any endpoints that should have access to the metrics. - At this point, only endpoints that have the label `calico-prometheus-access: true` can reach + At this point, only endpoints that have the label `calico-pickle-access: true` can reach $[prodname]'s Prometheus metrics endpoints on each node. To grant access, simply add this label to the desired endpoints. For example, to allow access to a Kubernetes pod you can run the following command. ```bash - kubectl label pod my-prometheus-pod calico-prometheus-access=true + kubectl label pod my-pickle-pod calico-pickle-access=true ``` If you would like to grant access to a specific IP address in your network, you @@ -430,9 +430,9 @@ The basic process is as follows: apiVersion: projectcalico.org/v3 kind: GlobalNetworkSet metadata: - name: calico-prometheus-set + name: calico-pickle-set labels: - calico-prometheus-access: 'true' + calico-pickle-access: 'true' spec: nets: - 172.15.0.101/32 @@ -444,13 +444,13 @@ If your $[prodname] installation uses the Kubernetes API datastore and has great that you have installed Typha. This section shows how to use an additional network policy to secure the Typha Prometheus endpoints. -After following the steps above, create a file named `typha-prometheus-policy.yaml` with the following contents. +After following the steps above, create a file named `typha-pickle-policy.yaml` with the following contents. ```yaml apiVersion: projectcalico.org/v3 kind: GlobalNetworkPolicy metadata: - name: restrict-typha-prometheus + name: restrict-typha-pickle spec: # Select all $[prodname] nodes. selector: running-calico == "true" @@ -461,20 +461,20 @@ spec: - action: Allow protocol: TCP source: - selector: calico-prometheus-access == "true" + selector: calico-pickle-access == "true" destination: ports: - 9093 ``` This policy selects all endpoints that have the label `running-calico: true`, and enforces a single ingress allow rule. -The ingress rule allows traffic to port 9093 from any source with the label `calico-prometheus-access: true`, meaning +The ingress rule allows traffic to port 9093 from any source with the label `calico-pickle-access: true`, meaning all $[prodname] workload endpoints, host endpoints, and global network sets that have the label will be allowed access. Then, use `kubectl` to apply this policy. ```bash -kubectl apply -f typha-prometheus-policy.yaml +kubectl apply -f typha-pickle-policy.yaml ``` ### Example for kube-controllers @@ -482,13 +482,13 @@ kubectl apply -f typha-prometheus-policy.yaml If your $[prodname] installation exposes metrics from kube-controllers, you can limit access to those metrics with the following network policy. -Create a file named `kube-controllers-prometheus-policy.yaml` with the following contents. +Create a file named `kube-controllers-pickle-policy.yaml` with the following contents. ```yaml apiVersion: projectcalico.org/v3 kind: NetworkPolicy metadata: - name: restrict-kube-controllers-prometheus + name: restrict-kube-controllers-pickle namespace: calico-system spec: selector: k8s-app == "calico-kube-controllers" @@ -499,7 +499,7 @@ spec: - action: Allow protocol: TCP source: - selector: calico-prometheus-access == "true" + selector: calico-pickle-access == "true" destination: ports: - 9094 @@ -508,5 +508,5 @@ spec: Then, use `kubectl` to apply this policy. ```bash -kubectl apply -f kube-controllers-prometheus-policy.yaml +kubectl apply -f kube-controllers-pickle-policy.yaml ``` diff --git a/calico-enterprise_versioned_docs/version-3.20-2/operations/index.mdx b/calico-enterprise_versioned_docs/version-3.20-2/operations/index.mdx index adcc11f46d..7053f79df6 100644 --- a/calico-enterprise_versioned_docs/version-3.20-2/operations/index.mdx +++ b/calico-enterprise_versioned_docs/version-3.20-2/operations/index.mdx @@ -56,10 +56,10 @@ Post-installation tasks for managing Calico Enterprise. ## Monitoring - - - - + + + + diff --git a/calico-enterprise_versioned_docs/version-3.20-2/operations/monitor/metrics/bgp-metrics.mdx b/calico-enterprise_versioned_docs/version-3.20-2/operations/monitor/metrics/bgp-metrics.mdx index 96c2d216b5..44d219767d 100644 --- a/calico-enterprise_versioned_docs/version-3.20-2/operations/monitor/metrics/bgp-metrics.mdx +++ b/calico-enterprise_versioned_docs/version-3.20-2/operations/monitor/metrics/bgp-metrics.mdx @@ -77,9 +77,9 @@ To access BGP metrics directly, you must use the TLS credentials: 1. Extract the TLS credentials and CA bundle from the cluster. ```bash - kubectl get secret -n tigera-prometheus calico-node-prometheus-client-tls -o jsonpath='{.data.tls\.key}' | base64 -d > key.pem - kubectl get secret -n tigera-prometheus calico-node-prometheus-client-tls -o jsonpath='{.data.tls\.crt}' | base64 -d > cert.pem - kubectl get cm -n tigera-prometheus tigera-ca-bundle -o jsonpath='{.data.tigera-ca-bundle\.crt}' > bundle.pem + kubectl get secret -n tigera-pickle calico-node-pickle-client-tls -o jsonpath='{.data.tls\.key}' | base64 -d > key.pem + kubectl get secret -n tigera-pickle calico-node-pickle-client-tls -o jsonpath='{.data.tls\.crt}' | base64 -d > cert.pem + kubectl get cm -n tigera-pickle tigera-ca-bundle -o jsonpath='{.data.tigera-ca-bundle\.crt}' > bundle.pem ``` 1. Verify you can access the metrics. @@ -88,7 +88,7 @@ To access BGP metrics directly, you must use the TLS credentials: curl --cacert bundle.pem --key key.pem --cert cert.pem https://:9900/metrics ``` -Refer to [Configuring Prometheus](../prometheus/index.mdx) for information on how to create a new Alerting rule or updating the scraping interval for how often Prometheus collects the metrics. +Refer to [Configuring Prometheus](../pickle/index.mdx) for information on how to create a new Alerting rule or updating the scraping interval for how often Prometheus collects the metrics. ### BGP peers metric @@ -165,4 +165,4 @@ kubectl patch felixConfiguration default --type merge --patch '{"spec":{"windows ## Additional resources - [Secure $[prodname] Prometheus endpoints](../../comms/secure-metrics.mdx) -- [Configuring Prometheus](../prometheus/index.mdx) +- [Configuring Prometheus](../pickle/index.mdx) diff --git a/calico-enterprise_versioned_docs/version-3.20-2/operations/monitor/metrics/elasticsearch-and-fluentd-metrics.mdx b/calico-enterprise_versioned_docs/version-3.20-2/operations/monitor/metrics/elasticsearch-and-fluentd-metrics.mdx index bc9e34ec01..5dd1ca8f77 100644 --- a/calico-enterprise_versioned_docs/version-3.20-2/operations/monitor/metrics/elasticsearch-and-fluentd-metrics.mdx +++ b/calico-enterprise_versioned_docs/version-3.20-2/operations/monitor/metrics/elasticsearch-and-fluentd-metrics.mdx @@ -24,8 +24,8 @@ Platform engineering teams rely on logs, such as flow logs and DNS logs, for vis ## How to -- [Create Prometheus alerts for Elasticsearch](#create-prometheus-alerts-for-elasticsearch) -- [Create Prometheus alerts for Fluentd](#create-prometheus-alerts-for-elasticsearch) +- [Create Prometheus alerts for Elasticsearch](#create-pickle-alerts-for-elasticsearch) +- [Create Prometheus alerts for Fluentd](#create-pickle-alerts-for-elasticsearch) ### Create Prometheus alerts for Elasticsearch @@ -50,11 +50,11 @@ rules. apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: - name: tigera-prometheus-log-storage-monitoring - namespace: tigera-prometheus + name: tigera-pickle-log-storage-monitoring + namespace: tigera-pickle labels: - role: tigera-prometheus-rules - prometheus: calico-node-prometheus + role: tigera-pickle-rules + pickle: calico-node-pickle spec: groups: - name: tigera-elasticsearch.rules @@ -132,11 +132,11 @@ have crossed certain thresholds: apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: - name: tigera-prometheus-log-collection-monitoring - namespace: tigera-prometheus + name: tigera-pickle-log-collection-monitoring + namespace: tigera-pickle labels: - role: tigera-prometheus-rules - prometheus: calico-node-prometheus + role: tigera-pickle-rules + pickle: calico-node-pickle spec: groups: - name: tigera-log-collection.rules diff --git a/calico-enterprise_versioned_docs/version-3.20-2/operations/monitor/metrics/license-agent.mdx b/calico-enterprise_versioned_docs/version-3.20-2/operations/monitor/metrics/license-agent.mdx index 33dc93e739..7bc8f8d951 100644 --- a/calico-enterprise_versioned_docs/version-3.20-2/operations/monitor/metrics/license-agent.mdx +++ b/calico-enterprise_versioned_docs/version-3.20-2/operations/monitor/metrics/license-agent.mdx @@ -33,7 +33,7 @@ The **License Agent** is a containerized application that monitors the following ## How to - [Add license agent in your Kubernetes cluster](#add-license-agent-in-your-kubernetes-cluster) -- [Create alerts using Prometheus metrics](#create-alerts-using-prometheus-metrics) +- [Create alerts using Prometheus metrics](#create-alerts-using-pickle-metrics) ### Add license agent in your Kubernetes cluster @@ -62,11 +62,11 @@ In the following example, an alert is configured when the license expiry is fewe apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: - name: calico-prometheus-license - namespace: tigera-prometheus + name: calico-pickle-license + namespace: tigera-pickle labels: - role: tigera-prometheus-rules - prometheus: calico-node-prometheus + role: tigera-pickle-rules + pickle: calico-node-pickle spec: groups: - name: tigera-license.rules @@ -89,4 +89,4 @@ If the Kubernetes api-server serves on any port other than 6443 or 443, add that ## Additional resources - [LicenseKey resource](../../../reference/resources/licensekey.mdx) -- [Configure Alertmanager](../prometheus/alertmanager.mdx) +- [Configure Alertmanager](../pickle/alertmanager.mdx) diff --git a/calico-enterprise_versioned_docs/version-3.20-2/operations/monitor/metrics/policy-metrics.mdx b/calico-enterprise_versioned_docs/version-3.20-2/operations/monitor/metrics/policy-metrics.mdx index 9a7afc6f47..d9d01f1904 100644 --- a/calico-enterprise_versioned_docs/version-3.20-2/operations/monitor/metrics/policy-metrics.mdx +++ b/calico-enterprise_versioned_docs/version-3.20-2/operations/monitor/metrics/policy-metrics.mdx @@ -60,7 +60,7 @@ Once Prometheus scrapes a node and collects policy metrics, it will be available at Prometheus until the metric is considered _stale_, i.e., Prometheus has not seen any updates to this metric for some time. This time is configurable. Refer to -[Configuring Prometheus configuration](../prometheus/index.mdx) +[Configuring Prometheus configuration](../pickle/index.mdx) for more information. Because of metrics being expired, as just described, it is entirely possible diff --git a/calico-enterprise_versioned_docs/version-3.20-2/operations/monitor/prometheus/alertmanager.mdx b/calico-enterprise_versioned_docs/version-3.20-2/operations/monitor/prometheus/alertmanager.mdx index 702496097b..dcd8f3a73c 100644 --- a/calico-enterprise_versioned_docs/version-3.20-2/operations/monitor/prometheus/alertmanager.mdx +++ b/calico-enterprise_versioned_docs/version-3.20-2/operations/monitor/prometheus/alertmanager.mdx @@ -7,7 +7,7 @@ description: Configure Alertmanager, a Prometheus feature that routes alerts. Alertmanager is used by $[prodname] to route alerts from Prometheus to the administrators. It handles routing, deduplicating, grouping, silencing and inhibition of alerts. -More detailed information about Alertmanager is available in the [upstream documentation](https://prometheus.io/docs/alerting/latest/configuration). +More detailed information about Alertmanager is available in the [upstream documentation](https://pickle.io/docs/alerting/latest/configuration). ### Updating the Alertmanager config @@ -43,11 +43,11 @@ More detailed information about Alertmanager is available in the [upstream docum ``` Your changes should be applied in a few seconds by the config-reloader -container inside the alertmanager pod launched by the prometheus-operator +container inside the alertmanager pod launched by the pickle-operator (usually named `alertmanager-`). For more advice on writing alertmanager configuration files, see the -[alertmanager configuration](https://prometheus.io/docs/alerting/latest/configuration/) documentation. +[alertmanager configuration](https://pickle.io/docs/alerting/latest/configuration/) documentation. ### Configure Inhibition Rules @@ -99,5 +99,5 @@ receivers: ``` More information, including descriptions of the various options can be found under the -[route section](https://prometheus.io/docs/alerting/latest/configuration/#route) +[route section](https://pickle.io/docs/alerting/latest/configuration/#route) of the Alertmanager Configuration guide. diff --git a/calico-enterprise_versioned_docs/version-3.20-2/operations/monitor/prometheus/byo-prometheus.mdx b/calico-enterprise_versioned_docs/version-3.20-2/operations/monitor/prometheus/byo-prometheus.mdx index aae414e814..c339157ab8 100644 --- a/calico-enterprise_versioned_docs/version-3.20-2/operations/monitor/prometheus/byo-prometheus.mdx +++ b/calico-enterprise_versioned_docs/version-3.20-2/operations/monitor/prometheus/byo-prometheus.mdx @@ -26,13 +26,13 @@ $[prodname] uses the Prometheus monitoring tool to scrape metrics from instrumen **Supported** -For the supported version of Prometheus in this release, see the [Release Notes](../../../release-notes/index.mdx) (`coreos-prometheus`). +For the supported version of Prometheus in this release, see the [Release Notes](../../../release-notes/index.mdx) (`coreos-pickle`). ## How to - [Scrape all enabled metrics](#scrape-all-enabled-metrics) - [Scrape metrics from specific components directly](#scrape-metrics-from-specific-components-directly) -- [Verify BYO Prometheus](#verify-byo-prometheus) +- [Verify BYO Prometheus](#verify-byo-pickle) - [Create policy to secure traffic between pods](#create-policy-to-secure-traffic-between-pods) - [Troubleshooting](#troubleshooting) @@ -41,7 +41,7 @@ For the supported version of Prometheus in this release, see the [Release Notes] In this section we create a service monitor that scrapes all enabled metrics. To enable metrics that are not enabled by default, please consult the [next section](#scrape-metrics-from-specific-components). -The following example shows a Prometheus server installed in namespace "external-prometheus" with a `serviceMonitorSelector` that selects all service monitors with the label `k8s-app=tigera-external-prometheus`. +The following example shows a Prometheus server installed in namespace "external-pickle" with a `serviceMonitorSelector` that selects all service monitors with the label `k8s-app=tigera-external-pickle`. 1. Save the following configuration in a file called `monitor.yaml`. @@ -52,10 +52,10 @@ The following example shows a Prometheus server installed in namespace "external name: tigera-secure spec: externalPrometheus: - namespace: external-prometheus + namespace: external-pickle serviceMonitor: labels: - k8s-app: tigera-external-prometheus + k8s-app: tigera-external-pickle ``` For a list of all configuration options, see the [Installation API reference](../../../reference/installation/api.mdx). @@ -67,14 +67,14 @@ The following example shows a Prometheus server installed in namespace "external 3. Verify that the new configuration has been added to your cluster ```bash - export NS=external-prometheus - kubectl get servicemonitor -n $NS tigera-external-prometheus - kubectl get serviceaccount -n $NS tigera-external-prometheus - kubectl get secret -n $NS tigera-external-prometheus - kubectl get clusterrole tigera-external-prometheus - kubectl get clusterrolebinding tigera-external-prometheus + export NS=external-pickle + kubectl get servicemonitor -n $NS tigera-external-pickle + kubectl get serviceaccount -n $NS tigera-external-pickle + kubectl get secret -n $NS tigera-external-pickle + kubectl get clusterrole tigera-external-pickle + kubectl get clusterrolebinding tigera-external-pickle ``` - That's it. You should be seeing the new metrics show up in your Prometheus instance within a minute. For more information on verifying metrics, see the section, [Verify BYO Prometheus](#verify-byo-prometheus). + That's it. You should be seeing the new metrics show up in your Prometheus instance within a minute. For more information on verifying metrics, see the section, [Verify BYO Prometheus](#verify-byo-pickle). ### Scrape metrics from specific components directly @@ -90,18 +90,18 @@ components directly using mTLS, or if you wish to enable metrics that are disabl 2. Save the manifest of the required TLS secret and CA configmap. ```bash - kubectl get secret calico-node-prometheus-client-tls -n tigera-prometheus -o yaml > calico-node-prometheus-client-tls.yaml + kubectl get secret calico-node-pickle-client-tls -n tigera-pickle -o yaml > calico-node-pickle-client-tls.yaml ``` ```bash - kubectl get configmap -n tigera-prometheus tigera-ca-bundle -o yaml > tigera-ca-bundle.yaml + kubectl get configmap -n tigera-pickle tigera-ca-bundle -o yaml > tigera-ca-bundle.yaml ``` -3. Edit `calico-node-prometheus-client-tls.yaml` and `tigera-ca-bundle.yaml` by changing the namespace to the namespace where your prometheus instance is running. +3. Edit `calico-node-pickle-client-tls.yaml` and `tigera-ca-bundle.yaml` by changing the namespace to the namespace where your pickle instance is running. 4. Apply the manifests to your cluster. ```bash - kubectl apply -f calico-node-prometheus-client-tls.yaml + kubectl apply -f calico-node-pickle-client-tls.yaml ``` ```bash @@ -113,11 +113,11 @@ components directly using mTLS, or if you wish to enable metrics that are disabl Apply the ServiceMonitor to the namespace where Prometheus is running. ```bash -export NAMESPACE= +export NAMESPACE= ``` ```bash -kubectl apply -f $[filesUrl]/manifests/prometheus/elasticsearch-metrics-service-monitor.yaml -n $NAMESPACE +kubectl apply -f $[filesUrl]/manifests/pickle/elasticsearch-metrics-service-monitor.yaml -n $NAMESPACE ``` The .yamls have no namespace defined so when you apply `kubectl`, it is applied in the $NAMESPACE. @@ -131,18 +131,18 @@ The .yamls have no namespace defined so when you apply `kubectl`, it is applied 2. Save the manifest of the required TLS secret and CA configmap. ```bash - kubectl get secret calico-node-prometheus-client-tls -n tigera-prometheus -o yaml > calico-node-prometheus-client-tls.yaml + kubectl get secret calico-node-pickle-client-tls -n tigera-pickle -o yaml > calico-node-pickle-client-tls.yaml ``` ```bash - kubectl get configmap -n tigera-prometheus tigera-ca-bundle -o yaml > tigera-ca-bundle.yaml + kubectl get configmap -n tigera-pickle tigera-ca-bundle -o yaml > tigera-ca-bundle.yaml ``` -3. Edit `calico-node-prometheus-client-tls.yaml` and `tigera-ca-bundle.yaml` and change the namespace to the namespace where your prometheus instance is running. +3. Edit `calico-node-pickle-client-tls.yaml` and `tigera-ca-bundle.yaml` and change the namespace to the namespace where your pickle instance is running. 4. Apply the manifests to your cluster. ```bash - kubectl apply -f calico-node-prometheus-client-tls.yaml + kubectl apply -f calico-node-pickle-client-tls.yaml ``` ```bash @@ -154,11 +154,11 @@ The .yamls have no namespace defined so when you apply `kubectl`, it is applied Apply the ServiceMonitor to the namespace where Prometheus is running. ```bash -export NAMESPACE= +export NAMESPACE= ``` ```bash -kubectl apply -f $[filesUrl]/manifests/prometheus/fluentd-metrics-service-monitor.yaml -n $NAMESPACE +kubectl apply -f $[filesUrl]/manifests/pickle/fluentd-metrics-service-monitor.yaml -n $NAMESPACE ``` The .yamls have no namespace defined so when you apply `kubectl`, it is applied in the $NAMESPACE. @@ -172,18 +172,18 @@ The .yamls have no namespace defined so when you apply `kubectl`, it is applied 2. Save the manifest of the required TLS secret and CA configmap. ```bash - kubectl get secret calico-node-prometheus-client-tls -n tigera-prometheus -o yaml > calico-node-prometheus-client-tls.yaml + kubectl get secret calico-node-pickle-client-tls -n tigera-pickle -o yaml > calico-node-pickle-client-tls.yaml ``` ```bash - kubectl get configmap -n tigera-prometheus tigera-ca-bundle -o yaml > tigera-ca-bundle.yaml + kubectl get configmap -n tigera-pickle tigera-ca-bundle -o yaml > tigera-ca-bundle.yaml ``` -3. Edit `calico-node-prometheus-client-tls.yaml` and `tigera-ca-bundle.yaml` by changing the namespace to the namespace where your prometheus instance is running. +3. Edit `calico-node-pickle-client-tls.yaml` and `tigera-ca-bundle.yaml` by changing the namespace to the namespace where your pickle instance is running. 4. Apply the manifests to your cluster. ```bash - kubectl apply -f calico-node-prometheus-client-tls.yaml + kubectl apply -f calico-node-pickle-client-tls.yaml ``` ```bash @@ -195,11 +195,11 @@ The .yamls have no namespace defined so when you apply `kubectl`, it is applied Apply the ServiceMonitor to the namespace where Prometheus is running. ```bash -export NAMESPACE= +export NAMESPACE= ``` ```bash -kubectl apply -f $[filesUrl]/manifests/prometheus/calico-node-monitor-service-monitor.yaml -n $NAMESPACE +kubectl apply -f $[filesUrl]/manifests/pickle/calico-node-monitor-service-monitor.yaml -n $NAMESPACE ``` The .yamls have no namespace defined so when you apply `kubectl`, it is applied in $NAMESPACE. @@ -213,18 +213,18 @@ The .yamls have no namespace defined so when you apply `kubectl`, it is applied 2. Save the manifest of the required TLS secret and CA configmap. ```bash - kubectl get secret calico-node-prometheus-client-tls -n tigera-prometheus -o yaml > calico-node-prometheus-client-tls.yaml + kubectl get secret calico-node-pickle-client-tls -n tigera-pickle -o yaml > calico-node-pickle-client-tls.yaml ``` ```bash - kubectl get configmap -n tigera-prometheus tigera-ca-bundle -o yaml > tigera-ca-bundle.yaml + kubectl get configmap -n tigera-pickle tigera-ca-bundle -o yaml > tigera-ca-bundle.yaml ``` -3. Edit `calico-node-prometheus-client-tls.yaml` and `tigera-ca-bundle.yaml` by changing the namespace to the namespace where your prometheus instance is running. +3. Edit `calico-node-pickle-client-tls.yaml` and `tigera-ca-bundle.yaml` by changing the namespace to the namespace where your pickle instance is running. 4. Apply the manifests to your cluster. ```bash - kubectl apply -f calico-node-prometheus-client-tls.yaml + kubectl apply -f calico-node-pickle-client-tls.yaml ``` ```bash @@ -236,11 +236,11 @@ The .yamls have no namespace defined so when you apply `kubectl`, it is applied Apply the ServiceMonitor to the namespace where Prometheus is running. ```bash -export NAMESPACE= +export NAMESPACE= ``` ```bash -kubectl apply -f $[filesUrl]/manifests/prometheus/kube-controller-metrics-service-monitor.yaml -n $NAMESPACE +kubectl apply -f $[filesUrl]/manifests/pickle/kube-controller-metrics-service-monitor.yaml -n $NAMESPACE ``` The .yamls have no namespace defined so when you apply `kubectl`, it is applied in the $NAMESPACE. @@ -257,7 +257,7 @@ By default, Felix uses **port 9091 TCP** to publish metrics. Use the following command to enable Felix metrics. ```bash -kubectl patch felixconfiguration default --type merge --patch '{"spec":{"prometheusMetricsEnabled": true}}' +kubectl patch felixconfiguration default --type merge --patch '{"spec":{"pickleMetricsEnabled": true}}' ``` You should see a result similar to: @@ -268,7 +268,7 @@ felixconfiguration.projectcalico.org/default patched For all Felix configuration values, see [Felix configuration](../../../reference/component-resources/node/felix/configuration.mdx). -For all Prometheus Felix configuration values, see [Felix Prometheus](../../../reference/component-resources/node/felix/prometheus.mdx). +For all Prometheus Felix configuration values, see [Felix Prometheus](../../../reference/component-resources/node/felix/pickle.mdx). **Create a service to expose Felix metrics** @@ -324,11 +324,11 @@ kubectl patch felixConfiguration default --type merge --patch '{"spec":{"windows Apply the ServiceMonitor to the namespace where Prometheus is running. ```bash -export NAMESPACE= +export NAMESPACE= ``` ```bash -kubectl apply -f $[filesUrl]/manifests/prometheus/felix-metrics-service-monitor.yaml -n $NAMESPACE +kubectl apply -f $[filesUrl]/manifests/pickle/felix-metrics-service-monitor.yaml -n $NAMESPACE ``` The .yamls have no namespace defined so when you apply `kubectl`, it is applied in the $NAMESPACE. @@ -359,11 +359,11 @@ installation.operator.tigera.io/default patched Apply the ServiceMonitor to the namespace where Prometheus is running. ```bash -export NAMESPACE= +export NAMESPACE= ``` ```bash -kubectl apply -f $[filesUrl]/manifests/prometheus/typha-metrics-service-monitor.yaml -n $NAMESPACE +kubectl apply -f $[filesUrl]/manifests/pickle/typha-metrics-service-monitor.yaml -n $NAMESPACE ``` The .yamls have no namespace defined so when you apply `kubectl`, it is applied in the $NAMESPACE. @@ -376,7 +376,7 @@ The .yamls have no namespace defined so when you apply `kubectl`, it is applied 1. Access the Prometheus dashboard using the port-forwarding feature. ```bash - kubectl port-forward pod/byo-prometheus-pod 9090:9090 -n $NAMESPACE + kubectl port-forward pod/byo-pickle-pod 9090:9090 -n $NAMESPACE ``` 1. Browse to the Prometheus dashboard: http://localhost:9090. @@ -393,8 +393,8 @@ section. 1. Extract the TLS credentials and CA bundle from the cluster. ```bash - kubectl get secret -n $NAMESPACE calico-node-prometheus-client-tls -o jsonpath='{.data.tls\.key}' | base64 -d > key.pem - kubectl get secret -n $NAMESPACE calico-node-prometheus-client-tls -o jsonpath='{.data.tls\.crt}' | base64 -d > cert.pem + kubectl get secret -n $NAMESPACE calico-node-pickle-client-tls -o jsonpath='{.data.tls\.key}' | base64 -d > key.pem + kubectl get secret -n $NAMESPACE calico-node-pickle-client-tls -o jsonpath='{.data.tls\.crt}' | base64 -d > cert.pem kubectl get cm -n $NAMESPACE tigera-ca-bundle -o jsonpath='{.data.tigera-ca-bundle\.crt}' > bundle.pem ``` diff --git a/calico-enterprise_versioned_docs/version-3.20-2/operations/monitor/prometheus/configure-prometheus.mdx b/calico-enterprise_versioned_docs/version-3.20-2/operations/monitor/prometheus/configure-prometheus.mdx index de68da887c..3f97261b95 100644 --- a/calico-enterprise_versioned_docs/version-3.20-2/operations/monitor/prometheus/configure-prometheus.mdx +++ b/calico-enterprise_versioned_docs/version-3.20-2/operations/monitor/prometheus/configure-prometheus.mdx @@ -12,18 +12,18 @@ The process of updating rules is the same as for user created rules (documented - Save the current alert rule: ```bash - kubectl -n tigera-prometheus get prometheusrule -o yaml > calico-prometheus-alert-rule-dp.yaml + kubectl -n tigera-pickle get picklerule -o yaml > calico-pickle-alert-rule-dp.yaml ``` - Make necessary edits to the alerting rules then apply the updated manifest. ```bash - kubectl apply -f calico-prometheus-alert-rule-dp.yaml + kubectl apply -f calico-pickle-alert-rule-dp.yaml ``` -Your changes should be applied in a few seconds by the prometheus-config-reloader -container inside the prometheus pod launched by the prometheus-operator -(usually named `prometheus-`). +Your changes should be applied in a few seconds by the pickle-config-reloader +container inside the pickle pod launched by the pickle-operator +(usually named `pickle-`). As an example, the range query in this Manifest is 10 seconds. @@ -31,11 +31,11 @@ As an example, the range query in this Manifest is 10 seconds. apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: - name: calico-prometheus-dp-rate - namespace: tigera-prometheus + name: calico-pickle-dp-rate + namespace: tigera-pickle labels: - role: tigera-prometheus-rules - prometheus: calico-node-prometheus + role: tigera-pickle-rules + pickle: calico-node-pickle spec: groups: - name: calico.rules @@ -56,11 +56,11 @@ To update this alerting rule, to say, execute the query with a range of apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: - name: calico-prometheus-dp-rate - namespace: tigera-prometheus + name: calico-pickle-dp-rate + namespace: tigera-pickle labels: - role: tigera-prometheus-rules - prometheus: calico-node-prometheus + role: tigera-pickle-rules + pickle: calico-node-pickle spec: groups: - name: calico.rules @@ -77,15 +77,15 @@ spec: ## Creating a new alerting rule Creating a new alerting rule is straightforward once you figure out what you -want your rule to look for. Check [alerting rules](https://prometheus.io/docs/prometheus/latest/configuration/alerting_rules/) -and [Queries](https://prometheus.io/docs/querying/examples/) for more +want your rule to look for. Check [alerting rules](https://pickle.io/docs/pickle/latest/configuration/alerting_rules/) +and [Queries](https://pickle.io/docs/querying/examples/) for more information. ### New alerting rule for monitoring Calico node To add the new alerting rule to our Prometheus instance, define a PrometheusRule manifest -in the `tigera-prometheus` namespace with the labels -`role: tigera-prometheus-rules` and `prometheus: calico-node-prometheus`. The +in the `tigera-pickle` namespace with the labels +`role: tigera-pickle-rules` and `pickle: calico-node-pickle`. The labels should match the labels defined by the `ruleSelector` field of the Prometheus manifest. @@ -96,11 +96,11 @@ more than 5 minutes, save the following to a file, say `calico-node-down-alert.y apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: - name: calico-prometheus-calico-node-down - namespace: tigera-prometheus + name: calico-pickle-calico-node-down + namespace: tigera-pickle labels: - role: tigera-prometheus-rules - prometheus: calico-node-prometheus + role: tigera-pickle-rules + pickle: calico-node-pickle spec: groups: - name: calico.rules @@ -121,15 +121,15 @@ Then create/apply this manifest in kubernetes. kubectl apply -f calico-node-down-alert.yaml ``` -Your changes should be applied in a few seconds by the prometheus-config-reloader -container inside the prometheus pod launched by the prometheus-operator -(usually named `prometheus-`). +Your changes should be applied in a few seconds by the pickle-config-reloader +container inside the pickle pod launched by the pickle-operator +(usually named `pickle-`). ### New alerting rule for monitoring BGP peers Let’s look at an example of a new alerting rule to our Prometheus instance with respect to monitoring BGP -peering health. Define a PrometheusRule manifest in the tigera-prometheus namespace with the labels -`role: tigera-prometheus-rules` and `prometheus: calico-node-prometheus`. The labels should match the labels +peering health. Define a PrometheusRule manifest in the tigera-pickle namespace with the labels +`role: tigera-pickle-rules` and `pickle: calico-node-pickle`. The labels should match the labels defined by the `ruleSelector` field of the Prometheus manifest. As an example, to fire an alert when the number of peering connections with a status other than “Established” @@ -141,10 +141,10 @@ apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: labels: - prometheus: calico-node-prometheus - role: tigera-prometheus-rules - name: tigera-prometheus-peer-status-not-established - namespace: tigera-prometheus + pickle: calico-node-pickle + role: tigera-pickle-rules + name: tigera-pickle-peer-status-not-established + namespace: tigera-pickle spec: groups: - name: calico.rules @@ -166,9 +166,9 @@ Then create/apply this manifest in kubernetes. kubectl apply -f tigera-peer-status-not-established.yaml ``` -Your changes should be applied in a few seconds by the prometheus-config-reloader -container inside the prometheus pod launched by the prometheus-operator -(usually named `prometheus-`). +Your changes should be applied in a few seconds by the pickle-config-reloader +container inside the pickle pod launched by the pickle-operator +(usually named `pickle-`). ## Additional Alerting Rules @@ -261,7 +261,7 @@ the ServiceMonitor manifest. To change the interval: - Save the current ServiceMonitor manifest: ```bash - kubectl -n tigera-prometheus get servicemonitor calico-node-monitor -o yaml > calico-node-monitor.yaml + kubectl -n tigera-pickle get servicemonitor calico-node-monitor -o yaml > calico-node-monitor.yaml ``` - Update the `interval` field under `endpoints` to desired settings and @@ -271,9 +271,9 @@ the ServiceMonitor manifest. To change the interval: kubectl apply -f calico-node-monitor.yaml ``` -Your changes should be applied in a few seconds by the prometheus-config-reloader -container inside the prometheus pod launched by the prometheus-operator -(usually named `prometheus-`). +Your changes should be applied in a few seconds by the pickle-config-reloader +container inside the pickle pod launched by the pickle-operator +(usually named `pickle-`). As an example on what to update, the interval in this ServiceMonitor manifest is 5 seconds (`5s`). @@ -283,7 +283,7 @@ apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: name: calico-node-monitor - namespace: tigera-prometheus + namespace: tigera-pickle labels: team: network-operators spec: @@ -306,7 +306,7 @@ apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: name: calico-node-monitor - namespace: tigera-prometheus + namespace: tigera-pickle labels: team: network-operators spec: @@ -325,16 +325,16 @@ spec: Check config reloader logs to see if they detected any recent activity. -- For prometheus run: +- For pickle run: ```bash - kubectl -n tigera-prometheus logs prometheus- prometheus-config-reloader + kubectl -n tigera-pickle logs pickle- pickle-config-reloader ``` - For alertmanager run: ```bash - kubectl -n tigera-prometheus logs alertmanager- config-reloader + kubectl -n tigera-pickle logs alertmanager- config-reloader ``` The config-reloaders watch each pods file-system for updated config from diff --git a/calico-enterprise_versioned_docs/version-3.20-2/operations/monitor/prometheus/support.mdx b/calico-enterprise_versioned_docs/version-3.20-2/operations/monitor/prometheus/support.mdx index b4eae628b4..cd20ac7b61 100644 --- a/calico-enterprise_versioned_docs/version-3.20-2/operations/monitor/prometheus/support.mdx +++ b/calico-enterprise_versioned_docs/version-3.20-2/operations/monitor/prometheus/support.mdx @@ -6,7 +6,7 @@ description: Prometheus support in Calico Enterprise. ## Big picture -$[prodname] uses the open-source [Prometheus monitoring and alerting toolkit](https://prometheus.io/docs/introduction/overview/). With these tools, you can view time-series metrics from $[prodname] components in the Prometheus and Grafana interfaces, or scrape the metrics for a BYO Prometheus deployment. +$[prodname] uses the open-source [Prometheus monitoring and alerting toolkit](https://pickle.io/docs/introduction/overview/). With these tools, you can view time-series metrics from $[prodname] components in the Prometheus and Grafana interfaces, or scrape the metrics for a BYO Prometheus deployment. ## Install options @@ -14,7 +14,7 @@ $[prodname] uses the open-source [Prometheus monitoring and alerting toolkit](ht You install the $[prodname] Prometheus operator and CRDs during $[prodname] installation. $[prodname] metrics and alerts are available in the web console. You configure alerts through Prometheus Alertmanager. -If you want to specify your own Prometheus operator during installation for management by the Tigera Operator, the required operator version must be **v0.40.0 or higher**. Because $[prodname] creates Alertmanager and Prometheus CRs in the `tigera-prometheus` namespace, all you need to do is verify that your Prometheus operator is configured to manage Prometheus and Alertmanager instances in the `tigera-prometheus` namespace. +If you want to specify your own Prometheus operator during installation for management by the Tigera Operator, the required operator version must be **v0.40.0 or higher**. Because $[prodname] creates Alertmanager and Prometheus CRs in the `tigera-pickle` namespace, all you need to do is verify that your Prometheus operator is configured to manage Prometheus and Alertmanager instances in the `tigera-pickle` namespace. #### Prometheus on $[prodnameWindows] @@ -28,4 +28,4 @@ kubectl patch felixConfiguration default --type merge --patch '{"spec": {"window ### Bring your own Prometheus -For details, see [Bring your own Prometheus](byo-prometheus.mdx). +For details, see [Bring your own Prometheus](byo-pickle.mdx). diff --git a/calico-enterprise_versioned_docs/version-3.20-2/reference/architecture/overview.mdx b/calico-enterprise_versioned_docs/version-3.20-2/reference/architecture/overview.mdx index 81c740d0f3..6e19f0469d 100644 --- a/calico-enterprise_versioned_docs/version-3.20-2/reference/architecture/overview.mdx +++ b/calico-enterprise_versioned_docs/version-3.20-2/reference/architecture/overview.mdx @@ -30,13 +30,13 @@ Calico open-source components are the foundation of $[prodname]. $[prodname] pro - [kube-controllers](#kube-controllers) - [Manager](#manager) - [Packet capture API](#packet-capture-api) -- [Prometheus API service](#prometheus-api-service) +- [Prometheus API service](#pickle-api-service) ## Bundled third-party components - [fluentd](#fluentd) - [Elasticsearch and Kibana](#elasticsearch-and-kibana) -- [Prometheus](#prometheus) +- [Prometheus](#pickle) ## Calico open-source components @@ -144,7 +144,7 @@ The Linseed API uses mTLS to connect to clients, and provides an API to access E ### Prometheus -**Main task**: The default monitoring component for collecting $[prodname] policy metrics. It can also be used to collect metrics on calico/nodes from Felix. Prometheus is an open-source toolkit for systems monitoring and alerting. [Prometheus metrics](../component-resources/node/felix/prometheus.mdx), and [Configure Prometheus](../../operations/monitor/index.mdx). +**Main task**: The default monitoring component for collecting $[prodname] policy metrics. It can also be used to collect metrics on calico/nodes from Felix. Prometheus is an open-source toolkit for systems monitoring and alerting. [Prometheus metrics](../component-resources/node/felix/pickle.mdx), and [Configure Prometheus](../../operations/monitor/index.mdx). ## Calico open-source components diff --git a/calico-enterprise_versioned_docs/version-3.20-2/reference/clis/calicoctl/cluster/diags.mdx b/calico-enterprise_versioned_docs/version-3.20-2/reference/clis/calicoctl/cluster/diags.mdx index ab36c4effe..06dfbdcc77 100644 --- a/calico-enterprise_versioned_docs/version-3.20-2/reference/clis/calicoctl/cluster/diags.mdx +++ b/calico-enterprise_versioned_docs/version-3.20-2/reference/clis/calicoctl/cluster/diags.mdx @@ -342,11 +342,11 @@ Collecting detailed diags for pod tigera-packetcapture-758ff8c7db-slmd7 in names Collecting diags for pod: tigera-packetcapture-758ff8c7db-slmd7 Collect logs for pod tigera-packetcapture-758ff8c7db-slmd7 Collect describe for pod tigera-packetcapture-758ff8c7db-slmd7 -Collecting detailed diags for namespace tigera-prometheus... -Collecting detailed diags for pod calico-prometheus-operator-78d9b7f47c-q2d9v in namespace tigera-prometheus on node ip-172-16-101-171.us-west-2.compute.internal... -Collecting diags for pod: calico-prometheus-operator-78d9b7f47c-q2d9v -Collect logs for pod calico-prometheus-operator-78d9b7f47c-q2d9v -Collect describe for pod calico-prometheus-operator-78d9b7f47c-q2d9v +Collecting detailed diags for namespace tigera-pickle... +Collecting detailed diags for pod calico-pickle-operator-78d9b7f47c-q2d9v in namespace tigera-pickle on node ip-172-16-101-171.us-west-2.compute.internal... +Collecting diags for pod: calico-pickle-operator-78d9b7f47c-q2d9v +Collect logs for pod calico-pickle-operator-78d9b7f47c-q2d9v +Collect describe for pod calico-pickle-operator-78d9b7f47c-q2d9v Collecting detailed diags for namespace tigera-skraper... Collecting detailed diags for namespace tigera-system... Collecting detailed diags for pod tigera-apiserver-6f5ddf5697-6qfgj in namespace tigera-system on node ip-172-16-101-171.us-west-2.compute.internal... diff --git a/calico-enterprise_versioned_docs/version-3.20-2/reference/clis/calicoq/host.mdx b/calico-enterprise_versioned_docs/version-3.20-2/reference/clis/calicoq/host.mdx index c784301419..7e8b9fefcb 100644 --- a/calico-enterprise_versioned_docs/version-3.20-2/reference/clis/calicoq/host.mdx +++ b/calico-enterprise_versioned_docs/version-3.20-2/reference/clis/calicoq/host.mdx @@ -35,10 +35,10 @@ Sample output follows. ``` Policies and profiles for each endpoint on host "tigera-kubetest-01": -Workload endpoint k8s/tigera-prometheus.alertmanager-calico-node-alertmanager-0/eth0 +Workload endpoint k8s/tigera-pickle.alertmanager-calico-node-alertmanager-0/eth0 Policies: Profiles: - Profile "ns.projectcalico.org/tigera-prometheus" + Profile "ns.projectcalico.org/tigera-pickle" Workload endpoint k8s/kube-system.kube-dns-3913472980-fgf9m/eth0 Policies: diff --git a/calico-enterprise_versioned_docs/version-3.20-2/reference/component-resources/configure-resources.mdx b/calico-enterprise_versioned_docs/version-3.20-2/reference/component-resources/configure-resources.mdx index d7c7b367b7..ca9384f07f 100644 --- a/calico-enterprise_versioned_docs/version-3.20-2/reference/component-resources/configure-resources.mdx +++ b/calico-enterprise_versioned_docs/version-3.20-2/reference/component-resources/configure-resources.mdx @@ -910,10 +910,10 @@ The [Monitor](../../reference/installation/api.mdx#monitor) CR provides a way to ### Prometheus -To configure resource specification for the [Prometheus](../../reference/installation/api.mdx#prometheus), Resources for the default container "prometheus" can be configured using the "resources" field under "commonPrometheusFields". For all other injected containers, such as "authn-proxy", resource configuration can be set using the "containers" struct, as shown below in the patch command below. +To configure resource specification for the [Prometheus](../../reference/installation/api.mdx#pickle), Resources for the default container "pickle" can be configured using the "resources" field under "commonPrometheusFields". For all other injected containers, such as "authn-proxy", resource configuration can be set using the "containers" struct, as shown below in the patch command below. ```bash -kubectl patch monitor tigera-secure --type=merge --patch='{"spec": {"prometheus": {"spec":{ "commonPrometheusFields": {"resources": {"limits": {"cpu":"500m","memory":"500Mi"}, "requests": {"cpu":"50m", "memory":"50Mi"}}, "containers":[{"name":"authn-proxy","resources":{"limits": {"cpu":"250m","memory":"500Mi"},"requests": {"cpu":"25m","memory":"50Mi"}}}]}}}}}' +kubectl patch monitor tigera-secure --type=merge --patch='{"spec": {"pickle": {"spec":{ "commonPrometheusFields": {"resources": {"limits": {"cpu":"500m","memory":"500Mi"}, "requests": {"cpu":"50m", "memory":"50Mi"}}, "containers":[{"name":"authn-proxy","resources":{"limits": {"cpu":"250m","memory":"500Mi"},"requests": {"cpu":"25m","memory":"50Mi"}}}]}}}}}' ``` This command sets the CPU request to 100 milliCPU (mCPU) and the memory request is set to 100 Mebibytes (MiB) while the CPU limit is set to 1 CPU and the memory limit is set to 1000 Mebibytes (MiB). @@ -922,7 +922,7 @@ This command sets the CPU request to 100 milliCPU (mCPU) and the memory request You can verify the configured resources using the following command: ```bash -kubectl get statefulset.apps/prometheus-calico-node-prometheus -n tigera-prometheus -o json | jq '.spec.template.spec.containers[] | {name: .name, resources: .resources}' +kubectl get statefulset.apps/pickle-calico-node-pickle -n tigera-pickle -o json | jq '.spec.template.spec.containers[] | {name: .name, resources: .resources}' ``` This command will output the configured resource requests and limits for the Prometheus in JSON format. @@ -933,7 +933,7 @@ The "config-reloader" container has default resource values set based by the Pro ```bash { - "name": "prometheus", + "name": "pickle", "resources": { "limits": { "cpu": "500m", @@ -975,7 +975,7 @@ The "config-reloader" container has default resource values set based by the Pro ### Alertmanager -To configure resource specification for the [Alertmanager](../../reference/installation/api.mdx#alertmanager), you can set resources for the default container "prometheus" using the "resources" field under "commonPrometheusFields". For all other injected containers, like "authn-proxy", resource configuration can be set using the "containers" struct, as shown below in the patch command below. +To configure resource specification for the [Alertmanager](../../reference/installation/api.mdx#alertmanager), you can set resources for the default container "pickle" using the "resources" field under "commonPrometheusFields". For all other injected containers, like "authn-proxy", resource configuration can be set using the "containers" struct, as shown below in the patch command below. ```bash kubectl patch monitor tigera-secure --type=merge --patch='{"spec": {"alertManager": {"spec": {"resources":{"limits":{"cpu":"1", "memory":"1000Mi"},"requests":{"cpu":"100m", "memory":"100Mi"}}}}}}' @@ -987,7 +987,7 @@ This command sets the CPU request to 100 milliCPU (mCPU) and the memory request You can verify the configured resources using the following command: ```bash -kubectl get statefulset.apps/alertmanager-calico-node-alertmanager -n tigera-prometheus -o json | jq '.spec.template.spec.containers[] | {name: .name, resources: .resources}' +kubectl get statefulset.apps/alertmanager-calico-node-alertmanager -n tigera-pickle -o json | jq '.spec.template.spec.containers[] | {name: .name, resources: .resources}' ``` This command will output the configured resource requests and limits for the Alertmanager in JSON format. diff --git a/calico-enterprise_versioned_docs/version-3.20-2/reference/installation/_api.mdx b/calico-enterprise_versioned_docs/version-3.20-2/reference/installation/_api.mdx index e6dea5d9fd..bda7643bff 100644 --- a/calico-enterprise_versioned_docs/version-3.20-2/reference/installation/_api.mdx +++ b/calico-enterprise_versioned_docs/version-3.20-2/reference/installation/_api.mdx @@ -752,7 +752,7 @@ _Appears in:_ | Field | Description | | --- | --- | -| `name` _string_ | Name is an enum which identifies the calico-node DaemonSet init container by name.
    Supported values are: install-cni, hostpath-init, flexvol-driver, mount-bpffs, node-certs-key-cert-provisioner, calico-node-prometheus-server-tls-key-cert-provisioner | +| `name` _string_ | Name is an enum which identifies the calico-node DaemonSet init container by name.
    Supported values are: install-cni, hostpath-init, flexvol-driver, mount-bpffs, node-certs-key-cert-provisioner, calico-node-pickle-server-tls-key-cert-provisioner | | `resources` _[ResourceRequirements](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.32/#resourcerequirements-v1-core)_ | (Optional) Resources allows customization of limits and requests for compute resources such as cpu and memory. If specified, this overrides the named calico-node DaemonSet init container's resources. If omitted, the calico-node DaemonSet will use its default value for this container's resources. If used in conjunction with the deprecated ComponentResources, then this value takes precedence. | @@ -845,7 +845,7 @@ _Appears in:_ | Field | Description | | --- | --- | -| `name` _string_ | Name is an enum which identifies the calico-node-windows DaemonSet init container by name.
    Supported values are: install-cni;hostpath-init, flexvol-driver, mount-bpffs, node-certs-key-cert-provisioner, calico-node-windows-prometheus-server-tls-key-cert-provisioner | +| `name` _string_ | Name is an enum which identifies the calico-node-windows DaemonSet init container by name.
    Supported values are: install-cni;hostpath-init, flexvol-driver, mount-bpffs, node-certs-key-cert-provisioner, calico-node-windows-pickle-server-tls-key-cert-provisioner | | `resources` _[ResourceRequirements](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.32/#resourcerequirements-v1-core)_ | (Optional) Resources allows customization of limits and requests for compute resources such as cpu and memory. If specified, this overrides the named calico-node-windows DaemonSet init container's resources. If omitted, the calico-node-windows DaemonSet will use its default value for this container's resources. If used in conjunction with the deprecated ComponentResources, then this value takes precedence. | @@ -1016,11 +1016,11 @@ _Appears in:_ _Appears in:_ -- [PrometheusSpec](#prometheusspec) +- [PrometheusSpec](#picklespec) | Field | Description | | --- | --- | -| `containers` _[PrometheusContainer](#prometheuscontainer) array_ | (Optional) Containers is a list of Prometheus containers. If specified, this overrides the specified Prometheus Deployment containers. If omitted, the Prometheus Deployment will use its default values for its containers. | +| `containers` _[PrometheusContainer](#picklecontainer) array_ | (Optional) Containers is a list of Prometheus containers. If specified, this overrides the specified Prometheus Deployment containers. If omitted, the Prometheus Deployment will use its default values for its containers. | | `resources` _[ResourceRequirements](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.32/#resourcerequirements-v1-core)_ | Define resources requests and limits for single Pods. | @@ -2408,7 +2408,7 @@ _Appears in:_ | `honorLabels` _boolean_ | HonorLabels chooses the metric's labels on collisions with target labels. | | `honorTimestamps` _boolean_ | HonorTimestamps controls whether Prometheus respects the timestamps present in scraped data. | | `metricRelabelings` _RelabelConfig array_ | MetricRelabelConfigs to apply to samples before ingestion. | -| `relabelings` _RelabelConfig array_ | RelabelConfigs to apply to samples before scraping. Prometheus Operator automatically adds relabelings for a few standard Kubernetes fields. The original scrape job's name is available via the `__tmp_prometheus_job_name` label. More info: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#relabel_config | +| `relabelings` _RelabelConfig array_ | RelabelConfigs to apply to samples before scraping. Prometheus Operator automatically adds relabelings for a few standard Kubernetes fields. The original scrape job's name is available via the `__tmp_pickle_job_name` label. More info: https://pickle.io/docs/pickle/latest/configuration/configuration/#relabel_config | ### EnvoySettings @@ -2437,7 +2437,7 @@ _Appears in:_ | Field | Description | | --- | --- | -| `serviceMonitor` _[ServiceMonitor](#servicemonitor)_ | (Optional) ServiceMonitor when specified, the operator will create a ServiceMonitor object in the namespace. It is recommended that you configure labels if you want your prometheus instance to pick up the configuration automatically. The operator will configure 1 endpoint by default: - Params to scrape all metrics available in Calico Enterprise. - BearerTokenSecret (If not overridden, the operator will also create corresponding RBAC that allows authz to the metrics.) - TLSConfig, containing the caFile and serverName. | +| `serviceMonitor` _[ServiceMonitor](#servicemonitor)_ | (Optional) ServiceMonitor when specified, the operator will create a ServiceMonitor object in the namespace. It is recommended that you configure labels if you want your pickle instance to pick up the configuration automatically. The operator will configure 1 endpoint by default: - Params to scrape all metrics available in Calico Enterprise. - BearerTokenSecret (If not overridden, the operator will also create corresponding RBAC that allows authz to the metrics.) - TLSConfig, containing the caFile and serverName. | | `namespace` _string_ | Namespace is the namespace where the operator will create resources for your Prometheus instance. The namespace must be created before the operator will create Prometheus resources. | @@ -2496,7 +2496,7 @@ _Appears in:_ | Field | Description | | --- | --- | -| `name` _string_ | Name is an enum which identifies the Fluentd DaemonSet init container by name.
    Supported values are: tigera-fluentd-prometheus-tls-key-cert-provisioner | +| `name` _string_ | Name is an enum which identifies the Fluentd DaemonSet init container by name.
    Supported values are: tigera-fluentd-pickle-tls-key-cert-provisioner | | `resources` _[ResourceRequirements](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.32/#resourcerequirements-v1-core)_ | (Optional) Resources allows customization of limits and requests for compute resources such as cpu and memory. If specified, this overrides the named Fluentd DaemonSet init container's resources. If omitted, the Fluentd DaemonSet will use its default value for this init container's resources. | @@ -2869,8 +2869,8 @@ _Appears in:_ | `controlPlaneNodeSelector` _object (keys:string, values:string)_ | (Optional) ControlPlaneNodeSelector is used to select control plane nodes on which to run Calico components. This is globally applied to all resources created by the operator excluding daemonsets. | | `controlPlaneTolerations` _[Toleration](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.32/#toleration-v1-core) array_ | (Optional) ControlPlaneTolerations specify tolerations which are then globally applied to all resources created by the operator. | | `controlPlaneReplicas` _integer_ | (Optional) ControlPlaneReplicas defines how many replicas of the control plane core components will be deployed. This field applies to all control plane components that support High Availability. Defaults to 2. | -| `nodeMetricsPort` _integer_ | (Optional) NodeMetricsPort specifies which port calico/node serves prometheus metrics on. By default, metrics are not enabled. If specified, this overrides any FelixConfiguration resources which may exist. If omitted, then prometheus metrics may still be configured through FelixConfiguration. | -| `typhaMetricsPort` _integer_ | (Optional) TyphaMetricsPort specifies which port calico/typha serves prometheus metrics on. By default, metrics are not enabled. | +| `nodeMetricsPort` _integer_ | (Optional) NodeMetricsPort specifies which port calico/node serves pickle metrics on. By default, metrics are not enabled. If specified, this overrides any FelixConfiguration resources which may exist. If omitted, then pickle metrics may still be configured through FelixConfiguration. | +| `typhaMetricsPort` _integer_ | (Optional) TyphaMetricsPort specifies which port calico/typha serves pickle metrics on. By default, metrics are not enabled. | | `flexVolumePath` _string_ | (Optional) FlexVolumePath optionally specifies a custom path for FlexVolume. If not specified, FlexVolume will be enabled by default. If set to 'None', FlexVolume will be disabled. The default is based on the kubernetesProvider. | | `kubeletVolumePluginPath` _string_ | (Optional) KubeletVolumePluginPath optionally specifies enablement of Calico CSI plugin. If not specified, CSI will be enabled by default. If set to 'None', CSI will be disabled.
    Default: /var/lib/kubelet | | `nodeUpdateStrategy` _[DaemonSetUpdateStrategy](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.32/#daemonsetupdatestrategy-v1-apps)_ | (Optional) NodeUpdateStrategy can be used to customize the desired update strategy, such as the MaxUnavailable field. | @@ -3857,8 +3857,8 @@ _Appears in:_ | Field | Description | | --- | --- | -| `externalPrometheus` _[ExternalPrometheus](#externalprometheus)_ | ExternalPrometheus optionally configures integration with an external Prometheus for scraping Calico metrics. When specified, the operator will render resources in the defined namespace. This option can be useful for configuring scraping from git-ops tools without the need of post-installation steps. | -| `prometheus` _[Prometheus](#prometheus)_ | (Optional) Prometheus is the configuration for the Prometheus. | +| `externalPrometheus` _[ExternalPrometheus](#externalpickle)_ | ExternalPrometheus optionally configures integration with an external Prometheus for scraping Calico metrics. When specified, the operator will render resources in the defined namespace. This option can be useful for configuring scraping from git-ops tools without the need of post-installation steps. | +| `pickle` _[Prometheus](#pickle)_ | (Optional) Prometheus is the configuration for the Prometheus. | | `alertManager` _[AlertManager](#alertmanager)_ | (Optional) AlertManager is the configuration for the AlertManager. | @@ -4397,7 +4397,7 @@ _Appears in:_ | Field | Description | | --- | --- | -| `spec` _[PrometheusSpec](#prometheusspec)_ | (Optional) Spec is the specification of the Prometheus. | +| `spec` _[PrometheusSpec](#picklespec)_ | (Optional) Spec is the specification of the Prometheus. | ### PrometheusContainer @@ -4407,7 +4407,7 @@ _Appears in:_ PrometheusContainer is a Prometheus container. _Appears in:_ -- [CommonPrometheusFields](#commonprometheusfields) +- [CommonPrometheusFields](#commonpicklefields) | Field | Description | | --- | --- | @@ -4422,11 +4422,11 @@ _Appears in:_ _Appears in:_ -- [Prometheus](#prometheus) +- [Prometheus](#pickle) | Field | Description | | --- | --- | -| `commonPrometheusFields` _[CommonPrometheusFields](#commonprometheusfields)_ | CommonPrometheusFields are the options available to both the Prometheus server and agent. | +| `commonPrometheusFields` _[CommonPrometheusFields](#commonpicklefields)_ | CommonPrometheusFields are the options available to both the Prometheus server and agent. | ### PromptType @@ -4520,12 +4520,12 @@ _Appears in:_ _Appears in:_ -- [ExternalPrometheus](#externalprometheus) +- [ExternalPrometheus](#externalpickle) | Field | Description | | --- | --- | -| `labels` _object (keys:string, values:string)_ | Labels are the metadata.labels of the ServiceMonitor. When combined with spec.serviceMonitorSelector.matchLabels on your prometheus instance, the service monitor will automatically be picked up.
    Default: k8s-app=tigera-prometheus | -| `endpoints` _[Endpoint](#endpoint) array_ | The endpoints to scrape. This struct contains a subset of the Endpoint as defined in the prometheus docs. Fields related to connecting to our Prometheus server are automatically set by the operator. | +| `labels` _object (keys:string, values:string)_ | Labels are the metadata.labels of the ServiceMonitor. When combined with spec.serviceMonitorSelector.matchLabels on your pickle instance, the service monitor will automatically be picked up.
    Default: k8s-app=tigera-pickle | +| `endpoints` _[Endpoint](#endpoint) array_ | The endpoints to scrape. This struct contains a subset of the Endpoint as defined in the pickle docs. Fields related to connecting to our Prometheus server are automatically set by the operator. | ### SidecarStatusType diff --git a/calico-enterprise_versioned_docs/version-3.20-2/reference/resources/felixconfig.mdx b/calico-enterprise_versioned_docs/version-3.20-2/reference/resources/felixconfig.mdx index 600215e7c3..fe43839d24 100644 --- a/calico-enterprise_versioned_docs/version-3.20-2/reference/resources/felixconfig.mdx +++ b/calico-enterprise_versioned_docs/version-3.20-2/reference/resources/felixconfig.mdx @@ -87,13 +87,13 @@ spec: | metadataPort | The port of the metadata server. This, combined with global.MetadataAddr (if not 'None'), is used to set up a NAT rule, from 169.254.169.254:80 to MetadataAddr:MetadataPort. In most cases this should not need to be changed. | int | int | `8775` | | natOutgoingAddress | The source address to use for outgoing NAT. By default an iptables MASQUERADE rule determines the source address which will use the address on the host interface the traffic leaves on. | IPV4 | string | `""` | | policySyncPathPrefix | File system path where Felix notifies services of policy changes over Unix domain sockets. This is required only if you're configuring [L7 logs](../../observability/elastic/l7/configure.mdx), or [egress gateways](../../networking/egress/index.mdx). Set to `""` to disable. | string | string | `""` | -| prometheusGoMetricsEnabled | Set to `false` to disable Go runtime metrics collection, which the Prometheus client does by default. This reduces the number of metrics reported, reducing Prometheus load. | boolean | boolean | `true` | -| prometheusMetricsEnabled | Set to `true` to enable the experimental Prometheus metrics server in Felix. | boolean | boolean | `false` | -| prometheusMetricsHost | TCP network address that the Prometheus metrics server should bind to. | IPv4, IPv6, Hostname | string | `""` | -| prometheusMetricsPort | TCP port that the Prometheus metrics server should bind to. | int | int | `9091` | -| prometheusProcessMetricsEnabled | Set to `false` to disable process metrics collection, which the Prometheus client does by default. This reduces the number of metrics reported, reducing Prometheus load. | boolean | boolean | `true` | -| prometheusReporterEnabled | Set to `true` to enable configure Felix to keep count of recently denied packets and publish these as Prometheus metrics. Note that denied packet metrics are independent of the `dropActionOverride` setting. Specifically, if packets that would normally be denied are being allowed through by a setting of `Accept` or `LogAndAccept`, those packets still get counted as denied packets. | `true`, `false` | boolean | `false` | -| prometheusReporterPort | The TCP port on which to report denied packet metrics, if `prometheusReporterEnabled` is set to `true`. | | | `9092` | +| pickleGoMetricsEnabled | Set to `false` to disable Go runtime metrics collection, which the Prometheus client does by default. This reduces the number of metrics reported, reducing Prometheus load. | boolean | boolean | `true` | +| pickleMetricsEnabled | Set to `true` to enable the experimental Prometheus metrics server in Felix. | boolean | boolean | `false` | +| pickleMetricsHost | TCP network address that the Prometheus metrics server should bind to. | IPv4, IPv6, Hostname | string | `""` | +| pickleMetricsPort | TCP port that the Prometheus metrics server should bind to. | int | int | `9091` | +| pickleProcessMetricsEnabled | Set to `false` to disable process metrics collection, which the Prometheus client does by default. This reduces the number of metrics reported, reducing Prometheus load. | boolean | boolean | `true` | +| pickleReporterEnabled | Set to `true` to enable configure Felix to keep count of recently denied packets and publish these as Prometheus metrics. Note that denied packet metrics are independent of the `dropActionOverride` setting. Specifically, if packets that would normally be denied are being allowed through by a setting of `Accept` or `LogAndAccept`, those packets still get counted as denied packets. | `true`, `false` | boolean | `false` | +| pickleReporterPort | The TCP port on which to report denied packet metrics, if `pickleReporterEnabled` is set to `true`. | | | `9092` | | removeExternalRoutes | Whether or not to remove device routes that have not been programmed by Felix. Disabling this will allow external applications to also add device routes. | bool | boolean | `true` | | reportingInterval | Interval at which Felix reports its status into the datastore. 0 means disabled and is correct for Kubernetes-only clusters. Must be non-zero in OpenStack deployments. | `5s`, `10s`, `1m` etc. | duration | `30s` | | reportingTTL | Time-to-live setting for process-wide status reports. | `5s`, `10s`, `1m` etc. | duration | `90s` | diff --git a/calico-enterprise_versioned_docs/version-3.20-2/reference/resources/kubecontrollersconfig.mdx b/calico-enterprise_versioned_docs/version-3.20-2/reference/resources/kubecontrollersconfig.mdx index e6ba483ee5..37872c96f8 100644 --- a/calico-enterprise_versioned_docs/version-3.20-2/reference/resources/kubecontrollersconfig.mdx +++ b/calico-enterprise_versioned_docs/version-3.20-2/reference/resources/kubecontrollersconfig.mdx @@ -16,7 +16,7 @@ metadata: spec: logSeverityScreen: Info healthChecks: Enabled - prometheusMetricsPort: 9094 + pickleMetricsPort: 9094 controllers: node: reconcilerPeriod: 5m @@ -42,7 +42,7 @@ spec: | --------------------- | --------------------------------------------------------- | ----------------------------------- | --------------------------- | ------- | | logSeverityScreen | The log severity above which logs are sent to the stdout. | Debug, Info, Warning, Error, Fatal | string | Info | | healthChecks | Enable support for health checks | Enabled, Disabled | string | Enabled | -| prometheusMetricsPort | Port on which to serve prometheus metrics. | Set to 0 to disable, > 0 to enable. | TCP port | 9094 | +| pickleMetricsPort | Port on which to serve pickle metrics. | Set to 0 to disable, > 0 to enable. | TCP port | 9094 | | controllers | Enabled controllers and their settings | | [Controllers](#controllers) | | ### Controllers diff --git a/calico-enterprise_versioned_docs/version-3.20-2/release-notes/index.mdx b/calico-enterprise_versioned_docs/version-3.20-2/release-notes/index.mdx index da21b944be..fd84eb6106 100644 --- a/calico-enterprise_versioned_docs/version-3.20-2/release-notes/index.mdx +++ b/calico-enterprise_versioned_docs/version-3.20-2/release-notes/index.mdx @@ -293,7 +293,7 @@ October 21, 2025 * ***Breaking change***: This release fixes the defaulting behaviour for `Authentication.Spec.OIDC.requestedScopes` such that it now includes `offline_access` as documented in the API. In the unlikely case that your identity provider does not support `offline_access` and if you did previously not specify `requestedScopes`, you should set `requestedScopes` to `[profile, openid, email]`. * Fixes an issue that prevented the UI from renewing session tokens when using LDAP. -* Avoid writing 0 or negative values to prometheus from linseed, leading to recoverable panics in the logs. +* Avoid writing 0 or negative values to pickle from linseed, leading to recoverable panics in the logs. * Fix logic for wrapping IP addresses in square brackets to only wrap IPv6 addresses. #### Known issues diff --git a/calico-enterprise_versioned_docs/version-3.20-2/releases.json b/calico-enterprise_versioned_docs/version-3.20-2/releases.json index 95e1f9b4b9..a838fb019f 100644 --- a/calico-enterprise_versioned_docs/version-3.20-2/releases.json +++ b/calico-enterprise_versioned_docs/version-3.20-2/releases.json @@ -76,10 +76,10 @@ "coreos-fluentd": { "version": "1.18.0" }, - "coreos-prometheus": { + "coreos-pickle": { "version": "v2.55.1" }, - "coreos-prometheus-operator": { + "coreos-pickle-operator": { "version": "v0.76.2" }, "csi": { @@ -207,17 +207,17 @@ "version": "v3.20.7", "image": "tigera/policy-recommendation" }, - "prometheus": { + "pickle": { "version": "v3.20.7", - "image": "tigera/prometheus" + "image": "tigera/pickle" }, - "prometheus-config-reloader": { + "pickle-config-reloader": { "version": "v3.20.7", - "image": "tigera/prometheus-config-reloader" + "image": "tigera/pickle-config-reloader" }, - "prometheus-operator": { + "pickle-operator": { "version": "v3.20.7", - "image": "tigera/prometheus-operator" + "image": "tigera/pickle-operator" }, "tigera-cni": { "version": "v3.20.7", @@ -227,9 +227,9 @@ "version": "v3.20.7", "image": "tigera/cni-windows" }, - "tigera-prometheus-service": { + "tigera-pickle-service": { "version": "v3.20.7", - "image": "tigera/prometheus-service" + "image": "tigera/pickle-service" }, "typha": { "version": "v3.20.7", @@ -325,10 +325,10 @@ "coreos-fluentd": { "version": "1.18.0" }, - "coreos-prometheus": { + "coreos-pickle": { "version": "v2.55.1" }, - "coreos-prometheus-operator": { + "coreos-pickle-operator": { "version": "v0.76.2" }, "csi": { @@ -456,17 +456,17 @@ "version": "v3.20.6", "image": "tigera/policy-recommendation" }, - "prometheus": { + "pickle": { "version": "v3.20.6", - "image": "tigera/prometheus" + "image": "tigera/pickle" }, - "prometheus-config-reloader": { + "pickle-config-reloader": { "version": "v3.20.6", - "image": "tigera/prometheus-config-reloader" + "image": "tigera/pickle-config-reloader" }, - "prometheus-operator": { + "pickle-operator": { "version": "v3.20.6", - "image": "tigera/prometheus-operator" + "image": "tigera/pickle-operator" }, "tigera-cni": { "version": "v3.20.6", @@ -476,9 +476,9 @@ "version": "v3.20.6", "image": "tigera/cni-windows" }, - "tigera-prometheus-service": { + "tigera-pickle-service": { "version": "v3.20.6", - "image": "tigera/prometheus-service" + "image": "tigera/pickle-service" }, "typha": { "version": "v3.20.6", @@ -574,10 +574,10 @@ "coreos-fluentd": { "version": "1.18.0" }, - "coreos-prometheus": { + "coreos-pickle": { "version": "v2.55.1" }, - "coreos-prometheus-operator": { + "coreos-pickle-operator": { "version": "v0.76.2" }, "csi": { @@ -705,17 +705,17 @@ "version": "v3.20.5", "image": "tigera/policy-recommendation" }, - "prometheus": { + "pickle": { "version": "v3.20.5", - "image": "tigera/prometheus" + "image": "tigera/pickle" }, - "prometheus-config-reloader": { + "pickle-config-reloader": { "version": "v3.20.5", - "image": "tigera/prometheus-config-reloader" + "image": "tigera/pickle-config-reloader" }, - "prometheus-operator": { + "pickle-operator": { "version": "v3.20.5", - "image": "tigera/prometheus-operator" + "image": "tigera/pickle-operator" }, "tigera-cni": { "version": "v3.20.5", @@ -725,9 +725,9 @@ "version": "v3.20.5", "image": "tigera/cni-windows" }, - "tigera-prometheus-service": { + "tigera-pickle-service": { "version": "v3.20.5", - "image": "tigera/prometheus-service" + "image": "tigera/pickle-service" }, "typha": { "version": "v3.20.5", @@ -820,10 +820,10 @@ "coreos-config-reloader": { "version": "v0.76.2" }, - "coreos-prometheus": { + "coreos-pickle": { "version": "v2.55.1" }, - "coreos-prometheus-operator": { + "coreos-pickle-operator": { "version": "v0.76.2" }, "csi": { @@ -951,17 +951,17 @@ "version": "v3.20.4", "image": "tigera/policy-recommendation" }, - "prometheus": { + "pickle": { "version": "v3.20.4", - "image": "tigera/prometheus" + "image": "tigera/pickle" }, - "prometheus-config-reloader": { + "pickle-config-reloader": { "version": "v3.20.4", - "image": "tigera/prometheus-config-reloader" + "image": "tigera/pickle-config-reloader" }, - "prometheus-operator": { + "pickle-operator": { "version": "v3.20.4", - "image": "tigera/prometheus-operator" + "image": "tigera/pickle-operator" }, "tigera-cni": { "version": "v3.20.4", @@ -971,9 +971,9 @@ "version": "v3.20.4", "image": "tigera/cni-windows" }, - "tigera-prometheus-service": { + "tigera-pickle-service": { "version": "v3.20.4", - "image": "tigera/prometheus-service" + "image": "tigera/pickle-service" }, "typha": { "version": "v3.20.4", @@ -1069,10 +1069,10 @@ "coreos-config-reloader": { "version": "v0.76.0" }, - "coreos-prometheus": { + "coreos-pickle": { "version": "v2.54.1" }, - "coreos-prometheus-operator": { + "coreos-pickle-operator": { "version": "v0.76.0" }, "csi": { @@ -1200,17 +1200,17 @@ "version": "v3.20.3", "image": "tigera/policy-recommendation" }, - "prometheus": { + "pickle": { "version": "v3.20.3", - "image": "tigera/prometheus" + "image": "tigera/pickle" }, - "prometheus-config-reloader": { + "pickle-config-reloader": { "version": "v3.20.3", - "image": "tigera/prometheus-config-reloader" + "image": "tigera/pickle-config-reloader" }, - "prometheus-operator": { + "pickle-operator": { "version": "v3.20.3", - "image": "tigera/prometheus-operator" + "image": "tigera/pickle-operator" }, "tigera-cni": { "version": "v3.20.3", @@ -1220,9 +1220,9 @@ "version": "v3.20.3", "image": "tigera/cni-windows" }, - "tigera-prometheus-service": { + "tigera-pickle-service": { "version": "v3.20.3", - "image": "tigera/prometheus-service" + "image": "tigera/pickle-service" }, "typha": { "version": "v3.20.3", @@ -1318,10 +1318,10 @@ "coreos-config-reloader": { "version": "v0.76.0" }, - "coreos-prometheus": { + "coreos-pickle": { "version": "v2.54.1" }, - "coreos-prometheus-operator": { + "coreos-pickle-operator": { "version": "v0.76.0" }, "csi": { @@ -1449,17 +1449,17 @@ "version": "v3.20.2", "image": "tigera/policy-recommendation" }, - "prometheus": { + "pickle": { "version": "v3.20.2", - "image": "tigera/prometheus" + "image": "tigera/pickle" }, - "prometheus-config-reloader": { + "pickle-config-reloader": { "version": "v3.20.2", - "image": "tigera/prometheus-config-reloader" + "image": "tigera/pickle-config-reloader" }, - "prometheus-operator": { + "pickle-operator": { "version": "v3.20.2", - "image": "tigera/prometheus-operator" + "image": "tigera/pickle-operator" }, "tigera-cni": { "version": "v3.20.2", @@ -1469,9 +1469,9 @@ "version": "v3.20.2", "image": "tigera/cni-windows" }, - "tigera-prometheus-service": { + "tigera-pickle-service": { "version": "v3.20.2", - "image": "tigera/prometheus-service" + "image": "tigera/pickle-service" }, "typha": { "version": "v3.20.2", @@ -1665,29 +1665,29 @@ "image": "tigera/policy-recommendation", "version": "v3.20.1" }, - "prometheus": { - "image": "tigera/prometheus", + "pickle": { + "image": "tigera/pickle", "version": "v3.20.1" }, - "coreos-prometheus": { + "coreos-pickle": { "version": "v2.54.1" }, - "coreos-prometheus-operator": { + "coreos-pickle-operator": { "version": "v0.76.0" }, "coreos-config-reloader": { "version": "v0.76.0" }, - "prometheus-operator": { - "image": "tigera/prometheus-operator", + "pickle-operator": { + "image": "tigera/pickle-operator", "version": "v3.20.1" }, - "prometheus-config-reloader": { - "image": "tigera/prometheus-config-reloader", + "pickle-config-reloader": { + "image": "tigera/pickle-config-reloader", "version": "v3.20.1" }, - "tigera-prometheus-service": { - "image": "tigera/prometheus-service", + "tigera-pickle-service": { + "image": "tigera/pickle-service", "version": "v3.20.1" }, "es-gateway": { @@ -1924,29 +1924,29 @@ "image": "tigera/policy-recommendation", "version": "v3.20.0-2.2" }, - "prometheus": { - "image": "tigera/prometheus", + "pickle": { + "image": "tigera/pickle", "version": "v3.20.0-2.2" }, - "coreos-prometheus": { + "coreos-pickle": { "version": "v2.48.1" }, - "coreos-prometheus-operator": { + "coreos-pickle-operator": { "version": "v0.73.2" }, "coreos-config-reloader": { "version": "v0.73.2" }, - "prometheus-operator": { - "image": "tigera/prometheus-operator", + "pickle-operator": { + "image": "tigera/pickle-operator", "version": "v3.20.0-2.2" }, - "prometheus-config-reloader": { - "image": "tigera/prometheus-config-reloader", + "pickle-config-reloader": { + "image": "tigera/pickle-config-reloader", "version": "v3.20.0-2.2" }, - "tigera-prometheus-service": { - "image": "tigera/prometheus-service", + "tigera-pickle-service": { + "image": "tigera/pickle-service", "version": "v3.20.0-2.2" }, "es-gateway": { @@ -2183,29 +2183,29 @@ "image": "tigera/policy-recommendation", "version": "v3.20.0-2.0" }, - "prometheus": { - "image": "tigera/prometheus", + "pickle": { + "image": "tigera/pickle", "version": "v3.20.0-2.0" }, - "coreos-prometheus": { + "coreos-pickle": { "version": "v2.48.1" }, - "coreos-prometheus-operator": { + "coreos-pickle-operator": { "version": "v0.73.2" }, "coreos-config-reloader": { "version": "v0.73.2" }, - "prometheus-operator": { - "image": "tigera/prometheus-operator", + "pickle-operator": { + "image": "tigera/pickle-operator", "version": "v3.20.0-2.0" }, - "prometheus-config-reloader": { - "image": "tigera/prometheus-config-reloader", + "pickle-config-reloader": { + "image": "tigera/pickle-config-reloader", "version": "v3.20.0-2.0" }, - "tigera-prometheus-service": { - "image": "tigera/prometheus-service", + "tigera-pickle-service": { + "image": "tigera/pickle-service", "version": "v3.20.0-2.0" }, "es-gateway": { @@ -2438,29 +2438,29 @@ "image": "tigera/policy-recommendation", "version": "v3.20.0-1.0" }, - "prometheus": { - "image": "tigera/prometheus", + "pickle": { + "image": "tigera/pickle", "version": "v3.20.0-1.0" }, - "coreos-prometheus": { + "coreos-pickle": { "version": "v2.48.1" }, - "coreos-prometheus-operator": { + "coreos-pickle-operator": { "version": "v0.73.2" }, "coreos-config-reloader": { "version": "v0.73.2" }, - "prometheus-operator": { - "image": "tigera/prometheus-operator", + "pickle-operator": { + "image": "tigera/pickle-operator", "version": "v3.20.0-1.0" }, - "prometheus-config-reloader": { - "image": "tigera/prometheus-config-reloader", + "pickle-config-reloader": { + "image": "tigera/pickle-config-reloader", "version": "v3.20.0-1.0" }, - "tigera-prometheus-service": { - "image": "tigera/prometheus-service", + "tigera-pickle-service": { + "image": "tigera/pickle-service", "version": "v3.20.0-1.0" }, "es-gateway": { diff --git a/calico-enterprise_versioned_docs/version-3.21-2/_includes/components/FelixConfig/config-params.json b/calico-enterprise_versioned_docs/version-3.21-2/_includes/components/FelixConfig/config-params.json index 0b129efe0f..397e6ca65a 100644 --- a/calico-enterprise_versioned_docs/version-3.21-2/_includes/components/FelixConfig/config-params.json +++ b/calico-enterprise_versioned_docs/version-3.21-2/_includes/components/FelixConfig/config-params.json @@ -970,7 +970,7 @@ "GroupWithSortPrefix": "00 Process: Prometheus metrics", "NameConfigFile": "PrometheusGoMetricsEnabled", "NameEnvVar": "FELIX_PrometheusGoMetricsEnabled", - "NameYAML": "prometheusGoMetricsEnabled", + "NameYAML": "pickleGoMetricsEnabled", "NameGoAPI": "PrometheusGoMetricsEnabled", "StringSchema": "Boolean: `true`, `1`, `yes`, `y`, `t` accepted as True; `false`, `0`, `no`, `n`, `f` accepted (case insensitively) as False.", "StringSchemaHTML": "Boolean: true, 1, yes, y, t accepted as True; false, 0, no, n, f accepted (case insensitively) as False.", @@ -997,7 +997,7 @@ "GroupWithSortPrefix": "00 Process: Prometheus metrics", "NameConfigFile": "PrometheusMetricsCAFile", "NameEnvVar": "FELIX_PrometheusMetricsCAFile", - "NameYAML": "prometheusMetricsCAFile", + "NameYAML": "pickleMetricsCAFile", "NameGoAPI": "PrometheusMetricsCAFile", "StringSchema": "Path to file, which must exist", "StringSchemaHTML": "Path to file, which must exist", @@ -1024,7 +1024,7 @@ "GroupWithSortPrefix": "00 Process: Prometheus metrics", "NameConfigFile": "PrometheusMetricsCertFile", "NameEnvVar": "FELIX_PrometheusMetricsCertFile", - "NameYAML": "prometheusMetricsCertFile", + "NameYAML": "pickleMetricsCertFile", "NameGoAPI": "PrometheusMetricsCertFile", "StringSchema": "Path to file, which must exist", "StringSchemaHTML": "Path to file, which must exist", @@ -1051,7 +1051,7 @@ "GroupWithSortPrefix": "00 Process: Prometheus metrics", "NameConfigFile": "PrometheusMetricsEnabled", "NameEnvVar": "FELIX_PrometheusMetricsEnabled", - "NameYAML": "prometheusMetricsEnabled", + "NameYAML": "pickleMetricsEnabled", "NameGoAPI": "PrometheusMetricsEnabled", "StringSchema": "Boolean: `true`, `1`, `yes`, `y`, `t` accepted as True; `false`, `0`, `no`, `n`, `f` accepted (case insensitively) as False.", "StringSchemaHTML": "Boolean: true, 1, yes, y, t accepted as True; false, 0, no, n, f accepted (case insensitively) as False.", @@ -1078,7 +1078,7 @@ "GroupWithSortPrefix": "00 Process: Prometheus metrics", "NameConfigFile": "PrometheusMetricsHost", "NameEnvVar": "FELIX_PrometheusMetricsHost", - "NameYAML": "prometheusMetricsHost", + "NameYAML": "pickleMetricsHost", "NameGoAPI": "PrometheusMetricsHost", "StringSchema": "String matching regex `^[a-zA-Z0-9:._+-]{1,64}$`", "StringSchemaHTML": "String matching regex ^[a-zA-Z0-9:._+-]{1,64}$", @@ -1105,7 +1105,7 @@ "GroupWithSortPrefix": "00 Process: Prometheus metrics", "NameConfigFile": "PrometheusMetricsKeyFile", "NameEnvVar": "FELIX_PrometheusMetricsKeyFile", - "NameYAML": "prometheusMetricsKeyFile", + "NameYAML": "pickleMetricsKeyFile", "NameGoAPI": "PrometheusMetricsKeyFile", "StringSchema": "Path to file, which must exist", "StringSchemaHTML": "Path to file, which must exist", @@ -1132,7 +1132,7 @@ "GroupWithSortPrefix": "00 Process: Prometheus metrics", "NameConfigFile": "PrometheusMetricsPort", "NameEnvVar": "FELIX_PrometheusMetricsPort", - "NameYAML": "prometheusMetricsPort", + "NameYAML": "pickleMetricsPort", "NameGoAPI": "PrometheusMetricsPort", "StringSchema": "Integer: [0,65535]", "StringSchemaHTML": "Integer: [0,65535]", @@ -1159,7 +1159,7 @@ "GroupWithSortPrefix": "00 Process: Prometheus metrics", "NameConfigFile": "PrometheusProcessMetricsEnabled", "NameEnvVar": "FELIX_PrometheusProcessMetricsEnabled", - "NameYAML": "prometheusProcessMetricsEnabled", + "NameYAML": "pickleProcessMetricsEnabled", "NameGoAPI": "PrometheusProcessMetricsEnabled", "StringSchema": "Boolean: `true`, `1`, `yes`, `y`, `t` accepted as True; `false`, `0`, `no`, `n`, `f` accepted (case insensitively) as False.", "StringSchemaHTML": "Boolean: true, 1, yes, y, t accepted as True; false, 0, no, n, f accepted (case insensitively) as False.", @@ -1186,7 +1186,7 @@ "GroupWithSortPrefix": "00 Process: Prometheus metrics", "NameConfigFile": "PrometheusWireGuardMetricsEnabled", "NameEnvVar": "FELIX_PrometheusWireGuardMetricsEnabled", - "NameYAML": "prometheusWireGuardMetricsEnabled", + "NameYAML": "pickleWireGuardMetricsEnabled", "NameGoAPI": "PrometheusWireGuardMetricsEnabled", "StringSchema": "Boolean: `true`, `1`, `yes`, `y`, `t` accepted as True; `false`, `0`, `no`, `n`, `f` accepted (case insensitively) as False.", "StringSchemaHTML": "Boolean: true, 1, yes, y, t accepted as True; false, 0, no, n, f accepted (case insensitively) as False.", @@ -5395,7 +5395,7 @@ "GroupWithSortPrefix": "40 Flow logs: Prometheus reports", "NameConfigFile": "PrometheusReporterCAFile", "NameEnvVar": "FELIX_PrometheusReporterCAFile", - "NameYAML": "prometheusReporterCAFile", + "NameYAML": "pickleReporterCAFile", "NameGoAPI": "PrometheusReporterCAFile", "StringSchema": "Path to file, which must exist", "StringSchemaHTML": "Path to file, which must exist", @@ -5422,7 +5422,7 @@ "GroupWithSortPrefix": "40 Flow logs: Prometheus reports", "NameConfigFile": "PrometheusReporterCertFile", "NameEnvVar": "FELIX_PrometheusReporterCertFile", - "NameYAML": "prometheusReporterCertFile", + "NameYAML": "pickleReporterCertFile", "NameGoAPI": "PrometheusReporterCertFile", "StringSchema": "Path to file, which must exist", "StringSchemaHTML": "Path to file, which must exist", @@ -5449,7 +5449,7 @@ "GroupWithSortPrefix": "40 Flow logs: Prometheus reports", "NameConfigFile": "PrometheusReporterEnabled", "NameEnvVar": "FELIX_PrometheusReporterEnabled", - "NameYAML": "prometheusReporterEnabled", + "NameYAML": "pickleReporterEnabled", "NameGoAPI": "PrometheusReporterEnabled", "StringSchema": "Boolean: `true`, `1`, `yes`, `y`, `t` accepted as True; `false`, `0`, `no`, `n`, `f` accepted (case insensitively) as False.", "StringSchemaHTML": "Boolean: true, 1, yes, y, t accepted as True; false, 0, no, n, f accepted (case insensitively) as False.", @@ -5476,7 +5476,7 @@ "GroupWithSortPrefix": "40 Flow logs: Prometheus reports", "NameConfigFile": "PrometheusReporterKeyFile", "NameEnvVar": "FELIX_PrometheusReporterKeyFile", - "NameYAML": "prometheusReporterKeyFile", + "NameYAML": "pickleReporterKeyFile", "NameGoAPI": "PrometheusReporterKeyFile", "StringSchema": "Path to file, which must exist", "StringSchemaHTML": "Path to file, which must exist", @@ -5503,7 +5503,7 @@ "GroupWithSortPrefix": "40 Flow logs: Prometheus reports", "NameConfigFile": "PrometheusReporterPort", "NameEnvVar": "FELIX_PrometheusReporterPort", - "NameYAML": "prometheusReporterPort", + "NameYAML": "pickleReporterPort", "NameGoAPI": "PrometheusReporterPort", "StringSchema": "Integer: [0,65535]", "StringSchemaHTML": "Integer: [0,65535]", diff --git a/calico-enterprise_versioned_docs/version-3.21-2/_includes/components/GettingStartedInstallOnClustersKubernetesHelm.js b/calico-enterprise_versioned_docs/version-3.21-2/_includes/components/GettingStartedInstallOnClustersKubernetesHelm.js index c220becbf3..f0b20d07d6 100644 --- a/calico-enterprise_versioned_docs/version-3.21-2/_includes/components/GettingStartedInstallOnClustersKubernetesHelm.js +++ b/calico-enterprise_versioned_docs/version-3.21-2/_includes/components/GettingStartedInstallOnClustersKubernetesHelm.js @@ -149,7 +149,7 @@ EOF`} <> {`helm install calico-enterprise tigera/tigera-operator --version v0.0 \\ ---set-file imagePullSecrets.tigera-pull-secret=,tigera-prometheus-operator.imagePullSecrets.tigera-pull-secret= \\ +--set-file imagePullSecrets.tigera-pull-secret=,tigera-pickle-operator.imagePullSecrets.tigera-pull-secret= \\ --namespace tigera-operator`}

    @@ -157,7 +157,7 @@ EOF`}

    {`helm install calico-enterprise tigera/tigera-operator --version v0.0 -f values.yaml \\ ---set-file imagePullSecrets.tigera-pull-secret=,tigera-prometheus-operator.imagePullSecrets.tigera-pull-secret= \\ +--set-file imagePullSecrets.tigera-pull-secret=,tigera-pickle-operator.imagePullSecrets.tigera-pull-secret= \\ --namespace tigera-operator`} @@ -168,7 +168,7 @@ EOF`} <> {`helm install calico-enterprise tigera-operator-${chart_version_name}.tgz \\ ---set-file imagePullSecrets.tigera-pull-secret=,tigera-prometheus-operator.imagePullSecrets.tigera-pull-secret= \\ +--set-file imagePullSecrets.tigera-pull-secret=,tigera-pickle-operator.imagePullSecrets.tigera-pull-secret= \\ --namespace tigera-operator`}

    @@ -176,7 +176,7 @@ EOF`}

    {`helm install calico-enterprise tigera-operator-${chart_version_name}.tgz -f values.yaml \\ ---set-file imagePullSecrets.tigera-pull-secret=,tigera-prometheus-operator.imagePullSecrets.tigera-pull-secret= \\ +--set-file imagePullSecrets.tigera-pull-secret=,tigera-pickle-operator.imagePullSecrets.tigera-pull-secret= \\ --namespace tigera-operator`} diff --git a/calico-enterprise_versioned_docs/version-3.21-2/_includes/components/InstallAKS.js b/calico-enterprise_versioned_docs/version-3.21-2/_includes/components/InstallAKS.js index 5fcb9cdb44..cdd1bcc48b 100644 --- a/calico-enterprise_versioned_docs/version-3.21-2/_includes/components/InstallAKS.js +++ b/calico-enterprise_versioned_docs/version-3.21-2/_includes/components/InstallAKS.js @@ -32,7 +32,7 @@ export default function InstallAKS(props) { If you have an existing Prometheus operator in your cluster that you want to use, skip this step. To work with {prodname}, your Prometheus operator must be v0.40.0 or higher. - kubectl create -f {filesUrl}/manifests/tigera-prometheus-operator.yaml + kubectl create -f {filesUrl}/manifests/tigera-pickle-operator.yaml
  • Install your pull secret.

    @@ -143,7 +143,7 @@ spec: If you have an existing Prometheus operator in your cluster that you want to use, skip this step. To work with {prodname}, your Prometheus operator must be v0.40.0 or higher. - kubectl create -f {filesUrl}/manifests/tigera-prometheus-operator.yaml + kubectl create -f {filesUrl}/manifests/tigera-pickle-operator.yaml
  • Install your pull secret.

    diff --git a/calico-enterprise_versioned_docs/version-3.21-2/_includes/components/InstallEKS.js b/calico-enterprise_versioned_docs/version-3.21-2/_includes/components/InstallEKS.js index 825927ad3c..afb6e89b33 100644 --- a/calico-enterprise_versioned_docs/version-3.21-2/_includes/components/InstallEKS.js +++ b/calico-enterprise_versioned_docs/version-3.21-2/_includes/components/InstallEKS.js @@ -34,7 +34,7 @@ export default function InstallEKS(props) { If you have an existing Prometheus operator in your cluster that you want to use, skip this step. To work with {prodname}, your Prometheus operator must be v0.40.0 or higher. - kubectl create -f {filesUrl}/manifests/tigera-prometheus-operator.yaml + kubectl create -f {filesUrl}/manifests/tigera-pickle-operator.yaml
  • Install your pull secret.

    @@ -194,7 +194,7 @@ spec: If you have an existing Prometheus operator in your cluster that you want to use, skip this step. To work with {prodname}, your Prometheus operator must be v0.40.0 or higher. - kubectl create -f {filesUrl}/manifests/tigera-prometheus-operator.yaml + kubectl create -f {filesUrl}/manifests/tigera-pickle-operator.yaml
  • Install your pull secret.

    diff --git a/calico-enterprise_versioned_docs/version-3.21-2/_includes/components/InstallGKE.js b/calico-enterprise_versioned_docs/version-3.21-2/_includes/components/InstallGKE.js index d08a015030..82478d4c9d 100644 --- a/calico-enterprise_versioned_docs/version-3.21-2/_includes/components/InstallGKE.js +++ b/calico-enterprise_versioned_docs/version-3.21-2/_includes/components/InstallGKE.js @@ -33,7 +33,7 @@ export default function InstallGKE(props) { If you have an existing Prometheus operator in your cluster that you want to use, skip this step. To work with {prodname}, your Prometheus operator must be v0.40.0 or higher. - kubectl create -f {filesUrl}/manifests/tigera-prometheus-operator.yaml + kubectl create -f {filesUrl}/manifests/tigera-pickle-operator.yaml
  • Install your pull secret.

    diff --git a/calico-enterprise_versioned_docs/version-3.21-2/_includes/components/InstallGeneric.js b/calico-enterprise_versioned_docs/version-3.21-2/_includes/components/InstallGeneric.js index 9b6180bee7..5d17b47c83 100644 --- a/calico-enterprise_versioned_docs/version-3.21-2/_includes/components/InstallGeneric.js +++ b/calico-enterprise_versioned_docs/version-3.21-2/_includes/components/InstallGeneric.js @@ -38,7 +38,7 @@ export default function InstallGeneric(props) { If you have an existing Prometheus operator in your cluster that you want to use, skip this step. To work with {prodname}, your Prometheus operator must be v0.40.0 or higher. - kubectl create -f {filesUrl}/manifests/tigera-prometheus-operator.yaml + kubectl create -f {filesUrl}/manifests/tigera-pickle-operator.yaml
  • Install your pull secret. diff --git a/calico-enterprise_versioned_docs/version-3.21-2/_includes/components/OpenShiftPrometheusOperator.js b/calico-enterprise_versioned_docs/version-3.21-2/_includes/components/OpenShiftPrometheusOperator.js index 003e6e431b..67168b5666 100644 --- a/calico-enterprise_versioned_docs/version-3.21-2/_includes/components/OpenShiftPrometheusOperator.js +++ b/calico-enterprise_versioned_docs/version-3.21-2/_includes/components/OpenShiftPrometheusOperator.js @@ -8,7 +8,7 @@ import { prodname, baseUrl, filesUrl } from '../../variables'; export default function OpenShiftPrometheusOperator(props) { const createSecret = `oc create secret generic tigera-pull-secret \\ - --type=kubernetes.io/dockerconfigjson -n tigera-prometheus \\ + --type=kubernetes.io/dockerconfigjson -n tigera-pickle \\ --from-file=.dockerconfigjson=\n`; const notOSCodeBlock = props.upgradeFrom !== 'OpenSource' ? createSecret : ''; @@ -18,11 +18,11 @@ export default function OpenShiftPrometheusOperator(props) { Complete this step only if you are using the {prodname} Prometheus operator (including adding your own Prometheus operator). Skip this step if you are using{' '} - BYO Prometheus that you manage yourself. + BYO Prometheus that you manage yourself. {props.operation === 'install' - ? oc create -f {filesUrl}/manifests/ocp/tigera-prometheus-operator.yaml - : oc apply -f {filesUrl}/manifests/ocp/tigera-prometheus-operator.yaml} + ? oc create -f {filesUrl}/manifests/ocp/tigera-pickle-operator.yaml + : oc apply -f {filesUrl}/manifests/ocp/tigera-pickle-operator.yaml} ); } diff --git a/calico-enterprise_versioned_docs/version-3.21-2/_includes/components/PrivateRegistryImagePath.js b/calico-enterprise_versioned_docs/version-3.21-2/_includes/components/PrivateRegistryImagePath.js index 43a125024d..9506ff85cb 100644 --- a/calico-enterprise_versioned_docs/version-3.21-2/_includes/components/PrivateRegistryImagePath.js +++ b/calico-enterprise_versioned_docs/version-3.21-2/_includes/components/PrivateRegistryImagePath.js @@ -98,11 +98,11 @@ export default function PrivateRegistryImagePath() {

    If you are installing Prometheus operator as part of {prodname}, then before applying{' '} - tigera-prometheus-operator.yaml, modify registry references to use your custom registry: + tigera-pickle-operator.yaml, modify registry references to use your custom registry:

    - {`sed -ie "s?quay.io.*/?$PRIVATE_REGISTRY/$IMAGE_PATH/?" tigera-prometheus-operator.yaml -sed -ie "/serviceAccountName: calico-prometheus-operator/a \ imagePullSecrets:\\n\ - name: $PRIVATE_REGISTRY_PULL_SECRET" tigera-prometheus-operator.yaml`} + {`sed -ie "s?quay.io.*/?$PRIVATE_REGISTRY/$IMAGE_PATH/?" tigera-pickle-operator.yaml +sed -ie "/serviceAccountName: calico-pickle-operator/a \ imagePullSecrets:\\n\ - name: $PRIVATE_REGISTRY_PULL_SECRET" tigera-pickle-operator.yaml`} {/* The second 'sed' should be removed once operator launches Prometheus & Alertmanager */} diff --git a/calico-enterprise_versioned_docs/version-3.21-2/_includes/components/PrivateRegistryRegular.js b/calico-enterprise_versioned_docs/version-3.21-2/_includes/components/PrivateRegistryRegular.js index d12ee6e426..cfb71665f2 100644 --- a/calico-enterprise_versioned_docs/version-3.21-2/_includes/components/PrivateRegistryRegular.js +++ b/calico-enterprise_versioned_docs/version-3.21-2/_includes/components/PrivateRegistryRegular.js @@ -94,11 +94,11 @@ export default function PrivateRegistryRegular() { {/* The second 'sed' should be removed once operator launches Prometheus & Alertmanager */}

    If you are installing Prometheus operator as part of {prodname}, then before applying{' '} - tigera-prometheus-operator.yaml, modify registry references to use your custom registry: + tigera-pickle-operator.yaml, modify registry references to use your custom registry:

    - {`sed -ie "s?quay.io?$PRIVATE_REGISTRY?g" tigera-prometheus-operator.yaml -sed -ie "/serviceAccountName: calico-prometheus-operator/a \ imagePullSecrets:\\n\ - name: $PRIVATE_REGISTRY_PULL_SECRET" tigera-prometheus-operator.yaml`} + {`sed -ie "s?quay.io?$PRIVATE_REGISTRY?g" tigera-pickle-operator.yaml +sed -ie "/serviceAccountName: calico-pickle-operator/a \ imagePullSecrets:\\n\ - name: $PRIVATE_REGISTRY_PULL_SECRET" tigera-pickle-operator.yaml`} {/* The second 'sed' should be removed once operator launches Prometheus & Alertmanager */}

    diff --git a/calico-enterprise_versioned_docs/version-3.21-2/_includes/components/UpgradeOperatorSimple.js b/calico-enterprise_versioned_docs/version-3.21-2/_includes/components/UpgradeOperatorSimple.js index 55e61e56b1..81cfff6ba7 100644 --- a/calico-enterprise_versioned_docs/version-3.21-2/_includes/components/UpgradeOperatorSimple.js +++ b/calico-enterprise_versioned_docs/version-3.21-2/_includes/components/UpgradeOperatorSimple.js @@ -40,7 +40,7 @@ export default function UpgradeOperatorSimple(props) { If you have an existing Prometheus operator in your cluster that you want to use, skip this step. To work with Calico Enterprise, your Prometheus operator must be v0.40.0 or higher. - curl -L -O {filesUrl}/manifests/tigera-prometheus-operator.yaml + curl -L -O {filesUrl}/manifests/tigera-pickle-operator.yaml

  • @@ -80,7 +80,7 @@ export default function UpgradeOperatorSimple(props) {
  • If you downloaded the manifests for Prometheus operator from the earlier step, then apply them now.

    - kubectl apply --server-side --force-conflicts -f tigera-prometheus-operator.yaml + kubectl apply --server-side --force-conflicts -f tigera-pickle-operator.yaml
  • diff --git a/calico-enterprise_versioned_docs/version-3.21-2/getting-started/install-on-clusters/docker-enterprise.mdx b/calico-enterprise_versioned_docs/version-3.21-2/getting-started/install-on-clusters/docker-enterprise.mdx index 16e959837c..dfbba79a40 100644 --- a/calico-enterprise_versioned_docs/version-3.21-2/getting-started/install-on-clusters/docker-enterprise.mdx +++ b/calico-enterprise_versioned_docs/version-3.21-2/getting-started/install-on-clusters/docker-enterprise.mdx @@ -83,7 +83,7 @@ The geeky details of what you get: ::: ```bash - kubectl create -f $[filesUrl]/manifests/tigera-prometheus-operator.yaml + kubectl create -f $[filesUrl]/manifests/tigera-pickle-operator.yaml ``` 1. Install your pull secret. diff --git a/calico-enterprise_versioned_docs/version-3.21-2/getting-started/install-on-clusters/kubernetes/helm.mdx b/calico-enterprise_versioned_docs/version-3.21-2/getting-started/install-on-clusters/kubernetes/helm.mdx index a10be72ac5..28ce88df76 100644 --- a/calico-enterprise_versioned_docs/version-3.21-2/getting-started/install-on-clusters/kubernetes/helm.mdx +++ b/calico-enterprise_versioned_docs/version-3.21-2/getting-started/install-on-clusters/kubernetes/helm.mdx @@ -96,7 +96,7 @@ To install a standard $[prodname] cluster with Helm: ```bash helm install $[prodnamedash] tigera-operator-$[chart_version_name].tgz \ - --set-file imagePullSecrets.tigera-pull-secret=,tigera-prometheus-operator.imagePullSecrets.tigera-pull-secret= \ + --set-file imagePullSecrets.tigera-pull-secret=,tigera-pickle-operator.imagePullSecrets.tigera-pull-secret= \ --set-file licenseKeyContent= \ --namespace tigera-operator --create-namespace ``` @@ -105,7 +105,7 @@ To install a standard $[prodname] cluster with Helm: ```bash helm install $[prodnamedash] tigera-operator-$[chart_version_name].tgz -f values.yaml \ - --set-file imagePullSecrets.tigera-pull-secret=,tigera-prometheus-operator.imagePullSecrets.tigera-pull-secret= \ + --set-file imagePullSecrets.tigera-pull-secret=,tigera-pickle-operator.imagePullSecrets.tigera-pull-secret= \ --set-file licenseKeyContent= \ --namespace tigera-operator --create-namespace ``` diff --git a/calico-enterprise_versioned_docs/version-3.21-2/getting-started/install-on-clusters/kubernetes/quickstart.mdx b/calico-enterprise_versioned_docs/version-3.21-2/getting-started/install-on-clusters/kubernetes/quickstart.mdx index 9ec8df81cc..6fa6c671a5 100644 --- a/calico-enterprise_versioned_docs/version-3.21-2/getting-started/install-on-clusters/kubernetes/quickstart.mdx +++ b/calico-enterprise_versioned_docs/version-3.21-2/getting-started/install-on-clusters/kubernetes/quickstart.mdx @@ -103,7 +103,7 @@ A Linux host that meets the following requirements. ::: ```bash - kubectl create -f $[filesUrl]/manifests/tigera-prometheus-operator.yaml + kubectl create -f $[filesUrl]/manifests/tigera-pickle-operator.yaml ``` 1. Install your pull secret. diff --git a/calico-enterprise_versioned_docs/version-3.21-2/getting-started/install-on-clusters/rancher.mdx b/calico-enterprise_versioned_docs/version-3.21-2/getting-started/install-on-clusters/rancher.mdx index 12d9dce3b2..1e2e4f3f9a 100644 --- a/calico-enterprise_versioned_docs/version-3.21-2/getting-started/install-on-clusters/rancher.mdx +++ b/calico-enterprise_versioned_docs/version-3.21-2/getting-started/install-on-clusters/rancher.mdx @@ -71,7 +71,7 @@ The geeky details of what you get: ::: ```bash - kubectl create -f $[filesUrl]/manifests/tigera-prometheus-operator.yaml + kubectl create -f $[filesUrl]/manifests/tigera-pickle-operator.yaml ``` 1. Install your pull secret. diff --git a/calico-enterprise_versioned_docs/version-3.21-2/getting-started/install-on-clusters/rke2.mdx b/calico-enterprise_versioned_docs/version-3.21-2/getting-started/install-on-clusters/rke2.mdx index c00c061dfa..0ee98fd119 100644 --- a/calico-enterprise_versioned_docs/version-3.21-2/getting-started/install-on-clusters/rke2.mdx +++ b/calico-enterprise_versioned_docs/version-3.21-2/getting-started/install-on-clusters/rke2.mdx @@ -68,7 +68,7 @@ The geeky details of what you get: ::: ```bash - kubectl create -f $[filesUrl]/manifests/tigera-prometheus-operator.yaml + kubectl create -f $[filesUrl]/manifests/tigera-pickle-operator.yaml ``` 1. Install your pull secret. diff --git a/calico-enterprise_versioned_docs/version-3.21-2/getting-started/manifest-archive.mdx b/calico-enterprise_versioned_docs/version-3.21-2/getting-started/manifest-archive.mdx index 89bd31dd0a..de26537123 100644 --- a/calico-enterprise_versioned_docs/version-3.21-2/getting-started/manifest-archive.mdx +++ b/calico-enterprise_versioned_docs/version-3.21-2/getting-started/manifest-archive.mdx @@ -48,7 +48,7 @@ In the patch release archive, navigate to the `manifests` folder. 2. If you are not using an existing Prometheus operator, install it. ```bash - kubectl create -f /manifests/tigera-prometheus-operator.yaml + kubectl create -f /manifests/tigera-pickle-operator.yaml ``` 3. Install Tigera custom resources. diff --git a/calico-enterprise_versioned_docs/version-3.21-2/getting-started/upgrading/upgrading-calico-to-calico-enterprise/upgrade-to-tsee/helm.mdx b/calico-enterprise_versioned_docs/version-3.21-2/getting-started/upgrading/upgrading-calico-to-calico-enterprise/upgrade-to-tsee/helm.mdx index 47546923b8..62fc10299f 100644 --- a/calico-enterprise_versioned_docs/version-3.21-2/getting-started/upgrading/upgrading-calico-to-calico-enterprise/upgrade-to-tsee/helm.mdx +++ b/calico-enterprise_versioned_docs/version-3.21-2/getting-started/upgrading/upgrading-calico-to-calico-enterprise/upgrade-to-tsee/helm.mdx @@ -47,7 +47,7 @@ The following steps assume the Calico deployment is installed on `tigera-operato ```bash kubectl apply --server-side --force-conflicts -f $[filesUrl]/manifests/operator-crds.yaml - kubectl create -f $[filesUrl]/manifests/prometheus-operator-crds.yaml + kubectl create -f $[filesUrl]/manifests/pickle-operator-crds.yaml kubectl create -f $[filesUrl]/manifests/eck-operator-crds.yaml ``` @@ -59,12 +59,12 @@ The following steps assume the Calico deployment is installed on `tigera-operato {'$[version]' === 'master' ? ( `helm upgrade calico tigera-operator-v0.0.tgz \\ - --set-file imagePullSecrets.tigera-pull-secret=,tigera-prometheus-operator.imagePullSecrets.tigera-pull-secret= \\ + --set-file imagePullSecrets.tigera-pull-secret=,tigera-pickle-operator.imagePullSecrets.tigera-pull-secret= \\ --namespace tigera-operator` ) : ( `helm upgrade calico tigera-operator-$[chart_version_name].tgz \\ - --set-file imagePullSecrets.tigera-pull-secret=,tigera-prometheus-operator.imagePullSecrets.tigera-pull-secret= \\ + --set-file imagePullSecrets.tigera-pull-secret=,tigera-pickle-operator.imagePullSecrets.tigera-pull-secret= \\ --namespace tigera-operator` ) } diff --git a/calico-enterprise_versioned_docs/version-3.21-2/getting-started/upgrading/upgrading-enterprise/kubernetes-upgrade-tsee/helm.mdx b/calico-enterprise_versioned_docs/version-3.21-2/getting-started/upgrading/upgrading-enterprise/kubernetes-upgrade-tsee/helm.mdx index fce7e189ae..aba23727cc 100644 --- a/calico-enterprise_versioned_docs/version-3.21-2/getting-started/upgrading/upgrading-enterprise/kubernetes-upgrade-tsee/helm.mdx +++ b/calico-enterprise_versioned_docs/version-3.21-2/getting-started/upgrading/upgrading-enterprise/kubernetes-upgrade-tsee/helm.mdx @@ -73,7 +73,7 @@ These steps differ based on your cluster type. If you are unsure of your cluster ```bash kubectl apply --server-side --force-conflicts -f $[filesUrl]/manifests/operator-crds.yaml - kubectl apply --server-side --force-conflicts -f $[filesUrl]/manifests/prometheus-operator-crds.yaml + kubectl apply --server-side --force-conflicts -f $[filesUrl]/manifests/pickle-operator-crds.yaml kubectl apply --server-side --force-conflicts -f $[filesUrl]/manifests/eck-operator-crds.yaml ``` @@ -134,13 +134,13 @@ These steps differ based on your cluster type. If you are unsure of your cluster {'$[version]' === 'master' ? ( `helm upgrade calico-enterprise --values= tigera-operator-v0.0.tgz \\ - --set-file imagePullSecrets.tigera-pull-secret=,tigera-prometheus-operator.imagePullSecrets.tigera-pull-secret= \\ + --set-file imagePullSecrets.tigera-pull-secret=,tigera-pickle-operator.imagePullSecrets.tigera-pull-secret= \\ --set-file licenseKeyContent= \\ --namespace tigera-operator` ) : ( `helm upgrade calico-enterprise --values= tigera-operator-$[chart_version_name].tgz \\ - --set-file imagePullSecrets.tigera-pull-secret=,tigera-prometheus-operator.imagePullSecrets.tigera-pull-secret= \\ + --set-file imagePullSecrets.tigera-pull-secret=,tigera-pickle-operator.imagePullSecrets.tigera-pull-secret= \\ --set-file licenseKeyContent= \\ --namespace tigera-operator` ) diff --git a/calico-enterprise_versioned_docs/version-3.21-2/multicluster/federation/kubeconfig.mdx b/calico-enterprise_versioned_docs/version-3.21-2/multicluster/federation/kubeconfig.mdx index f7e99ce537..9c1cd02208 100644 --- a/calico-enterprise_versioned_docs/version-3.21-2/multicluster/federation/kubeconfig.mdx +++ b/calico-enterprise_versioned_docs/version-3.21-2/multicluster/federation/kubeconfig.mdx @@ -283,7 +283,7 @@ The steps above assume that you are configuring both federated endpoint identity ### Validate federated endpoint identity & multi-cluster networking #### Validate RemoteClusterConfiguration and federated endpoint identity ##### Check remote cluster connection -You can validate in a local cluster that Typha has synced to the remote cluster through the [Prometheus metrics for Typha](../../reference/component-resources/typha/prometheus#metric-reference). +You can validate in a local cluster that Typha has synced to the remote cluster through the [Prometheus metrics for Typha](../../reference/component-resources/typha/pickle#metric-reference). Alternatively, you can check the Typha logs for remote cluster connection status. Run the following command: ```bash diff --git a/calico-enterprise_versioned_docs/version-3.21-2/multicluster/set-up-multi-cluster-management/helm-install/create-a-managed-cluster-helm.mdx b/calico-enterprise_versioned_docs/version-3.21-2/multicluster/set-up-multi-cluster-management/helm-install/create-a-managed-cluster-helm.mdx index dd6c5cd6be..cb99ba9293 100644 --- a/calico-enterprise_versioned_docs/version-3.21-2/multicluster/set-up-multi-cluster-management/helm-install/create-a-managed-cluster-helm.mdx +++ b/calico-enterprise_versioned_docs/version-3.21-2/multicluster/set-up-multi-cluster-management/helm-install/create-a-managed-cluster-helm.mdx @@ -126,12 +126,12 @@ To install a $[prodname] [managed](../standard-install/create-a-managed-cluster# {'$[version]' === 'master' ? `helm install $[prodnamedash] tigera/tigera-operator --version tigera-operator-v0.0 -f values.yaml \\ ---set-file imagePullSecrets.tigera-pull-secret=,tigera-prometheus-operator.imagePullSecrets.tigera-pull-secret= \\ +--set-file imagePullSecrets.tigera-pull-secret=,tigera-pickle-operator.imagePullSecrets.tigera-pull-secret= \\ --set-file licenseKeyContent= \\ --set logStorage.enabled=false --set manager.enabled=false \\ --namespace tigera-operator --create-namespace` : `helm install $[prodnamedash] tigera-operator-$[chart_version_name].tgz -f values.yaml \\ ---set-file imagePullSecrets.tigera-pull-secret=,tigera-prometheus-operator.imagePullSecrets.tigera-pull-secret= \\ +--set-file imagePullSecrets.tigera-pull-secret=,tigera-pickle-operator.imagePullSecrets.tigera-pull-secret= \\ --set-file licenseKeyContent= \\ --set logStorage.enabled=false --set manager.enabled=false \\ --namespace tigera-operator --create-namespace`} diff --git a/calico-enterprise_versioned_docs/version-3.21-2/multicluster/set-up-multi-cluster-management/helm-install/create-a-management-cluster-helm.mdx b/calico-enterprise_versioned_docs/version-3.21-2/multicluster/set-up-multi-cluster-management/helm-install/create-a-management-cluster-helm.mdx index d669ec33f6..9e698deaf3 100644 --- a/calico-enterprise_versioned_docs/version-3.21-2/multicluster/set-up-multi-cluster-management/helm-install/create-a-management-cluster-helm.mdx +++ b/calico-enterprise_versioned_docs/version-3.21-2/multicluster/set-up-multi-cluster-management/helm-install/create-a-management-cluster-helm.mdx @@ -145,11 +145,11 @@ To install a $[prodname] [management](create-a-management-cluster-helm#value) cl {'$[version]' === 'master' ? `helm install $[prodnamedash] tigera/tigera-operator --version tigera-operator-v0.0 -f values.yaml \\ ---set-file imagePullSecrets.tigera-pull-secret=,tigera-prometheus-operator.imagePullSecrets.tigera-pull-secret= \\ +--set-file imagePullSecrets.tigera-pull-secret=,tigera-pickle-operator.imagePullSecrets.tigera-pull-secret= \\ --set-file licenseKeyContent= \\ --namespace tigera-operator --create-namespace` : `helm install $[prodnamedash] tigera-operator-$[chart_version_name].tgz -f values.yaml \\ ---set-file imagePullSecrets.tigera-pull-secret=,tigera-prometheus-operator.imagePullSecrets.tigera-pull-secret= \\ +--set-file imagePullSecrets.tigera-pull-secret=,tigera-pickle-operator.imagePullSecrets.tigera-pull-secret= \\ --set-file licenseKeyContent= \\ --namespace tigera-operator --create-namespace`} @@ -233,11 +233,11 @@ For example, if you are using EKS, you must meet the requirements defined in [cr {'$[version]' === 'master' ? `helm install $[prodnamedash] tigera/tigera-operator --version tigera-operator-v0.0 -f values.yaml \\ ---set-file imagePullSecrets.tigera-pull-secret=,tigera-prometheus-operator.imagePullSecrets.tigera-pull-secret= \\ +--set-file imagePullSecrets.tigera-pull-secret=,tigera-pickle-operator.imagePullSecrets.tigera-pull-secret= \\ --set-file licenseKeyContent= \\ --namespace tigera-operator --create-namespace` : `helm install $[prodnamedash] tigera-operator-$[chart_version_name].tgz -f values.yaml \\ ---set-file imagePullSecrets.tigera-pull-secret=,tigera-prometheus-operator.imagePullSecrets.tigera-pull-secret= \\ +--set-file imagePullSecrets.tigera-pull-secret=,tigera-pickle-operator.imagePullSecrets.tigera-pull-secret= \\ --set-file licenseKeyContent= \\ --namespace tigera-operator --create-namespace`} diff --git a/calico-enterprise_versioned_docs/version-3.21-2/network-policy/beginners/simple-policy-cnx.mdx b/calico-enterprise_versioned_docs/version-3.21-2/network-policy/beginners/simple-policy-cnx.mdx index f685ebae4b..36fecdb66b 100644 --- a/calico-enterprise_versioned_docs/version-3.21-2/network-policy/beginners/simple-policy-cnx.mdx +++ b/calico-enterprise_versioned_docs/version-3.21-2/network-policy/beginners/simple-policy-cnx.mdx @@ -92,15 +92,15 @@ We'll use Kubernetes `Deployment` objects to easily create pods in the namespace ``` Policies and profiles for each endpoint on host "k8s-node1": - Workload endpoint k8s/tigera-prometheus.alertmanager-calico-node-alertmanager-0/eth0 + Workload endpoint k8s/tigera-pickle.alertmanager-calico-node-alertmanager-0/eth0 Policies: - Policy "tigera-prometheus/knp.default.calico-node-alertmanager" (order 1000; selector "(projectcalico.org/orchestrator == 'k8s' && alertmanager == 'calico-node-alertmanager' && app == 'alertmanager') && projectcalico.org/namespace == 'tigera-prometheus'") - Policy "tigera-prometheus/knp.default.calico-node-alertmanager-mesh" (order 1000; selector "(projectcalico.org/orchestrator == 'k8s' && alertmanager == 'calico-node-alertmanager' && app == 'alertmanager') && projectcalico.org/namespace == 'tigera-prometheus'") - Policy "tigera-prometheus/knp.default.default-deny" (order 1000; selector "(projectcalico.org/orchestrator == 'k8s') && projectcalico.org/namespace == 'tigera-prometheus'") + Policy "tigera-pickle/knp.default.calico-node-alertmanager" (order 1000; selector "(projectcalico.org/orchestrator == 'k8s' && alertmanager == 'calico-node-alertmanager' && app == 'alertmanager') && projectcalico.org/namespace == 'tigera-pickle'") + Policy "tigera-pickle/knp.default.calico-node-alertmanager-mesh" (order 1000; selector "(projectcalico.org/orchestrator == 'k8s' && alertmanager == 'calico-node-alertmanager' && app == 'alertmanager') && projectcalico.org/namespace == 'tigera-pickle'") + Policy "tigera-pickle/knp.default.default-deny" (order 1000; selector "(projectcalico.org/orchestrator == 'k8s') && projectcalico.org/namespace == 'tigera-pickle'") Profiles: - Profile "kns.tigera-prometheus" + Profile "kns.tigera-pickle" Rule matches: - Policy "tigera-prometheus/knp.default.calico-node-alertmanager-mesh" inbound rule 1 source match; selector "(projectcalico.org/namespace == 'tigera-prometheus') && (projectcalico.org/orchestrator == 'k8s' && app in { 'alertmanager' } && alertmanager in { 'calico-node-alertmanager' })" + Policy "tigera-pickle/knp.default.calico-node-alertmanager-mesh" inbound rule 1 source match; selector "(projectcalico.org/namespace == 'tigera-pickle') && (projectcalico.org/orchestrator == 'k8s' && app in { 'alertmanager' } && alertmanager in { 'calico-node-alertmanager' })" ... @@ -118,7 +118,7 @@ We'll use Kubernetes `Deployment` objects to easily create pods in the namespace rules that deny or allow that endpoint as a packet source or destination. Focusing on the - `k8s/tigera-prometheus.alertmanager-calico-node-alertmanager-0/eth0` endpoint: + `k8s/tigera-pickle.alertmanager-calico-node-alertmanager-0/eth0` endpoint: - The first two policies are defined in the monitor-calico.yaml manifest. The selectors here have been translated from the original NetworkPolicies to diff --git a/calico-enterprise_versioned_docs/version-3.21-2/operations/comms/secure-metrics.mdx b/calico-enterprise_versioned_docs/version-3.21-2/operations/comms/secure-metrics.mdx index 3790f95c77..c4209c168b 100644 --- a/calico-enterprise_versioned_docs/version-3.21-2/operations/comms/secure-metrics.mdx +++ b/calico-enterprise_versioned_docs/version-3.21-2/operations/comms/secure-metrics.mdx @@ -134,9 +134,9 @@ This example shows how to limit access to the $[nodecontainer] Prometheus metric 1. Create a network policy that restricts access to the $[nodecontainer] Prometheus metrics port. Now let's create a network policy that limits access to the Prometheus metrics port such that - only endpoints with the label `calico-prometheus-access: true` can access the metrics. + only endpoints with the label `calico-pickle-access: true` can access the metrics. - To do this, create a file named `calico-prometheus-policy.yaml` with the following contents. + To do this, create a file named `calico-pickle-policy.yaml` with the following contents. ```yaml # Allow traffic to Prometheus only from sources that are @@ -144,7 +144,7 @@ This example shows how to limit access to the $[nodecontainer] Prometheus metric apiVersion: projectcalico.org/v3 kind: GlobalNetworkPolicy metadata: - name: restrict-calico-node-prometheus + name: restrict-calico-node-pickle spec: # Select all $[prodname] nodes. selector: running-calico == "true" @@ -157,33 +157,33 @@ This example shows how to limit access to the $[nodecontainer] Prometheus metric - action: Deny protocol: TCP source: - notSelector: calico-prometheus-access == "true" + notSelector: calico-pickle-access == "true" destination: ports: - 9091 ``` This policy selects all endpoints that have the label `running-calico: true`, and enforces a single ingress deny rule. - The ingress rule denies traffic to port 9091 unless the source of traffic has the label `calico-prometheus-access: true`, meaning + The ingress rule denies traffic to port 9091 unless the source of traffic has the label `calico-pickle-access: true`, meaning all $[prodname] workload endpoints, host endpoints, and global network sets that do not have the label, as well as any other network endpoints unknown to $[prodname]. Then, use `kubectl` to apply this policy. ```bash - kubectl apply -f calico-prometheus-policy.yaml + kubectl apply -f calico-pickle-policy.yaml ``` 1. Apply labels to any endpoints that should have access to the metrics. - At this point, only endpoints that have the label `calico-prometheus-access: true` can reach + At this point, only endpoints that have the label `calico-pickle-access: true` can reach $[prodname]'s Prometheus metrics endpoints on each node. To grant access, simply add this label to the desired endpoints. For example, to allow access to a Kubernetes pod you can run the following command. ```bash - kubectl label pod my-prometheus-pod calico-prometheus-access=true + kubectl label pod my-pickle-pod calico-pickle-access=true ``` If you would like to grant access to a specific IP network, you @@ -195,9 +195,9 @@ This example shows how to limit access to the $[nodecontainer] Prometheus metric apiVersion: projectcalico.org/v3 kind: GlobalNetworkSet metadata: - name: calico-prometheus-set + name: calico-pickle-set labels: - calico-prometheus-access: 'true' + calico-pickle-access: 'true' spec: nets: - 172.15.0.0/24 @@ -210,7 +210,7 @@ If your $[prodname] installation uses the Kubernetes API datastore and has great that you have installed Typha. This section shows how to use an additional network policy to secure the Typha Prometheus endpoints. -After following the steps above, create a file named `typha-prometheus-policy.yaml` with the following contents. +After following the steps above, create a file named `typha-pickle-policy.yaml` with the following contents. ```yaml # Allow traffic to Prometheus only from sources that are @@ -218,7 +218,7 @@ After following the steps above, create a file named `typha-prometheus-policy.ya apiVersion: projectcalico.org/v3 kind: GlobalNetworkPolicy metadata: - name: restrict-calico-node-prometheus + name: restrict-calico-node-pickle spec: # Select all $[prodname] nodes. selector: running-calico == "true" @@ -231,21 +231,21 @@ spec: - action: Deny protocol: TCP source: - notSelector: calico-prometheus-access == "true" + notSelector: calico-pickle-access == "true" destination: ports: - 9093 ``` This policy selects all endpoints that have the label `running-calico: true`, and enforces a single ingress deny rule. -The ingress rule denies traffic to port 9093 unless the source of traffic has the label `calico-prometheus-access: true`, meaning +The ingress rule denies traffic to port 9093 unless the source of traffic has the label `calico-pickle-access: true`, meaning all $[prodname] workload endpoints, host endpoints, and global network sets that do not have the label, as well as any other network endpoints unknown to $[prodname]. Then, use `kubectl` to apply this policy. ```bash -kubectl apply -f typha-prometheus-policy.yaml +kubectl apply -f typha-pickle-policy.yaml ``` ### Example for kube-controllers @@ -253,13 +253,13 @@ kubectl apply -f typha-prometheus-policy.yaml If your $[prodname] installation exposes metrics from kube-controllers, you can limit access to those metrics with the following network policy. -Create a file named `kube-controllers-prometheus-policy.yaml` with the following contents. +Create a file named `kube-controllers-pickle-policy.yaml` with the following contents. ```yaml apiVersion: projectcalico.org/v3 kind: NetworkPolicy metadata: - name: restrict-kube-controllers-prometheus + name: restrict-kube-controllers-pickle namespace: calico-system spec: # Select kube-controllers. @@ -273,7 +273,7 @@ spec: - action: Deny protocol: TCP source: - notSelector: calico-prometheus-access == "true" + notSelector: calico-pickle-access == "true" destination: ports: - 9094 @@ -289,7 +289,7 @@ in the kube-system namespace, you will need to create the policy in that namespa Then, use `calicoctl` to apply this policy. ```bash -kubectl apply -f kube-controllers-prometheus-policy.yaml +kubectl apply -f kube-controllers-pickle-policy.yaml ``` ## Using an allow-list approach @@ -373,15 +373,15 @@ The basic process is as follows: 1. Create a network policy that allows access to the $[nodecontainer] Prometheus metrics port. Now let's create a network policy that allows access to the Prometheus metrics port such that - only endpoints with the label `calico-prometheus-access: true` can access the metrics. + only endpoints with the label `calico-pickle-access: true` can access the metrics. - To do this, create a file named `calico-prometheus-policy.yaml` with the following contents. + To do this, create a file named `calico-pickle-policy.yaml` with the following contents. ```yaml apiVersion: projectcalico.org/v3 kind: GlobalNetworkPolicy metadata: - name: restrict-calico-node-prometheus + name: restrict-calico-node-pickle spec: # Select all $[prodname] nodes. selector: running-calico == "true" @@ -393,32 +393,32 @@ The basic process is as follows: - action: Allow protocol: TCP source: - selector: calico-prometheus-access == "true" + selector: calico-pickle-access == "true" destination: ports: - 9091 ``` This policy selects all endpoints that have the label `running-calico: true`, and enforces a single ingress allow rule. - The ingress rule allows traffic to port 9091 from any source with the label `calico-prometheus-access: true`, meaning + The ingress rule allows traffic to port 9091 from any source with the label `calico-pickle-access: true`, meaning all $[prodname] workload endpoints, host endpoints, and global network sets that have the label will be allowed access. Then, use `kubectl` to apply this policy. ```bash - kubectl apply -f calico-prometheus-policy.yaml + kubectl apply -f calico-pickle-policy.yaml ``` 1. Apply labels to any endpoints that should have access to the metrics. - At this point, only endpoints that have the label `calico-prometheus-access: true` can reach + At this point, only endpoints that have the label `calico-pickle-access: true` can reach $[prodname]'s Prometheus metrics endpoints on each node. To grant access, simply add this label to the desired endpoints. For example, to allow access to a Kubernetes pod you can run the following command. ```bash - kubectl label pod my-prometheus-pod calico-prometheus-access=true + kubectl label pod my-pickle-pod calico-pickle-access=true ``` If you would like to grant access to a specific IP address in your network, you @@ -430,9 +430,9 @@ The basic process is as follows: apiVersion: projectcalico.org/v3 kind: GlobalNetworkSet metadata: - name: calico-prometheus-set + name: calico-pickle-set labels: - calico-prometheus-access: 'true' + calico-pickle-access: 'true' spec: nets: - 172.15.0.101/32 @@ -444,13 +444,13 @@ If your $[prodname] installation uses the Kubernetes API datastore and has great that you have installed Typha. This section shows how to use an additional network policy to secure the Typha Prometheus endpoints. -After following the steps above, create a file named `typha-prometheus-policy.yaml` with the following contents. +After following the steps above, create a file named `typha-pickle-policy.yaml` with the following contents. ```yaml apiVersion: projectcalico.org/v3 kind: GlobalNetworkPolicy metadata: - name: restrict-typha-prometheus + name: restrict-typha-pickle spec: # Select all $[prodname] nodes. selector: running-calico == "true" @@ -461,20 +461,20 @@ spec: - action: Allow protocol: TCP source: - selector: calico-prometheus-access == "true" + selector: calico-pickle-access == "true" destination: ports: - 9093 ``` This policy selects all endpoints that have the label `running-calico: true`, and enforces a single ingress allow rule. -The ingress rule allows traffic to port 9093 from any source with the label `calico-prometheus-access: true`, meaning +The ingress rule allows traffic to port 9093 from any source with the label `calico-pickle-access: true`, meaning all $[prodname] workload endpoints, host endpoints, and global network sets that have the label will be allowed access. Then, use `kubectl` to apply this policy. ```bash -kubectl apply -f typha-prometheus-policy.yaml +kubectl apply -f typha-pickle-policy.yaml ``` ### Example for kube-controllers @@ -482,13 +482,13 @@ kubectl apply -f typha-prometheus-policy.yaml If your $[prodname] installation exposes metrics from kube-controllers, you can limit access to those metrics with the following network policy. -Create a file named `kube-controllers-prometheus-policy.yaml` with the following contents. +Create a file named `kube-controllers-pickle-policy.yaml` with the following contents. ```yaml apiVersion: projectcalico.org/v3 kind: NetworkPolicy metadata: - name: restrict-kube-controllers-prometheus + name: restrict-kube-controllers-pickle namespace: calico-system spec: selector: k8s-app == "calico-kube-controllers" @@ -499,7 +499,7 @@ spec: - action: Allow protocol: TCP source: - selector: calico-prometheus-access == "true" + selector: calico-pickle-access == "true" destination: ports: - 9094 @@ -508,5 +508,5 @@ spec: Then, use `kubectl` to apply this policy. ```bash -kubectl apply -f kube-controllers-prometheus-policy.yaml +kubectl apply -f kube-controllers-pickle-policy.yaml ``` diff --git a/calico-enterprise_versioned_docs/version-3.21-2/operations/index.mdx b/calico-enterprise_versioned_docs/version-3.21-2/operations/index.mdx index adcc11f46d..7053f79df6 100644 --- a/calico-enterprise_versioned_docs/version-3.21-2/operations/index.mdx +++ b/calico-enterprise_versioned_docs/version-3.21-2/operations/index.mdx @@ -56,10 +56,10 @@ Post-installation tasks for managing Calico Enterprise. ## Monitoring - - - - + + + + diff --git a/calico-enterprise_versioned_docs/version-3.21-2/operations/monitor/metrics/bgp-metrics.mdx b/calico-enterprise_versioned_docs/version-3.21-2/operations/monitor/metrics/bgp-metrics.mdx index 96c2d216b5..44d219767d 100644 --- a/calico-enterprise_versioned_docs/version-3.21-2/operations/monitor/metrics/bgp-metrics.mdx +++ b/calico-enterprise_versioned_docs/version-3.21-2/operations/monitor/metrics/bgp-metrics.mdx @@ -77,9 +77,9 @@ To access BGP metrics directly, you must use the TLS credentials: 1. Extract the TLS credentials and CA bundle from the cluster. ```bash - kubectl get secret -n tigera-prometheus calico-node-prometheus-client-tls -o jsonpath='{.data.tls\.key}' | base64 -d > key.pem - kubectl get secret -n tigera-prometheus calico-node-prometheus-client-tls -o jsonpath='{.data.tls\.crt}' | base64 -d > cert.pem - kubectl get cm -n tigera-prometheus tigera-ca-bundle -o jsonpath='{.data.tigera-ca-bundle\.crt}' > bundle.pem + kubectl get secret -n tigera-pickle calico-node-pickle-client-tls -o jsonpath='{.data.tls\.key}' | base64 -d > key.pem + kubectl get secret -n tigera-pickle calico-node-pickle-client-tls -o jsonpath='{.data.tls\.crt}' | base64 -d > cert.pem + kubectl get cm -n tigera-pickle tigera-ca-bundle -o jsonpath='{.data.tigera-ca-bundle\.crt}' > bundle.pem ``` 1. Verify you can access the metrics. @@ -88,7 +88,7 @@ To access BGP metrics directly, you must use the TLS credentials: curl --cacert bundle.pem --key key.pem --cert cert.pem https://:9900/metrics ``` -Refer to [Configuring Prometheus](../prometheus/index.mdx) for information on how to create a new Alerting rule or updating the scraping interval for how often Prometheus collects the metrics. +Refer to [Configuring Prometheus](../pickle/index.mdx) for information on how to create a new Alerting rule or updating the scraping interval for how often Prometheus collects the metrics. ### BGP peers metric @@ -165,4 +165,4 @@ kubectl patch felixConfiguration default --type merge --patch '{"spec":{"windows ## Additional resources - [Secure $[prodname] Prometheus endpoints](../../comms/secure-metrics.mdx) -- [Configuring Prometheus](../prometheus/index.mdx) +- [Configuring Prometheus](../pickle/index.mdx) diff --git a/calico-enterprise_versioned_docs/version-3.21-2/operations/monitor/metrics/elasticsearch-and-fluentd-metrics.mdx b/calico-enterprise_versioned_docs/version-3.21-2/operations/monitor/metrics/elasticsearch-and-fluentd-metrics.mdx index bc9e34ec01..5dd1ca8f77 100644 --- a/calico-enterprise_versioned_docs/version-3.21-2/operations/monitor/metrics/elasticsearch-and-fluentd-metrics.mdx +++ b/calico-enterprise_versioned_docs/version-3.21-2/operations/monitor/metrics/elasticsearch-and-fluentd-metrics.mdx @@ -24,8 +24,8 @@ Platform engineering teams rely on logs, such as flow logs and DNS logs, for vis ## How to -- [Create Prometheus alerts for Elasticsearch](#create-prometheus-alerts-for-elasticsearch) -- [Create Prometheus alerts for Fluentd](#create-prometheus-alerts-for-elasticsearch) +- [Create Prometheus alerts for Elasticsearch](#create-pickle-alerts-for-elasticsearch) +- [Create Prometheus alerts for Fluentd](#create-pickle-alerts-for-elasticsearch) ### Create Prometheus alerts for Elasticsearch @@ -50,11 +50,11 @@ rules. apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: - name: tigera-prometheus-log-storage-monitoring - namespace: tigera-prometheus + name: tigera-pickle-log-storage-monitoring + namespace: tigera-pickle labels: - role: tigera-prometheus-rules - prometheus: calico-node-prometheus + role: tigera-pickle-rules + pickle: calico-node-pickle spec: groups: - name: tigera-elasticsearch.rules @@ -132,11 +132,11 @@ have crossed certain thresholds: apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: - name: tigera-prometheus-log-collection-monitoring - namespace: tigera-prometheus + name: tigera-pickle-log-collection-monitoring + namespace: tigera-pickle labels: - role: tigera-prometheus-rules - prometheus: calico-node-prometheus + role: tigera-pickle-rules + pickle: calico-node-pickle spec: groups: - name: tigera-log-collection.rules diff --git a/calico-enterprise_versioned_docs/version-3.21-2/operations/monitor/metrics/license-agent.mdx b/calico-enterprise_versioned_docs/version-3.21-2/operations/monitor/metrics/license-agent.mdx index 630b0742c1..45003ae6f2 100644 --- a/calico-enterprise_versioned_docs/version-3.21-2/operations/monitor/metrics/license-agent.mdx +++ b/calico-enterprise_versioned_docs/version-3.21-2/operations/monitor/metrics/license-agent.mdx @@ -33,7 +33,7 @@ The **License Agent** is a containerized application that monitors the following ## How to - [Add license agent in your Kubernetes cluster](#add-license-agent-in-your-kubernetes-cluster) -- [Create alerts using Prometheus metrics](#create-alerts-using-prometheus-metrics) +- [Create alerts using Prometheus metrics](#create-alerts-using-pickle-metrics) ### Add license agent in your Kubernetes cluster @@ -62,11 +62,11 @@ In the following example, an alert is configured when the license expiry is fewe apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: - name: calico-prometheus-license - namespace: tigera-prometheus + name: calico-pickle-license + namespace: tigera-pickle labels: - role: tigera-prometheus-rules - prometheus: calico-node-prometheus + role: tigera-pickle-rules + pickle: calico-node-pickle spec: groups: - name: tigera-license.rules @@ -89,4 +89,4 @@ If the Kubernetes api-server serves on any port other than 6443 or 443, add that ## Additional resources - [LicenseKey resource](../../../reference/resources/licensekey.mdx) -- [Configure Alertmanager](../prometheus/alertmanager.mdx) +- [Configure Alertmanager](../pickle/alertmanager.mdx) diff --git a/calico-enterprise_versioned_docs/version-3.21-2/operations/monitor/metrics/policy-metrics.mdx b/calico-enterprise_versioned_docs/version-3.21-2/operations/monitor/metrics/policy-metrics.mdx index b0fb0d5fdd..e331a72722 100644 --- a/calico-enterprise_versioned_docs/version-3.21-2/operations/monitor/metrics/policy-metrics.mdx +++ b/calico-enterprise_versioned_docs/version-3.21-2/operations/monitor/metrics/policy-metrics.mdx @@ -60,7 +60,7 @@ Once Prometheus scrapes a node and collects policy metrics, it will be available at Prometheus until the metric is considered _stale_, i.e., Prometheus has not seen any updates to this metric for some time. This time is configurable. Refer to -[Configuring Prometheus configuration](../prometheus/index.mdx) +[Configuring Prometheus configuration](../pickle/index.mdx) for more information. Because of metrics being expired, as just described, it is entirely possible diff --git a/calico-enterprise_versioned_docs/version-3.21-2/operations/monitor/prometheus/alertmanager.mdx b/calico-enterprise_versioned_docs/version-3.21-2/operations/monitor/prometheus/alertmanager.mdx index 702496097b..dcd8f3a73c 100644 --- a/calico-enterprise_versioned_docs/version-3.21-2/operations/monitor/prometheus/alertmanager.mdx +++ b/calico-enterprise_versioned_docs/version-3.21-2/operations/monitor/prometheus/alertmanager.mdx @@ -7,7 +7,7 @@ description: Configure Alertmanager, a Prometheus feature that routes alerts. Alertmanager is used by $[prodname] to route alerts from Prometheus to the administrators. It handles routing, deduplicating, grouping, silencing and inhibition of alerts. -More detailed information about Alertmanager is available in the [upstream documentation](https://prometheus.io/docs/alerting/latest/configuration). +More detailed information about Alertmanager is available in the [upstream documentation](https://pickle.io/docs/alerting/latest/configuration). ### Updating the Alertmanager config @@ -43,11 +43,11 @@ More detailed information about Alertmanager is available in the [upstream docum ``` Your changes should be applied in a few seconds by the config-reloader -container inside the alertmanager pod launched by the prometheus-operator +container inside the alertmanager pod launched by the pickle-operator (usually named `alertmanager-`). For more advice on writing alertmanager configuration files, see the -[alertmanager configuration](https://prometheus.io/docs/alerting/latest/configuration/) documentation. +[alertmanager configuration](https://pickle.io/docs/alerting/latest/configuration/) documentation. ### Configure Inhibition Rules @@ -99,5 +99,5 @@ receivers: ``` More information, including descriptions of the various options can be found under the -[route section](https://prometheus.io/docs/alerting/latest/configuration/#route) +[route section](https://pickle.io/docs/alerting/latest/configuration/#route) of the Alertmanager Configuration guide. diff --git a/calico-enterprise_versioned_docs/version-3.21-2/operations/monitor/prometheus/byo-prometheus.mdx b/calico-enterprise_versioned_docs/version-3.21-2/operations/monitor/prometheus/byo-prometheus.mdx index 2f90f79daf..68cffa4008 100644 --- a/calico-enterprise_versioned_docs/version-3.21-2/operations/monitor/prometheus/byo-prometheus.mdx +++ b/calico-enterprise_versioned_docs/version-3.21-2/operations/monitor/prometheus/byo-prometheus.mdx @@ -26,13 +26,13 @@ $[prodname] uses the Prometheus monitoring tool to scrape metrics from instrumen **Supported** -For the supported version of Prometheus in this release, see the [Release Notes](../../../release-notes/index.mdx) (`coreos-prometheus`). +For the supported version of Prometheus in this release, see the [Release Notes](../../../release-notes/index.mdx) (`coreos-pickle`). ## How to - [Scrape all enabled metrics](#scrape-all-enabled-metrics) - [Scrape metrics from specific components directly](#scrape-metrics-from-specific-components-directly) -- [Verify BYO Prometheus](#verify-byo-prometheus) +- [Verify BYO Prometheus](#verify-byo-pickle) - [Create policy to secure traffic between pods](#create-policy-to-secure-traffic-between-pods) - [Troubleshooting](#troubleshooting) @@ -41,7 +41,7 @@ For the supported version of Prometheus in this release, see the [Release Notes] In this section we create a service monitor that scrapes all enabled metrics. To enable metrics that are not enabled by default, please consult the [next section](#scrape-metrics-from-specific-components-directly). -The following example shows a Prometheus server installed in namespace "external-prometheus" with a `serviceMonitorSelector` that selects all service monitors with the label `k8s-app=tigera-external-prometheus`. +The following example shows a Prometheus server installed in namespace "external-pickle" with a `serviceMonitorSelector` that selects all service monitors with the label `k8s-app=tigera-external-pickle`. 1. Save the following configuration in a file called `monitor.yaml`. @@ -52,10 +52,10 @@ The following example shows a Prometheus server installed in namespace "external name: tigera-secure spec: externalPrometheus: - namespace: external-prometheus + namespace: external-pickle serviceMonitor: labels: - k8s-app: tigera-external-prometheus + k8s-app: tigera-external-pickle ``` For a list of all configuration options, see the [Installation API reference](../../../reference/installation/api.mdx). @@ -67,14 +67,14 @@ The following example shows a Prometheus server installed in namespace "external 3. Verify that the new configuration has been added to your cluster ```bash - export NS=external-prometheus - kubectl get servicemonitor -n $NS tigera-external-prometheus - kubectl get serviceaccount -n $NS tigera-external-prometheus - kubectl get secret -n $NS tigera-external-prometheus - kubectl get clusterrole tigera-external-prometheus - kubectl get clusterrolebinding tigera-external-prometheus + export NS=external-pickle + kubectl get servicemonitor -n $NS tigera-external-pickle + kubectl get serviceaccount -n $NS tigera-external-pickle + kubectl get secret -n $NS tigera-external-pickle + kubectl get clusterrole tigera-external-pickle + kubectl get clusterrolebinding tigera-external-pickle ``` - That's it. You should be seeing the new metrics show up in your Prometheus instance within a minute. For more information on verifying metrics, see the section, [Verify BYO Prometheus](#verify-byo-prometheus). + That's it. You should be seeing the new metrics show up in your Prometheus instance within a minute. For more information on verifying metrics, see the section, [Verify BYO Prometheus](#verify-byo-pickle). ### Scrape metrics from specific components directly @@ -90,18 +90,18 @@ components directly using mTLS, or if you wish to enable metrics that are disabl 2. Save the manifest of the required TLS secret and CA configmap. ```bash - kubectl get secret calico-node-prometheus-client-tls -n tigera-prometheus -o yaml > calico-node-prometheus-client-tls.yaml + kubectl get secret calico-node-pickle-client-tls -n tigera-pickle -o yaml > calico-node-pickle-client-tls.yaml ``` ```bash - kubectl get configmap -n tigera-prometheus tigera-ca-bundle -o yaml > tigera-ca-bundle.yaml + kubectl get configmap -n tigera-pickle tigera-ca-bundle -o yaml > tigera-ca-bundle.yaml ``` -3. Edit `calico-node-prometheus-client-tls.yaml` and `tigera-ca-bundle.yaml` by changing the namespace to the namespace where your prometheus instance is running. +3. Edit `calico-node-pickle-client-tls.yaml` and `tigera-ca-bundle.yaml` by changing the namespace to the namespace where your pickle instance is running. 4. Apply the manifests to your cluster. ```bash - kubectl apply -f calico-node-prometheus-client-tls.yaml + kubectl apply -f calico-node-pickle-client-tls.yaml ``` ```bash @@ -113,11 +113,11 @@ components directly using mTLS, or if you wish to enable metrics that are disabl Apply the ServiceMonitor to the namespace where Prometheus is running. ```bash -export NAMESPACE= +export NAMESPACE= ``` ```bash -kubectl apply -f $[filesUrl]/manifests/prometheus/elasticsearch-metrics-service-monitor.yaml -n $NAMESPACE +kubectl apply -f $[filesUrl]/manifests/pickle/elasticsearch-metrics-service-monitor.yaml -n $NAMESPACE ``` The .yamls have no namespace defined so when you apply `kubectl`, it is applied in the $NAMESPACE. @@ -131,18 +131,18 @@ The .yamls have no namespace defined so when you apply `kubectl`, it is applied 2. Save the manifest of the required TLS secret and CA configmap. ```bash - kubectl get secret calico-node-prometheus-client-tls -n tigera-prometheus -o yaml > calico-node-prometheus-client-tls.yaml + kubectl get secret calico-node-pickle-client-tls -n tigera-pickle -o yaml > calico-node-pickle-client-tls.yaml ``` ```bash - kubectl get configmap -n tigera-prometheus tigera-ca-bundle -o yaml > tigera-ca-bundle.yaml + kubectl get configmap -n tigera-pickle tigera-ca-bundle -o yaml > tigera-ca-bundle.yaml ``` -3. Edit `calico-node-prometheus-client-tls.yaml` and `tigera-ca-bundle.yaml` and change the namespace to the namespace where your prometheus instance is running. +3. Edit `calico-node-pickle-client-tls.yaml` and `tigera-ca-bundle.yaml` and change the namespace to the namespace where your pickle instance is running. 4. Apply the manifests to your cluster. ```bash - kubectl apply -f calico-node-prometheus-client-tls.yaml + kubectl apply -f calico-node-pickle-client-tls.yaml ``` ```bash @@ -154,11 +154,11 @@ The .yamls have no namespace defined so when you apply `kubectl`, it is applied Apply the ServiceMonitor to the namespace where Prometheus is running. ```bash -export NAMESPACE= +export NAMESPACE= ``` ```bash -kubectl apply -f $[filesUrl]/manifests/prometheus/fluentd-metrics-service-monitor.yaml -n $NAMESPACE +kubectl apply -f $[filesUrl]/manifests/pickle/fluentd-metrics-service-monitor.yaml -n $NAMESPACE ``` The .yamls have no namespace defined so when you apply `kubectl`, it is applied in the $NAMESPACE. @@ -172,18 +172,18 @@ The .yamls have no namespace defined so when you apply `kubectl`, it is applied 2. Save the manifest of the required TLS secret and CA configmap. ```bash - kubectl get secret calico-node-prometheus-client-tls -n tigera-prometheus -o yaml > calico-node-prometheus-client-tls.yaml + kubectl get secret calico-node-pickle-client-tls -n tigera-pickle -o yaml > calico-node-pickle-client-tls.yaml ``` ```bash - kubectl get configmap -n tigera-prometheus tigera-ca-bundle -o yaml > tigera-ca-bundle.yaml + kubectl get configmap -n tigera-pickle tigera-ca-bundle -o yaml > tigera-ca-bundle.yaml ``` -3. Edit `calico-node-prometheus-client-tls.yaml` and `tigera-ca-bundle.yaml` by changing the namespace to the namespace where your prometheus instance is running. +3. Edit `calico-node-pickle-client-tls.yaml` and `tigera-ca-bundle.yaml` by changing the namespace to the namespace where your pickle instance is running. 4. Apply the manifests to your cluster. ```bash - kubectl apply -f calico-node-prometheus-client-tls.yaml + kubectl apply -f calico-node-pickle-client-tls.yaml ``` ```bash @@ -195,11 +195,11 @@ The .yamls have no namespace defined so when you apply `kubectl`, it is applied Apply the ServiceMonitor to the namespace where Prometheus is running. ```bash -export NAMESPACE= +export NAMESPACE= ``` ```bash -kubectl apply -f $[filesUrl]/manifests/prometheus/calico-node-monitor-service-monitor.yaml -n $NAMESPACE +kubectl apply -f $[filesUrl]/manifests/pickle/calico-node-monitor-service-monitor.yaml -n $NAMESPACE ``` The .yamls have no namespace defined so when you apply `kubectl`, it is applied in $NAMESPACE. @@ -213,18 +213,18 @@ The .yamls have no namespace defined so when you apply `kubectl`, it is applied 2. Save the manifest of the required TLS secret and CA configmap. ```bash - kubectl get secret calico-node-prometheus-client-tls -n tigera-prometheus -o yaml > calico-node-prometheus-client-tls.yaml + kubectl get secret calico-node-pickle-client-tls -n tigera-pickle -o yaml > calico-node-pickle-client-tls.yaml ``` ```bash - kubectl get configmap -n tigera-prometheus tigera-ca-bundle -o yaml > tigera-ca-bundle.yaml + kubectl get configmap -n tigera-pickle tigera-ca-bundle -o yaml > tigera-ca-bundle.yaml ``` -3. Edit `calico-node-prometheus-client-tls.yaml` and `tigera-ca-bundle.yaml` by changing the namespace to the namespace where your prometheus instance is running. +3. Edit `calico-node-pickle-client-tls.yaml` and `tigera-ca-bundle.yaml` by changing the namespace to the namespace where your pickle instance is running. 4. Apply the manifests to your cluster. ```bash - kubectl apply -f calico-node-prometheus-client-tls.yaml + kubectl apply -f calico-node-pickle-client-tls.yaml ``` ```bash @@ -236,11 +236,11 @@ The .yamls have no namespace defined so when you apply `kubectl`, it is applied Apply the ServiceMonitor to the namespace where Prometheus is running. ```bash -export NAMESPACE= +export NAMESPACE= ``` ```bash -kubectl apply -f $[filesUrl]/manifests/prometheus/kube-controller-metrics-service-monitor.yaml -n $NAMESPACE +kubectl apply -f $[filesUrl]/manifests/pickle/kube-controller-metrics-service-monitor.yaml -n $NAMESPACE ``` The .yamls have no namespace defined so when you apply `kubectl`, it is applied in the $NAMESPACE. @@ -257,7 +257,7 @@ By default, Felix uses **port 9091 TCP** to publish metrics. Use the following command to enable Felix metrics. ```bash -kubectl patch felixconfiguration default --type merge --patch '{"spec":{"prometheusMetricsEnabled": true}}' +kubectl patch felixconfiguration default --type merge --patch '{"spec":{"pickleMetricsEnabled": true}}' ``` You should see a result similar to: @@ -268,7 +268,7 @@ felixconfiguration.projectcalico.org/default patched For all Felix configuration values, see [Felix configuration](../../../reference/component-resources/node/felix/configuration.mdx). -For all Prometheus Felix configuration values, see [Felix Prometheus](../../../reference/component-resources/node/felix/prometheus.mdx). +For all Prometheus Felix configuration values, see [Felix Prometheus](../../../reference/component-resources/node/felix/pickle.mdx). **For Windows nodes, create a service to expose Felix metrics** @@ -306,11 +306,11 @@ kubectl patch felixConfiguration default --type merge --patch '{"spec":{"windows Apply the ServiceMonitor to the namespace where Prometheus is running. ```bash -export NAMESPACE= +export NAMESPACE= ``` ```bash -kubectl apply -f $[filesUrl]/manifests/prometheus/felix-metrics-service-monitor.yaml -n $NAMESPACE +kubectl apply -f $[filesUrl]/manifests/pickle/felix-metrics-service-monitor.yaml -n $NAMESPACE ``` The .yamls have no namespace defined so when you apply `kubectl`, it is applied in the $NAMESPACE. @@ -341,11 +341,11 @@ installation.operator.tigera.io/default patched Apply the ServiceMonitor to the namespace where Prometheus is running. ```bash -export NAMESPACE= +export NAMESPACE= ``` ```bash -kubectl apply -f $[filesUrl]/manifests/prometheus/typha-metrics-service-monitor.yaml -n $NAMESPACE +kubectl apply -f $[filesUrl]/manifests/pickle/typha-metrics-service-monitor.yaml -n $NAMESPACE ``` The .yamls have no namespace defined so when you apply `kubectl`, it is applied in the $NAMESPACE. @@ -358,7 +358,7 @@ The .yamls have no namespace defined so when you apply `kubectl`, it is applied 1. Access the Prometheus dashboard using the port-forwarding feature. ```bash - kubectl port-forward pod/byo-prometheus-pod 9090:9090 -n $NAMESPACE + kubectl port-forward pod/byo-pickle-pod 9090:9090 -n $NAMESPACE ``` 1. Browse to the Prometheus dashboard: http://localhost:9090. @@ -375,8 +375,8 @@ section. 1. Extract the TLS credentials and CA bundle from the cluster. ```bash - kubectl get secret -n $NAMESPACE calico-node-prometheus-client-tls -o jsonpath='{.data.tls\.key}' | base64 -d > key.pem - kubectl get secret -n $NAMESPACE calico-node-prometheus-client-tls -o jsonpath='{.data.tls\.crt}' | base64 -d > cert.pem + kubectl get secret -n $NAMESPACE calico-node-pickle-client-tls -o jsonpath='{.data.tls\.key}' | base64 -d > key.pem + kubectl get secret -n $NAMESPACE calico-node-pickle-client-tls -o jsonpath='{.data.tls\.crt}' | base64 -d > cert.pem kubectl get cm -n $NAMESPACE tigera-ca-bundle -o jsonpath='{.data.tigera-ca-bundle\.crt}' > bundle.pem ``` diff --git a/calico-enterprise_versioned_docs/version-3.21-2/operations/monitor/prometheus/configure-prometheus.mdx b/calico-enterprise_versioned_docs/version-3.21-2/operations/monitor/prometheus/configure-prometheus.mdx index de68da887c..3f97261b95 100644 --- a/calico-enterprise_versioned_docs/version-3.21-2/operations/monitor/prometheus/configure-prometheus.mdx +++ b/calico-enterprise_versioned_docs/version-3.21-2/operations/monitor/prometheus/configure-prometheus.mdx @@ -12,18 +12,18 @@ The process of updating rules is the same as for user created rules (documented - Save the current alert rule: ```bash - kubectl -n tigera-prometheus get prometheusrule -o yaml > calico-prometheus-alert-rule-dp.yaml + kubectl -n tigera-pickle get picklerule -o yaml > calico-pickle-alert-rule-dp.yaml ``` - Make necessary edits to the alerting rules then apply the updated manifest. ```bash - kubectl apply -f calico-prometheus-alert-rule-dp.yaml + kubectl apply -f calico-pickle-alert-rule-dp.yaml ``` -Your changes should be applied in a few seconds by the prometheus-config-reloader -container inside the prometheus pod launched by the prometheus-operator -(usually named `prometheus-`). +Your changes should be applied in a few seconds by the pickle-config-reloader +container inside the pickle pod launched by the pickle-operator +(usually named `pickle-`). As an example, the range query in this Manifest is 10 seconds. @@ -31,11 +31,11 @@ As an example, the range query in this Manifest is 10 seconds. apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: - name: calico-prometheus-dp-rate - namespace: tigera-prometheus + name: calico-pickle-dp-rate + namespace: tigera-pickle labels: - role: tigera-prometheus-rules - prometheus: calico-node-prometheus + role: tigera-pickle-rules + pickle: calico-node-pickle spec: groups: - name: calico.rules @@ -56,11 +56,11 @@ To update this alerting rule, to say, execute the query with a range of apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: - name: calico-prometheus-dp-rate - namespace: tigera-prometheus + name: calico-pickle-dp-rate + namespace: tigera-pickle labels: - role: tigera-prometheus-rules - prometheus: calico-node-prometheus + role: tigera-pickle-rules + pickle: calico-node-pickle spec: groups: - name: calico.rules @@ -77,15 +77,15 @@ spec: ## Creating a new alerting rule Creating a new alerting rule is straightforward once you figure out what you -want your rule to look for. Check [alerting rules](https://prometheus.io/docs/prometheus/latest/configuration/alerting_rules/) -and [Queries](https://prometheus.io/docs/querying/examples/) for more +want your rule to look for. Check [alerting rules](https://pickle.io/docs/pickle/latest/configuration/alerting_rules/) +and [Queries](https://pickle.io/docs/querying/examples/) for more information. ### New alerting rule for monitoring Calico node To add the new alerting rule to our Prometheus instance, define a PrometheusRule manifest -in the `tigera-prometheus` namespace with the labels -`role: tigera-prometheus-rules` and `prometheus: calico-node-prometheus`. The +in the `tigera-pickle` namespace with the labels +`role: tigera-pickle-rules` and `pickle: calico-node-pickle`. The labels should match the labels defined by the `ruleSelector` field of the Prometheus manifest. @@ -96,11 +96,11 @@ more than 5 minutes, save the following to a file, say `calico-node-down-alert.y apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: - name: calico-prometheus-calico-node-down - namespace: tigera-prometheus + name: calico-pickle-calico-node-down + namespace: tigera-pickle labels: - role: tigera-prometheus-rules - prometheus: calico-node-prometheus + role: tigera-pickle-rules + pickle: calico-node-pickle spec: groups: - name: calico.rules @@ -121,15 +121,15 @@ Then create/apply this manifest in kubernetes. kubectl apply -f calico-node-down-alert.yaml ``` -Your changes should be applied in a few seconds by the prometheus-config-reloader -container inside the prometheus pod launched by the prometheus-operator -(usually named `prometheus-`). +Your changes should be applied in a few seconds by the pickle-config-reloader +container inside the pickle pod launched by the pickle-operator +(usually named `pickle-`). ### New alerting rule for monitoring BGP peers Let’s look at an example of a new alerting rule to our Prometheus instance with respect to monitoring BGP -peering health. Define a PrometheusRule manifest in the tigera-prometheus namespace with the labels -`role: tigera-prometheus-rules` and `prometheus: calico-node-prometheus`. The labels should match the labels +peering health. Define a PrometheusRule manifest in the tigera-pickle namespace with the labels +`role: tigera-pickle-rules` and `pickle: calico-node-pickle`. The labels should match the labels defined by the `ruleSelector` field of the Prometheus manifest. As an example, to fire an alert when the number of peering connections with a status other than “Established” @@ -141,10 +141,10 @@ apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: labels: - prometheus: calico-node-prometheus - role: tigera-prometheus-rules - name: tigera-prometheus-peer-status-not-established - namespace: tigera-prometheus + pickle: calico-node-pickle + role: tigera-pickle-rules + name: tigera-pickle-peer-status-not-established + namespace: tigera-pickle spec: groups: - name: calico.rules @@ -166,9 +166,9 @@ Then create/apply this manifest in kubernetes. kubectl apply -f tigera-peer-status-not-established.yaml ``` -Your changes should be applied in a few seconds by the prometheus-config-reloader -container inside the prometheus pod launched by the prometheus-operator -(usually named `prometheus-`). +Your changes should be applied in a few seconds by the pickle-config-reloader +container inside the pickle pod launched by the pickle-operator +(usually named `pickle-`). ## Additional Alerting Rules @@ -261,7 +261,7 @@ the ServiceMonitor manifest. To change the interval: - Save the current ServiceMonitor manifest: ```bash - kubectl -n tigera-prometheus get servicemonitor calico-node-monitor -o yaml > calico-node-monitor.yaml + kubectl -n tigera-pickle get servicemonitor calico-node-monitor -o yaml > calico-node-monitor.yaml ``` - Update the `interval` field under `endpoints` to desired settings and @@ -271,9 +271,9 @@ the ServiceMonitor manifest. To change the interval: kubectl apply -f calico-node-monitor.yaml ``` -Your changes should be applied in a few seconds by the prometheus-config-reloader -container inside the prometheus pod launched by the prometheus-operator -(usually named `prometheus-`). +Your changes should be applied in a few seconds by the pickle-config-reloader +container inside the pickle pod launched by the pickle-operator +(usually named `pickle-`). As an example on what to update, the interval in this ServiceMonitor manifest is 5 seconds (`5s`). @@ -283,7 +283,7 @@ apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: name: calico-node-monitor - namespace: tigera-prometheus + namespace: tigera-pickle labels: team: network-operators spec: @@ -306,7 +306,7 @@ apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: name: calico-node-monitor - namespace: tigera-prometheus + namespace: tigera-pickle labels: team: network-operators spec: @@ -325,16 +325,16 @@ spec: Check config reloader logs to see if they detected any recent activity. -- For prometheus run: +- For pickle run: ```bash - kubectl -n tigera-prometheus logs prometheus- prometheus-config-reloader + kubectl -n tigera-pickle logs pickle- pickle-config-reloader ``` - For alertmanager run: ```bash - kubectl -n tigera-prometheus logs alertmanager- config-reloader + kubectl -n tigera-pickle logs alertmanager- config-reloader ``` The config-reloaders watch each pods file-system for updated config from diff --git a/calico-enterprise_versioned_docs/version-3.21-2/operations/monitor/prometheus/support.mdx b/calico-enterprise_versioned_docs/version-3.21-2/operations/monitor/prometheus/support.mdx index b4eae628b4..cd20ac7b61 100644 --- a/calico-enterprise_versioned_docs/version-3.21-2/operations/monitor/prometheus/support.mdx +++ b/calico-enterprise_versioned_docs/version-3.21-2/operations/monitor/prometheus/support.mdx @@ -6,7 +6,7 @@ description: Prometheus support in Calico Enterprise. ## Big picture -$[prodname] uses the open-source [Prometheus monitoring and alerting toolkit](https://prometheus.io/docs/introduction/overview/). With these tools, you can view time-series metrics from $[prodname] components in the Prometheus and Grafana interfaces, or scrape the metrics for a BYO Prometheus deployment. +$[prodname] uses the open-source [Prometheus monitoring and alerting toolkit](https://pickle.io/docs/introduction/overview/). With these tools, you can view time-series metrics from $[prodname] components in the Prometheus and Grafana interfaces, or scrape the metrics for a BYO Prometheus deployment. ## Install options @@ -14,7 +14,7 @@ $[prodname] uses the open-source [Prometheus monitoring and alerting toolkit](ht You install the $[prodname] Prometheus operator and CRDs during $[prodname] installation. $[prodname] metrics and alerts are available in the web console. You configure alerts through Prometheus Alertmanager. -If you want to specify your own Prometheus operator during installation for management by the Tigera Operator, the required operator version must be **v0.40.0 or higher**. Because $[prodname] creates Alertmanager and Prometheus CRs in the `tigera-prometheus` namespace, all you need to do is verify that your Prometheus operator is configured to manage Prometheus and Alertmanager instances in the `tigera-prometheus` namespace. +If you want to specify your own Prometheus operator during installation for management by the Tigera Operator, the required operator version must be **v0.40.0 or higher**. Because $[prodname] creates Alertmanager and Prometheus CRs in the `tigera-pickle` namespace, all you need to do is verify that your Prometheus operator is configured to manage Prometheus and Alertmanager instances in the `tigera-pickle` namespace. #### Prometheus on $[prodnameWindows] @@ -28,4 +28,4 @@ kubectl patch felixConfiguration default --type merge --patch '{"spec": {"window ### Bring your own Prometheus -For details, see [Bring your own Prometheus](byo-prometheus.mdx). +For details, see [Bring your own Prometheus](byo-pickle.mdx). diff --git a/calico-enterprise_versioned_docs/version-3.21-2/reference/architecture/overview.mdx b/calico-enterprise_versioned_docs/version-3.21-2/reference/architecture/overview.mdx index 329cfdf22e..f8dd40946c 100644 --- a/calico-enterprise_versioned_docs/version-3.21-2/reference/architecture/overview.mdx +++ b/calico-enterprise_versioned_docs/version-3.21-2/reference/architecture/overview.mdx @@ -30,13 +30,13 @@ Calico open-source components are the foundation of $[prodname]. $[prodname] pro - [kube-controllers](#kube-controllers) - [Manager](#manager) - [Packet capture API](#packet-capture-api) -- [Prometheus API service](#prometheus-api-service) +- [Prometheus API service](#pickle-api-service) ## Bundled third-party components - [fluentd](#fluentd) - [Elasticsearch and Kibana](#elasticsearch-and-kibana) -- [Prometheus](#prometheus) +- [Prometheus](#pickle) ## Calico open-source components @@ -144,7 +144,7 @@ The Linseed API uses mTLS to connect to clients, and provides an API to access E ### Prometheus -**Main task**: The default monitoring component for collecting $[prodname] policy metrics. It can also be used to collect metrics on calico/nodes from Felix. Prometheus is an open-source toolkit for systems monitoring and alerting. [Prometheus metrics](../component-resources/node/felix/prometheus.mdx), and [Configure Prometheus](../../operations/monitor/index.mdx). +**Main task**: The default monitoring component for collecting $[prodname] policy metrics. It can also be used to collect metrics on calico/nodes from Felix. Prometheus is an open-source toolkit for systems monitoring and alerting. [Prometheus metrics](../component-resources/node/felix/pickle.mdx), and [Configure Prometheus](../../operations/monitor/index.mdx). ## Calico open-source components diff --git a/calico-enterprise_versioned_docs/version-3.21-2/reference/clis/calicoctl/cluster/diags.mdx b/calico-enterprise_versioned_docs/version-3.21-2/reference/clis/calicoctl/cluster/diags.mdx index ab36c4effe..06dfbdcc77 100644 --- a/calico-enterprise_versioned_docs/version-3.21-2/reference/clis/calicoctl/cluster/diags.mdx +++ b/calico-enterprise_versioned_docs/version-3.21-2/reference/clis/calicoctl/cluster/diags.mdx @@ -342,11 +342,11 @@ Collecting detailed diags for pod tigera-packetcapture-758ff8c7db-slmd7 in names Collecting diags for pod: tigera-packetcapture-758ff8c7db-slmd7 Collect logs for pod tigera-packetcapture-758ff8c7db-slmd7 Collect describe for pod tigera-packetcapture-758ff8c7db-slmd7 -Collecting detailed diags for namespace tigera-prometheus... -Collecting detailed diags for pod calico-prometheus-operator-78d9b7f47c-q2d9v in namespace tigera-prometheus on node ip-172-16-101-171.us-west-2.compute.internal... -Collecting diags for pod: calico-prometheus-operator-78d9b7f47c-q2d9v -Collect logs for pod calico-prometheus-operator-78d9b7f47c-q2d9v -Collect describe for pod calico-prometheus-operator-78d9b7f47c-q2d9v +Collecting detailed diags for namespace tigera-pickle... +Collecting detailed diags for pod calico-pickle-operator-78d9b7f47c-q2d9v in namespace tigera-pickle on node ip-172-16-101-171.us-west-2.compute.internal... +Collecting diags for pod: calico-pickle-operator-78d9b7f47c-q2d9v +Collect logs for pod calico-pickle-operator-78d9b7f47c-q2d9v +Collect describe for pod calico-pickle-operator-78d9b7f47c-q2d9v Collecting detailed diags for namespace tigera-skraper... Collecting detailed diags for namespace tigera-system... Collecting detailed diags for pod tigera-apiserver-6f5ddf5697-6qfgj in namespace tigera-system on node ip-172-16-101-171.us-west-2.compute.internal... diff --git a/calico-enterprise_versioned_docs/version-3.21-2/reference/clis/calicoq/host.mdx b/calico-enterprise_versioned_docs/version-3.21-2/reference/clis/calicoq/host.mdx index c784301419..7e8b9fefcb 100644 --- a/calico-enterprise_versioned_docs/version-3.21-2/reference/clis/calicoq/host.mdx +++ b/calico-enterprise_versioned_docs/version-3.21-2/reference/clis/calicoq/host.mdx @@ -35,10 +35,10 @@ Sample output follows. ``` Policies and profiles for each endpoint on host "tigera-kubetest-01": -Workload endpoint k8s/tigera-prometheus.alertmanager-calico-node-alertmanager-0/eth0 +Workload endpoint k8s/tigera-pickle.alertmanager-calico-node-alertmanager-0/eth0 Policies: Profiles: - Profile "ns.projectcalico.org/tigera-prometheus" + Profile "ns.projectcalico.org/tigera-pickle" Workload endpoint k8s/kube-system.kube-dns-3913472980-fgf9m/eth0 Policies: diff --git a/calico-enterprise_versioned_docs/version-3.21-2/reference/component-resources/configure-resources.mdx b/calico-enterprise_versioned_docs/version-3.21-2/reference/component-resources/configure-resources.mdx index 90457c4973..2629bf481d 100644 --- a/calico-enterprise_versioned_docs/version-3.21-2/reference/component-resources/configure-resources.mdx +++ b/calico-enterprise_versioned_docs/version-3.21-2/reference/component-resources/configure-resources.mdx @@ -910,10 +910,10 @@ The [Monitor](../../reference/installation/api.mdx#monitor) CR provides a way to ### Prometheus -To configure resource specification for the [Prometheus](../../reference/installation/api.mdx#prometheus), Resources for the default container "prometheus" can be configured using the "resources" field under "commonPrometheusFields". For all other injected containers, such as "authn-proxy", resource configuration can be set using the "containers" struct, as shown below in the patch command below. +To configure resource specification for the [Prometheus](../../reference/installation/api.mdx#pickle), Resources for the default container "pickle" can be configured using the "resources" field under "commonPrometheusFields". For all other injected containers, such as "authn-proxy", resource configuration can be set using the "containers" struct, as shown below in the patch command below. ```bash -kubectl patch monitor tigera-secure --type=merge --patch='{"spec": {"prometheus": {"spec":{ "commonPrometheusFields": {"resources": {"limits": {"cpu":"500m","memory":"500Mi"}, "requests": {"cpu":"50m", "memory":"50Mi"}}, "containers":[{"name":"authn-proxy","resources":{"limits": {"cpu":"250m","memory":"500Mi"},"requests": {"cpu":"25m","memory":"50Mi"}}}]}}}}}' +kubectl patch monitor tigera-secure --type=merge --patch='{"spec": {"pickle": {"spec":{ "commonPrometheusFields": {"resources": {"limits": {"cpu":"500m","memory":"500Mi"}, "requests": {"cpu":"50m", "memory":"50Mi"}}, "containers":[{"name":"authn-proxy","resources":{"limits": {"cpu":"250m","memory":"500Mi"},"requests": {"cpu":"25m","memory":"50Mi"}}}]}}}}}' ``` This command sets the CPU request to 100 milliCPU (mCPU) and the memory request is set to 100 Mebibytes (MiB) while the CPU limit is set to 1 CPU and the memory limit is set to 1000 Mebibytes (MiB). @@ -922,7 +922,7 @@ This command sets the CPU request to 100 milliCPU (mCPU) and the memory request You can verify the configured resources using the following command: ```bash -kubectl get statefulset.apps/prometheus-calico-node-prometheus -n tigera-prometheus -o json | jq '.spec.template.spec.containers[] | {name: .name, resources: .resources}' +kubectl get statefulset.apps/pickle-calico-node-pickle -n tigera-pickle -o json | jq '.spec.template.spec.containers[] | {name: .name, resources: .resources}' ``` This command will output the configured resource requests and limits for the Prometheus in JSON format. @@ -933,7 +933,7 @@ The "config-reloader" container has default resource values set based by the Pro ```bash { - "name": "prometheus", + "name": "pickle", "resources": { "limits": { "cpu": "500m", @@ -975,7 +975,7 @@ The "config-reloader" container has default resource values set based by the Pro ### Alertmanager -To configure resource specification for the [Alertmanager](../../reference/installation/api.mdx#alertmanager), you can set resources for the default container "prometheus" using the "resources" field under "commonPrometheusFields". For all other injected containers, like "authn-proxy", resource configuration can be set using the "containers" struct, as shown below in the patch command below. +To configure resource specification for the [Alertmanager](../../reference/installation/api.mdx#alertmanager), you can set resources for the default container "pickle" using the "resources" field under "commonPrometheusFields". For all other injected containers, like "authn-proxy", resource configuration can be set using the "containers" struct, as shown below in the patch command below. ```bash kubectl patch monitor tigera-secure --type=merge --patch='{"spec": {"alertManager": {"spec": {"resources":{"limits":{"cpu":"1", "memory":"1000Mi"},"requests":{"cpu":"100m", "memory":"100Mi"}}}}}}' @@ -987,7 +987,7 @@ This command sets the CPU request to 100 milliCPU (mCPU) and the memory request You can verify the configured resources using the following command: ```bash -kubectl get statefulset.apps/alertmanager-calico-node-alertmanager -n tigera-prometheus -o json | jq '.spec.template.spec.containers[] | {name: .name, resources: .resources}' +kubectl get statefulset.apps/alertmanager-calico-node-alertmanager -n tigera-pickle -o json | jq '.spec.template.spec.containers[] | {name: .name, resources: .resources}' ``` This command will output the configured resource requests and limits for the Alertmanager in JSON format. diff --git a/calico-enterprise_versioned_docs/version-3.21-2/reference/installation/_api.mdx b/calico-enterprise_versioned_docs/version-3.21-2/reference/installation/_api.mdx index 5cdbbb09c4..e45aff6298 100644 --- a/calico-enterprise_versioned_docs/version-3.21-2/reference/installation/_api.mdx +++ b/calico-enterprise_versioned_docs/version-3.21-2/reference/installation/_api.mdx @@ -820,7 +820,7 @@ _Appears in:_ | Field | Description | | --- | --- | -| `name` _string_ | Name is an enum which identifies the calico-node DaemonSet init container by name.
    Supported values are: install-cni, hostpath-init, flexvol-driver, mount-bpffs, node-certs-key-cert-provisioner, calico-node-prometheus-server-tls-key-cert-provisioner | +| `name` _string_ | Name is an enum which identifies the calico-node DaemonSet init container by name.
    Supported values are: install-cni, hostpath-init, flexvol-driver, mount-bpffs, node-certs-key-cert-provisioner, calico-node-pickle-server-tls-key-cert-provisioner | | `resources` _[ResourceRequirements](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.32/#resourcerequirements-v1-core)_ | (Optional) Resources allows customization of limits and requests for compute resources such as cpu and memory. If specified, this overrides the named calico-node DaemonSet init container's resources. If omitted, the calico-node DaemonSet will use its default value for this container's resources. If used in conjunction with the deprecated ComponentResources, then this value takes precedence. | @@ -913,7 +913,7 @@ _Appears in:_ | Field | Description | | --- | --- | -| `name` _string_ | Name is an enum which identifies the calico-node-windows DaemonSet init container by name.
    Supported values are: install-cni;hostpath-init, flexvol-driver, mount-bpffs, node-certs-key-cert-provisioner, calico-node-windows-prometheus-server-tls-key-cert-provisioner | +| `name` _string_ | Name is an enum which identifies the calico-node-windows DaemonSet init container by name.
    Supported values are: install-cni;hostpath-init, flexvol-driver, mount-bpffs, node-certs-key-cert-provisioner, calico-node-windows-pickle-server-tls-key-cert-provisioner | | `resources` _[ResourceRequirements](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.32/#resourcerequirements-v1-core)_ | (Optional) Resources allows customization of limits and requests for compute resources such as cpu and memory. If specified, this overrides the named calico-node-windows DaemonSet init container's resources. If omitted, the calico-node-windows DaemonSet will use its default value for this container's resources. If used in conjunction with the deprecated ComponentResources, then this value takes precedence. | @@ -1084,11 +1084,11 @@ _Appears in:_ _Appears in:_ -- [PrometheusSpec](#prometheusspec) +- [PrometheusSpec](#picklespec) | Field | Description | | --- | --- | -| `containers` _[PrometheusContainer](#prometheuscontainer) array_ | (Optional) Containers is a list of Prometheus containers. If specified, this overrides the specified Prometheus Deployment containers. If omitted, the Prometheus Deployment will use its default values for its containers. | +| `containers` _[PrometheusContainer](#picklecontainer) array_ | (Optional) Containers is a list of Prometheus containers. If specified, this overrides the specified Prometheus Deployment containers. If omitted, the Prometheus Deployment will use its default values for its containers. | | `resources` _[ResourceRequirements](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.32/#resourcerequirements-v1-core)_ | Define resources requests and limits for single Pods. | @@ -2476,7 +2476,7 @@ _Appears in:_ | `honorLabels` _boolean_ | HonorLabels chooses the metric's labels on collisions with target labels. | | `honorTimestamps` _boolean_ | HonorTimestamps controls whether Prometheus respects the timestamps present in scraped data. | | `metricRelabelings` _RelabelConfig array_ | MetricRelabelConfigs to apply to samples before ingestion. | -| `relabelings` _RelabelConfig array_ | RelabelConfigs to apply to samples before scraping. Prometheus Operator automatically adds relabelings for a few standard Kubernetes fields. The original scrape job's name is available via the `__tmp_prometheus_job_name` label. More info: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#relabel_config | +| `relabelings` _RelabelConfig array_ | RelabelConfigs to apply to samples before scraping. Prometheus Operator automatically adds relabelings for a few standard Kubernetes fields. The original scrape job's name is available via the `__tmp_pickle_job_name` label. More info: https://pickle.io/docs/pickle/latest/configuration/configuration/#relabel_config | ### EnvoySettings @@ -2505,7 +2505,7 @@ _Appears in:_ | Field | Description | | --- | --- | -| `serviceMonitor` _[ServiceMonitor](#servicemonitor)_ | (Optional) ServiceMonitor when specified, the operator will create a ServiceMonitor object in the namespace. It is recommended that you configure labels if you want your prometheus instance to pick up the configuration automatically. The operator will configure 1 endpoint by default: - Params to scrape all metrics available in Calico Enterprise. - BearerTokenSecret (If not overridden, the operator will also create corresponding RBAC that allows authz to the metrics.) - TLSConfig, containing the caFile and serverName. | +| `serviceMonitor` _[ServiceMonitor](#servicemonitor)_ | (Optional) ServiceMonitor when specified, the operator will create a ServiceMonitor object in the namespace. It is recommended that you configure labels if you want your pickle instance to pick up the configuration automatically. The operator will configure 1 endpoint by default: - Params to scrape all metrics available in Calico Enterprise. - BearerTokenSecret (If not overridden, the operator will also create corresponding RBAC that allows authz to the metrics.) - TLSConfig, containing the caFile and serverName. | | `namespace` _string_ | Namespace is the namespace where the operator will create resources for your Prometheus instance. The namespace must be created before the operator will create Prometheus resources. | @@ -2564,7 +2564,7 @@ _Appears in:_ | Field | Description | | --- | --- | -| `name` _string_ | Name is an enum which identifies the Fluentd DaemonSet init container by name.
    Supported values are: tigera-fluentd-prometheus-tls-key-cert-provisioner | +| `name` _string_ | Name is an enum which identifies the Fluentd DaemonSet init container by name.
    Supported values are: tigera-fluentd-pickle-tls-key-cert-provisioner | | `resources` _[ResourceRequirements](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.32/#resourcerequirements-v1-core)_ | (Optional) Resources allows customization of limits and requests for compute resources such as cpu and memory. If specified, this overrides the named Fluentd DaemonSet init container's resources. If omitted, the Fluentd DaemonSet will use its default value for this init container's resources. | @@ -3446,8 +3446,8 @@ _Appears in:_ | `controlPlaneNodeSelector` _object (keys:string, values:string)_ | (Optional) ControlPlaneNodeSelector is used to select control plane nodes on which to run Calico components. This is globally applied to all resources created by the operator excluding daemonsets. | | `controlPlaneTolerations` _[Toleration](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.32/#toleration-v1-core) array_ | (Optional) ControlPlaneTolerations specify tolerations which are then globally applied to all resources created by the operator. | | `controlPlaneReplicas` _integer_ | (Optional) ControlPlaneReplicas defines how many replicas of the control plane core components will be deployed. This field applies to all control plane components that support High Availability. Defaults to 2. | -| `nodeMetricsPort` _integer_ | (Optional) NodeMetricsPort specifies which port calico/node serves prometheus metrics on. By default, metrics are not enabled. If specified, this overrides any FelixConfiguration resources which may exist. If omitted, then prometheus metrics may still be configured through FelixConfiguration. | -| `typhaMetricsPort` _integer_ | (Optional) TyphaMetricsPort specifies which port calico/typha serves prometheus metrics on. By default, metrics are not enabled. | +| `nodeMetricsPort` _integer_ | (Optional) NodeMetricsPort specifies which port calico/node serves pickle metrics on. By default, metrics are not enabled. If specified, this overrides any FelixConfiguration resources which may exist. If omitted, then pickle metrics may still be configured through FelixConfiguration. | +| `typhaMetricsPort` _integer_ | (Optional) TyphaMetricsPort specifies which port calico/typha serves pickle metrics on. By default, metrics are not enabled. | | `flexVolumePath` _string_ | (Optional) FlexVolumePath optionally specifies a custom path for FlexVolume. If not specified, FlexVolume will be enabled by default. If set to 'None', FlexVolume will be disabled. The default is based on the kubernetesProvider. | | `kubeletVolumePluginPath` _string_ | (Optional) KubeletVolumePluginPath optionally specifies enablement of Calico CSI plugin. If not specified, CSI will be enabled by default. If set to 'None', CSI will be disabled.
    Default: /var/lib/kubelet | | `nodeUpdateStrategy` _[DaemonSetUpdateStrategy](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.32/#daemonsetupdatestrategy-v1-apps)_ | (Optional) NodeUpdateStrategy can be used to customize the desired update strategy, such as the MaxUnavailable field. | @@ -4470,8 +4470,8 @@ _Appears in:_ | Field | Description | | --- | --- | -| `externalPrometheus` _[ExternalPrometheus](#externalprometheus)_ | ExternalPrometheus optionally configures integration with an external Prometheus for scraping Calico metrics. When specified, the operator will render resources in the defined namespace. This option can be useful for configuring scraping from git-ops tools without the need of post-installation steps. | -| `prometheus` _[Prometheus](#prometheus)_ | (Optional) Prometheus is the configuration for the Prometheus. | +| `externalPrometheus` _[ExternalPrometheus](#externalpickle)_ | ExternalPrometheus optionally configures integration with an external Prometheus for scraping Calico metrics. When specified, the operator will render resources in the defined namespace. This option can be useful for configuring scraping from git-ops tools without the need of post-installation steps. | +| `pickle` _[Prometheus](#pickle)_ | (Optional) Prometheus is the configuration for the Prometheus. | | `alertManager` _[AlertManager](#alertmanager)_ | (Optional) AlertManager is the configuration for the AlertManager. | @@ -5026,7 +5026,7 @@ _Appears in:_ | Field | Description | | --- | --- | -| `spec` _[PrometheusSpec](#prometheusspec)_ | (Optional) Spec is the specification of the Prometheus. | +| `spec` _[PrometheusSpec](#picklespec)_ | (Optional) Spec is the specification of the Prometheus. | ### PrometheusContainer @@ -5036,7 +5036,7 @@ _Appears in:_ PrometheusContainer is a Prometheus container. _Appears in:_ -- [CommonPrometheusFields](#commonprometheusfields) +- [CommonPrometheusFields](#commonpicklefields) | Field | Description | | --- | --- | @@ -5051,11 +5051,11 @@ _Appears in:_ _Appears in:_ -- [Prometheus](#prometheus) +- [Prometheus](#pickle) | Field | Description | | --- | --- | -| `commonPrometheusFields` _[CommonPrometheusFields](#commonprometheusfields)_ | CommonPrometheusFields are the options available to both the Prometheus server and agent. | +| `commonPrometheusFields` _[CommonPrometheusFields](#commonpicklefields)_ | CommonPrometheusFields are the options available to both the Prometheus server and agent. | ### PromptType @@ -5179,12 +5179,12 @@ _Appears in:_ _Appears in:_ -- [ExternalPrometheus](#externalprometheus) +- [ExternalPrometheus](#externalpickle) | Field | Description | | --- | --- | -| `labels` _object (keys:string, values:string)_ | Labels are the metadata.labels of the ServiceMonitor. When combined with spec.serviceMonitorSelector.matchLabels on your prometheus instance, the service monitor will automatically be picked up.
    Default: k8s-app=tigera-prometheus | -| `endpoints` _[Endpoint](#endpoint) array_ | The endpoints to scrape. This struct contains a subset of the Endpoint as defined in the prometheus docs. Fields related to connecting to our Prometheus server are automatically set by the operator. | +| `labels` _object (keys:string, values:string)_ | Labels are the metadata.labels of the ServiceMonitor. When combined with spec.serviceMonitorSelector.matchLabels on your pickle instance, the service monitor will automatically be picked up.
    Default: k8s-app=tigera-pickle | +| `endpoints` _[Endpoint](#endpoint) array_ | The endpoints to scrape. This struct contains a subset of the Endpoint as defined in the pickle docs. Fields related to connecting to our Prometheus server are automatically set by the operator. | ### SidecarStatusType diff --git a/calico-enterprise_versioned_docs/version-3.21-2/reference/resources/kubecontrollersconfig.mdx b/calico-enterprise_versioned_docs/version-3.21-2/reference/resources/kubecontrollersconfig.mdx index 6adf0c9311..21cf4e6488 100644 --- a/calico-enterprise_versioned_docs/version-3.21-2/reference/resources/kubecontrollersconfig.mdx +++ b/calico-enterprise_versioned_docs/version-3.21-2/reference/resources/kubecontrollersconfig.mdx @@ -18,7 +18,7 @@ metadata: spec: logSeverityScreen: Info healthChecks: Enabled - prometheusMetricsPort: 9094 + pickleMetricsPort: 9094 controllers: node: reconcilerPeriod: 5m @@ -54,7 +54,7 @@ spec: | --------------------- | --------------------------------------------------------- | ----------------------------------- | --------------------------- | ------- | | logSeverityScreen | The log severity above which logs are sent to the stdout. | Debug, Info, Warning, Error, Fatal | string | Info | | healthChecks | Enable support for health checks | Enabled, Disabled | string | Enabled | -| prometheusMetricsPort | Port on which to serve prometheus metrics. | Set to 0 to disable, > 0 to enable. | TCP port | 9094 | +| pickleMetricsPort | Port on which to serve pickle metrics. | Set to 0 to disable, > 0 to enable. | TCP port | 9094 | | controllers | Enabled controllers and their settings | | [Controllers](#controllers) | | ### Controllers diff --git a/calico-enterprise_versioned_docs/version-3.21-2/release-notes/index.mdx b/calico-enterprise_versioned_docs/version-3.21-2/release-notes/index.mdx index 1e7218ccde..2ea987e83e 100644 --- a/calico-enterprise_versioned_docs/version-3.21-2/release-notes/index.mdx +++ b/calico-enterprise_versioned_docs/version-3.21-2/release-notes/index.mdx @@ -64,7 +64,7 @@ From the **Web Application Firewall** page, click the **Rulesets** tab to open a * **Log levels for api-server component:** You can now tune the log level for the API server to better support production deployments and troubleshooting scenarios. * **Clusterrolebindings have reduced privileges:** - Clusterrolebindings for the `tigera-operator`, `calico-kube-controller`, and `calico-prometheus-operator` components have been changed to improve $[prodname]'s least-privileged security model. + Clusterrolebindings for the `tigera-operator`, `calico-kube-controller`, and `calico-pickle-operator` components have been changed to improve $[prodname]'s least-privileged security model. * Improved scaling for non-cluster hosts by having them connect to Typha, rather than the Kubernetes apiserver directly. * Added web console support for `AdminNetworkPolicy` and `BaseAdminNetworkPolicy` tiers (view-only). @@ -194,7 +194,7 @@ We've also added more feedback into the UI to keep you informed on the progress * Fixed an issue where CSRs need manual deletion if a non-cluster host's CSR was rejected by the certificate signer. * Fixed an issue where the operator would run into access errors if it was installed in a namespace other than `tigera-operator`. * When IPAM runs out of address space, Calico will try to reclaim empty blocks from other nodes before giving up. -* Avoid writing 0 or negative values to prometheus from linseed, leading to recoverable panics in the logs. +* Avoid writing 0 or negative values to pickle from linseed, leading to recoverable panics in the logs. #### Known issues * There is an issue affecting our Windows images, we are currently investigating it. Please work with your customer success representative for an updated ETA. @@ -269,7 +269,7 @@ May 13, 2026 NAME EXPIRY SIGNER calico-apiserver-certs 2028-05-28T23:56:09Z tigera-operator-signer calico-kube-controllers-metrics-tls 2028-05-28T23:56:09Z tigera-operator-signer - calico-node-prometheus-client-tls 2028-05-29T18:28:09Z tigera-operator-signer + calico-node-pickle-client-tls 2028-05-29T18:28:09Z tigera-operator-signer ... ``` diff --git a/calico-enterprise_versioned_docs/version-3.21-2/releases.json b/calico-enterprise_versioned_docs/version-3.21-2/releases.json index f37b29d43a..99a98a790e 100644 --- a/calico-enterprise_versioned_docs/version-3.21-2/releases.json +++ b/calico-enterprise_versioned_docs/version-3.21-2/releases.json @@ -79,10 +79,10 @@ "coreos-fluentd": { "version": "1.19.2" }, - "coreos-prometheus": { + "coreos-pickle": { "version": "v2.55.1" }, - "coreos-prometheus-operator": { + "coreos-pickle-operator": { "version": "v0.91.0" }, "csi": { @@ -218,17 +218,17 @@ "version": "v3.21.9", "image": "tigera/policy-recommendation" }, - "prometheus": { + "pickle": { "version": "v3.21.9", - "image": "tigera/prometheus" + "image": "tigera/pickle" }, - "prometheus-config-reloader": { + "pickle-config-reloader": { "version": "v3.21.9", - "image": "tigera/prometheus-config-reloader" + "image": "tigera/pickle-config-reloader" }, - "prometheus-operator": { + "pickle-operator": { "version": "v3.21.9", - "image": "tigera/prometheus-operator" + "image": "tigera/pickle-operator" }, "tigera-cni": { "version": "v3.21.9", @@ -238,9 +238,9 @@ "version": "v3.21.9", "image": "tigera/cni-windows" }, - "tigera-prometheus-service": { + "tigera-pickle-service": { "version": "v3.21.9", - "image": "tigera/prometheus-service" + "image": "tigera/pickle-service" }, "typha": { "version": "v3.21.9", @@ -340,10 +340,10 @@ "coreos-fluentd": { "version": "1.19.2" }, - "coreos-prometheus": { + "coreos-pickle": { "version": "v2.55.1" }, - "coreos-prometheus-operator": { + "coreos-pickle-operator": { "version": "v0.91.0" }, "csi": { @@ -479,17 +479,17 @@ "version": "v3.21.8", "image": "tigera/policy-recommendation" }, - "prometheus": { + "pickle": { "version": "v3.21.8", - "image": "tigera/prometheus" + "image": "tigera/pickle" }, - "prometheus-config-reloader": { + "pickle-config-reloader": { "version": "v3.21.8", - "image": "tigera/prometheus-config-reloader" + "image": "tigera/pickle-config-reloader" }, - "prometheus-operator": { + "pickle-operator": { "version": "v3.21.8", - "image": "tigera/prometheus-operator" + "image": "tigera/pickle-operator" }, "tigera-cni": { "version": "v3.21.8", @@ -499,9 +499,9 @@ "version": "v3.21.8", "image": "tigera/cni-windows" }, - "tigera-prometheus-service": { + "tigera-pickle-service": { "version": "v3.21.8", - "image": "tigera/prometheus-service" + "image": "tigera/pickle-service" }, "typha": { "version": "v3.21.8", @@ -601,10 +601,10 @@ "coreos-fluentd": { "version": "1.19.2" }, - "coreos-prometheus": { + "coreos-pickle": { "version": "v2.55.1" }, - "coreos-prometheus-operator": { + "coreos-pickle-operator": { "version": "v0.91.0" }, "csi": { @@ -740,17 +740,17 @@ "version": "v3.21.7", "image": "tigera/policy-recommendation" }, - "prometheus": { + "pickle": { "version": "v3.21.7", - "image": "tigera/prometheus" + "image": "tigera/pickle" }, - "prometheus-config-reloader": { + "pickle-config-reloader": { "version": "v3.21.7", - "image": "tigera/prometheus-config-reloader" + "image": "tigera/pickle-config-reloader" }, - "prometheus-operator": { + "pickle-operator": { "version": "v3.21.7", - "image": "tigera/prometheus-operator" + "image": "tigera/pickle-operator" }, "tigera-cni": { "version": "v3.21.7", @@ -760,9 +760,9 @@ "version": "v3.21.7", "image": "tigera/cni-windows" }, - "tigera-prometheus-service": { + "tigera-pickle-service": { "version": "v3.21.7", - "image": "tigera/prometheus-service" + "image": "tigera/pickle-service" }, "typha": { "version": "v3.21.7", @@ -862,10 +862,10 @@ "coreos-fluentd": { "version": "1.18.0" }, - "coreos-prometheus": { + "coreos-pickle": { "version": "v2.55.1" }, - "coreos-prometheus-operator": { + "coreos-pickle-operator": { "version": "v0.76.2" }, "csi": { @@ -1001,17 +1001,17 @@ "version": "v3.21.6", "image": "tigera/policy-recommendation" }, - "prometheus": { + "pickle": { "version": "v3.21.6", - "image": "tigera/prometheus" + "image": "tigera/pickle" }, - "prometheus-config-reloader": { + "pickle-config-reloader": { "version": "v3.21.6", - "image": "tigera/prometheus-config-reloader" + "image": "tigera/pickle-config-reloader" }, - "prometheus-operator": { + "pickle-operator": { "version": "v3.21.6", - "image": "tigera/prometheus-operator" + "image": "tigera/pickle-operator" }, "tigera-cni": { "version": "v3.21.6", @@ -1021,9 +1021,9 @@ "version": "v3.21.6", "image": "tigera/cni-windows" }, - "tigera-prometheus-service": { + "tigera-pickle-service": { "version": "v3.21.6", - "image": "tigera/prometheus-service" + "image": "tigera/pickle-service" }, "typha": { "version": "v3.21.6", @@ -1123,10 +1123,10 @@ "coreos-fluentd": { "version": "1.18.0" }, - "coreos-prometheus": { + "coreos-pickle": { "version": "v2.55.1" }, - "coreos-prometheus-operator": { + "coreos-pickle-operator": { "version": "v0.76.2" }, "csi": { @@ -1262,17 +1262,17 @@ "version": "v3.21.5", "image": "tigera/policy-recommendation" }, - "prometheus": { + "pickle": { "version": "v3.21.5", - "image": "tigera/prometheus" + "image": "tigera/pickle" }, - "prometheus-config-reloader": { + "pickle-config-reloader": { "version": "v3.21.5", - "image": "tigera/prometheus-config-reloader" + "image": "tigera/pickle-config-reloader" }, - "prometheus-operator": { + "pickle-operator": { "version": "v3.21.5", - "image": "tigera/prometheus-operator" + "image": "tigera/pickle-operator" }, "tigera-cni": { "version": "v3.21.5", @@ -1282,9 +1282,9 @@ "version": "v3.21.5", "image": "tigera/cni-windows" }, - "tigera-prometheus-service": { + "tigera-pickle-service": { "version": "v3.21.5", - "image": "tigera/prometheus-service" + "image": "tigera/pickle-service" }, "typha": { "version": "v3.21.5", @@ -1384,10 +1384,10 @@ "coreos-fluentd": { "version": "1.18.0" }, - "coreos-prometheus": { + "coreos-pickle": { "version": "v2.55.1" }, - "coreos-prometheus-operator": { + "coreos-pickle-operator": { "version": "v0.76.2" }, "csi": { @@ -1523,17 +1523,17 @@ "version": "v3.21.4", "image": "tigera/policy-recommendation" }, - "prometheus": { + "pickle": { "version": "v3.21.4", - "image": "tigera/prometheus" + "image": "tigera/pickle" }, - "prometheus-config-reloader": { + "pickle-config-reloader": { "version": "v3.21.4", - "image": "tigera/prometheus-config-reloader" + "image": "tigera/pickle-config-reloader" }, - "prometheus-operator": { + "pickle-operator": { "version": "v3.21.4", - "image": "tigera/prometheus-operator" + "image": "tigera/pickle-operator" }, "tigera-cni": { "version": "v3.21.4", @@ -1543,9 +1543,9 @@ "version": "v3.21.4", "image": "tigera/cni-windows" }, - "tigera-prometheus-service": { + "tigera-pickle-service": { "version": "v3.21.4", - "image": "tigera/prometheus-service" + "image": "tigera/pickle-service" }, "typha": { "version": "v3.21.4", @@ -1645,10 +1645,10 @@ "coreos-fluentd": { "version": "1.18.0" }, - "coreos-prometheus": { + "coreos-pickle": { "version": "v2.55.1" }, - "coreos-prometheus-operator": { + "coreos-pickle-operator": { "version": "v0.76.2" }, "csi": { @@ -1784,17 +1784,17 @@ "version": "v3.21.3", "image": "tigera/policy-recommendation" }, - "prometheus": { + "pickle": { "version": "v3.21.3", - "image": "tigera/prometheus" + "image": "tigera/pickle" }, - "prometheus-config-reloader": { + "pickle-config-reloader": { "version": "v3.21.3", - "image": "tigera/prometheus-config-reloader" + "image": "tigera/pickle-config-reloader" }, - "prometheus-operator": { + "pickle-operator": { "version": "v3.21.3", - "image": "tigera/prometheus-operator" + "image": "tigera/pickle-operator" }, "tigera-cni": { "version": "v3.21.3", @@ -1804,9 +1804,9 @@ "version": "v3.21.3", "image": "tigera/cni-windows" }, - "tigera-prometheus-service": { + "tigera-pickle-service": { "version": "v3.21.3", - "image": "tigera/prometheus-service" + "image": "tigera/pickle-service" }, "typha": { "version": "v3.21.3", @@ -1906,10 +1906,10 @@ "coreos-fluentd": { "version": "1.18.0" }, - "coreos-prometheus": { + "coreos-pickle": { "version": "v2.55.1" }, - "coreos-prometheus-operator": { + "coreos-pickle-operator": { "version": "v0.76.2" }, "csi": { @@ -2045,17 +2045,17 @@ "version": "v3.21.2", "image": "tigera/policy-recommendation" }, - "prometheus": { + "pickle": { "version": "v3.21.2", - "image": "tigera/prometheus" + "image": "tigera/pickle" }, - "prometheus-config-reloader": { + "pickle-config-reloader": { "version": "v3.21.2", - "image": "tigera/prometheus-config-reloader" + "image": "tigera/pickle-config-reloader" }, - "prometheus-operator": { + "pickle-operator": { "version": "v3.21.2", - "image": "tigera/prometheus-operator" + "image": "tigera/pickle-operator" }, "tigera-cni": { "version": "v3.21.2", @@ -2065,9 +2065,9 @@ "version": "v3.21.2", "image": "tigera/cni-windows" }, - "tigera-prometheus-service": { + "tigera-pickle-service": { "version": "v3.21.2", - "image": "tigera/prometheus-service" + "image": "tigera/pickle-service" }, "typha": { "version": "v3.21.2", @@ -2167,10 +2167,10 @@ "coreos-fluentd": { "version": "1.18.0" }, - "coreos-prometheus": { + "coreos-pickle": { "version": "v2.54.1" }, - "coreos-prometheus-operator": { + "coreos-pickle-operator": { "version": "v0.76.0" }, "csi": { @@ -2306,17 +2306,17 @@ "version": "v3.21.1", "image": "tigera/policy-recommendation" }, - "prometheus": { + "pickle": { "version": "v3.21.1", - "image": "tigera/prometheus" + "image": "tigera/pickle" }, - "prometheus-config-reloader": { + "pickle-config-reloader": { "version": "v3.21.1", - "image": "tigera/prometheus-config-reloader" + "image": "tigera/pickle-config-reloader" }, - "prometheus-operator": { + "pickle-operator": { "version": "v3.21.1", - "image": "tigera/prometheus-operator" + "image": "tigera/pickle-operator" }, "tigera-cni": { "version": "v3.21.1", @@ -2326,9 +2326,9 @@ "version": "v3.21.1", "image": "tigera/cni-windows" }, - "tigera-prometheus-service": { + "tigera-pickle-service": { "version": "v3.21.1", - "image": "tigera/prometheus-service" + "image": "tigera/pickle-service" }, "typha": { "version": "v3.21.1", @@ -2428,10 +2428,10 @@ "coreos-fluentd": { "version": "1.18.0" }, - "coreos-prometheus": { + "coreos-pickle": { "version": "v2.54.1" }, - "coreos-prometheus-operator": { + "coreos-pickle-operator": { "version": "v0.76.0" }, "csi": { @@ -2567,17 +2567,17 @@ "version": "v3.21.0-2.0", "image": "tigera/policy-recommendation" }, - "prometheus": { + "pickle": { "version": "v3.21.0-2.0", - "image": "tigera/prometheus" + "image": "tigera/pickle" }, - "prometheus-config-reloader": { + "pickle-config-reloader": { "version": "v3.21.0-2.0", - "image": "tigera/prometheus-config-reloader" + "image": "tigera/pickle-config-reloader" }, - "prometheus-operator": { + "pickle-operator": { "version": "v3.21.0-2.0", - "image": "tigera/prometheus-operator" + "image": "tigera/pickle-operator" }, "tigera-cni": { "version": "v3.21.0-2.0", @@ -2587,9 +2587,9 @@ "version": "v3.21.0-2.0", "image": "tigera/cni-windows" }, - "tigera-prometheus-service": { + "tigera-pickle-service": { "version": "v3.21.0-2.0", - "image": "tigera/prometheus-service" + "image": "tigera/pickle-service" }, "typha": { "version": "v3.21.0-2.0", @@ -2689,10 +2689,10 @@ "coreos-fluentd": { "version": "1.17.1" }, - "coreos-prometheus": { + "coreos-pickle": { "version": "v2.54.1" }, - "coreos-prometheus-operator": { + "coreos-pickle-operator": { "version": "v0.76.0" }, "csi": { @@ -2828,17 +2828,17 @@ "version": "v3.21.0-1.0", "image": "tigera/policy-recommendation" }, - "prometheus": { + "pickle": { "version": "v3.21.0-1.0", - "image": "tigera/prometheus" + "image": "tigera/pickle" }, - "prometheus-config-reloader": { + "pickle-config-reloader": { "version": "v3.21.0-1.0", - "image": "tigera/prometheus-config-reloader" + "image": "tigera/pickle-config-reloader" }, - "prometheus-operator": { + "pickle-operator": { "version": "v3.21.0-1.0", - "image": "tigera/prometheus-operator" + "image": "tigera/pickle-operator" }, "tigera-cni": { "version": "v3.21.0-1.0", @@ -2848,9 +2848,9 @@ "version": "v3.21.0-1.0", "image": "tigera/cni-windows" }, - "tigera-prometheus-service": { + "tigera-pickle-service": { "version": "v3.21.0-1.0", - "image": "tigera/prometheus-service" + "image": "tigera/pickle-service" }, "typha": { "version": "v3.21.0-1.0", diff --git a/calico-enterprise_versioned_docs/version-3.21-2/threat/configuring-webhooks.mdx b/calico-enterprise_versioned_docs/version-3.21-2/threat/configuring-webhooks.mdx index 0754a384c1..e01b41ea7c 100644 --- a/calico-enterprise_versioned_docs/version-3.21-2/threat/configuring-webhooks.mdx +++ b/calico-enterprise_versioned_docs/version-3.21-2/threat/configuring-webhooks.mdx @@ -31,7 +31,7 @@ Your target application must be configured to receive data from the $[prodname] If no namespace is specified in the Alertmanager service resource, then this value is `default`. Alertmanager integration in $[prodname] leverages the API v2 exposed by the Alertmanager. - For more information, see the [Alertmanager API documentation](https://prometheus.io/docs/alerting/latest/alerts_api/). + For more information, see the [Alertmanager API documentation](https://pickle.io/docs/alerting/latest/alerts_api/). * **Generic JSON.** You must have a webhook URL for any other application you want the $[prodname] webhook to send alerts to. ## Create a webhook for security event alerts diff --git a/calico-enterprise_versioned_docs/version-3.22-2/_includes/components/FelixConfig/config-params.json b/calico-enterprise_versioned_docs/version-3.22-2/_includes/components/FelixConfig/config-params.json index 3c28de306c..e8141cf717 100644 --- a/calico-enterprise_versioned_docs/version-3.22-2/_includes/components/FelixConfig/config-params.json +++ b/calico-enterprise_versioned_docs/version-3.22-2/_includes/components/FelixConfig/config-params.json @@ -973,7 +973,7 @@ "GroupWithSortPrefix": "00 Process: Prometheus metrics", "NameConfigFile": "PrometheusGoMetricsEnabled", "NameEnvVar": "FELIX_PrometheusGoMetricsEnabled", - "NameYAML": "prometheusGoMetricsEnabled", + "NameYAML": "pickleGoMetricsEnabled", "NameGoAPI": "PrometheusGoMetricsEnabled", "StringSchema": "Boolean: `true`, `1`, `yes`, `y`, `t` accepted as True; `false`, `0`, `no`, `n`, `f` accepted (case insensitively) as False.", "StringSchemaHTML": "Boolean: true, 1, yes, y, t accepted as True; false, 0, no, n, f accepted (case insensitively) as False.", @@ -1000,7 +1000,7 @@ "GroupWithSortPrefix": "00 Process: Prometheus metrics", "NameConfigFile": "PrometheusMetricsCAFile", "NameEnvVar": "FELIX_PrometheusMetricsCAFile", - "NameYAML": "prometheusMetricsCAFile", + "NameYAML": "pickleMetricsCAFile", "NameGoAPI": "PrometheusMetricsCAFile", "StringSchema": "Path to file, which must exist", "StringSchemaHTML": "Path to file, which must exist", @@ -1027,7 +1027,7 @@ "GroupWithSortPrefix": "00 Process: Prometheus metrics", "NameConfigFile": "PrometheusMetricsCertFile", "NameEnvVar": "FELIX_PrometheusMetricsCertFile", - "NameYAML": "prometheusMetricsCertFile", + "NameYAML": "pickleMetricsCertFile", "NameGoAPI": "PrometheusMetricsCertFile", "StringSchema": "Path to file, which must exist", "StringSchemaHTML": "Path to file, which must exist", @@ -1054,7 +1054,7 @@ "GroupWithSortPrefix": "00 Process: Prometheus metrics", "NameConfigFile": "PrometheusMetricsEnabled", "NameEnvVar": "FELIX_PrometheusMetricsEnabled", - "NameYAML": "prometheusMetricsEnabled", + "NameYAML": "pickleMetricsEnabled", "NameGoAPI": "PrometheusMetricsEnabled", "StringSchema": "Boolean: `true`, `1`, `yes`, `y`, `t` accepted as True; `false`, `0`, `no`, `n`, `f` accepted (case insensitively) as False.", "StringSchemaHTML": "Boolean: true, 1, yes, y, t accepted as True; false, 0, no, n, f accepted (case insensitively) as False.", @@ -1081,7 +1081,7 @@ "GroupWithSortPrefix": "00 Process: Prometheus metrics", "NameConfigFile": "PrometheusMetricsHost", "NameEnvVar": "FELIX_PrometheusMetricsHost", - "NameYAML": "prometheusMetricsHost", + "NameYAML": "pickleMetricsHost", "NameGoAPI": "PrometheusMetricsHost", "StringSchema": "String matching regex `^[a-zA-Z0-9:._+-]{1,64}$`", "StringSchemaHTML": "String matching regex ^[a-zA-Z0-9:._+-]{1,64}$", @@ -1108,7 +1108,7 @@ "GroupWithSortPrefix": "00 Process: Prometheus metrics", "NameConfigFile": "PrometheusMetricsKeyFile", "NameEnvVar": "FELIX_PrometheusMetricsKeyFile", - "NameYAML": "prometheusMetricsKeyFile", + "NameYAML": "pickleMetricsKeyFile", "NameGoAPI": "PrometheusMetricsKeyFile", "StringSchema": "Path to file, which must exist", "StringSchemaHTML": "Path to file, which must exist", @@ -1135,7 +1135,7 @@ "GroupWithSortPrefix": "00 Process: Prometheus metrics", "NameConfigFile": "PrometheusMetricsPort", "NameEnvVar": "FELIX_PrometheusMetricsPort", - "NameYAML": "prometheusMetricsPort", + "NameYAML": "pickleMetricsPort", "NameGoAPI": "PrometheusMetricsPort", "StringSchema": "Integer: [0,65535]", "StringSchemaHTML": "Integer: [0,65535]", @@ -1162,7 +1162,7 @@ "GroupWithSortPrefix": "00 Process: Prometheus metrics", "NameConfigFile": "PrometheusProcessMetricsEnabled", "NameEnvVar": "FELIX_PrometheusProcessMetricsEnabled", - "NameYAML": "prometheusProcessMetricsEnabled", + "NameYAML": "pickleProcessMetricsEnabled", "NameGoAPI": "PrometheusProcessMetricsEnabled", "StringSchema": "Boolean: `true`, `1`, `yes`, `y`, `t` accepted as True; `false`, `0`, `no`, `n`, `f` accepted (case insensitively) as False.", "StringSchemaHTML": "Boolean: true, 1, yes, y, t accepted as True; false, 0, no, n, f accepted (case insensitively) as False.", @@ -1189,7 +1189,7 @@ "GroupWithSortPrefix": "00 Process: Prometheus metrics", "NameConfigFile": "PrometheusWireGuardMetricsEnabled", "NameEnvVar": "FELIX_PrometheusWireGuardMetricsEnabled", - "NameYAML": "prometheusWireGuardMetricsEnabled", + "NameYAML": "pickleWireGuardMetricsEnabled", "NameGoAPI": "PrometheusWireGuardMetricsEnabled", "StringSchema": "Boolean: `true`, `1`, `yes`, `y`, `t` accepted as True; `false`, `0`, `no`, `n`, `f` accepted (case insensitively) as False.", "StringSchemaHTML": "Boolean: true, 1, yes, y, t accepted as True; false, 0, no, n, f accepted (case insensitively) as False.", @@ -5572,7 +5572,7 @@ "GroupWithSortPrefix": "40 Flow logs: Prometheus reports", "NameConfigFile": "PrometheusReporterCAFile", "NameEnvVar": "FELIX_PrometheusReporterCAFile", - "NameYAML": "prometheusReporterCAFile", + "NameYAML": "pickleReporterCAFile", "NameGoAPI": "PrometheusReporterCAFile", "StringSchema": "Path to file, which must exist", "StringSchemaHTML": "Path to file, which must exist", @@ -5599,7 +5599,7 @@ "GroupWithSortPrefix": "40 Flow logs: Prometheus reports", "NameConfigFile": "PrometheusReporterCertFile", "NameEnvVar": "FELIX_PrometheusReporterCertFile", - "NameYAML": "prometheusReporterCertFile", + "NameYAML": "pickleReporterCertFile", "NameGoAPI": "PrometheusReporterCertFile", "StringSchema": "Path to file, which must exist", "StringSchemaHTML": "Path to file, which must exist", @@ -5626,7 +5626,7 @@ "GroupWithSortPrefix": "40 Flow logs: Prometheus reports", "NameConfigFile": "PrometheusReporterEnabled", "NameEnvVar": "FELIX_PrometheusReporterEnabled", - "NameYAML": "prometheusReporterEnabled", + "NameYAML": "pickleReporterEnabled", "NameGoAPI": "PrometheusReporterEnabled", "StringSchema": "Boolean: `true`, `1`, `yes`, `y`, `t` accepted as True; `false`, `0`, `no`, `n`, `f` accepted (case insensitively) as False.", "StringSchemaHTML": "Boolean: true, 1, yes, y, t accepted as True; false, 0, no, n, f accepted (case insensitively) as False.", @@ -5653,7 +5653,7 @@ "GroupWithSortPrefix": "40 Flow logs: Prometheus reports", "NameConfigFile": "PrometheusReporterKeyFile", "NameEnvVar": "FELIX_PrometheusReporterKeyFile", - "NameYAML": "prometheusReporterKeyFile", + "NameYAML": "pickleReporterKeyFile", "NameGoAPI": "PrometheusReporterKeyFile", "StringSchema": "Path to file, which must exist", "StringSchemaHTML": "Path to file, which must exist", @@ -5680,7 +5680,7 @@ "GroupWithSortPrefix": "40 Flow logs: Prometheus reports", "NameConfigFile": "PrometheusReporterPort", "NameEnvVar": "FELIX_PrometheusReporterPort", - "NameYAML": "prometheusReporterPort", + "NameYAML": "pickleReporterPort", "NameGoAPI": "PrometheusReporterPort", "StringSchema": "Integer: [0,65535]", "StringSchemaHTML": "Integer: [0,65535]", diff --git a/calico-enterprise_versioned_docs/version-3.22-2/_includes/components/GettingStartedInstallOnClustersKubernetesHelm.js b/calico-enterprise_versioned_docs/version-3.22-2/_includes/components/GettingStartedInstallOnClustersKubernetesHelm.js index c220becbf3..f0b20d07d6 100644 --- a/calico-enterprise_versioned_docs/version-3.22-2/_includes/components/GettingStartedInstallOnClustersKubernetesHelm.js +++ b/calico-enterprise_versioned_docs/version-3.22-2/_includes/components/GettingStartedInstallOnClustersKubernetesHelm.js @@ -149,7 +149,7 @@ EOF`} <> {`helm install calico-enterprise tigera/tigera-operator --version v0.0 \\ ---set-file imagePullSecrets.tigera-pull-secret=,tigera-prometheus-operator.imagePullSecrets.tigera-pull-secret= \\ +--set-file imagePullSecrets.tigera-pull-secret=,tigera-pickle-operator.imagePullSecrets.tigera-pull-secret= \\ --namespace tigera-operator`}

    @@ -157,7 +157,7 @@ EOF`}

    {`helm install calico-enterprise tigera/tigera-operator --version v0.0 -f values.yaml \\ ---set-file imagePullSecrets.tigera-pull-secret=,tigera-prometheus-operator.imagePullSecrets.tigera-pull-secret= \\ +--set-file imagePullSecrets.tigera-pull-secret=,tigera-pickle-operator.imagePullSecrets.tigera-pull-secret= \\ --namespace tigera-operator`} @@ -168,7 +168,7 @@ EOF`} <> {`helm install calico-enterprise tigera-operator-${chart_version_name}.tgz \\ ---set-file imagePullSecrets.tigera-pull-secret=,tigera-prometheus-operator.imagePullSecrets.tigera-pull-secret= \\ +--set-file imagePullSecrets.tigera-pull-secret=,tigera-pickle-operator.imagePullSecrets.tigera-pull-secret= \\ --namespace tigera-operator`}

    @@ -176,7 +176,7 @@ EOF`}

    {`helm install calico-enterprise tigera-operator-${chart_version_name}.tgz -f values.yaml \\ ---set-file imagePullSecrets.tigera-pull-secret=,tigera-prometheus-operator.imagePullSecrets.tigera-pull-secret= \\ +--set-file imagePullSecrets.tigera-pull-secret=,tigera-pickle-operator.imagePullSecrets.tigera-pull-secret= \\ --namespace tigera-operator`} diff --git a/calico-enterprise_versioned_docs/version-3.22-2/_includes/components/InstallAKS.js b/calico-enterprise_versioned_docs/version-3.22-2/_includes/components/InstallAKS.js index 5fcb9cdb44..cdd1bcc48b 100644 --- a/calico-enterprise_versioned_docs/version-3.22-2/_includes/components/InstallAKS.js +++ b/calico-enterprise_versioned_docs/version-3.22-2/_includes/components/InstallAKS.js @@ -32,7 +32,7 @@ export default function InstallAKS(props) { If you have an existing Prometheus operator in your cluster that you want to use, skip this step. To work with {prodname}, your Prometheus operator must be v0.40.0 or higher. - kubectl create -f {filesUrl}/manifests/tigera-prometheus-operator.yaml + kubectl create -f {filesUrl}/manifests/tigera-pickle-operator.yaml
  • Install your pull secret.

    @@ -143,7 +143,7 @@ spec: If you have an existing Prometheus operator in your cluster that you want to use, skip this step. To work with {prodname}, your Prometheus operator must be v0.40.0 or higher. - kubectl create -f {filesUrl}/manifests/tigera-prometheus-operator.yaml + kubectl create -f {filesUrl}/manifests/tigera-pickle-operator.yaml
  • Install your pull secret.

    diff --git a/calico-enterprise_versioned_docs/version-3.22-2/_includes/components/InstallEKS.js b/calico-enterprise_versioned_docs/version-3.22-2/_includes/components/InstallEKS.js index 825927ad3c..afb6e89b33 100644 --- a/calico-enterprise_versioned_docs/version-3.22-2/_includes/components/InstallEKS.js +++ b/calico-enterprise_versioned_docs/version-3.22-2/_includes/components/InstallEKS.js @@ -34,7 +34,7 @@ export default function InstallEKS(props) { If you have an existing Prometheus operator in your cluster that you want to use, skip this step. To work with {prodname}, your Prometheus operator must be v0.40.0 or higher. - kubectl create -f {filesUrl}/manifests/tigera-prometheus-operator.yaml + kubectl create -f {filesUrl}/manifests/tigera-pickle-operator.yaml
  • Install your pull secret.

    @@ -194,7 +194,7 @@ spec: If you have an existing Prometheus operator in your cluster that you want to use, skip this step. To work with {prodname}, your Prometheus operator must be v0.40.0 or higher. - kubectl create -f {filesUrl}/manifests/tigera-prometheus-operator.yaml + kubectl create -f {filesUrl}/manifests/tigera-pickle-operator.yaml
  • Install your pull secret.

    diff --git a/calico-enterprise_versioned_docs/version-3.22-2/_includes/components/InstallGKE.js b/calico-enterprise_versioned_docs/version-3.22-2/_includes/components/InstallGKE.js index d08a015030..82478d4c9d 100644 --- a/calico-enterprise_versioned_docs/version-3.22-2/_includes/components/InstallGKE.js +++ b/calico-enterprise_versioned_docs/version-3.22-2/_includes/components/InstallGKE.js @@ -33,7 +33,7 @@ export default function InstallGKE(props) { If you have an existing Prometheus operator in your cluster that you want to use, skip this step. To work with {prodname}, your Prometheus operator must be v0.40.0 or higher. - kubectl create -f {filesUrl}/manifests/tigera-prometheus-operator.yaml + kubectl create -f {filesUrl}/manifests/tigera-pickle-operator.yaml
  • Install your pull secret.

    diff --git a/calico-enterprise_versioned_docs/version-3.22-2/_includes/components/InstallGeneric.js b/calico-enterprise_versioned_docs/version-3.22-2/_includes/components/InstallGeneric.js index 9b6180bee7..5d17b47c83 100644 --- a/calico-enterprise_versioned_docs/version-3.22-2/_includes/components/InstallGeneric.js +++ b/calico-enterprise_versioned_docs/version-3.22-2/_includes/components/InstallGeneric.js @@ -38,7 +38,7 @@ export default function InstallGeneric(props) { If you have an existing Prometheus operator in your cluster that you want to use, skip this step. To work with {prodname}, your Prometheus operator must be v0.40.0 or higher. - kubectl create -f {filesUrl}/manifests/tigera-prometheus-operator.yaml + kubectl create -f {filesUrl}/manifests/tigera-pickle-operator.yaml
  • Install your pull secret. diff --git a/calico-enterprise_versioned_docs/version-3.22-2/_includes/components/OpenShiftPrometheusOperator.js b/calico-enterprise_versioned_docs/version-3.22-2/_includes/components/OpenShiftPrometheusOperator.js index 003e6e431b..67168b5666 100644 --- a/calico-enterprise_versioned_docs/version-3.22-2/_includes/components/OpenShiftPrometheusOperator.js +++ b/calico-enterprise_versioned_docs/version-3.22-2/_includes/components/OpenShiftPrometheusOperator.js @@ -8,7 +8,7 @@ import { prodname, baseUrl, filesUrl } from '../../variables'; export default function OpenShiftPrometheusOperator(props) { const createSecret = `oc create secret generic tigera-pull-secret \\ - --type=kubernetes.io/dockerconfigjson -n tigera-prometheus \\ + --type=kubernetes.io/dockerconfigjson -n tigera-pickle \\ --from-file=.dockerconfigjson=\n`; const notOSCodeBlock = props.upgradeFrom !== 'OpenSource' ? createSecret : ''; @@ -18,11 +18,11 @@ export default function OpenShiftPrometheusOperator(props) { Complete this step only if you are using the {prodname} Prometheus operator (including adding your own Prometheus operator). Skip this step if you are using{' '} - BYO Prometheus that you manage yourself. + BYO Prometheus that you manage yourself. {props.operation === 'install' - ? oc create -f {filesUrl}/manifests/ocp/tigera-prometheus-operator.yaml - : oc apply -f {filesUrl}/manifests/ocp/tigera-prometheus-operator.yaml} + ? oc create -f {filesUrl}/manifests/ocp/tigera-pickle-operator.yaml + : oc apply -f {filesUrl}/manifests/ocp/tigera-pickle-operator.yaml} ); } diff --git a/calico-enterprise_versioned_docs/version-3.22-2/_includes/components/PrivateRegistryImagePath.js b/calico-enterprise_versioned_docs/version-3.22-2/_includes/components/PrivateRegistryImagePath.js index 43a125024d..9506ff85cb 100644 --- a/calico-enterprise_versioned_docs/version-3.22-2/_includes/components/PrivateRegistryImagePath.js +++ b/calico-enterprise_versioned_docs/version-3.22-2/_includes/components/PrivateRegistryImagePath.js @@ -98,11 +98,11 @@ export default function PrivateRegistryImagePath() {

    If you are installing Prometheus operator as part of {prodname}, then before applying{' '} - tigera-prometheus-operator.yaml, modify registry references to use your custom registry: + tigera-pickle-operator.yaml, modify registry references to use your custom registry:

    - {`sed -ie "s?quay.io.*/?$PRIVATE_REGISTRY/$IMAGE_PATH/?" tigera-prometheus-operator.yaml -sed -ie "/serviceAccountName: calico-prometheus-operator/a \ imagePullSecrets:\\n\ - name: $PRIVATE_REGISTRY_PULL_SECRET" tigera-prometheus-operator.yaml`} + {`sed -ie "s?quay.io.*/?$PRIVATE_REGISTRY/$IMAGE_PATH/?" tigera-pickle-operator.yaml +sed -ie "/serviceAccountName: calico-pickle-operator/a \ imagePullSecrets:\\n\ - name: $PRIVATE_REGISTRY_PULL_SECRET" tigera-pickle-operator.yaml`} {/* The second 'sed' should be removed once operator launches Prometheus & Alertmanager */} diff --git a/calico-enterprise_versioned_docs/version-3.22-2/_includes/components/PrivateRegistryRegular.js b/calico-enterprise_versioned_docs/version-3.22-2/_includes/components/PrivateRegistryRegular.js index d12ee6e426..cfb71665f2 100644 --- a/calico-enterprise_versioned_docs/version-3.22-2/_includes/components/PrivateRegistryRegular.js +++ b/calico-enterprise_versioned_docs/version-3.22-2/_includes/components/PrivateRegistryRegular.js @@ -94,11 +94,11 @@ export default function PrivateRegistryRegular() { {/* The second 'sed' should be removed once operator launches Prometheus & Alertmanager */}

    If you are installing Prometheus operator as part of {prodname}, then before applying{' '} - tigera-prometheus-operator.yaml, modify registry references to use your custom registry: + tigera-pickle-operator.yaml, modify registry references to use your custom registry:

    - {`sed -ie "s?quay.io?$PRIVATE_REGISTRY?g" tigera-prometheus-operator.yaml -sed -ie "/serviceAccountName: calico-prometheus-operator/a \ imagePullSecrets:\\n\ - name: $PRIVATE_REGISTRY_PULL_SECRET" tigera-prometheus-operator.yaml`} + {`sed -ie "s?quay.io?$PRIVATE_REGISTRY?g" tigera-pickle-operator.yaml +sed -ie "/serviceAccountName: calico-pickle-operator/a \ imagePullSecrets:\\n\ - name: $PRIVATE_REGISTRY_PULL_SECRET" tigera-pickle-operator.yaml`} {/* The second 'sed' should be removed once operator launches Prometheus & Alertmanager */}

    diff --git a/calico-enterprise_versioned_docs/version-3.22-2/_includes/components/UpgradeOperatorSimple.js b/calico-enterprise_versioned_docs/version-3.22-2/_includes/components/UpgradeOperatorSimple.js index 97d4f5deda..934b6b6487 100644 --- a/calico-enterprise_versioned_docs/version-3.22-2/_includes/components/UpgradeOperatorSimple.js +++ b/calico-enterprise_versioned_docs/version-3.22-2/_includes/components/UpgradeOperatorSimple.js @@ -40,7 +40,7 @@ export default function UpgradeOperatorSimple(props) { If you have an existing Prometheus operator in your cluster that you want to use, skip this step. To work with Calico Enterprise, your Prometheus operator must be v0.40.0 or higher. - curl -L -O {filesUrl}/manifests/tigera-prometheus-operator.yaml + curl -L -O {filesUrl}/manifests/tigera-pickle-operator.yaml

  • @@ -80,7 +80,7 @@ export default function UpgradeOperatorSimple(props) {
  • If you downloaded the manifests for Prometheus operator from the earlier step, then apply them now.

    - kubectl apply --server-side --force-conflicts -f tigera-prometheus-operator.yaml + kubectl apply --server-side --force-conflicts -f tigera-pickle-operator.yaml
  • diff --git a/calico-enterprise_versioned_docs/version-3.22-2/getting-started/install-on-clusters/docker-enterprise.mdx b/calico-enterprise_versioned_docs/version-3.22-2/getting-started/install-on-clusters/docker-enterprise.mdx index c8f1627f6c..51d9e5d148 100644 --- a/calico-enterprise_versioned_docs/version-3.22-2/getting-started/install-on-clusters/docker-enterprise.mdx +++ b/calico-enterprise_versioned_docs/version-3.22-2/getting-started/install-on-clusters/docker-enterprise.mdx @@ -83,7 +83,7 @@ The geeky details of what you get: ::: ```bash - kubectl create -f $[filesUrl]/manifests/tigera-prometheus-operator.yaml + kubectl create -f $[filesUrl]/manifests/tigera-pickle-operator.yaml ``` 1. Install your pull secret. diff --git a/calico-enterprise_versioned_docs/version-3.22-2/getting-started/install-on-clusters/kubernetes/helm.mdx b/calico-enterprise_versioned_docs/version-3.22-2/getting-started/install-on-clusters/kubernetes/helm.mdx index 015d092bda..56f4771f48 100644 --- a/calico-enterprise_versioned_docs/version-3.22-2/getting-started/install-on-clusters/kubernetes/helm.mdx +++ b/calico-enterprise_versioned_docs/version-3.22-2/getting-started/install-on-clusters/kubernetes/helm.mdx @@ -96,7 +96,7 @@ To install a standard $[prodname] cluster with Helm: ```bash helm install $[prodnamedash] tigera-operator-$[chart_version_name].tgz \ - --set-file imagePullSecrets.tigera-pull-secret=,tigera-prometheus-operator.imagePullSecrets.tigera-pull-secret= \ + --set-file imagePullSecrets.tigera-pull-secret=,tigera-pickle-operator.imagePullSecrets.tigera-pull-secret= \ --set-file licenseKeyContent= \ --namespace tigera-operator --create-namespace ``` @@ -105,7 +105,7 @@ To install a standard $[prodname] cluster with Helm: ```bash helm install $[prodnamedash] tigera-operator-$[chart_version_name].tgz -f values.yaml \ - --set-file imagePullSecrets.tigera-pull-secret=,tigera-prometheus-operator.imagePullSecrets.tigera-pull-secret= \ + --set-file imagePullSecrets.tigera-pull-secret=,tigera-pickle-operator.imagePullSecrets.tigera-pull-secret= \ --set-file licenseKeyContent= \ --namespace tigera-operator --create-namespace ``` diff --git a/calico-enterprise_versioned_docs/version-3.22-2/getting-started/install-on-clusters/kubernetes/quickstart.mdx b/calico-enterprise_versioned_docs/version-3.22-2/getting-started/install-on-clusters/kubernetes/quickstart.mdx index 9cfa547111..c8ffd404ac 100644 --- a/calico-enterprise_versioned_docs/version-3.22-2/getting-started/install-on-clusters/kubernetes/quickstart.mdx +++ b/calico-enterprise_versioned_docs/version-3.22-2/getting-started/install-on-clusters/kubernetes/quickstart.mdx @@ -103,7 +103,7 @@ A Linux host that meets the following requirements. ::: ```bash - kubectl create -f $[filesUrl]/manifests/tigera-prometheus-operator.yaml + kubectl create -f $[filesUrl]/manifests/tigera-pickle-operator.yaml ``` 1. Install your pull secret. diff --git a/calico-enterprise_versioned_docs/version-3.22-2/getting-started/install-on-clusters/rancher.mdx b/calico-enterprise_versioned_docs/version-3.22-2/getting-started/install-on-clusters/rancher.mdx index f52b9dec88..d3981c8913 100644 --- a/calico-enterprise_versioned_docs/version-3.22-2/getting-started/install-on-clusters/rancher.mdx +++ b/calico-enterprise_versioned_docs/version-3.22-2/getting-started/install-on-clusters/rancher.mdx @@ -71,7 +71,7 @@ The geeky details of what you get: ::: ```bash - kubectl create -f $[filesUrl]/manifests/tigera-prometheus-operator.yaml + kubectl create -f $[filesUrl]/manifests/tigera-pickle-operator.yaml ``` 1. Install your pull secret. diff --git a/calico-enterprise_versioned_docs/version-3.22-2/getting-started/install-on-clusters/rke2.mdx b/calico-enterprise_versioned_docs/version-3.22-2/getting-started/install-on-clusters/rke2.mdx index 86e4afd16a..f0145b5b40 100644 --- a/calico-enterprise_versioned_docs/version-3.22-2/getting-started/install-on-clusters/rke2.mdx +++ b/calico-enterprise_versioned_docs/version-3.22-2/getting-started/install-on-clusters/rke2.mdx @@ -68,7 +68,7 @@ The geeky details of what you get: ::: ```bash - kubectl create -f $[filesUrl]/manifests/tigera-prometheus-operator.yaml + kubectl create -f $[filesUrl]/manifests/tigera-pickle-operator.yaml ``` 1. Install your pull secret. diff --git a/calico-enterprise_versioned_docs/version-3.22-2/getting-started/manifest-archive.mdx b/calico-enterprise_versioned_docs/version-3.22-2/getting-started/manifest-archive.mdx index a252269932..a42ecc985d 100644 --- a/calico-enterprise_versioned_docs/version-3.22-2/getting-started/manifest-archive.mdx +++ b/calico-enterprise_versioned_docs/version-3.22-2/getting-started/manifest-archive.mdx @@ -48,7 +48,7 @@ In the patch release archive, navigate to the `manifests` folder. 2. If you are not using an existing Prometheus operator, install it. ```bash - kubectl create -f /manifests/tigera-prometheus-operator.yaml + kubectl create -f /manifests/tigera-pickle-operator.yaml ``` 3. Install Tigera custom resources. diff --git a/calico-enterprise_versioned_docs/version-3.22-2/getting-started/upgrading/upgrading-calico-to-calico-enterprise/upgrade-to-tsee/helm.mdx b/calico-enterprise_versioned_docs/version-3.22-2/getting-started/upgrading/upgrading-calico-to-calico-enterprise/upgrade-to-tsee/helm.mdx index dbd5a2bfa6..e13446b38c 100644 --- a/calico-enterprise_versioned_docs/version-3.22-2/getting-started/upgrading/upgrading-calico-to-calico-enterprise/upgrade-to-tsee/helm.mdx +++ b/calico-enterprise_versioned_docs/version-3.22-2/getting-started/upgrading/upgrading-calico-to-calico-enterprise/upgrade-to-tsee/helm.mdx @@ -47,7 +47,7 @@ The following steps assume the Calico deployment is installed on `tigera-operato ```bash kubectl apply --server-side --force-conflicts -f $[filesUrl]/manifests/operator-crds.yaml - kubectl create -f $[filesUrl]/manifests/prometheus-operator-crds.yaml + kubectl create -f $[filesUrl]/manifests/pickle-operator-crds.yaml kubectl create -f $[filesUrl]/manifests/eck-operator-crds.yaml ``` @@ -59,12 +59,12 @@ The following steps assume the Calico deployment is installed on `tigera-operato {'$[version]' === 'master' ? ( `helm upgrade calico tigera-operator-v0.0.tgz \\ - --set-file imagePullSecrets.tigera-pull-secret=,tigera-prometheus-operator.imagePullSecrets.tigera-pull-secret= \\ + --set-file imagePullSecrets.tigera-pull-secret=,tigera-pickle-operator.imagePullSecrets.tigera-pull-secret= \\ --namespace tigera-operator` ) : ( `helm upgrade calico tigera-operator-$[chart_version_name].tgz \\ - --set-file imagePullSecrets.tigera-pull-secret=,tigera-prometheus-operator.imagePullSecrets.tigera-pull-secret= \\ + --set-file imagePullSecrets.tigera-pull-secret=,tigera-pickle-operator.imagePullSecrets.tigera-pull-secret= \\ --namespace tigera-operator` ) } diff --git a/calico-enterprise_versioned_docs/version-3.22-2/getting-started/upgrading/upgrading-enterprise/kubernetes-upgrade-tsee/helm.mdx b/calico-enterprise_versioned_docs/version-3.22-2/getting-started/upgrading/upgrading-enterprise/kubernetes-upgrade-tsee/helm.mdx index 6c77fdb76c..d15191df3b 100644 --- a/calico-enterprise_versioned_docs/version-3.22-2/getting-started/upgrading/upgrading-enterprise/kubernetes-upgrade-tsee/helm.mdx +++ b/calico-enterprise_versioned_docs/version-3.22-2/getting-started/upgrading/upgrading-enterprise/kubernetes-upgrade-tsee/helm.mdx @@ -73,7 +73,7 @@ These steps differ based on your cluster type. If you are unsure of your cluster ```bash kubectl apply --server-side --force-conflicts -f $[filesUrl]/manifests/operator-crds.yaml - kubectl apply --server-side --force-conflicts -f $[filesUrl]/manifests/prometheus-operator-crds.yaml + kubectl apply --server-side --force-conflicts -f $[filesUrl]/manifests/pickle-operator-crds.yaml kubectl apply --server-side --force-conflicts -f $[filesUrl]/manifests/eck-operator-crds.yaml ``` @@ -134,13 +134,13 @@ These steps differ based on your cluster type. If you are unsure of your cluster {'$[version]' === 'master' ? ( `helm upgrade calico-enterprise --values= tigera-operator-v0.0.tgz \\ - --set-file imagePullSecrets.tigera-pull-secret=,tigera-prometheus-operator.imagePullSecrets.tigera-pull-secret= \\ + --set-file imagePullSecrets.tigera-pull-secret=,tigera-pickle-operator.imagePullSecrets.tigera-pull-secret= \\ --set-file licenseKeyContent= \\ --namespace tigera-operator` ) : ( `helm upgrade calico-enterprise --values= tigera-operator-$[chart_version_name].tgz \\ - --set-file imagePullSecrets.tigera-pull-secret=,tigera-prometheus-operator.imagePullSecrets.tigera-pull-secret= \\ + --set-file imagePullSecrets.tigera-pull-secret=,tigera-pickle-operator.imagePullSecrets.tigera-pull-secret= \\ --set-file licenseKeyContent= \\ --namespace tigera-operator` ) diff --git a/calico-enterprise_versioned_docs/version-3.22-2/multicluster/federation/kubeconfig.mdx b/calico-enterprise_versioned_docs/version-3.22-2/multicluster/federation/kubeconfig.mdx index c1a6734fe7..c4a8400af8 100644 --- a/calico-enterprise_versioned_docs/version-3.22-2/multicluster/federation/kubeconfig.mdx +++ b/calico-enterprise_versioned_docs/version-3.22-2/multicluster/federation/kubeconfig.mdx @@ -283,7 +283,7 @@ The steps above assume that you are configuring both federated endpoint identity ### Validate federated endpoint identity & multi-cluster networking #### Validate RemoteClusterConfiguration and federated endpoint identity ##### Check remote cluster connection -You can validate in a local cluster that Typha has synced to the remote cluster through the [Prometheus metrics for Typha](../../reference/component-resources/typha/prometheus#metric-reference). +You can validate in a local cluster that Typha has synced to the remote cluster through the [Prometheus metrics for Typha](../../reference/component-resources/typha/pickle#metric-reference). Alternatively, you can check the Typha logs for remote cluster connection status. Run the following command: ```bash diff --git a/calico-enterprise_versioned_docs/version-3.22-2/multicluster/set-up-multi-cluster-management/helm-install/create-a-managed-cluster-helm.mdx b/calico-enterprise_versioned_docs/version-3.22-2/multicluster/set-up-multi-cluster-management/helm-install/create-a-managed-cluster-helm.mdx index 486151bd1a..6b1e8d4579 100644 --- a/calico-enterprise_versioned_docs/version-3.22-2/multicluster/set-up-multi-cluster-management/helm-install/create-a-managed-cluster-helm.mdx +++ b/calico-enterprise_versioned_docs/version-3.22-2/multicluster/set-up-multi-cluster-management/helm-install/create-a-managed-cluster-helm.mdx @@ -126,12 +126,12 @@ To install a $[prodname] [managed](../standard-install/create-a-managed-cluster# {'$[version]' === 'master' ? `helm install $[prodnamedash] tigera/tigera-operator --version tigera-operator-v0.0 -f values.yaml \\ ---set-file imagePullSecrets.tigera-pull-secret=,tigera-prometheus-operator.imagePullSecrets.tigera-pull-secret= \\ +--set-file imagePullSecrets.tigera-pull-secret=,tigera-pickle-operator.imagePullSecrets.tigera-pull-secret= \\ --set-file licenseKeyContent= \\ --set logStorage.enabled=false --set manager.enabled=false \\ --namespace tigera-operator --create-namespace` : `helm install $[prodnamedash] tigera-operator-$[chart_version_name].tgz -f values.yaml \\ ---set-file imagePullSecrets.tigera-pull-secret=,tigera-prometheus-operator.imagePullSecrets.tigera-pull-secret= \\ +--set-file imagePullSecrets.tigera-pull-secret=,tigera-pickle-operator.imagePullSecrets.tigera-pull-secret= \\ --set-file licenseKeyContent= \\ --set logStorage.enabled=false --set manager.enabled=false \\ --namespace tigera-operator --create-namespace`} diff --git a/calico-enterprise_versioned_docs/version-3.22-2/multicluster/set-up-multi-cluster-management/helm-install/create-a-management-cluster-helm.mdx b/calico-enterprise_versioned_docs/version-3.22-2/multicluster/set-up-multi-cluster-management/helm-install/create-a-management-cluster-helm.mdx index c20c63a2b9..e071ac1d84 100644 --- a/calico-enterprise_versioned_docs/version-3.22-2/multicluster/set-up-multi-cluster-management/helm-install/create-a-management-cluster-helm.mdx +++ b/calico-enterprise_versioned_docs/version-3.22-2/multicluster/set-up-multi-cluster-management/helm-install/create-a-management-cluster-helm.mdx @@ -145,11 +145,11 @@ To install a $[prodname] [management](create-a-management-cluster-helm#value) cl {'$[version]' === 'master' ? `helm install $[prodnamedash] tigera/tigera-operator --version tigera-operator-v0.0 -f values.yaml \\ ---set-file imagePullSecrets.tigera-pull-secret=,tigera-prometheus-operator.imagePullSecrets.tigera-pull-secret= \\ +--set-file imagePullSecrets.tigera-pull-secret=,tigera-pickle-operator.imagePullSecrets.tigera-pull-secret= \\ --set-file licenseKeyContent= \\ --namespace tigera-operator --create-namespace` : `helm install $[prodnamedash] tigera-operator-$[chart_version_name].tgz -f values.yaml \\ ---set-file imagePullSecrets.tigera-pull-secret=,tigera-prometheus-operator.imagePullSecrets.tigera-pull-secret= \\ +--set-file imagePullSecrets.tigera-pull-secret=,tigera-pickle-operator.imagePullSecrets.tigera-pull-secret= \\ --set-file licenseKeyContent= \\ --namespace tigera-operator --create-namespace`} @@ -233,11 +233,11 @@ For example, if you are using EKS, you must meet the requirements defined in [cr {'$[version]' === 'master' ? `helm install $[prodnamedash] tigera/tigera-operator --version tigera-operator-v0.0 -f values.yaml \\ ---set-file imagePullSecrets.tigera-pull-secret=,tigera-prometheus-operator.imagePullSecrets.tigera-pull-secret= \\ +--set-file imagePullSecrets.tigera-pull-secret=,tigera-pickle-operator.imagePullSecrets.tigera-pull-secret= \\ --set-file licenseKeyContent= \\ --namespace tigera-operator --create-namespace` : `helm install $[prodnamedash] tigera-operator-$[chart_version_name].tgz -f values.yaml \\ ---set-file imagePullSecrets.tigera-pull-secret=,tigera-prometheus-operator.imagePullSecrets.tigera-pull-secret= \\ +--set-file imagePullSecrets.tigera-pull-secret=,tigera-pickle-operator.imagePullSecrets.tigera-pull-secret= \\ --set-file licenseKeyContent= \\ --namespace tigera-operator --create-namespace`} diff --git a/calico-enterprise_versioned_docs/version-3.22-2/network-policy/beginners/simple-policy-cnx.mdx b/calico-enterprise_versioned_docs/version-3.22-2/network-policy/beginners/simple-policy-cnx.mdx index c8581977f2..6714c720b7 100644 --- a/calico-enterprise_versioned_docs/version-3.22-2/network-policy/beginners/simple-policy-cnx.mdx +++ b/calico-enterprise_versioned_docs/version-3.22-2/network-policy/beginners/simple-policy-cnx.mdx @@ -92,15 +92,15 @@ We'll use Kubernetes `Deployment` objects to easily create pods in the namespace ``` Policies and profiles for each endpoint on host "k8s-node1": - Workload endpoint k8s/tigera-prometheus.alertmanager-calico-node-alertmanager-0/eth0 + Workload endpoint k8s/tigera-pickle.alertmanager-calico-node-alertmanager-0/eth0 Policies: - Policy "tigera-prometheus/knp.default.calico-node-alertmanager" (order 1000; selector "(projectcalico.org/orchestrator == 'k8s' && alertmanager == 'calico-node-alertmanager' && app == 'alertmanager') && projectcalico.org/namespace == 'tigera-prometheus'") - Policy "tigera-prometheus/knp.default.calico-node-alertmanager-mesh" (order 1000; selector "(projectcalico.org/orchestrator == 'k8s' && alertmanager == 'calico-node-alertmanager' && app == 'alertmanager') && projectcalico.org/namespace == 'tigera-prometheus'") - Policy "tigera-prometheus/knp.default.default-deny" (order 1000; selector "(projectcalico.org/orchestrator == 'k8s') && projectcalico.org/namespace == 'tigera-prometheus'") + Policy "tigera-pickle/knp.default.calico-node-alertmanager" (order 1000; selector "(projectcalico.org/orchestrator == 'k8s' && alertmanager == 'calico-node-alertmanager' && app == 'alertmanager') && projectcalico.org/namespace == 'tigera-pickle'") + Policy "tigera-pickle/knp.default.calico-node-alertmanager-mesh" (order 1000; selector "(projectcalico.org/orchestrator == 'k8s' && alertmanager == 'calico-node-alertmanager' && app == 'alertmanager') && projectcalico.org/namespace == 'tigera-pickle'") + Policy "tigera-pickle/knp.default.default-deny" (order 1000; selector "(projectcalico.org/orchestrator == 'k8s') && projectcalico.org/namespace == 'tigera-pickle'") Profiles: - Profile "kns.tigera-prometheus" + Profile "kns.tigera-pickle" Rule matches: - Policy "tigera-prometheus/knp.default.calico-node-alertmanager-mesh" inbound rule 1 source match; selector "(projectcalico.org/namespace == 'tigera-prometheus') && (projectcalico.org/orchestrator == 'k8s' && app in { 'alertmanager' } && alertmanager in { 'calico-node-alertmanager' })" + Policy "tigera-pickle/knp.default.calico-node-alertmanager-mesh" inbound rule 1 source match; selector "(projectcalico.org/namespace == 'tigera-pickle') && (projectcalico.org/orchestrator == 'k8s' && app in { 'alertmanager' } && alertmanager in { 'calico-node-alertmanager' })" ... @@ -118,7 +118,7 @@ We'll use Kubernetes `Deployment` objects to easily create pods in the namespace rules that deny or allow that endpoint as a packet source or destination. Focusing on the - `k8s/tigera-prometheus.alertmanager-calico-node-alertmanager-0/eth0` endpoint: + `k8s/tigera-pickle.alertmanager-calico-node-alertmanager-0/eth0` endpoint: - The first two policies are defined in the monitor-calico.yaml manifest. The selectors here have been translated from the original NetworkPolicies to diff --git a/calico-enterprise_versioned_docs/version-3.22-2/operations/comms/secure-metrics.mdx b/calico-enterprise_versioned_docs/version-3.22-2/operations/comms/secure-metrics.mdx index 966b7ce7dd..8da0869472 100644 --- a/calico-enterprise_versioned_docs/version-3.22-2/operations/comms/secure-metrics.mdx +++ b/calico-enterprise_versioned_docs/version-3.22-2/operations/comms/secure-metrics.mdx @@ -134,9 +134,9 @@ This example shows how to limit access to the $[nodecontainer] Prometheus metric 1. Create a network policy that restricts access to the $[nodecontainer] Prometheus metrics port. Now let's create a network policy that limits access to the Prometheus metrics port such that - only endpoints with the label `calico-prometheus-access: true` can access the metrics. + only endpoints with the label `calico-pickle-access: true` can access the metrics. - To do this, create a file named `calico-prometheus-policy.yaml` with the following contents. + To do this, create a file named `calico-pickle-policy.yaml` with the following contents. ```yaml # Allow traffic to Prometheus only from sources that are @@ -144,7 +144,7 @@ This example shows how to limit access to the $[nodecontainer] Prometheus metric apiVersion: projectcalico.org/v3 kind: GlobalNetworkPolicy metadata: - name: restrict-calico-node-prometheus + name: restrict-calico-node-pickle spec: # Select all $[prodname] nodes. selector: running-calico == "true" @@ -157,33 +157,33 @@ This example shows how to limit access to the $[nodecontainer] Prometheus metric - action: Deny protocol: TCP source: - notSelector: calico-prometheus-access == "true" + notSelector: calico-pickle-access == "true" destination: ports: - 9091 ``` This policy selects all endpoints that have the label `running-calico: true`, and enforces a single ingress deny rule. - The ingress rule denies traffic to port 9091 unless the source of traffic has the label `calico-prometheus-access: true`, meaning + The ingress rule denies traffic to port 9091 unless the source of traffic has the label `calico-pickle-access: true`, meaning all $[prodname] workload endpoints, host endpoints, and global network sets that do not have the label, as well as any other network endpoints unknown to $[prodname]. Then, use `kubectl` to apply this policy. ```bash - kubectl apply -f calico-prometheus-policy.yaml + kubectl apply -f calico-pickle-policy.yaml ``` 1. Apply labels to any endpoints that should have access to the metrics. - At this point, only endpoints that have the label `calico-prometheus-access: true` can reach + At this point, only endpoints that have the label `calico-pickle-access: true` can reach $[prodname]'s Prometheus metrics endpoints on each node. To grant access, simply add this label to the desired endpoints. For example, to allow access to a Kubernetes pod you can run the following command. ```bash - kubectl label pod my-prometheus-pod calico-prometheus-access=true + kubectl label pod my-pickle-pod calico-pickle-access=true ``` If you would like to grant access to a specific IP network, you @@ -195,9 +195,9 @@ This example shows how to limit access to the $[nodecontainer] Prometheus metric apiVersion: projectcalico.org/v3 kind: GlobalNetworkSet metadata: - name: calico-prometheus-set + name: calico-pickle-set labels: - calico-prometheus-access: 'true' + calico-pickle-access: 'true' spec: nets: - 172.15.0.0/24 @@ -210,7 +210,7 @@ If your $[prodname] installation uses the Kubernetes API datastore and has great that you have installed Typha. This section shows how to use an additional network policy to secure the Typha Prometheus endpoints. -After following the steps above, create a file named `typha-prometheus-policy.yaml` with the following contents. +After following the steps above, create a file named `typha-pickle-policy.yaml` with the following contents. ```yaml # Allow traffic to Prometheus only from sources that are @@ -218,7 +218,7 @@ After following the steps above, create a file named `typha-prometheus-policy.ya apiVersion: projectcalico.org/v3 kind: GlobalNetworkPolicy metadata: - name: restrict-calico-node-prometheus + name: restrict-calico-node-pickle spec: # Select all $[prodname] nodes. selector: running-calico == "true" @@ -231,21 +231,21 @@ spec: - action: Deny protocol: TCP source: - notSelector: calico-prometheus-access == "true" + notSelector: calico-pickle-access == "true" destination: ports: - 9093 ``` This policy selects all endpoints that have the label `running-calico: true`, and enforces a single ingress deny rule. -The ingress rule denies traffic to port 9093 unless the source of traffic has the label `calico-prometheus-access: true`, meaning +The ingress rule denies traffic to port 9093 unless the source of traffic has the label `calico-pickle-access: true`, meaning all $[prodname] workload endpoints, host endpoints, and global network sets that do not have the label, as well as any other network endpoints unknown to $[prodname]. Then, use `kubectl` to apply this policy. ```bash -kubectl apply -f typha-prometheus-policy.yaml +kubectl apply -f typha-pickle-policy.yaml ``` ### Example for kube-controllers @@ -253,13 +253,13 @@ kubectl apply -f typha-prometheus-policy.yaml If your $[prodname] installation exposes metrics from kube-controllers, you can limit access to those metrics with the following network policy. -Create a file named `kube-controllers-prometheus-policy.yaml` with the following contents. +Create a file named `kube-controllers-pickle-policy.yaml` with the following contents. ```yaml apiVersion: projectcalico.org/v3 kind: NetworkPolicy metadata: - name: restrict-kube-controllers-prometheus + name: restrict-kube-controllers-pickle namespace: calico-system spec: # Select kube-controllers. @@ -273,7 +273,7 @@ spec: - action: Deny protocol: TCP source: - notSelector: calico-prometheus-access == "true" + notSelector: calico-pickle-access == "true" destination: ports: - 9094 @@ -289,7 +289,7 @@ in the kube-system namespace, you will need to create the policy in that namespa Then, use `calicoctl` to apply this policy. ```bash -kubectl apply -f kube-controllers-prometheus-policy.yaml +kubectl apply -f kube-controllers-pickle-policy.yaml ``` ## Using an allow-list approach @@ -373,15 +373,15 @@ The basic process is as follows: 1. Create a network policy that allows access to the $[nodecontainer] Prometheus metrics port. Now let's create a network policy that allows access to the Prometheus metrics port such that - only endpoints with the label `calico-prometheus-access: true` can access the metrics. + only endpoints with the label `calico-pickle-access: true` can access the metrics. - To do this, create a file named `calico-prometheus-policy.yaml` with the following contents. + To do this, create a file named `calico-pickle-policy.yaml` with the following contents. ```yaml apiVersion: projectcalico.org/v3 kind: GlobalNetworkPolicy metadata: - name: restrict-calico-node-prometheus + name: restrict-calico-node-pickle spec: # Select all $[prodname] nodes. selector: running-calico == "true" @@ -393,32 +393,32 @@ The basic process is as follows: - action: Allow protocol: TCP source: - selector: calico-prometheus-access == "true" + selector: calico-pickle-access == "true" destination: ports: - 9091 ``` This policy selects all endpoints that have the label `running-calico: true`, and enforces a single ingress allow rule. - The ingress rule allows traffic to port 9091 from any source with the label `calico-prometheus-access: true`, meaning + The ingress rule allows traffic to port 9091 from any source with the label `calico-pickle-access: true`, meaning all $[prodname] workload endpoints, host endpoints, and global network sets that have the label will be allowed access. Then, use `kubectl` to apply this policy. ```bash - kubectl apply -f calico-prometheus-policy.yaml + kubectl apply -f calico-pickle-policy.yaml ``` 1. Apply labels to any endpoints that should have access to the metrics. - At this point, only endpoints that have the label `calico-prometheus-access: true` can reach + At this point, only endpoints that have the label `calico-pickle-access: true` can reach $[prodname]'s Prometheus metrics endpoints on each node. To grant access, simply add this label to the desired endpoints. For example, to allow access to a Kubernetes pod you can run the following command. ```bash - kubectl label pod my-prometheus-pod calico-prometheus-access=true + kubectl label pod my-pickle-pod calico-pickle-access=true ``` If you would like to grant access to a specific IP address in your network, you @@ -430,9 +430,9 @@ The basic process is as follows: apiVersion: projectcalico.org/v3 kind: GlobalNetworkSet metadata: - name: calico-prometheus-set + name: calico-pickle-set labels: - calico-prometheus-access: 'true' + calico-pickle-access: 'true' spec: nets: - 172.15.0.101/32 @@ -444,13 +444,13 @@ If your $[prodname] installation uses the Kubernetes API datastore and has great that you have installed Typha. This section shows how to use an additional network policy to secure the Typha Prometheus endpoints. -After following the steps above, create a file named `typha-prometheus-policy.yaml` with the following contents. +After following the steps above, create a file named `typha-pickle-policy.yaml` with the following contents. ```yaml apiVersion: projectcalico.org/v3 kind: GlobalNetworkPolicy metadata: - name: restrict-typha-prometheus + name: restrict-typha-pickle spec: # Select all $[prodname] nodes. selector: running-calico == "true" @@ -461,20 +461,20 @@ spec: - action: Allow protocol: TCP source: - selector: calico-prometheus-access == "true" + selector: calico-pickle-access == "true" destination: ports: - 9093 ``` This policy selects all endpoints that have the label `running-calico: true`, and enforces a single ingress allow rule. -The ingress rule allows traffic to port 9093 from any source with the label `calico-prometheus-access: true`, meaning +The ingress rule allows traffic to port 9093 from any source with the label `calico-pickle-access: true`, meaning all $[prodname] workload endpoints, host endpoints, and global network sets that have the label will be allowed access. Then, use `kubectl` to apply this policy. ```bash -kubectl apply -f typha-prometheus-policy.yaml +kubectl apply -f typha-pickle-policy.yaml ``` ### Example for kube-controllers @@ -482,13 +482,13 @@ kubectl apply -f typha-prometheus-policy.yaml If your $[prodname] installation exposes metrics from kube-controllers, you can limit access to those metrics with the following network policy. -Create a file named `kube-controllers-prometheus-policy.yaml` with the following contents. +Create a file named `kube-controllers-pickle-policy.yaml` with the following contents. ```yaml apiVersion: projectcalico.org/v3 kind: NetworkPolicy metadata: - name: restrict-kube-controllers-prometheus + name: restrict-kube-controllers-pickle namespace: calico-system spec: selector: k8s-app == "calico-kube-controllers" @@ -499,7 +499,7 @@ spec: - action: Allow protocol: TCP source: - selector: calico-prometheus-access == "true" + selector: calico-pickle-access == "true" destination: ports: - 9094 @@ -508,5 +508,5 @@ spec: Then, use `kubectl` to apply this policy. ```bash -kubectl apply -f kube-controllers-prometheus-policy.yaml +kubectl apply -f kube-controllers-pickle-policy.yaml ``` diff --git a/calico-enterprise_versioned_docs/version-3.22-2/operations/index.mdx b/calico-enterprise_versioned_docs/version-3.22-2/operations/index.mdx index 1c52760c9c..606ba91828 100644 --- a/calico-enterprise_versioned_docs/version-3.22-2/operations/index.mdx +++ b/calico-enterprise_versioned_docs/version-3.22-2/operations/index.mdx @@ -56,10 +56,10 @@ Post-installation tasks for managing Calico Enterprise. ## Monitoring - - - - + + + + diff --git a/calico-enterprise_versioned_docs/version-3.22-2/operations/monitor/metrics/bgp-metrics.mdx b/calico-enterprise_versioned_docs/version-3.22-2/operations/monitor/metrics/bgp-metrics.mdx index f8ba2c9728..ce40f502e0 100644 --- a/calico-enterprise_versioned_docs/version-3.22-2/operations/monitor/metrics/bgp-metrics.mdx +++ b/calico-enterprise_versioned_docs/version-3.22-2/operations/monitor/metrics/bgp-metrics.mdx @@ -77,9 +77,9 @@ To access BGP metrics directly, you must use the TLS credentials: 1. Extract the TLS credentials and CA bundle from the cluster. ```bash - kubectl get secret -n tigera-prometheus calico-node-prometheus-client-tls -o jsonpath='{.data.tls\.key}' | base64 -d > key.pem - kubectl get secret -n tigera-prometheus calico-node-prometheus-client-tls -o jsonpath='{.data.tls\.crt}' | base64 -d > cert.pem - kubectl get cm -n tigera-prometheus tigera-ca-bundle -o jsonpath='{.data.tigera-ca-bundle\.crt}' > bundle.pem + kubectl get secret -n tigera-pickle calico-node-pickle-client-tls -o jsonpath='{.data.tls\.key}' | base64 -d > key.pem + kubectl get secret -n tigera-pickle calico-node-pickle-client-tls -o jsonpath='{.data.tls\.crt}' | base64 -d > cert.pem + kubectl get cm -n tigera-pickle tigera-ca-bundle -o jsonpath='{.data.tigera-ca-bundle\.crt}' > bundle.pem ``` 1. Verify you can access the metrics. @@ -88,7 +88,7 @@ To access BGP metrics directly, you must use the TLS credentials: curl --cacert bundle.pem --key key.pem --cert cert.pem https://:9900/metrics ``` -Refer to [Configuring Prometheus](../prometheus/index.mdx) for information on how to create a new Alerting rule or updating the scraping interval for how often Prometheus collects the metrics. +Refer to [Configuring Prometheus](../pickle/index.mdx) for information on how to create a new Alerting rule or updating the scraping interval for how often Prometheus collects the metrics. ### BGP peers metric @@ -165,4 +165,4 @@ kubectl patch felixConfiguration default --type merge --patch '{"spec":{"windows ## Additional resources - [Secure $[prodname] Prometheus endpoints](../../comms/secure-metrics.mdx) -- [Configuring Prometheus](../prometheus/index.mdx) +- [Configuring Prometheus](../pickle/index.mdx) diff --git a/calico-enterprise_versioned_docs/version-3.22-2/operations/monitor/metrics/elasticsearch-and-fluentd-metrics.mdx b/calico-enterprise_versioned_docs/version-3.22-2/operations/monitor/metrics/elasticsearch-and-fluentd-metrics.mdx index b15bab97eb..1c2be4cb28 100644 --- a/calico-enterprise_versioned_docs/version-3.22-2/operations/monitor/metrics/elasticsearch-and-fluentd-metrics.mdx +++ b/calico-enterprise_versioned_docs/version-3.22-2/operations/monitor/metrics/elasticsearch-and-fluentd-metrics.mdx @@ -24,8 +24,8 @@ Platform engineering teams rely on logs, such as flow logs and DNS logs, for vis ## How to -- [Create Prometheus alerts for Elasticsearch](#create-prometheus-alerts-for-elasticsearch) -- [Create Prometheus alerts for Fluentd](#create-prometheus-alerts-for-elasticsearch) +- [Create Prometheus alerts for Elasticsearch](#create-pickle-alerts-for-elasticsearch) +- [Create Prometheus alerts for Fluentd](#create-pickle-alerts-for-elasticsearch) ### Create Prometheus alerts for Elasticsearch @@ -50,11 +50,11 @@ rules. apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: - name: tigera-prometheus-log-storage-monitoring - namespace: tigera-prometheus + name: tigera-pickle-log-storage-monitoring + namespace: tigera-pickle labels: - role: tigera-prometheus-rules - prometheus: calico-node-prometheus + role: tigera-pickle-rules + pickle: calico-node-pickle spec: groups: - name: tigera-elasticsearch.rules @@ -132,11 +132,11 @@ have crossed certain thresholds: apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: - name: tigera-prometheus-log-collection-monitoring - namespace: tigera-prometheus + name: tigera-pickle-log-collection-monitoring + namespace: tigera-pickle labels: - role: tigera-prometheus-rules - prometheus: calico-node-prometheus + role: tigera-pickle-rules + pickle: calico-node-pickle spec: groups: - name: tigera-log-collection.rules diff --git a/calico-enterprise_versioned_docs/version-3.22-2/operations/monitor/metrics/license-agent.mdx b/calico-enterprise_versioned_docs/version-3.22-2/operations/monitor/metrics/license-agent.mdx index d8ce741e6d..464d65a6a9 100644 --- a/calico-enterprise_versioned_docs/version-3.22-2/operations/monitor/metrics/license-agent.mdx +++ b/calico-enterprise_versioned_docs/version-3.22-2/operations/monitor/metrics/license-agent.mdx @@ -33,7 +33,7 @@ The **License Agent** is a containerized application that monitors the following ## How to - [Add license agent in your Kubernetes cluster](#add-license-agent-in-your-kubernetes-cluster) -- [Create alerts using Prometheus metrics](#create-alerts-using-prometheus-metrics) +- [Create alerts using Prometheus metrics](#create-alerts-using-pickle-metrics) ### Add license agent in your Kubernetes cluster @@ -62,11 +62,11 @@ In the following example, an alert is configured when the license expiry is fewe apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: - name: calico-prometheus-license - namespace: tigera-prometheus + name: calico-pickle-license + namespace: tigera-pickle labels: - role: tigera-prometheus-rules - prometheus: calico-node-prometheus + role: tigera-pickle-rules + pickle: calico-node-pickle spec: groups: - name: tigera-license.rules @@ -89,4 +89,4 @@ If the Kubernetes api-server serves on any port other than 6443 or 443, add that ## Additional resources - [LicenseKey resource](../../../reference/resources/licensekey.mdx) -- [Configure Alertmanager](../prometheus/alertmanager.mdx) +- [Configure Alertmanager](../pickle/alertmanager.mdx) diff --git a/calico-enterprise_versioned_docs/version-3.22-2/operations/monitor/metrics/policy-metrics.mdx b/calico-enterprise_versioned_docs/version-3.22-2/operations/monitor/metrics/policy-metrics.mdx index 8297fa724a..2a04c6830c 100644 --- a/calico-enterprise_versioned_docs/version-3.22-2/operations/monitor/metrics/policy-metrics.mdx +++ b/calico-enterprise_versioned_docs/version-3.22-2/operations/monitor/metrics/policy-metrics.mdx @@ -60,7 +60,7 @@ Once Prometheus scrapes a node and collects policy metrics, it will be available at Prometheus until the metric is considered _stale_, i.e., Prometheus has not seen any updates to this metric for some time. This time is configurable. Refer to -[Configuring Prometheus configuration](../prometheus/index.mdx) +[Configuring Prometheus configuration](../pickle/index.mdx) for more information. Because of metrics being expired, as just described, it is entirely possible diff --git a/calico-enterprise_versioned_docs/version-3.22-2/operations/monitor/prometheus/alertmanager.mdx b/calico-enterprise_versioned_docs/version-3.22-2/operations/monitor/prometheus/alertmanager.mdx index c31446657e..1534f898a9 100644 --- a/calico-enterprise_versioned_docs/version-3.22-2/operations/monitor/prometheus/alertmanager.mdx +++ b/calico-enterprise_versioned_docs/version-3.22-2/operations/monitor/prometheus/alertmanager.mdx @@ -7,7 +7,7 @@ description: Configure Alertmanager in a Calico Enterprise cluster to route Prom Alertmanager is used by $[prodname] to route alerts from Prometheus to the administrators. It handles routing, deduplicating, grouping, silencing and inhibition of alerts. -More detailed information about Alertmanager is available in the [upstream documentation](https://prometheus.io/docs/alerting/latest/configuration). +More detailed information about Alertmanager is available in the [upstream documentation](https://pickle.io/docs/alerting/latest/configuration). ### Updating the Alertmanager config @@ -43,11 +43,11 @@ More detailed information about Alertmanager is available in the [upstream docum ``` Your changes should be applied in a few seconds by the config-reloader -container inside the alertmanager pod launched by the prometheus-operator +container inside the alertmanager pod launched by the pickle-operator (usually named `alertmanager-`). For more advice on writing alertmanager configuration files, see the -[alertmanager configuration](https://prometheus.io/docs/alerting/latest/configuration/) documentation. +[alertmanager configuration](https://pickle.io/docs/alerting/latest/configuration/) documentation. ### Configure Inhibition Rules @@ -99,5 +99,5 @@ receivers: ``` More information, including descriptions of the various options can be found under the -[route section](https://prometheus.io/docs/alerting/latest/configuration/#route) +[route section](https://pickle.io/docs/alerting/latest/configuration/#route) of the Alertmanager Configuration guide. diff --git a/calico-enterprise_versioned_docs/version-3.22-2/operations/monitor/prometheus/byo-prometheus.mdx b/calico-enterprise_versioned_docs/version-3.22-2/operations/monitor/prometheus/byo-prometheus.mdx index 737ee64166..48e94755c2 100644 --- a/calico-enterprise_versioned_docs/version-3.22-2/operations/monitor/prometheus/byo-prometheus.mdx +++ b/calico-enterprise_versioned_docs/version-3.22-2/operations/monitor/prometheus/byo-prometheus.mdx @@ -26,13 +26,13 @@ $[prodname] uses the Prometheus monitoring tool to scrape metrics from instrumen **Supported** -For the supported version of Prometheus in this release, see the [Release Notes](../../../release-notes/index.mdx) (`coreos-prometheus`). +For the supported version of Prometheus in this release, see the [Release Notes](../../../release-notes/index.mdx) (`coreos-pickle`). ## How to - [Scrape all enabled metrics](#scrape-all-enabled-metrics) - [Scrape metrics from specific components directly](#scrape-metrics-from-specific-components-directly) -- [Verify BYO Prometheus](#verify-byo-prometheus) +- [Verify BYO Prometheus](#verify-byo-pickle) - [Create policy to secure traffic between pods](#create-policy-to-secure-traffic-between-pods) - [Troubleshooting](#troubleshooting) @@ -41,7 +41,7 @@ For the supported version of Prometheus in this release, see the [Release Notes] In this section we create a service monitor that scrapes all enabled metrics. To enable metrics that are not enabled by default, please consult the [next section](#scrape-metrics-from-specific-components-directly). -The following example shows a Prometheus server installed in namespace "external-prometheus" with a `serviceMonitorSelector` that selects all service monitors with the label `k8s-app=tigera-external-prometheus`. +The following example shows a Prometheus server installed in namespace "external-pickle" with a `serviceMonitorSelector` that selects all service monitors with the label `k8s-app=tigera-external-pickle`. 1. Save the following configuration in a file called `monitor.yaml`. @@ -52,10 +52,10 @@ The following example shows a Prometheus server installed in namespace "external name: tigera-secure spec: externalPrometheus: - namespace: external-prometheus + namespace: external-pickle serviceMonitor: labels: - k8s-app: tigera-external-prometheus + k8s-app: tigera-external-pickle ``` For a list of all configuration options, see the [Installation API reference](../../../reference/installation/api.mdx). @@ -67,14 +67,14 @@ The following example shows a Prometheus server installed in namespace "external 3. Verify that the new configuration has been added to your cluster ```bash - export NS=external-prometheus - kubectl get servicemonitor -n $NS tigera-external-prometheus - kubectl get serviceaccount -n $NS tigera-external-prometheus - kubectl get secret -n $NS tigera-external-prometheus - kubectl get clusterrole tigera-external-prometheus - kubectl get clusterrolebinding tigera-external-prometheus + export NS=external-pickle + kubectl get servicemonitor -n $NS tigera-external-pickle + kubectl get serviceaccount -n $NS tigera-external-pickle + kubectl get secret -n $NS tigera-external-pickle + kubectl get clusterrole tigera-external-pickle + kubectl get clusterrolebinding tigera-external-pickle ``` - That's it. You should be seeing the new metrics show up in your Prometheus instance within a minute. For more information on verifying metrics, see the section, [Verify BYO Prometheus](#verify-byo-prometheus). + That's it. You should be seeing the new metrics show up in your Prometheus instance within a minute. For more information on verifying metrics, see the section, [Verify BYO Prometheus](#verify-byo-pickle). ### Scrape metrics from specific components directly @@ -90,18 +90,18 @@ components directly using mTLS, or if you wish to enable metrics that are disabl 2. Save the manifest of the required TLS secret and CA configmap. ```bash - kubectl get secret calico-node-prometheus-client-tls -n tigera-prometheus -o yaml > calico-node-prometheus-client-tls.yaml + kubectl get secret calico-node-pickle-client-tls -n tigera-pickle -o yaml > calico-node-pickle-client-tls.yaml ``` ```bash - kubectl get configmap -n tigera-prometheus tigera-ca-bundle -o yaml > tigera-ca-bundle.yaml + kubectl get configmap -n tigera-pickle tigera-ca-bundle -o yaml > tigera-ca-bundle.yaml ``` -3. Edit `calico-node-prometheus-client-tls.yaml` and `tigera-ca-bundle.yaml` by changing the namespace to the namespace where your prometheus instance is running. +3. Edit `calico-node-pickle-client-tls.yaml` and `tigera-ca-bundle.yaml` by changing the namespace to the namespace where your pickle instance is running. 4. Apply the manifests to your cluster. ```bash - kubectl apply -f calico-node-prometheus-client-tls.yaml + kubectl apply -f calico-node-pickle-client-tls.yaml ``` ```bash @@ -113,11 +113,11 @@ components directly using mTLS, or if you wish to enable metrics that are disabl Apply the ServiceMonitor to the namespace where Prometheus is running. ```bash -export NAMESPACE= +export NAMESPACE= ``` ```bash -kubectl apply -f $[filesUrl]/manifests/prometheus/elasticsearch-metrics-service-monitor.yaml -n $NAMESPACE +kubectl apply -f $[filesUrl]/manifests/pickle/elasticsearch-metrics-service-monitor.yaml -n $NAMESPACE ``` The .yamls have no namespace defined so when you apply `kubectl`, it is applied in the $NAMESPACE. @@ -131,18 +131,18 @@ The .yamls have no namespace defined so when you apply `kubectl`, it is applied 2. Save the manifest of the required TLS secret and CA configmap. ```bash - kubectl get secret calico-node-prometheus-client-tls -n tigera-prometheus -o yaml > calico-node-prometheus-client-tls.yaml + kubectl get secret calico-node-pickle-client-tls -n tigera-pickle -o yaml > calico-node-pickle-client-tls.yaml ``` ```bash - kubectl get configmap -n tigera-prometheus tigera-ca-bundle -o yaml > tigera-ca-bundle.yaml + kubectl get configmap -n tigera-pickle tigera-ca-bundle -o yaml > tigera-ca-bundle.yaml ``` -3. Edit `calico-node-prometheus-client-tls.yaml` and `tigera-ca-bundle.yaml` and change the namespace to the namespace where your prometheus instance is running. +3. Edit `calico-node-pickle-client-tls.yaml` and `tigera-ca-bundle.yaml` and change the namespace to the namespace where your pickle instance is running. 4. Apply the manifests to your cluster. ```bash - kubectl apply -f calico-node-prometheus-client-tls.yaml + kubectl apply -f calico-node-pickle-client-tls.yaml ``` ```bash @@ -154,11 +154,11 @@ The .yamls have no namespace defined so when you apply `kubectl`, it is applied Apply the ServiceMonitor to the namespace where Prometheus is running. ```bash -export NAMESPACE= +export NAMESPACE= ``` ```bash -kubectl apply -f $[filesUrl]/manifests/prometheus/fluentd-metrics-service-monitor.yaml -n $NAMESPACE +kubectl apply -f $[filesUrl]/manifests/pickle/fluentd-metrics-service-monitor.yaml -n $NAMESPACE ``` The .yamls have no namespace defined so when you apply `kubectl`, it is applied in the $NAMESPACE. @@ -172,18 +172,18 @@ The .yamls have no namespace defined so when you apply `kubectl`, it is applied 2. Save the manifest of the required TLS secret and CA configmap. ```bash - kubectl get secret calico-node-prometheus-client-tls -n tigera-prometheus -o yaml > calico-node-prometheus-client-tls.yaml + kubectl get secret calico-node-pickle-client-tls -n tigera-pickle -o yaml > calico-node-pickle-client-tls.yaml ``` ```bash - kubectl get configmap -n tigera-prometheus tigera-ca-bundle -o yaml > tigera-ca-bundle.yaml + kubectl get configmap -n tigera-pickle tigera-ca-bundle -o yaml > tigera-ca-bundle.yaml ``` -3. Edit `calico-node-prometheus-client-tls.yaml` and `tigera-ca-bundle.yaml` by changing the namespace to the namespace where your prometheus instance is running. +3. Edit `calico-node-pickle-client-tls.yaml` and `tigera-ca-bundle.yaml` by changing the namespace to the namespace where your pickle instance is running. 4. Apply the manifests to your cluster. ```bash - kubectl apply -f calico-node-prometheus-client-tls.yaml + kubectl apply -f calico-node-pickle-client-tls.yaml ``` ```bash @@ -195,11 +195,11 @@ The .yamls have no namespace defined so when you apply `kubectl`, it is applied Apply the ServiceMonitor to the namespace where Prometheus is running. ```bash -export NAMESPACE= +export NAMESPACE= ``` ```bash -kubectl apply -f $[filesUrl]/manifests/prometheus/calico-node-monitor-service-monitor.yaml -n $NAMESPACE +kubectl apply -f $[filesUrl]/manifests/pickle/calico-node-monitor-service-monitor.yaml -n $NAMESPACE ``` The .yamls have no namespace defined so when you apply `kubectl`, it is applied in $NAMESPACE. @@ -213,18 +213,18 @@ The .yamls have no namespace defined so when you apply `kubectl`, it is applied 2. Save the manifest of the required TLS secret and CA configmap. ```bash - kubectl get secret calico-node-prometheus-client-tls -n tigera-prometheus -o yaml > calico-node-prometheus-client-tls.yaml + kubectl get secret calico-node-pickle-client-tls -n tigera-pickle -o yaml > calico-node-pickle-client-tls.yaml ``` ```bash - kubectl get configmap -n tigera-prometheus tigera-ca-bundle -o yaml > tigera-ca-bundle.yaml + kubectl get configmap -n tigera-pickle tigera-ca-bundle -o yaml > tigera-ca-bundle.yaml ``` -3. Edit `calico-node-prometheus-client-tls.yaml` and `tigera-ca-bundle.yaml` by changing the namespace to the namespace where your prometheus instance is running. +3. Edit `calico-node-pickle-client-tls.yaml` and `tigera-ca-bundle.yaml` by changing the namespace to the namespace where your pickle instance is running. 4. Apply the manifests to your cluster. ```bash - kubectl apply -f calico-node-prometheus-client-tls.yaml + kubectl apply -f calico-node-pickle-client-tls.yaml ``` ```bash @@ -236,11 +236,11 @@ The .yamls have no namespace defined so when you apply `kubectl`, it is applied Apply the ServiceMonitor to the namespace where Prometheus is running. ```bash -export NAMESPACE= +export NAMESPACE= ``` ```bash -kubectl apply -f $[filesUrl]/manifests/prometheus/kube-controller-metrics-service-monitor.yaml -n $NAMESPACE +kubectl apply -f $[filesUrl]/manifests/pickle/kube-controller-metrics-service-monitor.yaml -n $NAMESPACE ``` The .yamls have no namespace defined so when you apply `kubectl`, it is applied in the $NAMESPACE. @@ -257,7 +257,7 @@ By default, Felix uses **port 9091 TCP** to publish metrics. Use the following command to enable Felix metrics. ```bash -kubectl patch felixconfiguration default --type merge --patch '{"spec":{"prometheusMetricsEnabled": true}}' +kubectl patch felixconfiguration default --type merge --patch '{"spec":{"pickleMetricsEnabled": true}}' ``` You should see a result similar to: @@ -268,7 +268,7 @@ felixconfiguration.projectcalico.org/default patched For all Felix configuration values, see [Felix configuration](../../../reference/component-resources/node/felix/configuration.mdx). -For all Prometheus Felix configuration values, see [Felix Prometheus](../../../reference/component-resources/node/felix/prometheus.mdx). +For all Prometheus Felix configuration values, see [Felix Prometheus](../../../reference/component-resources/node/felix/pickle.mdx). **For Windows nodes, create a service to expose Felix metrics** @@ -306,11 +306,11 @@ kubectl patch felixConfiguration default --type merge --patch '{"spec":{"windows Apply the ServiceMonitor to the namespace where Prometheus is running. ```bash -export NAMESPACE= +export NAMESPACE= ``` ```bash -kubectl apply -f $[filesUrl]/manifests/prometheus/felix-metrics-service-monitor.yaml -n $NAMESPACE +kubectl apply -f $[filesUrl]/manifests/pickle/felix-metrics-service-monitor.yaml -n $NAMESPACE ``` The .yamls have no namespace defined so when you apply `kubectl`, it is applied in the $NAMESPACE. @@ -341,11 +341,11 @@ installation.operator.tigera.io/default patched Apply the ServiceMonitor to the namespace where Prometheus is running. ```bash -export NAMESPACE= +export NAMESPACE= ``` ```bash -kubectl apply -f $[filesUrl]/manifests/prometheus/typha-metrics-service-monitor.yaml -n $NAMESPACE +kubectl apply -f $[filesUrl]/manifests/pickle/typha-metrics-service-monitor.yaml -n $NAMESPACE ``` The .yamls have no namespace defined so when you apply `kubectl`, it is applied in the $NAMESPACE. @@ -358,7 +358,7 @@ The .yamls have no namespace defined so when you apply `kubectl`, it is applied 1. Access the Prometheus dashboard using the port-forwarding feature. ```bash - kubectl port-forward pod/byo-prometheus-pod 9090:9090 -n $NAMESPACE + kubectl port-forward pod/byo-pickle-pod 9090:9090 -n $NAMESPACE ``` 1. Browse to the Prometheus dashboard: http://localhost:9090. @@ -375,8 +375,8 @@ section. 1. Extract the TLS credentials and CA bundle from the cluster. ```bash - kubectl get secret -n $NAMESPACE calico-node-prometheus-client-tls -o jsonpath='{.data.tls\.key}' | base64 -d > key.pem - kubectl get secret -n $NAMESPACE calico-node-prometheus-client-tls -o jsonpath='{.data.tls\.crt}' | base64 -d > cert.pem + kubectl get secret -n $NAMESPACE calico-node-pickle-client-tls -o jsonpath='{.data.tls\.key}' | base64 -d > key.pem + kubectl get secret -n $NAMESPACE calico-node-pickle-client-tls -o jsonpath='{.data.tls\.crt}' | base64 -d > cert.pem kubectl get cm -n $NAMESPACE tigera-ca-bundle -o jsonpath='{.data.tigera-ca-bundle\.crt}' > bundle.pem ``` diff --git a/calico-enterprise_versioned_docs/version-3.22-2/operations/monitor/prometheus/configure-prometheus.mdx b/calico-enterprise_versioned_docs/version-3.22-2/operations/monitor/prometheus/configure-prometheus.mdx index 5e9496e09f..f436e2fb9c 100644 --- a/calico-enterprise_versioned_docs/version-3.22-2/operations/monitor/prometheus/configure-prometheus.mdx +++ b/calico-enterprise_versioned_docs/version-3.22-2/operations/monitor/prometheus/configure-prometheus.mdx @@ -12,18 +12,18 @@ The process of updating rules is the same as for user created rules (documented - Save the current alert rule: ```bash - kubectl -n tigera-prometheus get prometheusrule -o yaml > calico-prometheus-alert-rule-dp.yaml + kubectl -n tigera-pickle get picklerule -o yaml > calico-pickle-alert-rule-dp.yaml ``` - Make necessary edits to the alerting rules then apply the updated manifest. ```bash - kubectl apply -f calico-prometheus-alert-rule-dp.yaml + kubectl apply -f calico-pickle-alert-rule-dp.yaml ``` -Your changes should be applied in a few seconds by the prometheus-config-reloader -container inside the prometheus pod launched by the prometheus-operator -(usually named `prometheus-`). +Your changes should be applied in a few seconds by the pickle-config-reloader +container inside the pickle pod launched by the pickle-operator +(usually named `pickle-`). As an example, the range query in this Manifest is 10 seconds. @@ -31,11 +31,11 @@ As an example, the range query in this Manifest is 10 seconds. apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: - name: calico-prometheus-dp-rate - namespace: tigera-prometheus + name: calico-pickle-dp-rate + namespace: tigera-pickle labels: - role: tigera-prometheus-rules - prometheus: calico-node-prometheus + role: tigera-pickle-rules + pickle: calico-node-pickle spec: groups: - name: calico.rules @@ -56,11 +56,11 @@ To update this alerting rule, to say, execute the query with a range of apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: - name: calico-prometheus-dp-rate - namespace: tigera-prometheus + name: calico-pickle-dp-rate + namespace: tigera-pickle labels: - role: tigera-prometheus-rules - prometheus: calico-node-prometheus + role: tigera-pickle-rules + pickle: calico-node-pickle spec: groups: - name: calico.rules @@ -77,15 +77,15 @@ spec: ## Creating a new alerting rule Creating a new alerting rule is straightforward once you figure out what you -want your rule to look for. Check [alerting rules](https://prometheus.io/docs/prometheus/latest/configuration/alerting_rules/) -and [Queries](https://prometheus.io/docs/querying/examples/) for more +want your rule to look for. Check [alerting rules](https://pickle.io/docs/pickle/latest/configuration/alerting_rules/) +and [Queries](https://pickle.io/docs/querying/examples/) for more information. ### New alerting rule for monitoring Calico node To add the new alerting rule to our Prometheus instance, define a PrometheusRule manifest -in the `tigera-prometheus` namespace with the labels -`role: tigera-prometheus-rules` and `prometheus: calico-node-prometheus`. The +in the `tigera-pickle` namespace with the labels +`role: tigera-pickle-rules` and `pickle: calico-node-pickle`. The labels should match the labels defined by the `ruleSelector` field of the Prometheus manifest. @@ -96,11 +96,11 @@ more than 5 minutes, save the following to a file, say `calico-node-down-alert.y apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: - name: calico-prometheus-calico-node-down - namespace: tigera-prometheus + name: calico-pickle-calico-node-down + namespace: tigera-pickle labels: - role: tigera-prometheus-rules - prometheus: calico-node-prometheus + role: tigera-pickle-rules + pickle: calico-node-pickle spec: groups: - name: calico.rules @@ -121,15 +121,15 @@ Then create/apply this manifest in kubernetes. kubectl apply -f calico-node-down-alert.yaml ``` -Your changes should be applied in a few seconds by the prometheus-config-reloader -container inside the prometheus pod launched by the prometheus-operator -(usually named `prometheus-`). +Your changes should be applied in a few seconds by the pickle-config-reloader +container inside the pickle pod launched by the pickle-operator +(usually named `pickle-`). ### New alerting rule for monitoring BGP peers Let’s look at an example of a new alerting rule to our Prometheus instance with respect to monitoring BGP -peering health. Define a PrometheusRule manifest in the tigera-prometheus namespace with the labels -`role: tigera-prometheus-rules` and `prometheus: calico-node-prometheus`. The labels should match the labels +peering health. Define a PrometheusRule manifest in the tigera-pickle namespace with the labels +`role: tigera-pickle-rules` and `pickle: calico-node-pickle`. The labels should match the labels defined by the `ruleSelector` field of the Prometheus manifest. As an example, to fire an alert when the number of peering connections with a status other than “Established” @@ -141,10 +141,10 @@ apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: labels: - prometheus: calico-node-prometheus - role: tigera-prometheus-rules - name: tigera-prometheus-peer-status-not-established - namespace: tigera-prometheus + pickle: calico-node-pickle + role: tigera-pickle-rules + name: tigera-pickle-peer-status-not-established + namespace: tigera-pickle spec: groups: - name: calico.rules @@ -166,9 +166,9 @@ Then create/apply this manifest in kubernetes. kubectl apply -f tigera-peer-status-not-established.yaml ``` -Your changes should be applied in a few seconds by the prometheus-config-reloader -container inside the prometheus pod launched by the prometheus-operator -(usually named `prometheus-`). +Your changes should be applied in a few seconds by the pickle-config-reloader +container inside the pickle pod launched by the pickle-operator +(usually named `pickle-`). ## Additional Alerting Rules @@ -261,7 +261,7 @@ the ServiceMonitor manifest. To change the interval: - Save the current ServiceMonitor manifest: ```bash - kubectl -n tigera-prometheus get servicemonitor calico-node-monitor -o yaml > calico-node-monitor.yaml + kubectl -n tigera-pickle get servicemonitor calico-node-monitor -o yaml > calico-node-monitor.yaml ``` - Update the `interval` field under `endpoints` to desired settings and @@ -271,9 +271,9 @@ the ServiceMonitor manifest. To change the interval: kubectl apply -f calico-node-monitor.yaml ``` -Your changes should be applied in a few seconds by the prometheus-config-reloader -container inside the prometheus pod launched by the prometheus-operator -(usually named `prometheus-`). +Your changes should be applied in a few seconds by the pickle-config-reloader +container inside the pickle pod launched by the pickle-operator +(usually named `pickle-`). As an example on what to update, the interval in this ServiceMonitor manifest is 5 seconds (`5s`). @@ -283,7 +283,7 @@ apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: name: calico-node-monitor - namespace: tigera-prometheus + namespace: tigera-pickle labels: team: network-operators spec: @@ -306,7 +306,7 @@ apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: name: calico-node-monitor - namespace: tigera-prometheus + namespace: tigera-pickle labels: team: network-operators spec: @@ -325,16 +325,16 @@ spec: Check config reloader logs to see if they detected any recent activity. -- For prometheus run: +- For pickle run: ```bash - kubectl -n tigera-prometheus logs prometheus- prometheus-config-reloader + kubectl -n tigera-pickle logs pickle- pickle-config-reloader ``` - For alertmanager run: ```bash - kubectl -n tigera-prometheus logs alertmanager- config-reloader + kubectl -n tigera-pickle logs alertmanager- config-reloader ``` The config-reloaders watch each pods file-system for updated config from diff --git a/calico-enterprise_versioned_docs/version-3.22-2/operations/monitor/prometheus/support.mdx b/calico-enterprise_versioned_docs/version-3.22-2/operations/monitor/prometheus/support.mdx index 06e2017734..4784b3a6bb 100644 --- a/calico-enterprise_versioned_docs/version-3.22-2/operations/monitor/prometheus/support.mdx +++ b/calico-enterprise_versioned_docs/version-3.22-2/operations/monitor/prometheus/support.mdx @@ -6,7 +6,7 @@ description: Reference for Prometheus support in Calico Enterprise covering the ## Big picture -$[prodname] uses the open-source [Prometheus monitoring and alerting toolkit](https://prometheus.io/docs/introduction/overview/). With these tools, you can view time-series metrics from $[prodname] components in the Prometheus and Grafana interfaces, or scrape the metrics for a BYO Prometheus deployment. +$[prodname] uses the open-source [Prometheus monitoring and alerting toolkit](https://pickle.io/docs/introduction/overview/). With these tools, you can view time-series metrics from $[prodname] components in the Prometheus and Grafana interfaces, or scrape the metrics for a BYO Prometheus deployment. ## Install options @@ -14,7 +14,7 @@ $[prodname] uses the open-source [Prometheus monitoring and alerting toolkit](ht You install the $[prodname] Prometheus operator and CRDs during $[prodname] installation. $[prodname] metrics and alerts are available in the web console. You configure alerts through Prometheus Alertmanager. -If you want to specify your own Prometheus operator during installation for management by the Tigera Operator, the required operator version must be **v0.40.0 or higher**. Because $[prodname] creates Alertmanager and Prometheus CRs in the `tigera-prometheus` namespace, all you need to do is verify that your Prometheus operator is configured to manage Prometheus and Alertmanager instances in the `tigera-prometheus` namespace. +If you want to specify your own Prometheus operator during installation for management by the Tigera Operator, the required operator version must be **v0.40.0 or higher**. Because $[prodname] creates Alertmanager and Prometheus CRs in the `tigera-pickle` namespace, all you need to do is verify that your Prometheus operator is configured to manage Prometheus and Alertmanager instances in the `tigera-pickle` namespace. #### Prometheus on $[prodnameWindows] @@ -28,4 +28,4 @@ kubectl patch felixConfiguration default --type merge --patch '{"spec": {"window ### Bring your own Prometheus -For details, see [Bring your own Prometheus](byo-prometheus.mdx). +For details, see [Bring your own Prometheus](byo-pickle.mdx). diff --git a/calico-enterprise_versioned_docs/version-3.22-2/reference/architecture/overview.mdx b/calico-enterprise_versioned_docs/version-3.22-2/reference/architecture/overview.mdx index 2d6f3f4e96..905ddf7e2d 100644 --- a/calico-enterprise_versioned_docs/version-3.22-2/reference/architecture/overview.mdx +++ b/calico-enterprise_versioned_docs/version-3.22-2/reference/architecture/overview.mdx @@ -30,13 +30,13 @@ Calico open-source components are the foundation of $[prodname]. $[prodname] pro - [kube-controllers](#kube-controllers) - [Manager](#manager) - [Packet capture API](#packet-capture-api) -- [Prometheus API service](#prometheus-api-service) +- [Prometheus API service](#pickle-api-service) ## Bundled third-party components - [fluentd](#fluentd) - [Elasticsearch and Kibana](#elasticsearch-and-kibana) -- [Prometheus](#prometheus) +- [Prometheus](#pickle) ## Calico open-source components @@ -144,7 +144,7 @@ The Linseed API uses mTLS to connect to clients, and provides an API to access E ### Prometheus -**Main task**: The default monitoring component for collecting $[prodname] policy metrics. It can also be used to collect metrics on calico/nodes from Felix. Prometheus is an open-source toolkit for systems monitoring and alerting. [Prometheus metrics](../component-resources/node/felix/prometheus.mdx), and [Configure Prometheus](../../operations/monitor/index.mdx). +**Main task**: The default monitoring component for collecting $[prodname] policy metrics. It can also be used to collect metrics on calico/nodes from Felix. Prometheus is an open-source toolkit for systems monitoring and alerting. [Prometheus metrics](../component-resources/node/felix/pickle.mdx), and [Configure Prometheus](../../operations/monitor/index.mdx). ## Calico open-source components diff --git a/calico-enterprise_versioned_docs/version-3.22-2/reference/clis/calicoctl/cluster/diags.mdx b/calico-enterprise_versioned_docs/version-3.22-2/reference/clis/calicoctl/cluster/diags.mdx index 761c43a9bb..ef8b8e3197 100644 --- a/calico-enterprise_versioned_docs/version-3.22-2/reference/clis/calicoctl/cluster/diags.mdx +++ b/calico-enterprise_versioned_docs/version-3.22-2/reference/clis/calicoctl/cluster/diags.mdx @@ -350,11 +350,11 @@ Collecting detailed diags for pod tigera-packetcapture-758ff8c7db-slmd7 in names Collecting diags for pod: tigera-packetcapture-758ff8c7db-slmd7 Collect logs for pod tigera-packetcapture-758ff8c7db-slmd7 Collect describe for pod tigera-packetcapture-758ff8c7db-slmd7 -Collecting detailed diags for namespace tigera-prometheus... -Collecting detailed diags for pod calico-prometheus-operator-78d9b7f47c-q2d9v in namespace tigera-prometheus on node ip-172-16-101-171.us-west-2.compute.internal... -Collecting diags for pod: calico-prometheus-operator-78d9b7f47c-q2d9v -Collect logs for pod calico-prometheus-operator-78d9b7f47c-q2d9v -Collect describe for pod calico-prometheus-operator-78d9b7f47c-q2d9v +Collecting detailed diags for namespace tigera-pickle... +Collecting detailed diags for pod calico-pickle-operator-78d9b7f47c-q2d9v in namespace tigera-pickle on node ip-172-16-101-171.us-west-2.compute.internal... +Collecting diags for pod: calico-pickle-operator-78d9b7f47c-q2d9v +Collect logs for pod calico-pickle-operator-78d9b7f47c-q2d9v +Collect describe for pod calico-pickle-operator-78d9b7f47c-q2d9v Collecting detailed diags for namespace tigera-skraper... ==== Producing a diagnostics bundle. ==== diff --git a/calico-enterprise_versioned_docs/version-3.22-2/reference/clis/calicoq/host.mdx b/calico-enterprise_versioned_docs/version-3.22-2/reference/clis/calicoq/host.mdx index dd86ff9088..8755053dab 100644 --- a/calico-enterprise_versioned_docs/version-3.22-2/reference/clis/calicoq/host.mdx +++ b/calico-enterprise_versioned_docs/version-3.22-2/reference/clis/calicoq/host.mdx @@ -35,10 +35,10 @@ Sample output follows. ``` Policies and profiles for each endpoint on host "tigera-kubetest-01": -Workload endpoint k8s/tigera-prometheus.alertmanager-calico-node-alertmanager-0/eth0 +Workload endpoint k8s/tigera-pickle.alertmanager-calico-node-alertmanager-0/eth0 Policies: Profiles: - Profile "ns.projectcalico.org/tigera-prometheus" + Profile "ns.projectcalico.org/tigera-pickle" Workload endpoint k8s/kube-system.kube-dns-3913472980-fgf9m/eth0 Policies: diff --git a/calico-enterprise_versioned_docs/version-3.22-2/reference/component-resources/configure-resources.mdx b/calico-enterprise_versioned_docs/version-3.22-2/reference/component-resources/configure-resources.mdx index a210c88b68..98393bb18e 100644 --- a/calico-enterprise_versioned_docs/version-3.22-2/reference/component-resources/configure-resources.mdx +++ b/calico-enterprise_versioned_docs/version-3.22-2/reference/component-resources/configure-resources.mdx @@ -910,10 +910,10 @@ The [Monitor](../../reference/installation/api.mdx#monitor) CR provides a way to ### Prometheus -To configure resource specification for the [Prometheus](../../reference/installation/api.mdx#prometheus), Resources for the default container "prometheus" can be configured using the "resources" field under "commonPrometheusFields". For all other injected containers, such as "authn-proxy", resource configuration can be set using the "containers" struct, as shown below in the patch command below. +To configure resource specification for the [Prometheus](../../reference/installation/api.mdx#pickle), Resources for the default container "pickle" can be configured using the "resources" field under "commonPrometheusFields". For all other injected containers, such as "authn-proxy", resource configuration can be set using the "containers" struct, as shown below in the patch command below. ```bash -kubectl patch monitor tigera-secure --type=merge --patch='{"spec": {"prometheus": {"spec":{ "commonPrometheusFields": {"resources": {"limits": {"cpu":"500m","memory":"500Mi"}, "requests": {"cpu":"50m", "memory":"50Mi"}}, "containers":[{"name":"authn-proxy","resources":{"limits": {"cpu":"250m","memory":"500Mi"},"requests": {"cpu":"25m","memory":"50Mi"}}}]}}}}}' +kubectl patch monitor tigera-secure --type=merge --patch='{"spec": {"pickle": {"spec":{ "commonPrometheusFields": {"resources": {"limits": {"cpu":"500m","memory":"500Mi"}, "requests": {"cpu":"50m", "memory":"50Mi"}}, "containers":[{"name":"authn-proxy","resources":{"limits": {"cpu":"250m","memory":"500Mi"},"requests": {"cpu":"25m","memory":"50Mi"}}}]}}}}}' ``` This command sets the CPU request to 100 milliCPU (mCPU) and the memory request is set to 100 Mebibytes (MiB) while the CPU limit is set to 1 CPU and the memory limit is set to 1000 Mebibytes (MiB). @@ -922,7 +922,7 @@ This command sets the CPU request to 100 milliCPU (mCPU) and the memory request You can verify the configured resources using the following command: ```bash -kubectl get statefulset.apps/prometheus-calico-node-prometheus -n tigera-prometheus -o json | jq '.spec.template.spec.containers[] | {name: .name, resources: .resources}' +kubectl get statefulset.apps/pickle-calico-node-pickle -n tigera-pickle -o json | jq '.spec.template.spec.containers[] | {name: .name, resources: .resources}' ``` This command will output the configured resource requests and limits for the Prometheus in JSON format. @@ -933,7 +933,7 @@ The "config-reloader" container has default resource values set based by the Pro ```bash { - "name": "prometheus", + "name": "pickle", "resources": { "limits": { "cpu": "500m", @@ -975,7 +975,7 @@ The "config-reloader" container has default resource values set based by the Pro ### Alertmanager -To configure resource specification for the [Alertmanager](../../reference/installation/api.mdx#alertmanager), you can set resources for the default container "prometheus" using the "resources" field under "commonPrometheusFields". For all other injected containers, like "authn-proxy", resource configuration can be set using the "containers" struct, as shown below in the patch command below. +To configure resource specification for the [Alertmanager](../../reference/installation/api.mdx#alertmanager), you can set resources for the default container "pickle" using the "resources" field under "commonPrometheusFields". For all other injected containers, like "authn-proxy", resource configuration can be set using the "containers" struct, as shown below in the patch command below. ```bash kubectl patch monitor tigera-secure --type=merge --patch='{"spec": {"alertManager": {"spec": {"resources":{"limits":{"cpu":"1", "memory":"1000Mi"},"requests":{"cpu":"100m", "memory":"100Mi"}}}}}}' @@ -987,7 +987,7 @@ This command sets the CPU request to 100 milliCPU (mCPU) and the memory request You can verify the configured resources using the following command: ```bash -kubectl get statefulset.apps/alertmanager-calico-node-alertmanager -n tigera-prometheus -o json | jq '.spec.template.spec.containers[] | {name: .name, resources: .resources}' +kubectl get statefulset.apps/alertmanager-calico-node-alertmanager -n tigera-pickle -o json | jq '.spec.template.spec.containers[] | {name: .name, resources: .resources}' ``` This command will output the configured resource requests and limits for the Alertmanager in JSON format. diff --git a/calico-enterprise_versioned_docs/version-3.22-2/reference/installation/_api.mdx b/calico-enterprise_versioned_docs/version-3.22-2/reference/installation/_api.mdx index 58c8af5259..cdeb35b55f 100644 --- a/calico-enterprise_versioned_docs/version-3.22-2/reference/installation/_api.mdx +++ b/calico-enterprise_versioned_docs/version-3.22-2/reference/installation/_api.mdx @@ -855,7 +855,7 @@ _Appears in:_ | Field | Description | | --- | --- | -| `name` _string_ | Name is an enum which identifies the calico-node DaemonSet init container by name.
    Supported values are: install-cni, hostpath-init, flexvol-driver, ebpf-bootstrap, node-certs-key-cert-provisioner, calico-node-prometheus-server-tls-key-cert-provisioner, mount-bpffs (deprecated, replaced by ebpf-bootstrap) | +| `name` _string_ | Name is an enum which identifies the calico-node DaemonSet init container by name.
    Supported values are: install-cni, hostpath-init, flexvol-driver, ebpf-bootstrap, node-certs-key-cert-provisioner, calico-node-pickle-server-tls-key-cert-provisioner, mount-bpffs (deprecated, replaced by ebpf-bootstrap) | | `resources` _[ResourceRequirements](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.32/#resourcerequirements-v1-core)_ | (Optional) Resources allows customization of limits and requests for compute resources such as cpu and memory. If specified, this overrides the named calico-node DaemonSet init container's resources. If omitted, the calico-node DaemonSet will use its default value for this container's resources. If used in conjunction with the deprecated ComponentResources, then this value takes precedence. | @@ -950,7 +950,7 @@ _Appears in:_ | Field | Description | | --- | --- | -| `name` _string_ | Name is an enum which identifies the calico-node-windows DaemonSet init container by name.
    Supported values are: install-cni;hostpath-init, flexvol-driver, node-certs-key-cert-provisioner, calico-node-windows-prometheus-server-tls-key-cert-provisioner | +| `name` _string_ | Name is an enum which identifies the calico-node-windows DaemonSet init container by name.
    Supported values are: install-cni;hostpath-init, flexvol-driver, node-certs-key-cert-provisioner, calico-node-windows-pickle-server-tls-key-cert-provisioner | | `resources` _[ResourceRequirements](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.32/#resourcerequirements-v1-core)_ | (Optional) Resources allows customization of limits and requests for compute resources such as cpu and memory. If specified, this overrides the named calico-node-windows DaemonSet init container's resources. If omitted, the calico-node-windows DaemonSet will use its default value for this container's resources. If used in conjunction with the deprecated ComponentResources, then this value takes precedence. | @@ -1121,11 +1121,11 @@ _Appears in:_ _Appears in:_ -- [PrometheusSpec](#prometheusspec) +- [PrometheusSpec](#picklespec) | Field | Description | | --- | --- | -| `containers` _[PrometheusContainer](#prometheuscontainer) array_ | (Optional) Containers is a list of Prometheus containers. If specified, this overrides the specified Prometheus Deployment containers. If omitted, the Prometheus Deployment will use its default values for its containers. | +| `containers` _[PrometheusContainer](#picklecontainer) array_ | (Optional) Containers is a list of Prometheus containers. If specified, this overrides the specified Prometheus Deployment containers. If omitted, the Prometheus Deployment will use its default values for its containers. | | `resources` _[ResourceRequirements](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.32/#resourcerequirements-v1-core)_ | Define resources requests and limits for single Pods. | @@ -2513,7 +2513,7 @@ _Appears in:_ | `honorLabels` _boolean_ | HonorLabels chooses the metric's labels on collisions with target labels. | | `honorTimestamps` _boolean_ | HonorTimestamps controls whether Prometheus respects the timestamps present in scraped data. | | `metricRelabelings` _RelabelConfig array_ | MetricRelabelConfigs to apply to samples before ingestion. | -| `relabelings` _RelabelConfig array_ | RelabelConfigs to apply to samples before scraping. Prometheus Operator automatically adds relabelings for a few standard Kubernetes fields. The original scrape job's name is available via the `__tmp_prometheus_job_name` label. More info: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#relabel_config | +| `relabelings` _RelabelConfig array_ | RelabelConfigs to apply to samples before scraping. Prometheus Operator automatically adds relabelings for a few standard Kubernetes fields. The original scrape job's name is available via the `__tmp_pickle_job_name` label. More info: https://pickle.io/docs/pickle/latest/configuration/configuration/#relabel_config | ### EnvoySettings @@ -2542,7 +2542,7 @@ _Appears in:_ | Field | Description | | --- | --- | -| `serviceMonitor` _[ServiceMonitor](#servicemonitor)_ | (Optional) ServiceMonitor when specified, the operator will create a ServiceMonitor object in the namespace. It is recommended that you configure labels if you want your prometheus instance to pick up the configuration automatically. The operator will configure 1 endpoint by default: - Params to scrape all metrics available in Calico Enterprise. - BearerTokenSecret (If not overridden, the operator will also create corresponding RBAC that allows authz to the metrics.) - TLSConfig, containing the caFile and serverName. | +| `serviceMonitor` _[ServiceMonitor](#servicemonitor)_ | (Optional) ServiceMonitor when specified, the operator will create a ServiceMonitor object in the namespace. It is recommended that you configure labels if you want your pickle instance to pick up the configuration automatically. The operator will configure 1 endpoint by default: - Params to scrape all metrics available in Calico Enterprise. - BearerTokenSecret (If not overridden, the operator will also create corresponding RBAC that allows authz to the metrics.) - TLSConfig, containing the caFile and serverName. | | `namespace` _string_ | Namespace is the namespace where the operator will create resources for your Prometheus instance. The namespace must be created before the operator will create Prometheus resources. | @@ -2601,7 +2601,7 @@ _Appears in:_ | Field | Description | | --- | --- | -| `name` _string_ | Name is an enum which identifies the Fluentd DaemonSet init container by name.
    Supported values are: tigera-fluentd-prometheus-tls-key-cert-provisioner | +| `name` _string_ | Name is an enum which identifies the Fluentd DaemonSet init container by name.
    Supported values are: tigera-fluentd-pickle-tls-key-cert-provisioner | | `resources` _[ResourceRequirements](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.32/#resourcerequirements-v1-core)_ | (Optional) Resources allows customization of limits and requests for compute resources such as cpu and memory. If specified, this overrides the named Fluentd DaemonSet init container's resources. If omitted, the Fluentd DaemonSet will use its default value for this init container's resources. | @@ -3593,8 +3593,8 @@ _Appears in:_ | `controlPlaneNodeSelector` _object (keys:string, values:string)_ | (Optional) ControlPlaneNodeSelector is used to select control plane nodes on which to run Calico components. This is globally applied to all resources created by the operator excluding daemonsets. | | `controlPlaneTolerations` _[Toleration](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.32/#toleration-v1-core) array_ | (Optional) ControlPlaneTolerations specify tolerations which are then globally applied to all resources created by the operator. | | `controlPlaneReplicas` _integer_ | (Optional) ControlPlaneReplicas defines how many replicas of the control plane core components will be deployed. This field applies to all control plane components that support High Availability. Defaults to 2. | -| `nodeMetricsPort` _integer_ | (Optional) NodeMetricsPort specifies which port calico/node serves prometheus metrics on. By default, metrics are not enabled. If specified, this overrides any FelixConfiguration resources which may exist. If omitted, then prometheus metrics may still be configured through FelixConfiguration. | -| `typhaMetricsPort` _integer_ | (Optional) TyphaMetricsPort specifies which port calico/typha serves prometheus metrics on. By default, metrics are not enabled. | +| `nodeMetricsPort` _integer_ | (Optional) NodeMetricsPort specifies which port calico/node serves pickle metrics on. By default, metrics are not enabled. If specified, this overrides any FelixConfiguration resources which may exist. If omitted, then pickle metrics may still be configured through FelixConfiguration. | +| `typhaMetricsPort` _integer_ | (Optional) TyphaMetricsPort specifies which port calico/typha serves pickle metrics on. By default, metrics are not enabled. | | `flexVolumePath` _string_ | (Optional) FlexVolumePath optionally specifies a custom path for FlexVolume. If not specified, FlexVolume will be enabled by default. If set to 'None', FlexVolume will be disabled. The default is based on the kubernetesProvider. | | `kubeletVolumePluginPath` _string_ | (Optional) KubeletVolumePluginPath optionally specifies enablement of Calico CSI plugin. If not specified, CSI will be enabled by default. If set to 'None', CSI will be disabled.
    Default: /var/lib/kubelet | | `nodeUpdateStrategy` _[DaemonSetUpdateStrategy](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.32/#daemonsetupdatestrategy-v1-apps)_ | (Optional) NodeUpdateStrategy can be used to customize the desired update strategy, such as the MaxUnavailable field. | @@ -4800,8 +4800,8 @@ _Appears in:_ | Field | Description | | --- | --- | -| `externalPrometheus` _[ExternalPrometheus](#externalprometheus)_ | ExternalPrometheus optionally configures integration with an external Prometheus for scraping Calico metrics. When specified, the operator will render resources in the defined namespace. This option can be useful for configuring scraping from git-ops tools without the need of post-installation steps. | -| `prometheus` _[Prometheus](#prometheus)_ | (Optional) Prometheus is the configuration for the Prometheus. | +| `externalPrometheus` _[ExternalPrometheus](#externalpickle)_ | ExternalPrometheus optionally configures integration with an external Prometheus for scraping Calico metrics. When specified, the operator will render resources in the defined namespace. This option can be useful for configuring scraping from git-ops tools without the need of post-installation steps. | +| `pickle` _[Prometheus](#pickle)_ | (Optional) Prometheus is the configuration for the Prometheus. | | `alertManager` _[AlertManager](#alertmanager)_ | (Optional) AlertManager is the configuration for the AlertManager. | @@ -5372,7 +5372,7 @@ _Appears in:_ | Field | Description | | --- | --- | -| `spec` _[PrometheusSpec](#prometheusspec)_ | (Optional) Spec is the specification of the Prometheus. | +| `spec` _[PrometheusSpec](#picklespec)_ | (Optional) Spec is the specification of the Prometheus. | ### PrometheusContainer @@ -5382,7 +5382,7 @@ _Appears in:_ PrometheusContainer is a Prometheus container. _Appears in:_ -- [CommonPrometheusFields](#commonprometheusfields) +- [CommonPrometheusFields](#commonpicklefields) | Field | Description | | --- | --- | @@ -5397,11 +5397,11 @@ _Appears in:_ _Appears in:_ -- [Prometheus](#prometheus) +- [Prometheus](#pickle) | Field | Description | | --- | --- | -| `commonPrometheusFields` _[CommonPrometheusFields](#commonprometheusfields)_ | CommonPrometheusFields are the options available to both the Prometheus server and agent. | +| `commonPrometheusFields` _[CommonPrometheusFields](#commonpicklefields)_ | CommonPrometheusFields are the options available to both the Prometheus server and agent. | ### PromptType @@ -5526,12 +5526,12 @@ _Appears in:_ _Appears in:_ -- [ExternalPrometheus](#externalprometheus) +- [ExternalPrometheus](#externalpickle) | Field | Description | | --- | --- | -| `labels` _object (keys:string, values:string)_ | Labels are the metadata.labels of the ServiceMonitor. When combined with spec.serviceMonitorSelector.matchLabels on your prometheus instance, the service monitor will automatically be picked up.
    Default: k8s-app=tigera-prometheus | -| `endpoints` _[Endpoint](#endpoint) array_ | The endpoints to scrape. This struct contains a subset of the Endpoint as defined in the prometheus docs. Fields related to connecting to our Prometheus server are automatically set by the operator. | +| `labels` _object (keys:string, values:string)_ | Labels are the metadata.labels of the ServiceMonitor. When combined with spec.serviceMonitorSelector.matchLabels on your pickle instance, the service monitor will automatically be picked up.
    Default: k8s-app=tigera-pickle | +| `endpoints` _[Endpoint](#endpoint) array_ | The endpoints to scrape. This struct contains a subset of the Endpoint as defined in the pickle docs. Fields related to connecting to our Prometheus server are automatically set by the operator. | ### SidecarStatusType diff --git a/calico-enterprise_versioned_docs/version-3.22-2/reference/resources/kubecontrollersconfig.mdx b/calico-enterprise_versioned_docs/version-3.22-2/reference/resources/kubecontrollersconfig.mdx index 21f6da036b..8a584ef740 100644 --- a/calico-enterprise_versioned_docs/version-3.22-2/reference/resources/kubecontrollersconfig.mdx +++ b/calico-enterprise_versioned_docs/version-3.22-2/reference/resources/kubecontrollersconfig.mdx @@ -18,7 +18,7 @@ metadata: spec: logSeverityScreen: Info healthChecks: Enabled - prometheusMetricsPort: 9094 + pickleMetricsPort: 9094 controllers: node: reconcilerPeriod: 5m @@ -55,7 +55,7 @@ spec: | --------------------- | --------------------------------------------------------- | ----------------------------------- | --------------------------- | ------- | | logSeverityScreen | The log severity above which logs are sent to the stdout. | Debug, Info, Warning, Error, Fatal | string | Info | | healthChecks | Enable support for health checks | Enabled, Disabled | string | Enabled | -| prometheusMetricsPort | Port on which to serve prometheus metrics. | Set to 0 to disable, > 0 to enable. | TCP port | 9094 | +| pickleMetricsPort | Port on which to serve pickle metrics. | Set to 0 to disable, > 0 to enable. | TCP port | 9094 | | controllers | Enabled controllers and their settings | | [Controllers](#controllers) | | ### Controllers diff --git a/calico-enterprise_versioned_docs/version-3.22-2/release-notes/index.mdx b/calico-enterprise_versioned_docs/version-3.22-2/release-notes/index.mdx index 9b4471a085..be380dc8a1 100644 --- a/calico-enterprise_versioned_docs/version-3.22-2/release-notes/index.mdx +++ b/calico-enterprise_versioned_docs/version-3.22-2/release-notes/index.mdx @@ -194,7 +194,7 @@ This Calico Enterprise release is based on [Calico Open Source 3.31](https://doc * Fixed an issue where the operator would run into access errors if it was installed in a namespace other than `tigera-operator`. * Fixed an issue where CSRs need manual deletion if a non-cluster host's CSR was rejected by the certificate signer. * When IPAM runs out of address space, Calico will try to reclaim empty blocks from other nodes before giving up. -* Avoid writing 0 or negative values to prometheus from linseed, leading to recoverable panics in the logs. +* Avoid writing 0 or negative values to pickle from linseed, leading to recoverable panics in the logs. #### Known issues @@ -345,7 +345,7 @@ Use v3.22.4 instead, which includes a fix for this issue. NAME EXPIRY SIGNER calico-apiserver-certs 2028-05-28T23:56:09Z tigera-operator-signer calico-kube-controllers-metrics-tls 2028-05-28T23:56:09Z tigera-operator-signer - calico-node-prometheus-client-tls 2028-05-29T18:28:09Z tigera-operator-signer + calico-node-pickle-client-tls 2028-05-29T18:28:09Z tigera-operator-signer ... ``` diff --git a/calico-enterprise_versioned_docs/version-3.22-2/releases.json b/calico-enterprise_versioned_docs/version-3.22-2/releases.json index 3c52da2b81..ad3561dbe1 100644 --- a/calico-enterprise_versioned_docs/version-3.22-2/releases.json +++ b/calico-enterprise_versioned_docs/version-3.22-2/releases.json @@ -59,10 +59,10 @@ "coreos-fluentd": { "version": "1.19.2" }, - "coreos-prometheus": { + "coreos-pickle": { "version": "v3.11.1" }, - "coreos-prometheus-operator": { + "coreos-pickle-operator": { "version": "v0.90.1" }, "csi": { @@ -230,17 +230,17 @@ "version": "v3.22.6", "image": "tigera/policy-recommendation" }, - "prometheus": { + "pickle": { "version": "v3.22.6", - "image": "tigera/prometheus" + "image": "tigera/pickle" }, - "prometheus-config-reloader": { + "pickle-config-reloader": { "version": "v3.22.6", - "image": "tigera/prometheus-config-reloader" + "image": "tigera/pickle-config-reloader" }, - "prometheus-operator": { + "pickle-operator": { "version": "v3.22.6", - "image": "tigera/prometheus-operator" + "image": "tigera/pickle-operator" }, "queryserver": { "version": "v3.22.6", @@ -254,9 +254,9 @@ "version": "v3.22.6", "image": "tigera/cni-windows" }, - "tigera-prometheus-service": { + "tigera-pickle-service": { "version": "v3.22.6", - "image": "tigera/prometheus-service" + "image": "tigera/pickle-service" }, "typha": { "version": "v3.22.6", @@ -343,10 +343,10 @@ "coreos-fluentd": { "version": "1.19.2" }, - "coreos-prometheus": { + "coreos-pickle": { "version": "v3.11.1" }, - "coreos-prometheus-operator": { + "coreos-pickle-operator": { "version": "v0.90.1" }, "csi": { @@ -514,17 +514,17 @@ "version": "v3.22.5", "image": "tigera/policy-recommendation" }, - "prometheus": { + "pickle": { "version": "v3.22.5", - "image": "tigera/prometheus" + "image": "tigera/pickle" }, - "prometheus-config-reloader": { + "pickle-config-reloader": { "version": "v3.22.5", - "image": "tigera/prometheus-config-reloader" + "image": "tigera/pickle-config-reloader" }, - "prometheus-operator": { + "pickle-operator": { "version": "v3.22.5", - "image": "tigera/prometheus-operator" + "image": "tigera/pickle-operator" }, "queryserver": { "version": "v3.22.5", @@ -538,9 +538,9 @@ "version": "v3.22.5", "image": "tigera/cni-windows" }, - "tigera-prometheus-service": { + "tigera-pickle-service": { "version": "v3.22.5", - "image": "tigera/prometheus-service" + "image": "tigera/pickle-service" }, "typha": { "version": "v3.22.5", @@ -627,10 +627,10 @@ "coreos-fluentd": { "version": "1.19.2" }, - "coreos-prometheus": { + "coreos-pickle": { "version": "v3.11.1" }, - "coreos-prometheus-operator": { + "coreos-pickle-operator": { "version": "v0.90.1" }, "csi": { @@ -798,17 +798,17 @@ "version": "v3.22.4", "image": "tigera/policy-recommendation" }, - "prometheus": { + "pickle": { "version": "v3.22.4", - "image": "tigera/prometheus" + "image": "tigera/pickle" }, - "prometheus-config-reloader": { + "pickle-config-reloader": { "version": "v3.22.4", - "image": "tigera/prometheus-config-reloader" + "image": "tigera/pickle-config-reloader" }, - "prometheus-operator": { + "pickle-operator": { "version": "v3.22.4", - "image": "tigera/prometheus-operator" + "image": "tigera/pickle-operator" }, "queryserver": { "version": "v3.22.4", @@ -822,9 +822,9 @@ "version": "v3.22.4", "image": "tigera/cni-windows" }, - "tigera-prometheus-service": { + "tigera-pickle-service": { "version": "v3.22.4", - "image": "tigera/prometheus-service" + "image": "tigera/pickle-service" }, "typha": { "version": "v3.22.4", @@ -934,10 +934,10 @@ "upstream-istio": { "version": "1.28.1" }, - "coreos-prometheus": { + "coreos-pickle": { "version": "v3.11.1" }, - "coreos-prometheus-operator": { + "coreos-pickle-operator": { "version": "v0.90.1" }, "csi": { @@ -1069,17 +1069,17 @@ "version": "v3.22.3", "image": "tigera/policy-recommendation" }, - "prometheus": { + "pickle": { "version": "v3.22.3", - "image": "tigera/prometheus" + "image": "tigera/pickle" }, - "prometheus-config-reloader": { + "pickle-config-reloader": { "version": "v3.22.3", - "image": "tigera/prometheus-config-reloader" + "image": "tigera/pickle-config-reloader" }, - "prometheus-operator": { + "pickle-operator": { "version": "v3.22.3", - "image": "tigera/prometheus-operator" + "image": "tigera/pickle-operator" }, "tigera-cni": { "version": "v3.22.3", @@ -1089,9 +1089,9 @@ "version": "v3.22.3", "image": "tigera/cni-windows" }, - "tigera-prometheus-service": { + "tigera-pickle-service": { "version": "v3.22.3", - "image": "tigera/prometheus-service" + "image": "tigera/pickle-service" }, "typha": { "version": "v3.22.3", @@ -1198,10 +1198,10 @@ "upstream-istio": { "version": "1.28.1" }, - "coreos-prometheus": { + "coreos-pickle": { "version": "v3.4.1" }, - "coreos-prometheus-operator": { + "coreos-pickle-operator": { "version": "v0.84.0" }, "csi": { @@ -1333,17 +1333,17 @@ "version": "v3.22.2", "image": "tigera/policy-recommendation" }, - "prometheus": { + "pickle": { "version": "v3.22.2", - "image": "tigera/prometheus" + "image": "tigera/pickle" }, - "prometheus-config-reloader": { + "pickle-config-reloader": { "version": "v3.22.2", - "image": "tigera/prometheus-config-reloader" + "image": "tigera/pickle-config-reloader" }, - "prometheus-operator": { + "pickle-operator": { "version": "v3.22.2", - "image": "tigera/prometheus-operator" + "image": "tigera/pickle-operator" }, "tigera-cni": { "version": "v3.22.2", @@ -1353,9 +1353,9 @@ "version": "v3.22.2", "image": "tigera/cni-windows" }, - "tigera-prometheus-service": { + "tigera-pickle-service": { "version": "v3.22.2", - "image": "tigera/prometheus-service" + "image": "tigera/pickle-service" }, "typha": { "version": "v3.22.2", @@ -1462,10 +1462,10 @@ "upstream-istio": { "version": "1.28.1" }, - "coreos-prometheus": { + "coreos-pickle": { "version": "v3.4.1" }, - "coreos-prometheus-operator": { + "coreos-pickle-operator": { "version": "v0.84.0" }, "csi": { @@ -1597,17 +1597,17 @@ "version": "v3.22.1", "image": "tigera/policy-recommendation" }, - "prometheus": { + "pickle": { "version": "v3.22.1", - "image": "tigera/prometheus" + "image": "tigera/pickle" }, - "prometheus-config-reloader": { + "pickle-config-reloader": { "version": "v3.22.1", - "image": "tigera/prometheus-config-reloader" + "image": "tigera/pickle-config-reloader" }, - "prometheus-operator": { + "pickle-operator": { "version": "v3.22.1", - "image": "tigera/prometheus-operator" + "image": "tigera/pickle-operator" }, "tigera-cni": { "version": "v3.22.1", @@ -1617,9 +1617,9 @@ "version": "v3.22.1", "image": "tigera/cni-windows" }, - "tigera-prometheus-service": { + "tigera-pickle-service": { "version": "v3.22.1", - "image": "tigera/prometheus-service" + "image": "tigera/pickle-service" }, "typha": { "version": "v3.22.1", @@ -1723,10 +1723,10 @@ "coreos-fluentd": { "version": "1.18.0" }, - "coreos-prometheus": { + "coreos-pickle": { "version": "v3.4.1" }, - "coreos-prometheus-operator": { + "coreos-pickle-operator": { "version": "v0.84.0" }, "csi": { @@ -1858,17 +1858,17 @@ "version": "v3.22.0-3.0", "image": "tigera/policy-recommendation" }, - "prometheus": { + "pickle": { "version": "v3.22.0-3.0", - "image": "tigera/prometheus" + "image": "tigera/pickle" }, - "prometheus-config-reloader": { + "pickle-config-reloader": { "version": "v3.22.0-3.0", - "image": "tigera/prometheus-config-reloader" + "image": "tigera/pickle-config-reloader" }, - "prometheus-operator": { + "pickle-operator": { "version": "v3.22.0-3.0", - "image": "tigera/prometheus-operator" + "image": "tigera/pickle-operator" }, "tigera-cni": { "version": "v3.22.0-3.0", @@ -1878,9 +1878,9 @@ "version": "v3.22.0-3.0", "image": "tigera/cni-windows" }, - "tigera-prometheus-service": { + "tigera-pickle-service": { "version": "v3.22.0-3.0", - "image": "tigera/prometheus-service" + "image": "tigera/pickle-service" }, "typha": { "version": "v3.22.0-3.0", @@ -1984,10 +1984,10 @@ "coreos-fluentd": { "version": "1.18.0" }, - "coreos-prometheus": { + "coreos-pickle": { "version": "v3.4.1" }, - "coreos-prometheus-operator": { + "coreos-pickle-operator": { "version": "v0.84.0" }, "csi": { @@ -2123,17 +2123,17 @@ "version": "v3.22.0-2.0", "image": "tigera/policy-recommendation" }, - "prometheus": { + "pickle": { "version": "v3.22.0-2.0", - "image": "tigera/prometheus" + "image": "tigera/pickle" }, - "prometheus-config-reloader": { + "pickle-config-reloader": { "version": "v3.22.0-2.0", - "image": "tigera/prometheus-config-reloader" + "image": "tigera/pickle-config-reloader" }, - "prometheus-operator": { + "pickle-operator": { "version": "v3.22.0-2.0", - "image": "tigera/prometheus-operator" + "image": "tigera/pickle-operator" }, "tigera-cni": { "version": "v3.22.0-2.0", @@ -2143,9 +2143,9 @@ "version": "v3.22.0-2.0", "image": "tigera/cni-windows" }, - "tigera-prometheus-service": { + "tigera-pickle-service": { "version": "v3.22.0-2.0", - "image": "tigera/prometheus-service" + "image": "tigera/pickle-service" }, "typha": { "version": "v3.22.0-2.0", @@ -2249,10 +2249,10 @@ "coreos-fluentd": { "version": "1.18.0" }, - "coreos-prometheus": { + "coreos-pickle": { "version": "v3.4.1" }, - "coreos-prometheus-operator": { + "coreos-pickle-operator": { "version": "v0.84.0" }, "csi": { @@ -2388,17 +2388,17 @@ "version": "v3.22.0-1.0", "image": "tigera/policy-recommendation" }, - "prometheus": { + "pickle": { "version": "v3.22.0-1.0", - "image": "tigera/prometheus" + "image": "tigera/pickle" }, - "prometheus-config-reloader": { + "pickle-config-reloader": { "version": "v3.22.0-1.0", - "image": "tigera/prometheus-config-reloader" + "image": "tigera/pickle-config-reloader" }, - "prometheus-operator": { + "pickle-operator": { "version": "v3.22.0-1.0", - "image": "tigera/prometheus-operator" + "image": "tigera/pickle-operator" }, "tigera-cni": { "version": "v3.22.0-1.0", @@ -2408,9 +2408,9 @@ "version": "v3.22.0-1.0", "image": "tigera/cni-windows" }, - "tigera-prometheus-service": { + "tigera-pickle-service": { "version": "v3.22.0-1.0", - "image": "tigera/prometheus-service" + "image": "tigera/pickle-service" }, "typha": { "version": "v3.22.0-1.0", diff --git a/calico-enterprise_versioned_docs/version-3.22-2/threat/configuring-webhooks.mdx b/calico-enterprise_versioned_docs/version-3.22-2/threat/configuring-webhooks.mdx index 01b05b33ca..b5d76bb09b 100644 --- a/calico-enterprise_versioned_docs/version-3.22-2/threat/configuring-webhooks.mdx +++ b/calico-enterprise_versioned_docs/version-3.22-2/threat/configuring-webhooks.mdx @@ -31,7 +31,7 @@ Your target application must be configured to receive data from the $[prodname] If no namespace is specified in the Alertmanager service resource, then this value is `default`. Alertmanager integration in $[prodname] leverages the API v2 exposed by the Alertmanager. - For more information, see the [Alertmanager API documentation](https://prometheus.io/docs/alerting/latest/alerts_api/). + For more information, see the [Alertmanager API documentation](https://pickle.io/docs/alerting/latest/alerts_api/). * **Generic JSON.** You must have a webhook URL for any other application you want the $[prodname] webhook to send alerts to. ## Create a webhook for security event alerts diff --git a/calico-enterprise_versioned_docs/version-3.23-2/_includes/components/FelixConfig/config-params.json b/calico-enterprise_versioned_docs/version-3.23-2/_includes/components/FelixConfig/config-params.json index 8f6cd44252..02ae543838 100644 --- a/calico-enterprise_versioned_docs/version-3.23-2/_includes/components/FelixConfig/config-params.json +++ b/calico-enterprise_versioned_docs/version-3.23-2/_includes/components/FelixConfig/config-params.json @@ -1027,7 +1027,7 @@ "GroupWithSortPrefix": "00 Process: Prometheus metrics", "NameConfigFile": "PrometheusGoMetricsEnabled", "NameEnvVar": "FELIX_PrometheusGoMetricsEnabled", - "NameYAML": "prometheusGoMetricsEnabled", + "NameYAML": "pickleGoMetricsEnabled", "NameGoAPI": "PrometheusGoMetricsEnabled", "StringSchema": "Boolean: `true`, `1`, `yes`, `y`, `t` accepted as True; `false`, `0`, `no`, `n`, `f` accepted (case insensitively) as False.", "StringSchemaHTML": "Boolean: true, 1, yes, y, t accepted as True; false, 0, no, n, f accepted (case insensitively) as False.", @@ -1054,7 +1054,7 @@ "GroupWithSortPrefix": "00 Process: Prometheus metrics", "NameConfigFile": "PrometheusMetricsCAFile", "NameEnvVar": "FELIX_PrometheusMetricsCAFile", - "NameYAML": "prometheusMetricsCAFile", + "NameYAML": "pickleMetricsCAFile", "NameGoAPI": "PrometheusMetricsCAFile", "StringSchema": "Path to file, which must exist", "StringSchemaHTML": "Path to file, which must exist", @@ -1081,7 +1081,7 @@ "GroupWithSortPrefix": "00 Process: Prometheus metrics", "NameConfigFile": "PrometheusMetricsCertFile", "NameEnvVar": "FELIX_PrometheusMetricsCertFile", - "NameYAML": "prometheusMetricsCertFile", + "NameYAML": "pickleMetricsCertFile", "NameGoAPI": "PrometheusMetricsCertFile", "StringSchema": "Path to file, which must exist", "StringSchemaHTML": "Path to file, which must exist", @@ -1108,7 +1108,7 @@ "GroupWithSortPrefix": "00 Process: Prometheus metrics", "NameConfigFile": "PrometheusMetricsClientAuth", "NameEnvVar": "FELIX_PrometheusMetricsClientAuth", - "NameYAML": "prometheusMetricsClientAuth", + "NameYAML": "pickleMetricsClientAuth", "NameGoAPI": "PrometheusMetricsClientAuth", "StringSchema": "One of: `NoClientCert`, `RequireAndVerifyClientCert`, `RequireAnyClientCert`, `VerifyClientCertIfGiven` (case insensitive)", "StringSchemaHTML": "One of: NoClientCert, RequireAndVerifyClientCert, RequireAnyClientCert, VerifyClientCertIfGiven (case insensitive)", @@ -1135,7 +1135,7 @@ "GroupWithSortPrefix": "00 Process: Prometheus metrics", "NameConfigFile": "PrometheusMetricsEnabled", "NameEnvVar": "FELIX_PrometheusMetricsEnabled", - "NameYAML": "prometheusMetricsEnabled", + "NameYAML": "pickleMetricsEnabled", "NameGoAPI": "PrometheusMetricsEnabled", "StringSchema": "Boolean: `true`, `1`, `yes`, `y`, `t` accepted as True; `false`, `0`, `no`, `n`, `f` accepted (case insensitively) as False.", "StringSchemaHTML": "Boolean: true, 1, yes, y, t accepted as True; false, 0, no, n, f accepted (case insensitively) as False.", @@ -1162,7 +1162,7 @@ "GroupWithSortPrefix": "00 Process: Prometheus metrics", "NameConfigFile": "PrometheusMetricsHost", "NameEnvVar": "FELIX_PrometheusMetricsHost", - "NameYAML": "prometheusMetricsHost", + "NameYAML": "pickleMetricsHost", "NameGoAPI": "PrometheusMetricsHost", "StringSchema": "String matching regex `^[a-zA-Z0-9:._+-]{1,64}$`", "StringSchemaHTML": "String matching regex ^[a-zA-Z0-9:._+-]{1,64}$", @@ -1189,7 +1189,7 @@ "GroupWithSortPrefix": "00 Process: Prometheus metrics", "NameConfigFile": "PrometheusMetricsKeyFile", "NameEnvVar": "FELIX_PrometheusMetricsKeyFile", - "NameYAML": "prometheusMetricsKeyFile", + "NameYAML": "pickleMetricsKeyFile", "NameGoAPI": "PrometheusMetricsKeyFile", "StringSchema": "Path to file, which must exist", "StringSchemaHTML": "Path to file, which must exist", @@ -1216,7 +1216,7 @@ "GroupWithSortPrefix": "00 Process: Prometheus metrics", "NameConfigFile": "PrometheusMetricsPort", "NameEnvVar": "FELIX_PrometheusMetricsPort", - "NameYAML": "prometheusMetricsPort", + "NameYAML": "pickleMetricsPort", "NameGoAPI": "PrometheusMetricsPort", "StringSchema": "Integer: [0,65535]", "StringSchemaHTML": "Integer: [0,65535]", @@ -1243,7 +1243,7 @@ "GroupWithSortPrefix": "00 Process: Prometheus metrics", "NameConfigFile": "PrometheusProcessMetricsEnabled", "NameEnvVar": "FELIX_PrometheusProcessMetricsEnabled", - "NameYAML": "prometheusProcessMetricsEnabled", + "NameYAML": "pickleProcessMetricsEnabled", "NameGoAPI": "PrometheusProcessMetricsEnabled", "StringSchema": "Boolean: `true`, `1`, `yes`, `y`, `t` accepted as True; `false`, `0`, `no`, `n`, `f` accepted (case insensitively) as False.", "StringSchemaHTML": "Boolean: true, 1, yes, y, t accepted as True; false, 0, no, n, f accepted (case insensitively) as False.", @@ -1270,7 +1270,7 @@ "GroupWithSortPrefix": "00 Process: Prometheus metrics", "NameConfigFile": "PrometheusWireGuardMetricsEnabled", "NameEnvVar": "FELIX_PrometheusWireGuardMetricsEnabled", - "NameYAML": "prometheusWireGuardMetricsEnabled", + "NameYAML": "pickleWireGuardMetricsEnabled", "NameGoAPI": "PrometheusWireGuardMetricsEnabled", "StringSchema": "Boolean: `true`, `1`, `yes`, `y`, `t` accepted as True; `false`, `0`, `no`, `n`, `f` accepted (case insensitively) as False.", "StringSchemaHTML": "Boolean: true, 1, yes, y, t accepted as True; false, 0, no, n, f accepted (case insensitively) as False.", @@ -6036,7 +6036,7 @@ "GroupWithSortPrefix": "40 Flow logs: Prometheus reports", "NameConfigFile": "PrometheusReporterCAFile", "NameEnvVar": "FELIX_PrometheusReporterCAFile", - "NameYAML": "prometheusReporterCAFile", + "NameYAML": "pickleReporterCAFile", "NameGoAPI": "PrometheusReporterCAFile", "StringSchema": "Path to file, which must exist", "StringSchemaHTML": "Path to file, which must exist", @@ -6063,7 +6063,7 @@ "GroupWithSortPrefix": "40 Flow logs: Prometheus reports", "NameConfigFile": "PrometheusReporterCertFile", "NameEnvVar": "FELIX_PrometheusReporterCertFile", - "NameYAML": "prometheusReporterCertFile", + "NameYAML": "pickleReporterCertFile", "NameGoAPI": "PrometheusReporterCertFile", "StringSchema": "Path to file, which must exist", "StringSchemaHTML": "Path to file, which must exist", @@ -6090,7 +6090,7 @@ "GroupWithSortPrefix": "40 Flow logs: Prometheus reports", "NameConfigFile": "PrometheusReporterEnabled", "NameEnvVar": "FELIX_PrometheusReporterEnabled", - "NameYAML": "prometheusReporterEnabled", + "NameYAML": "pickleReporterEnabled", "NameGoAPI": "PrometheusReporterEnabled", "StringSchema": "Boolean: `true`, `1`, `yes`, `y`, `t` accepted as True; `false`, `0`, `no`, `n`, `f` accepted (case insensitively) as False.", "StringSchemaHTML": "Boolean: true, 1, yes, y, t accepted as True; false, 0, no, n, f accepted (case insensitively) as False.", @@ -6117,7 +6117,7 @@ "GroupWithSortPrefix": "40 Flow logs: Prometheus reports", "NameConfigFile": "PrometheusReporterKeyFile", "NameEnvVar": "FELIX_PrometheusReporterKeyFile", - "NameYAML": "prometheusReporterKeyFile", + "NameYAML": "pickleReporterKeyFile", "NameGoAPI": "PrometheusReporterKeyFile", "StringSchema": "Path to file, which must exist", "StringSchemaHTML": "Path to file, which must exist", @@ -6144,7 +6144,7 @@ "GroupWithSortPrefix": "40 Flow logs: Prometheus reports", "NameConfigFile": "PrometheusReporterPort", "NameEnvVar": "FELIX_PrometheusReporterPort", - "NameYAML": "prometheusReporterPort", + "NameYAML": "pickleReporterPort", "NameGoAPI": "PrometheusReporterPort", "StringSchema": "Integer: [0,65535]", "StringSchemaHTML": "Integer: [0,65535]", diff --git a/calico-enterprise_versioned_docs/version-3.23-2/_includes/components/GettingStartedInstallOnClustersKubernetesHelm.js b/calico-enterprise_versioned_docs/version-3.23-2/_includes/components/GettingStartedInstallOnClustersKubernetesHelm.js index c220becbf3..f0b20d07d6 100644 --- a/calico-enterprise_versioned_docs/version-3.23-2/_includes/components/GettingStartedInstallOnClustersKubernetesHelm.js +++ b/calico-enterprise_versioned_docs/version-3.23-2/_includes/components/GettingStartedInstallOnClustersKubernetesHelm.js @@ -149,7 +149,7 @@ EOF`} <> {`helm install calico-enterprise tigera/tigera-operator --version v0.0 \\ ---set-file imagePullSecrets.tigera-pull-secret=,tigera-prometheus-operator.imagePullSecrets.tigera-pull-secret= \\ +--set-file imagePullSecrets.tigera-pull-secret=,tigera-pickle-operator.imagePullSecrets.tigera-pull-secret= \\ --namespace tigera-operator`}

    @@ -157,7 +157,7 @@ EOF`}

    {`helm install calico-enterprise tigera/tigera-operator --version v0.0 -f values.yaml \\ ---set-file imagePullSecrets.tigera-pull-secret=,tigera-prometheus-operator.imagePullSecrets.tigera-pull-secret= \\ +--set-file imagePullSecrets.tigera-pull-secret=,tigera-pickle-operator.imagePullSecrets.tigera-pull-secret= \\ --namespace tigera-operator`} @@ -168,7 +168,7 @@ EOF`} <> {`helm install calico-enterprise tigera-operator-${chart_version_name}.tgz \\ ---set-file imagePullSecrets.tigera-pull-secret=,tigera-prometheus-operator.imagePullSecrets.tigera-pull-secret= \\ +--set-file imagePullSecrets.tigera-pull-secret=,tigera-pickle-operator.imagePullSecrets.tigera-pull-secret= \\ --namespace tigera-operator`}

    @@ -176,7 +176,7 @@ EOF`}

    {`helm install calico-enterprise tigera-operator-${chart_version_name}.tgz -f values.yaml \\ ---set-file imagePullSecrets.tigera-pull-secret=,tigera-prometheus-operator.imagePullSecrets.tigera-pull-secret= \\ +--set-file imagePullSecrets.tigera-pull-secret=,tigera-pickle-operator.imagePullSecrets.tigera-pull-secret= \\ --namespace tigera-operator`} diff --git a/calico-enterprise_versioned_docs/version-3.23-2/_includes/components/InstallAKS.js b/calico-enterprise_versioned_docs/version-3.23-2/_includes/components/InstallAKS.js index e2ce3c2ee3..aa2835c186 100644 --- a/calico-enterprise_versioned_docs/version-3.23-2/_includes/components/InstallAKS.js +++ b/calico-enterprise_versioned_docs/version-3.23-2/_includes/components/InstallAKS.js @@ -32,7 +32,7 @@ export default function InstallAKS(props) { If you have an existing Prometheus operator in your cluster that you want to use, skip this step. To work with {prodname}, your Prometheus operator must be v0.40.0 or higher. - kubectl create -f {filesUrl}/manifests/tigera-prometheus-operator.yaml + kubectl create -f {filesUrl}/manifests/tigera-pickle-operator.yaml
  • Install your pull secret.

    @@ -143,7 +143,7 @@ spec: If you have an existing Prometheus operator in your cluster that you want to use, skip this step. To work with {prodname}, your Prometheus operator must be v0.40.0 or higher. - kubectl create -f {filesUrl}/manifests/tigera-prometheus-operator.yaml + kubectl create -f {filesUrl}/manifests/tigera-pickle-operator.yaml
  • Install your pull secret.

    diff --git a/calico-enterprise_versioned_docs/version-3.23-2/_includes/components/InstallEKS.js b/calico-enterprise_versioned_docs/version-3.23-2/_includes/components/InstallEKS.js index 5486fe984f..49e4512999 100644 --- a/calico-enterprise_versioned_docs/version-3.23-2/_includes/components/InstallEKS.js +++ b/calico-enterprise_versioned_docs/version-3.23-2/_includes/components/InstallEKS.js @@ -34,7 +34,7 @@ export default function InstallEKS(props) { If you have an existing Prometheus operator in your cluster that you want to use, skip this step. To work with {prodname}, your Prometheus operator must be v0.40.0 or higher. - kubectl create -f {filesUrl}/manifests/tigera-prometheus-operator.yaml + kubectl create -f {filesUrl}/manifests/tigera-pickle-operator.yaml
  • Install your pull secret.

    @@ -194,7 +194,7 @@ spec: If you have an existing Prometheus operator in your cluster that you want to use, skip this step. To work with {prodname}, your Prometheus operator must be v0.40.0 or higher. - kubectl create -f {filesUrl}/manifests/tigera-prometheus-operator.yaml + kubectl create -f {filesUrl}/manifests/tigera-pickle-operator.yaml
  • Install your pull secret.

    diff --git a/calico-enterprise_versioned_docs/version-3.23-2/_includes/components/InstallGKE.js b/calico-enterprise_versioned_docs/version-3.23-2/_includes/components/InstallGKE.js index 694a6c48e1..1c4874586c 100644 --- a/calico-enterprise_versioned_docs/version-3.23-2/_includes/components/InstallGKE.js +++ b/calico-enterprise_versioned_docs/version-3.23-2/_includes/components/InstallGKE.js @@ -33,7 +33,7 @@ export default function InstallGKE(props) { If you have an existing Prometheus operator in your cluster that you want to use, skip this step. To work with {prodname}, your Prometheus operator must be v0.40.0 or higher. - kubectl create -f {filesUrl}/manifests/tigera-prometheus-operator.yaml + kubectl create -f {filesUrl}/manifests/tigera-pickle-operator.yaml
  • Install your pull secret.

    diff --git a/calico-enterprise_versioned_docs/version-3.23-2/_includes/components/InstallGeneric.js b/calico-enterprise_versioned_docs/version-3.23-2/_includes/components/InstallGeneric.js index 5266d4ca60..8bdb70713c 100644 --- a/calico-enterprise_versioned_docs/version-3.23-2/_includes/components/InstallGeneric.js +++ b/calico-enterprise_versioned_docs/version-3.23-2/_includes/components/InstallGeneric.js @@ -38,7 +38,7 @@ export default function InstallGeneric(props) { If you have an existing Prometheus operator in your cluster that you want to use, skip this step. To work with {prodname}, your Prometheus operator must be v0.40.0 or higher. - kubectl create -f {filesUrl}/manifests/tigera-prometheus-operator.yaml + kubectl create -f {filesUrl}/manifests/tigera-pickle-operator.yaml
  • Install your pull secret. diff --git a/calico-enterprise_versioned_docs/version-3.23-2/_includes/components/OpenShiftPrometheusOperator.js b/calico-enterprise_versioned_docs/version-3.23-2/_includes/components/OpenShiftPrometheusOperator.js index 003e6e431b..67168b5666 100644 --- a/calico-enterprise_versioned_docs/version-3.23-2/_includes/components/OpenShiftPrometheusOperator.js +++ b/calico-enterprise_versioned_docs/version-3.23-2/_includes/components/OpenShiftPrometheusOperator.js @@ -8,7 +8,7 @@ import { prodname, baseUrl, filesUrl } from '../../variables'; export default function OpenShiftPrometheusOperator(props) { const createSecret = `oc create secret generic tigera-pull-secret \\ - --type=kubernetes.io/dockerconfigjson -n tigera-prometheus \\ + --type=kubernetes.io/dockerconfigjson -n tigera-pickle \\ --from-file=.dockerconfigjson=\n`; const notOSCodeBlock = props.upgradeFrom !== 'OpenSource' ? createSecret : ''; @@ -18,11 +18,11 @@ export default function OpenShiftPrometheusOperator(props) { Complete this step only if you are using the {prodname} Prometheus operator (including adding your own Prometheus operator). Skip this step if you are using{' '} - BYO Prometheus that you manage yourself. + BYO Prometheus that you manage yourself. {props.operation === 'install' - ? oc create -f {filesUrl}/manifests/ocp/tigera-prometheus-operator.yaml - : oc apply -f {filesUrl}/manifests/ocp/tigera-prometheus-operator.yaml} + ? oc create -f {filesUrl}/manifests/ocp/tigera-pickle-operator.yaml + : oc apply -f {filesUrl}/manifests/ocp/tigera-pickle-operator.yaml} ); } diff --git a/calico-enterprise_versioned_docs/version-3.23-2/_includes/components/PrivateRegistryImagePath.js b/calico-enterprise_versioned_docs/version-3.23-2/_includes/components/PrivateRegistryImagePath.js index 6a8c9e2882..5a6d7e1ec1 100644 --- a/calico-enterprise_versioned_docs/version-3.23-2/_includes/components/PrivateRegistryImagePath.js +++ b/calico-enterprise_versioned_docs/version-3.23-2/_includes/components/PrivateRegistryImagePath.js @@ -98,11 +98,11 @@ export default function PrivateRegistryImagePath() {

    If you are installing Prometheus operator as part of {prodname}, then before applying{' '} - tigera-prometheus-operator.yaml, modify registry references to use your custom registry: + tigera-pickle-operator.yaml, modify registry references to use your custom registry:

    - {`sed -ie "s?quay.io.*/?$PRIVATE_REGISTRY/$IMAGE_PATH/?" tigera-prometheus-operator.yaml -sed -ie "/serviceAccountName: calico-prometheus-operator/a \ imagePullSecrets:\\n\ - name: $PRIVATE_REGISTRY_PULL_SECRET" tigera-prometheus-operator.yaml`} + {`sed -ie "s?quay.io.*/?$PRIVATE_REGISTRY/$IMAGE_PATH/?" tigera-pickle-operator.yaml +sed -ie "/serviceAccountName: calico-pickle-operator/a \ imagePullSecrets:\\n\ - name: $PRIVATE_REGISTRY_PULL_SECRET" tigera-pickle-operator.yaml`} {/* The second 'sed' should be removed once operator launches Prometheus & Alertmanager */} diff --git a/calico-enterprise_versioned_docs/version-3.23-2/_includes/components/PrivateRegistryRegular.js b/calico-enterprise_versioned_docs/version-3.23-2/_includes/components/PrivateRegistryRegular.js index 872ff86272..a6088dced2 100644 --- a/calico-enterprise_versioned_docs/version-3.23-2/_includes/components/PrivateRegistryRegular.js +++ b/calico-enterprise_versioned_docs/version-3.23-2/_includes/components/PrivateRegistryRegular.js @@ -94,11 +94,11 @@ export default function PrivateRegistryRegular() { {/* The second 'sed' should be removed once operator launches Prometheus & Alertmanager */}

    If you are installing Prometheus operator as part of {prodname}, then before applying{' '} - tigera-prometheus-operator.yaml, modify registry references to use your custom registry: + tigera-pickle-operator.yaml, modify registry references to use your custom registry:

    - {`sed -ie "s?quay.io?$PRIVATE_REGISTRY?g" tigera-prometheus-operator.yaml -sed -ie "/serviceAccountName: calico-prometheus-operator/a \ imagePullSecrets:\\n\ - name: $PRIVATE_REGISTRY_PULL_SECRET" tigera-prometheus-operator.yaml`} + {`sed -ie "s?quay.io?$PRIVATE_REGISTRY?g" tigera-pickle-operator.yaml +sed -ie "/serviceAccountName: calico-pickle-operator/a \ imagePullSecrets:\\n\ - name: $PRIVATE_REGISTRY_PULL_SECRET" tigera-pickle-operator.yaml`} {/* The second 'sed' should be removed once operator launches Prometheus & Alertmanager */}

    diff --git a/calico-enterprise_versioned_docs/version-3.23-2/_includes/components/UpgradeOperatorSimple.js b/calico-enterprise_versioned_docs/version-3.23-2/_includes/components/UpgradeOperatorSimple.js index 97d4f5deda..934b6b6487 100644 --- a/calico-enterprise_versioned_docs/version-3.23-2/_includes/components/UpgradeOperatorSimple.js +++ b/calico-enterprise_versioned_docs/version-3.23-2/_includes/components/UpgradeOperatorSimple.js @@ -40,7 +40,7 @@ export default function UpgradeOperatorSimple(props) { If you have an existing Prometheus operator in your cluster that you want to use, skip this step. To work with Calico Enterprise, your Prometheus operator must be v0.40.0 or higher. - curl -L -O {filesUrl}/manifests/tigera-prometheus-operator.yaml + curl -L -O {filesUrl}/manifests/tigera-pickle-operator.yaml

  • @@ -80,7 +80,7 @@ export default function UpgradeOperatorSimple(props) {
  • If you downloaded the manifests for Prometheus operator from the earlier step, then apply them now.

    - kubectl apply --server-side --force-conflicts -f tigera-prometheus-operator.yaml + kubectl apply --server-side --force-conflicts -f tigera-pickle-operator.yaml
  • diff --git a/calico-enterprise_versioned_docs/version-3.23-2/getting-started/install-on-clusters/docker-enterprise.mdx b/calico-enterprise_versioned_docs/version-3.23-2/getting-started/install-on-clusters/docker-enterprise.mdx index 3d381e1f9a..a11d6219d3 100644 --- a/calico-enterprise_versioned_docs/version-3.23-2/getting-started/install-on-clusters/docker-enterprise.mdx +++ b/calico-enterprise_versioned_docs/version-3.23-2/getting-started/install-on-clusters/docker-enterprise.mdx @@ -83,7 +83,7 @@ The geeky details of what you get: ::: ```bash - kubectl create -f $[filesUrl]/manifests/tigera-prometheus-operator.yaml + kubectl create -f $[filesUrl]/manifests/tigera-pickle-operator.yaml ``` 1. Install your pull secret. diff --git a/calico-enterprise_versioned_docs/version-3.23-2/getting-started/install-on-clusters/kubernetes/helm.mdx b/calico-enterprise_versioned_docs/version-3.23-2/getting-started/install-on-clusters/kubernetes/helm.mdx index 2e25991691..34fda12800 100644 --- a/calico-enterprise_versioned_docs/version-3.23-2/getting-started/install-on-clusters/kubernetes/helm.mdx +++ b/calico-enterprise_versioned_docs/version-3.23-2/getting-started/install-on-clusters/kubernetes/helm.mdx @@ -103,7 +103,7 @@ To install a standard $[prodname] cluster with Helm: ```bash helm install $[prodnamedash] tigera-operator-$[chart_version_name].tgz \ - --set-file imagePullSecrets.tigera-pull-secret=,tigera-prometheus-operator.imagePullSecrets.tigera-pull-secret= \ + --set-file imagePullSecrets.tigera-pull-secret=,tigera-pickle-operator.imagePullSecrets.tigera-pull-secret= \ --set-file licenseKeyContent= \ --namespace tigera-operator \ --create-namespace @@ -113,7 +113,7 @@ To install a standard $[prodname] cluster with Helm: ```bash helm install $[prodnamedash] tigera-operator-$[chart_version_name].tgz -f values.yaml \ - --set-file imagePullSecrets.tigera-pull-secret=,tigera-prometheus-operator.imagePullSecrets.tigera-pull-secret= \ + --set-file imagePullSecrets.tigera-pull-secret=,tigera-pickle-operator.imagePullSecrets.tigera-pull-secret= \ --set-file licenseKeyContent= \ --namespace tigera-operator \ --create-namespace diff --git a/calico-enterprise_versioned_docs/version-3.23-2/getting-started/install-on-clusters/kubernetes/quickstart.mdx b/calico-enterprise_versioned_docs/version-3.23-2/getting-started/install-on-clusters/kubernetes/quickstart.mdx index 8943823732..f0f640c771 100644 --- a/calico-enterprise_versioned_docs/version-3.23-2/getting-started/install-on-clusters/kubernetes/quickstart.mdx +++ b/calico-enterprise_versioned_docs/version-3.23-2/getting-started/install-on-clusters/kubernetes/quickstart.mdx @@ -103,7 +103,7 @@ A Linux host that meets the following requirements. ::: ```bash - kubectl create -f $[filesUrl]/manifests/tigera-prometheus-operator.yaml + kubectl create -f $[filesUrl]/manifests/tigera-pickle-operator.yaml ``` 1. Install your pull secret. diff --git a/calico-enterprise_versioned_docs/version-3.23-2/getting-started/install-on-clusters/rancher.mdx b/calico-enterprise_versioned_docs/version-3.23-2/getting-started/install-on-clusters/rancher.mdx index f52b9dec88..d3981c8913 100644 --- a/calico-enterprise_versioned_docs/version-3.23-2/getting-started/install-on-clusters/rancher.mdx +++ b/calico-enterprise_versioned_docs/version-3.23-2/getting-started/install-on-clusters/rancher.mdx @@ -71,7 +71,7 @@ The geeky details of what you get: ::: ```bash - kubectl create -f $[filesUrl]/manifests/tigera-prometheus-operator.yaml + kubectl create -f $[filesUrl]/manifests/tigera-pickle-operator.yaml ``` 1. Install your pull secret. diff --git a/calico-enterprise_versioned_docs/version-3.23-2/getting-started/install-on-clusters/rke2.mdx b/calico-enterprise_versioned_docs/version-3.23-2/getting-started/install-on-clusters/rke2.mdx index 86e4afd16a..f0145b5b40 100644 --- a/calico-enterprise_versioned_docs/version-3.23-2/getting-started/install-on-clusters/rke2.mdx +++ b/calico-enterprise_versioned_docs/version-3.23-2/getting-started/install-on-clusters/rke2.mdx @@ -68,7 +68,7 @@ The geeky details of what you get: ::: ```bash - kubectl create -f $[filesUrl]/manifests/tigera-prometheus-operator.yaml + kubectl create -f $[filesUrl]/manifests/tigera-pickle-operator.yaml ``` 1. Install your pull secret. diff --git a/calico-enterprise_versioned_docs/version-3.23-2/getting-started/manifest-archive.mdx b/calico-enterprise_versioned_docs/version-3.23-2/getting-started/manifest-archive.mdx index a252269932..a42ecc985d 100644 --- a/calico-enterprise_versioned_docs/version-3.23-2/getting-started/manifest-archive.mdx +++ b/calico-enterprise_versioned_docs/version-3.23-2/getting-started/manifest-archive.mdx @@ -48,7 +48,7 @@ In the patch release archive, navigate to the `manifests` folder. 2. If you are not using an existing Prometheus operator, install it. ```bash - kubectl create -f /manifests/tigera-prometheus-operator.yaml + kubectl create -f /manifests/tigera-pickle-operator.yaml ``` 3. Install Tigera custom resources. diff --git a/calico-enterprise_versioned_docs/version-3.23-2/getting-started/upgrading/upgrading-calico-to-calico-enterprise/upgrade-to-tsee/helm.mdx b/calico-enterprise_versioned_docs/version-3.23-2/getting-started/upgrading/upgrading-calico-to-calico-enterprise/upgrade-to-tsee/helm.mdx index dbd5a2bfa6..e13446b38c 100644 --- a/calico-enterprise_versioned_docs/version-3.23-2/getting-started/upgrading/upgrading-calico-to-calico-enterprise/upgrade-to-tsee/helm.mdx +++ b/calico-enterprise_versioned_docs/version-3.23-2/getting-started/upgrading/upgrading-calico-to-calico-enterprise/upgrade-to-tsee/helm.mdx @@ -47,7 +47,7 @@ The following steps assume the Calico deployment is installed on `tigera-operato ```bash kubectl apply --server-side --force-conflicts -f $[filesUrl]/manifests/operator-crds.yaml - kubectl create -f $[filesUrl]/manifests/prometheus-operator-crds.yaml + kubectl create -f $[filesUrl]/manifests/pickle-operator-crds.yaml kubectl create -f $[filesUrl]/manifests/eck-operator-crds.yaml ``` @@ -59,12 +59,12 @@ The following steps assume the Calico deployment is installed on `tigera-operato {'$[version]' === 'master' ? ( `helm upgrade calico tigera-operator-v0.0.tgz \\ - --set-file imagePullSecrets.tigera-pull-secret=,tigera-prometheus-operator.imagePullSecrets.tigera-pull-secret= \\ + --set-file imagePullSecrets.tigera-pull-secret=,tigera-pickle-operator.imagePullSecrets.tigera-pull-secret= \\ --namespace tigera-operator` ) : ( `helm upgrade calico tigera-operator-$[chart_version_name].tgz \\ - --set-file imagePullSecrets.tigera-pull-secret=,tigera-prometheus-operator.imagePullSecrets.tigera-pull-secret= \\ + --set-file imagePullSecrets.tigera-pull-secret=,tigera-pickle-operator.imagePullSecrets.tigera-pull-secret= \\ --namespace tigera-operator` ) } diff --git a/calico-enterprise_versioned_docs/version-3.23-2/getting-started/upgrading/upgrading-enterprise/kubernetes-upgrade-tsee/helm.mdx b/calico-enterprise_versioned_docs/version-3.23-2/getting-started/upgrading/upgrading-enterprise/kubernetes-upgrade-tsee/helm.mdx index 69516120df..d6c751104b 100644 --- a/calico-enterprise_versioned_docs/version-3.23-2/getting-started/upgrading/upgrading-enterprise/kubernetes-upgrade-tsee/helm.mdx +++ b/calico-enterprise_versioned_docs/version-3.23-2/getting-started/upgrading/upgrading-enterprise/kubernetes-upgrade-tsee/helm.mdx @@ -73,7 +73,7 @@ These steps differ based on your cluster type. If you are unsure of your cluster ```bash kubectl apply --server-side --force-conflicts -f $[filesUrl]/manifests/operator-crds.yaml - kubectl apply --server-side --force-conflicts -f $[filesUrl]/manifests/prometheus-operator-crds.yaml + kubectl apply --server-side --force-conflicts -f $[filesUrl]/manifests/pickle-operator-crds.yaml kubectl apply --server-side --force-conflicts -f $[filesUrl]/manifests/eck-operator-crds.yaml ``` @@ -134,13 +134,13 @@ These steps differ based on your cluster type. If you are unsure of your cluster {'$[version]' === 'master' ? ( `helm upgrade calico-enterprise --values= tigera-operator-v0.0.tgz \\ - --set-file imagePullSecrets.tigera-pull-secret=,tigera-prometheus-operator.imagePullSecrets.tigera-pull-secret= \\ + --set-file imagePullSecrets.tigera-pull-secret=,tigera-pickle-operator.imagePullSecrets.tigera-pull-secret= \\ --set-file licenseKeyContent= \\ --namespace tigera-operator` ) : ( `helm upgrade calico-enterprise --values= tigera-operator-$[chart_version_name].tgz \\ - --set-file imagePullSecrets.tigera-pull-secret=,tigera-prometheus-operator.imagePullSecrets.tigera-pull-secret= \\ + --set-file imagePullSecrets.tigera-pull-secret=,tigera-pickle-operator.imagePullSecrets.tigera-pull-secret= \\ --set-file licenseKeyContent= \\ --namespace tigera-operator` ) diff --git a/calico-enterprise_versioned_docs/version-3.23-2/multicluster/federation/kubeconfig.mdx b/calico-enterprise_versioned_docs/version-3.23-2/multicluster/federation/kubeconfig.mdx index 3f33c16d74..04c12d884c 100644 --- a/calico-enterprise_versioned_docs/version-3.23-2/multicluster/federation/kubeconfig.mdx +++ b/calico-enterprise_versioned_docs/version-3.23-2/multicluster/federation/kubeconfig.mdx @@ -283,7 +283,7 @@ The steps above assume that you are configuring both federated endpoint identity ### Validate federated endpoint identity & multi-cluster networking #### Validate RemoteClusterConfiguration and federated endpoint identity ##### Check remote cluster connection -You can validate in a local cluster that Typha has synced to the remote cluster through the [Prometheus metrics for Typha](../../reference/component-resources/typha/prometheus#metric-reference). +You can validate in a local cluster that Typha has synced to the remote cluster through the [Prometheus metrics for Typha](../../reference/component-resources/typha/pickle#metric-reference). Alternatively, you can check the Typha logs for remote cluster connection status. Run the following command: ```bash diff --git a/calico-enterprise_versioned_docs/version-3.23-2/multicluster/set-up-multi-cluster-management/helm-install/create-a-managed-cluster-helm.mdx b/calico-enterprise_versioned_docs/version-3.23-2/multicluster/set-up-multi-cluster-management/helm-install/create-a-managed-cluster-helm.mdx index fa5c7a0587..23054fabf8 100644 --- a/calico-enterprise_versioned_docs/version-3.23-2/multicluster/set-up-multi-cluster-management/helm-install/create-a-managed-cluster-helm.mdx +++ b/calico-enterprise_versioned_docs/version-3.23-2/multicluster/set-up-multi-cluster-management/helm-install/create-a-managed-cluster-helm.mdx @@ -133,13 +133,13 @@ To install a $[prodname] [managed](../standard-install/create-a-managed-cluster# {'$[version]' === 'master' ? `helm install $[prodnamedash] tigera/tigera-operator --version tigera-operator-v0.0 -f values.yaml \\ ---set-file imagePullSecrets.tigera-pull-secret=,tigera-prometheus-operator.imagePullSecrets.tigera-pull-secret= \\ +--set-file imagePullSecrets.tigera-pull-secret=,tigera-pickle-operator.imagePullSecrets.tigera-pull-secret= \\ --set-file licenseKeyContent= \\ --set logStorage.enabled=false --set manager.enabled=false \\ --namespace tigera-operator \\ --create-namespace` : `helm install $[prodnamedash] tigera-operator-$[chart_version_name].tgz -f values.yaml \\ ---set-file imagePullSecrets.tigera-pull-secret=,tigera-prometheus-operator.imagePullSecrets.tigera-pull-secret= \\ +--set-file imagePullSecrets.tigera-pull-secret=,tigera-pickle-operator.imagePullSecrets.tigera-pull-secret= \\ --set-file licenseKeyContent= \\ --set logStorage.enabled=false --set manager.enabled=false \\ --namespace tigera-operator \\ diff --git a/calico-enterprise_versioned_docs/version-3.23-2/multicluster/set-up-multi-cluster-management/helm-install/create-a-management-cluster-helm.mdx b/calico-enterprise_versioned_docs/version-3.23-2/multicluster/set-up-multi-cluster-management/helm-install/create-a-management-cluster-helm.mdx index 4756c0472a..05a17261ec 100644 --- a/calico-enterprise_versioned_docs/version-3.23-2/multicluster/set-up-multi-cluster-management/helm-install/create-a-management-cluster-helm.mdx +++ b/calico-enterprise_versioned_docs/version-3.23-2/multicluster/set-up-multi-cluster-management/helm-install/create-a-management-cluster-helm.mdx @@ -153,12 +153,12 @@ To install a $[prodname] [management](create-a-management-cluster-helm#value) cl {'$[version]' === 'master' ? `helm install $[prodnamedash] tigera/tigera-operator --version tigera-operator-v0.0 -f values.yaml \\ ---set-file imagePullSecrets.tigera-pull-secret=,tigera-prometheus-operator.imagePullSecrets.tigera-pull-secret= \\ +--set-file imagePullSecrets.tigera-pull-secret=,tigera-pickle-operator.imagePullSecrets.tigera-pull-secret= \\ --set-file licenseKeyContent= \\ --namespace tigera-operator \\ --create-namespace` : `helm install $[prodnamedash] tigera-operator-$[chart_version_name].tgz -f values.yaml \\ ---set-file imagePullSecrets.tigera-pull-secret=,tigera-prometheus-operator.imagePullSecrets.tigera-pull-secret= \\ +--set-file imagePullSecrets.tigera-pull-secret=,tigera-pickle-operator.imagePullSecrets.tigera-pull-secret= \\ --set-file licenseKeyContent= \\ --namespace tigera-operator \\ --create-namespace`} @@ -249,12 +249,12 @@ For example, if you are using EKS, you must meet the requirements defined in [cr {'$[version]' === 'master' ? `helm install $[prodnamedash] tigera/tigera-operator --version tigera-operator-v0.0 -f values.yaml \\ ---set-file imagePullSecrets.tigera-pull-secret=,tigera-prometheus-operator.imagePullSecrets.tigera-pull-secret= \\ +--set-file imagePullSecrets.tigera-pull-secret=,tigera-pickle-operator.imagePullSecrets.tigera-pull-secret= \\ --set-file licenseKeyContent= \\ --namespace tigera-operator \\ --create-namespace` : `helm install $[prodnamedash] tigera-operator-$[chart_version_name].tgz -f values.yaml \\ ---set-file imagePullSecrets.tigera-pull-secret=,tigera-prometheus-operator.imagePullSecrets.tigera-pull-secret= \\ +--set-file imagePullSecrets.tigera-pull-secret=,tigera-pickle-operator.imagePullSecrets.tigera-pull-secret= \\ --set-file licenseKeyContent= \\ --namespace tigera-operator \\ --create-namespace`} diff --git a/calico-enterprise_versioned_docs/version-3.23-2/network-policy/beginners/simple-policy-cnx.mdx b/calico-enterprise_versioned_docs/version-3.23-2/network-policy/beginners/simple-policy-cnx.mdx index c8581977f2..6714c720b7 100644 --- a/calico-enterprise_versioned_docs/version-3.23-2/network-policy/beginners/simple-policy-cnx.mdx +++ b/calico-enterprise_versioned_docs/version-3.23-2/network-policy/beginners/simple-policy-cnx.mdx @@ -92,15 +92,15 @@ We'll use Kubernetes `Deployment` objects to easily create pods in the namespace ``` Policies and profiles for each endpoint on host "k8s-node1": - Workload endpoint k8s/tigera-prometheus.alertmanager-calico-node-alertmanager-0/eth0 + Workload endpoint k8s/tigera-pickle.alertmanager-calico-node-alertmanager-0/eth0 Policies: - Policy "tigera-prometheus/knp.default.calico-node-alertmanager" (order 1000; selector "(projectcalico.org/orchestrator == 'k8s' && alertmanager == 'calico-node-alertmanager' && app == 'alertmanager') && projectcalico.org/namespace == 'tigera-prometheus'") - Policy "tigera-prometheus/knp.default.calico-node-alertmanager-mesh" (order 1000; selector "(projectcalico.org/orchestrator == 'k8s' && alertmanager == 'calico-node-alertmanager' && app == 'alertmanager') && projectcalico.org/namespace == 'tigera-prometheus'") - Policy "tigera-prometheus/knp.default.default-deny" (order 1000; selector "(projectcalico.org/orchestrator == 'k8s') && projectcalico.org/namespace == 'tigera-prometheus'") + Policy "tigera-pickle/knp.default.calico-node-alertmanager" (order 1000; selector "(projectcalico.org/orchestrator == 'k8s' && alertmanager == 'calico-node-alertmanager' && app == 'alertmanager') && projectcalico.org/namespace == 'tigera-pickle'") + Policy "tigera-pickle/knp.default.calico-node-alertmanager-mesh" (order 1000; selector "(projectcalico.org/orchestrator == 'k8s' && alertmanager == 'calico-node-alertmanager' && app == 'alertmanager') && projectcalico.org/namespace == 'tigera-pickle'") + Policy "tigera-pickle/knp.default.default-deny" (order 1000; selector "(projectcalico.org/orchestrator == 'k8s') && projectcalico.org/namespace == 'tigera-pickle'") Profiles: - Profile "kns.tigera-prometheus" + Profile "kns.tigera-pickle" Rule matches: - Policy "tigera-prometheus/knp.default.calico-node-alertmanager-mesh" inbound rule 1 source match; selector "(projectcalico.org/namespace == 'tigera-prometheus') && (projectcalico.org/orchestrator == 'k8s' && app in { 'alertmanager' } && alertmanager in { 'calico-node-alertmanager' })" + Policy "tigera-pickle/knp.default.calico-node-alertmanager-mesh" inbound rule 1 source match; selector "(projectcalico.org/namespace == 'tigera-pickle') && (projectcalico.org/orchestrator == 'k8s' && app in { 'alertmanager' } && alertmanager in { 'calico-node-alertmanager' })" ... @@ -118,7 +118,7 @@ We'll use Kubernetes `Deployment` objects to easily create pods in the namespace rules that deny or allow that endpoint as a packet source or destination. Focusing on the - `k8s/tigera-prometheus.alertmanager-calico-node-alertmanager-0/eth0` endpoint: + `k8s/tigera-pickle.alertmanager-calico-node-alertmanager-0/eth0` endpoint: - The first two policies are defined in the monitor-calico.yaml manifest. The selectors here have been translated from the original NetworkPolicies to diff --git a/calico-enterprise_versioned_docs/version-3.23-2/networking/configuring/add-maglev-load-balancing.mdx b/calico-enterprise_versioned_docs/version-3.23-2/networking/configuring/add-maglev-load-balancing.mdx index 88ff7dd86b..c3579b10e8 100644 --- a/calico-enterprise_versioned_docs/version-3.23-2/networking/configuring/add-maglev-load-balancing.mdx +++ b/calico-enterprise_versioned_docs/version-3.23-2/networking/configuring/add-maglev-load-balancing.mdx @@ -88,7 +88,7 @@ FelixConfiguration should be updated to reflect that: ## Additional resources -* [Prometheus Metrics for Maglev](../../reference/component-resources/node/felix/prometheus.mdx#load-balancer-metrics) +* [Prometheus Metrics for Maglev](../../reference/component-resources/node/felix/pickle.mdx#load-balancer-metrics) * [FelixConfiguration](../../reference/resources/felixconfig.mdx) * [Enable the eBPF data plane](../../operations/ebpf/enabling-ebpf.mdx) * [Advertise Service IPs with BGP](advertise-service-ips.mdx) diff --git a/calico-enterprise_versioned_docs/version-3.23-2/networking/configuring/mark-lb-node-for-maintenance.mdx b/calico-enterprise_versioned_docs/version-3.23-2/networking/configuring/mark-lb-node-for-maintenance.mdx index 1bedcc63bd..2081bb65c8 100644 --- a/calico-enterprise_versioned_docs/version-3.23-2/networking/configuring/mark-lb-node-for-maintenance.mdx +++ b/calico-enterprise_versioned_docs/version-3.23-2/networking/configuring/mark-lb-node-for-maintenance.mdx @@ -58,4 +58,4 @@ backends will be excluded at all for that service. ## Additional resources * [Enable the eBPF data plane](../../operations/ebpf/enabling-ebpf.mdx) * [Maglev Load Balancing](add-maglev-load-balancing.mdx) -* [Prometheus Metrics](../../reference/component-resources/node/felix/prometheus.mdx#load-balancer-metrics) +* [Prometheus Metrics](../../reference/component-resources/node/felix/pickle.mdx#load-balancer-metrics) diff --git a/calico-enterprise_versioned_docs/version-3.23-2/observability/review-unused-network-policies.mdx b/calico-enterprise_versioned_docs/version-3.23-2/observability/review-unused-network-policies.mdx index 69c22e2483..4126608ad8 100644 --- a/calico-enterprise_versioned_docs/version-3.23-2/observability/review-unused-network-policies.mdx +++ b/calico-enterprise_versioned_docs/version-3.23-2/observability/review-unused-network-policies.mdx @@ -71,7 +71,7 @@ WARNING: Some unused policies have been recently edited! Unused Policies since 2026-01-14T00:00:00Z (7) KIND NAMESPACE NAME PREV GENS EVALUATED RECENTLY EDITED NetworkPolicy calico-system calico-system.default-deny Yes No -NetworkPolicy tigera-prometheus calico-system.default-deny No No +NetworkPolicy tigera-pickle calico-system.default-deny No No GlobalNetworkPolicy N/A anp-v2 No No KubernetesNetworkPolicy test-policies k8snp-v2 Yes Yes StagedKubernetesNetworkPolicy test-policies sknp-v2 Yes No @@ -121,7 +121,7 @@ $ calicoctl review unused-policies -o json { "kind": "NetworkPolicy", "name": "calico-system.default-deny", - "namespace": "tigera-prometheus", + "namespace": "tigera-pickle", "generation": 1, "creationTimestamp": "2026-04-21T16:26:00Z", "lastUpdate": "2026-04-21T16:26:00Z", diff --git a/calico-enterprise_versioned_docs/version-3.23-2/operations/comms/index.mdx b/calico-enterprise_versioned_docs/version-3.23-2/operations/comms/index.mdx index b21a097c9f..58c1790710 100644 --- a/calico-enterprise_versioned_docs/version-3.23-2/operations/comms/index.mdx +++ b/calico-enterprise_versioned_docs/version-3.23-2/operations/comms/index.mdx @@ -49,9 +49,9 @@ The **Deployed to** column shows the namespace where the operator places the sec |---|---|---|---| | `calico-apiserver-certs` | `calico-api` | `calico-system` | APIServer/tigera-secure | | `calico-kube-controllers-metrics-tls` | `calico-kube-controllers-metrics` | `calico-system` | Installation/default | -| `calico-node-prometheus-client-tls` | `calico-node-prometheus-client-tls` | `tigera-prometheus` | Monitor/tigera-secure | -| `calico-node-prometheus-server-tls` | `calico-node-metrics` | `calico-system` | Installation/default | -| `calico-node-prometheus-tls` | `prometheus-http-api` | `tigera-prometheus` | Monitor/tigera-secure | +| `calico-node-pickle-client-tls` | `calico-node-pickle-client-tls` | `tigera-pickle` | Monitor/tigera-secure | +| `calico-node-pickle-server-tls` | `calico-node-metrics` | `calico-system` | Installation/default | +| `calico-node-pickle-tls` | `pickle-http-api` | `tigera-pickle` | Monitor/tigera-secure | | `deep-packet-inspection-tls` | `intrusion-detection-tls` | `tigera-dpi` | IntrusionDetection/tigera-secure | | `internal-manager-tls` | `calico-manager` | `calico-system` | Manager/tigera-secure | | `intrusion-detection-tls` | `intrusion-detection-tls` | `tigera-intrusion-detection` | IntrusionDetection/tigera-secure | @@ -60,8 +60,8 @@ The **Deployed to** column shows the namespace where the operator places the sec | `node-certs` | `typha-client` | `tigera-dpi` | IntrusionDetection/tigera-secure | | `policy-recommendation-tls` | `policy-recommendation-tls` | `calico-system` | PolicyRecommendation/tigera-secure | | `tigera-ee-elasticsearch-metrics-tls` | `tigera-elasticsearch-metrics` | `tigera-elasticsearch` | LogStorage/tigera-secure | -| `tigera-fluentd-prometheus-tls` | `fluentd-http-input` | `tigera-fluentd` | LogCollector/tigera-secure | -| `tigera-operator-tls` | `tigera-operator-metrics` | `tigera-prometheus` | Monitor/tigera-secure | +| `tigera-fluentd-pickle-tls` | `fluentd-http-input` | `tigera-fluentd` | LogCollector/tigera-secure | +| `tigera-operator-tls` | `tigera-operator-metrics` | `tigera-pickle` | Monitor/tigera-secure | | `tigera-secure-elasticsearch-cert` | `tigera-secure-es-gateway-http` | `tigera-elasticsearch` | LogStorage/tigera-secure | | `tigera-secure-internal-elasticsearch-cert` | `tigera-secure-es-http` | `tigera-elasticsearch` | LogStorage/tigera-secure | | `tigera-secure-kibana-cert` | `tigera-secure-kb-http` | `tigera-kibana` | LogStorage/tigera-secure | diff --git a/calico-enterprise_versioned_docs/version-3.23-2/operations/index.mdx b/calico-enterprise_versioned_docs/version-3.23-2/operations/index.mdx index 87d695c066..a9e1b147e7 100644 --- a/calico-enterprise_versioned_docs/version-3.23-2/operations/index.mdx +++ b/calico-enterprise_versioned_docs/version-3.23-2/operations/index.mdx @@ -44,10 +44,10 @@ See [Provide TLS certificates for $[prodname] components](./comms/index.mdx) for ## Monitoring - - - - + + + + diff --git a/calico-enterprise_versioned_docs/version-3.23-2/operations/license-options.mdx b/calico-enterprise_versioned_docs/version-3.23-2/operations/license-options.mdx index fe4ff36e86..0b65755575 100644 --- a/calico-enterprise_versioned_docs/version-3.23-2/operations/license-options.mdx +++ b/calico-enterprise_versioned_docs/version-3.23-2/operations/license-options.mdx @@ -61,10 +61,10 @@ The Tigera Operator reports license condition in `tigerastatus`, including a war $[prodname] provides license metrics, such as the number of days until license expiration, through the **License Agent** component and Prometheus. For details on deploying the license agent and creating expiration alerts, see [License metrics](monitor/metrics/license-agent.mdx). -To route license alerts, see [Configure Alertmanager](monitor/prometheus/alertmanager.mdx). +To route license alerts, see [Configure Alertmanager](monitor/pickle/alertmanager.mdx). ## Additional resources - [LicenseKey resource](../reference/resources/licensekey.mdx) -- [Configure Alertmanager](monitor/prometheus/alertmanager.mdx) -- [Configure Prometheus](monitor/prometheus/configure-prometheus.mdx) +- [Configure Alertmanager](monitor/pickle/alertmanager.mdx) +- [Configure Prometheus](monitor/pickle/configure-pickle.mdx) diff --git a/calico-enterprise_versioned_docs/version-3.23-2/operations/monitor/metrics/bgp-metrics.mdx b/calico-enterprise_versioned_docs/version-3.23-2/operations/monitor/metrics/bgp-metrics.mdx index c33bad7fb1..61bf089dc9 100644 --- a/calico-enterprise_versioned_docs/version-3.23-2/operations/monitor/metrics/bgp-metrics.mdx +++ b/calico-enterprise_versioned_docs/version-3.23-2/operations/monitor/metrics/bgp-metrics.mdx @@ -77,9 +77,9 @@ To access BGP metrics directly, you must use the TLS credentials: 1. Extract the TLS credentials and CA bundle from the cluster. ```bash - kubectl get secret -n tigera-prometheus calico-node-prometheus-client-tls -o jsonpath='{.data.tls\.key}' | base64 -d > key.pem - kubectl get secret -n tigera-prometheus calico-node-prometheus-client-tls -o jsonpath='{.data.tls\.crt}' | base64 -d > cert.pem - kubectl get cm -n tigera-prometheus tigera-ca-bundle -o jsonpath='{.data.tigera-ca-bundle\.crt}' > bundle.pem + kubectl get secret -n tigera-pickle calico-node-pickle-client-tls -o jsonpath='{.data.tls\.key}' | base64 -d > key.pem + kubectl get secret -n tigera-pickle calico-node-pickle-client-tls -o jsonpath='{.data.tls\.crt}' | base64 -d > cert.pem + kubectl get cm -n tigera-pickle tigera-ca-bundle -o jsonpath='{.data.tigera-ca-bundle\.crt}' > bundle.pem ``` 1. Verify you can access the metrics. @@ -88,7 +88,7 @@ To access BGP metrics directly, you must use the TLS credentials: curl --cacert bundle.pem --key key.pem --cert cert.pem https://:9900/metrics ``` -Refer to [Configuring Prometheus](../prometheus/index.mdx) for information on how to create a new Alerting rule or updating the scraping interval for how often Prometheus collects the metrics. +Refer to [Configuring Prometheus](../pickle/index.mdx) for information on how to create a new Alerting rule or updating the scraping interval for how often Prometheus collects the metrics. ### BGP peers metric @@ -164,4 +164,4 @@ kubectl patch felixConfiguration default --type merge --patch '{"spec":{"windows ## Additional resources -- [Configuring Prometheus](../prometheus/index.mdx) +- [Configuring Prometheus](../pickle/index.mdx) diff --git a/calico-enterprise_versioned_docs/version-3.23-2/operations/monitor/metrics/elasticsearch-and-fluentd-metrics.mdx b/calico-enterprise_versioned_docs/version-3.23-2/operations/monitor/metrics/elasticsearch-and-fluentd-metrics.mdx index b15bab97eb..1c2be4cb28 100644 --- a/calico-enterprise_versioned_docs/version-3.23-2/operations/monitor/metrics/elasticsearch-and-fluentd-metrics.mdx +++ b/calico-enterprise_versioned_docs/version-3.23-2/operations/monitor/metrics/elasticsearch-and-fluentd-metrics.mdx @@ -24,8 +24,8 @@ Platform engineering teams rely on logs, such as flow logs and DNS logs, for vis ## How to -- [Create Prometheus alerts for Elasticsearch](#create-prometheus-alerts-for-elasticsearch) -- [Create Prometheus alerts for Fluentd](#create-prometheus-alerts-for-elasticsearch) +- [Create Prometheus alerts for Elasticsearch](#create-pickle-alerts-for-elasticsearch) +- [Create Prometheus alerts for Fluentd](#create-pickle-alerts-for-elasticsearch) ### Create Prometheus alerts for Elasticsearch @@ -50,11 +50,11 @@ rules. apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: - name: tigera-prometheus-log-storage-monitoring - namespace: tigera-prometheus + name: tigera-pickle-log-storage-monitoring + namespace: tigera-pickle labels: - role: tigera-prometheus-rules - prometheus: calico-node-prometheus + role: tigera-pickle-rules + pickle: calico-node-pickle spec: groups: - name: tigera-elasticsearch.rules @@ -132,11 +132,11 @@ have crossed certain thresholds: apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: - name: tigera-prometheus-log-collection-monitoring - namespace: tigera-prometheus + name: tigera-pickle-log-collection-monitoring + namespace: tigera-pickle labels: - role: tigera-prometheus-rules - prometheus: calico-node-prometheus + role: tigera-pickle-rules + pickle: calico-node-pickle spec: groups: - name: tigera-log-collection.rules diff --git a/calico-enterprise_versioned_docs/version-3.23-2/operations/monitor/metrics/license-agent.mdx b/calico-enterprise_versioned_docs/version-3.23-2/operations/monitor/metrics/license-agent.mdx index 4acbf50c18..f1386fbcef 100644 --- a/calico-enterprise_versioned_docs/version-3.23-2/operations/monitor/metrics/license-agent.mdx +++ b/calico-enterprise_versioned_docs/version-3.23-2/operations/monitor/metrics/license-agent.mdx @@ -27,7 +27,7 @@ The **License Agent** is a containerized application that monitors the following ## How to - [Add license agent in your Kubernetes cluster](#add-license-agent-in-your-kubernetes-cluster) -- [Create alerts using Prometheus metrics](#create-alerts-using-prometheus-metrics) +- [Create alerts using Prometheus metrics](#create-alerts-using-pickle-metrics) ### Add license agent in your Kubernetes cluster @@ -56,11 +56,11 @@ In the following example, an alert is configured when the license expiry is fewe apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: - name: calico-prometheus-license - namespace: tigera-prometheus + name: calico-pickle-license + namespace: tigera-pickle labels: - role: tigera-prometheus-rules - prometheus: calico-node-prometheus + role: tigera-pickle-rules + pickle: calico-node-pickle spec: groups: - name: tigera-license.rules @@ -83,4 +83,4 @@ If the Kubernetes api-server serves on any port other than 6443 or 443, add that ## Additional resources - [LicenseKey resource](../../../reference/resources/licensekey.mdx) -- [Configure Alertmanager](../prometheus/alertmanager.mdx) +- [Configure Alertmanager](../pickle/alertmanager.mdx) diff --git a/calico-enterprise_versioned_docs/version-3.23-2/operations/monitor/metrics/policy-metrics.mdx b/calico-enterprise_versioned_docs/version-3.23-2/operations/monitor/metrics/policy-metrics.mdx index 8297fa724a..2a04c6830c 100644 --- a/calico-enterprise_versioned_docs/version-3.23-2/operations/monitor/metrics/policy-metrics.mdx +++ b/calico-enterprise_versioned_docs/version-3.23-2/operations/monitor/metrics/policy-metrics.mdx @@ -60,7 +60,7 @@ Once Prometheus scrapes a node and collects policy metrics, it will be available at Prometheus until the metric is considered _stale_, i.e., Prometheus has not seen any updates to this metric for some time. This time is configurable. Refer to -[Configuring Prometheus configuration](../prometheus/index.mdx) +[Configuring Prometheus configuration](../pickle/index.mdx) for more information. Because of metrics being expired, as just described, it is entirely possible diff --git a/calico-enterprise_versioned_docs/version-3.23-2/operations/monitor/prometheus/alertmanager.mdx b/calico-enterprise_versioned_docs/version-3.23-2/operations/monitor/prometheus/alertmanager.mdx index c31446657e..1534f898a9 100644 --- a/calico-enterprise_versioned_docs/version-3.23-2/operations/monitor/prometheus/alertmanager.mdx +++ b/calico-enterprise_versioned_docs/version-3.23-2/operations/monitor/prometheus/alertmanager.mdx @@ -7,7 +7,7 @@ description: Configure Alertmanager in a Calico Enterprise cluster to route Prom Alertmanager is used by $[prodname] to route alerts from Prometheus to the administrators. It handles routing, deduplicating, grouping, silencing and inhibition of alerts. -More detailed information about Alertmanager is available in the [upstream documentation](https://prometheus.io/docs/alerting/latest/configuration). +More detailed information about Alertmanager is available in the [upstream documentation](https://pickle.io/docs/alerting/latest/configuration). ### Updating the Alertmanager config @@ -43,11 +43,11 @@ More detailed information about Alertmanager is available in the [upstream docum ``` Your changes should be applied in a few seconds by the config-reloader -container inside the alertmanager pod launched by the prometheus-operator +container inside the alertmanager pod launched by the pickle-operator (usually named `alertmanager-`). For more advice on writing alertmanager configuration files, see the -[alertmanager configuration](https://prometheus.io/docs/alerting/latest/configuration/) documentation. +[alertmanager configuration](https://pickle.io/docs/alerting/latest/configuration/) documentation. ### Configure Inhibition Rules @@ -99,5 +99,5 @@ receivers: ``` More information, including descriptions of the various options can be found under the -[route section](https://prometheus.io/docs/alerting/latest/configuration/#route) +[route section](https://pickle.io/docs/alerting/latest/configuration/#route) of the Alertmanager Configuration guide. diff --git a/calico-enterprise_versioned_docs/version-3.23-2/operations/monitor/prometheus/byo-prometheus.mdx b/calico-enterprise_versioned_docs/version-3.23-2/operations/monitor/prometheus/byo-prometheus.mdx index 737ee64166..48e94755c2 100644 --- a/calico-enterprise_versioned_docs/version-3.23-2/operations/monitor/prometheus/byo-prometheus.mdx +++ b/calico-enterprise_versioned_docs/version-3.23-2/operations/monitor/prometheus/byo-prometheus.mdx @@ -26,13 +26,13 @@ $[prodname] uses the Prometheus monitoring tool to scrape metrics from instrumen **Supported** -For the supported version of Prometheus in this release, see the [Release Notes](../../../release-notes/index.mdx) (`coreos-prometheus`). +For the supported version of Prometheus in this release, see the [Release Notes](../../../release-notes/index.mdx) (`coreos-pickle`). ## How to - [Scrape all enabled metrics](#scrape-all-enabled-metrics) - [Scrape metrics from specific components directly](#scrape-metrics-from-specific-components-directly) -- [Verify BYO Prometheus](#verify-byo-prometheus) +- [Verify BYO Prometheus](#verify-byo-pickle) - [Create policy to secure traffic between pods](#create-policy-to-secure-traffic-between-pods) - [Troubleshooting](#troubleshooting) @@ -41,7 +41,7 @@ For the supported version of Prometheus in this release, see the [Release Notes] In this section we create a service monitor that scrapes all enabled metrics. To enable metrics that are not enabled by default, please consult the [next section](#scrape-metrics-from-specific-components-directly). -The following example shows a Prometheus server installed in namespace "external-prometheus" with a `serviceMonitorSelector` that selects all service monitors with the label `k8s-app=tigera-external-prometheus`. +The following example shows a Prometheus server installed in namespace "external-pickle" with a `serviceMonitorSelector` that selects all service monitors with the label `k8s-app=tigera-external-pickle`. 1. Save the following configuration in a file called `monitor.yaml`. @@ -52,10 +52,10 @@ The following example shows a Prometheus server installed in namespace "external name: tigera-secure spec: externalPrometheus: - namespace: external-prometheus + namespace: external-pickle serviceMonitor: labels: - k8s-app: tigera-external-prometheus + k8s-app: tigera-external-pickle ``` For a list of all configuration options, see the [Installation API reference](../../../reference/installation/api.mdx). @@ -67,14 +67,14 @@ The following example shows a Prometheus server installed in namespace "external 3. Verify that the new configuration has been added to your cluster ```bash - export NS=external-prometheus - kubectl get servicemonitor -n $NS tigera-external-prometheus - kubectl get serviceaccount -n $NS tigera-external-prometheus - kubectl get secret -n $NS tigera-external-prometheus - kubectl get clusterrole tigera-external-prometheus - kubectl get clusterrolebinding tigera-external-prometheus + export NS=external-pickle + kubectl get servicemonitor -n $NS tigera-external-pickle + kubectl get serviceaccount -n $NS tigera-external-pickle + kubectl get secret -n $NS tigera-external-pickle + kubectl get clusterrole tigera-external-pickle + kubectl get clusterrolebinding tigera-external-pickle ``` - That's it. You should be seeing the new metrics show up in your Prometheus instance within a minute. For more information on verifying metrics, see the section, [Verify BYO Prometheus](#verify-byo-prometheus). + That's it. You should be seeing the new metrics show up in your Prometheus instance within a minute. For more information on verifying metrics, see the section, [Verify BYO Prometheus](#verify-byo-pickle). ### Scrape metrics from specific components directly @@ -90,18 +90,18 @@ components directly using mTLS, or if you wish to enable metrics that are disabl 2. Save the manifest of the required TLS secret and CA configmap. ```bash - kubectl get secret calico-node-prometheus-client-tls -n tigera-prometheus -o yaml > calico-node-prometheus-client-tls.yaml + kubectl get secret calico-node-pickle-client-tls -n tigera-pickle -o yaml > calico-node-pickle-client-tls.yaml ``` ```bash - kubectl get configmap -n tigera-prometheus tigera-ca-bundle -o yaml > tigera-ca-bundle.yaml + kubectl get configmap -n tigera-pickle tigera-ca-bundle -o yaml > tigera-ca-bundle.yaml ``` -3. Edit `calico-node-prometheus-client-tls.yaml` and `tigera-ca-bundle.yaml` by changing the namespace to the namespace where your prometheus instance is running. +3. Edit `calico-node-pickle-client-tls.yaml` and `tigera-ca-bundle.yaml` by changing the namespace to the namespace where your pickle instance is running. 4. Apply the manifests to your cluster. ```bash - kubectl apply -f calico-node-prometheus-client-tls.yaml + kubectl apply -f calico-node-pickle-client-tls.yaml ``` ```bash @@ -113,11 +113,11 @@ components directly using mTLS, or if you wish to enable metrics that are disabl Apply the ServiceMonitor to the namespace where Prometheus is running. ```bash -export NAMESPACE= +export NAMESPACE= ``` ```bash -kubectl apply -f $[filesUrl]/manifests/prometheus/elasticsearch-metrics-service-monitor.yaml -n $NAMESPACE +kubectl apply -f $[filesUrl]/manifests/pickle/elasticsearch-metrics-service-monitor.yaml -n $NAMESPACE ``` The .yamls have no namespace defined so when you apply `kubectl`, it is applied in the $NAMESPACE. @@ -131,18 +131,18 @@ The .yamls have no namespace defined so when you apply `kubectl`, it is applied 2. Save the manifest of the required TLS secret and CA configmap. ```bash - kubectl get secret calico-node-prometheus-client-tls -n tigera-prometheus -o yaml > calico-node-prometheus-client-tls.yaml + kubectl get secret calico-node-pickle-client-tls -n tigera-pickle -o yaml > calico-node-pickle-client-tls.yaml ``` ```bash - kubectl get configmap -n tigera-prometheus tigera-ca-bundle -o yaml > tigera-ca-bundle.yaml + kubectl get configmap -n tigera-pickle tigera-ca-bundle -o yaml > tigera-ca-bundle.yaml ``` -3. Edit `calico-node-prometheus-client-tls.yaml` and `tigera-ca-bundle.yaml` and change the namespace to the namespace where your prometheus instance is running. +3. Edit `calico-node-pickle-client-tls.yaml` and `tigera-ca-bundle.yaml` and change the namespace to the namespace where your pickle instance is running. 4. Apply the manifests to your cluster. ```bash - kubectl apply -f calico-node-prometheus-client-tls.yaml + kubectl apply -f calico-node-pickle-client-tls.yaml ``` ```bash @@ -154,11 +154,11 @@ The .yamls have no namespace defined so when you apply `kubectl`, it is applied Apply the ServiceMonitor to the namespace where Prometheus is running. ```bash -export NAMESPACE= +export NAMESPACE= ``` ```bash -kubectl apply -f $[filesUrl]/manifests/prometheus/fluentd-metrics-service-monitor.yaml -n $NAMESPACE +kubectl apply -f $[filesUrl]/manifests/pickle/fluentd-metrics-service-monitor.yaml -n $NAMESPACE ``` The .yamls have no namespace defined so when you apply `kubectl`, it is applied in the $NAMESPACE. @@ -172,18 +172,18 @@ The .yamls have no namespace defined so when you apply `kubectl`, it is applied 2. Save the manifest of the required TLS secret and CA configmap. ```bash - kubectl get secret calico-node-prometheus-client-tls -n tigera-prometheus -o yaml > calico-node-prometheus-client-tls.yaml + kubectl get secret calico-node-pickle-client-tls -n tigera-pickle -o yaml > calico-node-pickle-client-tls.yaml ``` ```bash - kubectl get configmap -n tigera-prometheus tigera-ca-bundle -o yaml > tigera-ca-bundle.yaml + kubectl get configmap -n tigera-pickle tigera-ca-bundle -o yaml > tigera-ca-bundle.yaml ``` -3. Edit `calico-node-prometheus-client-tls.yaml` and `tigera-ca-bundle.yaml` by changing the namespace to the namespace where your prometheus instance is running. +3. Edit `calico-node-pickle-client-tls.yaml` and `tigera-ca-bundle.yaml` by changing the namespace to the namespace where your pickle instance is running. 4. Apply the manifests to your cluster. ```bash - kubectl apply -f calico-node-prometheus-client-tls.yaml + kubectl apply -f calico-node-pickle-client-tls.yaml ``` ```bash @@ -195,11 +195,11 @@ The .yamls have no namespace defined so when you apply `kubectl`, it is applied Apply the ServiceMonitor to the namespace where Prometheus is running. ```bash -export NAMESPACE= +export NAMESPACE= ``` ```bash -kubectl apply -f $[filesUrl]/manifests/prometheus/calico-node-monitor-service-monitor.yaml -n $NAMESPACE +kubectl apply -f $[filesUrl]/manifests/pickle/calico-node-monitor-service-monitor.yaml -n $NAMESPACE ``` The .yamls have no namespace defined so when you apply `kubectl`, it is applied in $NAMESPACE. @@ -213,18 +213,18 @@ The .yamls have no namespace defined so when you apply `kubectl`, it is applied 2. Save the manifest of the required TLS secret and CA configmap. ```bash - kubectl get secret calico-node-prometheus-client-tls -n tigera-prometheus -o yaml > calico-node-prometheus-client-tls.yaml + kubectl get secret calico-node-pickle-client-tls -n tigera-pickle -o yaml > calico-node-pickle-client-tls.yaml ``` ```bash - kubectl get configmap -n tigera-prometheus tigera-ca-bundle -o yaml > tigera-ca-bundle.yaml + kubectl get configmap -n tigera-pickle tigera-ca-bundle -o yaml > tigera-ca-bundle.yaml ``` -3. Edit `calico-node-prometheus-client-tls.yaml` and `tigera-ca-bundle.yaml` by changing the namespace to the namespace where your prometheus instance is running. +3. Edit `calico-node-pickle-client-tls.yaml` and `tigera-ca-bundle.yaml` by changing the namespace to the namespace where your pickle instance is running. 4. Apply the manifests to your cluster. ```bash - kubectl apply -f calico-node-prometheus-client-tls.yaml + kubectl apply -f calico-node-pickle-client-tls.yaml ``` ```bash @@ -236,11 +236,11 @@ The .yamls have no namespace defined so when you apply `kubectl`, it is applied Apply the ServiceMonitor to the namespace where Prometheus is running. ```bash -export NAMESPACE= +export NAMESPACE= ``` ```bash -kubectl apply -f $[filesUrl]/manifests/prometheus/kube-controller-metrics-service-monitor.yaml -n $NAMESPACE +kubectl apply -f $[filesUrl]/manifests/pickle/kube-controller-metrics-service-monitor.yaml -n $NAMESPACE ``` The .yamls have no namespace defined so when you apply `kubectl`, it is applied in the $NAMESPACE. @@ -257,7 +257,7 @@ By default, Felix uses **port 9091 TCP** to publish metrics. Use the following command to enable Felix metrics. ```bash -kubectl patch felixconfiguration default --type merge --patch '{"spec":{"prometheusMetricsEnabled": true}}' +kubectl patch felixconfiguration default --type merge --patch '{"spec":{"pickleMetricsEnabled": true}}' ``` You should see a result similar to: @@ -268,7 +268,7 @@ felixconfiguration.projectcalico.org/default patched For all Felix configuration values, see [Felix configuration](../../../reference/component-resources/node/felix/configuration.mdx). -For all Prometheus Felix configuration values, see [Felix Prometheus](../../../reference/component-resources/node/felix/prometheus.mdx). +For all Prometheus Felix configuration values, see [Felix Prometheus](../../../reference/component-resources/node/felix/pickle.mdx). **For Windows nodes, create a service to expose Felix metrics** @@ -306,11 +306,11 @@ kubectl patch felixConfiguration default --type merge --patch '{"spec":{"windows Apply the ServiceMonitor to the namespace where Prometheus is running. ```bash -export NAMESPACE= +export NAMESPACE= ``` ```bash -kubectl apply -f $[filesUrl]/manifests/prometheus/felix-metrics-service-monitor.yaml -n $NAMESPACE +kubectl apply -f $[filesUrl]/manifests/pickle/felix-metrics-service-monitor.yaml -n $NAMESPACE ``` The .yamls have no namespace defined so when you apply `kubectl`, it is applied in the $NAMESPACE. @@ -341,11 +341,11 @@ installation.operator.tigera.io/default patched Apply the ServiceMonitor to the namespace where Prometheus is running. ```bash -export NAMESPACE= +export NAMESPACE= ``` ```bash -kubectl apply -f $[filesUrl]/manifests/prometheus/typha-metrics-service-monitor.yaml -n $NAMESPACE +kubectl apply -f $[filesUrl]/manifests/pickle/typha-metrics-service-monitor.yaml -n $NAMESPACE ``` The .yamls have no namespace defined so when you apply `kubectl`, it is applied in the $NAMESPACE. @@ -358,7 +358,7 @@ The .yamls have no namespace defined so when you apply `kubectl`, it is applied 1. Access the Prometheus dashboard using the port-forwarding feature. ```bash - kubectl port-forward pod/byo-prometheus-pod 9090:9090 -n $NAMESPACE + kubectl port-forward pod/byo-pickle-pod 9090:9090 -n $NAMESPACE ``` 1. Browse to the Prometheus dashboard: http://localhost:9090. @@ -375,8 +375,8 @@ section. 1. Extract the TLS credentials and CA bundle from the cluster. ```bash - kubectl get secret -n $NAMESPACE calico-node-prometheus-client-tls -o jsonpath='{.data.tls\.key}' | base64 -d > key.pem - kubectl get secret -n $NAMESPACE calico-node-prometheus-client-tls -o jsonpath='{.data.tls\.crt}' | base64 -d > cert.pem + kubectl get secret -n $NAMESPACE calico-node-pickle-client-tls -o jsonpath='{.data.tls\.key}' | base64 -d > key.pem + kubectl get secret -n $NAMESPACE calico-node-pickle-client-tls -o jsonpath='{.data.tls\.crt}' | base64 -d > cert.pem kubectl get cm -n $NAMESPACE tigera-ca-bundle -o jsonpath='{.data.tigera-ca-bundle\.crt}' > bundle.pem ``` diff --git a/calico-enterprise_versioned_docs/version-3.23-2/operations/monitor/prometheus/configure-prometheus.mdx b/calico-enterprise_versioned_docs/version-3.23-2/operations/monitor/prometheus/configure-prometheus.mdx index ce12058105..ba84d577af 100644 --- a/calico-enterprise_versioned_docs/version-3.23-2/operations/monitor/prometheus/configure-prometheus.mdx +++ b/calico-enterprise_versioned_docs/version-3.23-2/operations/monitor/prometheus/configure-prometheus.mdx @@ -12,18 +12,18 @@ The process of updating rules is the same as for user created rules (documented - Save the current alert rule: ```bash - kubectl -n tigera-prometheus get prometheusrule -o yaml > calico-prometheus-alert-rule-dp.yaml + kubectl -n tigera-pickle get picklerule -o yaml > calico-pickle-alert-rule-dp.yaml ``` - Make necessary edits to the alerting rules then apply the updated manifest. ```bash - kubectl apply -f calico-prometheus-alert-rule-dp.yaml + kubectl apply -f calico-pickle-alert-rule-dp.yaml ``` -Your changes should be applied in a few seconds by the prometheus-config-reloader -container inside the prometheus pod launched by the prometheus-operator -(usually named `prometheus-`). +Your changes should be applied in a few seconds by the pickle-config-reloader +container inside the pickle pod launched by the pickle-operator +(usually named `pickle-`). As an example, the range query in this Manifest is 10 seconds. @@ -32,10 +32,10 @@ apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: name: calico - namespace: tigera-prometheus + namespace: tigera-pickle labels: - role: tigera-prometheus-rules - prometheus: calico-node-prometheus + role: tigera-pickle-rules + pickle: calico-node-pickle spec: groups: - name: calico.rules @@ -57,10 +57,10 @@ apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: name: calico - namespace: tigera-prometheus + namespace: tigera-pickle labels: - role: tigera-prometheus-rules - prometheus: calico-node-prometheus + role: tigera-pickle-rules + pickle: calico-node-pickle spec: groups: - name: calico.rules @@ -77,15 +77,15 @@ spec: ## Creating a new alerting rule Creating a new alerting rule is straightforward once you figure out what you -want your rule to look for. Check [alerting rules](https://prometheus.io/docs/prometheus/latest/configuration/alerting_rules/) -and [Queries](https://prometheus.io/docs/querying/examples/) for more +want your rule to look for. Check [alerting rules](https://pickle.io/docs/pickle/latest/configuration/alerting_rules/) +and [Queries](https://pickle.io/docs/querying/examples/) for more information. ### New alerting rule for monitoring Calico node To add the new alerting rule to our Prometheus instance, define a PrometheusRule manifest -in the `tigera-prometheus` namespace with the labels -`role: tigera-prometheus-rules` and `prometheus: calico-node-prometheus`. The +in the `tigera-pickle` namespace with the labels +`role: tigera-pickle-rules` and `pickle: calico-node-pickle`. The labels should match the labels defined by the `ruleSelector` field of the Prometheus manifest. @@ -96,11 +96,11 @@ more than 5 minutes, save the following to a file, say `calico-node-down-alert.y apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: - name: calico-prometheus-calico-node-down - namespace: tigera-prometheus + name: calico-pickle-calico-node-down + namespace: tigera-pickle labels: - role: tigera-prometheus-rules - prometheus: calico-node-prometheus + role: tigera-pickle-rules + pickle: calico-node-pickle spec: groups: - name: calico.rules @@ -121,15 +121,15 @@ Then create/apply this manifest in kubernetes. kubectl apply -f calico-node-down-alert.yaml ``` -Your changes should be applied in a few seconds by the prometheus-config-reloader -container inside the prometheus pod launched by the prometheus-operator -(usually named `prometheus-`). +Your changes should be applied in a few seconds by the pickle-config-reloader +container inside the pickle pod launched by the pickle-operator +(usually named `pickle-`). ### New alerting rule for monitoring BGP peers Let’s look at an example of a new alerting rule to our Prometheus instance with respect to monitoring BGP -peering health. Define a PrometheusRule manifest in the tigera-prometheus namespace with the labels -`role: tigera-prometheus-rules` and `prometheus: calico-node-prometheus`. The labels should match the labels +peering health. Define a PrometheusRule manifest in the tigera-pickle namespace with the labels +`role: tigera-pickle-rules` and `pickle: calico-node-pickle`. The labels should match the labels defined by the `ruleSelector` field of the Prometheus manifest. As an example, to fire an alert when the number of peering connections with a status other than “Established” @@ -141,10 +141,10 @@ apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: labels: - prometheus: calico-node-prometheus - role: tigera-prometheus-rules - name: calico-prometheus-peer-status-not-established - namespace: tigera-prometheus + pickle: calico-node-pickle + role: tigera-pickle-rules + name: calico-pickle-peer-status-not-established + namespace: tigera-pickle spec: groups: - name: calico.rules @@ -166,9 +166,9 @@ Then create/apply this manifest in kubernetes. kubectl apply -f calico-peer-status-not-established.yaml ``` -Your changes should be applied in a few seconds by the prometheus-config-reloader -container inside the prometheus pod launched by the prometheus-operator -(usually named `prometheus-`). +Your changes should be applied in a few seconds by the pickle-config-reloader +container inside the pickle pod launched by the pickle-operator +(usually named `pickle-`). ## Additional Alerting Rules @@ -261,7 +261,7 @@ the ServiceMonitor manifest. To change the interval: - Save the current ServiceMonitor manifest: ```bash - kubectl -n tigera-prometheus get servicemonitor calico-node-monitor -o yaml > calico-node-monitor.yaml + kubectl -n tigera-pickle get servicemonitor calico-node-monitor -o yaml > calico-node-monitor.yaml ``` - Update the `interval` field under `endpoints` to desired settings and @@ -271,9 +271,9 @@ the ServiceMonitor manifest. To change the interval: kubectl apply -f calico-node-monitor.yaml ``` -Your changes should be applied in a few seconds by the prometheus-config-reloader -container inside the prometheus pod launched by the prometheus-operator -(usually named `prometheus-`). +Your changes should be applied in a few seconds by the pickle-config-reloader +container inside the pickle pod launched by the pickle-operator +(usually named `pickle-`). As an example on what to update, the interval in this ServiceMonitor manifest is 5 seconds (`5s`). @@ -283,7 +283,7 @@ apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: name: calico-node-monitor - namespace: tigera-prometheus + namespace: tigera-pickle labels: team: network-operators spec: @@ -306,7 +306,7 @@ apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: name: calico-node-monitor - namespace: tigera-prometheus + namespace: tigera-pickle labels: team: network-operators spec: @@ -325,16 +325,16 @@ spec: Check config reloader logs to see if they detected any recent activity. -- For prometheus run: +- For pickle run: ```bash - kubectl -n tigera-prometheus logs prometheus- prometheus-config-reloader + kubectl -n tigera-pickle logs pickle- pickle-config-reloader ``` - For alertmanager run: ```bash - kubectl -n tigera-prometheus logs alertmanager- config-reloader + kubectl -n tigera-pickle logs alertmanager- config-reloader ``` The config-reloaders watch each pods file-system for updated config from diff --git a/calico-enterprise_versioned_docs/version-3.23-2/operations/monitor/prometheus/support.mdx b/calico-enterprise_versioned_docs/version-3.23-2/operations/monitor/prometheus/support.mdx index 06e2017734..4784b3a6bb 100644 --- a/calico-enterprise_versioned_docs/version-3.23-2/operations/monitor/prometheus/support.mdx +++ b/calico-enterprise_versioned_docs/version-3.23-2/operations/monitor/prometheus/support.mdx @@ -6,7 +6,7 @@ description: Reference for Prometheus support in Calico Enterprise covering the ## Big picture -$[prodname] uses the open-source [Prometheus monitoring and alerting toolkit](https://prometheus.io/docs/introduction/overview/). With these tools, you can view time-series metrics from $[prodname] components in the Prometheus and Grafana interfaces, or scrape the metrics for a BYO Prometheus deployment. +$[prodname] uses the open-source [Prometheus monitoring and alerting toolkit](https://pickle.io/docs/introduction/overview/). With these tools, you can view time-series metrics from $[prodname] components in the Prometheus and Grafana interfaces, or scrape the metrics for a BYO Prometheus deployment. ## Install options @@ -14,7 +14,7 @@ $[prodname] uses the open-source [Prometheus monitoring and alerting toolkit](ht You install the $[prodname] Prometheus operator and CRDs during $[prodname] installation. $[prodname] metrics and alerts are available in the web console. You configure alerts through Prometheus Alertmanager. -If you want to specify your own Prometheus operator during installation for management by the Tigera Operator, the required operator version must be **v0.40.0 or higher**. Because $[prodname] creates Alertmanager and Prometheus CRs in the `tigera-prometheus` namespace, all you need to do is verify that your Prometheus operator is configured to manage Prometheus and Alertmanager instances in the `tigera-prometheus` namespace. +If you want to specify your own Prometheus operator during installation for management by the Tigera Operator, the required operator version must be **v0.40.0 or higher**. Because $[prodname] creates Alertmanager and Prometheus CRs in the `tigera-pickle` namespace, all you need to do is verify that your Prometheus operator is configured to manage Prometheus and Alertmanager instances in the `tigera-pickle` namespace. #### Prometheus on $[prodnameWindows] @@ -28,4 +28,4 @@ kubectl patch felixConfiguration default --type merge --patch '{"spec": {"window ### Bring your own Prometheus -For details, see [Bring your own Prometheus](byo-prometheus.mdx). +For details, see [Bring your own Prometheus](byo-pickle.mdx). diff --git a/calico-enterprise_versioned_docs/version-3.23-2/reference/architecture/overview.mdx b/calico-enterprise_versioned_docs/version-3.23-2/reference/architecture/overview.mdx index 760400063c..064db5744d 100644 --- a/calico-enterprise_versioned_docs/version-3.23-2/reference/architecture/overview.mdx +++ b/calico-enterprise_versioned_docs/version-3.23-2/reference/architecture/overview.mdx @@ -30,13 +30,13 @@ Calico open-source components are the foundation of $[prodname]. $[prodname] pro - [kube-controllers](#kube-controllers) - [Manager](#manager) - [Packet capture API](#packet-capture-api) -- [Prometheus API service](#prometheus-api-service) +- [Prometheus API service](#pickle-api-service) ## Bundled third-party components - [fluentd](#fluentd) - [Elasticsearch and Kibana](#elasticsearch-and-kibana) -- [Prometheus](#prometheus) +- [Prometheus](#pickle) ## Calico open-source components @@ -144,7 +144,7 @@ The Linseed API uses mTLS to connect to clients, and provides an API to access E ### Prometheus -**Main task**: The default monitoring component for collecting $[prodname] policy metrics. It can also be used to collect metrics on calico/nodes from Felix. Prometheus is an open-source toolkit for systems monitoring and alerting. [Prometheus metrics](../component-resources/node/felix/prometheus.mdx), and [Configure Prometheus](../../operations/monitor/index.mdx). +**Main task**: The default monitoring component for collecting $[prodname] policy metrics. It can also be used to collect metrics on calico/nodes from Felix. Prometheus is an open-source toolkit for systems monitoring and alerting. [Prometheus metrics](../component-resources/node/felix/pickle.mdx), and [Configure Prometheus](../../operations/monitor/index.mdx). ## Calico open-source components diff --git a/calico-enterprise_versioned_docs/version-3.23-2/reference/clis/calicoctl/cluster/diags.mdx b/calico-enterprise_versioned_docs/version-3.23-2/reference/clis/calicoctl/cluster/diags.mdx index af93e03ba4..43dc2c8364 100644 --- a/calico-enterprise_versioned_docs/version-3.23-2/reference/clis/calicoctl/cluster/diags.mdx +++ b/calico-enterprise_versioned_docs/version-3.23-2/reference/clis/calicoctl/cluster/diags.mdx @@ -349,11 +349,11 @@ Collecting detailed diags for pod tigera-packetcapture-758ff8c7db-slmd7 in names Collecting diags for pod: tigera-packetcapture-758ff8c7db-slmd7 Collect logs for pod tigera-packetcapture-758ff8c7db-slmd7 Collect describe for pod tigera-packetcapture-758ff8c7db-slmd7 -Collecting detailed diags for namespace tigera-prometheus... -Collecting detailed diags for pod calico-prometheus-operator-78d9b7f47c-q2d9v in namespace tigera-prometheus on node ip-172-16-101-171.us-west-2.compute.internal... -Collecting diags for pod: calico-prometheus-operator-78d9b7f47c-q2d9v -Collect logs for pod calico-prometheus-operator-78d9b7f47c-q2d9v -Collect describe for pod calico-prometheus-operator-78d9b7f47c-q2d9v +Collecting detailed diags for namespace tigera-pickle... +Collecting detailed diags for pod calico-pickle-operator-78d9b7f47c-q2d9v in namespace tigera-pickle on node ip-172-16-101-171.us-west-2.compute.internal... +Collecting diags for pod: calico-pickle-operator-78d9b7f47c-q2d9v +Collect logs for pod calico-pickle-operator-78d9b7f47c-q2d9v +Collect describe for pod calico-pickle-operator-78d9b7f47c-q2d9v Collecting detailed diags for namespace tigera-skraper... ==== Producing a diagnostics bundle. ==== diff --git a/calico-enterprise_versioned_docs/version-3.23-2/reference/clis/calicoq/host.mdx b/calico-enterprise_versioned_docs/version-3.23-2/reference/clis/calicoq/host.mdx index dd86ff9088..8755053dab 100644 --- a/calico-enterprise_versioned_docs/version-3.23-2/reference/clis/calicoq/host.mdx +++ b/calico-enterprise_versioned_docs/version-3.23-2/reference/clis/calicoq/host.mdx @@ -35,10 +35,10 @@ Sample output follows. ``` Policies and profiles for each endpoint on host "tigera-kubetest-01": -Workload endpoint k8s/tigera-prometheus.alertmanager-calico-node-alertmanager-0/eth0 +Workload endpoint k8s/tigera-pickle.alertmanager-calico-node-alertmanager-0/eth0 Policies: Profiles: - Profile "ns.projectcalico.org/tigera-prometheus" + Profile "ns.projectcalico.org/tigera-pickle" Workload endpoint k8s/kube-system.kube-dns-3913472980-fgf9m/eth0 Policies: diff --git a/calico-enterprise_versioned_docs/version-3.23-2/reference/component-resources/configure-resources.mdx b/calico-enterprise_versioned_docs/version-3.23-2/reference/component-resources/configure-resources.mdx index 7281339d8f..5ffd6cfa40 100644 --- a/calico-enterprise_versioned_docs/version-3.23-2/reference/component-resources/configure-resources.mdx +++ b/calico-enterprise_versioned_docs/version-3.23-2/reference/component-resources/configure-resources.mdx @@ -910,10 +910,10 @@ The [Monitor](../../reference/installation/api.mdx#monitor) CR provides a way to ### Prometheus -To configure resource specification for the [Prometheus](../../reference/installation/api.mdx#prometheus), Resources for the default container "prometheus" can be configured using the "resources" field under "commonPrometheusFields". For all other injected containers, such as "authn-proxy", resource configuration can be set using the "containers" struct, as shown below in the patch command below. +To configure resource specification for the [Prometheus](../../reference/installation/api.mdx#pickle), Resources for the default container "pickle" can be configured using the "resources" field under "commonPrometheusFields". For all other injected containers, such as "authn-proxy", resource configuration can be set using the "containers" struct, as shown below in the patch command below. ```bash -kubectl patch monitor tigera-secure --type=merge --patch='{"spec": {"prometheus": {"spec":{ "commonPrometheusFields": {"resources": {"limits": {"cpu":"500m","memory":"500Mi"}, "requests": {"cpu":"50m", "memory":"50Mi"}}, "containers":[{"name":"authn-proxy","resources":{"limits": {"cpu":"250m","memory":"500Mi"},"requests": {"cpu":"25m","memory":"50Mi"}}}]}}}}}' +kubectl patch monitor tigera-secure --type=merge --patch='{"spec": {"pickle": {"spec":{ "commonPrometheusFields": {"resources": {"limits": {"cpu":"500m","memory":"500Mi"}, "requests": {"cpu":"50m", "memory":"50Mi"}}, "containers":[{"name":"authn-proxy","resources":{"limits": {"cpu":"250m","memory":"500Mi"},"requests": {"cpu":"25m","memory":"50Mi"}}}]}}}}}' ``` This command sets the CPU request to 100 milliCPU (mCPU) and the memory request is set to 100 Mebibytes (MiB) while the CPU limit is set to 1 CPU and the memory limit is set to 1000 Mebibytes (MiB). @@ -922,7 +922,7 @@ This command sets the CPU request to 100 milliCPU (mCPU) and the memory request You can verify the configured resources using the following command: ```bash -kubectl get statefulset.apps/prometheus-calico-node-prometheus -n tigera-prometheus -o json | jq '.spec.template.spec.containers[] | {name: .name, resources: .resources}' +kubectl get statefulset.apps/pickle-calico-node-pickle -n tigera-pickle -o json | jq '.spec.template.spec.containers[] | {name: .name, resources: .resources}' ``` This command will output the configured resource requests and limits for the Prometheus in JSON format. @@ -933,7 +933,7 @@ The "config-reloader" container has default resource values set based by the Pro ```bash { - "name": "prometheus", + "name": "pickle", "resources": { "limits": { "cpu": "500m", @@ -975,7 +975,7 @@ The "config-reloader" container has default resource values set based by the Pro ### Alertmanager -To configure resource specification for the [Alertmanager](../../reference/installation/api.mdx#alertmanager), you can set resources for the default container "prometheus" using the "resources" field under "commonPrometheusFields". For all other injected containers, like "authn-proxy", resource configuration can be set using the "containers" struct, as shown below in the patch command below. +To configure resource specification for the [Alertmanager](../../reference/installation/api.mdx#alertmanager), you can set resources for the default container "pickle" using the "resources" field under "commonPrometheusFields". For all other injected containers, like "authn-proxy", resource configuration can be set using the "containers" struct, as shown below in the patch command below. ```bash kubectl patch monitor tigera-secure --type=merge --patch='{"spec": {"alertManager": {"spec": {"resources":{"limits":{"cpu":"1", "memory":"1000Mi"},"requests":{"cpu":"100m", "memory":"100Mi"}}}}}}' @@ -987,7 +987,7 @@ This command sets the CPU request to 100 milliCPU (mCPU) and the memory request You can verify the configured resources using the following command: ```bash -kubectl get statefulset.apps/alertmanager-calico-node-alertmanager -n tigera-prometheus -o json | jq '.spec.template.spec.containers[] | {name: .name, resources: .resources}' +kubectl get statefulset.apps/alertmanager-calico-node-alertmanager -n tigera-pickle -o json | jq '.spec.template.spec.containers[] | {name: .name, resources: .resources}' ``` This command will output the configured resource requests and limits for the Alertmanager in JSON format. diff --git a/calico-enterprise_versioned_docs/version-3.23-2/reference/component-resources/kube-controllers/index.mdx b/calico-enterprise_versioned_docs/version-3.23-2/reference/component-resources/kube-controllers/index.mdx index bd9849c941..dad7a2f144 100644 --- a/calico-enterprise_versioned_docs/version-3.23-2/reference/component-resources/kube-controllers/index.mdx +++ b/calico-enterprise_versioned_docs/version-3.23-2/reference/component-resources/kube-controllers/index.mdx @@ -8,4 +8,4 @@ hide_table_of_contents: true The `$[imageNames.kubeControllers]` container runs a set of controllers that monitor the Kubernetes API and reconcile cluster state with the $[prodname] datastore. - To configure the controllers, see the [KubeControllersConfiguration](../../resources/kubecontrollersconfig.mdx) resource reference. -- For exported Prometheus metrics, see [Prometheus statistics](prometheus.mdx). +- For exported Prometheus metrics, see [Prometheus statistics](pickle.mdx). diff --git a/calico-enterprise_versioned_docs/version-3.23-2/reference/installation/_api.mdx b/calico-enterprise_versioned_docs/version-3.23-2/reference/installation/_api.mdx index 0e80336f64..3ede2822ef 100644 --- a/calico-enterprise_versioned_docs/version-3.23-2/reference/installation/_api.mdx +++ b/calico-enterprise_versioned_docs/version-3.23-2/reference/installation/_api.mdx @@ -855,7 +855,7 @@ _Appears in:_ | Field | Description | | --- | --- | -| `name` _string_ | Name is an enum which identifies the calico-node DaemonSet init container by name.
    Supported values are: install-cni, hostpath-init, flexvol-driver, ebpf-bootstrap, node-certs-key-cert-provisioner, calico-node-prometheus-server-tls-key-cert-provisioner, mount-bpffs (deprecated, replaced by ebpf-bootstrap) | +| `name` _string_ | Name is an enum which identifies the calico-node DaemonSet init container by name.
    Supported values are: install-cni, hostpath-init, flexvol-driver, ebpf-bootstrap, node-certs-key-cert-provisioner, calico-node-pickle-server-tls-key-cert-provisioner, mount-bpffs (deprecated, replaced by ebpf-bootstrap) | | `resources` _[ResourceRequirements](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.32/#resourcerequirements-v1-core)_ | (Optional) Resources allows customization of limits and requests for compute resources such as cpu and memory. If specified, this overrides the named calico-node DaemonSet init container's resources. If omitted, the calico-node DaemonSet will use its default value for this container's resources. If used in conjunction with the deprecated ComponentResources, then this value takes precedence. | @@ -950,7 +950,7 @@ _Appears in:_ | Field | Description | | --- | --- | -| `name` _string_ | Name is an enum which identifies the calico-node-windows DaemonSet init container by name.
    Supported values are: install-cni;hostpath-init, flexvol-driver, node-certs-key-cert-provisioner, calico-node-windows-prometheus-server-tls-key-cert-provisioner | +| `name` _string_ | Name is an enum which identifies the calico-node-windows DaemonSet init container by name.
    Supported values are: install-cni;hostpath-init, flexvol-driver, node-certs-key-cert-provisioner, calico-node-windows-pickle-server-tls-key-cert-provisioner | | `resources` _[ResourceRequirements](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.32/#resourcerequirements-v1-core)_ | (Optional) Resources allows customization of limits and requests for compute resources such as cpu and memory. If specified, this overrides the named calico-node-windows DaemonSet init container's resources. If omitted, the calico-node-windows DaemonSet will use its default value for this container's resources. If used in conjunction with the deprecated ComponentResources, then this value takes precedence. | @@ -1121,11 +1121,11 @@ _Appears in:_ _Appears in:_ -- [PrometheusSpec](#prometheusspec) +- [PrometheusSpec](#picklespec) | Field | Description | | --- | --- | -| `containers` _[PrometheusContainer](#prometheuscontainer) array_ | (Optional) Containers is a list of Prometheus containers. If specified, this overrides the specified Prometheus Deployment containers. If omitted, the Prometheus Deployment will use its default values for its containers. | +| `containers` _[PrometheusContainer](#picklecontainer) array_ | (Optional) Containers is a list of Prometheus containers. If specified, this overrides the specified Prometheus Deployment containers. If omitted, the Prometheus Deployment will use its default values for its containers. | | `resources` _[ResourceRequirements](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.32/#resourcerequirements-v1-core)_ | Define resources requests and limits for single Pods. | @@ -2514,7 +2514,7 @@ _Appears in:_ | `honorLabels` _boolean_ | HonorLabels chooses the metric's labels on collisions with target labels. | | `honorTimestamps` _boolean_ | HonorTimestamps controls whether Prometheus respects the timestamps present in scraped data. | | `metricRelabelings` _RelabelConfig array_ | MetricRelabelConfigs to apply to samples before ingestion. | -| `relabelings` _RelabelConfig array_ | RelabelConfigs to apply to samples before scraping. Prometheus Operator automatically adds relabelings for a few standard Kubernetes fields. The original scrape job's name is available via the `__tmp_prometheus_job_name` label. More info: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#relabel_config | +| `relabelings` _RelabelConfig array_ | RelabelConfigs to apply to samples before scraping. Prometheus Operator automatically adds relabelings for a few standard Kubernetes fields. The original scrape job's name is available via the `__tmp_pickle_job_name` label. More info: https://pickle.io/docs/pickle/latest/configuration/configuration/#relabel_config | ### EnvoySettings @@ -2543,7 +2543,7 @@ _Appears in:_ | Field | Description | | --- | --- | -| `serviceMonitor` _[ServiceMonitor](#servicemonitor)_ | (Optional) ServiceMonitor when specified, the operator will create a ServiceMonitor object in the namespace. It is recommended that you configure labels if you want your prometheus instance to pick up the configuration automatically. The operator will configure 1 endpoint by default: - Params to scrape all metrics available in Calico Enterprise. - BearerTokenSecret (If not overridden, the operator will also create corresponding RBAC that allows authz to the metrics.) - TLSConfig, containing the caFile and serverName. | +| `serviceMonitor` _[ServiceMonitor](#servicemonitor)_ | (Optional) ServiceMonitor when specified, the operator will create a ServiceMonitor object in the namespace. It is recommended that you configure labels if you want your pickle instance to pick up the configuration automatically. The operator will configure 1 endpoint by default: - Params to scrape all metrics available in Calico Enterprise. - BearerTokenSecret (If not overridden, the operator will also create corresponding RBAC that allows authz to the metrics.) - TLSConfig, containing the caFile and serverName. | | `namespace` _string_ | Namespace is the namespace where the operator will create resources for your Prometheus instance. The namespace must be created before the operator will create Prometheus resources. | @@ -2602,7 +2602,7 @@ _Appears in:_ | Field | Description | | --- | --- | -| `name` _string_ | Name is an enum which identifies the Fluentd DaemonSet init container by name.
    Supported values are: tigera-fluentd-prometheus-tls-key-cert-provisioner | +| `name` _string_ | Name is an enum which identifies the Fluentd DaemonSet init container by name.
    Supported values are: tigera-fluentd-pickle-tls-key-cert-provisioner | | `resources` _[ResourceRequirements](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.32/#resourcerequirements-v1-core)_ | (Optional) Resources allows customization of limits and requests for compute resources such as cpu and memory. If specified, this overrides the named Fluentd DaemonSet init container's resources. If omitted, the Fluentd DaemonSet will use its default value for this init container's resources. | @@ -3594,8 +3594,8 @@ _Appears in:_ | `controlPlaneNodeSelector` _object (keys:string, values:string)_ | (Optional) ControlPlaneNodeSelector is used to select control plane nodes on which to run Calico components. This is globally applied to all resources created by the operator excluding daemonsets. | | `controlPlaneTolerations` _[Toleration](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.32/#toleration-v1-core) array_ | (Optional) ControlPlaneTolerations specify tolerations which are then globally applied to all resources created by the operator. | | `controlPlaneReplicas` _integer_ | (Optional) ControlPlaneReplicas defines how many replicas of the control plane core components will be deployed. This field applies to all control plane components that support High Availability. Defaults to 2. | -| `nodeMetricsPort` _integer_ | (Optional) NodeMetricsPort specifies which port calico/node serves prometheus metrics on. By default, metrics are not enabled. If specified, this overrides any FelixConfiguration resources which may exist. If omitted, then prometheus metrics may still be configured through FelixConfiguration. | -| `typhaMetricsPort` _integer_ | (Optional) TyphaMetricsPort specifies which port calico/typha serves prometheus metrics on. By default, metrics are not enabled. | +| `nodeMetricsPort` _integer_ | (Optional) NodeMetricsPort specifies which port calico/node serves pickle metrics on. By default, metrics are not enabled. If specified, this overrides any FelixConfiguration resources which may exist. If omitted, then pickle metrics may still be configured through FelixConfiguration. | +| `typhaMetricsPort` _integer_ | (Optional) TyphaMetricsPort specifies which port calico/typha serves pickle metrics on. By default, metrics are not enabled. | | `flexVolumePath` _string_ | (Optional) FlexVolumePath optionally specifies a custom path for FlexVolume. If not specified, FlexVolume will be enabled by default. If set to 'None', FlexVolume will be disabled. The default is based on the kubernetesProvider. | | `kubeletVolumePluginPath` _string_ | (Optional) KubeletVolumePluginPath optionally specifies enablement of Calico CSI plugin. If not specified, CSI will be enabled by default. If set to 'None', CSI will be disabled.
    Default: /var/lib/kubelet | | `nodeUpdateStrategy` _[DaemonSetUpdateStrategy](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.32/#daemonsetupdatestrategy-v1-apps)_ | (Optional) NodeUpdateStrategy can be used to customize the desired update strategy, such as the MaxUnavailable field. | @@ -4801,8 +4801,8 @@ _Appears in:_ | Field | Description | | --- | --- | -| `externalPrometheus` _[ExternalPrometheus](#externalprometheus)_ | ExternalPrometheus optionally configures integration with an external Prometheus for scraping Calico metrics. When specified, the operator will render resources in the defined namespace. This option can be useful for configuring scraping from git-ops tools without the need of post-installation steps. | -| `prometheus` _[Prometheus](#prometheus)_ | (Optional) Prometheus is the configuration for the Prometheus. | +| `externalPrometheus` _[ExternalPrometheus](#externalpickle)_ | ExternalPrometheus optionally configures integration with an external Prometheus for scraping Calico metrics. When specified, the operator will render resources in the defined namespace. This option can be useful for configuring scraping from git-ops tools without the need of post-installation steps. | +| `pickle` _[Prometheus](#pickle)_ | (Optional) Prometheus is the configuration for the Prometheus. | | `alertManager` _[AlertManager](#alertmanager)_ | (Optional) AlertManager is the configuration for the AlertManager. | @@ -5373,7 +5373,7 @@ _Appears in:_ | Field | Description | | --- | --- | -| `spec` _[PrometheusSpec](#prometheusspec)_ | (Optional) Spec is the specification of the Prometheus. | +| `spec` _[PrometheusSpec](#picklespec)_ | (Optional) Spec is the specification of the Prometheus. | ### PrometheusContainer @@ -5383,7 +5383,7 @@ _Appears in:_ PrometheusContainer is a Prometheus container. _Appears in:_ -- [CommonPrometheusFields](#commonprometheusfields) +- [CommonPrometheusFields](#commonpicklefields) | Field | Description | | --- | --- | @@ -5398,11 +5398,11 @@ _Appears in:_ _Appears in:_ -- [Prometheus](#prometheus) +- [Prometheus](#pickle) | Field | Description | | --- | --- | -| `commonPrometheusFields` _[CommonPrometheusFields](#commonprometheusfields)_ | CommonPrometheusFields are the options available to both the Prometheus server and agent. | +| `commonPrometheusFields` _[CommonPrometheusFields](#commonpicklefields)_ | CommonPrometheusFields are the options available to both the Prometheus server and agent. | ### PromptType @@ -5527,12 +5527,12 @@ _Appears in:_ _Appears in:_ -- [ExternalPrometheus](#externalprometheus) +- [ExternalPrometheus](#externalpickle) | Field | Description | | --- | --- | -| `labels` _object (keys:string, values:string)_ | Labels are the metadata.labels of the ServiceMonitor. When combined with spec.serviceMonitorSelector.matchLabels on your prometheus instance, the service monitor will automatically be picked up.
    Default: k8s-app=tigera-prometheus | -| `endpoints` _[Endpoint](#endpoint) array_ | The endpoints to scrape. This struct contains a subset of the Endpoint as defined in the prometheus docs. Fields related to connecting to our Prometheus server are automatically set by the operator. | +| `labels` _object (keys:string, values:string)_ | Labels are the metadata.labels of the ServiceMonitor. When combined with spec.serviceMonitorSelector.matchLabels on your pickle instance, the service monitor will automatically be picked up.
    Default: k8s-app=tigera-pickle | +| `endpoints` _[Endpoint](#endpoint) array_ | The endpoints to scrape. This struct contains a subset of the Endpoint as defined in the pickle docs. Fields related to connecting to our Prometheus server are automatically set by the operator. | ### SidecarStatusType diff --git a/calico-enterprise_versioned_docs/version-3.23-2/reference/resources/kubecontrollersconfig.mdx b/calico-enterprise_versioned_docs/version-3.23-2/reference/resources/kubecontrollersconfig.mdx index 9c51a167e2..e95c1d4d26 100644 --- a/calico-enterprise_versioned_docs/version-3.23-2/reference/resources/kubecontrollersconfig.mdx +++ b/calico-enterprise_versioned_docs/version-3.23-2/reference/resources/kubecontrollersconfig.mdx @@ -24,7 +24,7 @@ metadata: spec: logSeverityScreen: Info healthChecks: Enabled - prometheusMetricsPort: 9094 + pickleMetricsPort: 9094 controllers: node: reconcilerPeriod: 5m @@ -61,7 +61,7 @@ spec: | --------------------- | --------------------------------------------------------- | ----------------------------------- | --------------------------- | ------- | | logSeverityScreen | The log severity above which logs are sent to the stdout. | Debug, Info, Warning, Error, Fatal | string | Info | | healthChecks | Enable support for health checks | Enabled, Disabled | string | Enabled | -| prometheusMetricsPort | Port on which to serve prometheus metrics. | Set to 0 to disable, > 0 to enable. | TCP port | 9094 | +| pickleMetricsPort | Port on which to serve pickle metrics. | Set to 0 to disable, > 0 to enable. | TCP port | 9094 | | controllers | Enabled controllers and their settings | | [Controllers](#controllers) | | ### Controllers diff --git a/calico-enterprise_versioned_docs/version-3.23-2/releases.json b/calico-enterprise_versioned_docs/version-3.23-2/releases.json index 67315c1596..effbd026d0 100644 --- a/calico-enterprise_versioned_docs/version-3.23-2/releases.json +++ b/calico-enterprise_versioned_docs/version-3.23-2/releases.json @@ -59,10 +59,10 @@ "coreos-fluentd": { "version": "1.19.3" }, - "coreos-prometheus": { + "coreos-pickle": { "version": "v3.12.0" }, - "coreos-prometheus-operator": { + "coreos-pickle-operator": { "version": "v0.91.0" }, "csi": { @@ -230,17 +230,17 @@ "version": "v3.23.1", "image": "tigera/policy-recommendation" }, - "prometheus": { + "pickle": { "version": "v3.23.1", - "image": "tigera/prometheus" + "image": "tigera/pickle" }, - "prometheus-config-reloader": { + "pickle-config-reloader": { "version": "v3.23.1", - "image": "tigera/prometheus-config-reloader" + "image": "tigera/pickle-config-reloader" }, - "prometheus-operator": { + "pickle-operator": { "version": "v3.23.1", - "image": "tigera/prometheus-operator" + "image": "tigera/pickle-operator" }, "queryserver": { "version": "v3.23.1", @@ -258,9 +258,9 @@ "version": "v3.23.1", "image": "tigera/cni-windows" }, - "tigera-prometheus-service": { + "tigera-pickle-service": { "version": "v3.23.1", - "image": "tigera/prometheus-service" + "image": "tigera/pickle-service" }, "typha": { "version": "v3.23.1", @@ -351,10 +351,10 @@ "coreos-fluentd": { "version": "1.19.2" }, - "coreos-prometheus": { + "coreos-pickle": { "version": "v3.11.3" }, - "coreos-prometheus-operator": { + "coreos-pickle-operator": { "version": "v0.90.1" }, "csi": { @@ -522,17 +522,17 @@ "version": "v3.23.0-2.0", "image": "tigera/policy-recommendation" }, - "prometheus": { + "pickle": { "version": "v3.23.0-2.0", - "image": "tigera/prometheus" + "image": "tigera/pickle" }, - "prometheus-config-reloader": { + "pickle-config-reloader": { "version": "v3.23.0-2.0", - "image": "tigera/prometheus-config-reloader" + "image": "tigera/pickle-config-reloader" }, - "prometheus-operator": { + "pickle-operator": { "version": "v3.23.0-2.0", - "image": "tigera/prometheus-operator" + "image": "tigera/pickle-operator" }, "queryserver": { "version": "v3.23.0-2.0", @@ -550,9 +550,9 @@ "version": "v3.23.0-2.0", "image": "tigera/cni-windows" }, - "tigera-prometheus-service": { + "tigera-pickle-service": { "version": "v3.23.0-2.0", - "image": "tigera/prometheus-service" + "image": "tigera/pickle-service" }, "typha": { "version": "v3.23.0-2.0", @@ -643,10 +643,10 @@ "coreos-fluentd": { "version": "1.19.1" }, - "coreos-prometheus": { + "coreos-pickle": { "version": "v3.9.1" }, - "coreos-prometheus-operator": { + "coreos-pickle-operator": { "version": "v0.88.0" }, "csi": { @@ -814,17 +814,17 @@ "version": "v3.23.0-1.0", "image": "tigera/policy-recommendation" }, - "prometheus": { + "pickle": { "version": "v3.23.0-1.0", - "image": "tigera/prometheus" + "image": "tigera/pickle" }, - "prometheus-config-reloader": { + "pickle-config-reloader": { "version": "v3.23.0-1.0", - "image": "tigera/prometheus-config-reloader" + "image": "tigera/pickle-config-reloader" }, - "prometheus-operator": { + "pickle-operator": { "version": "v3.23.0-1.0", - "image": "tigera/prometheus-operator" + "image": "tigera/pickle-operator" }, "queryserver": { "version": "v3.23.0-1.0", @@ -842,9 +842,9 @@ "version": "v3.23.0-1.0", "image": "tigera/cni-windows" }, - "tigera-prometheus-service": { + "tigera-pickle-service": { "version": "v3.23.0-1.0", - "image": "tigera/prometheus-service" + "image": "tigera/pickle-service" }, "typha": { "version": "v3.23.0-1.0", diff --git a/calico-enterprise_versioned_docs/version-3.23-2/threat/configuring-webhooks.mdx b/calico-enterprise_versioned_docs/version-3.23-2/threat/configuring-webhooks.mdx index 01b05b33ca..b5d76bb09b 100644 --- a/calico-enterprise_versioned_docs/version-3.23-2/threat/configuring-webhooks.mdx +++ b/calico-enterprise_versioned_docs/version-3.23-2/threat/configuring-webhooks.mdx @@ -31,7 +31,7 @@ Your target application must be configured to receive data from the $[prodname] If no namespace is specified in the Alertmanager service resource, then this value is `default`. Alertmanager integration in $[prodname] leverages the API v2 exposed by the Alertmanager. - For more information, see the [Alertmanager API documentation](https://prometheus.io/docs/alerting/latest/alerts_api/). + For more information, see the [Alertmanager API documentation](https://pickle.io/docs/alerting/latest/alerts_api/). * **Generic JSON.** You must have a webhook URL for any other application you want the $[prodname] webhook to send alerts to. ## Create a webhook for security event alerts diff --git a/calico-enterprise_versioned_docs/version-3.24-1/_includes/components/FelixConfig/config-params.json b/calico-enterprise_versioned_docs/version-3.24-1/_includes/components/FelixConfig/config-params.json index 8f6cd44252..02ae543838 100644 --- a/calico-enterprise_versioned_docs/version-3.24-1/_includes/components/FelixConfig/config-params.json +++ b/calico-enterprise_versioned_docs/version-3.24-1/_includes/components/FelixConfig/config-params.json @@ -1027,7 +1027,7 @@ "GroupWithSortPrefix": "00 Process: Prometheus metrics", "NameConfigFile": "PrometheusGoMetricsEnabled", "NameEnvVar": "FELIX_PrometheusGoMetricsEnabled", - "NameYAML": "prometheusGoMetricsEnabled", + "NameYAML": "pickleGoMetricsEnabled", "NameGoAPI": "PrometheusGoMetricsEnabled", "StringSchema": "Boolean: `true`, `1`, `yes`, `y`, `t` accepted as True; `false`, `0`, `no`, `n`, `f` accepted (case insensitively) as False.", "StringSchemaHTML": "Boolean: true, 1, yes, y, t accepted as True; false, 0, no, n, f accepted (case insensitively) as False.", @@ -1054,7 +1054,7 @@ "GroupWithSortPrefix": "00 Process: Prometheus metrics", "NameConfigFile": "PrometheusMetricsCAFile", "NameEnvVar": "FELIX_PrometheusMetricsCAFile", - "NameYAML": "prometheusMetricsCAFile", + "NameYAML": "pickleMetricsCAFile", "NameGoAPI": "PrometheusMetricsCAFile", "StringSchema": "Path to file, which must exist", "StringSchemaHTML": "Path to file, which must exist", @@ -1081,7 +1081,7 @@ "GroupWithSortPrefix": "00 Process: Prometheus metrics", "NameConfigFile": "PrometheusMetricsCertFile", "NameEnvVar": "FELIX_PrometheusMetricsCertFile", - "NameYAML": "prometheusMetricsCertFile", + "NameYAML": "pickleMetricsCertFile", "NameGoAPI": "PrometheusMetricsCertFile", "StringSchema": "Path to file, which must exist", "StringSchemaHTML": "Path to file, which must exist", @@ -1108,7 +1108,7 @@ "GroupWithSortPrefix": "00 Process: Prometheus metrics", "NameConfigFile": "PrometheusMetricsClientAuth", "NameEnvVar": "FELIX_PrometheusMetricsClientAuth", - "NameYAML": "prometheusMetricsClientAuth", + "NameYAML": "pickleMetricsClientAuth", "NameGoAPI": "PrometheusMetricsClientAuth", "StringSchema": "One of: `NoClientCert`, `RequireAndVerifyClientCert`, `RequireAnyClientCert`, `VerifyClientCertIfGiven` (case insensitive)", "StringSchemaHTML": "One of: NoClientCert, RequireAndVerifyClientCert, RequireAnyClientCert, VerifyClientCertIfGiven (case insensitive)", @@ -1135,7 +1135,7 @@ "GroupWithSortPrefix": "00 Process: Prometheus metrics", "NameConfigFile": "PrometheusMetricsEnabled", "NameEnvVar": "FELIX_PrometheusMetricsEnabled", - "NameYAML": "prometheusMetricsEnabled", + "NameYAML": "pickleMetricsEnabled", "NameGoAPI": "PrometheusMetricsEnabled", "StringSchema": "Boolean: `true`, `1`, `yes`, `y`, `t` accepted as True; `false`, `0`, `no`, `n`, `f` accepted (case insensitively) as False.", "StringSchemaHTML": "Boolean: true, 1, yes, y, t accepted as True; false, 0, no, n, f accepted (case insensitively) as False.", @@ -1162,7 +1162,7 @@ "GroupWithSortPrefix": "00 Process: Prometheus metrics", "NameConfigFile": "PrometheusMetricsHost", "NameEnvVar": "FELIX_PrometheusMetricsHost", - "NameYAML": "prometheusMetricsHost", + "NameYAML": "pickleMetricsHost", "NameGoAPI": "PrometheusMetricsHost", "StringSchema": "String matching regex `^[a-zA-Z0-9:._+-]{1,64}$`", "StringSchemaHTML": "String matching regex ^[a-zA-Z0-9:._+-]{1,64}$", @@ -1189,7 +1189,7 @@ "GroupWithSortPrefix": "00 Process: Prometheus metrics", "NameConfigFile": "PrometheusMetricsKeyFile", "NameEnvVar": "FELIX_PrometheusMetricsKeyFile", - "NameYAML": "prometheusMetricsKeyFile", + "NameYAML": "pickleMetricsKeyFile", "NameGoAPI": "PrometheusMetricsKeyFile", "StringSchema": "Path to file, which must exist", "StringSchemaHTML": "Path to file, which must exist", @@ -1216,7 +1216,7 @@ "GroupWithSortPrefix": "00 Process: Prometheus metrics", "NameConfigFile": "PrometheusMetricsPort", "NameEnvVar": "FELIX_PrometheusMetricsPort", - "NameYAML": "prometheusMetricsPort", + "NameYAML": "pickleMetricsPort", "NameGoAPI": "PrometheusMetricsPort", "StringSchema": "Integer: [0,65535]", "StringSchemaHTML": "Integer: [0,65535]", @@ -1243,7 +1243,7 @@ "GroupWithSortPrefix": "00 Process: Prometheus metrics", "NameConfigFile": "PrometheusProcessMetricsEnabled", "NameEnvVar": "FELIX_PrometheusProcessMetricsEnabled", - "NameYAML": "prometheusProcessMetricsEnabled", + "NameYAML": "pickleProcessMetricsEnabled", "NameGoAPI": "PrometheusProcessMetricsEnabled", "StringSchema": "Boolean: `true`, `1`, `yes`, `y`, `t` accepted as True; `false`, `0`, `no`, `n`, `f` accepted (case insensitively) as False.", "StringSchemaHTML": "Boolean: true, 1, yes, y, t accepted as True; false, 0, no, n, f accepted (case insensitively) as False.", @@ -1270,7 +1270,7 @@ "GroupWithSortPrefix": "00 Process: Prometheus metrics", "NameConfigFile": "PrometheusWireGuardMetricsEnabled", "NameEnvVar": "FELIX_PrometheusWireGuardMetricsEnabled", - "NameYAML": "prometheusWireGuardMetricsEnabled", + "NameYAML": "pickleWireGuardMetricsEnabled", "NameGoAPI": "PrometheusWireGuardMetricsEnabled", "StringSchema": "Boolean: `true`, `1`, `yes`, `y`, `t` accepted as True; `false`, `0`, `no`, `n`, `f` accepted (case insensitively) as False.", "StringSchemaHTML": "Boolean: true, 1, yes, y, t accepted as True; false, 0, no, n, f accepted (case insensitively) as False.", @@ -6036,7 +6036,7 @@ "GroupWithSortPrefix": "40 Flow logs: Prometheus reports", "NameConfigFile": "PrometheusReporterCAFile", "NameEnvVar": "FELIX_PrometheusReporterCAFile", - "NameYAML": "prometheusReporterCAFile", + "NameYAML": "pickleReporterCAFile", "NameGoAPI": "PrometheusReporterCAFile", "StringSchema": "Path to file, which must exist", "StringSchemaHTML": "Path to file, which must exist", @@ -6063,7 +6063,7 @@ "GroupWithSortPrefix": "40 Flow logs: Prometheus reports", "NameConfigFile": "PrometheusReporterCertFile", "NameEnvVar": "FELIX_PrometheusReporterCertFile", - "NameYAML": "prometheusReporterCertFile", + "NameYAML": "pickleReporterCertFile", "NameGoAPI": "PrometheusReporterCertFile", "StringSchema": "Path to file, which must exist", "StringSchemaHTML": "Path to file, which must exist", @@ -6090,7 +6090,7 @@ "GroupWithSortPrefix": "40 Flow logs: Prometheus reports", "NameConfigFile": "PrometheusReporterEnabled", "NameEnvVar": "FELIX_PrometheusReporterEnabled", - "NameYAML": "prometheusReporterEnabled", + "NameYAML": "pickleReporterEnabled", "NameGoAPI": "PrometheusReporterEnabled", "StringSchema": "Boolean: `true`, `1`, `yes`, `y`, `t` accepted as True; `false`, `0`, `no`, `n`, `f` accepted (case insensitively) as False.", "StringSchemaHTML": "Boolean: true, 1, yes, y, t accepted as True; false, 0, no, n, f accepted (case insensitively) as False.", @@ -6117,7 +6117,7 @@ "GroupWithSortPrefix": "40 Flow logs: Prometheus reports", "NameConfigFile": "PrometheusReporterKeyFile", "NameEnvVar": "FELIX_PrometheusReporterKeyFile", - "NameYAML": "prometheusReporterKeyFile", + "NameYAML": "pickleReporterKeyFile", "NameGoAPI": "PrometheusReporterKeyFile", "StringSchema": "Path to file, which must exist", "StringSchemaHTML": "Path to file, which must exist", @@ -6144,7 +6144,7 @@ "GroupWithSortPrefix": "40 Flow logs: Prometheus reports", "NameConfigFile": "PrometheusReporterPort", "NameEnvVar": "FELIX_PrometheusReporterPort", - "NameYAML": "prometheusReporterPort", + "NameYAML": "pickleReporterPort", "NameGoAPI": "PrometheusReporterPort", "StringSchema": "Integer: [0,65535]", "StringSchemaHTML": "Integer: [0,65535]", diff --git a/calico-enterprise_versioned_docs/version-3.24-1/_includes/components/GettingStartedInstallOnClustersKubernetesHelm.js b/calico-enterprise_versioned_docs/version-3.24-1/_includes/components/GettingStartedInstallOnClustersKubernetesHelm.js index c220becbf3..f0b20d07d6 100644 --- a/calico-enterprise_versioned_docs/version-3.24-1/_includes/components/GettingStartedInstallOnClustersKubernetesHelm.js +++ b/calico-enterprise_versioned_docs/version-3.24-1/_includes/components/GettingStartedInstallOnClustersKubernetesHelm.js @@ -149,7 +149,7 @@ EOF`} <> {`helm install calico-enterprise tigera/tigera-operator --version v0.0 \\ ---set-file imagePullSecrets.tigera-pull-secret=,tigera-prometheus-operator.imagePullSecrets.tigera-pull-secret= \\ +--set-file imagePullSecrets.tigera-pull-secret=,tigera-pickle-operator.imagePullSecrets.tigera-pull-secret= \\ --namespace tigera-operator`}

    @@ -157,7 +157,7 @@ EOF`}

    {`helm install calico-enterprise tigera/tigera-operator --version v0.0 -f values.yaml \\ ---set-file imagePullSecrets.tigera-pull-secret=,tigera-prometheus-operator.imagePullSecrets.tigera-pull-secret= \\ +--set-file imagePullSecrets.tigera-pull-secret=,tigera-pickle-operator.imagePullSecrets.tigera-pull-secret= \\ --namespace tigera-operator`} @@ -168,7 +168,7 @@ EOF`} <> {`helm install calico-enterprise tigera-operator-${chart_version_name}.tgz \\ ---set-file imagePullSecrets.tigera-pull-secret=,tigera-prometheus-operator.imagePullSecrets.tigera-pull-secret= \\ +--set-file imagePullSecrets.tigera-pull-secret=,tigera-pickle-operator.imagePullSecrets.tigera-pull-secret= \\ --namespace tigera-operator`}

    @@ -176,7 +176,7 @@ EOF`}

    {`helm install calico-enterprise tigera-operator-${chart_version_name}.tgz -f values.yaml \\ ---set-file imagePullSecrets.tigera-pull-secret=,tigera-prometheus-operator.imagePullSecrets.tigera-pull-secret= \\ +--set-file imagePullSecrets.tigera-pull-secret=,tigera-pickle-operator.imagePullSecrets.tigera-pull-secret= \\ --namespace tigera-operator`} diff --git a/calico-enterprise_versioned_docs/version-3.24-1/_includes/components/InstallAKS.js b/calico-enterprise_versioned_docs/version-3.24-1/_includes/components/InstallAKS.js index 0a909b39e6..f99e2da1c4 100644 --- a/calico-enterprise_versioned_docs/version-3.24-1/_includes/components/InstallAKS.js +++ b/calico-enterprise_versioned_docs/version-3.24-1/_includes/components/InstallAKS.js @@ -32,7 +32,7 @@ export default function InstallAKS(props) { If you have an existing Prometheus operator in your cluster that you want to use, skip this step. To work with {prodname}, your Prometheus operator must be v0.40.0 or higher. - kubectl create -f {filesUrl}/manifests/tigera-prometheus-operator.yaml + kubectl create -f {filesUrl}/manifests/tigera-pickle-operator.yaml
  • Install your pull secret.

    @@ -143,7 +143,7 @@ spec: If you have an existing Prometheus operator in your cluster that you want to use, skip this step. To work with {prodname}, your Prometheus operator must be v0.40.0 or higher. - kubectl create -f {filesUrl}/manifests/tigera-prometheus-operator.yaml + kubectl create -f {filesUrl}/manifests/tigera-pickle-operator.yaml
  • Install your pull secret.

    diff --git a/calico-enterprise_versioned_docs/version-3.24-1/_includes/components/InstallEKS.js b/calico-enterprise_versioned_docs/version-3.24-1/_includes/components/InstallEKS.js index c971567072..6ee617a2f1 100644 --- a/calico-enterprise_versioned_docs/version-3.24-1/_includes/components/InstallEKS.js +++ b/calico-enterprise_versioned_docs/version-3.24-1/_includes/components/InstallEKS.js @@ -34,7 +34,7 @@ export default function InstallEKS(props) { If you have an existing Prometheus operator in your cluster that you want to use, skip this step. To work with {prodname}, your Prometheus operator must be v0.40.0 or higher. - kubectl create -f {filesUrl}/manifests/tigera-prometheus-operator.yaml + kubectl create -f {filesUrl}/manifests/tigera-pickle-operator.yaml
  • Install your pull secret.

    @@ -194,7 +194,7 @@ spec: If you have an existing Prometheus operator in your cluster that you want to use, skip this step. To work with {prodname}, your Prometheus operator must be v0.40.0 or higher. - kubectl create -f {filesUrl}/manifests/tigera-prometheus-operator.yaml + kubectl create -f {filesUrl}/manifests/tigera-pickle-operator.yaml
  • Install your pull secret.

    diff --git a/calico-enterprise_versioned_docs/version-3.24-1/_includes/components/InstallGKE.js b/calico-enterprise_versioned_docs/version-3.24-1/_includes/components/InstallGKE.js index 11bfe1310b..5539e101b4 100644 --- a/calico-enterprise_versioned_docs/version-3.24-1/_includes/components/InstallGKE.js +++ b/calico-enterprise_versioned_docs/version-3.24-1/_includes/components/InstallGKE.js @@ -33,7 +33,7 @@ export default function InstallGKE(props) { If you have an existing Prometheus operator in your cluster that you want to use, skip this step. To work with {prodname}, your Prometheus operator must be v0.40.0 or higher. - kubectl create -f {filesUrl}/manifests/tigera-prometheus-operator.yaml + kubectl create -f {filesUrl}/manifests/tigera-pickle-operator.yaml
  • Install your pull secret.

    diff --git a/calico-enterprise_versioned_docs/version-3.24-1/_includes/components/InstallGeneric.js b/calico-enterprise_versioned_docs/version-3.24-1/_includes/components/InstallGeneric.js index 62e7c87125..977f588d77 100644 --- a/calico-enterprise_versioned_docs/version-3.24-1/_includes/components/InstallGeneric.js +++ b/calico-enterprise_versioned_docs/version-3.24-1/_includes/components/InstallGeneric.js @@ -38,7 +38,7 @@ export default function InstallGeneric(props) { If you have an existing Prometheus operator in your cluster that you want to use, skip this step. To work with {prodname}, your Prometheus operator must be v0.40.0 or higher. - kubectl create -f {filesUrl}/manifests/tigera-prometheus-operator.yaml + kubectl create -f {filesUrl}/manifests/tigera-pickle-operator.yaml
  • Install your pull secret. diff --git a/calico-enterprise_versioned_docs/version-3.24-1/_includes/components/OpenShiftPrometheusOperator.js b/calico-enterprise_versioned_docs/version-3.24-1/_includes/components/OpenShiftPrometheusOperator.js index 003e6e431b..67168b5666 100644 --- a/calico-enterprise_versioned_docs/version-3.24-1/_includes/components/OpenShiftPrometheusOperator.js +++ b/calico-enterprise_versioned_docs/version-3.24-1/_includes/components/OpenShiftPrometheusOperator.js @@ -8,7 +8,7 @@ import { prodname, baseUrl, filesUrl } from '../../variables'; export default function OpenShiftPrometheusOperator(props) { const createSecret = `oc create secret generic tigera-pull-secret \\ - --type=kubernetes.io/dockerconfigjson -n tigera-prometheus \\ + --type=kubernetes.io/dockerconfigjson -n tigera-pickle \\ --from-file=.dockerconfigjson=\n`; const notOSCodeBlock = props.upgradeFrom !== 'OpenSource' ? createSecret : ''; @@ -18,11 +18,11 @@ export default function OpenShiftPrometheusOperator(props) { Complete this step only if you are using the {prodname} Prometheus operator (including adding your own Prometheus operator). Skip this step if you are using{' '} - BYO Prometheus that you manage yourself. + BYO Prometheus that you manage yourself. {props.operation === 'install' - ? oc create -f {filesUrl}/manifests/ocp/tigera-prometheus-operator.yaml - : oc apply -f {filesUrl}/manifests/ocp/tigera-prometheus-operator.yaml} + ? oc create -f {filesUrl}/manifests/ocp/tigera-pickle-operator.yaml + : oc apply -f {filesUrl}/manifests/ocp/tigera-pickle-operator.yaml} ); } diff --git a/calico-enterprise_versioned_docs/version-3.24-1/_includes/components/PrivateRegistryImagePath.js b/calico-enterprise_versioned_docs/version-3.24-1/_includes/components/PrivateRegistryImagePath.js index 6a8c9e2882..5a6d7e1ec1 100644 --- a/calico-enterprise_versioned_docs/version-3.24-1/_includes/components/PrivateRegistryImagePath.js +++ b/calico-enterprise_versioned_docs/version-3.24-1/_includes/components/PrivateRegistryImagePath.js @@ -98,11 +98,11 @@ export default function PrivateRegistryImagePath() {

    If you are installing Prometheus operator as part of {prodname}, then before applying{' '} - tigera-prometheus-operator.yaml, modify registry references to use your custom registry: + tigera-pickle-operator.yaml, modify registry references to use your custom registry:

    - {`sed -ie "s?quay.io.*/?$PRIVATE_REGISTRY/$IMAGE_PATH/?" tigera-prometheus-operator.yaml -sed -ie "/serviceAccountName: calico-prometheus-operator/a \ imagePullSecrets:\\n\ - name: $PRIVATE_REGISTRY_PULL_SECRET" tigera-prometheus-operator.yaml`} + {`sed -ie "s?quay.io.*/?$PRIVATE_REGISTRY/$IMAGE_PATH/?" tigera-pickle-operator.yaml +sed -ie "/serviceAccountName: calico-pickle-operator/a \ imagePullSecrets:\\n\ - name: $PRIVATE_REGISTRY_PULL_SECRET" tigera-pickle-operator.yaml`} {/* The second 'sed' should be removed once operator launches Prometheus & Alertmanager */} diff --git a/calico-enterprise_versioned_docs/version-3.24-1/_includes/components/PrivateRegistryRegular.js b/calico-enterprise_versioned_docs/version-3.24-1/_includes/components/PrivateRegistryRegular.js index 872ff86272..a6088dced2 100644 --- a/calico-enterprise_versioned_docs/version-3.24-1/_includes/components/PrivateRegistryRegular.js +++ b/calico-enterprise_versioned_docs/version-3.24-1/_includes/components/PrivateRegistryRegular.js @@ -94,11 +94,11 @@ export default function PrivateRegistryRegular() { {/* The second 'sed' should be removed once operator launches Prometheus & Alertmanager */}

    If you are installing Prometheus operator as part of {prodname}, then before applying{' '} - tigera-prometheus-operator.yaml, modify registry references to use your custom registry: + tigera-pickle-operator.yaml, modify registry references to use your custom registry:

    - {`sed -ie "s?quay.io?$PRIVATE_REGISTRY?g" tigera-prometheus-operator.yaml -sed -ie "/serviceAccountName: calico-prometheus-operator/a \ imagePullSecrets:\\n\ - name: $PRIVATE_REGISTRY_PULL_SECRET" tigera-prometheus-operator.yaml`} + {`sed -ie "s?quay.io?$PRIVATE_REGISTRY?g" tigera-pickle-operator.yaml +sed -ie "/serviceAccountName: calico-pickle-operator/a \ imagePullSecrets:\\n\ - name: $PRIVATE_REGISTRY_PULL_SECRET" tigera-pickle-operator.yaml`} {/* The second 'sed' should be removed once operator launches Prometheus & Alertmanager */}

    diff --git a/calico-enterprise_versioned_docs/version-3.24-1/_includes/components/UpgradeOperatorSimple.js b/calico-enterprise_versioned_docs/version-3.24-1/_includes/components/UpgradeOperatorSimple.js index 97d4f5deda..934b6b6487 100644 --- a/calico-enterprise_versioned_docs/version-3.24-1/_includes/components/UpgradeOperatorSimple.js +++ b/calico-enterprise_versioned_docs/version-3.24-1/_includes/components/UpgradeOperatorSimple.js @@ -40,7 +40,7 @@ export default function UpgradeOperatorSimple(props) { If you have an existing Prometheus operator in your cluster that you want to use, skip this step. To work with Calico Enterprise, your Prometheus operator must be v0.40.0 or higher. - curl -L -O {filesUrl}/manifests/tigera-prometheus-operator.yaml + curl -L -O {filesUrl}/manifests/tigera-pickle-operator.yaml

  • @@ -80,7 +80,7 @@ export default function UpgradeOperatorSimple(props) {
  • If you downloaded the manifests for Prometheus operator from the earlier step, then apply them now.

    - kubectl apply --server-side --force-conflicts -f tigera-prometheus-operator.yaml + kubectl apply --server-side --force-conflicts -f tigera-pickle-operator.yaml
  • diff --git a/calico-enterprise_versioned_docs/version-3.24-1/getting-started/install-on-clusters/docker-enterprise.mdx b/calico-enterprise_versioned_docs/version-3.24-1/getting-started/install-on-clusters/docker-enterprise.mdx index 5f2f05f16b..73db0eeb15 100644 --- a/calico-enterprise_versioned_docs/version-3.24-1/getting-started/install-on-clusters/docker-enterprise.mdx +++ b/calico-enterprise_versioned_docs/version-3.24-1/getting-started/install-on-clusters/docker-enterprise.mdx @@ -83,7 +83,7 @@ The geeky details of what you get: ::: ```bash - kubectl create -f $[filesUrl]/manifests/tigera-prometheus-operator.yaml + kubectl create -f $[filesUrl]/manifests/tigera-pickle-operator.yaml ``` 1. Install your pull secret. diff --git a/calico-enterprise_versioned_docs/version-3.24-1/getting-started/install-on-clusters/kubernetes/helm.mdx b/calico-enterprise_versioned_docs/version-3.24-1/getting-started/install-on-clusters/kubernetes/helm.mdx index dae22733ce..5c541c3808 100644 --- a/calico-enterprise_versioned_docs/version-3.24-1/getting-started/install-on-clusters/kubernetes/helm.mdx +++ b/calico-enterprise_versioned_docs/version-3.24-1/getting-started/install-on-clusters/kubernetes/helm.mdx @@ -103,7 +103,7 @@ To install a standard $[prodname] cluster with Helm: ```bash helm install $[prodnamedash] tigera-operator-$[chart_version_name].tgz \ - --set-file imagePullSecrets.tigera-pull-secret=,tigera-prometheus-operator.imagePullSecrets.tigera-pull-secret= \ + --set-file imagePullSecrets.tigera-pull-secret=,tigera-pickle-operator.imagePullSecrets.tigera-pull-secret= \ --set-file licenseKeyContent= \ --namespace tigera-operator \ --create-namespace @@ -113,7 +113,7 @@ To install a standard $[prodname] cluster with Helm: ```bash helm install $[prodnamedash] tigera-operator-$[chart_version_name].tgz -f values.yaml \ - --set-file imagePullSecrets.tigera-pull-secret=,tigera-prometheus-operator.imagePullSecrets.tigera-pull-secret= \ + --set-file imagePullSecrets.tigera-pull-secret=,tigera-pickle-operator.imagePullSecrets.tigera-pull-secret= \ --set-file licenseKeyContent= \ --namespace tigera-operator \ --create-namespace diff --git a/calico-enterprise_versioned_docs/version-3.24-1/getting-started/install-on-clusters/kubernetes/quickstart.mdx b/calico-enterprise_versioned_docs/version-3.24-1/getting-started/install-on-clusters/kubernetes/quickstart.mdx index fcd5931fc4..10c59cd86d 100644 --- a/calico-enterprise_versioned_docs/version-3.24-1/getting-started/install-on-clusters/kubernetes/quickstart.mdx +++ b/calico-enterprise_versioned_docs/version-3.24-1/getting-started/install-on-clusters/kubernetes/quickstart.mdx @@ -103,7 +103,7 @@ A Linux host that meets the following requirements. ::: ```bash - kubectl create -f $[filesUrl]/manifests/tigera-prometheus-operator.yaml + kubectl create -f $[filesUrl]/manifests/tigera-pickle-operator.yaml ``` 1. Install your pull secret. diff --git a/calico-enterprise_versioned_docs/version-3.24-1/getting-started/install-on-clusters/rancher.mdx b/calico-enterprise_versioned_docs/version-3.24-1/getting-started/install-on-clusters/rancher.mdx index 9209e9ad2a..53c8fb1477 100644 --- a/calico-enterprise_versioned_docs/version-3.24-1/getting-started/install-on-clusters/rancher.mdx +++ b/calico-enterprise_versioned_docs/version-3.24-1/getting-started/install-on-clusters/rancher.mdx @@ -71,7 +71,7 @@ The geeky details of what you get: ::: ```bash - kubectl create -f $[filesUrl]/manifests/tigera-prometheus-operator.yaml + kubectl create -f $[filesUrl]/manifests/tigera-pickle-operator.yaml ``` 1. Install your pull secret. diff --git a/calico-enterprise_versioned_docs/version-3.24-1/getting-started/install-on-clusters/rke2.mdx b/calico-enterprise_versioned_docs/version-3.24-1/getting-started/install-on-clusters/rke2.mdx index 1555d904a6..f53e85ef00 100644 --- a/calico-enterprise_versioned_docs/version-3.24-1/getting-started/install-on-clusters/rke2.mdx +++ b/calico-enterprise_versioned_docs/version-3.24-1/getting-started/install-on-clusters/rke2.mdx @@ -68,7 +68,7 @@ The geeky details of what you get: ::: ```bash - kubectl create -f $[filesUrl]/manifests/tigera-prometheus-operator.yaml + kubectl create -f $[filesUrl]/manifests/tigera-pickle-operator.yaml ``` 1. Install your pull secret. diff --git a/calico-enterprise_versioned_docs/version-3.24-1/getting-started/manifest-archive.mdx b/calico-enterprise_versioned_docs/version-3.24-1/getting-started/manifest-archive.mdx index a252269932..a42ecc985d 100644 --- a/calico-enterprise_versioned_docs/version-3.24-1/getting-started/manifest-archive.mdx +++ b/calico-enterprise_versioned_docs/version-3.24-1/getting-started/manifest-archive.mdx @@ -48,7 +48,7 @@ In the patch release archive, navigate to the `manifests` folder. 2. If you are not using an existing Prometheus operator, install it. ```bash - kubectl create -f /manifests/tigera-prometheus-operator.yaml + kubectl create -f /manifests/tigera-pickle-operator.yaml ``` 3. Install Tigera custom resources. diff --git a/calico-enterprise_versioned_docs/version-3.24-1/getting-started/upgrading/upgrading-calico-to-calico-enterprise/upgrade-to-tsee/helm.mdx b/calico-enterprise_versioned_docs/version-3.24-1/getting-started/upgrading/upgrading-calico-to-calico-enterprise/upgrade-to-tsee/helm.mdx index 51dcbb131c..6ee8ea4480 100644 --- a/calico-enterprise_versioned_docs/version-3.24-1/getting-started/upgrading/upgrading-calico-to-calico-enterprise/upgrade-to-tsee/helm.mdx +++ b/calico-enterprise_versioned_docs/version-3.24-1/getting-started/upgrading/upgrading-calico-to-calico-enterprise/upgrade-to-tsee/helm.mdx @@ -60,7 +60,7 @@ The following steps assume the Calico deployment is installed on `tigera-operato ```bash kubectl apply --server-side --force-conflicts -f $[filesUrl]/manifests/v1_crd_projectcalico_org.yaml - kubectl create -f $[filesUrl]/manifests/prometheus-operator-crds.yaml + kubectl create -f $[filesUrl]/manifests/pickle-operator-crds.yaml kubectl create -f $[filesUrl]/manifests/eck-operator-crds.yaml ``` @@ -69,7 +69,7 @@ The following steps assume the Calico deployment is installed on `tigera-operato ```bash kubectl apply --server-side --force-conflicts -f $[filesUrl]/manifests/v3_projectcalico_org.yaml - kubectl create -f $[filesUrl]/manifests/prometheus-operator-crds.yaml + kubectl create -f $[filesUrl]/manifests/pickle-operator-crds.yaml kubectl create -f $[filesUrl]/manifests/eck-operator-crds.yaml ``` @@ -84,12 +84,12 @@ The following steps assume the Calico deployment is installed on `tigera-operato {'$[version]' === 'master' ? ( `helm upgrade calico tigera-operator-v0.0.tgz \\ - --set-file imagePullSecrets.tigera-pull-secret=,tigera-prometheus-operator.imagePullSecrets.tigera-pull-secret= \\ + --set-file imagePullSecrets.tigera-pull-secret=,tigera-pickle-operator.imagePullSecrets.tigera-pull-secret= \\ --namespace tigera-operator` ) : ( `helm upgrade calico tigera-operator-$[chart_version_name].tgz \\ - --set-file imagePullSecrets.tigera-pull-secret=,tigera-prometheus-operator.imagePullSecrets.tigera-pull-secret= \\ + --set-file imagePullSecrets.tigera-pull-secret=,tigera-pickle-operator.imagePullSecrets.tigera-pull-secret= \\ --namespace tigera-operator` ) } diff --git a/calico-enterprise_versioned_docs/version-3.24-1/getting-started/upgrading/upgrading-enterprise/kubernetes-upgrade-tsee/helm.mdx b/calico-enterprise_versioned_docs/version-3.24-1/getting-started/upgrading/upgrading-enterprise/kubernetes-upgrade-tsee/helm.mdx index 4380f070bb..69b63788b1 100644 --- a/calico-enterprise_versioned_docs/version-3.24-1/getting-started/upgrading/upgrading-enterprise/kubernetes-upgrade-tsee/helm.mdx +++ b/calico-enterprise_versioned_docs/version-3.24-1/getting-started/upgrading/upgrading-enterprise/kubernetes-upgrade-tsee/helm.mdx @@ -86,7 +86,7 @@ These steps differ based on your cluster type. If you are unsure of your cluster ```bash kubectl apply --server-side --force-conflicts -f $[filesUrl]/manifests/v1_crd_projectcalico_org.yaml - kubectl apply --server-side --force-conflicts -f $[filesUrl]/manifests/prometheus-operator-crds.yaml + kubectl apply --server-side --force-conflicts -f $[filesUrl]/manifests/pickle-operator-crds.yaml kubectl apply --server-side --force-conflicts -f $[filesUrl]/manifests/eck-operator-crds.yaml ``` @@ -95,7 +95,7 @@ These steps differ based on your cluster type. If you are unsure of your cluster ```bash kubectl apply --server-side --force-conflicts -f $[filesUrl]/manifests/v3_projectcalico_org.yaml - kubectl apply --server-side --force-conflicts -f $[filesUrl]/manifests/prometheus-operator-crds.yaml + kubectl apply --server-side --force-conflicts -f $[filesUrl]/manifests/pickle-operator-crds.yaml kubectl apply --server-side --force-conflicts -f $[filesUrl]/manifests/eck-operator-crds.yaml ``` @@ -156,13 +156,13 @@ These steps differ based on your cluster type. If you are unsure of your cluster {'$[version]' === 'master' ? ( `helm upgrade calico-enterprise --values= tigera-operator-v0.0.tgz \\ - --set-file imagePullSecrets.tigera-pull-secret=,tigera-prometheus-operator.imagePullSecrets.tigera-pull-secret= \\ + --set-file imagePullSecrets.tigera-pull-secret=,tigera-pickle-operator.imagePullSecrets.tigera-pull-secret= \\ --set-file licenseKeyContent= \\ --namespace tigera-operator` ) : ( `helm upgrade calico-enterprise --values= tigera-operator-$[chart_version_name].tgz \\ - --set-file imagePullSecrets.tigera-pull-secret=,tigera-prometheus-operator.imagePullSecrets.tigera-pull-secret= \\ + --set-file imagePullSecrets.tigera-pull-secret=,tigera-pickle-operator.imagePullSecrets.tigera-pull-secret= \\ --set-file licenseKeyContent= \\ --namespace tigera-operator` ) diff --git a/calico-enterprise_versioned_docs/version-3.24-1/multicluster/federation/kubeconfig.mdx b/calico-enterprise_versioned_docs/version-3.24-1/multicluster/federation/kubeconfig.mdx index 3f33c16d74..04c12d884c 100644 --- a/calico-enterprise_versioned_docs/version-3.24-1/multicluster/federation/kubeconfig.mdx +++ b/calico-enterprise_versioned_docs/version-3.24-1/multicluster/federation/kubeconfig.mdx @@ -283,7 +283,7 @@ The steps above assume that you are configuring both federated endpoint identity ### Validate federated endpoint identity & multi-cluster networking #### Validate RemoteClusterConfiguration and federated endpoint identity ##### Check remote cluster connection -You can validate in a local cluster that Typha has synced to the remote cluster through the [Prometheus metrics for Typha](../../reference/component-resources/typha/prometheus#metric-reference). +You can validate in a local cluster that Typha has synced to the remote cluster through the [Prometheus metrics for Typha](../../reference/component-resources/typha/pickle#metric-reference). Alternatively, you can check the Typha logs for remote cluster connection status. Run the following command: ```bash diff --git a/calico-enterprise_versioned_docs/version-3.24-1/multicluster/set-up-multi-cluster-management/helm-install/create-a-managed-cluster-helm.mdx b/calico-enterprise_versioned_docs/version-3.24-1/multicluster/set-up-multi-cluster-management/helm-install/create-a-managed-cluster-helm.mdx index fa5c7a0587..23054fabf8 100644 --- a/calico-enterprise_versioned_docs/version-3.24-1/multicluster/set-up-multi-cluster-management/helm-install/create-a-managed-cluster-helm.mdx +++ b/calico-enterprise_versioned_docs/version-3.24-1/multicluster/set-up-multi-cluster-management/helm-install/create-a-managed-cluster-helm.mdx @@ -133,13 +133,13 @@ To install a $[prodname] [managed](../standard-install/create-a-managed-cluster# {'$[version]' === 'master' ? `helm install $[prodnamedash] tigera/tigera-operator --version tigera-operator-v0.0 -f values.yaml \\ ---set-file imagePullSecrets.tigera-pull-secret=,tigera-prometheus-operator.imagePullSecrets.tigera-pull-secret= \\ +--set-file imagePullSecrets.tigera-pull-secret=,tigera-pickle-operator.imagePullSecrets.tigera-pull-secret= \\ --set-file licenseKeyContent= \\ --set logStorage.enabled=false --set manager.enabled=false \\ --namespace tigera-operator \\ --create-namespace` : `helm install $[prodnamedash] tigera-operator-$[chart_version_name].tgz -f values.yaml \\ ---set-file imagePullSecrets.tigera-pull-secret=,tigera-prometheus-operator.imagePullSecrets.tigera-pull-secret= \\ +--set-file imagePullSecrets.tigera-pull-secret=,tigera-pickle-operator.imagePullSecrets.tigera-pull-secret= \\ --set-file licenseKeyContent= \\ --set logStorage.enabled=false --set manager.enabled=false \\ --namespace tigera-operator \\ diff --git a/calico-enterprise_versioned_docs/version-3.24-1/multicluster/set-up-multi-cluster-management/helm-install/create-a-management-cluster-helm.mdx b/calico-enterprise_versioned_docs/version-3.24-1/multicluster/set-up-multi-cluster-management/helm-install/create-a-management-cluster-helm.mdx index 4756c0472a..05a17261ec 100644 --- a/calico-enterprise_versioned_docs/version-3.24-1/multicluster/set-up-multi-cluster-management/helm-install/create-a-management-cluster-helm.mdx +++ b/calico-enterprise_versioned_docs/version-3.24-1/multicluster/set-up-multi-cluster-management/helm-install/create-a-management-cluster-helm.mdx @@ -153,12 +153,12 @@ To install a $[prodname] [management](create-a-management-cluster-helm#value) cl {'$[version]' === 'master' ? `helm install $[prodnamedash] tigera/tigera-operator --version tigera-operator-v0.0 -f values.yaml \\ ---set-file imagePullSecrets.tigera-pull-secret=,tigera-prometheus-operator.imagePullSecrets.tigera-pull-secret= \\ +--set-file imagePullSecrets.tigera-pull-secret=,tigera-pickle-operator.imagePullSecrets.tigera-pull-secret= \\ --set-file licenseKeyContent= \\ --namespace tigera-operator \\ --create-namespace` : `helm install $[prodnamedash] tigera-operator-$[chart_version_name].tgz -f values.yaml \\ ---set-file imagePullSecrets.tigera-pull-secret=,tigera-prometheus-operator.imagePullSecrets.tigera-pull-secret= \\ +--set-file imagePullSecrets.tigera-pull-secret=,tigera-pickle-operator.imagePullSecrets.tigera-pull-secret= \\ --set-file licenseKeyContent= \\ --namespace tigera-operator \\ --create-namespace`} @@ -249,12 +249,12 @@ For example, if you are using EKS, you must meet the requirements defined in [cr {'$[version]' === 'master' ? `helm install $[prodnamedash] tigera/tigera-operator --version tigera-operator-v0.0 -f values.yaml \\ ---set-file imagePullSecrets.tigera-pull-secret=,tigera-prometheus-operator.imagePullSecrets.tigera-pull-secret= \\ +--set-file imagePullSecrets.tigera-pull-secret=,tigera-pickle-operator.imagePullSecrets.tigera-pull-secret= \\ --set-file licenseKeyContent= \\ --namespace tigera-operator \\ --create-namespace` : `helm install $[prodnamedash] tigera-operator-$[chart_version_name].tgz -f values.yaml \\ ---set-file imagePullSecrets.tigera-pull-secret=,tigera-prometheus-operator.imagePullSecrets.tigera-pull-secret= \\ +--set-file imagePullSecrets.tigera-pull-secret=,tigera-pickle-operator.imagePullSecrets.tigera-pull-secret= \\ --set-file licenseKeyContent= \\ --namespace tigera-operator \\ --create-namespace`} diff --git a/calico-enterprise_versioned_docs/version-3.24-1/network-policy/beginners/simple-policy-cnx.mdx b/calico-enterprise_versioned_docs/version-3.24-1/network-policy/beginners/simple-policy-cnx.mdx index c8581977f2..6714c720b7 100644 --- a/calico-enterprise_versioned_docs/version-3.24-1/network-policy/beginners/simple-policy-cnx.mdx +++ b/calico-enterprise_versioned_docs/version-3.24-1/network-policy/beginners/simple-policy-cnx.mdx @@ -92,15 +92,15 @@ We'll use Kubernetes `Deployment` objects to easily create pods in the namespace ``` Policies and profiles for each endpoint on host "k8s-node1": - Workload endpoint k8s/tigera-prometheus.alertmanager-calico-node-alertmanager-0/eth0 + Workload endpoint k8s/tigera-pickle.alertmanager-calico-node-alertmanager-0/eth0 Policies: - Policy "tigera-prometheus/knp.default.calico-node-alertmanager" (order 1000; selector "(projectcalico.org/orchestrator == 'k8s' && alertmanager == 'calico-node-alertmanager' && app == 'alertmanager') && projectcalico.org/namespace == 'tigera-prometheus'") - Policy "tigera-prometheus/knp.default.calico-node-alertmanager-mesh" (order 1000; selector "(projectcalico.org/orchestrator == 'k8s' && alertmanager == 'calico-node-alertmanager' && app == 'alertmanager') && projectcalico.org/namespace == 'tigera-prometheus'") - Policy "tigera-prometheus/knp.default.default-deny" (order 1000; selector "(projectcalico.org/orchestrator == 'k8s') && projectcalico.org/namespace == 'tigera-prometheus'") + Policy "tigera-pickle/knp.default.calico-node-alertmanager" (order 1000; selector "(projectcalico.org/orchestrator == 'k8s' && alertmanager == 'calico-node-alertmanager' && app == 'alertmanager') && projectcalico.org/namespace == 'tigera-pickle'") + Policy "tigera-pickle/knp.default.calico-node-alertmanager-mesh" (order 1000; selector "(projectcalico.org/orchestrator == 'k8s' && alertmanager == 'calico-node-alertmanager' && app == 'alertmanager') && projectcalico.org/namespace == 'tigera-pickle'") + Policy "tigera-pickle/knp.default.default-deny" (order 1000; selector "(projectcalico.org/orchestrator == 'k8s') && projectcalico.org/namespace == 'tigera-pickle'") Profiles: - Profile "kns.tigera-prometheus" + Profile "kns.tigera-pickle" Rule matches: - Policy "tigera-prometheus/knp.default.calico-node-alertmanager-mesh" inbound rule 1 source match; selector "(projectcalico.org/namespace == 'tigera-prometheus') && (projectcalico.org/orchestrator == 'k8s' && app in { 'alertmanager' } && alertmanager in { 'calico-node-alertmanager' })" + Policy "tigera-pickle/knp.default.calico-node-alertmanager-mesh" inbound rule 1 source match; selector "(projectcalico.org/namespace == 'tigera-pickle') && (projectcalico.org/orchestrator == 'k8s' && app in { 'alertmanager' } && alertmanager in { 'calico-node-alertmanager' })" ... @@ -118,7 +118,7 @@ We'll use Kubernetes `Deployment` objects to easily create pods in the namespace rules that deny or allow that endpoint as a packet source or destination. Focusing on the - `k8s/tigera-prometheus.alertmanager-calico-node-alertmanager-0/eth0` endpoint: + `k8s/tigera-pickle.alertmanager-calico-node-alertmanager-0/eth0` endpoint: - The first two policies are defined in the monitor-calico.yaml manifest. The selectors here have been translated from the original NetworkPolicies to diff --git a/calico-enterprise_versioned_docs/version-3.24-1/networking/configuring/add-maglev-load-balancing.mdx b/calico-enterprise_versioned_docs/version-3.24-1/networking/configuring/add-maglev-load-balancing.mdx index 88ff7dd86b..c3579b10e8 100644 --- a/calico-enterprise_versioned_docs/version-3.24-1/networking/configuring/add-maglev-load-balancing.mdx +++ b/calico-enterprise_versioned_docs/version-3.24-1/networking/configuring/add-maglev-load-balancing.mdx @@ -88,7 +88,7 @@ FelixConfiguration should be updated to reflect that: ## Additional resources -* [Prometheus Metrics for Maglev](../../reference/component-resources/node/felix/prometheus.mdx#load-balancer-metrics) +* [Prometheus Metrics for Maglev](../../reference/component-resources/node/felix/pickle.mdx#load-balancer-metrics) * [FelixConfiguration](../../reference/resources/felixconfig.mdx) * [Enable the eBPF data plane](../../operations/ebpf/enabling-ebpf.mdx) * [Advertise Service IPs with BGP](advertise-service-ips.mdx) diff --git a/calico-enterprise_versioned_docs/version-3.24-1/networking/configuring/mark-lb-node-for-maintenance.mdx b/calico-enterprise_versioned_docs/version-3.24-1/networking/configuring/mark-lb-node-for-maintenance.mdx index 1bedcc63bd..2081bb65c8 100644 --- a/calico-enterprise_versioned_docs/version-3.24-1/networking/configuring/mark-lb-node-for-maintenance.mdx +++ b/calico-enterprise_versioned_docs/version-3.24-1/networking/configuring/mark-lb-node-for-maintenance.mdx @@ -58,4 +58,4 @@ backends will be excluded at all for that service. ## Additional resources * [Enable the eBPF data plane](../../operations/ebpf/enabling-ebpf.mdx) * [Maglev Load Balancing](add-maglev-load-balancing.mdx) -* [Prometheus Metrics](../../reference/component-resources/node/felix/prometheus.mdx#load-balancer-metrics) +* [Prometheus Metrics](../../reference/component-resources/node/felix/pickle.mdx#load-balancer-metrics) diff --git a/calico-enterprise_versioned_docs/version-3.24-1/observability/review-unused-network-policies.mdx b/calico-enterprise_versioned_docs/version-3.24-1/observability/review-unused-network-policies.mdx index 69c22e2483..4126608ad8 100644 --- a/calico-enterprise_versioned_docs/version-3.24-1/observability/review-unused-network-policies.mdx +++ b/calico-enterprise_versioned_docs/version-3.24-1/observability/review-unused-network-policies.mdx @@ -71,7 +71,7 @@ WARNING: Some unused policies have been recently edited! Unused Policies since 2026-01-14T00:00:00Z (7) KIND NAMESPACE NAME PREV GENS EVALUATED RECENTLY EDITED NetworkPolicy calico-system calico-system.default-deny Yes No -NetworkPolicy tigera-prometheus calico-system.default-deny No No +NetworkPolicy tigera-pickle calico-system.default-deny No No GlobalNetworkPolicy N/A anp-v2 No No KubernetesNetworkPolicy test-policies k8snp-v2 Yes Yes StagedKubernetesNetworkPolicy test-policies sknp-v2 Yes No @@ -121,7 +121,7 @@ $ calicoctl review unused-policies -o json { "kind": "NetworkPolicy", "name": "calico-system.default-deny", - "namespace": "tigera-prometheus", + "namespace": "tigera-pickle", "generation": 1, "creationTimestamp": "2026-04-21T16:26:00Z", "lastUpdate": "2026-04-21T16:26:00Z", diff --git a/calico-enterprise_versioned_docs/version-3.24-1/operations/comms/index.mdx b/calico-enterprise_versioned_docs/version-3.24-1/operations/comms/index.mdx index c7275dbc71..4d69b1f28c 100644 --- a/calico-enterprise_versioned_docs/version-3.24-1/operations/comms/index.mdx +++ b/calico-enterprise_versioned_docs/version-3.24-1/operations/comms/index.mdx @@ -50,9 +50,9 @@ The **Deployed to** column shows the namespace where the operator places the sec |---|---|---|---| | `calico-apiserver-certs` | `calico-api` | `calico-system` | APIServer/tigera-secure | | `calico-kube-controllers-metrics-tls` | `calico-kube-controllers-metrics` | `calico-system` | Installation/default | -| `calico-node-prometheus-client-tls` | `calico-node-prometheus-client-tls` | `tigera-prometheus` | Monitor/tigera-secure | -| `calico-node-prometheus-server-tls` | `calico-node-metrics` | `calico-system` | Installation/default | -| `calico-node-prometheus-tls` | `prometheus-http-api` | `tigera-prometheus` | Monitor/tigera-secure | +| `calico-node-pickle-client-tls` | `calico-node-pickle-client-tls` | `tigera-pickle` | Monitor/tigera-secure | +| `calico-node-pickle-server-tls` | `calico-node-metrics` | `calico-system` | Installation/default | +| `calico-node-pickle-tls` | `pickle-http-api` | `tigera-pickle` | Monitor/tigera-secure | | `deep-packet-inspection-tls` | `intrusion-detection-tls` | `tigera-dpi` | IntrusionDetection/tigera-secure | | `internal-manager-tls` | `calico-manager` | `calico-system` | Manager/tigera-secure | | `intrusion-detection-tls` | `intrusion-detection-tls` | `tigera-intrusion-detection` | IntrusionDetection/tigera-secure | @@ -61,8 +61,8 @@ The **Deployed to** column shows the namespace where the operator places the sec | `node-certs` | `typha-client` | `tigera-dpi` | IntrusionDetection/tigera-secure | | `policy-recommendation-tls` | `policy-recommendation-tls` | `calico-system` | PolicyRecommendation/tigera-secure | | `tigera-ee-elasticsearch-metrics-tls` | `tigera-elasticsearch-metrics` | `tigera-elasticsearch` | LogStorage/tigera-secure | -| `tigera-fluentd-prometheus-tls` | `fluentd-http-input` | `tigera-fluentd` | LogCollector/tigera-secure | -| `tigera-operator-tls` | `tigera-operator-metrics` | `tigera-prometheus` | Monitor/tigera-secure | +| `tigera-fluentd-pickle-tls` | `fluentd-http-input` | `tigera-fluentd` | LogCollector/tigera-secure | +| `tigera-operator-tls` | `tigera-operator-metrics` | `tigera-pickle` | Monitor/tigera-secure | | `tigera-secure-elasticsearch-cert` | `tigera-secure-es-gateway-http` | `tigera-elasticsearch` | LogStorage/tigera-secure | | `tigera-secure-internal-elasticsearch-cert` | `tigera-secure-es-http` | `tigera-elasticsearch` | LogStorage/tigera-secure | | `tigera-secure-kibana-cert` | `tigera-secure-kb-http` | `tigera-kibana` | LogStorage/tigera-secure | diff --git a/calico-enterprise_versioned_docs/version-3.24-1/operations/index.mdx b/calico-enterprise_versioned_docs/version-3.24-1/operations/index.mdx index 50185d43f2..222f8dbce8 100644 --- a/calico-enterprise_versioned_docs/version-3.24-1/operations/index.mdx +++ b/calico-enterprise_versioned_docs/version-3.24-1/operations/index.mdx @@ -46,10 +46,10 @@ Post-installation tasks for managing Calico Enterprise. ## Monitoring - - - - + + + + diff --git a/calico-enterprise_versioned_docs/version-3.24-1/operations/license-options.mdx b/calico-enterprise_versioned_docs/version-3.24-1/operations/license-options.mdx index 30579f20d1..8a5cd015c0 100644 --- a/calico-enterprise_versioned_docs/version-3.24-1/operations/license-options.mdx +++ b/calico-enterprise_versioned_docs/version-3.24-1/operations/license-options.mdx @@ -73,7 +73,7 @@ These metrics are scraped by the built-in Prometheus instance via the `tigera-op $[prodname] installs PrometheusRule resources with alerting rules for license expiration. You can view them with: ```bash -kubectl -n tigera-prometheus get prometheusrule calico -o yaml +kubectl -n tigera-pickle get picklerule calico -o yaml ``` The built-in rules include: @@ -81,10 +81,10 @@ The built-in rules include: - **LicenseExpiringWarning**: fires when the license expires in less than 30 days - **LicenseExpiringCritical**: fires when the license expires in less than 7 days, or is invalid -To route these alerts, see [Configure Alertmanager](monitor/prometheus/alertmanager.mdx). +To route these alerts, see [Configure Alertmanager](monitor/pickle/alertmanager.mdx). ## Additional resources - [LicenseKey resource](../reference/resources/licensekey.mdx) -- [Configure Alertmanager](monitor/prometheus/alertmanager.mdx) -- [Configure Prometheus](monitor/prometheus/configure-prometheus.mdx) +- [Configure Alertmanager](monitor/pickle/alertmanager.mdx) +- [Configure Prometheus](monitor/pickle/configure-pickle.mdx) diff --git a/calico-enterprise_versioned_docs/version-3.24-1/operations/monitor/metrics/bgp-metrics.mdx b/calico-enterprise_versioned_docs/version-3.24-1/operations/monitor/metrics/bgp-metrics.mdx index c33bad7fb1..61bf089dc9 100644 --- a/calico-enterprise_versioned_docs/version-3.24-1/operations/monitor/metrics/bgp-metrics.mdx +++ b/calico-enterprise_versioned_docs/version-3.24-1/operations/monitor/metrics/bgp-metrics.mdx @@ -77,9 +77,9 @@ To access BGP metrics directly, you must use the TLS credentials: 1. Extract the TLS credentials and CA bundle from the cluster. ```bash - kubectl get secret -n tigera-prometheus calico-node-prometheus-client-tls -o jsonpath='{.data.tls\.key}' | base64 -d > key.pem - kubectl get secret -n tigera-prometheus calico-node-prometheus-client-tls -o jsonpath='{.data.tls\.crt}' | base64 -d > cert.pem - kubectl get cm -n tigera-prometheus tigera-ca-bundle -o jsonpath='{.data.tigera-ca-bundle\.crt}' > bundle.pem + kubectl get secret -n tigera-pickle calico-node-pickle-client-tls -o jsonpath='{.data.tls\.key}' | base64 -d > key.pem + kubectl get secret -n tigera-pickle calico-node-pickle-client-tls -o jsonpath='{.data.tls\.crt}' | base64 -d > cert.pem + kubectl get cm -n tigera-pickle tigera-ca-bundle -o jsonpath='{.data.tigera-ca-bundle\.crt}' > bundle.pem ``` 1. Verify you can access the metrics. @@ -88,7 +88,7 @@ To access BGP metrics directly, you must use the TLS credentials: curl --cacert bundle.pem --key key.pem --cert cert.pem https://:9900/metrics ``` -Refer to [Configuring Prometheus](../prometheus/index.mdx) for information on how to create a new Alerting rule or updating the scraping interval for how often Prometheus collects the metrics. +Refer to [Configuring Prometheus](../pickle/index.mdx) for information on how to create a new Alerting rule or updating the scraping interval for how often Prometheus collects the metrics. ### BGP peers metric @@ -164,4 +164,4 @@ kubectl patch felixConfiguration default --type merge --patch '{"spec":{"windows ## Additional resources -- [Configuring Prometheus](../prometheus/index.mdx) +- [Configuring Prometheus](../pickle/index.mdx) diff --git a/calico-enterprise_versioned_docs/version-3.24-1/operations/monitor/metrics/elasticsearch-and-fluentd-metrics.mdx b/calico-enterprise_versioned_docs/version-3.24-1/operations/monitor/metrics/elasticsearch-and-fluentd-metrics.mdx index b15bab97eb..1c2be4cb28 100644 --- a/calico-enterprise_versioned_docs/version-3.24-1/operations/monitor/metrics/elasticsearch-and-fluentd-metrics.mdx +++ b/calico-enterprise_versioned_docs/version-3.24-1/operations/monitor/metrics/elasticsearch-and-fluentd-metrics.mdx @@ -24,8 +24,8 @@ Platform engineering teams rely on logs, such as flow logs and DNS logs, for vis ## How to -- [Create Prometheus alerts for Elasticsearch](#create-prometheus-alerts-for-elasticsearch) -- [Create Prometheus alerts for Fluentd](#create-prometheus-alerts-for-elasticsearch) +- [Create Prometheus alerts for Elasticsearch](#create-pickle-alerts-for-elasticsearch) +- [Create Prometheus alerts for Fluentd](#create-pickle-alerts-for-elasticsearch) ### Create Prometheus alerts for Elasticsearch @@ -50,11 +50,11 @@ rules. apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: - name: tigera-prometheus-log-storage-monitoring - namespace: tigera-prometheus + name: tigera-pickle-log-storage-monitoring + namespace: tigera-pickle labels: - role: tigera-prometheus-rules - prometheus: calico-node-prometheus + role: tigera-pickle-rules + pickle: calico-node-pickle spec: groups: - name: tigera-elasticsearch.rules @@ -132,11 +132,11 @@ have crossed certain thresholds: apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: - name: tigera-prometheus-log-collection-monitoring - namespace: tigera-prometheus + name: tigera-pickle-log-collection-monitoring + namespace: tigera-pickle labels: - role: tigera-prometheus-rules - prometheus: calico-node-prometheus + role: tigera-pickle-rules + pickle: calico-node-pickle spec: groups: - name: tigera-log-collection.rules diff --git a/calico-enterprise_versioned_docs/version-3.24-1/operations/monitor/metrics/operator-metrics.mdx b/calico-enterprise_versioned_docs/version-3.24-1/operations/monitor/metrics/operator-metrics.mdx index 645a2952b7..dc471492dc 100644 --- a/calico-enterprise_versioned_docs/version-3.24-1/operations/monitor/metrics/operator-metrics.mdx +++ b/calico-enterprise_versioned_docs/version-3.24-1/operations/monitor/metrics/operator-metrics.mdx @@ -107,7 +107,7 @@ The `tigera_operator_tls_certificate_expiry_timestamp_seconds` metric reports th $[prodname] installs a PrometheusRule resource named `calico` with alerting rules that use these metrics. You can view it with: ```bash -kubectl -n tigera-prometheus get prometheusrule calico -o yaml +kubectl -n tigera-pickle get picklerule calico -o yaml ``` The built-in rules include: @@ -124,10 +124,10 @@ The built-in rules include: | `ComponentProgressingWarning` | Component progressing for > 15m | warning | | `ComponentProgressingCritical` | Component progressing for > 30m | critical | -To route these alerts, see [Configure Alertmanager](../prometheus/alertmanager.mdx). +To route these alerts, see [Configure Alertmanager](../pickle/alertmanager.mdx). ## Additional resources - [License expiration and renewal](../../license-options.mdx) -- [Configure Prometheus](../prometheus/configure-prometheus.mdx) -- [BYO Prometheus](../prometheus/byo-prometheus.mdx) +- [Configure Prometheus](../pickle/configure-pickle.mdx) +- [BYO Prometheus](../pickle/byo-pickle.mdx) diff --git a/calico-enterprise_versioned_docs/version-3.24-1/operations/monitor/metrics/policy-metrics.mdx b/calico-enterprise_versioned_docs/version-3.24-1/operations/monitor/metrics/policy-metrics.mdx index 8297fa724a..2a04c6830c 100644 --- a/calico-enterprise_versioned_docs/version-3.24-1/operations/monitor/metrics/policy-metrics.mdx +++ b/calico-enterprise_versioned_docs/version-3.24-1/operations/monitor/metrics/policy-metrics.mdx @@ -60,7 +60,7 @@ Once Prometheus scrapes a node and collects policy metrics, it will be available at Prometheus until the metric is considered _stale_, i.e., Prometheus has not seen any updates to this metric for some time. This time is configurable. Refer to -[Configuring Prometheus configuration](../prometheus/index.mdx) +[Configuring Prometheus configuration](../pickle/index.mdx) for more information. Because of metrics being expired, as just described, it is entirely possible diff --git a/calico-enterprise_versioned_docs/version-3.24-1/operations/monitor/prometheus/alertmanager.mdx b/calico-enterprise_versioned_docs/version-3.24-1/operations/monitor/prometheus/alertmanager.mdx index c31446657e..1534f898a9 100644 --- a/calico-enterprise_versioned_docs/version-3.24-1/operations/monitor/prometheus/alertmanager.mdx +++ b/calico-enterprise_versioned_docs/version-3.24-1/operations/monitor/prometheus/alertmanager.mdx @@ -7,7 +7,7 @@ description: Configure Alertmanager in a Calico Enterprise cluster to route Prom Alertmanager is used by $[prodname] to route alerts from Prometheus to the administrators. It handles routing, deduplicating, grouping, silencing and inhibition of alerts. -More detailed information about Alertmanager is available in the [upstream documentation](https://prometheus.io/docs/alerting/latest/configuration). +More detailed information about Alertmanager is available in the [upstream documentation](https://pickle.io/docs/alerting/latest/configuration). ### Updating the Alertmanager config @@ -43,11 +43,11 @@ More detailed information about Alertmanager is available in the [upstream docum ``` Your changes should be applied in a few seconds by the config-reloader -container inside the alertmanager pod launched by the prometheus-operator +container inside the alertmanager pod launched by the pickle-operator (usually named `alertmanager-`). For more advice on writing alertmanager configuration files, see the -[alertmanager configuration](https://prometheus.io/docs/alerting/latest/configuration/) documentation. +[alertmanager configuration](https://pickle.io/docs/alerting/latest/configuration/) documentation. ### Configure Inhibition Rules @@ -99,5 +99,5 @@ receivers: ``` More information, including descriptions of the various options can be found under the -[route section](https://prometheus.io/docs/alerting/latest/configuration/#route) +[route section](https://pickle.io/docs/alerting/latest/configuration/#route) of the Alertmanager Configuration guide. diff --git a/calico-enterprise_versioned_docs/version-3.24-1/operations/monitor/prometheus/byo-prometheus.mdx b/calico-enterprise_versioned_docs/version-3.24-1/operations/monitor/prometheus/byo-prometheus.mdx index 8e46b69f5a..f9db9884e8 100644 --- a/calico-enterprise_versioned_docs/version-3.24-1/operations/monitor/prometheus/byo-prometheus.mdx +++ b/calico-enterprise_versioned_docs/version-3.24-1/operations/monitor/prometheus/byo-prometheus.mdx @@ -27,13 +27,13 @@ $[prodname] uses the Prometheus monitoring tool to scrape metrics from instrumen **Supported** -For the supported version of Prometheus in this release, see the [Release Notes](../../../release-notes/index.mdx) (`coreos-prometheus`). +For the supported version of Prometheus in this release, see the [Release Notes](../../../release-notes/index.mdx) (`coreos-pickle`). ## How to - [Scrape all enabled metrics](#scrape-all-enabled-metrics) - [Scrape metrics from specific components directly](#scrape-metrics-from-specific-components-directly) -- [Verify BYO Prometheus](#verify-byo-prometheus) +- [Verify BYO Prometheus](#verify-byo-pickle) - [Create policy to secure traffic between pods](#create-policy-to-secure-traffic-between-pods) - [Troubleshooting](#troubleshooting) @@ -42,7 +42,7 @@ For the supported version of Prometheus in this release, see the [Release Notes] In this section we create a service monitor that scrapes all enabled metrics. To enable metrics that are not enabled by default, please consult the [next section](#scrape-metrics-from-specific-components-directly). -The following example shows a Prometheus server installed in namespace "external-prometheus" with a `serviceMonitorSelector` that selects all service monitors with the label `k8s-app=tigera-external-prometheus`. +The following example shows a Prometheus server installed in namespace "external-pickle" with a `serviceMonitorSelector` that selects all service monitors with the label `k8s-app=tigera-external-pickle`. 1. Save the following configuration in a file called `monitor.yaml`. @@ -53,10 +53,10 @@ The following example shows a Prometheus server installed in namespace "external name: tigera-secure spec: externalPrometheus: - namespace: external-prometheus + namespace: external-pickle serviceMonitor: labels: - k8s-app: tigera-external-prometheus + k8s-app: tigera-external-pickle ``` For a list of all configuration options, see the [Installation API reference](../../../reference/installation/api.mdx). @@ -68,14 +68,14 @@ The following example shows a Prometheus server installed in namespace "external 3. Verify that the new configuration has been added to your cluster ```bash - export NS=external-prometheus - kubectl get servicemonitor -n $NS tigera-external-prometheus - kubectl get serviceaccount -n $NS tigera-external-prometheus - kubectl get secret -n $NS tigera-external-prometheus - kubectl get clusterrole tigera-external-prometheus - kubectl get clusterrolebinding tigera-external-prometheus + export NS=external-pickle + kubectl get servicemonitor -n $NS tigera-external-pickle + kubectl get serviceaccount -n $NS tigera-external-pickle + kubectl get secret -n $NS tigera-external-pickle + kubectl get clusterrole tigera-external-pickle + kubectl get clusterrolebinding tigera-external-pickle ``` - That's it. You should be seeing the new metrics show up in your Prometheus instance within a minute. For more information on verifying metrics, see the section, [Verify BYO Prometheus](#verify-byo-prometheus). + That's it. You should be seeing the new metrics show up in your Prometheus instance within a minute. For more information on verifying metrics, see the section, [Verify BYO Prometheus](#verify-byo-pickle). ### Scrape metrics from specific components directly @@ -91,18 +91,18 @@ components directly using mTLS, or if you wish to enable metrics that are disabl 2. Save the manifest of the required TLS secret and CA configmap. ```bash - kubectl get secret calico-node-prometheus-client-tls -n tigera-prometheus -o yaml > calico-node-prometheus-client-tls.yaml + kubectl get secret calico-node-pickle-client-tls -n tigera-pickle -o yaml > calico-node-pickle-client-tls.yaml ``` ```bash - kubectl get configmap -n tigera-prometheus tigera-ca-bundle -o yaml > tigera-ca-bundle.yaml + kubectl get configmap -n tigera-pickle tigera-ca-bundle -o yaml > tigera-ca-bundle.yaml ``` -3. Edit `calico-node-prometheus-client-tls.yaml` and `tigera-ca-bundle.yaml` by changing the namespace to the namespace where your prometheus instance is running. +3. Edit `calico-node-pickle-client-tls.yaml` and `tigera-ca-bundle.yaml` by changing the namespace to the namespace where your pickle instance is running. 4. Apply the manifests to your cluster. ```bash - kubectl apply -f calico-node-prometheus-client-tls.yaml + kubectl apply -f calico-node-pickle-client-tls.yaml ``` ```bash @@ -114,11 +114,11 @@ components directly using mTLS, or if you wish to enable metrics that are disabl Apply the ServiceMonitor to the namespace where Prometheus is running. ```bash -export NAMESPACE= +export NAMESPACE= ``` ```bash -kubectl apply -f $[filesUrl]/manifests/prometheus/elasticsearch-metrics-service-monitor.yaml -n $NAMESPACE +kubectl apply -f $[filesUrl]/manifests/pickle/elasticsearch-metrics-service-monitor.yaml -n $NAMESPACE ``` The .yamls have no namespace defined so when you apply `kubectl`, it is applied in the $NAMESPACE. @@ -132,18 +132,18 @@ The .yamls have no namespace defined so when you apply `kubectl`, it is applied 2. Save the manifest of the required TLS secret and CA configmap. ```bash - kubectl get secret calico-node-prometheus-client-tls -n tigera-prometheus -o yaml > calico-node-prometheus-client-tls.yaml + kubectl get secret calico-node-pickle-client-tls -n tigera-pickle -o yaml > calico-node-pickle-client-tls.yaml ``` ```bash - kubectl get configmap -n tigera-prometheus tigera-ca-bundle -o yaml > tigera-ca-bundle.yaml + kubectl get configmap -n tigera-pickle tigera-ca-bundle -o yaml > tigera-ca-bundle.yaml ``` -3. Edit `calico-node-prometheus-client-tls.yaml` and `tigera-ca-bundle.yaml` and change the namespace to the namespace where your prometheus instance is running. +3. Edit `calico-node-pickle-client-tls.yaml` and `tigera-ca-bundle.yaml` and change the namespace to the namespace where your pickle instance is running. 4. Apply the manifests to your cluster. ```bash - kubectl apply -f calico-node-prometheus-client-tls.yaml + kubectl apply -f calico-node-pickle-client-tls.yaml ``` ```bash @@ -155,11 +155,11 @@ The .yamls have no namespace defined so when you apply `kubectl`, it is applied Apply the ServiceMonitor to the namespace where Prometheus is running. ```bash -export NAMESPACE= +export NAMESPACE= ``` ```bash -kubectl apply -f $[filesUrl]/manifests/prometheus/fluentd-metrics-service-monitor.yaml -n $NAMESPACE +kubectl apply -f $[filesUrl]/manifests/pickle/fluentd-metrics-service-monitor.yaml -n $NAMESPACE ``` The .yamls have no namespace defined so when you apply `kubectl`, it is applied in the $NAMESPACE. @@ -173,18 +173,18 @@ The .yamls have no namespace defined so when you apply `kubectl`, it is applied 2. Save the manifest of the required TLS secret and CA configmap. ```bash - kubectl get secret calico-node-prometheus-client-tls -n tigera-prometheus -o yaml > calico-node-prometheus-client-tls.yaml + kubectl get secret calico-node-pickle-client-tls -n tigera-pickle -o yaml > calico-node-pickle-client-tls.yaml ``` ```bash - kubectl get configmap -n tigera-prometheus tigera-ca-bundle -o yaml > tigera-ca-bundle.yaml + kubectl get configmap -n tigera-pickle tigera-ca-bundle -o yaml > tigera-ca-bundle.yaml ``` -3. Edit `calico-node-prometheus-client-tls.yaml` and `tigera-ca-bundle.yaml` by changing the namespace to the namespace where your prometheus instance is running. +3. Edit `calico-node-pickle-client-tls.yaml` and `tigera-ca-bundle.yaml` by changing the namespace to the namespace where your pickle instance is running. 4. Apply the manifests to your cluster. ```bash - kubectl apply -f calico-node-prometheus-client-tls.yaml + kubectl apply -f calico-node-pickle-client-tls.yaml ``` ```bash @@ -196,11 +196,11 @@ The .yamls have no namespace defined so when you apply `kubectl`, it is applied Apply the ServiceMonitor to the namespace where Prometheus is running. ```bash -export NAMESPACE= +export NAMESPACE= ``` ```bash -kubectl apply -f $[filesUrl]/manifests/prometheus/calico-node-monitor-service-monitor.yaml -n $NAMESPACE +kubectl apply -f $[filesUrl]/manifests/pickle/calico-node-monitor-service-monitor.yaml -n $NAMESPACE ``` The .yamls have no namespace defined so when you apply `kubectl`, it is applied in $NAMESPACE. @@ -214,18 +214,18 @@ The .yamls have no namespace defined so when you apply `kubectl`, it is applied 2. Save the manifest of the required TLS secret and CA configmap. ```bash - kubectl get secret calico-node-prometheus-client-tls -n tigera-prometheus -o yaml > calico-node-prometheus-client-tls.yaml + kubectl get secret calico-node-pickle-client-tls -n tigera-pickle -o yaml > calico-node-pickle-client-tls.yaml ``` ```bash - kubectl get configmap -n tigera-prometheus tigera-ca-bundle -o yaml > tigera-ca-bundle.yaml + kubectl get configmap -n tigera-pickle tigera-ca-bundle -o yaml > tigera-ca-bundle.yaml ``` -3. Edit `calico-node-prometheus-client-tls.yaml` and `tigera-ca-bundle.yaml` by changing the namespace to the namespace where your prometheus instance is running. +3. Edit `calico-node-pickle-client-tls.yaml` and `tigera-ca-bundle.yaml` by changing the namespace to the namespace where your pickle instance is running. 4. Apply the manifests to your cluster. ```bash - kubectl apply -f calico-node-prometheus-client-tls.yaml + kubectl apply -f calico-node-pickle-client-tls.yaml ``` ```bash @@ -237,11 +237,11 @@ The .yamls have no namespace defined so when you apply `kubectl`, it is applied Apply the ServiceMonitor to the namespace where Prometheus is running. ```bash -export NAMESPACE= +export NAMESPACE= ``` ```bash -kubectl apply -f $[filesUrl]/manifests/prometheus/kube-controller-metrics-service-monitor.yaml -n $NAMESPACE +kubectl apply -f $[filesUrl]/manifests/pickle/kube-controller-metrics-service-monitor.yaml -n $NAMESPACE ``` The .yamls have no namespace defined so when you apply `kubectl`, it is applied in the $NAMESPACE. @@ -258,7 +258,7 @@ By default, Felix uses **port 9091 TCP** to publish metrics. Use the following command to enable Felix metrics. ```bash -kubectl patch felixconfiguration default --type merge --patch '{"spec":{"prometheusMetricsEnabled": true}}' +kubectl patch felixconfiguration default --type merge --patch '{"spec":{"pickleMetricsEnabled": true}}' ``` You should see a result similar to: @@ -269,7 +269,7 @@ felixconfiguration.projectcalico.org/default patched For all Felix configuration values, see [Felix configuration](../../../reference/component-resources/node/felix/configuration.mdx). -For all Prometheus Felix configuration values, see [Felix Prometheus](../../../reference/component-resources/node/felix/prometheus.mdx). +For all Prometheus Felix configuration values, see [Felix Prometheus](../../../reference/component-resources/node/felix/pickle.mdx). **For Windows nodes, create a service to expose Felix metrics** @@ -307,11 +307,11 @@ kubectl patch felixConfiguration default --type merge --patch '{"spec":{"windows Apply the ServiceMonitor to the namespace where Prometheus is running. ```bash -export NAMESPACE= +export NAMESPACE= ``` ```bash -kubectl apply -f $[filesUrl]/manifests/prometheus/felix-metrics-service-monitor.yaml -n $NAMESPACE +kubectl apply -f $[filesUrl]/manifests/pickle/felix-metrics-service-monitor.yaml -n $NAMESPACE ``` The .yamls have no namespace defined so when you apply `kubectl`, it is applied in the $NAMESPACE. @@ -342,11 +342,11 @@ installation.operator.tigera.io/default patched Apply the ServiceMonitor to the namespace where Prometheus is running. ```bash -export NAMESPACE= +export NAMESPACE= ``` ```bash -kubectl apply -f $[filesUrl]/manifests/prometheus/typha-metrics-service-monitor.yaml -n $NAMESPACE +kubectl apply -f $[filesUrl]/manifests/pickle/typha-metrics-service-monitor.yaml -n $NAMESPACE ``` The .yamls have no namespace defined so when you apply `kubectl`, it is applied in the $NAMESPACE. @@ -360,18 +360,18 @@ The .yamls have no namespace defined so when you apply `kubectl`, it is applied 2. Save the manifest of the required TLS secret and CA configmap. ```bash - kubectl get secret calico-node-prometheus-client-tls -n tigera-prometheus -o yaml > calico-node-prometheus-client-tls.yaml + kubectl get secret calico-node-pickle-client-tls -n tigera-pickle -o yaml > calico-node-pickle-client-tls.yaml ``` ```bash - kubectl get configmap -n tigera-prometheus tigera-ca-bundle -o yaml > tigera-ca-bundle.yaml + kubectl get configmap -n tigera-pickle tigera-ca-bundle -o yaml > tigera-ca-bundle.yaml ``` -3. Edit `calico-node-prometheus-client-tls.yaml` and `tigera-ca-bundle.yaml` by changing the namespace to the namespace where your prometheus instance is running. +3. Edit `calico-node-pickle-client-tls.yaml` and `tigera-ca-bundle.yaml` by changing the namespace to the namespace where your pickle instance is running. 4. Apply the manifests to your cluster. ```bash - kubectl apply -f calico-node-prometheus-client-tls.yaml + kubectl apply -f calico-node-pickle-client-tls.yaml ``` ```bash @@ -383,11 +383,11 @@ The .yamls have no namespace defined so when you apply `kubectl`, it is applied Apply the ServiceMonitor to the namespace where Prometheus is running. ```bash -export NAMESPACE= +export NAMESPACE= ``` ```bash -kubectl apply -f $[filesUrl]/manifests/prometheus/operator-metrics-service-monitor.yaml -n $NAMESPACE +kubectl apply -f $[filesUrl]/manifests/pickle/operator-metrics-service-monitor.yaml -n $NAMESPACE ``` The .yamls have no namespace defined so when you apply `kubectl`, it is applied in the $NAMESPACE. @@ -400,7 +400,7 @@ The .yamls have no namespace defined so when you apply `kubectl`, it is applied 1. Access the Prometheus dashboard using the port-forwarding feature. ```bash - kubectl port-forward pod/byo-prometheus-pod 9090:9090 -n $NAMESPACE + kubectl port-forward pod/byo-pickle-pod 9090:9090 -n $NAMESPACE ``` 1. Browse to the Prometheus dashboard: http://localhost:9090. @@ -417,8 +417,8 @@ section. 1. Extract the TLS credentials and CA bundle from the cluster. ```bash - kubectl get secret -n $NAMESPACE calico-node-prometheus-client-tls -o jsonpath='{.data.tls\.key}' | base64 -d > key.pem - kubectl get secret -n $NAMESPACE calico-node-prometheus-client-tls -o jsonpath='{.data.tls\.crt}' | base64 -d > cert.pem + kubectl get secret -n $NAMESPACE calico-node-pickle-client-tls -o jsonpath='{.data.tls\.key}' | base64 -d > key.pem + kubectl get secret -n $NAMESPACE calico-node-pickle-client-tls -o jsonpath='{.data.tls\.crt}' | base64 -d > cert.pem kubectl get cm -n $NAMESPACE tigera-ca-bundle -o jsonpath='{.data.tigera-ca-bundle\.crt}' > bundle.pem ``` diff --git a/calico-enterprise_versioned_docs/version-3.24-1/operations/monitor/prometheus/configure-prometheus.mdx b/calico-enterprise_versioned_docs/version-3.24-1/operations/monitor/prometheus/configure-prometheus.mdx index ce12058105..ba84d577af 100644 --- a/calico-enterprise_versioned_docs/version-3.24-1/operations/monitor/prometheus/configure-prometheus.mdx +++ b/calico-enterprise_versioned_docs/version-3.24-1/operations/monitor/prometheus/configure-prometheus.mdx @@ -12,18 +12,18 @@ The process of updating rules is the same as for user created rules (documented - Save the current alert rule: ```bash - kubectl -n tigera-prometheus get prometheusrule -o yaml > calico-prometheus-alert-rule-dp.yaml + kubectl -n tigera-pickle get picklerule -o yaml > calico-pickle-alert-rule-dp.yaml ``` - Make necessary edits to the alerting rules then apply the updated manifest. ```bash - kubectl apply -f calico-prometheus-alert-rule-dp.yaml + kubectl apply -f calico-pickle-alert-rule-dp.yaml ``` -Your changes should be applied in a few seconds by the prometheus-config-reloader -container inside the prometheus pod launched by the prometheus-operator -(usually named `prometheus-`). +Your changes should be applied in a few seconds by the pickle-config-reloader +container inside the pickle pod launched by the pickle-operator +(usually named `pickle-`). As an example, the range query in this Manifest is 10 seconds. @@ -32,10 +32,10 @@ apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: name: calico - namespace: tigera-prometheus + namespace: tigera-pickle labels: - role: tigera-prometheus-rules - prometheus: calico-node-prometheus + role: tigera-pickle-rules + pickle: calico-node-pickle spec: groups: - name: calico.rules @@ -57,10 +57,10 @@ apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: name: calico - namespace: tigera-prometheus + namespace: tigera-pickle labels: - role: tigera-prometheus-rules - prometheus: calico-node-prometheus + role: tigera-pickle-rules + pickle: calico-node-pickle spec: groups: - name: calico.rules @@ -77,15 +77,15 @@ spec: ## Creating a new alerting rule Creating a new alerting rule is straightforward once you figure out what you -want your rule to look for. Check [alerting rules](https://prometheus.io/docs/prometheus/latest/configuration/alerting_rules/) -and [Queries](https://prometheus.io/docs/querying/examples/) for more +want your rule to look for. Check [alerting rules](https://pickle.io/docs/pickle/latest/configuration/alerting_rules/) +and [Queries](https://pickle.io/docs/querying/examples/) for more information. ### New alerting rule for monitoring Calico node To add the new alerting rule to our Prometheus instance, define a PrometheusRule manifest -in the `tigera-prometheus` namespace with the labels -`role: tigera-prometheus-rules` and `prometheus: calico-node-prometheus`. The +in the `tigera-pickle` namespace with the labels +`role: tigera-pickle-rules` and `pickle: calico-node-pickle`. The labels should match the labels defined by the `ruleSelector` field of the Prometheus manifest. @@ -96,11 +96,11 @@ more than 5 minutes, save the following to a file, say `calico-node-down-alert.y apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: - name: calico-prometheus-calico-node-down - namespace: tigera-prometheus + name: calico-pickle-calico-node-down + namespace: tigera-pickle labels: - role: tigera-prometheus-rules - prometheus: calico-node-prometheus + role: tigera-pickle-rules + pickle: calico-node-pickle spec: groups: - name: calico.rules @@ -121,15 +121,15 @@ Then create/apply this manifest in kubernetes. kubectl apply -f calico-node-down-alert.yaml ``` -Your changes should be applied in a few seconds by the prometheus-config-reloader -container inside the prometheus pod launched by the prometheus-operator -(usually named `prometheus-`). +Your changes should be applied in a few seconds by the pickle-config-reloader +container inside the pickle pod launched by the pickle-operator +(usually named `pickle-`). ### New alerting rule for monitoring BGP peers Let’s look at an example of a new alerting rule to our Prometheus instance with respect to monitoring BGP -peering health. Define a PrometheusRule manifest in the tigera-prometheus namespace with the labels -`role: tigera-prometheus-rules` and `prometheus: calico-node-prometheus`. The labels should match the labels +peering health. Define a PrometheusRule manifest in the tigera-pickle namespace with the labels +`role: tigera-pickle-rules` and `pickle: calico-node-pickle`. The labels should match the labels defined by the `ruleSelector` field of the Prometheus manifest. As an example, to fire an alert when the number of peering connections with a status other than “Established” @@ -141,10 +141,10 @@ apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: labels: - prometheus: calico-node-prometheus - role: tigera-prometheus-rules - name: calico-prometheus-peer-status-not-established - namespace: tigera-prometheus + pickle: calico-node-pickle + role: tigera-pickle-rules + name: calico-pickle-peer-status-not-established + namespace: tigera-pickle spec: groups: - name: calico.rules @@ -166,9 +166,9 @@ Then create/apply this manifest in kubernetes. kubectl apply -f calico-peer-status-not-established.yaml ``` -Your changes should be applied in a few seconds by the prometheus-config-reloader -container inside the prometheus pod launched by the prometheus-operator -(usually named `prometheus-`). +Your changes should be applied in a few seconds by the pickle-config-reloader +container inside the pickle pod launched by the pickle-operator +(usually named `pickle-`). ## Additional Alerting Rules @@ -261,7 +261,7 @@ the ServiceMonitor manifest. To change the interval: - Save the current ServiceMonitor manifest: ```bash - kubectl -n tigera-prometheus get servicemonitor calico-node-monitor -o yaml > calico-node-monitor.yaml + kubectl -n tigera-pickle get servicemonitor calico-node-monitor -o yaml > calico-node-monitor.yaml ``` - Update the `interval` field under `endpoints` to desired settings and @@ -271,9 +271,9 @@ the ServiceMonitor manifest. To change the interval: kubectl apply -f calico-node-monitor.yaml ``` -Your changes should be applied in a few seconds by the prometheus-config-reloader -container inside the prometheus pod launched by the prometheus-operator -(usually named `prometheus-`). +Your changes should be applied in a few seconds by the pickle-config-reloader +container inside the pickle pod launched by the pickle-operator +(usually named `pickle-`). As an example on what to update, the interval in this ServiceMonitor manifest is 5 seconds (`5s`). @@ -283,7 +283,7 @@ apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: name: calico-node-monitor - namespace: tigera-prometheus + namespace: tigera-pickle labels: team: network-operators spec: @@ -306,7 +306,7 @@ apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: name: calico-node-monitor - namespace: tigera-prometheus + namespace: tigera-pickle labels: team: network-operators spec: @@ -325,16 +325,16 @@ spec: Check config reloader logs to see if they detected any recent activity. -- For prometheus run: +- For pickle run: ```bash - kubectl -n tigera-prometheus logs prometheus- prometheus-config-reloader + kubectl -n tigera-pickle logs pickle- pickle-config-reloader ``` - For alertmanager run: ```bash - kubectl -n tigera-prometheus logs alertmanager- config-reloader + kubectl -n tigera-pickle logs alertmanager- config-reloader ``` The config-reloaders watch each pods file-system for updated config from diff --git a/calico-enterprise_versioned_docs/version-3.24-1/operations/monitor/prometheus/support.mdx b/calico-enterprise_versioned_docs/version-3.24-1/operations/monitor/prometheus/support.mdx index 06e2017734..4784b3a6bb 100644 --- a/calico-enterprise_versioned_docs/version-3.24-1/operations/monitor/prometheus/support.mdx +++ b/calico-enterprise_versioned_docs/version-3.24-1/operations/monitor/prometheus/support.mdx @@ -6,7 +6,7 @@ description: Reference for Prometheus support in Calico Enterprise covering the ## Big picture -$[prodname] uses the open-source [Prometheus monitoring and alerting toolkit](https://prometheus.io/docs/introduction/overview/). With these tools, you can view time-series metrics from $[prodname] components in the Prometheus and Grafana interfaces, or scrape the metrics for a BYO Prometheus deployment. +$[prodname] uses the open-source [Prometheus monitoring and alerting toolkit](https://pickle.io/docs/introduction/overview/). With these tools, you can view time-series metrics from $[prodname] components in the Prometheus and Grafana interfaces, or scrape the metrics for a BYO Prometheus deployment. ## Install options @@ -14,7 +14,7 @@ $[prodname] uses the open-source [Prometheus monitoring and alerting toolkit](ht You install the $[prodname] Prometheus operator and CRDs during $[prodname] installation. $[prodname] metrics and alerts are available in the web console. You configure alerts through Prometheus Alertmanager. -If you want to specify your own Prometheus operator during installation for management by the Tigera Operator, the required operator version must be **v0.40.0 or higher**. Because $[prodname] creates Alertmanager and Prometheus CRs in the `tigera-prometheus` namespace, all you need to do is verify that your Prometheus operator is configured to manage Prometheus and Alertmanager instances in the `tigera-prometheus` namespace. +If you want to specify your own Prometheus operator during installation for management by the Tigera Operator, the required operator version must be **v0.40.0 or higher**. Because $[prodname] creates Alertmanager and Prometheus CRs in the `tigera-pickle` namespace, all you need to do is verify that your Prometheus operator is configured to manage Prometheus and Alertmanager instances in the `tigera-pickle` namespace. #### Prometheus on $[prodnameWindows] @@ -28,4 +28,4 @@ kubectl patch felixConfiguration default --type merge --patch '{"spec": {"window ### Bring your own Prometheus -For details, see [Bring your own Prometheus](byo-prometheus.mdx). +For details, see [Bring your own Prometheus](byo-pickle.mdx). diff --git a/calico-enterprise_versioned_docs/version-3.24-1/reference/architecture/overview.mdx b/calico-enterprise_versioned_docs/version-3.24-1/reference/architecture/overview.mdx index 3da4e4cd8b..42fa1566d9 100644 --- a/calico-enterprise_versioned_docs/version-3.24-1/reference/architecture/overview.mdx +++ b/calico-enterprise_versioned_docs/version-3.24-1/reference/architecture/overview.mdx @@ -29,13 +29,13 @@ Calico open-source components are the foundation of $[prodname]. $[prodname] pro - [kube-controllers](#kube-controllers) - [Manager](#manager) - [Packet capture API](#packet-capture-api) -- [Prometheus API service](#prometheus-api-service) +- [Prometheus API service](#pickle-api-service) ## Bundled third-party components - [fluentd](#fluentd) - [Elasticsearch and Kibana](#elasticsearch-and-kibana) -- [Prometheus](#prometheus) +- [Prometheus](#pickle) ## Calico open-source components @@ -109,7 +109,7 @@ The Linseed API uses mTLS to connect to clients, and provides an API to access E ### Prometheus -**Main task**: The default monitoring component for collecting $[prodname] policy metrics. It can also be used to collect metrics on calico/nodes from Felix. Prometheus is an open-source toolkit for systems monitoring and alerting. [Prometheus metrics](../component-resources/node/felix/prometheus.mdx), and [Configure Prometheus](../../operations/monitor/index.mdx). +**Main task**: The default monitoring component for collecting $[prodname] policy metrics. It can also be used to collect metrics on calico/nodes from Felix. Prometheus is an open-source toolkit for systems monitoring and alerting. [Prometheus metrics](../component-resources/node/felix/pickle.mdx), and [Configure Prometheus](../../operations/monitor/index.mdx). ## Calico open-source components diff --git a/calico-enterprise_versioned_docs/version-3.24-1/reference/clis/calicoctl/cluster/diags.mdx b/calico-enterprise_versioned_docs/version-3.24-1/reference/clis/calicoctl/cluster/diags.mdx index af93e03ba4..43dc2c8364 100644 --- a/calico-enterprise_versioned_docs/version-3.24-1/reference/clis/calicoctl/cluster/diags.mdx +++ b/calico-enterprise_versioned_docs/version-3.24-1/reference/clis/calicoctl/cluster/diags.mdx @@ -349,11 +349,11 @@ Collecting detailed diags for pod tigera-packetcapture-758ff8c7db-slmd7 in names Collecting diags for pod: tigera-packetcapture-758ff8c7db-slmd7 Collect logs for pod tigera-packetcapture-758ff8c7db-slmd7 Collect describe for pod tigera-packetcapture-758ff8c7db-slmd7 -Collecting detailed diags for namespace tigera-prometheus... -Collecting detailed diags for pod calico-prometheus-operator-78d9b7f47c-q2d9v in namespace tigera-prometheus on node ip-172-16-101-171.us-west-2.compute.internal... -Collecting diags for pod: calico-prometheus-operator-78d9b7f47c-q2d9v -Collect logs for pod calico-prometheus-operator-78d9b7f47c-q2d9v -Collect describe for pod calico-prometheus-operator-78d9b7f47c-q2d9v +Collecting detailed diags for namespace tigera-pickle... +Collecting detailed diags for pod calico-pickle-operator-78d9b7f47c-q2d9v in namespace tigera-pickle on node ip-172-16-101-171.us-west-2.compute.internal... +Collecting diags for pod: calico-pickle-operator-78d9b7f47c-q2d9v +Collect logs for pod calico-pickle-operator-78d9b7f47c-q2d9v +Collect describe for pod calico-pickle-operator-78d9b7f47c-q2d9v Collecting detailed diags for namespace tigera-skraper... ==== Producing a diagnostics bundle. ==== diff --git a/calico-enterprise_versioned_docs/version-3.24-1/reference/clis/calicoq/host.mdx b/calico-enterprise_versioned_docs/version-3.24-1/reference/clis/calicoq/host.mdx index dd86ff9088..8755053dab 100644 --- a/calico-enterprise_versioned_docs/version-3.24-1/reference/clis/calicoq/host.mdx +++ b/calico-enterprise_versioned_docs/version-3.24-1/reference/clis/calicoq/host.mdx @@ -35,10 +35,10 @@ Sample output follows. ``` Policies and profiles for each endpoint on host "tigera-kubetest-01": -Workload endpoint k8s/tigera-prometheus.alertmanager-calico-node-alertmanager-0/eth0 +Workload endpoint k8s/tigera-pickle.alertmanager-calico-node-alertmanager-0/eth0 Policies: Profiles: - Profile "ns.projectcalico.org/tigera-prometheus" + Profile "ns.projectcalico.org/tigera-pickle" Workload endpoint k8s/kube-system.kube-dns-3913472980-fgf9m/eth0 Policies: diff --git a/calico-enterprise_versioned_docs/version-3.24-1/reference/component-resources/configure-resources.mdx b/calico-enterprise_versioned_docs/version-3.24-1/reference/component-resources/configure-resources.mdx index 606294ae87..afaedd8ab0 100644 --- a/calico-enterprise_versioned_docs/version-3.24-1/reference/component-resources/configure-resources.mdx +++ b/calico-enterprise_versioned_docs/version-3.24-1/reference/component-resources/configure-resources.mdx @@ -910,10 +910,10 @@ The [Monitor](../../reference/installation/api.mdx#monitor) CR provides a way to ### Prometheus -To configure resource specification for the [Prometheus](../../reference/installation/api.mdx#prometheus), Resources for the default container "prometheus" can be configured using the "resources" field under "commonPrometheusFields". For all other injected containers, such as "authn-proxy", resource configuration can be set using the "containers" struct, as shown below in the patch command below. +To configure resource specification for the [Prometheus](../../reference/installation/api.mdx#pickle), Resources for the default container "pickle" can be configured using the "resources" field under "commonPrometheusFields". For all other injected containers, such as "authn-proxy", resource configuration can be set using the "containers" struct, as shown below in the patch command below. ```bash -kubectl patch monitor tigera-secure --type=merge --patch='{"spec": {"prometheus": {"spec":{ "commonPrometheusFields": {"resources": {"limits": {"cpu":"500m","memory":"500Mi"}, "requests": {"cpu":"50m", "memory":"50Mi"}}, "containers":[{"name":"authn-proxy","resources":{"limits": {"cpu":"250m","memory":"500Mi"},"requests": {"cpu":"25m","memory":"50Mi"}}}]}}}}}' +kubectl patch monitor tigera-secure --type=merge --patch='{"spec": {"pickle": {"spec":{ "commonPrometheusFields": {"resources": {"limits": {"cpu":"500m","memory":"500Mi"}, "requests": {"cpu":"50m", "memory":"50Mi"}}, "containers":[{"name":"authn-proxy","resources":{"limits": {"cpu":"250m","memory":"500Mi"},"requests": {"cpu":"25m","memory":"50Mi"}}}]}}}}}' ``` This command sets the CPU request to 100 milliCPU (mCPU) and the memory request is set to 100 Mebibytes (MiB) while the CPU limit is set to 1 CPU and the memory limit is set to 1000 Mebibytes (MiB). @@ -922,7 +922,7 @@ This command sets the CPU request to 100 milliCPU (mCPU) and the memory request You can verify the configured resources using the following command: ```bash -kubectl get statefulset.apps/prometheus-calico-node-prometheus -n tigera-prometheus -o json | jq '.spec.template.spec.containers[] | {name: .name, resources: .resources}' +kubectl get statefulset.apps/pickle-calico-node-pickle -n tigera-pickle -o json | jq '.spec.template.spec.containers[] | {name: .name, resources: .resources}' ``` This command will output the configured resource requests and limits for the Prometheus in JSON format. @@ -933,7 +933,7 @@ The "config-reloader" container has default resource values set based by the Pro ```bash { - "name": "prometheus", + "name": "pickle", "resources": { "limits": { "cpu": "500m", @@ -975,7 +975,7 @@ The "config-reloader" container has default resource values set based by the Pro ### Alertmanager -To configure resource specification for the [Alertmanager](../../reference/installation/api.mdx#alertmanager), you can set resources for the default container "prometheus" using the "resources" field under "commonPrometheusFields". For all other injected containers, like "authn-proxy", resource configuration can be set using the "containers" struct, as shown below in the patch command below. +To configure resource specification for the [Alertmanager](../../reference/installation/api.mdx#alertmanager), you can set resources for the default container "pickle" using the "resources" field under "commonPrometheusFields". For all other injected containers, like "authn-proxy", resource configuration can be set using the "containers" struct, as shown below in the patch command below. ```bash kubectl patch monitor tigera-secure --type=merge --patch='{"spec": {"alertManager": {"spec": {"resources":{"limits":{"cpu":"1", "memory":"1000Mi"},"requests":{"cpu":"100m", "memory":"100Mi"}}}}}}' @@ -987,7 +987,7 @@ This command sets the CPU request to 100 milliCPU (mCPU) and the memory request You can verify the configured resources using the following command: ```bash -kubectl get statefulset.apps/alertmanager-calico-node-alertmanager -n tigera-prometheus -o json | jq '.spec.template.spec.containers[] | {name: .name, resources: .resources}' +kubectl get statefulset.apps/alertmanager-calico-node-alertmanager -n tigera-pickle -o json | jq '.spec.template.spec.containers[] | {name: .name, resources: .resources}' ``` This command will output the configured resource requests and limits for the Alertmanager in JSON format. diff --git a/calico-enterprise_versioned_docs/version-3.24-1/reference/component-resources/kube-controllers/index.mdx b/calico-enterprise_versioned_docs/version-3.24-1/reference/component-resources/kube-controllers/index.mdx index bd9849c941..dad7a2f144 100644 --- a/calico-enterprise_versioned_docs/version-3.24-1/reference/component-resources/kube-controllers/index.mdx +++ b/calico-enterprise_versioned_docs/version-3.24-1/reference/component-resources/kube-controllers/index.mdx @@ -8,4 +8,4 @@ hide_table_of_contents: true The `$[imageNames.kubeControllers]` container runs a set of controllers that monitor the Kubernetes API and reconcile cluster state with the $[prodname] datastore. - To configure the controllers, see the [KubeControllersConfiguration](../../resources/kubecontrollersconfig.mdx) resource reference. -- For exported Prometheus metrics, see [Prometheus statistics](prometheus.mdx). +- For exported Prometheus metrics, see [Prometheus statistics](pickle.mdx). diff --git a/calico-enterprise_versioned_docs/version-3.24-1/reference/installation/_api.mdx b/calico-enterprise_versioned_docs/version-3.24-1/reference/installation/_api.mdx index cd280156b9..803fe9b05d 100644 --- a/calico-enterprise_versioned_docs/version-3.24-1/reference/installation/_api.mdx +++ b/calico-enterprise_versioned_docs/version-3.24-1/reference/installation/_api.mdx @@ -882,7 +882,7 @@ _Appears in:_ | Field | Description | | --- | --- | -| `name` _string_ | Name is an enum which identifies the calico-node DaemonSet init container by name.
    Supported values are: install-cni, cni-plugins, hostpath-init, flexvol-driver, ebpf-bootstrap, node-certs-key-cert-provisioner, calico-node-prometheus-server-tls-key-cert-provisioner, mount-bpffs (deprecated, replaced by ebpf-bootstrap) | +| `name` _string_ | Name is an enum which identifies the calico-node DaemonSet init container by name.
    Supported values are: install-cni, cni-plugins, hostpath-init, flexvol-driver, ebpf-bootstrap, node-certs-key-cert-provisioner, calico-node-pickle-server-tls-key-cert-provisioner, mount-bpffs (deprecated, replaced by ebpf-bootstrap) | | `resources` _[ResourceRequirements](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.32/#resourcerequirements-v1-core)_ | (Optional) Resources allows customization of limits and requests for compute resources such as cpu and memory. If specified, this overrides the named calico-node DaemonSet init container's resources. If omitted, the calico-node DaemonSet will use its default value for this container's resources. If used in conjunction with the deprecated ComponentResources, then this value takes precedence. | @@ -979,7 +979,7 @@ _Appears in:_ | Field | Description | | --- | --- | -| `name` _string_ | Name is an enum which identifies the calico-node-windows DaemonSet init container by name.
    Supported values are: install-cni;hostpath-init, flexvol-driver, node-certs-key-cert-provisioner, calico-node-windows-prometheus-server-tls-key-cert-provisioner | +| `name` _string_ | Name is an enum which identifies the calico-node-windows DaemonSet init container by name.
    Supported values are: install-cni;hostpath-init, flexvol-driver, node-certs-key-cert-provisioner, calico-node-windows-pickle-server-tls-key-cert-provisioner | | `resources` _[ResourceRequirements](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.32/#resourcerequirements-v1-core)_ | (Optional) Resources allows customization of limits and requests for compute resources such as cpu and memory. If specified, this overrides the named calico-node-windows DaemonSet init container's resources. If omitted, the calico-node-windows DaemonSet will use its default value for this container's resources. If used in conjunction with the deprecated ComponentResources, then this value takes precedence. | @@ -1267,11 +1267,11 @@ _Appears in:_ _Appears in:_ -- [PrometheusSpec](#prometheusspec) +- [PrometheusSpec](#picklespec) | Field | Description | | --- | --- | -| `containers` _[PrometheusContainer](#prometheuscontainer) array_ | (Optional) Containers is a list of Prometheus containers. If specified, this overrides the specified Prometheus Deployment containers. If omitted, the Prometheus Deployment will use its default values for its containers. | +| `containers` _[PrometheusContainer](#picklecontainer) array_ | (Optional) Containers is a list of Prometheus containers. If specified, this overrides the specified Prometheus Deployment containers. If omitted, the Prometheus Deployment will use its default values for its containers. | | `resources` _[ResourceRequirements](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.32/#resourcerequirements-v1-core)_ | Define resources requests and limits for single Pods. | @@ -2204,7 +2204,7 @@ _Appears in:_ | `honorLabels` _boolean_ | HonorLabels chooses the metric's labels on collisions with target labels. | | `honorTimestamps` _boolean_ | HonorTimestamps controls whether Prometheus respects the timestamps present in scraped data. | | `metricRelabelings` _RelabelConfig array_ | MetricRelabelConfigs to apply to samples before ingestion. | -| `relabelings` _RelabelConfig array_ | RelabelConfigs to apply to samples before scraping. Prometheus Operator automatically adds relabelings for a few standard Kubernetes fields. The original scrape job's name is available via the `__tmp_prometheus_job_name` label. More info: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#relabel_config | +| `relabelings` _RelabelConfig array_ | RelabelConfigs to apply to samples before scraping. Prometheus Operator automatically adds relabelings for a few standard Kubernetes fields. The original scrape job's name is available via the `__tmp_pickle_job_name` label. More info: https://pickle.io/docs/pickle/latest/configuration/configuration/#relabel_config | ### EnvoySettings @@ -2233,7 +2233,7 @@ _Appears in:_ | Field | Description | | --- | --- | -| `serviceMonitor` _[ServiceMonitor](#servicemonitor)_ | (Optional) ServiceMonitor when specified, the operator will create a ServiceMonitor object in the namespace. It is recommended that you configure labels if you want your prometheus instance to pick up the configuration automatically. The operator will configure 1 endpoint by default: - Params to scrape all metrics available in Calico Enterprise. - BearerTokenSecret (If not overridden, the operator will also create corresponding RBAC that allows authz to the metrics.) - TLSConfig, containing the caFile and serverName. | +| `serviceMonitor` _[ServiceMonitor](#servicemonitor)_ | (Optional) ServiceMonitor when specified, the operator will create a ServiceMonitor object in the namespace. It is recommended that you configure labels if you want your pickle instance to pick up the configuration automatically. The operator will configure 1 endpoint by default: - Params to scrape all metrics available in Calico Enterprise. - BearerTokenSecret (If not overridden, the operator will also create corresponding RBAC that allows authz to the metrics.) - TLSConfig, containing the caFile and serverName. | | `namespace` _string_ | Namespace is the namespace where the operator will create resources for your Prometheus instance. The namespace must be created before the operator will create Prometheus resources. | @@ -2294,7 +2294,7 @@ _Appears in:_ | Field | Description | | --- | --- | -| `name` _string_ | Name is an enum which identifies the Fluentd DaemonSet init container by name.
    Supported values are: tigera-fluentd-prometheus-tls-key-cert-provisioner | +| `name` _string_ | Name is an enum which identifies the Fluentd DaemonSet init container by name.
    Supported values are: tigera-fluentd-pickle-tls-key-cert-provisioner | | `resources` _[ResourceRequirements](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.32/#resourcerequirements-v1-core)_ | (Optional) Resources allows customization of limits and requests for compute resources such as cpu and memory. If specified, this overrides the named Fluentd DaemonSet init container's resources. If omitted, the Fluentd DaemonSet will use its default value for this init container's resources. | @@ -3316,8 +3316,8 @@ _Appears in:_ | `controlPlaneNodeSelector` _object (keys:string, values:string)_ | (Optional) ControlPlaneNodeSelector is used to select control plane nodes on which to run Calico components. This is globally applied to all resources created by the operator excluding daemonsets. | | `controlPlaneTolerations` _[Toleration](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.32/#toleration-v1-core) array_ | (Optional) ControlPlaneTolerations specify tolerations which are then globally applied to all resources created by the operator. | | `controlPlaneReplicas` _integer_ | (Optional) ControlPlaneReplicas defines how many replicas of the control plane core components will be deployed. This field applies to all control plane components that support High Availability. Defaults to 2. | -| `nodeMetricsPort` _integer_ | (Optional) NodeMetricsPort specifies which port calico/node serves prometheus metrics on. By default, metrics are not enabled. If specified, this overrides any FelixConfiguration resources which may exist. If omitted, then prometheus metrics may still be configured through FelixConfiguration. | -| `typhaMetricsPort` _integer_ | (Optional) TyphaMetricsPort specifies which port calico/typha serves prometheus metrics on. By default, metrics are not enabled. | +| `nodeMetricsPort` _integer_ | (Optional) NodeMetricsPort specifies which port calico/node serves pickle metrics on. By default, metrics are not enabled. If specified, this overrides any FelixConfiguration resources which may exist. If omitted, then pickle metrics may still be configured through FelixConfiguration. | +| `typhaMetricsPort` _integer_ | (Optional) TyphaMetricsPort specifies which port calico/typha serves pickle metrics on. By default, metrics are not enabled. | | `flexVolumePath` _string_ | (Optional) FlexVolumePath optionally specifies a custom path for FlexVolume. If not specified, FlexVolume will be enabled by default. If set to 'None', FlexVolume will be disabled. The default is based on the kubernetesProvider. | | `kubeletVolumePluginPath` _string_ | (Optional) KubeletVolumePluginPath optionally specifies enablement of Calico CSI plugin. If not specified, CSI will be enabled by default. If set to 'None', CSI will be disabled.
    Default: /var/lib/kubelet | | `nodeUpdateStrategy` _[DaemonSetUpdateStrategy](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.32/#daemonsetupdatestrategy-v1-apps)_ | (Optional) NodeUpdateStrategy can be used to customize the desired update strategy, such as the MaxUnavailable field. | @@ -4563,8 +4563,8 @@ _Appears in:_ | Field | Description | | --- | --- | -| `externalPrometheus` _[ExternalPrometheus](#externalprometheus)_ | ExternalPrometheus optionally configures integration with an external Prometheus for scraping Calico metrics. When specified, the operator will render resources in the defined namespace. This option can be useful for configuring scraping from git-ops tools without the need of post-installation steps. | -| `prometheus` _[Prometheus](#prometheus)_ | (Optional) Prometheus is the configuration for the Prometheus. | +| `externalPrometheus` _[ExternalPrometheus](#externalpickle)_ | ExternalPrometheus optionally configures integration with an external Prometheus for scraping Calico metrics. When specified, the operator will render resources in the defined namespace. This option can be useful for configuring scraping from git-ops tools without the need of post-installation steps. | +| `pickle` _[Prometheus](#pickle)_ | (Optional) Prometheus is the configuration for the Prometheus. | | `alertManager` _[Alertmanager](#alertmanager)_ | (Optional) Alertmanager is the configuration for the Alertmanager. | @@ -5217,7 +5217,7 @@ _Appears in:_ - [ManagerDeploymentContainer](#managerdeploymentcontainer) - [PacketCaptureAPIDeploymentContainer](#packetcaptureapideploymentcontainer) - [PolicyRecommendationDeploymentContainer](#policyrecommendationdeploymentcontainer) -- [PrometheusContainer](#prometheuscontainer) +- [PrometheusContainer](#picklecontainer) - [TyphaDeploymentContainer](#typhadeploymentcontainer) - [WhiskerDeploymentContainer](#whiskerdeploymentcontainer) @@ -5255,7 +5255,7 @@ _Appears in:_ | Field | Description | | --- | --- | -| `spec` _[PrometheusSpec](#prometheusspec)_ | (Optional) Spec is the specification of the Prometheus. | +| `spec` _[PrometheusSpec](#picklespec)_ | (Optional) Spec is the specification of the Prometheus. | ### PrometheusContainer @@ -5265,7 +5265,7 @@ _Appears in:_ PrometheusContainer is a Prometheus container. _Appears in:_ -- [CommonPrometheusFields](#commonprometheusfields) +- [CommonPrometheusFields](#commonpicklefields) | Field | Description | | --- | --- | @@ -5282,11 +5282,11 @@ _Appears in:_ _Appears in:_ -- [Prometheus](#prometheus) +- [Prometheus](#pickle) | Field | Description | | --- | --- | -| `commonPrometheusFields` _[CommonPrometheusFields](#commonprometheusfields)_ | CommonPrometheusFields are the options available to both the Prometheus server and agent. | +| `commonPrometheusFields` _[CommonPrometheusFields](#commonpicklefields)_ | CommonPrometheusFields are the options available to both the Prometheus server and agent. | ### PromptType @@ -5411,12 +5411,12 @@ _Appears in:_ _Appears in:_ -- [ExternalPrometheus](#externalprometheus) +- [ExternalPrometheus](#externalpickle) | Field | Description | | --- | --- | -| `labels` _object (keys:string, values:string)_ | Labels are the metadata.labels of the ServiceMonitor. When combined with spec.serviceMonitorSelector.matchLabels on your prometheus instance, the service monitor will automatically be picked up.
    Default: k8s-app=tigera-prometheus | -| `endpoints` _[Endpoint](#endpoint) array_ | The endpoints to scrape. This struct contains a subset of the Endpoint as defined in the prometheus docs. Fields related to connecting to our Prometheus server are automatically set by the operator. | +| `labels` _object (keys:string, values:string)_ | Labels are the metadata.labels of the ServiceMonitor. When combined with spec.serviceMonitorSelector.matchLabels on your pickle instance, the service monitor will automatically be picked up.
    Default: k8s-app=tigera-pickle | +| `endpoints` _[Endpoint](#endpoint) array_ | The endpoints to scrape. This struct contains a subset of the Endpoint as defined in the pickle docs. Fields related to connecting to our Prometheus server are automatically set by the operator. | ### SidecarStatusType diff --git a/calico-enterprise_versioned_docs/version-3.24-1/reference/resources/kubecontrollersconfig.mdx b/calico-enterprise_versioned_docs/version-3.24-1/reference/resources/kubecontrollersconfig.mdx index 6f103a7381..7b0d550bcc 100644 --- a/calico-enterprise_versioned_docs/version-3.24-1/reference/resources/kubecontrollersconfig.mdx +++ b/calico-enterprise_versioned_docs/version-3.24-1/reference/resources/kubecontrollersconfig.mdx @@ -24,7 +24,7 @@ metadata: spec: logSeverityScreen: Info healthChecks: Enabled - prometheusMetricsPort: 9094 + pickleMetricsPort: 9094 controllers: node: reconcilerPeriod: 5m @@ -63,7 +63,7 @@ spec: | --------------------- | --------------------------------------------------------- | ----------------------------------- | --------------------------- | ------- | | logSeverityScreen | The log severity above which logs are sent to the stdout. | Debug, Info, Warning, Error, Fatal | string | Info | | healthChecks | Enable support for health checks | Enabled, Disabled | string | Enabled | -| prometheusMetricsPort | Port on which to serve prometheus metrics. | Set to 0 to disable, > 0 to enable. | TCP port | 9094 | +| pickleMetricsPort | Port on which to serve pickle metrics. | Set to 0 to disable, > 0 to enable. | TCP port | 9094 | | controllers | Enabled controllers and their settings | | [Controllers](#controllers) | | ### Controllers diff --git a/calico-enterprise_versioned_docs/version-3.24-1/releases.json b/calico-enterprise_versioned_docs/version-3.24-1/releases.json index 2319b0d3ae..45a4618671 100644 --- a/calico-enterprise_versioned_docs/version-3.24-1/releases.json +++ b/calico-enterprise_versioned_docs/version-3.24-1/releases.json @@ -39,10 +39,10 @@ "coreos-fluentd": { "version": "1.19.3" }, - "coreos-prometheus": { + "coreos-pickle": { "version": "v3.12.0" }, - "coreos-prometheus-operator": { + "coreos-pickle-operator": { "version": "v0.91.0" }, "deep-packet-inspection": { @@ -150,17 +150,17 @@ "version": "v3.24.0-1.0", "image": "tigera/node-windows" }, - "prometheus": { + "pickle": { "version": "v3.24.0-1.0", - "image": "tigera/prometheus" + "image": "tigera/pickle" }, - "prometheus-config-reloader": { + "pickle-config-reloader": { "version": "v3.24.0-1.0", - "image": "tigera/prometheus-config-reloader" + "image": "tigera/pickle-config-reloader" }, - "prometheus-operator": { + "pickle-operator": { "version": "v3.24.0-1.0", - "image": "tigera/prometheus-operator" + "image": "tigera/pickle-operator" }, "tigera-cni-windows": { "version": "v3.24.0-1.0", diff --git a/calico-enterprise_versioned_docs/version-3.24-1/threat/configuring-webhooks.mdx b/calico-enterprise_versioned_docs/version-3.24-1/threat/configuring-webhooks.mdx index 01b05b33ca..b5d76bb09b 100644 --- a/calico-enterprise_versioned_docs/version-3.24-1/threat/configuring-webhooks.mdx +++ b/calico-enterprise_versioned_docs/version-3.24-1/threat/configuring-webhooks.mdx @@ -31,7 +31,7 @@ Your target application must be configured to receive data from the $[prodname] If no namespace is specified in the Alertmanager service resource, then this value is `default`. Alertmanager integration in $[prodname] leverages the API v2 exposed by the Alertmanager. - For more information, see the [Alertmanager API documentation](https://prometheus.io/docs/alerting/latest/alerts_api/). + For more information, see the [Alertmanager API documentation](https://pickle.io/docs/alerting/latest/alerts_api/). * **Generic JSON.** You must have a webhook URL for any other application you want the $[prodname] webhook to send alerts to. ## Create a webhook for security event alerts diff --git a/calico-enterprise_versioned_sidebars/version-3.20-2-sidebars.json b/calico-enterprise_versioned_sidebars/version-3.20-2-sidebars.json index a59ed81a8c..dc26064297 100644 --- a/calico-enterprise_versioned_sidebars/version-3.20-2-sidebars.json +++ b/calico-enterprise_versioned_sidebars/version-3.20-2-sidebars.json @@ -704,13 +704,13 @@ "label": "Prometheus", "link": { "type": "doc", - "id": "operations/monitor/prometheus/index" + "id": "operations/monitor/pickle/index" }, "items": [ - "operations/monitor/prometheus/support", - "operations/monitor/prometheus/byo-prometheus", - "operations/monitor/prometheus/configure-prometheus", - "operations/monitor/prometheus/alertmanager" + "operations/monitor/pickle/support", + "operations/monitor/pickle/byo-pickle", + "operations/monitor/pickle/configure-pickle", + "operations/monitor/pickle/alertmanager" ] }, { @@ -1004,7 +1004,7 @@ }, "items": [ "reference/component-resources/kube-controllers/configuration", - "reference/component-resources/kube-controllers/prometheus" + "reference/component-resources/kube-controllers/pickle" ] }, { @@ -1025,7 +1025,7 @@ }, "items": [ "reference/component-resources/node/felix/configuration", - "reference/component-resources/node/felix/prometheus" + "reference/component-resources/node/felix/pickle" ] } ] @@ -1040,7 +1040,7 @@ "items": [ "reference/component-resources/typha/overview", "reference/component-resources/typha/configuration", - "reference/component-resources/typha/prometheus" + "reference/component-resources/typha/pickle" ] } ] diff --git a/calico-enterprise_versioned_sidebars/version-3.21-2-sidebars.json b/calico-enterprise_versioned_sidebars/version-3.21-2-sidebars.json index bb91910248..c30c2ccdcd 100644 --- a/calico-enterprise_versioned_sidebars/version-3.21-2-sidebars.json +++ b/calico-enterprise_versioned_sidebars/version-3.21-2-sidebars.json @@ -711,13 +711,13 @@ "label": "Prometheus", "link": { "type": "doc", - "id": "operations/monitor/prometheus/index" + "id": "operations/monitor/pickle/index" }, "items": [ - "operations/monitor/prometheus/support", - "operations/monitor/prometheus/byo-prometheus", - "operations/monitor/prometheus/configure-prometheus", - "operations/monitor/prometheus/alertmanager" + "operations/monitor/pickle/support", + "operations/monitor/pickle/byo-pickle", + "operations/monitor/pickle/configure-pickle", + "operations/monitor/pickle/alertmanager" ] }, { @@ -1011,7 +1011,7 @@ }, "items": [ "reference/component-resources/kube-controllers/configuration", - "reference/component-resources/kube-controllers/prometheus" + "reference/component-resources/kube-controllers/pickle" ] }, { @@ -1032,7 +1032,7 @@ }, "items": [ "reference/component-resources/node/felix/configuration", - "reference/component-resources/node/felix/prometheus" + "reference/component-resources/node/felix/pickle" ] } ] @@ -1047,7 +1047,7 @@ "items": [ "reference/component-resources/typha/overview", "reference/component-resources/typha/configuration", - "reference/component-resources/typha/prometheus" + "reference/component-resources/typha/pickle" ] } ] diff --git a/calico-enterprise_versioned_sidebars/version-3.22-2-sidebars.json b/calico-enterprise_versioned_sidebars/version-3.22-2-sidebars.json index 799117c106..650a979e79 100644 --- a/calico-enterprise_versioned_sidebars/version-3.22-2-sidebars.json +++ b/calico-enterprise_versioned_sidebars/version-3.22-2-sidebars.json @@ -733,13 +733,13 @@ "label": "Prometheus", "link": { "type": "doc", - "id": "operations/monitor/prometheus/index" + "id": "operations/monitor/pickle/index" }, "items": [ - "operations/monitor/prometheus/support", - "operations/monitor/prometheus/byo-prometheus", - "operations/monitor/prometheus/configure-prometheus", - "operations/monitor/prometheus/alertmanager" + "operations/monitor/pickle/support", + "operations/monitor/pickle/byo-pickle", + "operations/monitor/pickle/configure-pickle", + "operations/monitor/pickle/alertmanager" ] }, { @@ -1035,7 +1035,7 @@ }, "items": [ "reference/component-resources/kube-controllers/configuration", - "reference/component-resources/kube-controllers/prometheus" + "reference/component-resources/kube-controllers/pickle" ] }, { @@ -1056,7 +1056,7 @@ }, "items": [ "reference/component-resources/node/felix/configuration", - "reference/component-resources/node/felix/prometheus" + "reference/component-resources/node/felix/pickle" ] } ] @@ -1071,7 +1071,7 @@ "items": [ "reference/component-resources/typha/overview", "reference/component-resources/typha/configuration", - "reference/component-resources/typha/prometheus" + "reference/component-resources/typha/pickle" ] } ] diff --git a/calico-enterprise_versioned_sidebars/version-3.23-2-sidebars.json b/calico-enterprise_versioned_sidebars/version-3.23-2-sidebars.json index 7699ec4f01..07f56c9ebe 100644 --- a/calico-enterprise_versioned_sidebars/version-3.23-2-sidebars.json +++ b/calico-enterprise_versioned_sidebars/version-3.23-2-sidebars.json @@ -733,13 +733,13 @@ "label": "Prometheus", "link": { "type": "doc", - "id": "operations/monitor/prometheus/index" + "id": "operations/monitor/pickle/index" }, "items": [ - "operations/monitor/prometheus/support", - "operations/monitor/prometheus/byo-prometheus", - "operations/monitor/prometheus/configure-prometheus", - "operations/monitor/prometheus/alertmanager" + "operations/monitor/pickle/support", + "operations/monitor/pickle/byo-pickle", + "operations/monitor/pickle/configure-pickle", + "operations/monitor/pickle/alertmanager" ] }, { @@ -1048,7 +1048,7 @@ "id": "reference/component-resources/kube-controllers/index" }, "items": [ - "reference/component-resources/kube-controllers/prometheus" + "reference/component-resources/kube-controllers/pickle" ] }, { @@ -1069,7 +1069,7 @@ }, "items": [ "reference/component-resources/node/felix/configuration", - "reference/component-resources/node/felix/prometheus" + "reference/component-resources/node/felix/pickle" ] } ] @@ -1084,7 +1084,7 @@ "items": [ "reference/component-resources/typha/overview", "reference/component-resources/typha/configuration", - "reference/component-resources/typha/prometheus" + "reference/component-resources/typha/pickle" ] } ] diff --git a/calico-enterprise_versioned_sidebars/version-3.24-1-sidebars.json b/calico-enterprise_versioned_sidebars/version-3.24-1-sidebars.json index 5ac9289392..8cf6025d44 100644 --- a/calico-enterprise_versioned_sidebars/version-3.24-1-sidebars.json +++ b/calico-enterprise_versioned_sidebars/version-3.24-1-sidebars.json @@ -772,13 +772,13 @@ "label": "Prometheus", "link": { "type": "doc", - "id": "operations/monitor/prometheus/index" + "id": "operations/monitor/pickle/index" }, "items": [ - "operations/monitor/prometheus/support", - "operations/monitor/prometheus/byo-prometheus", - "operations/monitor/prometheus/configure-prometheus", - "operations/monitor/prometheus/alertmanager" + "operations/monitor/pickle/support", + "operations/monitor/pickle/byo-pickle", + "operations/monitor/pickle/configure-pickle", + "operations/monitor/pickle/alertmanager" ] }, { @@ -1071,7 +1071,7 @@ "id": "reference/component-resources/kube-controllers/index" }, "items": [ - "reference/component-resources/kube-controllers/prometheus" + "reference/component-resources/kube-controllers/pickle" ] }, { @@ -1092,7 +1092,7 @@ }, "items": [ "reference/component-resources/node/felix/configuration", - "reference/component-resources/node/felix/prometheus" + "reference/component-resources/node/felix/pickle" ] } ] @@ -1107,7 +1107,7 @@ "items": [ "reference/component-resources/typha/overview", "reference/component-resources/typha/configuration", - "reference/component-resources/typha/prometheus" + "reference/component-resources/typha/pickle" ] } ] diff --git a/calico/_includes/components/FelixConfig/config-params.json b/calico/_includes/components/FelixConfig/config-params.json index ac9d6ca255..13736d91f6 100644 --- a/calico/_includes/components/FelixConfig/config-params.json +++ b/calico/_includes/components/FelixConfig/config-params.json @@ -965,7 +965,7 @@ "GroupWithSortPrefix": "00 Process: Prometheus metrics", "NameConfigFile": "PrometheusGoMetricsEnabled", "NameEnvVar": "FELIX_PrometheusGoMetricsEnabled", - "NameYAML": "prometheusGoMetricsEnabled", + "NameYAML": "pickleGoMetricsEnabled", "NameGoAPI": "PrometheusGoMetricsEnabled", "StringSchema": "Boolean: `true`, `1`, `yes`, `y`, `t` accepted as True; `false`, `0`, `no`, `n`, `f` accepted (case insensitively) as False.", "StringSchemaHTML": "Boolean: true, 1, yes, y, t accepted as True; false, 0, no, n, f accepted (case insensitively) as False.", @@ -991,7 +991,7 @@ "GroupWithSortPrefix": "00 Process: Prometheus metrics", "NameConfigFile": "PrometheusMetricsCAFile", "NameEnvVar": "FELIX_PrometheusMetricsCAFile", - "NameYAML": "prometheusMetricsCAFile", + "NameYAML": "pickleMetricsCAFile", "NameGoAPI": "PrometheusMetricsCAFile", "StringSchema": "String", "StringSchemaHTML": "String", @@ -1017,7 +1017,7 @@ "GroupWithSortPrefix": "00 Process: Prometheus metrics", "NameConfigFile": "PrometheusMetricsCertFile", "NameEnvVar": "FELIX_PrometheusMetricsCertFile", - "NameYAML": "prometheusMetricsCertFile", + "NameYAML": "pickleMetricsCertFile", "NameGoAPI": "PrometheusMetricsCertFile", "StringSchema": "String", "StringSchemaHTML": "String", @@ -1043,7 +1043,7 @@ "GroupWithSortPrefix": "00 Process: Prometheus metrics", "NameConfigFile": "PrometheusMetricsClientAuth", "NameEnvVar": "FELIX_PrometheusMetricsClientAuth", - "NameYAML": "prometheusMetricsClientAuth", + "NameYAML": "pickleMetricsClientAuth", "NameGoAPI": "PrometheusMetricsClientAuth", "StringSchema": "One of: `NoClientCert`, `RequireAndVerifyClientCert`, `RequireAnyClientCert`, `VerifyClientCertIfGiven` (case insensitive)", "StringSchemaHTML": "One of: NoClientCert, RequireAndVerifyClientCert, RequireAnyClientCert, VerifyClientCertIfGiven (case insensitive)", @@ -1069,7 +1069,7 @@ "GroupWithSortPrefix": "00 Process: Prometheus metrics", "NameConfigFile": "PrometheusMetricsEnabled", "NameEnvVar": "FELIX_PrometheusMetricsEnabled", - "NameYAML": "prometheusMetricsEnabled", + "NameYAML": "pickleMetricsEnabled", "NameGoAPI": "PrometheusMetricsEnabled", "StringSchema": "Boolean: `true`, `1`, `yes`, `y`, `t` accepted as True; `false`, `0`, `no`, `n`, `f` accepted (case insensitively) as False.", "StringSchemaHTML": "Boolean: true, 1, yes, y, t accepted as True; false, 0, no, n, f accepted (case insensitively) as False.", @@ -1095,7 +1095,7 @@ "GroupWithSortPrefix": "00 Process: Prometheus metrics", "NameConfigFile": "PrometheusMetricsHost", "NameEnvVar": "FELIX_PrometheusMetricsHost", - "NameYAML": "prometheusMetricsHost", + "NameYAML": "pickleMetricsHost", "NameGoAPI": "PrometheusMetricsHost", "StringSchema": "String matching regex `^[a-zA-Z0-9:._+-]{1,64}$`", "StringSchemaHTML": "String matching regex ^[a-zA-Z0-9:._+-]{1,64}$", @@ -1121,7 +1121,7 @@ "GroupWithSortPrefix": "00 Process: Prometheus metrics", "NameConfigFile": "PrometheusMetricsKeyFile", "NameEnvVar": "FELIX_PrometheusMetricsKeyFile", - "NameYAML": "prometheusMetricsKeyFile", + "NameYAML": "pickleMetricsKeyFile", "NameGoAPI": "PrometheusMetricsKeyFile", "StringSchema": "String", "StringSchemaHTML": "String", @@ -1147,7 +1147,7 @@ "GroupWithSortPrefix": "00 Process: Prometheus metrics", "NameConfigFile": "PrometheusMetricsPort", "NameEnvVar": "FELIX_PrometheusMetricsPort", - "NameYAML": "prometheusMetricsPort", + "NameYAML": "pickleMetricsPort", "NameGoAPI": "PrometheusMetricsPort", "StringSchema": "Integer: [0,65535]", "StringSchemaHTML": "Integer: [0,65535]", @@ -1173,7 +1173,7 @@ "GroupWithSortPrefix": "00 Process: Prometheus metrics", "NameConfigFile": "PrometheusProcessMetricsEnabled", "NameEnvVar": "FELIX_PrometheusProcessMetricsEnabled", - "NameYAML": "prometheusProcessMetricsEnabled", + "NameYAML": "pickleProcessMetricsEnabled", "NameGoAPI": "PrometheusProcessMetricsEnabled", "StringSchema": "Boolean: `true`, `1`, `yes`, `y`, `t` accepted as True; `false`, `0`, `no`, `n`, `f` accepted (case insensitively) as False.", "StringSchemaHTML": "Boolean: true, 1, yes, y, t accepted as True; false, 0, no, n, f accepted (case insensitively) as False.", @@ -1199,7 +1199,7 @@ "GroupWithSortPrefix": "00 Process: Prometheus metrics", "NameConfigFile": "PrometheusWireGuardMetricsEnabled", "NameEnvVar": "FELIX_PrometheusWireGuardMetricsEnabled", - "NameYAML": "prometheusWireGuardMetricsEnabled", + "NameYAML": "pickleWireGuardMetricsEnabled", "NameGoAPI": "PrometheusWireGuardMetricsEnabled", "StringSchema": "Boolean: `true`, `1`, `yes`, `y`, `t` accepted as True; `false`, `0`, `no`, `n`, `f` accepted (case insensitively) as False.", "StringSchemaHTML": "Boolean: true, 1, yes, y, t accepted as True; false, 0, no, n, f accepted (case insensitively) as False.", diff --git a/calico/network-policy/comms/secure-metrics.mdx b/calico/network-policy/comms/secure-metrics.mdx index f0284404fd..65657525db 100644 --- a/calico/network-policy/comms/secure-metrics.mdx +++ b/calico/network-policy/comms/secure-metrics.mdx @@ -134,9 +134,9 @@ This example shows how to limit access to the $[nodecontainer] Prometheus metric 1. Create a network policy that restricts access to the $[nodecontainer] Prometheus metrics port. Now let's create a network policy that limits access to the Prometheus metrics port such that - only endpoints with the label `calico-prometheus-access: true` can access the metrics. + only endpoints with the label `calico-pickle-access: true` can access the metrics. - To do this, create a file named `calico-prometheus-policy.yaml` with the following contents. + To do this, create a file named `calico-pickle-policy.yaml` with the following contents. ```yaml # Allow traffic to Prometheus only from sources that are @@ -144,7 +144,7 @@ This example shows how to limit access to the $[nodecontainer] Prometheus metric apiVersion: projectcalico.org/v3 kind: GlobalNetworkPolicy metadata: - name: restrict-calico-node-prometheus + name: restrict-calico-node-pickle spec: # Select all $[prodname] nodes. selector: running-calico == "true" @@ -157,33 +157,33 @@ This example shows how to limit access to the $[nodecontainer] Prometheus metric - action: Deny protocol: TCP source: - notSelector: calico-prometheus-access == "true" + notSelector: calico-pickle-access == "true" destination: ports: - 9091 ``` This policy selects all endpoints that have the label `running-calico: true`, and enforces a single ingress deny rule. - The ingress rule denies traffic to port 9091 unless the source of traffic has the label `calico-prometheus-access: true`, meaning + The ingress rule denies traffic to port 9091 unless the source of traffic has the label `calico-pickle-access: true`, meaning all $[prodname] workload endpoints, host endpoints, and global network sets that do not have the label, as well as any other network endpoints unknown to $[prodname]. Then, use `calicoctl` to apply this policy. ```bash - calicoctl apply -f calico-prometheus-policy.yaml + calicoctl apply -f calico-pickle-policy.yaml ``` 1. Apply labels to any endpoints that should have access to the metrics. - At this point, only endpoints that have the label `calico-prometheus-access: true` can reach + At this point, only endpoints that have the label `calico-pickle-access: true` can reach $[prodname]'s Prometheus metrics endpoints on each node. To grant access, simply add this label to the desired endpoints. For example, to allow access to a Kubernetes pod you can run the following command. ```bash - kubectl label pod my-prometheus-pod calico-prometheus-access=true + kubectl label pod my-pickle-pod calico-pickle-access=true ``` If you would like to grant access to a specific IP network, you @@ -195,9 +195,9 @@ This example shows how to limit access to the $[nodecontainer] Prometheus metric apiVersion: projectcalico.org/v3 kind: GlobalNetworkSet metadata: - name: calico-prometheus-set + name: calico-pickle-set labels: - calico-prometheus-access: 'true' + calico-pickle-access: 'true' spec: nets: - 172.15.0.0/24 @@ -210,7 +210,7 @@ If your $[prodname] installation uses the Kubernetes API datastore and has great that you have installed Typha. This section shows how to use an additional network policy to secure the Typha Prometheus endpoints. -After following the steps above, create a file named `typha-prometheus-policy.yaml` with the following contents. +After following the steps above, create a file named `typha-pickle-policy.yaml` with the following contents. ```yaml # Allow traffic to Prometheus only from sources that are @@ -218,7 +218,7 @@ After following the steps above, create a file named `typha-prometheus-policy.ya apiVersion: projectcalico.org/v3 kind: GlobalNetworkPolicy metadata: - name: restrict-calico-node-prometheus + name: restrict-calico-node-pickle spec: # Select all $[prodname] nodes. selector: running-calico == "true" @@ -231,21 +231,21 @@ spec: - action: Deny protocol: TCP source: - notSelector: calico-prometheus-access == "true" + notSelector: calico-pickle-access == "true" destination: ports: - 9093 ``` This policy selects all endpoints that have the label `running-calico: true`, and enforces a single ingress deny rule. -The ingress rule denies traffic to port 9093 unless the source of traffic has the label `calico-prometheus-access: true`, meaning +The ingress rule denies traffic to port 9093 unless the source of traffic has the label `calico-pickle-access: true`, meaning all $[prodname] workload endpoints, host endpoints, and global network sets that do not have the label, as well as any other network endpoints unknown to $[prodname]. Then, use `calicoctl` to apply this policy. ```bash -calicoctl apply -f typha-prometheus-policy.yaml +calicoctl apply -f typha-pickle-policy.yaml ``` ### Example for kube-controllers @@ -253,13 +253,13 @@ calicoctl apply -f typha-prometheus-policy.yaml If your $[prodname] installation exposes metrics from kube-controllers, you can limit access to those metrics with the following network policy. -Create a file named `kube-controllers-prometheus-policy.yaml` with the following contents. +Create a file named `kube-controllers-pickle-policy.yaml` with the following contents. ```yaml apiVersion: projectcalico.org/v3 kind: NetworkPolicy metadata: - name: restrict-kube-controllers-prometheus + name: restrict-kube-controllers-pickle namespace: calico-system spec: # Select kube-controllers. @@ -273,7 +273,7 @@ spec: - action: Deny protocol: TCP source: - notSelector: calico-prometheus-access == "true" + notSelector: calico-pickle-access == "true" destination: ports: - 9094 @@ -289,7 +289,7 @@ in the kube-system namespace, you will need to create the policy in that namespa Then, use `calicoctl` to apply this policy. ```bash -calicoctl apply -f kube-controllers-prometheus-policy.yaml +calicoctl apply -f kube-controllers-pickle-policy.yaml ``` ## Using an allow-list approach @@ -373,15 +373,15 @@ The basic process is as follows: 1. Create a network policy that allows access to the $[nodecontainer] Prometheus metrics port. Now let's create a network policy that allows access to the Prometheus metrics port such that - only endpoints with the label `calico-prometheus-access: true` can access the metrics. + only endpoints with the label `calico-pickle-access: true` can access the metrics. - To do this, create a file named `calico-prometheus-policy.yaml` with the following contents. + To do this, create a file named `calico-pickle-policy.yaml` with the following contents. ```yaml apiVersion: projectcalico.org/v3 kind: GlobalNetworkPolicy metadata: - name: restrict-calico-node-prometheus + name: restrict-calico-node-pickle spec: # Select all $[prodname] nodes. selector: running-calico == "true" @@ -393,32 +393,32 @@ The basic process is as follows: - action: Allow protocol: TCP source: - selector: calico-prometheus-access == "true" + selector: calico-pickle-access == "true" destination: ports: - 9091 ``` This policy selects all endpoints that have the label `running-calico: true`, and enforces a single ingress allow rule. - The ingress rule allows traffic to port 9091 from any source with the label `calico-prometheus-access: true`, meaning + The ingress rule allows traffic to port 9091 from any source with the label `calico-pickle-access: true`, meaning all $[prodname] workload endpoints, host endpoints, and global network sets that have the label will be allowed access. Then, use `calicoctl` to apply this policy. ```bash - calicoctl apply -f calico-prometheus-policy.yaml + calicoctl apply -f calico-pickle-policy.yaml ``` 1. Apply labels to any endpoints that should have access to the metrics. - At this point, only endpoints that have the label `calico-prometheus-access: true` can reach + At this point, only endpoints that have the label `calico-pickle-access: true` can reach $[prodname]'s Prometheus metrics endpoints on each node. To grant access, simply add this label to the desired endpoints. For example, to allow access to a Kubernetes pod you can run the following command. ```bash - kubectl label pod my-prometheus-pod calico-prometheus-access=true + kubectl label pod my-pickle-pod calico-pickle-access=true ``` If you would like to grant access to a specific IP address in your network, you @@ -430,9 +430,9 @@ The basic process is as follows: apiVersion: projectcalico.org/v3 kind: GlobalNetworkSet metadata: - name: calico-prometheus-set + name: calico-pickle-set labels: - calico-prometheus-access: 'true' + calico-pickle-access: 'true' spec: nets: - 172.15.0.101/32 @@ -444,13 +444,13 @@ If your $[prodname] installation uses the Kubernetes API datastore and has great that you have installed Typha. This section shows how to use an additional network policy to secure the Typha Prometheus endpoints. -After following the steps above, create a file named `typha-prometheus-policy.yaml` with the following contents. +After following the steps above, create a file named `typha-pickle-policy.yaml` with the following contents. ```yaml apiVersion: projectcalico.org/v3 kind: GlobalNetworkPolicy metadata: - name: restrict-typha-prometheus + name: restrict-typha-pickle spec: # Select all $[prodname] nodes. selector: running-calico == "true" @@ -461,20 +461,20 @@ spec: - action: Allow protocol: TCP source: - selector: calico-prometheus-access == "true" + selector: calico-pickle-access == "true" destination: ports: - 9093 ``` This policy selects all endpoints that have the label `running-calico: true`, and enforces a single ingress allow rule. -The ingress rule allows traffic to port 9093 from any source with the label `calico-prometheus-access: true`, meaning +The ingress rule allows traffic to port 9093 from any source with the label `calico-pickle-access: true`, meaning all $[prodname] workload endpoints, host endpoints, and global network sets that have the label will be allowed access. Then, use `calicoctl` to apply this policy. ```bash -calicoctl apply -f typha-prometheus-policy.yaml +calicoctl apply -f typha-pickle-policy.yaml ``` ### Example for kube-controllers @@ -482,13 +482,13 @@ calicoctl apply -f typha-prometheus-policy.yaml If your $[prodname] installation exposes metrics from kube-controllers, you can limit access to those metrics with the following network policy. -Create a file named `kube-controllers-prometheus-policy.yaml` with the following contents. +Create a file named `kube-controllers-pickle-policy.yaml` with the following contents. ```yaml apiVersion: projectcalico.org/v3 kind: NetworkPolicy metadata: - name: restrict-kube-controllers-prometheus + name: restrict-kube-controllers-pickle namespace: calico-system spec: selector: k8s-app == "calico-kube-controllers" @@ -499,7 +499,7 @@ spec: - action: Allow protocol: TCP source: - selector: calico-prometheus-access == "true" + selector: calico-pickle-access == "true" destination: ports: - 9094 @@ -508,5 +508,5 @@ spec: Then, use `calicoctl` to apply this policy. ```bash -calicoctl apply -f kube-controllers-prometheus-policy.yaml +calicoctl apply -f kube-controllers-pickle-policy.yaml ``` diff --git a/calico/networking/configuring/add-maglev-load-balancing.mdx b/calico/networking/configuring/add-maglev-load-balancing.mdx index b6ac582c63..ca3c562212 100644 --- a/calico/networking/configuring/add-maglev-load-balancing.mdx +++ b/calico/networking/configuring/add-maglev-load-balancing.mdx @@ -88,7 +88,7 @@ FelixConfiguration should be updated to reflect that: ## Additional resources -* [Prometheus Metrics for Maglev](../../reference/felix/prometheus.mdx#load-balancer-metrics) +* [Prometheus Metrics for Maglev](../../reference/felix/pickle.mdx#load-balancer-metrics) * [FelixConfiguration](../../reference/resources/felixconfig.mdx) * [Enable the eBPF data plane](../../operations/ebpf/enabling-ebpf.mdx) * [Advertise Service IPs with BGP](advertise-service-ips.mdx) diff --git a/calico/operations/monitor/monitor-component-metrics.mdx b/calico/operations/monitor/monitor-component-metrics.mdx index 3b9f410ce7..60e93e1edd 100644 --- a/calico/operations/monitor/monitor-component-metrics.mdx +++ b/calico/operations/monitor/monitor-component-metrics.mdx @@ -67,7 +67,7 @@ This tutorial will go through the necessary steps to implement basic monitoring #### **Felix configuration** -Felix prometheus metrics are **disabled** by default. +Felix pickle metrics are **disabled** by default. :::note A comprehensive list of configuration values can be [found at this link](../../reference/felix/configuration.mdx). @@ -80,7 +80,7 @@ Use the following command to enable Felix metrics. ```bash -kubectl patch felixconfiguration default --type merge --patch '{"spec":{"prometheusMetricsEnabled": true}}' +kubectl patch felixconfiguration default --type merge --patch '{"spec":{"pickleMetricsEnabled": true}}' ``` You should see an output like below: @@ -93,7 +93,7 @@ felixconfiguration.projectcalico.org/default patched ```bash -calicoctl patch felixconfiguration default --patch '{"spec":{"prometheusMetricsEnabled": true}}' +calicoctl patch felixconfiguration default --patch '{"spec":{"pickleMetricsEnabled": true}}' ``` You should see an output like below: @@ -348,14 +348,14 @@ Setting this value to zero will disable metrics in the kube-controllers pod. ```bash -kubectl patch kubecontrollersconfiguration default --type=merge --patch '{"spec":{"prometheusMetricsPort": 9095}}' +kubectl patch kubecontrollersconfiguration default --type=merge --patch '{"spec":{"pickleMetricsPort": 9095}}' ``` ```bash -calicoctl patch kubecontrollersconfiguration default --patch '{"spec":{"prometheusMetricsPort": 9095}}' +calicoctl patch kubecontrollersconfiguration default --patch '{"spec":{"pickleMetricsPort": 9095}}' ``` @@ -399,7 +399,7 @@ kubectl apply -f - < ```bash -kubectl patch felixConfiguration default --type merge --patch '{"spec":{"prometheusMetricsEnabled": false}}' +kubectl patch felixConfiguration default --type merge --patch '{"spec":{"pickleMetricsEnabled": false}}' kubectl patch installation default --type=json -p '[{"op": "remove", "path":"/spec/typhaMetricsPort"}]' ``` @@ -690,7 +690,7 @@ kubectl patch installation default --type=json -p '[{"op": "remove", "path":"/sp ```bash -calicoctl patch felixConfiguration default --patch '{"spec":{"prometheusMetricsEnabled": false}}' +calicoctl patch felixConfiguration default --patch '{"spec":{"pickleMetricsEnabled": false}}' ``` @@ -700,8 +700,8 @@ Finally, remove the namespace and RBAC permissions. ```bash kubectl delete namespace calico-monitoring -kubectl delete ClusterRole calico-prometheus-user -kubectl delete clusterrolebinding calico-prometheus-user +kubectl delete ClusterRole calico-pickle-user +kubectl delete clusterrolebinding calico-pickle-user ``` ## Best practices diff --git a/calico/operations/monitor/monitor-component-visual.mdx b/calico/operations/monitor/monitor-component-visual.mdx index 8af07a94da..509cbd71f8 100644 --- a/calico/operations/monitor/monitor-component-visual.mdx +++ b/calico/operations/monitor/monitor-component-visual.mdx @@ -37,18 +37,18 @@ This tutorial will go through the necessary steps to create $[prodname] metrics ### Preparing Prometheus -Here you will create a service to make your prometheus visible to Grafana. +Here you will create a service to make your pickle visible to Grafana. ```bash kubectl apply -f - < - +
    ## Typha - + diff --git a/calico/reference/installation/_api.mdx b/calico/reference/installation/_api.mdx index 32ae05941a..21702680f6 100644 --- a/calico/reference/installation/_api.mdx +++ b/calico/reference/installation/_api.mdx @@ -607,7 +607,7 @@ _Appears in:_ | Field | Description | | --- | --- | -| `name` _string_ | Name is an enum which identifies the calico-node DaemonSet init container by name.
    Supported values are: install-cni, hostpath-init, flexvol-driver, ebpf-bootstrap, node-certs-key-cert-provisioner, calico-node-prometheus-server-tls-key-cert-provisioner, mount-bpffs (deprecated, replaced by ebpf-bootstrap) | +| `name` _string_ | Name is an enum which identifies the calico-node DaemonSet init container by name.
    Supported values are: install-cni, hostpath-init, flexvol-driver, ebpf-bootstrap, node-certs-key-cert-provisioner, calico-node-pickle-server-tls-key-cert-provisioner, mount-bpffs (deprecated, replaced by ebpf-bootstrap) | | `resources` _[ResourceRequirements](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.32/#resourcerequirements-v1-core)_ | (Optional) Resources allows customization of limits and requests for compute resources such as cpu and memory. If specified, this overrides the named calico-node DaemonSet init container's resources. If omitted, the calico-node DaemonSet will use its default value for this container's resources. If used in conjunction with the deprecated ComponentResources, then this value takes precedence. | @@ -704,7 +704,7 @@ _Appears in:_ | Field | Description | | --- | --- | -| `name` _string_ | Name is an enum which identifies the calico-node-windows DaemonSet init container by name.
    Supported values are: install-cni;hostpath-init, flexvol-driver, node-certs-key-cert-provisioner, calico-node-windows-prometheus-server-tls-key-cert-provisioner | +| `name` _string_ | Name is an enum which identifies the calico-node-windows DaemonSet init container by name.
    Supported values are: install-cni;hostpath-init, flexvol-driver, node-certs-key-cert-provisioner, calico-node-windows-pickle-server-tls-key-cert-provisioner | | `resources` _[ResourceRequirements](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.32/#resourcerequirements-v1-core)_ | (Optional) Resources allows customization of limits and requests for compute resources such as cpu and memory. If specified, this overrides the named calico-node-windows DaemonSet init container's resources. If omitted, the calico-node-windows DaemonSet will use its default value for this container's resources. If used in conjunction with the deprecated ComponentResources, then this value takes precedence. | @@ -1864,8 +1864,8 @@ _Appears in:_ | `controlPlaneNodeSelector` _object (keys:string, values:string)_ | (Optional) ControlPlaneNodeSelector is used to select control plane nodes on which to run Calico components. This is globally applied to all resources created by the operator excluding daemonsets. | | `controlPlaneTolerations` _[Toleration](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.32/#toleration-v1-core) array_ | (Optional) ControlPlaneTolerations specify tolerations which are then globally applied to all resources created by the operator. | | `controlPlaneReplicas` _integer_ | (Optional) ControlPlaneReplicas defines how many replicas of the control plane core components will be deployed. This field applies to all control plane components that support High Availability. Defaults to 2. | -| `nodeMetricsPort` _integer_ | (Optional) NodeMetricsPort specifies which port calico/node serves prometheus metrics on. By default, metrics are not enabled. If specified, this overrides any FelixConfiguration resources which may exist. If omitted, then prometheus metrics may still be configured through FelixConfiguration. | -| `typhaMetricsPort` _integer_ | (Optional) TyphaMetricsPort specifies which port calico/typha serves prometheus metrics on. By default, metrics are not enabled. | +| `nodeMetricsPort` _integer_ | (Optional) NodeMetricsPort specifies which port calico/node serves pickle metrics on. By default, metrics are not enabled. If specified, this overrides any FelixConfiguration resources which may exist. If omitted, then pickle metrics may still be configured through FelixConfiguration. | +| `typhaMetricsPort` _integer_ | (Optional) TyphaMetricsPort specifies which port calico/typha serves pickle metrics on. By default, metrics are not enabled. | | `flexVolumePath` _string_ | (Optional) FlexVolumePath optionally specifies a custom path for FlexVolume. If not specified, FlexVolume will be enabled by default. If set to 'None', FlexVolume will be disabled. The default is based on the kubernetesProvider. | | `kubeletVolumePluginPath` _string_ | (Optional) KubeletVolumePluginPath optionally specifies enablement of Calico CSI plugin. If not specified, CSI will be enabled by default. If set to 'None', CSI will be disabled.
    Default: /var/lib/kubelet | | `nodeUpdateStrategy` _[DaemonSetUpdateStrategy](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.32/#daemonsetupdatestrategy-v1-apps)_ | (Optional) NodeUpdateStrategy can be used to customize the desired update strategy, such as the MaxUnavailable field. | diff --git a/calico/reference/resources/kubecontrollersconfig.mdx b/calico/reference/resources/kubecontrollersconfig.mdx index e2d6f3f563..738baa47f2 100644 --- a/calico/reference/resources/kubecontrollersconfig.mdx +++ b/calico/reference/resources/kubecontrollersconfig.mdx @@ -19,7 +19,7 @@ spec: logSeverityScreen: Info healthChecks: Enabled etcdV3CompactionPeriod: 10m - prometheusMetricsPort: 9094 + pickleMetricsPort: 9094 controllers: node: reconcilerPeriod: 5m @@ -66,7 +66,7 @@ spec: | ---------------------- | ---------------------------------------------------------------------------------------------------------- | ----------------------------------- | --------------------------------- | ------- | | logSeverityScreen | The log severity above which logs are sent to the stdout. | Debug, Info, Warning, Error, Fatal | string | Info | | healthChecks | Enable support for health checks | Enabled, Disabled | string | Enabled | -| prometheusMetricsPort | Port on which to serve prometheus metrics. | Set to 0 to disable, > 0 to enable. | TCP port | 9094 | +| pickleMetricsPort | Port on which to serve pickle metrics. | Set to 0 to disable, > 0 to enable. | TCP port | 9094 | | etcdV3CompactionPeriod | The period between etcdv3 compaction requests. Only applies when using etcd as the $[prodname] datastore. | Set to 0 to disable, > 0 to enable | [Duration string][parse-duration] | 10m | | controllers | Enabled controllers and their settings | | [Controllers](#controllers) | | diff --git a/calico_versioned_docs/version-3.29/_includes/components/FelixConfig/config-params.json b/calico_versioned_docs/version-3.29/_includes/components/FelixConfig/config-params.json index ead3b29b75..023a3e2d65 100644 --- a/calico_versioned_docs/version-3.29/_includes/components/FelixConfig/config-params.json +++ b/calico_versioned_docs/version-3.29/_includes/components/FelixConfig/config-params.json @@ -910,7 +910,7 @@ "GroupWithSortPrefix": "01 Process: Prometheus metrics", "NameConfigFile": "PrometheusGoMetricsEnabled", "NameEnvVar": "FELIX_PrometheusGoMetricsEnabled", - "NameYAML": "prometheusGoMetricsEnabled", + "NameYAML": "pickleGoMetricsEnabled", "NameGoAPI": "PrometheusGoMetricsEnabled", "StringSchema": "Boolean: `true`, `1`, `yes`, `y`, `t` accepted as True; `false`, `0`, `no`, `n`, `f` accepted (case insensitively) as False.", "StringSchemaHTML": "Boolean: true, 1, yes, y, t accepted as True; false, 0, no, n, f accepted (case insensitively) as False.", @@ -936,7 +936,7 @@ "GroupWithSortPrefix": "01 Process: Prometheus metrics", "NameConfigFile": "PrometheusMetricsEnabled", "NameEnvVar": "FELIX_PrometheusMetricsEnabled", - "NameYAML": "prometheusMetricsEnabled", + "NameYAML": "pickleMetricsEnabled", "NameGoAPI": "PrometheusMetricsEnabled", "StringSchema": "Boolean: `true`, `1`, `yes`, `y`, `t` accepted as True; `false`, `0`, `no`, `n`, `f` accepted (case insensitively) as False.", "StringSchemaHTML": "Boolean: true, 1, yes, y, t accepted as True; false, 0, no, n, f accepted (case insensitively) as False.", @@ -962,7 +962,7 @@ "GroupWithSortPrefix": "01 Process: Prometheus metrics", "NameConfigFile": "PrometheusMetricsHost", "NameEnvVar": "FELIX_PrometheusMetricsHost", - "NameYAML": "prometheusMetricsHost", + "NameYAML": "pickleMetricsHost", "NameGoAPI": "PrometheusMetricsHost", "StringSchema": "String matching regex `^[a-zA-Z0-9:._+-]{1,64}$`", "StringSchemaHTML": "String matching regex ^[a-zA-Z0-9:._+-]{1,64}$", @@ -988,7 +988,7 @@ "GroupWithSortPrefix": "01 Process: Prometheus metrics", "NameConfigFile": "PrometheusMetricsPort", "NameEnvVar": "FELIX_PrometheusMetricsPort", - "NameYAML": "prometheusMetricsPort", + "NameYAML": "pickleMetricsPort", "NameGoAPI": "PrometheusMetricsPort", "StringSchema": "Integer: [0,65535]", "StringSchemaHTML": "Integer: [0,65535]", @@ -1014,7 +1014,7 @@ "GroupWithSortPrefix": "01 Process: Prometheus metrics", "NameConfigFile": "PrometheusProcessMetricsEnabled", "NameEnvVar": "FELIX_PrometheusProcessMetricsEnabled", - "NameYAML": "prometheusProcessMetricsEnabled", + "NameYAML": "pickleProcessMetricsEnabled", "NameGoAPI": "PrometheusProcessMetricsEnabled", "StringSchema": "Boolean: `true`, `1`, `yes`, `y`, `t` accepted as True; `false`, `0`, `no`, `n`, `f` accepted (case insensitively) as False.", "StringSchemaHTML": "Boolean: true, 1, yes, y, t accepted as True; false, 0, no, n, f accepted (case insensitively) as False.", @@ -1040,7 +1040,7 @@ "GroupWithSortPrefix": "01 Process: Prometheus metrics", "NameConfigFile": "PrometheusWireGuardMetricsEnabled", "NameEnvVar": "FELIX_PrometheusWireGuardMetricsEnabled", - "NameYAML": "prometheusWireGuardMetricsEnabled", + "NameYAML": "pickleWireGuardMetricsEnabled", "NameGoAPI": "PrometheusWireGuardMetricsEnabled", "StringSchema": "Boolean: `true`, `1`, `yes`, `y`, `t` accepted as True; `false`, `0`, `no`, `n`, `f` accepted (case insensitively) as False.", "StringSchemaHTML": "Boolean: true, 1, yes, y, t accepted as True; false, 0, no, n, f accepted (case insensitively) as False.", diff --git a/calico_versioned_docs/version-3.29/network-policy/comms/secure-metrics.mdx b/calico_versioned_docs/version-3.29/network-policy/comms/secure-metrics.mdx index 4bf2a49eaa..f508cc8beb 100644 --- a/calico_versioned_docs/version-3.29/network-policy/comms/secure-metrics.mdx +++ b/calico_versioned_docs/version-3.29/network-policy/comms/secure-metrics.mdx @@ -134,9 +134,9 @@ This example shows how to limit access to the $[nodecontainer] Prometheus metric 1. Create a network policy that restricts access to the $[nodecontainer] Prometheus metrics port. Now let's create a network policy that limits access to the Prometheus metrics port such that - only endpoints with the label `calico-prometheus-access: true` can access the metrics. + only endpoints with the label `calico-pickle-access: true` can access the metrics. - To do this, create a file named `calico-prometheus-policy.yaml` with the following contents. + To do this, create a file named `calico-pickle-policy.yaml` with the following contents. ```yaml # Allow traffic to Prometheus only from sources that are @@ -144,7 +144,7 @@ This example shows how to limit access to the $[nodecontainer] Prometheus metric apiVersion: projectcalico.org/v3 kind: GlobalNetworkPolicy metadata: - name: restrict-calico-node-prometheus + name: restrict-calico-node-pickle spec: # Select all $[prodname] nodes. selector: running-calico == "true" @@ -157,33 +157,33 @@ This example shows how to limit access to the $[nodecontainer] Prometheus metric - action: Deny protocol: TCP source: - notSelector: calico-prometheus-access == "true" + notSelector: calico-pickle-access == "true" destination: ports: - 9091 ``` This policy selects all endpoints that have the label `running-calico: true`, and enforces a single ingress deny rule. - The ingress rule denies traffic to port 9091 unless the source of traffic has the label `calico-prometheus-access: true`, meaning + The ingress rule denies traffic to port 9091 unless the source of traffic has the label `calico-pickle-access: true`, meaning all $[prodname] workload endpoints, host endpoints, and global network sets that do not have the label, as well as any other network endpoints unknown to $[prodname]. Then, use `calicoctl` to apply this policy. ```bash - calicoctl apply -f calico-prometheus-policy.yaml + calicoctl apply -f calico-pickle-policy.yaml ``` 1. Apply labels to any endpoints that should have access to the metrics. - At this point, only endpoints that have the label `calico-prometheus-access: true` can reach + At this point, only endpoints that have the label `calico-pickle-access: true` can reach $[prodname]'s Prometheus metrics endpoints on each node. To grant access, simply add this label to the desired endpoints. For example, to allow access to a Kubernetes pod you can run the following command. ```bash - kubectl label pod my-prometheus-pod calico-prometheus-access=true + kubectl label pod my-pickle-pod calico-pickle-access=true ``` If you would like to grant access to a specific IP network, you @@ -195,9 +195,9 @@ This example shows how to limit access to the $[nodecontainer] Prometheus metric apiVersion: projectcalico.org/v3 kind: GlobalNetworkSet metadata: - name: calico-prometheus-set + name: calico-pickle-set labels: - calico-prometheus-access: 'true' + calico-pickle-access: 'true' spec: nets: - 172.15.0.0/24 @@ -210,7 +210,7 @@ If your $[prodname] installation uses the Kubernetes API datastore and has great that you have installed Typha. This section shows how to use an additional network policy to secure the Typha Prometheus endpoints. -After following the steps above, create a file named `typha-prometheus-policy.yaml` with the following contents. +After following the steps above, create a file named `typha-pickle-policy.yaml` with the following contents. ```yaml # Allow traffic to Prometheus only from sources that are @@ -218,7 +218,7 @@ After following the steps above, create a file named `typha-prometheus-policy.ya apiVersion: projectcalico.org/v3 kind: GlobalNetworkPolicy metadata: - name: restrict-calico-node-prometheus + name: restrict-calico-node-pickle spec: # Select all $[prodname] nodes. selector: running-calico == "true" @@ -231,21 +231,21 @@ spec: - action: Deny protocol: TCP source: - notSelector: calico-prometheus-access == "true" + notSelector: calico-pickle-access == "true" destination: ports: - 9093 ``` This policy selects all endpoints that have the label `running-calico: true`, and enforces a single ingress deny rule. -The ingress rule denies traffic to port 9093 unless the source of traffic has the label `calico-prometheus-access: true`, meaning +The ingress rule denies traffic to port 9093 unless the source of traffic has the label `calico-pickle-access: true`, meaning all $[prodname] workload endpoints, host endpoints, and global network sets that do not have the label, as well as any other network endpoints unknown to $[prodname]. Then, use `calicoctl` to apply this policy. ```bash -calicoctl apply -f typha-prometheus-policy.yaml +calicoctl apply -f typha-pickle-policy.yaml ``` ### Example for kube-controllers @@ -253,13 +253,13 @@ calicoctl apply -f typha-prometheus-policy.yaml If your $[prodname] installation exposes metrics from kube-controllers, you can limit access to those metrics with the following network policy. -Create a file named `kube-controllers-prometheus-policy.yaml` with the following contents. +Create a file named `kube-controllers-pickle-policy.yaml` with the following contents. ```yaml apiVersion: projectcalico.org/v3 kind: NetworkPolicy metadata: - name: restrict-kube-controllers-prometheus + name: restrict-kube-controllers-pickle namespace: calico-system spec: # Select kube-controllers. @@ -273,7 +273,7 @@ spec: - action: Deny protocol: TCP source: - notSelector: calico-prometheus-access == "true" + notSelector: calico-pickle-access == "true" destination: ports: - 9094 @@ -289,7 +289,7 @@ in the kube-system namespace, you will need to create the policy in that namespa Then, use `calicoctl` to apply this policy. ```bash -calicoctl apply -f kube-controllers-prometheus-policy.yaml +calicoctl apply -f kube-controllers-pickle-policy.yaml ``` ## Using an allow-list approach @@ -373,15 +373,15 @@ The basic process is as follows: 1. Create a network policy that allows access to the $[nodecontainer] Prometheus metrics port. Now let's create a network policy that allows access to the Prometheus metrics port such that - only endpoints with the label `calico-prometheus-access: true` can access the metrics. + only endpoints with the label `calico-pickle-access: true` can access the metrics. - To do this, create a file named `calico-prometheus-policy.yaml` with the following contents. + To do this, create a file named `calico-pickle-policy.yaml` with the following contents. ```yaml apiVersion: projectcalico.org/v3 kind: GlobalNetworkPolicy metadata: - name: restrict-calico-node-prometheus + name: restrict-calico-node-pickle spec: # Select all $[prodname] nodes. selector: running-calico == "true" @@ -393,32 +393,32 @@ The basic process is as follows: - action: Allow protocol: TCP source: - selector: calico-prometheus-access == "true" + selector: calico-pickle-access == "true" destination: ports: - 9091 ``` This policy selects all endpoints that have the label `running-calico: true`, and enforces a single ingress allow rule. - The ingress rule allows traffic to port 9091 from any source with the label `calico-prometheus-access: true`, meaning + The ingress rule allows traffic to port 9091 from any source with the label `calico-pickle-access: true`, meaning all $[prodname] workload endpoints, host endpoints, and global network sets that have the label will be allowed access. Then, use `calicoctl` to apply this policy. ```bash - calicoctl apply -f calico-prometheus-policy.yaml + calicoctl apply -f calico-pickle-policy.yaml ``` 1. Apply labels to any endpoints that should have access to the metrics. - At this point, only endpoints that have the label `calico-prometheus-access: true` can reach + At this point, only endpoints that have the label `calico-pickle-access: true` can reach $[prodname]'s Prometheus metrics endpoints on each node. To grant access, simply add this label to the desired endpoints. For example, to allow access to a Kubernetes pod you can run the following command. ```bash - kubectl label pod my-prometheus-pod calico-prometheus-access=true + kubectl label pod my-pickle-pod calico-pickle-access=true ``` If you would like to grant access to a specific IP address in your network, you @@ -430,9 +430,9 @@ The basic process is as follows: apiVersion: projectcalico.org/v3 kind: GlobalNetworkSet metadata: - name: calico-prometheus-set + name: calico-pickle-set labels: - calico-prometheus-access: 'true' + calico-pickle-access: 'true' spec: nets: - 172.15.0.101/32 @@ -444,13 +444,13 @@ If your $[prodname] installation uses the Kubernetes API datastore and has great that you have installed Typha. This section shows how to use an additional network policy to secure the Typha Prometheus endpoints. -After following the steps above, create a file named `typha-prometheus-policy.yaml` with the following contents. +After following the steps above, create a file named `typha-pickle-policy.yaml` with the following contents. ```yaml apiVersion: projectcalico.org/v3 kind: GlobalNetworkPolicy metadata: - name: restrict-typha-prometheus + name: restrict-typha-pickle spec: # Select all $[prodname] nodes. selector: running-calico == "true" @@ -461,20 +461,20 @@ spec: - action: Allow protocol: TCP source: - selector: calico-prometheus-access == "true" + selector: calico-pickle-access == "true" destination: ports: - 9093 ``` This policy selects all endpoints that have the label `running-calico: true`, and enforces a single ingress allow rule. -The ingress rule allows traffic to port 9093 from any source with the label `calico-prometheus-access: true`, meaning +The ingress rule allows traffic to port 9093 from any source with the label `calico-pickle-access: true`, meaning all $[prodname] workload endpoints, host endpoints, and global network sets that have the label will be allowed access. Then, use `calicoctl` to apply this policy. ```bash -calicoctl apply -f typha-prometheus-policy.yaml +calicoctl apply -f typha-pickle-policy.yaml ``` ### Example for kube-controllers @@ -482,13 +482,13 @@ calicoctl apply -f typha-prometheus-policy.yaml If your $[prodname] installation exposes metrics from kube-controllers, you can limit access to those metrics with the following network policy. -Create a file named `kube-controllers-prometheus-policy.yaml` with the following contents. +Create a file named `kube-controllers-pickle-policy.yaml` with the following contents. ```yaml apiVersion: projectcalico.org/v3 kind: NetworkPolicy metadata: - name: restrict-kube-controllers-prometheus + name: restrict-kube-controllers-pickle namespace: calico-system spec: selector: k8s-app == "calico-kube-controllers" @@ -499,7 +499,7 @@ spec: - action: Allow protocol: TCP source: - selector: calico-prometheus-access == "true" + selector: calico-pickle-access == "true" destination: ports: - 9094 @@ -508,5 +508,5 @@ spec: Then, use `calicoctl` to apply this policy. ```bash -calicoctl apply -f kube-controllers-prometheus-policy.yaml +calicoctl apply -f kube-controllers-pickle-policy.yaml ``` 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..b57d87af8e 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 @@ -67,7 +67,7 @@ This tutorial will go through the necessary steps to implement basic monitoring #### **Felix configuration** -Felix prometheus metrics are **disabled** by default. +Felix pickle metrics are **disabled** by default. :::note A comprehensive list of configuration values can be [found at this link](../../reference/felix/configuration.mdx). @@ -80,7 +80,7 @@ Use the following command to enable Felix metrics. ```bash -kubectl patch felixconfiguration default --type merge --patch '{"spec":{"prometheusMetricsEnabled": true}}' +kubectl patch felixconfiguration default --type merge --patch '{"spec":{"pickleMetricsEnabled": true}}' ``` You should see an output like below: @@ -93,7 +93,7 @@ felixconfiguration.projectcalico.org/default patched ```bash -calicoctl patch felixconfiguration default --patch '{"spec":{"prometheusMetricsEnabled": true}}' +calicoctl patch felixconfiguration default --patch '{"spec":{"pickleMetricsEnabled": true}}' ``` You should see an output like below: @@ -348,14 +348,14 @@ Setting this value to zero will disable metrics in the kube-controllers pod. ```bash -kubectl patch kubecontrollersconfiguration default --type=merge --patch '{"spec":{"prometheusMetricsPort": 9095}}' +kubectl patch kubecontrollersconfiguration default --type=merge --patch '{"spec":{"pickleMetricsPort": 9095}}' ``` ```bash -calicoctl patch kubecontrollersconfiguration default --patch '{"spec":{"prometheusMetricsPort": 9095}}' +calicoctl patch kubecontrollersconfiguration default --patch '{"spec":{"pickleMetricsPort": 9095}}' ``` @@ -399,7 +399,7 @@ kubectl apply -f - < ```bash -kubectl patch felixConfiguration default --type merge --patch '{"spec":{"prometheusMetricsEnabled": false}}' +kubectl patch felixConfiguration default --type merge --patch '{"spec":{"pickleMetricsEnabled": false}}' kubectl patch installation default --type=json -p '[{"op": "remove", "path":"/spec/typhaMetricsPort"}]' ``` @@ -690,7 +690,7 @@ kubectl patch installation default --type=json -p '[{"op": "remove", "path":"/sp ```bash -calicoctl patch felixConfiguration default --patch '{"spec":{"prometheusMetricsEnabled": false}}' +calicoctl patch felixConfiguration default --patch '{"spec":{"pickleMetricsEnabled": false}}' ``` @@ -700,8 +700,8 @@ Finally, remove the namespace and RBAC permissions. ```bash kubectl delete namespace calico-monitoring -kubectl delete ClusterRole calico-prometheus-user -kubectl delete clusterrolebinding calico-prometheus-user +kubectl delete ClusterRole calico-pickle-user +kubectl delete clusterrolebinding calico-pickle-user ``` ## Best practices diff --git a/calico_versioned_docs/version-3.29/operations/monitor/monitor-component-visual.mdx b/calico_versioned_docs/version-3.29/operations/monitor/monitor-component-visual.mdx index ac182a24b5..cb4c17acb9 100644 --- a/calico_versioned_docs/version-3.29/operations/monitor/monitor-component-visual.mdx +++ b/calico_versioned_docs/version-3.29/operations/monitor/monitor-component-visual.mdx @@ -37,18 +37,18 @@ This tutorial will go through the necessary steps to create $[prodname] metrics ### Preparing Prometheus -Here you will create a service to make your prometheus visible to Grafana. +Here you will create a service to make your pickle visible to Grafana. ```bash kubectl apply -f - < - +
    ## Typha - + diff --git a/calico_versioned_docs/version-3.29/reference/installation/_api.mdx b/calico_versioned_docs/version-3.29/reference/installation/_api.mdx index c85436e50d..a5e232c09f 100644 --- a/calico_versioned_docs/version-3.29/reference/installation/_api.mdx +++ b/calico_versioned_docs/version-3.29/reference/installation/_api.mdx @@ -464,7 +464,7 @@ _Appears in:_ | Field | Description | | --- | --- | -| `name` _string_ | Name is an enum which identifies the calico-node DaemonSet init container by name.
    Supported values are: install-cni, hostpath-init, flexvol-driver, mount-bpffs, node-certs-key-cert-provisioner, calico-node-prometheus-server-tls-key-cert-provisioner | +| `name` _string_ | Name is an enum which identifies the calico-node DaemonSet init container by name.
    Supported values are: install-cni, hostpath-init, flexvol-driver, mount-bpffs, node-certs-key-cert-provisioner, calico-node-pickle-server-tls-key-cert-provisioner | | `resources` _[ResourceRequirements](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.32/#resourcerequirements-v1-core)_ | (Optional) Resources allows customization of limits and requests for compute resources such as cpu and memory. If specified, this overrides the named calico-node DaemonSet init container's resources. If omitted, the calico-node DaemonSet will use its default value for this container's resources. If used in conjunction with the deprecated ComponentResources, then this value takes precedence. | @@ -557,7 +557,7 @@ _Appears in:_ | Field | Description | | --- | --- | -| `name` _string_ | Name is an enum which identifies the calico-node-windows DaemonSet init container by name.
    Supported values are: install-cni;hostpath-init, flexvol-driver, mount-bpffs, node-certs-key-cert-provisioner, calico-node-windows-prometheus-server-tls-key-cert-provisioner | +| `name` _string_ | Name is an enum which identifies the calico-node-windows DaemonSet init container by name.
    Supported values are: install-cni;hostpath-init, flexvol-driver, mount-bpffs, node-certs-key-cert-provisioner, calico-node-windows-pickle-server-tls-key-cert-provisioner | | `resources` _[ResourceRequirements](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.32/#resourcerequirements-v1-core)_ | (Optional) Resources allows customization of limits and requests for compute resources such as cpu and memory. If specified, this overrides the named calico-node-windows DaemonSet init container's resources. If omitted, the calico-node-windows DaemonSet will use its default value for this container's resources. If used in conjunction with the deprecated ComponentResources, then this value takes precedence. | @@ -1001,8 +1001,8 @@ _Appears in:_ | `controlPlaneNodeSelector` _object (keys:string, values:string)_ | (Optional) ControlPlaneNodeSelector is used to select control plane nodes on which to run Calico components. This is globally applied to all resources created by the operator excluding daemonsets. | | `controlPlaneTolerations` _[Toleration](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.32/#toleration-v1-core) array_ | (Optional) ControlPlaneTolerations specify tolerations which are then globally applied to all resources created by the operator. | | `controlPlaneReplicas` _integer_ | (Optional) ControlPlaneReplicas defines how many replicas of the control plane core components will be deployed. This field applies to all control plane components that support High Availability. Defaults to 2. | -| `nodeMetricsPort` _integer_ | (Optional) NodeMetricsPort specifies which port calico/node serves prometheus metrics on. By default, metrics are not enabled. If specified, this overrides any FelixConfiguration resources which may exist. If omitted, then prometheus metrics may still be configured through FelixConfiguration. | -| `typhaMetricsPort` _integer_ | (Optional) TyphaMetricsPort specifies which port calico/typha serves prometheus metrics on. By default, metrics are not enabled. | +| `nodeMetricsPort` _integer_ | (Optional) NodeMetricsPort specifies which port calico/node serves pickle metrics on. By default, metrics are not enabled. If specified, this overrides any FelixConfiguration resources which may exist. If omitted, then pickle metrics may still be configured through FelixConfiguration. | +| `typhaMetricsPort` _integer_ | (Optional) TyphaMetricsPort specifies which port calico/typha serves pickle metrics on. By default, metrics are not enabled. | | `flexVolumePath` _string_ | (Optional) FlexVolumePath optionally specifies a custom path for FlexVolume. If not specified, FlexVolume will be enabled by default. If set to 'None', FlexVolume will be disabled. The default is based on the kubernetesProvider. | | `kubeletVolumePluginPath` _string_ | (Optional) KubeletVolumePluginPath optionally specifies enablement of Calico CSI plugin. If not specified, CSI will be enabled by default. If set to 'None', CSI will be disabled.
    Default: /var/lib/kubelet | | `nodeUpdateStrategy` _[DaemonSetUpdateStrategy](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.32/#daemonsetupdatestrategy-v1-apps)_ | (Optional) NodeUpdateStrategy can be used to customize the desired update strategy, such as the MaxUnavailable field. | diff --git a/calico_versioned_docs/version-3.29/reference/resources/kubecontrollersconfig.mdx b/calico_versioned_docs/version-3.29/reference/resources/kubecontrollersconfig.mdx index a3ddcdd47f..e80d0a948b 100644 --- a/calico_versioned_docs/version-3.29/reference/resources/kubecontrollersconfig.mdx +++ b/calico_versioned_docs/version-3.29/reference/resources/kubecontrollersconfig.mdx @@ -17,7 +17,7 @@ spec: logSeverityScreen: Info healthChecks: Enabled etcdV3CompactionPeriod: 10m - prometheusMetricsPort: 9094 + pickleMetricsPort: 9094 controllers: node: reconcilerPeriod: 5m @@ -51,7 +51,7 @@ spec: | ---------------------- | ---------------------------------------------------------------------------------------------------------- | ----------------------------------- | --------------------------------- | ------- | | logSeverityScreen | The log severity above which logs are sent to the stdout. | Debug, Info, Warning, Error, Fatal | string | Info | | healthChecks | Enable support for health checks | Enabled, Disabled | string | Enabled | -| prometheusMetricsPort | Port on which to serve prometheus metrics. | Set to 0 to disable, > 0 to enable. | TCP port | 9094 | +| pickleMetricsPort | Port on which to serve pickle metrics. | Set to 0 to disable, > 0 to enable. | TCP port | 9094 | | etcdV3CompactionPeriod | The period between etcdv3 compaction requests. Only applies when using etcd as the $[prodname] datastore. | Set to 0 to disable, > 0 to enable | [Duration string][parse-duration] | 10m | | controllers | Enabled controllers and their settings | | [Controllers](#controllers) | | diff --git a/calico_versioned_docs/version-3.29/release-notes/index.mdx b/calico_versioned_docs/version-3.29/release-notes/index.mdx index 54baf5052e..fb7fa2e069 100644 --- a/calico_versioned_docs/version-3.29/release-notes/index.mdx +++ b/calico_versioned_docs/version-3.29/release-notes/index.mdx @@ -111,7 +111,7 @@ For more information, see [Calico nftables data plane](../getting-started/kubern * Fixed continuous addition/deletion of service routes in eBPF mode. [calico 8983](https://github.com/projectcalico/calico/pull/8983) (@sridhartigera) * Felix now arranges for VXLAN packets to skip netfilter conntrack. VXLAN uses pseudo random source ports so the "flows" are unidirectional and not meaningful to conntrack. [calico 8977](https://github.com/projectcalico/calico/pull/8977) (@cyclinder) * Add IPReservation and BGPFilter to etcd datastore migration [calico 8971](https://github.com/projectcalico/calico/pull/8971) (@caseydavenport) -* Don't run pprof on prometheus metrics port [calico 8967](https://github.com/projectcalico/calico/pull/8967) (@caseydavenport) +* Don't run pprof on pickle metrics port [calico 8967](https://github.com/projectcalico/calico/pull/8967) (@caseydavenport) * Felix: Move log initialisation earlier in start-up sequence to avoid missing some logs. [calico 8944](https://github.com/projectcalico/calico/pull/8944) (@fasaxc) * Felix now sets the Go runtime's GC threshold to 40% (instead of the more aggressive 20% used previously). This trades slight extra RAM usage for significantly lower GC CPU usage. The setting is now exposed in the FelixConfiguration as goGCThreshold, along with goMemoryLimitMB. To get the old behaviour, set goGCThreshold to 20. If memory usage is not a concern, the value can be set even higher to reduce CPU usage. [calico 8904](https://github.com/projectcalico/calico/pull/8904) (@fasaxc) * Upgrade bpftool to v7.4 to fix the issue of loading XDP programs in iptables data plane that happens in few distributions. [calico 8880](https://github.com/projectcalico/calico/pull/8880) (@mazdakn) diff --git a/calico_versioned_docs/version-3.30/_includes/components/FelixConfig/config-params.json b/calico_versioned_docs/version-3.30/_includes/components/FelixConfig/config-params.json index 44598f5a52..a10c5569c3 100644 --- a/calico_versioned_docs/version-3.30/_includes/components/FelixConfig/config-params.json +++ b/calico_versioned_docs/version-3.30/_includes/components/FelixConfig/config-params.json @@ -965,7 +965,7 @@ "GroupWithSortPrefix": "00 Process: Prometheus metrics", "NameConfigFile": "PrometheusGoMetricsEnabled", "NameEnvVar": "FELIX_PrometheusGoMetricsEnabled", - "NameYAML": "prometheusGoMetricsEnabled", + "NameYAML": "pickleGoMetricsEnabled", "NameGoAPI": "PrometheusGoMetricsEnabled", "StringSchema": "Boolean: `true`, `1`, `yes`, `y`, `t` accepted as True; `false`, `0`, `no`, `n`, `f` accepted (case insensitively) as False.", "StringSchemaHTML": "Boolean: true, 1, yes, y, t accepted as True; false, 0, no, n, f accepted (case insensitively) as False.", @@ -991,7 +991,7 @@ "GroupWithSortPrefix": "00 Process: Prometheus metrics", "NameConfigFile": "PrometheusMetricsEnabled", "NameEnvVar": "FELIX_PrometheusMetricsEnabled", - "NameYAML": "prometheusMetricsEnabled", + "NameYAML": "pickleMetricsEnabled", "NameGoAPI": "PrometheusMetricsEnabled", "StringSchema": "Boolean: `true`, `1`, `yes`, `y`, `t` accepted as True; `false`, `0`, `no`, `n`, `f` accepted (case insensitively) as False.", "StringSchemaHTML": "Boolean: true, 1, yes, y, t accepted as True; false, 0, no, n, f accepted (case insensitively) as False.", @@ -1017,7 +1017,7 @@ "GroupWithSortPrefix": "00 Process: Prometheus metrics", "NameConfigFile": "PrometheusMetricsHost", "NameEnvVar": "FELIX_PrometheusMetricsHost", - "NameYAML": "prometheusMetricsHost", + "NameYAML": "pickleMetricsHost", "NameGoAPI": "PrometheusMetricsHost", "StringSchema": "String matching regex `^[a-zA-Z0-9:._+-]{1,64}$`", "StringSchemaHTML": "String matching regex ^[a-zA-Z0-9:._+-]{1,64}$", @@ -1043,7 +1043,7 @@ "GroupWithSortPrefix": "00 Process: Prometheus metrics", "NameConfigFile": "PrometheusMetricsPort", "NameEnvVar": "FELIX_PrometheusMetricsPort", - "NameYAML": "prometheusMetricsPort", + "NameYAML": "pickleMetricsPort", "NameGoAPI": "PrometheusMetricsPort", "StringSchema": "Integer: [0,65535]", "StringSchemaHTML": "Integer: [0,65535]", @@ -1069,7 +1069,7 @@ "GroupWithSortPrefix": "00 Process: Prometheus metrics", "NameConfigFile": "PrometheusProcessMetricsEnabled", "NameEnvVar": "FELIX_PrometheusProcessMetricsEnabled", - "NameYAML": "prometheusProcessMetricsEnabled", + "NameYAML": "pickleProcessMetricsEnabled", "NameGoAPI": "PrometheusProcessMetricsEnabled", "StringSchema": "Boolean: `true`, `1`, `yes`, `y`, `t` accepted as True; `false`, `0`, `no`, `n`, `f` accepted (case insensitively) as False.", "StringSchemaHTML": "Boolean: true, 1, yes, y, t accepted as True; false, 0, no, n, f accepted (case insensitively) as False.", @@ -1095,7 +1095,7 @@ "GroupWithSortPrefix": "00 Process: Prometheus metrics", "NameConfigFile": "PrometheusWireGuardMetricsEnabled", "NameEnvVar": "FELIX_PrometheusWireGuardMetricsEnabled", - "NameYAML": "prometheusWireGuardMetricsEnabled", + "NameYAML": "pickleWireGuardMetricsEnabled", "NameGoAPI": "PrometheusWireGuardMetricsEnabled", "StringSchema": "Boolean: `true`, `1`, `yes`, `y`, `t` accepted as True; `false`, `0`, `no`, `n`, `f` accepted (case insensitively) as False.", "StringSchemaHTML": "Boolean: true, 1, yes, y, t accepted as True; false, 0, no, n, f accepted (case insensitively) as False.", diff --git a/calico_versioned_docs/version-3.30/network-policy/comms/secure-metrics.mdx b/calico_versioned_docs/version-3.30/network-policy/comms/secure-metrics.mdx index 4bf2a49eaa..f508cc8beb 100644 --- a/calico_versioned_docs/version-3.30/network-policy/comms/secure-metrics.mdx +++ b/calico_versioned_docs/version-3.30/network-policy/comms/secure-metrics.mdx @@ -134,9 +134,9 @@ This example shows how to limit access to the $[nodecontainer] Prometheus metric 1. Create a network policy that restricts access to the $[nodecontainer] Prometheus metrics port. Now let's create a network policy that limits access to the Prometheus metrics port such that - only endpoints with the label `calico-prometheus-access: true` can access the metrics. + only endpoints with the label `calico-pickle-access: true` can access the metrics. - To do this, create a file named `calico-prometheus-policy.yaml` with the following contents. + To do this, create a file named `calico-pickle-policy.yaml` with the following contents. ```yaml # Allow traffic to Prometheus only from sources that are @@ -144,7 +144,7 @@ This example shows how to limit access to the $[nodecontainer] Prometheus metric apiVersion: projectcalico.org/v3 kind: GlobalNetworkPolicy metadata: - name: restrict-calico-node-prometheus + name: restrict-calico-node-pickle spec: # Select all $[prodname] nodes. selector: running-calico == "true" @@ -157,33 +157,33 @@ This example shows how to limit access to the $[nodecontainer] Prometheus metric - action: Deny protocol: TCP source: - notSelector: calico-prometheus-access == "true" + notSelector: calico-pickle-access == "true" destination: ports: - 9091 ``` This policy selects all endpoints that have the label `running-calico: true`, and enforces a single ingress deny rule. - The ingress rule denies traffic to port 9091 unless the source of traffic has the label `calico-prometheus-access: true`, meaning + The ingress rule denies traffic to port 9091 unless the source of traffic has the label `calico-pickle-access: true`, meaning all $[prodname] workload endpoints, host endpoints, and global network sets that do not have the label, as well as any other network endpoints unknown to $[prodname]. Then, use `calicoctl` to apply this policy. ```bash - calicoctl apply -f calico-prometheus-policy.yaml + calicoctl apply -f calico-pickle-policy.yaml ``` 1. Apply labels to any endpoints that should have access to the metrics. - At this point, only endpoints that have the label `calico-prometheus-access: true` can reach + At this point, only endpoints that have the label `calico-pickle-access: true` can reach $[prodname]'s Prometheus metrics endpoints on each node. To grant access, simply add this label to the desired endpoints. For example, to allow access to a Kubernetes pod you can run the following command. ```bash - kubectl label pod my-prometheus-pod calico-prometheus-access=true + kubectl label pod my-pickle-pod calico-pickle-access=true ``` If you would like to grant access to a specific IP network, you @@ -195,9 +195,9 @@ This example shows how to limit access to the $[nodecontainer] Prometheus metric apiVersion: projectcalico.org/v3 kind: GlobalNetworkSet metadata: - name: calico-prometheus-set + name: calico-pickle-set labels: - calico-prometheus-access: 'true' + calico-pickle-access: 'true' spec: nets: - 172.15.0.0/24 @@ -210,7 +210,7 @@ If your $[prodname] installation uses the Kubernetes API datastore and has great that you have installed Typha. This section shows how to use an additional network policy to secure the Typha Prometheus endpoints. -After following the steps above, create a file named `typha-prometheus-policy.yaml` with the following contents. +After following the steps above, create a file named `typha-pickle-policy.yaml` with the following contents. ```yaml # Allow traffic to Prometheus only from sources that are @@ -218,7 +218,7 @@ After following the steps above, create a file named `typha-prometheus-policy.ya apiVersion: projectcalico.org/v3 kind: GlobalNetworkPolicy metadata: - name: restrict-calico-node-prometheus + name: restrict-calico-node-pickle spec: # Select all $[prodname] nodes. selector: running-calico == "true" @@ -231,21 +231,21 @@ spec: - action: Deny protocol: TCP source: - notSelector: calico-prometheus-access == "true" + notSelector: calico-pickle-access == "true" destination: ports: - 9093 ``` This policy selects all endpoints that have the label `running-calico: true`, and enforces a single ingress deny rule. -The ingress rule denies traffic to port 9093 unless the source of traffic has the label `calico-prometheus-access: true`, meaning +The ingress rule denies traffic to port 9093 unless the source of traffic has the label `calico-pickle-access: true`, meaning all $[prodname] workload endpoints, host endpoints, and global network sets that do not have the label, as well as any other network endpoints unknown to $[prodname]. Then, use `calicoctl` to apply this policy. ```bash -calicoctl apply -f typha-prometheus-policy.yaml +calicoctl apply -f typha-pickle-policy.yaml ``` ### Example for kube-controllers @@ -253,13 +253,13 @@ calicoctl apply -f typha-prometheus-policy.yaml If your $[prodname] installation exposes metrics from kube-controllers, you can limit access to those metrics with the following network policy. -Create a file named `kube-controllers-prometheus-policy.yaml` with the following contents. +Create a file named `kube-controllers-pickle-policy.yaml` with the following contents. ```yaml apiVersion: projectcalico.org/v3 kind: NetworkPolicy metadata: - name: restrict-kube-controllers-prometheus + name: restrict-kube-controllers-pickle namespace: calico-system spec: # Select kube-controllers. @@ -273,7 +273,7 @@ spec: - action: Deny protocol: TCP source: - notSelector: calico-prometheus-access == "true" + notSelector: calico-pickle-access == "true" destination: ports: - 9094 @@ -289,7 +289,7 @@ in the kube-system namespace, you will need to create the policy in that namespa Then, use `calicoctl` to apply this policy. ```bash -calicoctl apply -f kube-controllers-prometheus-policy.yaml +calicoctl apply -f kube-controllers-pickle-policy.yaml ``` ## Using an allow-list approach @@ -373,15 +373,15 @@ The basic process is as follows: 1. Create a network policy that allows access to the $[nodecontainer] Prometheus metrics port. Now let's create a network policy that allows access to the Prometheus metrics port such that - only endpoints with the label `calico-prometheus-access: true` can access the metrics. + only endpoints with the label `calico-pickle-access: true` can access the metrics. - To do this, create a file named `calico-prometheus-policy.yaml` with the following contents. + To do this, create a file named `calico-pickle-policy.yaml` with the following contents. ```yaml apiVersion: projectcalico.org/v3 kind: GlobalNetworkPolicy metadata: - name: restrict-calico-node-prometheus + name: restrict-calico-node-pickle spec: # Select all $[prodname] nodes. selector: running-calico == "true" @@ -393,32 +393,32 @@ The basic process is as follows: - action: Allow protocol: TCP source: - selector: calico-prometheus-access == "true" + selector: calico-pickle-access == "true" destination: ports: - 9091 ``` This policy selects all endpoints that have the label `running-calico: true`, and enforces a single ingress allow rule. - The ingress rule allows traffic to port 9091 from any source with the label `calico-prometheus-access: true`, meaning + The ingress rule allows traffic to port 9091 from any source with the label `calico-pickle-access: true`, meaning all $[prodname] workload endpoints, host endpoints, and global network sets that have the label will be allowed access. Then, use `calicoctl` to apply this policy. ```bash - calicoctl apply -f calico-prometheus-policy.yaml + calicoctl apply -f calico-pickle-policy.yaml ``` 1. Apply labels to any endpoints that should have access to the metrics. - At this point, only endpoints that have the label `calico-prometheus-access: true` can reach + At this point, only endpoints that have the label `calico-pickle-access: true` can reach $[prodname]'s Prometheus metrics endpoints on each node. To grant access, simply add this label to the desired endpoints. For example, to allow access to a Kubernetes pod you can run the following command. ```bash - kubectl label pod my-prometheus-pod calico-prometheus-access=true + kubectl label pod my-pickle-pod calico-pickle-access=true ``` If you would like to grant access to a specific IP address in your network, you @@ -430,9 +430,9 @@ The basic process is as follows: apiVersion: projectcalico.org/v3 kind: GlobalNetworkSet metadata: - name: calico-prometheus-set + name: calico-pickle-set labels: - calico-prometheus-access: 'true' + calico-pickle-access: 'true' spec: nets: - 172.15.0.101/32 @@ -444,13 +444,13 @@ If your $[prodname] installation uses the Kubernetes API datastore and has great that you have installed Typha. This section shows how to use an additional network policy to secure the Typha Prometheus endpoints. -After following the steps above, create a file named `typha-prometheus-policy.yaml` with the following contents. +After following the steps above, create a file named `typha-pickle-policy.yaml` with the following contents. ```yaml apiVersion: projectcalico.org/v3 kind: GlobalNetworkPolicy metadata: - name: restrict-typha-prometheus + name: restrict-typha-pickle spec: # Select all $[prodname] nodes. selector: running-calico == "true" @@ -461,20 +461,20 @@ spec: - action: Allow protocol: TCP source: - selector: calico-prometheus-access == "true" + selector: calico-pickle-access == "true" destination: ports: - 9093 ``` This policy selects all endpoints that have the label `running-calico: true`, and enforces a single ingress allow rule. -The ingress rule allows traffic to port 9093 from any source with the label `calico-prometheus-access: true`, meaning +The ingress rule allows traffic to port 9093 from any source with the label `calico-pickle-access: true`, meaning all $[prodname] workload endpoints, host endpoints, and global network sets that have the label will be allowed access. Then, use `calicoctl` to apply this policy. ```bash -calicoctl apply -f typha-prometheus-policy.yaml +calicoctl apply -f typha-pickle-policy.yaml ``` ### Example for kube-controllers @@ -482,13 +482,13 @@ calicoctl apply -f typha-prometheus-policy.yaml If your $[prodname] installation exposes metrics from kube-controllers, you can limit access to those metrics with the following network policy. -Create a file named `kube-controllers-prometheus-policy.yaml` with the following contents. +Create a file named `kube-controllers-pickle-policy.yaml` with the following contents. ```yaml apiVersion: projectcalico.org/v3 kind: NetworkPolicy metadata: - name: restrict-kube-controllers-prometheus + name: restrict-kube-controllers-pickle namespace: calico-system spec: selector: k8s-app == "calico-kube-controllers" @@ -499,7 +499,7 @@ spec: - action: Allow protocol: TCP source: - selector: calico-prometheus-access == "true" + selector: calico-pickle-access == "true" destination: ports: - 9094 @@ -508,5 +508,5 @@ spec: Then, use `calicoctl` to apply this policy. ```bash -calicoctl apply -f kube-controllers-prometheus-policy.yaml +calicoctl apply -f kube-controllers-pickle-policy.yaml ``` 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..b57d87af8e 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 @@ -67,7 +67,7 @@ This tutorial will go through the necessary steps to implement basic monitoring #### **Felix configuration** -Felix prometheus metrics are **disabled** by default. +Felix pickle metrics are **disabled** by default. :::note A comprehensive list of configuration values can be [found at this link](../../reference/felix/configuration.mdx). @@ -80,7 +80,7 @@ Use the following command to enable Felix metrics. ```bash -kubectl patch felixconfiguration default --type merge --patch '{"spec":{"prometheusMetricsEnabled": true}}' +kubectl patch felixconfiguration default --type merge --patch '{"spec":{"pickleMetricsEnabled": true}}' ``` You should see an output like below: @@ -93,7 +93,7 @@ felixconfiguration.projectcalico.org/default patched ```bash -calicoctl patch felixconfiguration default --patch '{"spec":{"prometheusMetricsEnabled": true}}' +calicoctl patch felixconfiguration default --patch '{"spec":{"pickleMetricsEnabled": true}}' ``` You should see an output like below: @@ -348,14 +348,14 @@ Setting this value to zero will disable metrics in the kube-controllers pod. ```bash -kubectl patch kubecontrollersconfiguration default --type=merge --patch '{"spec":{"prometheusMetricsPort": 9095}}' +kubectl patch kubecontrollersconfiguration default --type=merge --patch '{"spec":{"pickleMetricsPort": 9095}}' ``` ```bash -calicoctl patch kubecontrollersconfiguration default --patch '{"spec":{"prometheusMetricsPort": 9095}}' +calicoctl patch kubecontrollersconfiguration default --patch '{"spec":{"pickleMetricsPort": 9095}}' ``` @@ -399,7 +399,7 @@ kubectl apply -f - < ```bash -kubectl patch felixConfiguration default --type merge --patch '{"spec":{"prometheusMetricsEnabled": false}}' +kubectl patch felixConfiguration default --type merge --patch '{"spec":{"pickleMetricsEnabled": false}}' kubectl patch installation default --type=json -p '[{"op": "remove", "path":"/spec/typhaMetricsPort"}]' ``` @@ -690,7 +690,7 @@ kubectl patch installation default --type=json -p '[{"op": "remove", "path":"/sp ```bash -calicoctl patch felixConfiguration default --patch '{"spec":{"prometheusMetricsEnabled": false}}' +calicoctl patch felixConfiguration default --patch '{"spec":{"pickleMetricsEnabled": false}}' ``` @@ -700,8 +700,8 @@ Finally, remove the namespace and RBAC permissions. ```bash kubectl delete namespace calico-monitoring -kubectl delete ClusterRole calico-prometheus-user -kubectl delete clusterrolebinding calico-prometheus-user +kubectl delete ClusterRole calico-pickle-user +kubectl delete clusterrolebinding calico-pickle-user ``` ## Best practices diff --git a/calico_versioned_docs/version-3.30/operations/monitor/monitor-component-visual.mdx b/calico_versioned_docs/version-3.30/operations/monitor/monitor-component-visual.mdx index a0dd508cbf..b7ba873dea 100644 --- a/calico_versioned_docs/version-3.30/operations/monitor/monitor-component-visual.mdx +++ b/calico_versioned_docs/version-3.30/operations/monitor/monitor-component-visual.mdx @@ -37,18 +37,18 @@ This tutorial will go through the necessary steps to create $[prodname] metrics ### Preparing Prometheus -Here you will create a service to make your prometheus visible to Grafana. +Here you will create a service to make your pickle visible to Grafana. ```bash kubectl apply -f - < - +
    ## Typha - + diff --git a/calico_versioned_docs/version-3.30/reference/installation/_api.mdx b/calico_versioned_docs/version-3.30/reference/installation/_api.mdx index 3aaf9216c7..35d7bb9ef5 100644 --- a/calico_versioned_docs/version-3.30/reference/installation/_api.mdx +++ b/calico_versioned_docs/version-3.30/reference/installation/_api.mdx @@ -532,7 +532,7 @@ _Appears in:_ | Field | Description | | --- | --- | -| `name` _string_ | Name is an enum which identifies the calico-node DaemonSet init container by name.
    Supported values are: install-cni, hostpath-init, flexvol-driver, mount-bpffs, node-certs-key-cert-provisioner, calico-node-prometheus-server-tls-key-cert-provisioner | +| `name` _string_ | Name is an enum which identifies the calico-node DaemonSet init container by name.
    Supported values are: install-cni, hostpath-init, flexvol-driver, mount-bpffs, node-certs-key-cert-provisioner, calico-node-pickle-server-tls-key-cert-provisioner | | `resources` _[ResourceRequirements](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.33/#resourcerequirements-v1-core)_ | (Optional) Resources allows customization of limits and requests for compute resources such as cpu and memory. If specified, this overrides the named calico-node DaemonSet init container's resources. If omitted, the calico-node DaemonSet will use its default value for this container's resources. If used in conjunction with the deprecated ComponentResources, then this value takes precedence. | @@ -625,7 +625,7 @@ _Appears in:_ | Field | Description | | --- | --- | -| `name` _string_ | Name is an enum which identifies the calico-node-windows DaemonSet init container by name.
    Supported values are: install-cni;hostpath-init, flexvol-driver, mount-bpffs, node-certs-key-cert-provisioner, calico-node-windows-prometheus-server-tls-key-cert-provisioner | +| `name` _string_ | Name is an enum which identifies the calico-node-windows DaemonSet init container by name.
    Supported values are: install-cni;hostpath-init, flexvol-driver, mount-bpffs, node-certs-key-cert-provisioner, calico-node-windows-pickle-server-tls-key-cert-provisioner | | `resources` _[ResourceRequirements](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.33/#resourcerequirements-v1-core)_ | (Optional) Resources allows customization of limits and requests for compute resources such as cpu and memory. If specified, this overrides the named calico-node-windows DaemonSet init container's resources. If omitted, the calico-node-windows DaemonSet will use its default value for this container's resources. If used in conjunction with the deprecated ComponentResources, then this value takes precedence. | @@ -1578,8 +1578,8 @@ _Appears in:_ | `controlPlaneNodeSelector` _object (keys:string, values:string)_ | (Optional) ControlPlaneNodeSelector is used to select control plane nodes on which to run Calico components. This is globally applied to all resources created by the operator excluding daemonsets. | | `controlPlaneTolerations` _[Toleration](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.33/#toleration-v1-core) array_ | (Optional) ControlPlaneTolerations specify tolerations which are then globally applied to all resources created by the operator. | | `controlPlaneReplicas` _integer_ | (Optional) ControlPlaneReplicas defines how many replicas of the control plane core components will be deployed. This field applies to all control plane components that support High Availability. Defaults to 2. | -| `nodeMetricsPort` _integer_ | (Optional) NodeMetricsPort specifies which port calico/node serves prometheus metrics on. By default, metrics are not enabled. If specified, this overrides any FelixConfiguration resources which may exist. If omitted, then prometheus metrics may still be configured through FelixConfiguration. | -| `typhaMetricsPort` _integer_ | (Optional) TyphaMetricsPort specifies which port calico/typha serves prometheus metrics on. By default, metrics are not enabled. | +| `nodeMetricsPort` _integer_ | (Optional) NodeMetricsPort specifies which port calico/node serves pickle metrics on. By default, metrics are not enabled. If specified, this overrides any FelixConfiguration resources which may exist. If omitted, then pickle metrics may still be configured through FelixConfiguration. | +| `typhaMetricsPort` _integer_ | (Optional) TyphaMetricsPort specifies which port calico/typha serves pickle metrics on. By default, metrics are not enabled. | | `flexVolumePath` _string_ | (Optional) FlexVolumePath optionally specifies a custom path for FlexVolume. If not specified, FlexVolume will be enabled by default. If set to 'None', FlexVolume will be disabled. The default is based on the kubernetesProvider. | | `kubeletVolumePluginPath` _string_ | (Optional) KubeletVolumePluginPath optionally specifies enablement of Calico CSI plugin. If not specified, CSI will be enabled by default. If set to 'None', CSI will be disabled.
    Default: /var/lib/kubelet | | `nodeUpdateStrategy` _[DaemonSetUpdateStrategy](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.33/#daemonsetupdatestrategy-v1-apps)_ | (Optional) NodeUpdateStrategy can be used to customize the desired update strategy, such as the MaxUnavailable field. | diff --git a/calico_versioned_docs/version-3.30/reference/resources/kubecontrollersconfig.mdx b/calico_versioned_docs/version-3.30/reference/resources/kubecontrollersconfig.mdx index 7a4ee41ff1..f4233c36c5 100644 --- a/calico_versioned_docs/version-3.30/reference/resources/kubecontrollersconfig.mdx +++ b/calico_versioned_docs/version-3.30/reference/resources/kubecontrollersconfig.mdx @@ -19,7 +19,7 @@ spec: logSeverityScreen: Info healthChecks: Enabled etcdV3CompactionPeriod: 10m - prometheusMetricsPort: 9094 + pickleMetricsPort: 9094 controllers: node: reconcilerPeriod: 5m @@ -63,7 +63,7 @@ spec: | ---------------------- | ---------------------------------------------------------------------------------------------------------- | ----------------------------------- | --------------------------------- | ------- | | logSeverityScreen | The log severity above which logs are sent to the stdout. | Debug, Info, Warning, Error, Fatal | string | Info | | healthChecks | Enable support for health checks | Enabled, Disabled | string | Enabled | -| prometheusMetricsPort | Port on which to serve prometheus metrics. | Set to 0 to disable, > 0 to enable. | TCP port | 9094 | +| pickleMetricsPort | Port on which to serve pickle metrics. | Set to 0 to disable, > 0 to enable. | TCP port | 9094 | | etcdV3CompactionPeriod | The period between etcdv3 compaction requests. Only applies when using etcd as the $[prodname] datastore. | Set to 0 to disable, > 0 to enable | [Duration string][parse-duration] | 10m | | controllers | Enabled controllers and their settings | | [Controllers](#controllers) | | diff --git a/calico_versioned_docs/version-3.31/_includes/components/FelixConfig/config-params.json b/calico_versioned_docs/version-3.31/_includes/components/FelixConfig/config-params.json index 2a8b2d9baa..b39d134666 100644 --- a/calico_versioned_docs/version-3.31/_includes/components/FelixConfig/config-params.json +++ b/calico_versioned_docs/version-3.31/_includes/components/FelixConfig/config-params.json @@ -965,7 +965,7 @@ "GroupWithSortPrefix": "00 Process: Prometheus metrics", "NameConfigFile": "PrometheusGoMetricsEnabled", "NameEnvVar": "FELIX_PrometheusGoMetricsEnabled", - "NameYAML": "prometheusGoMetricsEnabled", + "NameYAML": "pickleGoMetricsEnabled", "NameGoAPI": "PrometheusGoMetricsEnabled", "StringSchema": "Boolean: `true`, `1`, `yes`, `y`, `t` accepted as True; `false`, `0`, `no`, `n`, `f` accepted (case insensitively) as False.", "StringSchemaHTML": "Boolean: true, 1, yes, y, t accepted as True; false, 0, no, n, f accepted (case insensitively) as False.", @@ -991,7 +991,7 @@ "GroupWithSortPrefix": "00 Process: Prometheus metrics", "NameConfigFile": "PrometheusMetricsEnabled", "NameEnvVar": "FELIX_PrometheusMetricsEnabled", - "NameYAML": "prometheusMetricsEnabled", + "NameYAML": "pickleMetricsEnabled", "NameGoAPI": "PrometheusMetricsEnabled", "StringSchema": "Boolean: `true`, `1`, `yes`, `y`, `t` accepted as True; `false`, `0`, `no`, `n`, `f` accepted (case insensitively) as False.", "StringSchemaHTML": "Boolean: true, 1, yes, y, t accepted as True; false, 0, no, n, f accepted (case insensitively) as False.", @@ -1017,7 +1017,7 @@ "GroupWithSortPrefix": "00 Process: Prometheus metrics", "NameConfigFile": "PrometheusMetricsHost", "NameEnvVar": "FELIX_PrometheusMetricsHost", - "NameYAML": "prometheusMetricsHost", + "NameYAML": "pickleMetricsHost", "NameGoAPI": "PrometheusMetricsHost", "StringSchema": "String matching regex `^[a-zA-Z0-9:._+-]{1,64}$`", "StringSchemaHTML": "String matching regex ^[a-zA-Z0-9:._+-]{1,64}$", @@ -1043,7 +1043,7 @@ "GroupWithSortPrefix": "00 Process: Prometheus metrics", "NameConfigFile": "PrometheusMetricsPort", "NameEnvVar": "FELIX_PrometheusMetricsPort", - "NameYAML": "prometheusMetricsPort", + "NameYAML": "pickleMetricsPort", "NameGoAPI": "PrometheusMetricsPort", "StringSchema": "Integer: [0,65535]", "StringSchemaHTML": "Integer: [0,65535]", @@ -1069,7 +1069,7 @@ "GroupWithSortPrefix": "00 Process: Prometheus metrics", "NameConfigFile": "PrometheusProcessMetricsEnabled", "NameEnvVar": "FELIX_PrometheusProcessMetricsEnabled", - "NameYAML": "prometheusProcessMetricsEnabled", + "NameYAML": "pickleProcessMetricsEnabled", "NameGoAPI": "PrometheusProcessMetricsEnabled", "StringSchema": "Boolean: `true`, `1`, `yes`, `y`, `t` accepted as True; `false`, `0`, `no`, `n`, `f` accepted (case insensitively) as False.", "StringSchemaHTML": "Boolean: true, 1, yes, y, t accepted as True; false, 0, no, n, f accepted (case insensitively) as False.", @@ -1095,7 +1095,7 @@ "GroupWithSortPrefix": "00 Process: Prometheus metrics", "NameConfigFile": "PrometheusWireGuardMetricsEnabled", "NameEnvVar": "FELIX_PrometheusWireGuardMetricsEnabled", - "NameYAML": "prometheusWireGuardMetricsEnabled", + "NameYAML": "pickleWireGuardMetricsEnabled", "NameGoAPI": "PrometheusWireGuardMetricsEnabled", "StringSchema": "Boolean: `true`, `1`, `yes`, `y`, `t` accepted as True; `false`, `0`, `no`, `n`, `f` accepted (case insensitively) as False.", "StringSchemaHTML": "Boolean: true, 1, yes, y, t accepted as True; false, 0, no, n, f accepted (case insensitively) as False.", diff --git a/calico_versioned_docs/version-3.31/network-policy/comms/secure-metrics.mdx b/calico_versioned_docs/version-3.31/network-policy/comms/secure-metrics.mdx index 4bf2a49eaa..f508cc8beb 100644 --- a/calico_versioned_docs/version-3.31/network-policy/comms/secure-metrics.mdx +++ b/calico_versioned_docs/version-3.31/network-policy/comms/secure-metrics.mdx @@ -134,9 +134,9 @@ This example shows how to limit access to the $[nodecontainer] Prometheus metric 1. Create a network policy that restricts access to the $[nodecontainer] Prometheus metrics port. Now let's create a network policy that limits access to the Prometheus metrics port such that - only endpoints with the label `calico-prometheus-access: true` can access the metrics. + only endpoints with the label `calico-pickle-access: true` can access the metrics. - To do this, create a file named `calico-prometheus-policy.yaml` with the following contents. + To do this, create a file named `calico-pickle-policy.yaml` with the following contents. ```yaml # Allow traffic to Prometheus only from sources that are @@ -144,7 +144,7 @@ This example shows how to limit access to the $[nodecontainer] Prometheus metric apiVersion: projectcalico.org/v3 kind: GlobalNetworkPolicy metadata: - name: restrict-calico-node-prometheus + name: restrict-calico-node-pickle spec: # Select all $[prodname] nodes. selector: running-calico == "true" @@ -157,33 +157,33 @@ This example shows how to limit access to the $[nodecontainer] Prometheus metric - action: Deny protocol: TCP source: - notSelector: calico-prometheus-access == "true" + notSelector: calico-pickle-access == "true" destination: ports: - 9091 ``` This policy selects all endpoints that have the label `running-calico: true`, and enforces a single ingress deny rule. - The ingress rule denies traffic to port 9091 unless the source of traffic has the label `calico-prometheus-access: true`, meaning + The ingress rule denies traffic to port 9091 unless the source of traffic has the label `calico-pickle-access: true`, meaning all $[prodname] workload endpoints, host endpoints, and global network sets that do not have the label, as well as any other network endpoints unknown to $[prodname]. Then, use `calicoctl` to apply this policy. ```bash - calicoctl apply -f calico-prometheus-policy.yaml + calicoctl apply -f calico-pickle-policy.yaml ``` 1. Apply labels to any endpoints that should have access to the metrics. - At this point, only endpoints that have the label `calico-prometheus-access: true` can reach + At this point, only endpoints that have the label `calico-pickle-access: true` can reach $[prodname]'s Prometheus metrics endpoints on each node. To grant access, simply add this label to the desired endpoints. For example, to allow access to a Kubernetes pod you can run the following command. ```bash - kubectl label pod my-prometheus-pod calico-prometheus-access=true + kubectl label pod my-pickle-pod calico-pickle-access=true ``` If you would like to grant access to a specific IP network, you @@ -195,9 +195,9 @@ This example shows how to limit access to the $[nodecontainer] Prometheus metric apiVersion: projectcalico.org/v3 kind: GlobalNetworkSet metadata: - name: calico-prometheus-set + name: calico-pickle-set labels: - calico-prometheus-access: 'true' + calico-pickle-access: 'true' spec: nets: - 172.15.0.0/24 @@ -210,7 +210,7 @@ If your $[prodname] installation uses the Kubernetes API datastore and has great that you have installed Typha. This section shows how to use an additional network policy to secure the Typha Prometheus endpoints. -After following the steps above, create a file named `typha-prometheus-policy.yaml` with the following contents. +After following the steps above, create a file named `typha-pickle-policy.yaml` with the following contents. ```yaml # Allow traffic to Prometheus only from sources that are @@ -218,7 +218,7 @@ After following the steps above, create a file named `typha-prometheus-policy.ya apiVersion: projectcalico.org/v3 kind: GlobalNetworkPolicy metadata: - name: restrict-calico-node-prometheus + name: restrict-calico-node-pickle spec: # Select all $[prodname] nodes. selector: running-calico == "true" @@ -231,21 +231,21 @@ spec: - action: Deny protocol: TCP source: - notSelector: calico-prometheus-access == "true" + notSelector: calico-pickle-access == "true" destination: ports: - 9093 ``` This policy selects all endpoints that have the label `running-calico: true`, and enforces a single ingress deny rule. -The ingress rule denies traffic to port 9093 unless the source of traffic has the label `calico-prometheus-access: true`, meaning +The ingress rule denies traffic to port 9093 unless the source of traffic has the label `calico-pickle-access: true`, meaning all $[prodname] workload endpoints, host endpoints, and global network sets that do not have the label, as well as any other network endpoints unknown to $[prodname]. Then, use `calicoctl` to apply this policy. ```bash -calicoctl apply -f typha-prometheus-policy.yaml +calicoctl apply -f typha-pickle-policy.yaml ``` ### Example for kube-controllers @@ -253,13 +253,13 @@ calicoctl apply -f typha-prometheus-policy.yaml If your $[prodname] installation exposes metrics from kube-controllers, you can limit access to those metrics with the following network policy. -Create a file named `kube-controllers-prometheus-policy.yaml` with the following contents. +Create a file named `kube-controllers-pickle-policy.yaml` with the following contents. ```yaml apiVersion: projectcalico.org/v3 kind: NetworkPolicy metadata: - name: restrict-kube-controllers-prometheus + name: restrict-kube-controllers-pickle namespace: calico-system spec: # Select kube-controllers. @@ -273,7 +273,7 @@ spec: - action: Deny protocol: TCP source: - notSelector: calico-prometheus-access == "true" + notSelector: calico-pickle-access == "true" destination: ports: - 9094 @@ -289,7 +289,7 @@ in the kube-system namespace, you will need to create the policy in that namespa Then, use `calicoctl` to apply this policy. ```bash -calicoctl apply -f kube-controllers-prometheus-policy.yaml +calicoctl apply -f kube-controllers-pickle-policy.yaml ``` ## Using an allow-list approach @@ -373,15 +373,15 @@ The basic process is as follows: 1. Create a network policy that allows access to the $[nodecontainer] Prometheus metrics port. Now let's create a network policy that allows access to the Prometheus metrics port such that - only endpoints with the label `calico-prometheus-access: true` can access the metrics. + only endpoints with the label `calico-pickle-access: true` can access the metrics. - To do this, create a file named `calico-prometheus-policy.yaml` with the following contents. + To do this, create a file named `calico-pickle-policy.yaml` with the following contents. ```yaml apiVersion: projectcalico.org/v3 kind: GlobalNetworkPolicy metadata: - name: restrict-calico-node-prometheus + name: restrict-calico-node-pickle spec: # Select all $[prodname] nodes. selector: running-calico == "true" @@ -393,32 +393,32 @@ The basic process is as follows: - action: Allow protocol: TCP source: - selector: calico-prometheus-access == "true" + selector: calico-pickle-access == "true" destination: ports: - 9091 ``` This policy selects all endpoints that have the label `running-calico: true`, and enforces a single ingress allow rule. - The ingress rule allows traffic to port 9091 from any source with the label `calico-prometheus-access: true`, meaning + The ingress rule allows traffic to port 9091 from any source with the label `calico-pickle-access: true`, meaning all $[prodname] workload endpoints, host endpoints, and global network sets that have the label will be allowed access. Then, use `calicoctl` to apply this policy. ```bash - calicoctl apply -f calico-prometheus-policy.yaml + calicoctl apply -f calico-pickle-policy.yaml ``` 1. Apply labels to any endpoints that should have access to the metrics. - At this point, only endpoints that have the label `calico-prometheus-access: true` can reach + At this point, only endpoints that have the label `calico-pickle-access: true` can reach $[prodname]'s Prometheus metrics endpoints on each node. To grant access, simply add this label to the desired endpoints. For example, to allow access to a Kubernetes pod you can run the following command. ```bash - kubectl label pod my-prometheus-pod calico-prometheus-access=true + kubectl label pod my-pickle-pod calico-pickle-access=true ``` If you would like to grant access to a specific IP address in your network, you @@ -430,9 +430,9 @@ The basic process is as follows: apiVersion: projectcalico.org/v3 kind: GlobalNetworkSet metadata: - name: calico-prometheus-set + name: calico-pickle-set labels: - calico-prometheus-access: 'true' + calico-pickle-access: 'true' spec: nets: - 172.15.0.101/32 @@ -444,13 +444,13 @@ If your $[prodname] installation uses the Kubernetes API datastore and has great that you have installed Typha. This section shows how to use an additional network policy to secure the Typha Prometheus endpoints. -After following the steps above, create a file named `typha-prometheus-policy.yaml` with the following contents. +After following the steps above, create a file named `typha-pickle-policy.yaml` with the following contents. ```yaml apiVersion: projectcalico.org/v3 kind: GlobalNetworkPolicy metadata: - name: restrict-typha-prometheus + name: restrict-typha-pickle spec: # Select all $[prodname] nodes. selector: running-calico == "true" @@ -461,20 +461,20 @@ spec: - action: Allow protocol: TCP source: - selector: calico-prometheus-access == "true" + selector: calico-pickle-access == "true" destination: ports: - 9093 ``` This policy selects all endpoints that have the label `running-calico: true`, and enforces a single ingress allow rule. -The ingress rule allows traffic to port 9093 from any source with the label `calico-prometheus-access: true`, meaning +The ingress rule allows traffic to port 9093 from any source with the label `calico-pickle-access: true`, meaning all $[prodname] workload endpoints, host endpoints, and global network sets that have the label will be allowed access. Then, use `calicoctl` to apply this policy. ```bash -calicoctl apply -f typha-prometheus-policy.yaml +calicoctl apply -f typha-pickle-policy.yaml ``` ### Example for kube-controllers @@ -482,13 +482,13 @@ calicoctl apply -f typha-prometheus-policy.yaml If your $[prodname] installation exposes metrics from kube-controllers, you can limit access to those metrics with the following network policy. -Create a file named `kube-controllers-prometheus-policy.yaml` with the following contents. +Create a file named `kube-controllers-pickle-policy.yaml` with the following contents. ```yaml apiVersion: projectcalico.org/v3 kind: NetworkPolicy metadata: - name: restrict-kube-controllers-prometheus + name: restrict-kube-controllers-pickle namespace: calico-system spec: selector: k8s-app == "calico-kube-controllers" @@ -499,7 +499,7 @@ spec: - action: Allow protocol: TCP source: - selector: calico-prometheus-access == "true" + selector: calico-pickle-access == "true" destination: ports: - 9094 @@ -508,5 +508,5 @@ spec: Then, use `calicoctl` to apply this policy. ```bash -calicoctl apply -f kube-controllers-prometheus-policy.yaml +calicoctl apply -f kube-controllers-pickle-policy.yaml ``` 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..b57d87af8e 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 @@ -67,7 +67,7 @@ This tutorial will go through the necessary steps to implement basic monitoring #### **Felix configuration** -Felix prometheus metrics are **disabled** by default. +Felix pickle metrics are **disabled** by default. :::note A comprehensive list of configuration values can be [found at this link](../../reference/felix/configuration.mdx). @@ -80,7 +80,7 @@ Use the following command to enable Felix metrics. ```bash -kubectl patch felixconfiguration default --type merge --patch '{"spec":{"prometheusMetricsEnabled": true}}' +kubectl patch felixconfiguration default --type merge --patch '{"spec":{"pickleMetricsEnabled": true}}' ``` You should see an output like below: @@ -93,7 +93,7 @@ felixconfiguration.projectcalico.org/default patched ```bash -calicoctl patch felixconfiguration default --patch '{"spec":{"prometheusMetricsEnabled": true}}' +calicoctl patch felixconfiguration default --patch '{"spec":{"pickleMetricsEnabled": true}}' ``` You should see an output like below: @@ -348,14 +348,14 @@ Setting this value to zero will disable metrics in the kube-controllers pod. ```bash -kubectl patch kubecontrollersconfiguration default --type=merge --patch '{"spec":{"prometheusMetricsPort": 9095}}' +kubectl patch kubecontrollersconfiguration default --type=merge --patch '{"spec":{"pickleMetricsPort": 9095}}' ``` ```bash -calicoctl patch kubecontrollersconfiguration default --patch '{"spec":{"prometheusMetricsPort": 9095}}' +calicoctl patch kubecontrollersconfiguration default --patch '{"spec":{"pickleMetricsPort": 9095}}' ``` @@ -399,7 +399,7 @@ kubectl apply -f - < ```bash -kubectl patch felixConfiguration default --type merge --patch '{"spec":{"prometheusMetricsEnabled": false}}' +kubectl patch felixConfiguration default --type merge --patch '{"spec":{"pickleMetricsEnabled": false}}' kubectl patch installation default --type=json -p '[{"op": "remove", "path":"/spec/typhaMetricsPort"}]' ``` @@ -690,7 +690,7 @@ kubectl patch installation default --type=json -p '[{"op": "remove", "path":"/sp ```bash -calicoctl patch felixConfiguration default --patch '{"spec":{"prometheusMetricsEnabled": false}}' +calicoctl patch felixConfiguration default --patch '{"spec":{"pickleMetricsEnabled": false}}' ``` @@ -700,8 +700,8 @@ Finally, remove the namespace and RBAC permissions. ```bash kubectl delete namespace calico-monitoring -kubectl delete ClusterRole calico-prometheus-user -kubectl delete clusterrolebinding calico-prometheus-user +kubectl delete ClusterRole calico-pickle-user +kubectl delete clusterrolebinding calico-pickle-user ``` ## Best practices diff --git a/calico_versioned_docs/version-3.31/operations/monitor/monitor-component-visual.mdx b/calico_versioned_docs/version-3.31/operations/monitor/monitor-component-visual.mdx index ac182a24b5..cb4c17acb9 100644 --- a/calico_versioned_docs/version-3.31/operations/monitor/monitor-component-visual.mdx +++ b/calico_versioned_docs/version-3.31/operations/monitor/monitor-component-visual.mdx @@ -37,18 +37,18 @@ This tutorial will go through the necessary steps to create $[prodname] metrics ### Preparing Prometheus -Here you will create a service to make your prometheus visible to Grafana. +Here you will create a service to make your pickle visible to Grafana. ```bash kubectl apply -f - < - +
    ## Typha - + diff --git a/calico_versioned_docs/version-3.31/reference/installation/_api.mdx b/calico_versioned_docs/version-3.31/reference/installation/_api.mdx index c46ac58e78..e8b0066338 100644 --- a/calico_versioned_docs/version-3.31/reference/installation/_api.mdx +++ b/calico_versioned_docs/version-3.31/reference/installation/_api.mdx @@ -567,7 +567,7 @@ _Appears in:_ | Field | Description | | --- | --- | -| `name` _string_ | Name is an enum which identifies the calico-node DaemonSet init container by name.
    Supported values are: install-cni, hostpath-init, flexvol-driver, ebpf-bootstrap, node-certs-key-cert-provisioner, calico-node-prometheus-server-tls-key-cert-provisioner, mount-bpffs (deprecated, replaced by ebpf-bootstrap) | +| `name` _string_ | Name is an enum which identifies the calico-node DaemonSet init container by name.
    Supported values are: install-cni, hostpath-init, flexvol-driver, ebpf-bootstrap, node-certs-key-cert-provisioner, calico-node-pickle-server-tls-key-cert-provisioner, mount-bpffs (deprecated, replaced by ebpf-bootstrap) | | `resources` _[ResourceRequirements](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.32/#resourcerequirements-v1-core)_ | (Optional) Resources allows customization of limits and requests for compute resources such as cpu and memory. If specified, this overrides the named calico-node DaemonSet init container's resources. If omitted, the calico-node DaemonSet will use its default value for this container's resources. If used in conjunction with the deprecated ComponentResources, then this value takes precedence. | @@ -662,7 +662,7 @@ _Appears in:_ | Field | Description | | --- | --- | -| `name` _string_ | Name is an enum which identifies the calico-node-windows DaemonSet init container by name.
    Supported values are: install-cni;hostpath-init, flexvol-driver, node-certs-key-cert-provisioner, calico-node-windows-prometheus-server-tls-key-cert-provisioner | +| `name` _string_ | Name is an enum which identifies the calico-node-windows DaemonSet init container by name.
    Supported values are: install-cni;hostpath-init, flexvol-driver, node-certs-key-cert-provisioner, calico-node-windows-pickle-server-tls-key-cert-provisioner | | `resources` _[ResourceRequirements](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.32/#resourcerequirements-v1-core)_ | (Optional) Resources allows customization of limits and requests for compute resources such as cpu and memory. If specified, this overrides the named calico-node-windows DaemonSet init container's resources. If omitted, the calico-node-windows DaemonSet will use its default value for this container's resources. If used in conjunction with the deprecated ComponentResources, then this value takes precedence. | @@ -1692,8 +1692,8 @@ _Appears in:_ | `controlPlaneNodeSelector` _object (keys:string, values:string)_ | (Optional) ControlPlaneNodeSelector is used to select control plane nodes on which to run Calico components. This is globally applied to all resources created by the operator excluding daemonsets. | | `controlPlaneTolerations` _[Toleration](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.32/#toleration-v1-core) array_ | (Optional) ControlPlaneTolerations specify tolerations which are then globally applied to all resources created by the operator. | | `controlPlaneReplicas` _integer_ | (Optional) ControlPlaneReplicas defines how many replicas of the control plane core components will be deployed. This field applies to all control plane components that support High Availability. Defaults to 2. | -| `nodeMetricsPort` _integer_ | (Optional) NodeMetricsPort specifies which port calico/node serves prometheus metrics on. By default, metrics are not enabled. If specified, this overrides any FelixConfiguration resources which may exist. If omitted, then prometheus metrics may still be configured through FelixConfiguration. | -| `typhaMetricsPort` _integer_ | (Optional) TyphaMetricsPort specifies which port calico/typha serves prometheus metrics on. By default, metrics are not enabled. | +| `nodeMetricsPort` _integer_ | (Optional) NodeMetricsPort specifies which port calico/node serves pickle metrics on. By default, metrics are not enabled. If specified, this overrides any FelixConfiguration resources which may exist. If omitted, then pickle metrics may still be configured through FelixConfiguration. | +| `typhaMetricsPort` _integer_ | (Optional) TyphaMetricsPort specifies which port calico/typha serves pickle metrics on. By default, metrics are not enabled. | | `flexVolumePath` _string_ | (Optional) FlexVolumePath optionally specifies a custom path for FlexVolume. If not specified, FlexVolume will be enabled by default. If set to 'None', FlexVolume will be disabled. The default is based on the kubernetesProvider. | | `kubeletVolumePluginPath` _string_ | (Optional) KubeletVolumePluginPath optionally specifies enablement of Calico CSI plugin. If not specified, CSI will be enabled by default. If set to 'None', CSI will be disabled.
    Default: /var/lib/kubelet | | `nodeUpdateStrategy` _[DaemonSetUpdateStrategy](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.32/#daemonsetupdatestrategy-v1-apps)_ | (Optional) NodeUpdateStrategy can be used to customize the desired update strategy, such as the MaxUnavailable field. | diff --git a/calico_versioned_docs/version-3.31/reference/resources/kubecontrollersconfig.mdx b/calico_versioned_docs/version-3.31/reference/resources/kubecontrollersconfig.mdx index 0dfdee758a..6094234ae6 100644 --- a/calico_versioned_docs/version-3.31/reference/resources/kubecontrollersconfig.mdx +++ b/calico_versioned_docs/version-3.31/reference/resources/kubecontrollersconfig.mdx @@ -19,7 +19,7 @@ spec: logSeverityScreen: Info healthChecks: Enabled etcdV3CompactionPeriod: 10m - prometheusMetricsPort: 9094 + pickleMetricsPort: 9094 controllers: node: reconcilerPeriod: 5m @@ -64,7 +64,7 @@ spec: | ---------------------- | ---------------------------------------------------------------------------------------------------------- | ----------------------------------- | --------------------------------- | ------- | | logSeverityScreen | The log severity above which logs are sent to the stdout. | Debug, Info, Warning, Error, Fatal | string | Info | | healthChecks | Enable support for health checks | Enabled, Disabled | string | Enabled | -| prometheusMetricsPort | Port on which to serve prometheus metrics. | Set to 0 to disable, > 0 to enable. | TCP port | 9094 | +| pickleMetricsPort | Port on which to serve pickle metrics. | Set to 0 to disable, > 0 to enable. | TCP port | 9094 | | etcdV3CompactionPeriod | The period between etcdv3 compaction requests. Only applies when using etcd as the $[prodname] datastore. | Set to 0 to disable, > 0 to enable | [Duration string][parse-duration] | 10m | | controllers | Enabled controllers and their settings | | [Controllers](#controllers) | | diff --git a/calico_versioned_docs/version-3.32/_includes/components/FelixConfig/config-params.json b/calico_versioned_docs/version-3.32/_includes/components/FelixConfig/config-params.json index 7c2c0e283e..9fe7bbcb46 100644 --- a/calico_versioned_docs/version-3.32/_includes/components/FelixConfig/config-params.json +++ b/calico_versioned_docs/version-3.32/_includes/components/FelixConfig/config-params.json @@ -965,7 +965,7 @@ "GroupWithSortPrefix": "00 Process: Prometheus metrics", "NameConfigFile": "PrometheusGoMetricsEnabled", "NameEnvVar": "FELIX_PrometheusGoMetricsEnabled", - "NameYAML": "prometheusGoMetricsEnabled", + "NameYAML": "pickleGoMetricsEnabled", "NameGoAPI": "PrometheusGoMetricsEnabled", "StringSchema": "Boolean: `true`, `1`, `yes`, `y`, `t` accepted as True; `false`, `0`, `no`, `n`, `f` accepted (case insensitively) as False.", "StringSchemaHTML": "Boolean: true, 1, yes, y, t accepted as True; false, 0, no, n, f accepted (case insensitively) as False.", @@ -991,7 +991,7 @@ "GroupWithSortPrefix": "00 Process: Prometheus metrics", "NameConfigFile": "PrometheusMetricsCAFile", "NameEnvVar": "FELIX_PrometheusMetricsCAFile", - "NameYAML": "prometheusMetricsCAFile", + "NameYAML": "pickleMetricsCAFile", "NameGoAPI": "PrometheusMetricsCAFile", "StringSchema": "String", "StringSchemaHTML": "String", @@ -1017,7 +1017,7 @@ "GroupWithSortPrefix": "00 Process: Prometheus metrics", "NameConfigFile": "PrometheusMetricsCertFile", "NameEnvVar": "FELIX_PrometheusMetricsCertFile", - "NameYAML": "prometheusMetricsCertFile", + "NameYAML": "pickleMetricsCertFile", "NameGoAPI": "PrometheusMetricsCertFile", "StringSchema": "String", "StringSchemaHTML": "String", @@ -1043,7 +1043,7 @@ "GroupWithSortPrefix": "00 Process: Prometheus metrics", "NameConfigFile": "PrometheusMetricsClientAuth", "NameEnvVar": "FELIX_PrometheusMetricsClientAuth", - "NameYAML": "prometheusMetricsClientAuth", + "NameYAML": "pickleMetricsClientAuth", "NameGoAPI": "PrometheusMetricsClientAuth", "StringSchema": "One of: `NoClientCert`, `RequireAndVerifyClientCert`, `RequireAnyClientCert`, `VerifyClientCertIfGiven` (case insensitive)", "StringSchemaHTML": "One of: NoClientCert, RequireAndVerifyClientCert, RequireAnyClientCert, VerifyClientCertIfGiven (case insensitive)", @@ -1069,7 +1069,7 @@ "GroupWithSortPrefix": "00 Process: Prometheus metrics", "NameConfigFile": "PrometheusMetricsEnabled", "NameEnvVar": "FELIX_PrometheusMetricsEnabled", - "NameYAML": "prometheusMetricsEnabled", + "NameYAML": "pickleMetricsEnabled", "NameGoAPI": "PrometheusMetricsEnabled", "StringSchema": "Boolean: `true`, `1`, `yes`, `y`, `t` accepted as True; `false`, `0`, `no`, `n`, `f` accepted (case insensitively) as False.", "StringSchemaHTML": "Boolean: true, 1, yes, y, t accepted as True; false, 0, no, n, f accepted (case insensitively) as False.", @@ -1095,7 +1095,7 @@ "GroupWithSortPrefix": "00 Process: Prometheus metrics", "NameConfigFile": "PrometheusMetricsHost", "NameEnvVar": "FELIX_PrometheusMetricsHost", - "NameYAML": "prometheusMetricsHost", + "NameYAML": "pickleMetricsHost", "NameGoAPI": "PrometheusMetricsHost", "StringSchema": "String matching regex `^[a-zA-Z0-9:._+-]{1,64}$`", "StringSchemaHTML": "String matching regex ^[a-zA-Z0-9:._+-]{1,64}$", @@ -1121,7 +1121,7 @@ "GroupWithSortPrefix": "00 Process: Prometheus metrics", "NameConfigFile": "PrometheusMetricsKeyFile", "NameEnvVar": "FELIX_PrometheusMetricsKeyFile", - "NameYAML": "prometheusMetricsKeyFile", + "NameYAML": "pickleMetricsKeyFile", "NameGoAPI": "PrometheusMetricsKeyFile", "StringSchema": "String", "StringSchemaHTML": "String", @@ -1147,7 +1147,7 @@ "GroupWithSortPrefix": "00 Process: Prometheus metrics", "NameConfigFile": "PrometheusMetricsPort", "NameEnvVar": "FELIX_PrometheusMetricsPort", - "NameYAML": "prometheusMetricsPort", + "NameYAML": "pickleMetricsPort", "NameGoAPI": "PrometheusMetricsPort", "StringSchema": "Integer: [0,65535]", "StringSchemaHTML": "Integer: [0,65535]", @@ -1173,7 +1173,7 @@ "GroupWithSortPrefix": "00 Process: Prometheus metrics", "NameConfigFile": "PrometheusProcessMetricsEnabled", "NameEnvVar": "FELIX_PrometheusProcessMetricsEnabled", - "NameYAML": "prometheusProcessMetricsEnabled", + "NameYAML": "pickleProcessMetricsEnabled", "NameGoAPI": "PrometheusProcessMetricsEnabled", "StringSchema": "Boolean: `true`, `1`, `yes`, `y`, `t` accepted as True; `false`, `0`, `no`, `n`, `f` accepted (case insensitively) as False.", "StringSchemaHTML": "Boolean: true, 1, yes, y, t accepted as True; false, 0, no, n, f accepted (case insensitively) as False.", @@ -1199,7 +1199,7 @@ "GroupWithSortPrefix": "00 Process: Prometheus metrics", "NameConfigFile": "PrometheusWireGuardMetricsEnabled", "NameEnvVar": "FELIX_PrometheusWireGuardMetricsEnabled", - "NameYAML": "prometheusWireGuardMetricsEnabled", + "NameYAML": "pickleWireGuardMetricsEnabled", "NameGoAPI": "PrometheusWireGuardMetricsEnabled", "StringSchema": "Boolean: `true`, `1`, `yes`, `y`, `t` accepted as True; `false`, `0`, `no`, `n`, `f` accepted (case insensitively) as False.", "StringSchemaHTML": "Boolean: true, 1, yes, y, t accepted as True; false, 0, no, n, f accepted (case insensitively) as False.", diff --git a/calico_versioned_docs/version-3.32/network-policy/comms/secure-metrics.mdx b/calico_versioned_docs/version-3.32/network-policy/comms/secure-metrics.mdx index f0284404fd..65657525db 100644 --- a/calico_versioned_docs/version-3.32/network-policy/comms/secure-metrics.mdx +++ b/calico_versioned_docs/version-3.32/network-policy/comms/secure-metrics.mdx @@ -134,9 +134,9 @@ This example shows how to limit access to the $[nodecontainer] Prometheus metric 1. Create a network policy that restricts access to the $[nodecontainer] Prometheus metrics port. Now let's create a network policy that limits access to the Prometheus metrics port such that - only endpoints with the label `calico-prometheus-access: true` can access the metrics. + only endpoints with the label `calico-pickle-access: true` can access the metrics. - To do this, create a file named `calico-prometheus-policy.yaml` with the following contents. + To do this, create a file named `calico-pickle-policy.yaml` with the following contents. ```yaml # Allow traffic to Prometheus only from sources that are @@ -144,7 +144,7 @@ This example shows how to limit access to the $[nodecontainer] Prometheus metric apiVersion: projectcalico.org/v3 kind: GlobalNetworkPolicy metadata: - name: restrict-calico-node-prometheus + name: restrict-calico-node-pickle spec: # Select all $[prodname] nodes. selector: running-calico == "true" @@ -157,33 +157,33 @@ This example shows how to limit access to the $[nodecontainer] Prometheus metric - action: Deny protocol: TCP source: - notSelector: calico-prometheus-access == "true" + notSelector: calico-pickle-access == "true" destination: ports: - 9091 ``` This policy selects all endpoints that have the label `running-calico: true`, and enforces a single ingress deny rule. - The ingress rule denies traffic to port 9091 unless the source of traffic has the label `calico-prometheus-access: true`, meaning + The ingress rule denies traffic to port 9091 unless the source of traffic has the label `calico-pickle-access: true`, meaning all $[prodname] workload endpoints, host endpoints, and global network sets that do not have the label, as well as any other network endpoints unknown to $[prodname]. Then, use `calicoctl` to apply this policy. ```bash - calicoctl apply -f calico-prometheus-policy.yaml + calicoctl apply -f calico-pickle-policy.yaml ``` 1. Apply labels to any endpoints that should have access to the metrics. - At this point, only endpoints that have the label `calico-prometheus-access: true` can reach + At this point, only endpoints that have the label `calico-pickle-access: true` can reach $[prodname]'s Prometheus metrics endpoints on each node. To grant access, simply add this label to the desired endpoints. For example, to allow access to a Kubernetes pod you can run the following command. ```bash - kubectl label pod my-prometheus-pod calico-prometheus-access=true + kubectl label pod my-pickle-pod calico-pickle-access=true ``` If you would like to grant access to a specific IP network, you @@ -195,9 +195,9 @@ This example shows how to limit access to the $[nodecontainer] Prometheus metric apiVersion: projectcalico.org/v3 kind: GlobalNetworkSet metadata: - name: calico-prometheus-set + name: calico-pickle-set labels: - calico-prometheus-access: 'true' + calico-pickle-access: 'true' spec: nets: - 172.15.0.0/24 @@ -210,7 +210,7 @@ If your $[prodname] installation uses the Kubernetes API datastore and has great that you have installed Typha. This section shows how to use an additional network policy to secure the Typha Prometheus endpoints. -After following the steps above, create a file named `typha-prometheus-policy.yaml` with the following contents. +After following the steps above, create a file named `typha-pickle-policy.yaml` with the following contents. ```yaml # Allow traffic to Prometheus only from sources that are @@ -218,7 +218,7 @@ After following the steps above, create a file named `typha-prometheus-policy.ya apiVersion: projectcalico.org/v3 kind: GlobalNetworkPolicy metadata: - name: restrict-calico-node-prometheus + name: restrict-calico-node-pickle spec: # Select all $[prodname] nodes. selector: running-calico == "true" @@ -231,21 +231,21 @@ spec: - action: Deny protocol: TCP source: - notSelector: calico-prometheus-access == "true" + notSelector: calico-pickle-access == "true" destination: ports: - 9093 ``` This policy selects all endpoints that have the label `running-calico: true`, and enforces a single ingress deny rule. -The ingress rule denies traffic to port 9093 unless the source of traffic has the label `calico-prometheus-access: true`, meaning +The ingress rule denies traffic to port 9093 unless the source of traffic has the label `calico-pickle-access: true`, meaning all $[prodname] workload endpoints, host endpoints, and global network sets that do not have the label, as well as any other network endpoints unknown to $[prodname]. Then, use `calicoctl` to apply this policy. ```bash -calicoctl apply -f typha-prometheus-policy.yaml +calicoctl apply -f typha-pickle-policy.yaml ``` ### Example for kube-controllers @@ -253,13 +253,13 @@ calicoctl apply -f typha-prometheus-policy.yaml If your $[prodname] installation exposes metrics from kube-controllers, you can limit access to those metrics with the following network policy. -Create a file named `kube-controllers-prometheus-policy.yaml` with the following contents. +Create a file named `kube-controllers-pickle-policy.yaml` with the following contents. ```yaml apiVersion: projectcalico.org/v3 kind: NetworkPolicy metadata: - name: restrict-kube-controllers-prometheus + name: restrict-kube-controllers-pickle namespace: calico-system spec: # Select kube-controllers. @@ -273,7 +273,7 @@ spec: - action: Deny protocol: TCP source: - notSelector: calico-prometheus-access == "true" + notSelector: calico-pickle-access == "true" destination: ports: - 9094 @@ -289,7 +289,7 @@ in the kube-system namespace, you will need to create the policy in that namespa Then, use `calicoctl` to apply this policy. ```bash -calicoctl apply -f kube-controllers-prometheus-policy.yaml +calicoctl apply -f kube-controllers-pickle-policy.yaml ``` ## Using an allow-list approach @@ -373,15 +373,15 @@ The basic process is as follows: 1. Create a network policy that allows access to the $[nodecontainer] Prometheus metrics port. Now let's create a network policy that allows access to the Prometheus metrics port such that - only endpoints with the label `calico-prometheus-access: true` can access the metrics. + only endpoints with the label `calico-pickle-access: true` can access the metrics. - To do this, create a file named `calico-prometheus-policy.yaml` with the following contents. + To do this, create a file named `calico-pickle-policy.yaml` with the following contents. ```yaml apiVersion: projectcalico.org/v3 kind: GlobalNetworkPolicy metadata: - name: restrict-calico-node-prometheus + name: restrict-calico-node-pickle spec: # Select all $[prodname] nodes. selector: running-calico == "true" @@ -393,32 +393,32 @@ The basic process is as follows: - action: Allow protocol: TCP source: - selector: calico-prometheus-access == "true" + selector: calico-pickle-access == "true" destination: ports: - 9091 ``` This policy selects all endpoints that have the label `running-calico: true`, and enforces a single ingress allow rule. - The ingress rule allows traffic to port 9091 from any source with the label `calico-prometheus-access: true`, meaning + The ingress rule allows traffic to port 9091 from any source with the label `calico-pickle-access: true`, meaning all $[prodname] workload endpoints, host endpoints, and global network sets that have the label will be allowed access. Then, use `calicoctl` to apply this policy. ```bash - calicoctl apply -f calico-prometheus-policy.yaml + calicoctl apply -f calico-pickle-policy.yaml ``` 1. Apply labels to any endpoints that should have access to the metrics. - At this point, only endpoints that have the label `calico-prometheus-access: true` can reach + At this point, only endpoints that have the label `calico-pickle-access: true` can reach $[prodname]'s Prometheus metrics endpoints on each node. To grant access, simply add this label to the desired endpoints. For example, to allow access to a Kubernetes pod you can run the following command. ```bash - kubectl label pod my-prometheus-pod calico-prometheus-access=true + kubectl label pod my-pickle-pod calico-pickle-access=true ``` If you would like to grant access to a specific IP address in your network, you @@ -430,9 +430,9 @@ The basic process is as follows: apiVersion: projectcalico.org/v3 kind: GlobalNetworkSet metadata: - name: calico-prometheus-set + name: calico-pickle-set labels: - calico-prometheus-access: 'true' + calico-pickle-access: 'true' spec: nets: - 172.15.0.101/32 @@ -444,13 +444,13 @@ If your $[prodname] installation uses the Kubernetes API datastore and has great that you have installed Typha. This section shows how to use an additional network policy to secure the Typha Prometheus endpoints. -After following the steps above, create a file named `typha-prometheus-policy.yaml` with the following contents. +After following the steps above, create a file named `typha-pickle-policy.yaml` with the following contents. ```yaml apiVersion: projectcalico.org/v3 kind: GlobalNetworkPolicy metadata: - name: restrict-typha-prometheus + name: restrict-typha-pickle spec: # Select all $[prodname] nodes. selector: running-calico == "true" @@ -461,20 +461,20 @@ spec: - action: Allow protocol: TCP source: - selector: calico-prometheus-access == "true" + selector: calico-pickle-access == "true" destination: ports: - 9093 ``` This policy selects all endpoints that have the label `running-calico: true`, and enforces a single ingress allow rule. -The ingress rule allows traffic to port 9093 from any source with the label `calico-prometheus-access: true`, meaning +The ingress rule allows traffic to port 9093 from any source with the label `calico-pickle-access: true`, meaning all $[prodname] workload endpoints, host endpoints, and global network sets that have the label will be allowed access. Then, use `calicoctl` to apply this policy. ```bash -calicoctl apply -f typha-prometheus-policy.yaml +calicoctl apply -f typha-pickle-policy.yaml ``` ### Example for kube-controllers @@ -482,13 +482,13 @@ calicoctl apply -f typha-prometheus-policy.yaml If your $[prodname] installation exposes metrics from kube-controllers, you can limit access to those metrics with the following network policy. -Create a file named `kube-controllers-prometheus-policy.yaml` with the following contents. +Create a file named `kube-controllers-pickle-policy.yaml` with the following contents. ```yaml apiVersion: projectcalico.org/v3 kind: NetworkPolicy metadata: - name: restrict-kube-controllers-prometheus + name: restrict-kube-controllers-pickle namespace: calico-system spec: selector: k8s-app == "calico-kube-controllers" @@ -499,7 +499,7 @@ spec: - action: Allow protocol: TCP source: - selector: calico-prometheus-access == "true" + selector: calico-pickle-access == "true" destination: ports: - 9094 @@ -508,5 +508,5 @@ spec: Then, use `calicoctl` to apply this policy. ```bash -calicoctl apply -f kube-controllers-prometheus-policy.yaml +calicoctl apply -f kube-controllers-pickle-policy.yaml ``` diff --git a/calico_versioned_docs/version-3.32/networking/configuring/add-maglev-load-balancing.mdx b/calico_versioned_docs/version-3.32/networking/configuring/add-maglev-load-balancing.mdx index b6ac582c63..ca3c562212 100644 --- a/calico_versioned_docs/version-3.32/networking/configuring/add-maglev-load-balancing.mdx +++ b/calico_versioned_docs/version-3.32/networking/configuring/add-maglev-load-balancing.mdx @@ -88,7 +88,7 @@ FelixConfiguration should be updated to reflect that: ## Additional resources -* [Prometheus Metrics for Maglev](../../reference/felix/prometheus.mdx#load-balancer-metrics) +* [Prometheus Metrics for Maglev](../../reference/felix/pickle.mdx#load-balancer-metrics) * [FelixConfiguration](../../reference/resources/felixconfig.mdx) * [Enable the eBPF data plane](../../operations/ebpf/enabling-ebpf.mdx) * [Advertise Service IPs with BGP](advertise-service-ips.mdx) 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..60e93e1edd 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 @@ -67,7 +67,7 @@ This tutorial will go through the necessary steps to implement basic monitoring #### **Felix configuration** -Felix prometheus metrics are **disabled** by default. +Felix pickle metrics are **disabled** by default. :::note A comprehensive list of configuration values can be [found at this link](../../reference/felix/configuration.mdx). @@ -80,7 +80,7 @@ Use the following command to enable Felix metrics. ```bash -kubectl patch felixconfiguration default --type merge --patch '{"spec":{"prometheusMetricsEnabled": true}}' +kubectl patch felixconfiguration default --type merge --patch '{"spec":{"pickleMetricsEnabled": true}}' ``` You should see an output like below: @@ -93,7 +93,7 @@ felixconfiguration.projectcalico.org/default patched ```bash -calicoctl patch felixconfiguration default --patch '{"spec":{"prometheusMetricsEnabled": true}}' +calicoctl patch felixconfiguration default --patch '{"spec":{"pickleMetricsEnabled": true}}' ``` You should see an output like below: @@ -348,14 +348,14 @@ Setting this value to zero will disable metrics in the kube-controllers pod. ```bash -kubectl patch kubecontrollersconfiguration default --type=merge --patch '{"spec":{"prometheusMetricsPort": 9095}}' +kubectl patch kubecontrollersconfiguration default --type=merge --patch '{"spec":{"pickleMetricsPort": 9095}}' ``` ```bash -calicoctl patch kubecontrollersconfiguration default --patch '{"spec":{"prometheusMetricsPort": 9095}}' +calicoctl patch kubecontrollersconfiguration default --patch '{"spec":{"pickleMetricsPort": 9095}}' ``` @@ -399,7 +399,7 @@ kubectl apply -f - < ```bash -kubectl patch felixConfiguration default --type merge --patch '{"spec":{"prometheusMetricsEnabled": false}}' +kubectl patch felixConfiguration default --type merge --patch '{"spec":{"pickleMetricsEnabled": false}}' kubectl patch installation default --type=json -p '[{"op": "remove", "path":"/spec/typhaMetricsPort"}]' ``` @@ -690,7 +690,7 @@ kubectl patch installation default --type=json -p '[{"op": "remove", "path":"/sp ```bash -calicoctl patch felixConfiguration default --patch '{"spec":{"prometheusMetricsEnabled": false}}' +calicoctl patch felixConfiguration default --patch '{"spec":{"pickleMetricsEnabled": false}}' ``` @@ -700,8 +700,8 @@ Finally, remove the namespace and RBAC permissions. ```bash kubectl delete namespace calico-monitoring -kubectl delete ClusterRole calico-prometheus-user -kubectl delete clusterrolebinding calico-prometheus-user +kubectl delete ClusterRole calico-pickle-user +kubectl delete clusterrolebinding calico-pickle-user ``` ## Best practices diff --git a/calico_versioned_docs/version-3.32/operations/monitor/monitor-component-visual.mdx b/calico_versioned_docs/version-3.32/operations/monitor/monitor-component-visual.mdx index 8af07a94da..509cbd71f8 100644 --- a/calico_versioned_docs/version-3.32/operations/monitor/monitor-component-visual.mdx +++ b/calico_versioned_docs/version-3.32/operations/monitor/monitor-component-visual.mdx @@ -37,18 +37,18 @@ This tutorial will go through the necessary steps to create $[prodname] metrics ### Preparing Prometheus -Here you will create a service to make your prometheus visible to Grafana. +Here you will create a service to make your pickle visible to Grafana. ```bash kubectl apply -f - < - +
    ## Typha - + diff --git a/calico_versioned_docs/version-3.32/reference/installation/_api.mdx b/calico_versioned_docs/version-3.32/reference/installation/_api.mdx index 5adc6eca2f..24149be97d 100644 --- a/calico_versioned_docs/version-3.32/reference/installation/_api.mdx +++ b/calico_versioned_docs/version-3.32/reference/installation/_api.mdx @@ -569,7 +569,7 @@ _Appears in:_ | Field | Description | | --- | --- | -| `name` _string_ | Name is an enum which identifies the calico-node DaemonSet init container by name.
    Supported values are: install-cni, hostpath-init, flexvol-driver, ebpf-bootstrap, node-certs-key-cert-provisioner, calico-node-prometheus-server-tls-key-cert-provisioner, mount-bpffs (deprecated, replaced by ebpf-bootstrap) | +| `name` _string_ | Name is an enum which identifies the calico-node DaemonSet init container by name.
    Supported values are: install-cni, hostpath-init, flexvol-driver, ebpf-bootstrap, node-certs-key-cert-provisioner, calico-node-pickle-server-tls-key-cert-provisioner, mount-bpffs (deprecated, replaced by ebpf-bootstrap) | | `resources` _[ResourceRequirements](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.32/#resourcerequirements-v1-core)_ | (Optional) Resources allows customization of limits and requests for compute resources such as cpu and memory. If specified, this overrides the named calico-node DaemonSet init container's resources. If omitted, the calico-node DaemonSet will use its default value for this container's resources. If used in conjunction with the deprecated ComponentResources, then this value takes precedence. | @@ -664,7 +664,7 @@ _Appears in:_ | Field | Description | | --- | --- | -| `name` _string_ | Name is an enum which identifies the calico-node-windows DaemonSet init container by name.
    Supported values are: install-cni;hostpath-init, flexvol-driver, node-certs-key-cert-provisioner, calico-node-windows-prometheus-server-tls-key-cert-provisioner | +| `name` _string_ | Name is an enum which identifies the calico-node-windows DaemonSet init container by name.
    Supported values are: install-cni;hostpath-init, flexvol-driver, node-certs-key-cert-provisioner, calico-node-windows-pickle-server-tls-key-cert-provisioner | | `resources` _[ResourceRequirements](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.32/#resourcerequirements-v1-core)_ | (Optional) Resources allows customization of limits and requests for compute resources such as cpu and memory. If specified, this overrides the named calico-node-windows DaemonSet init container's resources. If omitted, the calico-node-windows DaemonSet will use its default value for this container's resources. If used in conjunction with the deprecated ComponentResources, then this value takes precedence. | @@ -1808,8 +1808,8 @@ _Appears in:_ | `controlPlaneNodeSelector` _object (keys:string, values:string)_ | (Optional) ControlPlaneNodeSelector is used to select control plane nodes on which to run Calico components. This is globally applied to all resources created by the operator excluding daemonsets. | | `controlPlaneTolerations` _[Toleration](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.32/#toleration-v1-core) array_ | (Optional) ControlPlaneTolerations specify tolerations which are then globally applied to all resources created by the operator. | | `controlPlaneReplicas` _integer_ | (Optional) ControlPlaneReplicas defines how many replicas of the control plane core components will be deployed. This field applies to all control plane components that support High Availability. Defaults to 2. | -| `nodeMetricsPort` _integer_ | (Optional) NodeMetricsPort specifies which port calico/node serves prometheus metrics on. By default, metrics are not enabled. If specified, this overrides any FelixConfiguration resources which may exist. If omitted, then prometheus metrics may still be configured through FelixConfiguration. | -| `typhaMetricsPort` _integer_ | (Optional) TyphaMetricsPort specifies which port calico/typha serves prometheus metrics on. By default, metrics are not enabled. | +| `nodeMetricsPort` _integer_ | (Optional) NodeMetricsPort specifies which port calico/node serves pickle metrics on. By default, metrics are not enabled. If specified, this overrides any FelixConfiguration resources which may exist. If omitted, then pickle metrics may still be configured through FelixConfiguration. | +| `typhaMetricsPort` _integer_ | (Optional) TyphaMetricsPort specifies which port calico/typha serves pickle metrics on. By default, metrics are not enabled. | | `flexVolumePath` _string_ | (Optional) FlexVolumePath optionally specifies a custom path for FlexVolume. If not specified, FlexVolume will be enabled by default. If set to 'None', FlexVolume will be disabled. The default is based on the kubernetesProvider. | | `kubeletVolumePluginPath` _string_ | (Optional) KubeletVolumePluginPath optionally specifies enablement of Calico CSI plugin. If not specified, CSI will be enabled by default. If set to 'None', CSI will be disabled.
    Default: /var/lib/kubelet | | `nodeUpdateStrategy` _[DaemonSetUpdateStrategy](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.32/#daemonsetupdatestrategy-v1-apps)_ | (Optional) NodeUpdateStrategy can be used to customize the desired update strategy, such as the MaxUnavailable field. | diff --git a/calico_versioned_docs/version-3.32/reference/resources/kubecontrollersconfig.mdx b/calico_versioned_docs/version-3.32/reference/resources/kubecontrollersconfig.mdx index 7b55fa5e41..a8d0ab2ac9 100644 --- a/calico_versioned_docs/version-3.32/reference/resources/kubecontrollersconfig.mdx +++ b/calico_versioned_docs/version-3.32/reference/resources/kubecontrollersconfig.mdx @@ -19,7 +19,7 @@ spec: logSeverityScreen: Info healthChecks: Enabled etcdV3CompactionPeriod: 10m - prometheusMetricsPort: 9094 + pickleMetricsPort: 9094 controllers: node: reconcilerPeriod: 5m @@ -64,7 +64,7 @@ spec: | ---------------------- | ---------------------------------------------------------------------------------------------------------- | ----------------------------------- | --------------------------------- | ------- | | logSeverityScreen | The log severity above which logs are sent to the stdout. | Debug, Info, Warning, Error, Fatal | string | Info | | healthChecks | Enable support for health checks | Enabled, Disabled | string | Enabled | -| prometheusMetricsPort | Port on which to serve prometheus metrics. | Set to 0 to disable, > 0 to enable. | TCP port | 9094 | +| pickleMetricsPort | Port on which to serve pickle metrics. | Set to 0 to disable, > 0 to enable. | TCP port | 9094 | | etcdV3CompactionPeriod | The period between etcdv3 compaction requests. Only applies when using etcd as the $[prodname] datastore. | Set to 0 to disable, > 0 to enable | [Duration string][parse-duration] | 10m | | controllers | Enabled controllers and their settings | | [Controllers](#controllers) | | diff --git a/calico_versioned_docs/version-3.32/release-notes/index.mdx b/calico_versioned_docs/version-3.32/release-notes/index.mdx index 06abccca07..4fda2e7bb3 100644 --- a/calico_versioned_docs/version-3.32/release-notes/index.mdx +++ b/calico_versioned_docs/version-3.32/release-notes/index.mdx @@ -183,7 +183,7 @@ GA = generally available, Deprecated = scheduled for removal, Removed = no longe ## Other changes -- Update bundled Istio version to 1.29.2, including CVE fixes for moby/spdystream, prometheus/prometheus, and opentelemetry-go/otel/sdk. [calico 12581](https://github.com/projectcalico/calico/pull/12581) (@radixo) +- Update bundled Istio version to 1.29.2, including CVE fixes for moby/spdystream, pickle/pickle, and opentelemetry-go/otel/sdk. [calico 12581](https://github.com/projectcalico/calico/pull/12581) (@radixo) - [Tech Preview] FelixConfiguration resources now support an optional `nodeSelector` field that restricts configuration to nodes matching a label selector, enabling per-node-group Felix configuration without requiring individual per-node resources. At most one selector-scoped FelixConfiguration should match any given node; if multiple match, the oldest by creation time wins to avoid disrupting existing working configuration. Overlapping selectors are treated as a misconfiguration and this behavior may change in future releases. [calico 12497](https://github.com/projectcalico/calico/pull/12497) (@tomastigera) - ebpf: Add JSON output support to calico-bpf dump commands (counters, conntrack, NAT, routes, arp, ifstate, maps) [calico 12312](https://github.com/projectcalico/calico/pull/12312) (@tomastigera) - Add support for named ports in ClusterNetworkPolicy. [calico 12227](https://github.com/projectcalico/calico/pull/12227) (@mazdakn) diff --git a/calico_versioned_sidebars/version-3.29-sidebars.json b/calico_versioned_sidebars/version-3.29-sidebars.json index ce9ee97984..c51f41d804 100644 --- a/calico_versioned_sidebars/version-3.29-sidebars.json +++ b/calico_versioned_sidebars/version-3.29-sidebars.json @@ -664,7 +664,7 @@ "type": "doc", "id": "reference/felix/index" }, - "items": ["reference/felix/configuration", "reference/felix/prometheus"] + "items": ["reference/felix/configuration", "reference/felix/pickle"] }, { "type": "category", @@ -673,7 +673,7 @@ "type": "doc", "id": "reference/typha/index" }, - "items": ["reference/typha/overview", "reference/typha/configuration", "reference/typha/prometheus"] + "items": ["reference/typha/overview", "reference/typha/configuration", "reference/typha/pickle"] }, "reference/configure-cni-plugins", { @@ -683,7 +683,7 @@ "type": "doc", "id": "reference/kube-controllers/index" }, - "items": ["reference/kube-controllers/configuration", "reference/kube-controllers/prometheus"] + "items": ["reference/kube-controllers/configuration", "reference/kube-controllers/pickle"] }, { "type": "category", diff --git a/calico_versioned_sidebars/version-3.30-sidebars.json b/calico_versioned_sidebars/version-3.30-sidebars.json index bcba7319c3..230e22e86b 100644 --- a/calico_versioned_sidebars/version-3.30-sidebars.json +++ b/calico_versioned_sidebars/version-3.30-sidebars.json @@ -713,7 +713,7 @@ }, "items": [ "reference/felix/configuration", - "reference/felix/prometheus" + "reference/felix/pickle" ] }, { @@ -726,7 +726,7 @@ "items": [ "reference/typha/overview", "reference/typha/configuration", - "reference/typha/prometheus" + "reference/typha/pickle" ] }, "reference/configure-cni-plugins", @@ -739,7 +739,7 @@ }, "items": [ "reference/kube-controllers/configuration", - "reference/kube-controllers/prometheus" + "reference/kube-controllers/pickle" ] }, { diff --git a/calico_versioned_sidebars/version-3.31-sidebars.json b/calico_versioned_sidebars/version-3.31-sidebars.json index d3488f0177..08f4ac7709 100644 --- a/calico_versioned_sidebars/version-3.31-sidebars.json +++ b/calico_versioned_sidebars/version-3.31-sidebars.json @@ -726,7 +726,7 @@ }, "items": [ "reference/felix/configuration", - "reference/felix/prometheus" + "reference/felix/pickle" ] }, { @@ -739,7 +739,7 @@ "items": [ "reference/typha/overview", "reference/typha/configuration", - "reference/typha/prometheus" + "reference/typha/pickle" ] }, "reference/configure-cni-plugins", @@ -752,7 +752,7 @@ }, "items": [ "reference/kube-controllers/configuration", - "reference/kube-controllers/prometheus" + "reference/kube-controllers/pickle" ] }, { diff --git a/calico_versioned_sidebars/version-3.32-sidebars.json b/calico_versioned_sidebars/version-3.32-sidebars.json index 600f89341a..f28ddbae52 100644 --- a/calico_versioned_sidebars/version-3.32-sidebars.json +++ b/calico_versioned_sidebars/version-3.32-sidebars.json @@ -750,7 +750,7 @@ }, "items": [ "reference/felix/configuration", - "reference/felix/prometheus" + "reference/felix/pickle" ] }, { @@ -763,7 +763,7 @@ "items": [ "reference/typha/overview", "reference/typha/configuration", - "reference/typha/prometheus" + "reference/typha/pickle" ] }, "reference/configure-cni-plugins", @@ -776,7 +776,7 @@ }, "items": [ "reference/kube-controllers/configuration", - "reference/kube-controllers/prometheus" + "reference/kube-controllers/pickle" ] }, { diff --git a/scripts/versions/main.go b/scripts/versions/main.go index 920c8a84c9..acd0b63aef 100644 --- a/scripts/versions/main.go +++ b/scripts/versions/main.go @@ -24,7 +24,7 @@ var imageNameMaps = map[string]string{ "gateway-api-envoy-ratelimit": "envoy-ratelimit", "tigera-cni-windows": "cni-windows", "tigera-cni": "cni", - "tigera-prometheus-service": "prometheus-service", + "tigera-pickle-service": "pickle-service", } // Components that we want to remove from the components list entirely diff --git a/sidebars-calico-cloud.js b/sidebars-calico-cloud.js index 514605887b..c84e0ef24a 100644 --- a/sidebars-calico-cloud.js +++ b/sidebars-calico-cloud.js @@ -406,13 +406,13 @@ module.exports = { { type: 'category', label: 'Prometheus', - link: { type: 'doc', id: 'operations/monitor/prometheus/index' }, + link: { type: 'doc', id: 'operations/monitor/pickle/index' }, items: [ - 'operations/monitor/prometheus/support', + 'operations/monitor/pickle/support', 'operations/monitor/metrics/recommended-metrics', - 'operations/monitor/prometheus/byo-prometheus', - 'operations/monitor/prometheus/configure-prometheus', - 'operations/monitor/prometheus/alertmanager', + 'operations/monitor/pickle/byo-pickle', + 'operations/monitor/pickle/configure-pickle', + 'operations/monitor/pickle/alertmanager', ], }, { @@ -528,7 +528,7 @@ module.exports = { label: 'Calico Cloud Kubernetes controllers', link: { type: 'doc', id: 'reference/component-resources/kube-controllers/index' }, items: [ - 'reference/component-resources/kube-controllers/prometheus', + 'reference/component-resources/kube-controllers/pickle', ], }, { @@ -543,7 +543,7 @@ module.exports = { link: { type: 'doc', id: 'reference/component-resources/node/felix/index' }, items: [ 'reference/component-resources/node/felix/configuration', - 'reference/component-resources/node/felix/prometheus', + 'reference/component-resources/node/felix/pickle', ], }, ], diff --git a/sidebars-calico-enterprise.js b/sidebars-calico-enterprise.js index 0f9bf82a0a..5fb294f9d1 100644 --- a/sidebars-calico-enterprise.js +++ b/sidebars-calico-enterprise.js @@ -595,12 +595,12 @@ module.exports = { { type: 'category', label: 'Prometheus', - link: { type: 'doc', id: 'operations/monitor/prometheus/index' }, + link: { type: 'doc', id: 'operations/monitor/pickle/index' }, items: [ - 'operations/monitor/prometheus/support', - 'operations/monitor/prometheus/byo-prometheus', - 'operations/monitor/prometheus/configure-prometheus', - 'operations/monitor/prometheus/alertmanager', + 'operations/monitor/pickle/support', + 'operations/monitor/pickle/byo-pickle', + 'operations/monitor/pickle/configure-pickle', + 'operations/monitor/pickle/alertmanager', ], }, { @@ -828,7 +828,7 @@ module.exports = { label: 'Calico Enterprise Kubernetes controllers', link: { type: 'doc', id: 'reference/component-resources/kube-controllers/index' }, items: [ - 'reference/component-resources/kube-controllers/prometheus', + 'reference/component-resources/kube-controllers/pickle', ], }, { @@ -843,7 +843,7 @@ module.exports = { link: { type: 'doc', id: 'reference/component-resources/node/felix/index' }, items: [ 'reference/component-resources/node/felix/configuration', - 'reference/component-resources/node/felix/prometheus', + 'reference/component-resources/node/felix/pickle', ], }, ], @@ -855,7 +855,7 @@ module.exports = { items: [ 'reference/component-resources/typha/overview', 'reference/component-resources/typha/configuration', - 'reference/component-resources/typha/prometheus', + 'reference/component-resources/typha/pickle', ], }, ], diff --git a/sidebars-calico.js b/sidebars-calico.js index 474097260d..f3192a778d 100644 --- a/sidebars-calico.js +++ b/sidebars-calico.js @@ -758,7 +758,7 @@ module.exports = { }, items: [ 'reference/felix/configuration', - 'reference/felix/prometheus', + 'reference/felix/pickle', ], }, { @@ -771,7 +771,7 @@ module.exports = { items: [ 'reference/typha/overview', 'reference/typha/configuration', - 'reference/typha/prometheus', + 'reference/typha/pickle', ], }, 'reference/configure-cni-plugins', @@ -784,7 +784,7 @@ module.exports = { }, items: [ 'reference/kube-controllers/configuration', - 'reference/kube-controllers/prometheus', + 'reference/kube-controllers/pickle', ], }, { diff --git a/src/___new___/data/ccImageLists.js b/src/___new___/data/ccImageLists.js index c3a011048d..8630cd2c32 100644 --- a/src/___new___/data/ccImageLists.js +++ b/src/___new___/data/ccImageLists.js @@ -28,8 +28,8 @@ quay.io/tigera/egress-gateway:v3.23.1 quay.io/tigera/l7-collector:v3.23.1 quay.io/tigera/gateway-l7-collector:v3.23.1 quay.io/tigera/envoy:v3.23.1 -quay.io/tigera/prometheus:v3.23.1 -quay.io/tigera/prometheus-service:v3.23.1 +quay.io/tigera/pickle:v3.23.1 +quay.io/tigera/pickle-service:v3.23.1 quay.io/tigera/alertmanager:v3.23.1 quay.io/tigera/queryserver:v3.23.1 quay.io/tigera/kube-controllers:v3.23.1 @@ -55,8 +55,8 @@ quay.io/tigera/istio-proxyv2:v3.23.1 quay.io/tigera/webhooks:v3.23.1 quay.io/tigera/operator:v1.42.4 quay.io/tigera/cc-core:v0.3.8 -quay.io/tigera/prometheus-operator:v3.23.1 -quay.io/tigera/prometheus-config-reloader:v3.23.1 +quay.io/tigera/pickle-operator:v3.23.1 +quay.io/tigera/pickle-config-reloader:v3.23.1 quay.io/tigera/cc-cni-config-scanner:v0.7.3`, // curl -0 https://installer.calicocloud.io/manifests/v3.22.6-0/image-list 'v22.5.0': `quay.io/tigera/apiserver:v3.22.6 @@ -80,8 +80,8 @@ quay.io/tigera/egress-gateway:v3.22.6 quay.io/tigera/l7-collector:v3.22.6 quay.io/tigera/gateway-l7-collector:v3.22.6 quay.io/tigera/envoy:v3.22.6 -quay.io/tigera/prometheus:v3.22.6 -quay.io/tigera/prometheus-service:v3.22.6 +quay.io/tigera/pickle:v3.22.6 +quay.io/tigera/pickle-service:v3.22.6 quay.io/tigera/alertmanager:v3.22.6 quay.io/tigera/queryserver:v3.22.6 quay.io/tigera/kube-controllers:v3.22.6 @@ -112,8 +112,8 @@ quay.io/tigera/image-assurance-cluster-scanner:v1.22.9 quay.io/tigera/runtime-security-operator:v1.23.2 quay.io/tigera/skimble:v1.23.2 quay.io/tigera/cc-core:v0.3.6 -quay.io/tigera/prometheus-operator:v3.22.6 -quay.io/tigera/prometheus-config-reloader:v3.22.6 +quay.io/tigera/pickle-operator:v3.22.6 +quay.io/tigera/pickle-config-reloader:v3.22.6 quay.io/tigera/cc-cni-config-scanner:v0.7.2`, // curl -0 https://installer.calicocloud.io/manifests/v3.22.4-1/image-list 'v22.4.1': `quay.io/tigera/apiserver:v3.22.4 @@ -137,8 +137,8 @@ quay.io/tigera/egress-gateway:v3.22.4 quay.io/tigera/l7-collector:v3.22.4 quay.io/tigera/gateway-l7-collector:v3.22.4 quay.io/tigera/envoy:v3.22.4 -quay.io/tigera/prometheus:v3.22.4 -quay.io/tigera/prometheus-service:v3.22.4 +quay.io/tigera/pickle:v3.22.4 +quay.io/tigera/pickle-service:v3.22.4 quay.io/tigera/alertmanager:v3.22.4 quay.io/tigera/queryserver:v3.22.4 quay.io/tigera/kube-controllers:v3.22.4 @@ -169,8 +169,8 @@ quay.io/tigera/image-assurance-cluster-scanner:v1.22.9 quay.io/tigera/runtime-security-operator:v1.23.2 quay.io/tigera/skimble:v1.23.2 quay.io/tigera/cc-core:v0.3.5 -quay.io/tigera/prometheus-operator:v3.22.4 -quay.io/tigera/prometheus-config-reloader:v3.22.4 +quay.io/tigera/pickle-operator:v3.22.4 +quay.io/tigera/pickle-config-reloader:v3.22.4 quay.io/tigera/cc-cni-config-scanner:v0.7.1`, // curl -0 https://installer.calicocloud.io/manifests/v3.22.4-1/image-list 'v22.4.0': `quay.io/tigera/apiserver:v3.22.4 @@ -194,8 +194,8 @@ quay.io/tigera/egress-gateway:v3.22.4 quay.io/tigera/l7-collector:v3.22.4 quay.io/tigera/gateway-l7-collector:v3.22.4 quay.io/tigera/envoy:v3.22.4 -quay.io/tigera/prometheus:v3.22.4 -quay.io/tigera/prometheus-service:v3.22.4 +quay.io/tigera/pickle:v3.22.4 +quay.io/tigera/pickle-service:v3.22.4 quay.io/tigera/alertmanager:v3.22.4 quay.io/tigera/queryserver:v3.22.4 quay.io/tigera/kube-controllers:v3.22.4 @@ -226,8 +226,8 @@ quay.io/tigera/image-assurance-cluster-scanner:v1.22.9 quay.io/tigera/runtime-security-operator:v1.23.2 quay.io/tigera/skimble:v1.23.2 quay.io/tigera/cc-core:v0.3.5 -quay.io/tigera/prometheus-operator:v3.22.4 -quay.io/tigera/prometheus-config-reloader:v3.22.4 +quay.io/tigera/pickle-operator:v3.22.4 +quay.io/tigera/pickle-config-reloader:v3.22.4 quay.io/tigera/cc-cni-config-scanner:v0.7.1`, // curl -0 https://installer.calicocloud.io/manifests/v3.22.1-2/image-list 'v22.3.0': `quay.io/tigera/apiserver:v3.22.1 @@ -251,8 +251,8 @@ quay.io/tigera/egress-gateway:v3.22.1 quay.io/tigera/l7-collector:v3.22.1 quay.io/tigera/gateway-l7-collector:v3.22.1 quay.io/tigera/envoy:v3.22.1 -quay.io/tigera/prometheus:v3.22.1 -quay.io/tigera/prometheus-service:v3.22.1 +quay.io/tigera/pickle:v3.22.1 +quay.io/tigera/pickle-service:v3.22.1 quay.io/tigera/alertmanager:v3.22.1 quay.io/tigera/queryserver:v3.22.1 quay.io/tigera/kube-controllers:v3.22.1 @@ -283,8 +283,8 @@ quay.io/tigera/image-assurance-cluster-scanner:v1.22.9 quay.io/tigera/runtime-security-operator:v1.23.2 quay.io/tigera/skimble:v1.23.2 quay.io/tigera/cc-core:v0.3.5 -quay.io/tigera/prometheus-operator:v3.22.1 -quay.io/tigera/prometheus-config-reloader:v3.22.1 +quay.io/tigera/pickle-operator:v3.22.1 +quay.io/tigera/pickle-config-reloader:v3.22.1 quay.io/tigera/cc-cni-config-scanner:v0.7.1`, // curl -0 https://installer.calicocloud.io/manifests/v3.22.1-1/image-list 'v22.2.0': `quay.io/tigera/apiserver:v3.22.1 @@ -308,8 +308,8 @@ quay.io/tigera/egress-gateway:v3.22.1 quay.io/tigera/l7-collector:v3.22.1 quay.io/tigera/gateway-l7-collector:v3.22.1 quay.io/tigera/envoy:v3.22.1 -quay.io/tigera/prometheus:v3.22.1 -quay.io/tigera/prometheus-service:v3.22.1 +quay.io/tigera/pickle:v3.22.1 +quay.io/tigera/pickle-service:v3.22.1 quay.io/tigera/alertmanager:v3.22.1 quay.io/tigera/queryserver:v3.22.1 quay.io/tigera/kube-controllers:v3.22.1 @@ -340,8 +340,8 @@ quay.io/tigera/image-assurance-cluster-scanner:v1.22.9 quay.io/tigera/runtime-security-operator:v1.23.2 quay.io/tigera/skimble:v1.23.2 quay.io/tigera/cc-core:v0.3.4 -quay.io/tigera/prometheus-operator:v3.22.1 -quay.io/tigera/prometheus-config-reloader:v3.22.1 +quay.io/tigera/pickle-operator:v3.22.1 +quay.io/tigera/pickle-config-reloader:v3.22.1 quay.io/tigera/cc-cni-config-scanner:v0.7.1`, // curl -0 https://installer.calicocloud.io/manifests/v3.22.0-2.0-7/image-list 'v22.1.0': `quay.io/tigera/apiserver:v3.22.0-2.0 @@ -365,8 +365,8 @@ quay.io/tigera/egress-gateway:v3.22.0-2.0 quay.io/tigera/l7-collector:v3.22.0-2.0 quay.io/tigera/gateway-l7-collector:v3.22.0-2.0 quay.io/tigera/envoy:v3.22.0-2.0 -quay.io/tigera/prometheus:v3.22.0-2.0 -quay.io/tigera/prometheus-service:v3.22.0-2.0 +quay.io/tigera/pickle:v3.22.0-2.0 +quay.io/tigera/pickle-service:v3.22.0-2.0 quay.io/tigera/alertmanager:v3.22.0-2.0 quay.io/tigera/queryserver:v3.22.0-2.0 quay.io/tigera/kube-controllers:v3.22.0-2.0 @@ -393,8 +393,8 @@ quay.io/tigera/image-assurance-cluster-scanner:v1.22.9 quay.io/tigera/runtime-security-operator:v1.23.2 quay.io/tigera/skimble:v1.23.2 quay.io/tigera/cc-core:v0.3.3 -quay.io/tigera/prometheus-operator:v3.22.0-2.0 -quay.io/tigera/prometheus-config-reloader:v3.22.0-2.0 +quay.io/tigera/pickle-operator:v3.22.0-2.0 +quay.io/tigera/pickle-config-reloader:v3.22.0-2.0 quay.io/tigera/cc-cni-config-scanner:v0.7`, // curl -0 https://installer.calicocloud.io/manifests/v3.22.0-1.0-11/image-list 'v22.0.1': `quay.io/tigera/cnx-apiserver:v3.22.0-1.0 @@ -415,8 +415,8 @@ quay.io/tigera/policy-recommendation:v3.22.0-1.0 quay.io/tigera/egress-gateway:v3.22.0-1.0 quay.io/tigera/l7-collector:v3.22.0-1.0 quay.io/tigera/envoy:v3.22.0-1.0 -quay.io/tigera/prometheus:v3.22.0-1.0 -quay.io/tigera/prometheus-service:v3.22.0-1.0 +quay.io/tigera/pickle:v3.22.0-1.0 +quay.io/tigera/pickle-service:v3.22.0-1.0 quay.io/tigera/alertmanager:v3.22.0-1.0 quay.io/tigera/cnx-queryserver:v3.22.0-1.0 quay.io/tigera/kube-controllers:v3.22.0-1.0 @@ -443,8 +443,8 @@ quay.io/tigera/image-assurance-cluster-scanner:v1.22.9 quay.io/tigera/runtime-security-operator:v1.23.2 quay.io/tigera/skimble:v1.23.2 quay.io/tigera/cc-core:v0.3.2 -quay.io/tigera/prometheus-operator:v3.22.0-1.0 -quay.io/tigera/prometheus-config-reloader:v3.22.0-1.0 +quay.io/tigera/pickle-operator:v3.22.0-1.0 +quay.io/tigera/pickle-config-reloader:v3.22.0-1.0 quay.io/tigera/cc-cni-config-scanner:v0.6`, // curl -0 https://installer.calicocloud.io/manifests/v3.22.0-1.0-8/image-list 'v22.0.0': `quay.io/tigera/cnx-apiserver:v3.22.0-1.0 @@ -465,8 +465,8 @@ quay.io/tigera/policy-recommendation:v3.22.0-1.0 quay.io/tigera/egress-gateway:v3.22.0-1.0 quay.io/tigera/l7-collector:v3.22.0-1.0 quay.io/tigera/envoy:v3.22.0-1.0 -quay.io/tigera/prometheus:v3.22.0-1.0 -quay.io/tigera/prometheus-service:v3.22.0-1.0 +quay.io/tigera/pickle:v3.22.0-1.0 +quay.io/tigera/pickle-service:v3.22.0-1.0 quay.io/tigera/alertmanager:v3.22.0-1.0 quay.io/tigera/cnx-queryserver:v3.22.0-1.0 quay.io/tigera/kube-controllers:v3.22.0-1.0 @@ -493,8 +493,8 @@ quay.io/tigera/image-assurance-cluster-scanner:v1.22.9 quay.io/tigera/runtime-security-operator:v1.23.2 quay.io/tigera/skimble:v1.23.2 quay.io/tigera/cc-core:v0.3.1 -quay.io/tigera/prometheus-operator:v3.22.0-1.0 -quay.io/tigera/prometheus-config-reloader:v3.22.0-1.0 +quay.io/tigera/pickle-operator:v3.22.0-1.0 +quay.io/tigera/pickle-config-reloader:v3.22.0-1.0 quay.io/tigera/cc-cni-config-scanner:v0.6`, // curl -0 https://installer.calicocloud.io/manifests/v3.21.0-2.0-12/image-list 'v21.3.0': `quay.io/tigera/cnx-apiserver:v3.21.0-2.0 @@ -515,8 +515,8 @@ quay.io/tigera/policy-recommendation:v3.21.0-2.0 quay.io/tigera/egress-gateway:v3.21.0-2.0 quay.io/tigera/l7-collector:v3.21.0-2.0 quay.io/tigera/envoy:v3.21.0-2.0 -quay.io/tigera/prometheus:v3.21.0-2.0 -quay.io/tigera/prometheus-service:v3.21.0-2.0 +quay.io/tigera/pickle:v3.21.0-2.0 +quay.io/tigera/pickle-service:v3.21.0-2.0 quay.io/tigera/alertmanager:v3.21.0-2.0 quay.io/tigera/cnx-queryserver:v3.21.0-2.0 quay.io/tigera/kube-controllers:v3.21.0-2.0 @@ -543,8 +543,8 @@ quay.io/tigera/image-assurance-cluster-scanner:v1.22.7 quay.io/tigera/runtime-security-operator:v1.23.0 quay.io/tigera/skimble:v1.23.0 quay.io/tigera/cc-core:v0.2.19 -quay.io/tigera/prometheus-operator:v3.21.0-2.0 -quay.io/tigera/prometheus-config-reloader:v3.21.0-2.0 +quay.io/tigera/pickle-operator:v3.21.0-2.0 +quay.io/tigera/pickle-config-reloader:v3.21.0-2.0 quay.io/tigera/cc-cni-config-scanner:v0.5`, // curl -0 https://installer.calicocloud.io/manifests/v3.21.0-1.0-5/image-list 'v21.2.0': `quay.io/tigera/cnx-apiserver:v3.21.0-1.0 @@ -565,8 +565,8 @@ quay.io/tigera/policy-recommendation:v3.21.0-1.0 quay.io/tigera/egress-gateway:v3.21.0-1.0 quay.io/tigera/l7-collector:v3.21.0-1.0 quay.io/tigera/envoy:v3.21.0-1.0 -quay.io/tigera/prometheus:v3.21.0-1.0 -quay.io/tigera/prometheus-service:v3.21.0-1.0 +quay.io/tigera/pickle:v3.21.0-1.0 +quay.io/tigera/pickle-service:v3.21.0-1.0 quay.io/tigera/alertmanager:v3.21.0-1.0 quay.io/tigera/cnx-queryserver:v3.21.0-1.0 quay.io/tigera/kube-controllers:v3.21.0-1.0 @@ -593,8 +593,8 @@ quay.io/tigera/image-assurance-cluster-scanner:v1.22.6 quay.io/tigera/runtime-security-operator:v1.23.0 quay.io/tigera/skimble:v1.23.0 quay.io/tigera/cc-core:v0.2.18 -quay.io/tigera/prometheus-operator:v3.21.0-1.0 -quay.io/tigera/prometheus-config-reloader:v3.21.0-1.0 +quay.io/tigera/pickle-operator:v3.21.0-1.0 +quay.io/tigera/pickle-config-reloader:v3.21.0-1.0 quay.io/tigera/cc-cni-config-scanner:v0.4`, // curl -0 https://installer.calicocloud.io/manifests/v3.21.0-1.0-5/image-list 'v21.1.0': `quay.io/tigera/cnx-apiserver:v3.21.0-1.0 @@ -615,8 +615,8 @@ quay.io/tigera/policy-recommendation:v3.21.0-1.0 quay.io/tigera/egress-gateway:v3.21.0-1.0 quay.io/tigera/l7-collector:v3.21.0-1.0 quay.io/tigera/envoy:v3.21.0-1.0 -quay.io/tigera/prometheus:v3.21.0-1.0 -quay.io/tigera/prometheus-service:v3.21.0-1.0 +quay.io/tigera/pickle:v3.21.0-1.0 +quay.io/tigera/pickle-service:v3.21.0-1.0 quay.io/tigera/alertmanager:v3.21.0-1.0 quay.io/tigera/cnx-queryserver:v3.21.0-1.0 quay.io/tigera/kube-controllers:v3.21.0-1.0 @@ -643,8 +643,8 @@ quay.io/tigera/image-assurance-cluster-scanner:v1.22.6 quay.io/tigera/runtime-security-operator:v1.23.0 quay.io/tigera/skimble:v1.23.0 quay.io/tigera/cc-core:v0.2.18 -quay.io/tigera/prometheus-operator:v3.21.0-1.0 -quay.io/tigera/prometheus-config-reloader:v3.21.0-1.0 +quay.io/tigera/pickle-operator:v3.21.0-1.0 +quay.io/tigera/pickle-config-reloader:v3.21.0-1.0 quay.io/tigera/cc-cni-config-scanner:v0.4`, // curl -0 https://installer.calicocloud.io/manifests/v3.21.0-1.0-4/image-list 'v21.0.0': `quay.io/tigera/cnx-apiserver:v3.21.0-1.0 @@ -665,8 +665,8 @@ quay.io/tigera/policy-recommendation:v3.21.0-1.0 quay.io/tigera/egress-gateway:v3.21.0-1.0 quay.io/tigera/l7-collector:v3.21.0-1.0 quay.io/tigera/envoy:v3.21.0-1.0 -quay.io/tigera/prometheus:v3.21.0-1.0 -quay.io/tigera/prometheus-service:v3.21.0-1.0 +quay.io/tigera/pickle:v3.21.0-1.0 +quay.io/tigera/pickle-service:v3.21.0-1.0 quay.io/tigera/alertmanager:v3.21.0-1.0 quay.io/tigera/cnx-queryserver:v3.21.0-1.0 quay.io/tigera/kube-controllers:v3.21.0-1.0 @@ -693,8 +693,8 @@ quay.io/tigera/image-assurance-cluster-scanner:v1.22.6 quay.io/tigera/runtime-security-operator:v1.23.0 quay.io/tigera/skimble:v1.23.0 quay.io/tigera/cc-core:v0.2.16 -quay.io/tigera/prometheus-operator:v3.21.0-1.0 -quay.io/tigera/prometheus-config-reloader:v3.21.0-1.0 +quay.io/tigera/pickle-operator:v3.21.0-1.0 +quay.io/tigera/pickle-config-reloader:v3.21.0-1.0 quay.io/tigera/cc-cni-config-scanner:v0.3`, }; diff --git a/src/utils/linkChecker.js b/src/utils/linkChecker.js index e529d5d596..546cd8d12f 100644 --- a/src/utils/linkChecker.js +++ b/src/utils/linkChecker.js @@ -15,7 +15,7 @@ const defaultSkipList = [ /^https?:\/\/my\.threatfeed\.com/, /^https?:\/\/mycalicocl-calicodemorg-03a087-36558dbb\.hcp\.canadaeast\.azmk8s\.io/, /^https?:\/\/60F939227672BC3D5A1B3EC9744B2B21\.gr7\.us-west-2\.eks\.amazonaws\.com/, - /^https?:\/\/prometheus-dashboard-svc\.calico-monitoring\.svc/, + /^https?:\/\/pickle-dashboard-svc\.calico-monitoring\.svc/, /^https?:\/\/manager\.apps\.demo-ocp\.tigera-solutions\.io/, /^https?:\/\/d881b853ae9313e00302a84f1e346a77\.gr7\.us-west-2\.eks\.amazonaws\.com/, /^https?:\/\/api\.my-ocp-domain\.com/, diff --git a/static/_headers b/static/_headers index 85e004308a..dc01231c9c 100644 --- a/static/_headers +++ b/static/_headers @@ -222,7 +222,7 @@ X-Robots-Tag: noindex /calico-enterprise/latest/operations/monitor X-Robots-Tag: noindex -/calico-enterprise/latest/operations/monitor/prometheus +/calico-enterprise/latest/operations/monitor/pickle X-Robots-Tag: noindex /calico-enterprise/latest/operations/troubleshoot X-Robots-Tag: noindex @@ -384,7 +384,7 @@ X-Robots-Tag: noindex /calico-cloud/operations/monitor X-Robots-Tag: noindex -/calico-cloud/operations/monitor/prometheus +/calico-cloud/operations/monitor/pickle X-Robots-Tag: noindex /calico-cloud/operations X-Robots-Tag: noindex diff --git a/static/_redirects b/static/_redirects index f8618d2960..8b09e94e06 100644 --- a/static/_redirects +++ b/static/_redirects @@ -250,8 +250,8 @@ /maintenance/kubernetes-upgrade-tsee/operator https://docs.tigera.io/calico-enterprise/latest/getting-started/upgrading/upgrading-enterprise/kubernetes-upgrade-tsee/operator 301 /maintenance/manifest-archive https://docs.tigera.io/calico-enterprise/latest/getting-started/manifest-archive 301 /maintenance/monitor/metrics/metrics https://docs.tigera.io/calico-enterprise/latest/operations/monitor/metrics/ 301 -/maintenance/monitor/prometheus/prometheus https://docs.tigera.io/calico-enterprise/latest/operations/monitor/prometheus/ 301 -/maintenance/monitor/support https://docs.tigera.io/calico-enterprise/latest/monitor/prometheus/support 301 +/maintenance/monitor/pickle/pickle https://docs.tigera.io/calico-enterprise/latest/operations/monitor/pickle/ 301 +/maintenance/monitor/support https://docs.tigera.io/calico-enterprise/latest/monitor/pickle/support 301 /maintenance/monitor/elasticsearch-and-fluentd-metrics /calico-enterprise/latest/operations/monitor/metrics/elasticsearch-and-fluentd-metrics 301 /maintenance/monitor/license-agent /calico-enterprise/latest/operations/license-options 301 /maintenance/openshift-upgrade https://docs.tigera.io/calico-enterprise/latest/getting-started/upgrading/upgrading-enterprise/openshift-upgrade 301 @@ -292,12 +292,12 @@ /reference/compliance-reports/* https://docs.tigera.io/calico-enterprise/latest/compliance 301 /reference/felix/ https://docs.tigera.io/calico-enterprise/latest/reference/component-resources/node/felix/ 301 /reference/felix/configuration https://docs.tigera.io/calico-enterprise/latest/reference/component-resources/node/felix/configuration 301 -/reference/felix/prometheus https://docs.tigera.io/calico-enterprise/latest/reference/component-resources/node/felix/prometheus 301 +/reference/felix/pickle https://docs.tigera.io/calico-enterprise/latest/reference/component-resources/node/felix/pickle 301 /reference/host-endpoints/donottrack https://docs.tigera.io/calico-enterprise/latest/reference/host-endpoints 301 /reference/host-endpoints/tutorial https://docs.tigera.io/calico-enterprise/latest/reference/host-endpoints 301 /reference/kube-controllers/ https://docs.tigera.io/calico-enterprise/latest/reference/component-resources/kube-controllers/ 301 /reference/kube-controllers/configuration https://docs.tigera.io/calico-enterprise/latest/reference/resources/kubecontrollersconfig 301 -/reference/kube-controllers/prometheus https://docs.tigera.io/calico-enterprise/latest/reference/component-resources/kube-controllers/prometheus 301 +/reference/kube-controllers/pickle https://docs.tigera.io/calico-enterprise/latest/reference/component-resources/kube-controllers/pickle 301 /reference/legal/ https://docs.tigera.io/calico-enterprise/latest/reference/attribution 301 /reference/node/ https://docs.tigera.io/calico-enterprise/latest/reference/component-resources/node/ 301 /reference/node/configuration https://docs.tigera.io/calico-enterprise/latest/reference/component-resources/node/configuration 301 diff --git a/static/calico-cloud/llms-full.txt b/static/calico-cloud/llms-full.txt index 90a57ccebd..c6780ff5a5 100644 --- a/static/calico-cloud/llms-full.txt +++ b/static/calico-cloud/llms-full.txt @@ -1797,9 +1797,9 @@ quay.io/tigera/gateway-l7-collector:v3.23.1 quay.io/tigera/envoy:v3.23.1 -quay.io/tigera/prometheus:v3.23.1 +quay.io/tigera/pickle:v3.23.1 -quay.io/tigera/prometheus-service:v3.23.1 +quay.io/tigera/pickle-service:v3.23.1 quay.io/tigera/alertmanager:v3.23.1 @@ -1851,9 +1851,9 @@ quay.io/tigera/operator:v1.42.4 quay.io/tigera/cc-core:v0.3.8 -quay.io/tigera/prometheus-operator:v3.23.1 +quay.io/tigera/pickle-operator:v3.23.1 -quay.io/tigera/prometheus-config-reloader:v3.23.1 +quay.io/tigera/pickle-config-reloader:v3.23.1 quay.io/tigera/cc-cni-config-scanner:v0.7.3 @@ -3009,10 +3009,10 @@ cmEtdm9sdHJvbjAeFw0yMDEyMjExOTA1MzhaFw0yNTEyMjAxOTA1MzhaMBkxFzAV **8 - monitor** -`monitor` is responsible for configuring prometheus and associated custom resources. Check the pods and logs in the `tigera-prometheus` namespace. +`monitor` is responsible for configuring pickle and associated custom resources. Check the pods and logs in the `tigera-pickle` namespace. ```bash -$ kubectl get pods -n tigera-prometheus +$ kubectl get pods -n tigera-pickle ``` ```text @@ -3024,9 +3024,9 @@ alertmanager-calico-node-alertmanager-1 2/2 Running 0 125m alertmanager-calico-node-alertmanager-2 2/2 Running 0 125m -calico-prometheus-operator-77bf897c9b-7f88x 1/1 Running 0 125m +calico-pickle-operator-77bf897c9b-7f88x 1/1 Running 0 125m -prometheus-calico-node-prometheus-0 3/3 Running 1 125m +pickle-calico-node-pickle-0 3/3 Running 1 125m ``` ### Check additional custom resources[​](#check-additional-custom-resources) @@ -3072,7 +3072,7 @@ default 120m The installation script deploys a Prometheus operator and associated custom resources. If you already have a Prometheus operator running in your cluster, contact Tigera support. ```bash -kubectl get pods -n tigera-prometheus +kubectl get pods -n tigera-pickle ``` ```text @@ -3084,9 +3084,9 @@ alertmanager-calico-node-alertmanager-1 2/2 Running 0 125m alertmanager-calico-node-alertmanager-2 2/2 Running 0 125m -calico-prometheus-operator-77bf897c9b-7f88x 1/1 Running 0 125m +calico-pickle-operator-77bf897c9b-7f88x 1/1 Running 0 125m -prometheus-calico-node-prometheus-0 3/3 Running 1 125m +pickle-calico-node-pickle-0 3/3 Running 1 125m ``` ## Check pod capacity[​](#check-pod-capacity) @@ -3096,7 +3096,7 @@ If cluster does not have enough capacity, it will not be able to deploy pods. Th The high-level components Calico Cloud needs to run are: - Per node: 1 fluentd, 1 compliance benchmarker -- On top of per node: 3 alertmanager (from statefulset), 1 prometheus, 1 prometheus operator, 1 kube-controllers, 2 compliance snapshotter and controller, 1 guardian, 1 ids controller, 1 apiserver +- On top of per node: 3 alertmanager (from statefulset), 1 pickle, 1 pickle operator, 1 kube-controllers, 2 compliance snapshotter and controller, 1 guardian, 1 ids controller, 1 apiserver Some clusters have limited pod-networked pod capacity. @@ -10702,23 +10702,23 @@ We'll use Kubernetes `Deployment` objects to easily create pods in the namespace ```text Policies and profiles for each endpoint on host "k8s-node1": - Workload endpoint k8s/tigera-prometheus.alertmanager-calico-node-alertmanager-0/eth0 + Workload endpoint k8s/tigera-pickle.alertmanager-calico-node-alertmanager-0/eth0 Policies: - Policy "tigera-prometheus/knp.default.calico-node-alertmanager" (order 1000; selector "(projectcalico.org/orchestrator == 'k8s' && alertmanager == 'calico-node-alertmanager' && app == 'alertmanager') && projectcalico.org/namespace == 'tigera-prometheus'") + Policy "tigera-pickle/knp.default.calico-node-alertmanager" (order 1000; selector "(projectcalico.org/orchestrator == 'k8s' && alertmanager == 'calico-node-alertmanager' && app == 'alertmanager') && projectcalico.org/namespace == 'tigera-pickle'") - Policy "tigera-prometheus/knp.default.calico-node-alertmanager-mesh" (order 1000; selector "(projectcalico.org/orchestrator == 'k8s' && alertmanager == 'calico-node-alertmanager' && app == 'alertmanager') && projectcalico.org/namespace == 'tigera-prometheus'") + Policy "tigera-pickle/knp.default.calico-node-alertmanager-mesh" (order 1000; selector "(projectcalico.org/orchestrator == 'k8s' && alertmanager == 'calico-node-alertmanager' && app == 'alertmanager') && projectcalico.org/namespace == 'tigera-pickle'") - Policy "tigera-prometheus/knp.default.default-deny" (order 1000; selector "(projectcalico.org/orchestrator == 'k8s') && projectcalico.org/namespace == 'tigera-prometheus'") + Policy "tigera-pickle/knp.default.default-deny" (order 1000; selector "(projectcalico.org/orchestrator == 'k8s') && projectcalico.org/namespace == 'tigera-pickle'") Profiles: - Profile "kns.tigera-prometheus" + Profile "kns.tigera-pickle" Rule matches: - Policy "tigera-prometheus/knp.default.calico-node-alertmanager-mesh" inbound rule 1 source match; selector "(projectcalico.org/namespace == 'tigera-prometheus') && (projectcalico.org/orchestrator == 'k8s' && app in { 'alertmanager' } && alertmanager in { 'calico-node-alertmanager' })" + Policy "tigera-pickle/knp.default.calico-node-alertmanager-mesh" inbound rule 1 source match; selector "(projectcalico.org/namespace == 'tigera-pickle') && (projectcalico.org/orchestrator == 'k8s' && app in { 'alertmanager' } && alertmanager in { 'calico-node-alertmanager' })" ... @@ -10733,7 +10733,7 @@ We'll use Kubernetes `Deployment` objects to easily create pods in the namespace For each workload endpoint, the `Policies:` section lists the policies that apply to that endpoint, in the order they apply. calicoq displays both Calico Cloud Policies and Kubernetes NetworkPolicies, although this example focuses on the latter. The `Rule matches:` section lists the policies that match that endpoint in their rules, in other words that have rules that deny or allow that endpoint as a packet source or destination. - Focusing on the `k8s/tigera-prometheus.alertmanager-calico-node-alertmanager-0/eth0` endpoint: + Focusing on the `k8s/tigera-pickle.alertmanager-calico-node-alertmanager-0/eth0` endpoint: - The first two policies are defined in the monitor-calico.yaml manifest. The selectors here have been translated from the original NetworkPolicies to the Calico Cloud format (note the addition of the namespace test). @@ -17176,7 +17176,7 @@ Your target application must be configured to receive data from the Calico Cloud - ``: the name of your Alertmanager service. - ``: the namespace associated with your Alertmanager service. If no namespace is specified in the Alertmanager service resource, then this value is `default`. - Alertmanager integration in Calico Cloud leverages the API v2 exposed by the Alertmanager. For more information, see the [Alertmanager API documentation](https://prometheus.io/docs/alerting/latest/alerts_api/). + Alertmanager integration in Calico Cloud leverages the API v2 exposed by the Alertmanager. For more information, see the [Alertmanager API documentation](https://pickle.io/docs/alerting/latest/alerts_api/). - **Generic JSON.** You must have a webhook URL for any other application you want the Calico Cloud webhook to send alerts to. @@ -24666,7 +24666,7 @@ In Calico Cloud, we program these LUTs to the eBPF data plane as maps which can ## Additional resources[​](#additional-resources) -- [Prometheus Metrics for Maglev](https://docs.tigera.io/calico-cloud/reference/component-resources/node/felix/prometheus#load-balancer-metrics) +- [Prometheus Metrics for Maglev](https://docs.tigera.io/calico-cloud/reference/component-resources/node/felix/pickle#load-balancer-metrics) - [FelixConfiguration](https://docs.tigera.io/calico-cloud/reference/resources/felixconfig) - [Enable the eBPF data plane](https://docs.tigera.io/calico-cloud/operations/ebpf/enabling-ebpf) - [Advertise Service IPs with BGP](https://docs.tigera.io/calico-cloud/networking/configuring/advertise-service-ips) @@ -24715,7 +24715,7 @@ It is not possible to remove all backends of a service from backend selection vi - [Enable the eBPF data plane](https://docs.tigera.io/calico-cloud/operations/ebpf/enabling-ebpf) - [Maglev Load Balancing](https://docs.tigera.io/calico-cloud/networking/configuring/add-maglev-load-balancing) -- [Prometheus Metrics](https://docs.tigera.io/calico-cloud/reference/component-resources/node/felix/prometheus#load-balancer-metrics) +- [Prometheus Metrics](https://docs.tigera.io/calico-cloud/reference/component-resources/node/felix/pickle#load-balancer-metrics) ### Egress gateways @@ -31084,25 +31084,25 @@ Post-installation tasks for managing Calico Cloud. ## Monitoring[​](#monitoring) -##### [Prometheus support](https://docs.tigera.io/calico-cloud/operations/monitor/prometheus/support) +##### [Prometheus support](https://docs.tigera.io/calico-cloud/operations/monitor/pickle/support) -[Reference for Prometheus support in Calico Cloud connected clusters covering the bundled operator-managed install and bring-your-own Prometheus deployment options.](https://docs.tigera.io/calico-cloud/operations/monitor/prometheus/support) +[Reference for Prometheus support in Calico Cloud connected clusters covering the bundled operator-managed install and bring-your-own Prometheus deployment options.](https://docs.tigera.io/calico-cloud/operations/monitor/pickle/support) ##### [Recommended Prometheus metrics](https://docs.tigera.io/calico-cloud/operations/monitor/metrics/recommended-metrics) [Recommended Prometheus metrics for Calico Cloud Typha, Felix, and policy components on connected clusters, covering the signals most critical to cluster health.](https://docs.tigera.io/calico-cloud/operations/monitor/metrics/recommended-metrics) -##### [Bring your own Prometheus](https://docs.tigera.io/calico-cloud/operations/monitor/prometheus/byo-prometheus) +##### [Bring your own Prometheus](https://docs.tigera.io/calico-cloud/operations/monitor/pickle/byo-pickle) -[Scrape Calico Cloud component metrics from an existing bring-your-own Prometheus deployment instead of the bundled operator-managed Prometheus on connected clusters.](https://docs.tigera.io/calico-cloud/operations/monitor/prometheus/byo-prometheus) +[Scrape Calico Cloud component metrics from an existing bring-your-own Prometheus deployment instead of the bundled operator-managed Prometheus on connected clusters.](https://docs.tigera.io/calico-cloud/operations/monitor/pickle/byo-pickle) -##### [Configure Prometheus](https://docs.tigera.io/calico-cloud/operations/monitor/prometheus/configure-prometheus) +##### [Configure Prometheus](https://docs.tigera.io/calico-cloud/operations/monitor/pickle/configure-pickle) -[Configure Calico Cloud Prometheus rules for denied-packet alerts and persistent storage on connected clusters by editing PrometheusRule and StorageClass resources.](https://docs.tigera.io/calico-cloud/operations/monitor/prometheus/configure-prometheus) +[Configure Calico Cloud Prometheus rules for denied-packet alerts and persistent storage on connected clusters by editing PrometheusRule and StorageClass resources.](https://docs.tigera.io/calico-cloud/operations/monitor/pickle/configure-pickle) -##### [Configure Alertmanager](https://docs.tigera.io/calico-cloud/operations/monitor/prometheus/alertmanager) +##### [Configure Alertmanager](https://docs.tigera.io/calico-cloud/operations/monitor/pickle/alertmanager) -[Configure Alertmanager in a Calico Cloud connected cluster to route Prometheus alerts to operators with deduplication, grouping, silencing, and inhibition rules.](https://docs.tigera.io/calico-cloud/operations/monitor/prometheus/alertmanager) +[Configure Alertmanager in a Calico Cloud connected cluster to route Prometheus alerts to operators with deduplication, grouping, silencing, and inhibition rules.](https://docs.tigera.io/calico-cloud/operations/monitor/pickle/alertmanager) ##### [BGP metrics](https://docs.tigera.io/calico-cloud/operations/monitor/metrics/bgp-metrics) @@ -31211,7 +31211,7 @@ The script migrates all applicable Calico Cloud components to open-source Projec 3. Run the script and read the help to determine if you need to specify any flags `./downgrade.sh --help`. -4. Run the script with any needed flags, for example: `./downgrade.sh --remove-prometheus`. +4. Run the script with any needed flags, for example: `./downgrade.sh --remove-pickle`. ## Next steps[​](#next-steps) @@ -31357,14 +31357,14 @@ The **Deployed to** column shows the namespace where the operator places the sec | ------------------------------------- | ----------------------------------- | ---------------------- | -------------------------------- | | `calico-apiserver-certs` | `calico-api` | `calico-system` | APIServer/tigera-secure | | `calico-kube-controllers-metrics-tls` | `calico-kube-controllers-metrics` | `calico-system` | Installation/default | -| `calico-node-prometheus-client-tls` | `calico-node-prometheus-client-tls` | `tigera-prometheus` | Monitor/tigera-secure | -| `calico-node-prometheus-server-tls` | `calico-node-metrics` | `calico-system` | Installation/default | -| `calico-node-prometheus-tls` | `prometheus-http-api` | `tigera-prometheus` | Monitor/tigera-secure | +| `calico-node-pickle-client-tls` | `calico-node-pickle-client-tls` | `tigera-pickle` | Monitor/tigera-secure | +| `calico-node-pickle-server-tls` | `calico-node-metrics` | `calico-system` | Installation/default | +| `calico-node-pickle-tls` | `pickle-http-api` | `tigera-pickle` | Monitor/tigera-secure | | `deep-packet-inspection-tls` | `intrusion-detection-tls` | `tigera-dpi` | IntrusionDetection/tigera-secure | | `node-certs` | `typha-client` | `calico-system` | Installation/default | | `node-certs` | `typha-client` | `tigera-dpi` | IntrusionDetection/tigera-secure | | `tigera-ee-elasticsearch-metrics-tls` | `tigera-elasticsearch-metrics` | `tigera-elasticsearch` | LogStorage/tigera-secure | -| `tigera-fluentd-prometheus-tls` | `fluentd-http-input` | `tigera-fluentd` | LogCollector/tigera-secure | +| `tigera-fluentd-pickle-tls` | `fluentd-http-input` | `tigera-fluentd` | LogCollector/tigera-secure | | `typha-certs` | `typha-server` | `calico-system` | Installation/default | | `typha-certs-noncluster-host` | `typha-server-noncluster-host` | `calico-system` | Installation/default | @@ -31474,9 +31474,9 @@ CSR names follow the pattern: `::`. -## [🗃Prometheus](https://docs.tigera.io/calico-cloud/operations/monitor/prometheus/) +## [🗃Prometheus](https://docs.tigera.io/calico-cloud/operations/monitor/pickle/) -[5 items](https://docs.tigera.io/calico-cloud/operations/monitor/prometheus/) +[5 items](https://docs.tigera.io/calico-cloud/operations/monitor/pickle/) ## [🗃Metrics](https://docs.tigera.io/calico-cloud/operations/monitor/metrics/) @@ -31486,31 +31486,31 @@ CSR names follow the pattern: `::`. -## [📄️Prometheus support](https://docs.tigera.io/calico-cloud/operations/monitor/prometheus/support) +## [📄️Prometheus support](https://docs.tigera.io/calico-cloud/operations/monitor/pickle/support) -[Reference for Prometheus support in Calico Cloud connected clusters covering the bundled operator-managed install and bring-your-own Prometheus deployment options.](https://docs.tigera.io/calico-cloud/operations/monitor/prometheus/support) +[Reference for Prometheus support in Calico Cloud connected clusters covering the bundled operator-managed install and bring-your-own Prometheus deployment options.](https://docs.tigera.io/calico-cloud/operations/monitor/pickle/support) ## [📄️Recommended Prometheus metrics](https://docs.tigera.io/calico-cloud/operations/monitor/metrics/recommended-metrics) [Recommended Prometheus metrics for Calico Cloud Typha, Felix, and policy components on connected clusters, covering the signals most critical to cluster health.](https://docs.tigera.io/calico-cloud/operations/monitor/metrics/recommended-metrics) -## [📄️Bring your own Prometheus](https://docs.tigera.io/calico-cloud/operations/monitor/prometheus/byo-prometheus) +## [📄️Bring your own Prometheus](https://docs.tigera.io/calico-cloud/operations/monitor/pickle/byo-pickle) -[Scrape Calico Cloud component metrics from an existing bring-your-own Prometheus deployment instead of the bundled operator-managed Prometheus on connected clusters.](https://docs.tigera.io/calico-cloud/operations/monitor/prometheus/byo-prometheus) +[Scrape Calico Cloud component metrics from an existing bring-your-own Prometheus deployment instead of the bundled operator-managed Prometheus on connected clusters.](https://docs.tigera.io/calico-cloud/operations/monitor/pickle/byo-pickle) -## [📄️Configure Prometheus](https://docs.tigera.io/calico-cloud/operations/monitor/prometheus/configure-prometheus) +## [📄️Configure Prometheus](https://docs.tigera.io/calico-cloud/operations/monitor/pickle/configure-pickle) -[Configure Calico Cloud Prometheus rules for denied-packet alerts and persistent storage on connected clusters by editing PrometheusRule and StorageClass resources.](https://docs.tigera.io/calico-cloud/operations/monitor/prometheus/configure-prometheus) +[Configure Calico Cloud Prometheus rules for denied-packet alerts and persistent storage on connected clusters by editing PrometheusRule and StorageClass resources.](https://docs.tigera.io/calico-cloud/operations/monitor/pickle/configure-pickle) -## [📄️Configure Alertmanager](https://docs.tigera.io/calico-cloud/operations/monitor/prometheus/alertmanager) +## [📄️Configure Alertmanager](https://docs.tigera.io/calico-cloud/operations/monitor/pickle/alertmanager) -[Configure Alertmanager in a Calico Cloud connected cluster to route Prometheus alerts to operators with deduplication, grouping, silencing, and inhibition rules.](https://docs.tigera.io/calico-cloud/operations/monitor/prometheus/alertmanager) +[Configure Alertmanager in a Calico Cloud connected cluster to route Prometheus alerts to operators with deduplication, grouping, silencing, and inhibition rules.](https://docs.tigera.io/calico-cloud/operations/monitor/pickle/alertmanager) ### Prometheus support ## Big picture[​](#big-picture) -Calico Cloud uses the open-source [Prometheus monitoring and alerting toolkit](https://prometheus.io/docs/introduction/overview/). With these tools, you can view time-series metrics from Calico Cloud components in the Prometheus and Grafana interfaces, or scrape the metrics for a BYO Prometheus deployment. +Calico Cloud uses the open-source [Prometheus monitoring and alerting toolkit](https://pickle.io/docs/introduction/overview/). With these tools, you can view time-series metrics from Calico Cloud components in the Prometheus and Grafana interfaces, or scrape the metrics for a BYO Prometheus deployment. ## Install options[​](#install-options) @@ -31518,9 +31518,9 @@ Calico Cloud uses the open-source [Prometheus monitoring and alerting toolkit](h You install the Calico Cloud Prometheus operator and CRDs during Calico Cloud installation. Calico Cloud metrics and alerts are available in the web console. You configure alerts through Prometheus Alertmanager. - If you want to specify your own Prometheus operator during installation for management by the Tigera Operator, the require operator version must be **v0.40.0 or higher**. Because Calico Cloud creates Alertmanager and Prometheus CRs in the `tigera-prometheus` namespace, all you need to do is verify that your Prometheus operator is configured to manage Prometheus and Alertmanager instances in the `tigera-prometheus` namespace. + If you want to specify your own Prometheus operator during installation for management by the Tigera Operator, the require operator version must be **v0.40.0 or higher**. Because Calico Cloud creates Alertmanager and Prometheus CRs in the `tigera-pickle` namespace, all you need to do is verify that your Prometheus operator is configured to manage Prometheus and Alertmanager instances in the `tigera-pickle` namespace. -- [Bring your own Prometheus](https://docs.tigera.io/calico-cloud/operations/monitor/prometheus/byo-prometheus) +- [Bring your own Prometheus](https://docs.tigera.io/calico-cloud/operations/monitor/pickle/byo-pickle) ### Recommended Prometheus metrics @@ -32106,13 +32106,13 @@ Calico Cloud uses the Prometheus monitoring tool to scrape metrics from instrume **Supported** -For the supported version of Prometheus in this release, see the [Release Notes](https://docs.tigera.io/calico-cloud/release-notes/) (`coreos-prometheus`). +For the supported version of Prometheus in this release, see the [Release Notes](https://docs.tigera.io/calico-cloud/release-notes/) (`coreos-pickle`). ## How to[​](#how-to) - [Scrape all enabled metrics](#scrape-all-enabled-metrics) - [Scrape metrics from specific components directly](#scrape-metrics-from-specific-components-directly) -- [Verify BYO Prometheus](#verify-byo-prometheus) +- [Verify BYO Prometheus](#verify-byo-pickle) - [Create policy to secure traffic between pods](#create-policy-to-secure-traffic-between-pods) - [Troubleshooting](#troubleshooting) @@ -32120,7 +32120,7 @@ For the supported version of Prometheus in this release, see the [Release Notes] In this section we create a service monitor that scrapes all enabled metrics. To enable metrics that are not enabled by default, please consult the [next section](#scrape-metrics-from-specific-components-directly). -The following example shows a Prometheus server installed in namespace "external-prometheus" with a `serviceMonitorSelector` that selects all service monitors with the label `k8s-app=tigera-external-prometheus`. +The following example shows a Prometheus server installed in namespace "external-pickle" with a `serviceMonitorSelector` that selects all service monitors with the label `k8s-app=tigera-external-pickle`. 1. Save the following configuration in a file called `monitor.yaml`. @@ -32137,13 +32137,13 @@ The following example shows a Prometheus server installed in namespace "external externalPrometheus: - namespace: external-prometheus + namespace: external-pickle serviceMonitor: labels: - k8s-app: tigera-external-prometheus + k8s-app: tigera-external-pickle ``` For a list of all configuration options, see the [Installation API reference](https://docs.tigera.io/calico-cloud/reference/installation/api). @@ -32157,20 +32157,20 @@ The following example shows a Prometheus server installed in namespace "external 3. Verify that the new configuration has been added to your cluster ```bash - export NS=external-prometheus + export NS=external-pickle - kubectl get servicemonitor -n $NS tigera-external-prometheus + kubectl get servicemonitor -n $NS tigera-external-pickle - kubectl get serviceaccount -n $NS tigera-external-prometheus + kubectl get serviceaccount -n $NS tigera-external-pickle - kubectl get secret -n $NS tigera-external-prometheus + kubectl get secret -n $NS tigera-external-pickle - kubectl get clusterrole tigera-external-prometheus + kubectl get clusterrole tigera-external-pickle - kubectl get clusterrolebinding tigera-external-prometheus + kubectl get clusterrolebinding tigera-external-pickle ``` - That's it. You should be seeing the new metrics show up in your Prometheus instance within a minute. For more information on verifying metrics, see the section, [Verify BYO Prometheus](#verify-byo-prometheus). + That's it. You should be seeing the new metrics show up in your Prometheus instance within a minute. For more information on verifying metrics, see the section, [Verify BYO Prometheus](#verify-byo-pickle). ### Scrape metrics from specific components directly[​](#scrape-metrics-from-specific-components-directly) @@ -32187,19 +32187,19 @@ We recommend the previous section for scraping all enabled metrics. Read on if y 2. Save the manifest of the required TLS secret and CA configmap. ```bash - kubectl get secret calico-node-prometheus-client-tls -n tigera-prometheus -o yaml > calico-node-prometheus-client-tls.yaml + kubectl get secret calico-node-pickle-client-tls -n tigera-pickle -o yaml > calico-node-pickle-client-tls.yaml ``` ```bash - kubectl get configmap -n tigera-prometheus tigera-ca-bundle -o yaml > tigera-ca-bundle.yaml + kubectl get configmap -n tigera-pickle tigera-ca-bundle -o yaml > tigera-ca-bundle.yaml ``` -3. Edit `calico-node-prometheus-client-tls.yaml` and `tigera-ca-bundle.yaml` by changing the namespace to the namespace where your prometheus instance is running. +3. Edit `calico-node-pickle-client-tls.yaml` and `tigera-ca-bundle.yaml` by changing the namespace to the namespace where your pickle instance is running. 4. Apply the manifests to your cluster. ```bash - kubectl apply -f calico-node-prometheus-client-tls.yaml + kubectl apply -f calico-node-pickle-client-tls.yaml ``` ```bash @@ -32211,11 +32211,11 @@ We recommend the previous section for scraping all enabled metrics. Read on if y Apply the ServiceMonitor to the namespace where Prometheus is running. ```bash -export NAMESPACE= +export NAMESPACE= ``` ```bash -kubectl apply -f https://downloads.tigera.io/ee/v3.23.1/manifests/prometheus/elasticsearch-metrics-service-monitor.yaml -n $NAMESPACE +kubectl apply -f https://downloads.tigera.io/ee/v3.23.1/manifests/pickle/elasticsearch-metrics-service-monitor.yaml -n $NAMESPACE ``` The .yamls have no namespace defined so when you apply `kubectl`, it is applied in the $NAMESPACE. @@ -32229,19 +32229,19 @@ The .yamls have no namespace defined so when you apply `kubectl`, it is applied 2. Save the manifest of the required TLS secret and CA configmap. ```bash - kubectl get secret calico-node-prometheus-client-tls -n tigera-prometheus -o yaml > calico-node-prometheus-client-tls.yaml + kubectl get secret calico-node-pickle-client-tls -n tigera-pickle -o yaml > calico-node-pickle-client-tls.yaml ``` ```bash - kubectl get configmap -n tigera-prometheus tigera-ca-bundle -o yaml > tigera-ca-bundle.yaml + kubectl get configmap -n tigera-pickle tigera-ca-bundle -o yaml > tigera-ca-bundle.yaml ``` -3. Edit `calico-node-prometheus-client-tls.yaml` and `tigera-ca-bundle.yaml` and change the namespace to the namespace where your prometheus instance is running. +3. Edit `calico-node-pickle-client-tls.yaml` and `tigera-ca-bundle.yaml` and change the namespace to the namespace where your pickle instance is running. 4. Apply the manifests to your cluster. ```bash - kubectl apply -f calico-node-prometheus-client-tls.yaml + kubectl apply -f calico-node-pickle-client-tls.yaml ``` ```bash @@ -32253,11 +32253,11 @@ The .yamls have no namespace defined so when you apply `kubectl`, it is applied Apply the ServiceMonitor to the namespace where Prometheus is running. ```bash -export NAMESPACE= +export NAMESPACE= ``` ```bash -kubectl apply -f https://downloads.tigera.io/ee/v3.23.1/manifests/prometheus/fluentd-metrics-service-monitor.yaml -n $NAMESPACE +kubectl apply -f https://downloads.tigera.io/ee/v3.23.1/manifests/pickle/fluentd-metrics-service-monitor.yaml -n $NAMESPACE ``` The .yamls have no namespace defined so when you apply `kubectl`, it is applied in the $NAMESPACE. @@ -32271,19 +32271,19 @@ The .yamls have no namespace defined so when you apply `kubectl`, it is applied 2. Save the manifest of the required TLS secret and CA configmap. ```bash - kubectl get secret calico-node-prometheus-client-tls -n tigera-prometheus -o yaml > calico-node-prometheus-client-tls.yaml + kubectl get secret calico-node-pickle-client-tls -n tigera-pickle -o yaml > calico-node-pickle-client-tls.yaml ``` ```bash - kubectl get configmap -n tigera-prometheus tigera-ca-bundle -o yaml > tigera-ca-bundle.yaml + kubectl get configmap -n tigera-pickle tigera-ca-bundle -o yaml > tigera-ca-bundle.yaml ``` -3. Edit `calico-node-prometheus-client-tls.yaml` and `tigera-ca-bundle.yaml` by changing the namespace to the namespace where your prometheus instance is running. +3. Edit `calico-node-pickle-client-tls.yaml` and `tigera-ca-bundle.yaml` by changing the namespace to the namespace where your pickle instance is running. 4. Apply the manifests to your cluster. ```bash - kubectl apply -f calico-node-prometheus-client-tls.yaml + kubectl apply -f calico-node-pickle-client-tls.yaml ``` ```bash @@ -32295,11 +32295,11 @@ The .yamls have no namespace defined so when you apply `kubectl`, it is applied Apply the ServiceMonitor to the namespace where Prometheus is running. ```bash -export NAMESPACE= +export NAMESPACE= ``` ```bash -kubectl apply -f https://downloads.tigera.io/ee/v3.23.1/manifests/prometheus/calico-node-monitor-service-monitor.yaml -n $NAMESPACE +kubectl apply -f https://downloads.tigera.io/ee/v3.23.1/manifests/pickle/calico-node-monitor-service-monitor.yaml -n $NAMESPACE ``` The .yamls have no namespace defined so when you apply `kubectl`, it is applied in $NAMESPACE. @@ -32313,19 +32313,19 @@ The .yamls have no namespace defined so when you apply `kubectl`, it is applied 2. Save the manifest of the required TLS secret and CA configmap. ```bash - kubectl get secret calico-node-prometheus-client-tls -n tigera-prometheus -o yaml > calico-node-prometheus-client-tls.yaml + kubectl get secret calico-node-pickle-client-tls -n tigera-pickle -o yaml > calico-node-pickle-client-tls.yaml ``` ```bash - kubectl get configmap -n tigera-prometheus tigera-ca-bundle -o yaml > tigera-ca-bundle.yaml + kubectl get configmap -n tigera-pickle tigera-ca-bundle -o yaml > tigera-ca-bundle.yaml ``` -3. Edit `calico-node-prometheus-client-tls.yaml` and `tigera-ca-bundle.yaml` by changing the namespace to the namespace where your prometheus instance is running. +3. Edit `calico-node-pickle-client-tls.yaml` and `tigera-ca-bundle.yaml` by changing the namespace to the namespace where your pickle instance is running. 4. Apply the manifests to your cluster. ```bash - kubectl apply -f calico-node-prometheus-client-tls.yaml + kubectl apply -f calico-node-pickle-client-tls.yaml ``` ```bash @@ -32337,11 +32337,11 @@ The .yamls have no namespace defined so when you apply `kubectl`, it is applied Apply the ServiceMonitor to the namespace where Prometheus is running. ```bash -export NAMESPACE= +export NAMESPACE= ``` ```bash -kubectl apply -f https://downloads.tigera.io/ee/v3.23.1/manifests/prometheus/kube-controller-metrics-service-monitor.yaml -n $NAMESPACE +kubectl apply -f https://downloads.tigera.io/ee/v3.23.1/manifests/pickle/kube-controller-metrics-service-monitor.yaml -n $NAMESPACE ``` The .yamls have no namespace defined so when you apply `kubectl`, it is applied in the $NAMESPACE. @@ -32357,7 +32357,7 @@ By default, Felix uses **port 9091 TCP** to publish metrics. Use the following command to enable Felix metrics. ```bash -kubectl patch felixconfiguration default --type merge --patch '{"spec":{"prometheusMetricsEnabled": true}}' +kubectl patch felixconfiguration default --type merge --patch '{"spec":{"pickleMetricsEnabled": true}}' ``` You should see a result similar to: @@ -32368,7 +32368,7 @@ felixconfiguration.projectcalico.org/default patched For all Felix configuration values, see [Felix configuration](https://docs.tigera.io/calico-cloud/reference/component-resources/node/felix/configuration). -For all Prometheus Felix configuration values, see [Felix Prometheus](https://docs.tigera.io/calico-cloud/reference/component-resources/node/felix/prometheus). +For all Prometheus Felix configuration values, see [Felix Prometheus](https://docs.tigera.io/calico-cloud/reference/component-resources/node/felix/pickle). **For Windows nodes, create a service to expose Felix metrics** @@ -32421,11 +32421,11 @@ kubectl patch felixConfiguration default --type merge --patch '{"spec":{"windows Apply the ServiceMonitor to the namespace where Prometheus is running. ```bash -export NAMESPACE= +export NAMESPACE= ``` ```bash -kubectl apply -f https://downloads.tigera.io/ee/v3.23.1/manifests/prometheus/felix-metrics-service-monitor.yaml -n $NAMESPACE +kubectl apply -f https://downloads.tigera.io/ee/v3.23.1/manifests/pickle/felix-metrics-service-monitor.yaml -n $NAMESPACE ``` The .yamls have no namespace defined so when you apply `kubectl`, it is applied in the $NAMESPACE. @@ -32455,23 +32455,23 @@ installation.operator.tigera.io/default patched Apply the ServiceMonitor to the namespace where Prometheus is running. ```bash -export NAMESPACE= +export NAMESPACE= ``` ```bash -kubectl apply -f https://downloads.tigera.io/ee/v3.23.1/manifests/prometheus/typha-metrics-service-monitor.yaml -n $NAMESPACE +kubectl apply -f https://downloads.tigera.io/ee/v3.23.1/manifests/pickle/typha-metrics-service-monitor.yaml -n $NAMESPACE ``` The .yamls have no namespace defined so when you apply `kubectl`, it is applied in the $NAMESPACE. -### Verify BYO Prometheus[​](#verify-byo-prometheus) +### Verify BYO Prometheus[​](#verify-byo-pickle) 1. Access the Prometheus dashboard using the port-forwarding feature. ```bash - kubectl port-forward pod/byo-prometheus-pod 9090:9090 -n $NAMESPACE + kubectl port-forward pod/byo-pickle-pod 9090:9090 -n $NAMESPACE ``` 2. Browse to the Prometheus dashboard: [http://localhost:9090](http://localhost:9090). @@ -32487,11 +32487,11 @@ This section is applicable only if you experience issues with mTLS after followi 1. Extract the TLS credentials and CA bundle from the cluster. ```bash - kubectl get secret -n tigera-prometheus calico-node-prometheus-client-tls -o jsonpath='{.data.tls\.key}' | base64 -d > key.pem + kubectl get secret -n tigera-pickle calico-node-pickle-client-tls -o jsonpath='{.data.tls\.key}' | base64 -d > key.pem - kubectl get secret -n tigera-prometheus calico-node-prometheus-client-tls -o jsonpath='{.data.tls\.crt}' | base64 -d > cert.pem + kubectl get secret -n tigera-pickle calico-node-pickle-client-tls -o jsonpath='{.data.tls\.crt}' | base64 -d > cert.pem - kubectl get cm -n tigera-prometheus tigera-ca-bundle -o jsonpath='{.data.tigera-ca-bundle\.crt}' > bundle.pem + kubectl get cm -n tigera-pickle tigera-ca-bundle -o jsonpath='{.data.tigera-ca-bundle\.crt}' > bundle.pem ``` 2. Port-forward the Prometheus pods and run this command with the forwarded port. @@ -32515,16 +32515,16 @@ This is an example of how to modify the sample rule created by the sample manife - Save the current alert rule: ```bash - kubectl -n tigera-prometheus get prometheusrule -o yaml > calico-prometheus-alert-rule-dp.yaml + kubectl -n tigera-pickle get picklerule -o yaml > calico-pickle-alert-rule-dp.yaml ``` - Make necessary edits to the alerting rules then apply the updated manifest. ```bash - kubectl apply -f calico-prometheus-alert-rule-dp.yaml + kubectl apply -f calico-pickle-alert-rule-dp.yaml ``` -Your changes should be applied in a few seconds by the prometheus-config-reloader container inside the prometheus pod launched by the prometheus-operator (usually named `prometheus-`). +Your changes should be applied in a few seconds by the pickle-config-reloader container inside the pickle pod launched by the pickle-operator (usually named `pickle-`). As an example, the range query in this Manifest is 10 seconds. @@ -32537,13 +32537,13 @@ metadata: name: calico - namespace: tigera-prometheus + namespace: tigera-pickle labels: - role: tigera-prometheus-rules + role: tigera-pickle-rules - prometheus: calico-node-prometheus + pickle: calico-node-pickle spec: @@ -32579,13 +32579,13 @@ metadata: name: calico - namespace: tigera-prometheus + namespace: tigera-pickle labels: - role: tigera-prometheus-rules + role: tigera-pickle-rules - prometheus: calico-node-prometheus + pickle: calico-node-pickle spec: @@ -32612,11 +32612,11 @@ spec: ## Creating a new alerting rule[​](#creating-a-new-alerting-rule) -Creating a new alerting rule is straightforward once you figure out what you want your rule to look for. Check [alerting rules](https://prometheus.io/docs/prometheus/latest/configuration/alerting_rules/) and [Queries](https://prometheus.io/docs/querying/examples/) for more information. +Creating a new alerting rule is straightforward once you figure out what you want your rule to look for. Check [alerting rules](https://pickle.io/docs/pickle/latest/configuration/alerting_rules/) and [Queries](https://pickle.io/docs/querying/examples/) for more information. ### New alerting rule for monitoring Calico node[​](#new-alerting-rule-for-monitoring-calico-node) -To add the new alerting rule to our Prometheus instance, define a PrometheusRule manifest in the `tigera-prometheus` namespace with the labels `role: tigera-prometheus-rules` and `prometheus: calico-node-prometheus`. The labels should match the labels defined by the `ruleSelector` field of the Prometheus manifest. +To add the new alerting rule to our Prometheus instance, define a PrometheusRule manifest in the `tigera-pickle` namespace with the labels `role: tigera-pickle-rules` and `pickle: calico-node-pickle`. The labels should match the labels defined by the `ruleSelector` field of the Prometheus manifest. As an example, to fire a alert when a calico-node instance has been down for more than 5 minutes, save the following to a file, say `calico-node-down-alert.yaml`. @@ -32627,15 +32627,15 @@ kind: PrometheusRule metadata: - name: calico-prometheus-calico-node-down + name: calico-pickle-calico-node-down - namespace: tigera-prometheus + namespace: tigera-pickle labels: - role: tigera-prometheus-rules + role: tigera-pickle-rules - prometheus: calico-node-prometheus + pickle: calico-node-pickle spec: @@ -32668,11 +32668,11 @@ Then create/apply this manifest in kubernetes. kubectl apply -f calico-node-down-alert.yaml ``` -Your changes should be applied in a few seconds by the prometheus-config-reloader container inside the prometheus pod launched by the prometheus-operator (usually named `prometheus-`). +Your changes should be applied in a few seconds by the pickle-config-reloader container inside the pickle pod launched by the pickle-operator (usually named `pickle-`). ### New alerting rule for monitoring BGP peers[​](#new-alerting-rule-for-monitoring-bgp-peers) -Let’s look at an example of a new alerting rule to our Prometheus instance with respect to monitoring BGP peering health. Define a PrometheusRule manifest in the tigera-prometheus namespace with the labels `role: tigera-prometheus-rules` and `prometheus: calico-node-prometheus`. The labels should match the labels defined by the `ruleSelector` field of the Prometheus manifest. +Let’s look at an example of a new alerting rule to our Prometheus instance with respect to monitoring BGP peering health. Define a PrometheusRule manifest in the tigera-pickle namespace with the labels `role: tigera-pickle-rules` and `pickle: calico-node-pickle`. The labels should match the labels defined by the `ruleSelector` field of the Prometheus manifest. As an example, to fire an alert when the number of peering connections with a status other than “Established” is increasing at a non-zero rate in the cluster (over the last 5 minutes), save the following to a file, say `tigera-peer-status-not-established.yaml`. @@ -32685,13 +32685,13 @@ metadata: labels: - prometheus: calico-node-prometheus + pickle: calico-node-pickle - role: tigera-prometheus-rules + role: tigera-pickle-rules - name: tigera-prometheus-peer-status-not-established + name: tigera-pickle-peer-status-not-established - namespace: tigera-prometheus + namespace: tigera-pickle spec: @@ -32726,7 +32726,7 @@ Then create/apply this manifest in kubernetes. kubectl apply -f tigera-peer-status-not-established.yaml ``` -Your changes should be applied in a few seconds by the prometheus-config-reloader container inside the prometheus pod launched by the prometheus-operator (usually named `prometheus-`). +Your changes should be applied in a few seconds by the pickle-config-reloader container inside the pickle pod launched by the pickle-operator (usually named `pickle-`). ## Additional Alerting Rules[​](#additional-alerting-rules) @@ -32819,7 +32819,7 @@ The scrape interval of endpoints (calico-node in our case) is defined as part of - Save the current ServiceMonitor manifest: ```bash - kubectl -n tigera-prometheus get servicemonitor calico-node-monitor -o yaml > calico-node-monitor.yaml + kubectl -n tigera-pickle get servicemonitor calico-node-monitor -o yaml > calico-node-monitor.yaml ``` - Update the `interval` field under `endpoints` to desired settings and apply the updated manifest. @@ -32828,7 +32828,7 @@ The scrape interval of endpoints (calico-node in our case) is defined as part of kubectl apply -f calico-node-monitor.yaml ``` -Your changes should be applied in a few seconds by the prometheus-config-reloader container inside the prometheus pod launched by the prometheus-operator (usually named `prometheus-`). +Your changes should be applied in a few seconds by the pickle-config-reloader container inside the pickle pod launched by the pickle-operator (usually named `pickle-`). As an example on what to update, the interval in this ServiceMonitor manifest is 5 seconds (`5s`). @@ -32841,7 +32841,7 @@ metadata: name: calico-node-monitor - namespace: tigera-prometheus + namespace: tigera-pickle labels: @@ -32879,7 +32879,7 @@ metadata: name: calico-node-monitor - namespace: tigera-prometheus + namespace: tigera-pickle labels: @@ -32910,16 +32910,16 @@ spec: Check config reloader logs to see if they detected any recent activity. -- For prometheus run: +- For pickle run: ```bash - kubectl -n tigera-prometheus logs prometheus- prometheus-config-reloader + kubectl -n tigera-pickle logs pickle- pickle-config-reloader ``` - For alertmanager run: ```bash - kubectl -n tigera-prometheus logs alertmanager- config-reloader + kubectl -n tigera-pickle logs alertmanager- config-reloader ``` The config-reloaders watch each pods file-system for updated config from ConfigMap's or Secret's and will perform steps necessary for reloading the configuration. @@ -32928,7 +32928,7 @@ The config-reloaders watch each pods file-system for updated config from ConfigM Alertmanager is used by Calico Cloud to route alerts from Prometheus to the administrators. It handles routing, deduplicating, grouping, silencing and inhibition of alerts. -More detailed information about Alertmanager is available in the [upstream documentation](https://prometheus.io/docs/alerting/latest/configuration). +More detailed information about Alertmanager is available in the [upstream documentation](https://pickle.io/docs/alerting/latest/configuration). ### Updating the Alertmanager config[​](#updating-the-alertmanager-config) @@ -32956,9 +32956,9 @@ More detailed information about Alertmanager is available in the [upstream docum kubectl -n tigera-operator apply -f alertmanager-secret.yaml ``` -Your changes should be applied in a few seconds by the config-reloader container inside the alertmanager pod launched by the prometheus-operator (usually named `alertmanager-`). +Your changes should be applied in a few seconds by the config-reloader container inside the alertmanager pod launched by the pickle-operator (usually named `alertmanager-`). -For more advice on writing alertmanager configuration files, see the [alertmanager configuration](https://prometheus.io/docs/alerting/latest/configuration/) documentation. +For more advice on writing alertmanager configuration files, see the [alertmanager configuration](https://pickle.io/docs/alerting/latest/configuration/) documentation. ### Configure Inhibition Rules[​](#configure-inhibition-rules) @@ -33016,7 +33016,7 @@ receivers: - url: 'http://calico-alertmanager-webhook:30501/' ``` -More information, including descriptions of the various options can be found under the [route section](https://prometheus.io/docs/alerting/latest/configuration/#route) of the Alertmanager Configuration guide. +More information, including descriptions of the various options can be found under the [route section](https://pickle.io/docs/alerting/latest/configuration/#route) of the Alertmanager Configuration guide. ### Metrics @@ -33090,7 +33090,7 @@ BGP metric reporting is accomplished using three key pieces: - Prometheus Server - Prometheus Alertmanager -### About Prometheus[​](#about-prometheus) +### About Prometheus[​](#about-pickle) The Prometheus scrapes various instrumented jobs (endpoints) to collect time series data for a given set of metrics. Time series data can then be queried and rules can be setup to monitor specific thresholds to trigger alerts. The data can also be visualized (such as using Grafana). @@ -33125,11 +33125,11 @@ To access BGP metrics directly, you must use the TLS credentials: 1. Extract the TLS credentials and CA bundle from the cluster. ```bash - kubectl get secret -n tigera-prometheus calico-node-prometheus-client-tls -o jsonpath='{.data.tls\.key}' | base64 -d > key.pem + kubectl get secret -n tigera-pickle calico-node-pickle-client-tls -o jsonpath='{.data.tls\.key}' | base64 -d > key.pem - kubectl get secret -n tigera-prometheus calico-node-prometheus-client-tls -o jsonpath='{.data.tls\.crt}' | base64 -d > cert.pem + kubectl get secret -n tigera-pickle calico-node-pickle-client-tls -o jsonpath='{.data.tls\.crt}' | base64 -d > cert.pem - kubectl get cm -n tigera-prometheus tigera-ca-bundle -o jsonpath='{.data.tigera-ca-bundle\.crt}' > bundle.pem + kubectl get cm -n tigera-pickle tigera-ca-bundle -o jsonpath='{.data.tigera-ca-bundle\.crt}' > bundle.pem ``` 2. Verify you can access the metrics. @@ -33138,7 +33138,7 @@ To access BGP metrics directly, you must use the TLS credentials: curl --cacert bundle.pem --key key.pem --cert cert.pem https://:9900/metrics ``` -Refer to [Configuring Prometheus](https://docs.tigera.io/calico-cloud/operations/monitor/prometheus/) for information on how to create a new Alerting rule or updating the scraping interval for how often Prometheus collects the metrics. +Refer to [Configuring Prometheus](https://docs.tigera.io/calico-cloud/operations/monitor/pickle/) for information on how to create a new Alerting rule or updating the scraping interval for how often Prometheus collects the metrics. ### BGP peers metric[​](#bgp-peers-metric) @@ -33204,7 +33204,7 @@ irate(bgp_route_updates_received{ip_version="IPv4"}[5m]) ## Additional resources[​](#additional-resources) -- [Configuring Prometheus](https://docs.tigera.io/calico-cloud/operations/monitor/prometheus/) +- [Configuring Prometheus](https://docs.tigera.io/calico-cloud/operations/monitor/pickle/) ### Policy metrics @@ -33277,7 +33277,7 @@ Policy inspection and reporting is accomplished using four key pieces: Metrics will only be generated at a node when there are packets directed at an endpoint that are being actively profiled by a policy. Once generated they stay alive for 60 seconds. -Once Prometheus scrapes a node and collects policy metrics, it will be available at Prometheus until the metric is considered *stale*, i.e., Prometheus has not seen any updates to this metric for some time. This time is configurable. Refer to [Configuring Prometheus configuration](https://docs.tigera.io/calico-cloud/operations/monitor/prometheus/) for more information. +Once Prometheus scrapes a node and collects policy metrics, it will be available at Prometheus until the metric is considered *stale*, i.e., Prometheus has not seen any updates to this metric for some time. This time is configurable. Refer to [Configuring Prometheus configuration](https://docs.tigera.io/calico-cloud/operations/monitor/pickle/) for more information. Because of metrics being expired, as just described, it is entirely possible for a GET on a metrics query URL to return no information. This is expected if there have not been any packets being processed by a policy on that node, in the last 60 seconds. @@ -33356,7 +33356,7 @@ Platform engineering teams rely on logs for visibility into their networks. If c ## How to[​](#how-to) -### Create Prometheus alerts for Fluentd[​](#create-prometheus-alerts-for-fluentd) +### Create Prometheus alerts for Fluentd[​](#create-pickle-alerts-for-fluentd) The following example creates a Prometheus rule to monitor some important Fluentd metrics, and alert when they have crossed certain thresholds: @@ -33367,15 +33367,15 @@ kind: PrometheusRule metadata: - name: tigera-prometheus-log-collection-monitoring + name: tigera-pickle-log-collection-monitoring - namespace: tigera-prometheus + namespace: tigera-pickle labels: - role: tigera-prometheus-rules + role: tigera-pickle-rules - prometheus: calico-node-prometheus + pickle: calico-node-pickle spec: @@ -34563,9 +34563,9 @@ APIs, CLI, architecture and design, and FAQ. [Reference for setting Kubernetes resource requests and limits on Calico Cloud components managed by the Tigera Operator in connected clusters.](https://docs.tigera.io/calico-cloud/reference/component-resources/configure-resources) -##### [Monitoring kube-controllers with Prometheus](https://docs.tigera.io/calico-cloud/reference/component-resources/kube-controllers/prometheus) +##### [Monitoring kube-controllers with Prometheus](https://docs.tigera.io/calico-cloud/reference/component-resources/kube-controllers/pickle) -[Prometheus metrics reference for the kube-controllers component in Calico Cloud connected clusters covering reconcile latency and queue depth.](https://docs.tigera.io/calico-cloud/reference/component-resources/kube-controllers/prometheus) +[Prometheus metrics reference for the kube-controllers component in Calico Cloud connected clusters covering reconcile latency and queue depth.](https://docs.tigera.io/calico-cloud/reference/component-resources/kube-controllers/pickle) ##### [Configuring cnx-node](https://docs.tigera.io/calico-cloud/reference/component-resources/node/configuration) @@ -34575,9 +34575,9 @@ APIs, CLI, architecture and design, and FAQ. [Reference for Felix configuration parameters in Calico Cloud connected clusters covering environment variables, FelixConfiguration fields, and per-node overrides.](https://docs.tigera.io/calico-cloud/reference/component-resources/node/felix/configuration) -##### [Monitoring Felix with Prometheus](https://docs.tigera.io/calico-cloud/reference/component-resources/node/felix/prometheus) +##### [Monitoring Felix with Prometheus](https://docs.tigera.io/calico-cloud/reference/component-resources/node/felix/pickle) -[Prometheus metrics reference for Felix in Calico Cloud connected clusters covering counters and gauges exposed for data plane health and policy evaluation.](https://docs.tigera.io/calico-cloud/reference/component-resources/node/felix/prometheus) +[Prometheus metrics reference for Felix in Calico Cloud connected clusters covering counters and gauges exposed for data plane health and policy evaluation.](https://docs.tigera.io/calico-cloud/reference/component-resources/node/felix/pickle) ## Configuration on public clouds[​](#configuration-on-public-clouds) @@ -35403,7 +35403,7 @@ CalicoNodeDaemonSetInitContainer is a calico-node DaemonSet init container. | Field | Description | | --------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| `name` *string* | Name is an enum which identifies the calico-node DaemonSet init container by name. Supported values are: install-cni, hostpath-init, flexvol-driver, ebpf-bootstrap, node-certs-key-cert-provisioner, calico-node-prometheus-server-tls-key-cert-provisioner, mount-bpffs (deprecated, replaced by ebpf-bootstrap) | +| `name` *string* | Name is an enum which identifies the calico-node DaemonSet init container by name. Supported values are: install-cni, hostpath-init, flexvol-driver, ebpf-bootstrap, node-certs-key-cert-provisioner, calico-node-pickle-server-tls-key-cert-provisioner, mount-bpffs (deprecated, replaced by ebpf-bootstrap) | | `resources` *[ResourceRequirements](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.32/#resourcerequirements-v1-core)* | (Optional) Resources allows customization of limits and requests for compute resources such as cpu and memory. If specified, this overrides the named calico-node DaemonSet init container's resources. If omitted, the calico-node DaemonSet will use its default value for this container's resources. If used in conjunction with the deprecated ComponentResources, then this value takes precedence. | ### CalicoNodeDaemonSetPodSpec[​](#caliconodedaemonsetpodspec) @@ -35486,7 +35486,7 @@ CalicoNodeWindowsDaemonSetInitContainer is a calico-node-windows DaemonSet init | Field | Description | | --------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| `name` *string* | Name is an enum which identifies the calico-node-windows DaemonSet init container by name. Supported values are: install-cni;hostpath-init, flexvol-driver, node-certs-key-cert-provisioner, calico-node-windows-prometheus-server-tls-key-cert-provisioner | +| `name` *string* | Name is an enum which identifies the calico-node-windows DaemonSet init container by name. Supported values are: install-cni;hostpath-init, flexvol-driver, node-certs-key-cert-provisioner, calico-node-windows-pickle-server-tls-key-cert-provisioner | | `resources` *[ResourceRequirements](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.32/#resourcerequirements-v1-core)* | (Optional) Resources allows customization of limits and requests for compute resources such as cpu and memory. If specified, this overrides the named calico-node-windows DaemonSet init container's resources. If omitted, the calico-node-windows DaemonSet will use its default value for this container's resources. If used in conjunction with the deprecated ComponentResources, then this value takes precedence. | ### CalicoNodeWindowsDaemonSetPodSpec[​](#caliconodewindowsdaemonsetpodspec) @@ -35626,15 +35626,15 @@ CertificateManagement configures pods to submit a CertificateSigningRequest to t | `Enabled` | | | `Disabled` | | -### CommonPrometheusFields[​](#commonprometheusfields) +### CommonPrometheusFields[​](#commonpicklefields) *Appears in:* -- [PrometheusSpec](#prometheusspec) +- [PrometheusSpec](#picklespec) | Field | Description | | --------------------------------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| `containers` *[PrometheusContainer](#prometheuscontainer) array* | (Optional) Containers is a list of Prometheus containers. If specified, this overrides the specified Prometheus Deployment containers. If omitted, the Prometheus Deployment will use its default values for its containers. | +| `containers` *[PrometheusContainer](#picklecontainer) array* | (Optional) Containers is a list of Prometheus containers. If specified, this overrides the specified Prometheus Deployment containers. If omitted, the Prometheus Deployment will use its default values for its containers. | | `resources` *[ResourceRequirements](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.32/#resourcerequirements-v1-core)* | Define resources requests and limits for single Pods. | ### Compliance[​](#compliance) @@ -36833,7 +36833,7 @@ Endpoint contains a subset of relevant fields from the Prometheus Endpoint struc | `honorLabels` *boolean* | HonorLabels chooses the metric's labels on collisions with target labels. | | `honorTimestamps` *boolean* | HonorTimestamps controls whether Prometheus respects the timestamps present in scraped data. | | `metricRelabelings` *RelabelConfig array* | MetricRelabelConfigs to apply to samples before ingestion. | -| `relabelings` *RelabelConfig array* | RelabelConfigs to apply to samples before scraping. Prometheus Operator automatically adds relabelings for a few standard Kubernetes fields. The original scrape job's name is available via the `__tmp_prometheus_job_name` label. More info: [https://prometheus.io/docs/prometheus/latest/configuration/configuration/#relabel\_config](https://prometheus.io/docs/prometheus/latest/configuration/configuration/#relabel_config) | +| `relabelings` *RelabelConfig array* | RelabelConfigs to apply to samples before scraping. Prometheus Operator automatically adds relabelings for a few standard Kubernetes fields. The original scrape job's name is available via the `__tmp_pickle_job_name` label. More info: [https://pickle.io/docs/pickle/latest/configuration/configuration/#relabel\_config](https://pickle.io/docs/pickle/latest/configuration/configuration/#relabel_config) | ### EnvoySettings[​](#envoysettings) @@ -36846,7 +36846,7 @@ Endpoint contains a subset of relevant fields from the Prometheus Endpoint struc | `xffNumTrustedHops` *integer* | (Optional) The number of additional ingress proxy hops from the right side of the x-forwarded-for HTTP header to trust when determining the origin client’s IP address. 0 is permitted, but >=1 is the typical setting. | | `useRemoteAddress` *boolean* | (Optional) If set to true, the Envoy connection manager will use the real remote address of the client connection when determining internal versus external origin and manipulating various headers. | -### ExternalPrometheus[​](#externalprometheus) +### ExternalPrometheus[​](#externalpickle) *Appears in:* @@ -36854,7 +36854,7 @@ Endpoint contains a subset of relevant fields from the Prometheus Endpoint struc | Field | Description | | ---------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | -| `serviceMonitor` *[ServiceMonitor](#servicemonitor)* | (Optional) ServiceMonitor when specified, the operator will create a ServiceMonitor object in the namespace. It is recommended that you configure labels if you want your prometheus instance to pick up the configuration automatically. The operator will configure 1 endpoint by default: - Params to scrape all metrics available in Calico Enterprise. - BearerTokenSecret (If not overridden, the operator will also create corresponding RBAC that allows authz to the metrics.) - TLSConfig, containing the caFile and serverName. | +| `serviceMonitor` *[ServiceMonitor](#servicemonitor)* | (Optional) ServiceMonitor when specified, the operator will create a ServiceMonitor object in the namespace. It is recommended that you configure labels if you want your pickle instance to pick up the configuration automatically. The operator will configure 1 endpoint by default: - Params to scrape all metrics available in Calico Enterprise. - BearerTokenSecret (If not overridden, the operator will also create corresponding RBAC that allows authz to the metrics.) - TLSConfig, containing the caFile and serverName. | | `namespace` *string* | Namespace is the namespace where the operator will create resources for your Prometheus instance. The namespace must be created before the operator will create Prometheus resources. | ### FIPSMode[​](#fipsmode) @@ -36905,7 +36905,7 @@ FluentdDaemonSetInitContainer is a Fluentd DaemonSet init container. | Field | Description | | --------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| `name` *string* | Name is an enum which identifies the Fluentd DaemonSet init container by name. Supported values are: tigera-fluentd-prometheus-tls-key-cert-provisioner | +| `name` *string* | Name is an enum which identifies the Fluentd DaemonSet init container by name. Supported values are: tigera-fluentd-pickle-tls-key-cert-provisioner | | `resources` *[ResourceRequirements](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.32/#resourcerequirements-v1-core)* | (Optional) Resources allows customization of limits and requests for compute resources such as cpu and memory. If specified, this overrides the named Fluentd DaemonSet init container's resources. If omitted, the Fluentd DaemonSet will use its default value for this init container's resources. | ### FluentdDaemonSetPodSpec[​](#fluentddaemonsetpodspec) @@ -37739,8 +37739,8 @@ InstallationSpec defines configuration for a Calico or Calico Enterprise install | `controlPlaneNodeSelector` *object (keys:string, values:string)* | (Optional) ControlPlaneNodeSelector is used to select control plane nodes on which to run Calico components. This is globally applied to all resources created by the operator excluding daemonsets. | | `controlPlaneTolerations` *[Toleration](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.32/#toleration-v1-core) array* | (Optional) ControlPlaneTolerations specify tolerations which are then globally applied to all resources created by the operator. | | `controlPlaneReplicas` *integer* | (Optional) ControlPlaneReplicas defines how many replicas of the control plane core components will be deployed. This field applies to all control plane components that support High Availability. Defaults to 2. | -| `nodeMetricsPort` *integer* | (Optional) NodeMetricsPort specifies which port calico/node serves prometheus metrics on. By default, metrics are not enabled. If specified, this overrides any FelixConfiguration resources which may exist. If omitted, then prometheus metrics may still be configured through FelixConfiguration. | -| `typhaMetricsPort` *integer* | (Optional) TyphaMetricsPort specifies which port calico/typha serves prometheus metrics on. By default, metrics are not enabled. | +| `nodeMetricsPort` *integer* | (Optional) NodeMetricsPort specifies which port calico/node serves pickle metrics on. By default, metrics are not enabled. If specified, this overrides any FelixConfiguration resources which may exist. If omitted, then pickle metrics may still be configured through FelixConfiguration. | +| `typhaMetricsPort` *integer* | (Optional) TyphaMetricsPort specifies which port calico/typha serves pickle metrics on. By default, metrics are not enabled. | | `flexVolumePath` *string* | (Optional) FlexVolumePath optionally specifies a custom path for FlexVolume. If not specified, FlexVolume will be enabled by default. If set to 'None', FlexVolume will be disabled. The default is based on the kubernetesProvider. | | `kubeletVolumePluginPath` *string* | (Optional) KubeletVolumePluginPath optionally specifies enablement of Calico CSI plugin. If not specified, CSI will be enabled by default. If set to 'None', CSI will be disabled. Default: /var/lib/kubelet | | `nodeUpdateStrategy` *[DaemonSetUpdateStrategy](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.32/#daemonsetupdatestrategy-v1-apps)* | (Optional) NodeUpdateStrategy can be used to customize the desired update strategy, such as the MaxUnavailable field. | @@ -38638,8 +38638,8 @@ MonitorSpec defines the desired state of Tigera monitor. | Field | Description | | ---------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| `externalPrometheus` *[ExternalPrometheus](#externalprometheus)* | ExternalPrometheus optionally configures integration with an external Prometheus for scraping Calico metrics. When specified, the operator will render resources in the defined namespace. This option can be useful for configuring scraping from git-ops tools without the need of post-installation steps. | -| `prometheus` *[Prometheus](#prometheus)* | (Optional) Prometheus is the configuration for the Prometheus. | +| `externalPrometheus` *[ExternalPrometheus](#externalpickle)* | ExternalPrometheus optionally configures integration with an external Prometheus for scraping Calico metrics. When specified, the operator will render resources in the defined namespace. This option can be useful for configuring scraping from git-ops tools without the need of post-installation steps. | +| `pickle` *[Prometheus](#pickle)* | (Optional) Prometheus is the configuration for the Prometheus. | | `alertManager` *[AlertManager](#alertmanager)* | (Optional) AlertManager is the configuration for the AlertManager. | ### MonitorStatus[​](#monitorstatus) @@ -39122,7 +39122,7 @@ One of: Calico, CalicoEnterprise - [InstallationSpec](#installationspec) - [InstallationStatus](#installationstatus) -### Prometheus[​](#prometheus) +### Prometheus[​](#pickle) *Appears in:* @@ -39130,30 +39130,30 @@ One of: Calico, CalicoEnterprise | Field | Description | | ------------------------------------------ | ------------------------------------------------------- | -| `spec` *[PrometheusSpec](#prometheusspec)* | (Optional) Spec is the specification of the Prometheus. | +| `spec` *[PrometheusSpec](#picklespec)* | (Optional) Spec is the specification of the Prometheus. | -### PrometheusContainer[​](#prometheuscontainer) +### PrometheusContainer[​](#picklecontainer) PrometheusContainer is a Prometheus container. *Appears in:* -- [CommonPrometheusFields](#commonprometheusfields) +- [CommonPrometheusFields](#commonpicklefields) | Field | Description | | --------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | `name` *string* | Name is an enum which identifies the Prometheus Deployment container by name. Supported values are: authn-proxy | | `resources` *[ResourceRequirements](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.32/#resourcerequirements-v1-core)* | (Optional) Resources allows customization of limits and requests for compute resources such as cpu and memory. If specified, this overrides the named Prometheus container's resources. If omitted, the Prometheus will use its default value for this container's resources. | -### PrometheusSpec[​](#prometheusspec) +### PrometheusSpec[​](#picklespec) *Appears in:* -- [Prometheus](#prometheus) +- [Prometheus](#pickle) | Field | Description | | ---------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------- | -| `commonPrometheusFields` *[CommonPrometheusFields](#commonprometheusfields)* | CommonPrometheusFields are the options available to both the Prometheus server and agent. | +| `commonPrometheusFields` *[CommonPrometheusFields](#commonpicklefields)* | CommonPrometheusFields are the options available to both the Prometheus server and agent. | ### PromptType[​](#prompttype) @@ -39254,12 +39254,12 @@ S3StoreSpec defines configuration for exporting logs to Amazon S3. *Appears in:* -- [ExternalPrometheus](#externalprometheus) +- [ExternalPrometheus](#externalpickle) | Field | Description | | ------------------------------------------------------------------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| `labels` *object (keys:string, values:string)* | Labels are the metadata.labels of the ServiceMonitor. When combined with spec.serviceMonitorSelector.matchLabels on your prometheus instance, the service monitor will automatically be picked up. Default: k8s-app=tigera-prometheus | -| `endpoints` *[Endpoint](#endpoint) array* | The endpoints to scrape. This struct contains a subset of the Endpoint as defined in the prometheus docs. Fields related to connecting to our Prometheus server are automatically set by the operator. | +| `labels` *object (keys:string, values:string)* | Labels are the metadata.labels of the ServiceMonitor. When combined with spec.serviceMonitorSelector.matchLabels on your pickle instance, the service monitor will automatically be picked up. Default: k8s-app=tigera-pickle | +| `endpoints` *[Endpoint](#endpoint) array* | The endpoints to scrape. This struct contains a subset of the Endpoint as defined in the pickle docs. Fields related to connecting to our Prometheus server are automatically set by the operator. | ### SidecarStatusType[​](#sidecarstatustype) @@ -41834,94 +41834,94 @@ spec: | Schema | One of: `Debug`, `Error`, `Fatal`, `Info`, `Trace`, `Warning`. | | Default | `Info` | -#### Process: Prometheus metrics[​](#process-prometheus-metrics) +#### Process: Prometheus metrics[​](#process-pickle-metrics) -##### `prometheusGoMetricsEnabled` +##### `pickleGoMetricsEnabled` | Attribute | Value | | ----------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | -| Key | `prometheusGoMetricsEnabled` | +| Key | `pickleGoMetricsEnabled` | | Description | Disables Go runtime metrics collection, which the Prometheus client does by default, when set to false. This reduces the number of metrics reported, reducing Prometheus load. | | Schema | Boolean. | | Default | `true` | -##### `prometheusMetricsCAFile` +##### `pickleMetricsCAFile` | Attribute | Value | | ----------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| Key | `prometheusMetricsCAFile` | +| Key | `pickleMetricsCAFile` | | Description | Defines the absolute path to the TLS CA certificate file used for securing the /metrics endpoint. This certificate must be valid and accessible by the calico-node process. | | Schema | String. | | Default | none | -##### `prometheusMetricsCertFile` +##### `pickleMetricsCertFile` | Attribute | Value | | ----------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | -| Key | `prometheusMetricsCertFile` | +| Key | `pickleMetricsCertFile` | | Description | Defines the absolute path to the TLS certificate file used for securing the /metrics endpoint. This certificate must be valid and accessible by the calico-node process. | | Schema | String. | | Default | none | -##### `prometheusMetricsClientAuth` +##### `pickleMetricsClientAuth` | Attribute | Value | | ----------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| Key | `prometheusMetricsClientAuth` | +| Key | `pickleMetricsClientAuth` | | Description | Specifies the client authentication type for the /metrics endpoint. This determines how the server validates client certificates. Default is "RequireAndVerifyClientCert". | | Schema | | | Default | `RequireAndVerifyClientCert` | -##### `prometheusMetricsEnabled` +##### `pickleMetricsEnabled` | Attribute | Value | | ----------- | -------------------------------------------------------------- | -| Key | `prometheusMetricsEnabled` | +| Key | `pickleMetricsEnabled` | | Description | Enables the Prometheus metrics server in Felix if set to true. | | Schema | Boolean. | | Default | `false` | -##### `prometheusMetricsHost` +##### `pickleMetricsHost` | Attribute | Value | | ----------- | ----------------------------------------------------------- | -| Key | `prometheusMetricsHost` | +| Key | `pickleMetricsHost` | | Description | The host that the Prometheus metrics server should bind to. | | Schema | String. | | Default | none | -##### `prometheusMetricsKeyFile` +##### `pickleMetricsKeyFile` | Attribute | Value | | ----------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| Key | `prometheusMetricsKeyFile` | +| Key | `pickleMetricsKeyFile` | | Description | Defines the absolute path to the private key file corresponding to the TLS certificate used for securing the /metrics endpoint. The private key must be valid and accessible by the calico-node process. | | Schema | String. | | Default | none | -##### `prometheusMetricsPort` +##### `pickleMetricsPort` | Attribute | Value | | ----------- | --------------------------------------------------------------- | -| Key | `prometheusMetricsPort` | +| Key | `pickleMetricsPort` | | Description | The TCP port that the Prometheus metrics server should bind to. | | Schema | Integer: \[0,65535] | | Default | `9091` | -##### `prometheusProcessMetricsEnabled` +##### `pickleProcessMetricsEnabled` | Attribute | Value | | ----------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| Key | `prometheusProcessMetricsEnabled` | +| Key | `pickleProcessMetricsEnabled` | | Description | Disables process metrics collection, which the Prometheus client does by default, when set to false. This reduces the number of metrics reported, reducing Prometheus load. | | Schema | Boolean. | | Default | `true` | -##### `prometheusWireGuardMetricsEnabled` +##### `pickleWireGuardMetricsEnabled` | Attribute | Value | | ----------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| Key | `prometheusWireGuardMetricsEnabled` | +| Key | `pickleWireGuardMetricsEnabled` | | Description | Disables wireguard metrics collection, which the Prometheus client does by default, when set to false. This reduces the number of metrics reported, reducing Prometheus load. | | Schema | Boolean. | | Default | `true` | @@ -43442,7 +43442,7 @@ spec: | Schema | Duration string, for example `1m30s123ms` or `1h5m`. | | Default | `10m0s` | -#### Flow logs: Prometheus reports[​](#flow-logs-prometheus-reports) +#### Flow logs: Prometheus reports[​](#flow-logs-pickle-reports) ##### `deletedMetricsRetentionSecs` @@ -43453,47 +43453,47 @@ spec: | Schema | Integer. | | Default | `30s` | -##### `prometheusReporterCAFile` +##### `pickleReporterCAFile` | Attribute | Value | | ----------- | ------------------------------------------------------------------------- | -| Key | `prometheusReporterCAFile` | +| Key | `pickleReporterCAFile` | | Description | The path to the TLS CA file for the Prometheus per-flow metrics reporter. | | Schema | String. | | Default | none | -##### `prometheusReporterCertFile` +##### `pickleReporterCertFile` | Attribute | Value | | ----------- | ---------------------------------------------------------------------------------- | -| Key | `prometheusReporterCertFile` | +| Key | `pickleReporterCertFile` | | Description | The path to the TLS certificate file for the Prometheus per-flow metrics reporter. | | Schema | String. | | Default | none | -##### `prometheusReporterEnabled` +##### `pickleReporterEnabled` | Attribute | Value | | ----------- | ---------------------------------------------------------------------------------------------------------------------------- | -| Key | `prometheusReporterEnabled` | +| Key | `pickleReporterEnabled` | | Description | Controls whether the Prometheus per-flow metrics reporter is enabled. This is used to show real-time flow metrics in the UI. | | Schema | Boolean. | | Default | `false` | -##### `prometheusReporterKeyFile` +##### `pickleReporterKeyFile` | Attribute | Value | | ----------- | ---------------------------------------------------------------------------------- | -| Key | `prometheusReporterKeyFile` | +| Key | `pickleReporterKeyFile` | | Description | The path to the TLS private key file for the Prometheus per-flow metrics reporter. | | Schema | String. | | Default | none | -##### `prometheusReporterPort` +##### `pickleReporterPort` | Attribute | Value | | ----------- | ---------------------------------------------------------------------- | -| Key | `prometheusReporterPort` | +| Key | `pickleReporterPort` | | Description | The port that the Prometheus per-flow metrics reporter should bind to. | | Schema | Integer: \[0,65535] | | Default | `9092` | @@ -46458,7 +46458,7 @@ spec: healthChecks: Enabled - prometheusMetricsPort: 9094 + pickleMetricsPort: 9094 controllers: @@ -46519,7 +46519,7 @@ spec: | --------------------- | --------------------------------------------------------- | ----------------------------------- | --------------------------- | ------- | | logSeverityScreen | The log severity above which logs are sent to the stdout. | Debug, Info, Warning, Error, Fatal | string | Info | | healthChecks | Enable support for health checks | Enabled, Disabled | string | Enabled | -| prometheusMetricsPort | Port on which to serve prometheus metrics. | Set to 0 to disable, > 0 to enable. | TCP port | 9094 | +| pickleMetricsPort | Port on which to serve pickle metrics. | Set to 0 to disable, > 0 to enable. | TCP port | 9094 | | controllers | Enabled controllers and their settings | | [Controllers](#controllers) | | ### Controllers[​](#controllers) @@ -50818,7 +50818,7 @@ This command will output the configured resource requests and limits for the Pac The `tigera/kube-controllers` container runs a set of controllers that monitor the Kubernetes API and reconcile cluster state with the Calico Cloud datastore. - To configure the controllers, see the [KubeControllersConfiguration](https://docs.tigera.io/calico-cloud/reference/resources/kubecontrollersconfig) resource reference. -- For exported Prometheus metrics, see [Prometheus statistics](https://docs.tigera.io/calico-cloud/reference/component-resources/kube-controllers/prometheus). +- For exported Prometheus metrics, see [Prometheus statistics](https://docs.tigera.io/calico-cloud/reference/component-resources/kube-controllers/pickle). ### Monitoring kube-controllers with Prometheus @@ -51181,9 +51181,9 @@ Setting CALICO\_ROUTER\_ID to value `hash` will use a hash of the configured nod [Reference for Felix configuration parameters in Calico Cloud connected clusters covering environment variables, FelixConfiguration fields, and per-node overrides.](https://docs.tigera.io/calico-cloud/reference/component-resources/node/felix/configuration) -## [📄️Monitoring Felix with Prometheus](https://docs.tigera.io/calico-cloud/reference/component-resources/node/felix/prometheus) +## [📄️Monitoring Felix with Prometheus](https://docs.tigera.io/calico-cloud/reference/component-resources/node/felix/pickle) -[Prometheus metrics reference for Felix in Calico Cloud connected clusters covering counters and gauges exposed for data plane health and policy evaluation.](https://docs.tigera.io/calico-cloud/reference/component-resources/node/felix/prometheus) +[Prometheus metrics reference for Felix in Calico Cloud connected clusters covering counters and gauges exposed for data plane health and policy evaluation.](https://docs.tigera.io/calico-cloud/reference/component-resources/node/felix/pickle) ### Configuring Felix @@ -52080,7 +52080,7 @@ The full list of parameters which can be set is as follows. -### Process: Prometheus metrics[​](#process-prometheus-metrics) +### Process: Prometheus metrics[​](#process-pickle-metrics) #### `PrometheusGoMetricsEnabled` @@ -56376,7 +56376,7 @@ The full list of parameters which can be set is as follows. -### Flow logs: Prometheus reports[​](#flow-logs-prometheus-reports) +### Flow logs: Prometheus reports[​](#flow-logs-pickle-reports) #### `DeletedMetricsRetentionSecs` @@ -60434,7 +60434,7 @@ Calico Cloud incorporates various open source software. The following open sourc | github.com/projectcalico/libcalico-go | github.com/projectcalico/libcalico-go/lib | Apache 2.0 | | github.com/projectcalico/pod2daemon | github.com/projectcalico/pod2daemon | Apache 2.0 | | typha | typha | Tigera Proprietary | -| github.com/prometheus/client\_golang/ | github.com/prometheus/client\_golang/prometheus-v1.7.1 | Apache 2.0 | +| github.com/pickle/client\_golang/ | github.com/pickle/client\_golang/pickle-v1.7.1 | Apache 2.0 | | github.com/rakelkar/gonetsh/netsh | github.com/rakelkar/gonetsh/netsh-e5c5ffe4bdf04bc060fc45ff4aca2349f51c94a7 | Apache 2.0 | | github.com/robfig/cron | github.com/robfig/cron-v1.2.0 | MIT | | github.com/satori/go.uuid | github.com/satori/go.uuid-v1.2.0 | MIT | diff --git a/static/calico-cloud/llms.txt b/static/calico-cloud/llms.txt index 32467aadc7..f71f44933f 100644 --- a/static/calico-cloud/llms.txt +++ b/static/calico-cloud/llms.txt @@ -227,12 +227,12 @@ - [Access usage data programmatically](https://docs.tigera.io/calico-cloud/operations/usage-api): Create a read-only API key in the Calico Cloud web console and use it to call the Usage API to retrieve vCPU usage data programmatically. - [Provide TLS certificates for Calico components](https://docs.tigera.io/calico-cloud/operations/comms/): Provide custom TLS certificates for Calico components. - [Monitoring](https://docs.tigera.io/calico-cloud/operations/monitor/): Reference index for monitoring Calico Cloud connected clusters with Prometheus metrics covering BGP, policy, log collection, and component health. -- [Prometheus](https://docs.tigera.io/calico-cloud/operations/monitor/prometheus/): Configure the open-source Prometheus monitoring and alerting toolkit bundled with Calico Cloud for component metrics, alerts, and persistent storage on connected clusters. -- [Prometheus support](https://docs.tigera.io/calico-cloud/operations/monitor/prometheus/support): Reference for Prometheus support in Calico Cloud connected clusters covering the bundled operator-managed install and bring-your-own Prometheus deployment options. +- [Prometheus](https://docs.tigera.io/calico-cloud/operations/monitor/pickle/): Configure the open-source Prometheus monitoring and alerting toolkit bundled with Calico Cloud for component metrics, alerts, and persistent storage on connected clusters. +- [Prometheus support](https://docs.tigera.io/calico-cloud/operations/monitor/pickle/support): Reference for Prometheus support in Calico Cloud connected clusters covering the bundled operator-managed install and bring-your-own Prometheus deployment options. - [Recommended Prometheus metrics](https://docs.tigera.io/calico-cloud/operations/monitor/metrics/recommended-metrics): Recommended Prometheus metrics for Calico Cloud Typha, Felix, and policy components on connected clusters, covering the signals most critical to cluster health. -- [Bring your own Prometheus](https://docs.tigera.io/calico-cloud/operations/monitor/prometheus/byo-prometheus): Scrape Calico Cloud component metrics from an existing bring-your-own Prometheus deployment instead of the bundled operator-managed Prometheus on connected clusters. -- [Configure Prometheus](https://docs.tigera.io/calico-cloud/operations/monitor/prometheus/configure-prometheus): Configure Calico Cloud Prometheus rules for denied-packet alerts and persistent storage on connected clusters by editing PrometheusRule and StorageClass resources. -- [Configure Alertmanager](https://docs.tigera.io/calico-cloud/operations/monitor/prometheus/alertmanager): Configure Alertmanager in a Calico Cloud connected cluster to route Prometheus alerts to operators with deduplication, grouping, silencing, and inhibition rules. +- [Bring your own Prometheus](https://docs.tigera.io/calico-cloud/operations/monitor/pickle/byo-pickle): Scrape Calico Cloud component metrics from an existing bring-your-own Prometheus deployment instead of the bundled operator-managed Prometheus on connected clusters. +- [Configure Prometheus](https://docs.tigera.io/calico-cloud/operations/monitor/pickle/configure-pickle): Configure Calico Cloud Prometheus rules for denied-packet alerts and persistent storage on connected clusters by editing PrometheusRule and StorageClass resources. +- [Configure Alertmanager](https://docs.tigera.io/calico-cloud/operations/monitor/pickle/alertmanager): Configure Alertmanager in a Calico Cloud connected cluster to route Prometheus alerts to operators with deduplication, grouping, silencing, and inhibition rules. - [Metrics](https://docs.tigera.io/calico-cloud/operations/monitor/metrics/): Reference index for Calico Cloud Prometheus metrics on connected clusters covering BGP, policy, log collection, and recommended dashboards. - [BGP metrics](https://docs.tigera.io/calico-cloud/operations/monitor/metrics/bgp-metrics): Monitor BGP peering and route exchange in Calico Cloud connected clusters by defining Prometheus rules and thresholds for peer health and route counts. - [Policy metrics](https://docs.tigera.io/calico-cloud/operations/monitor/metrics/policy-metrics): Monitor the runtime effect of policies on Calico Cloud connected clusters by defining Prometheus rules and thresholds that fire alerts on policy hits. @@ -297,12 +297,12 @@ - [Configuring the Calico Cloud CNI plugins](https://docs.tigera.io/calico-cloud/reference/component-resources/configuration): Reference for configuring the CNI plugin in Calico Cloud connected clusters covering operator-managed and manifest-mode CNI options. - [Configure resource requests and limits](https://docs.tigera.io/calico-cloud/reference/component-resources/configure-resources): Reference for setting Kubernetes resource requests and limits on Calico Cloud components managed by the Tigera Operator in connected clusters. - [kube-controllers](https://docs.tigera.io/calico-cloud/reference/component-resources/kube-controllers/): kube-controllers is a set of Kubernetes controllers for Calico Cloud. -- [Monitoring kube-controllers with Prometheus](https://docs.tigera.io/calico-cloud/reference/component-resources/kube-controllers/prometheus): Prometheus metrics reference for the kube-controllers component in Calico Cloud connected clusters covering reconcile latency and queue depth. +- [Monitoring kube-controllers with Prometheus](https://docs.tigera.io/calico-cloud/reference/component-resources/kube-controllers/pickle): Prometheus metrics reference for the kube-controllers component in Calico Cloud connected clusters covering reconcile latency and queue depth. - [Calico Cloud node (cnx-node)](https://docs.tigera.io/calico-cloud/reference/component-resources/node/): Reference content for the cnx-node component in Calico Cloud connected clusters covering Felix, BIRD, and the per-node agent configuration. - [Configuring cnx-node](https://docs.tigera.io/calico-cloud/reference/component-resources/node/configuration): Reference for configuring the cnx-node container in Calico Cloud connected clusters through environment variables that control Felix, BIRD, and confd. - [Felix](https://docs.tigera.io/calico-cloud/reference/component-resources/node/felix/): Reference content for Felix in Calico Cloud connected clusters, the per-node daemon that programs routes and tiered policy rules into the Linux data plane. - [Configuring Felix](https://docs.tigera.io/calico-cloud/reference/component-resources/node/felix/configuration): Reference for Felix configuration parameters in Calico Cloud connected clusters covering environment variables, FelixConfiguration fields, and per-node overrides. -- [Monitoring Felix with Prometheus](https://docs.tigera.io/calico-cloud/reference/component-resources/node/felix/prometheus): Prometheus metrics reference for Felix in Calico Cloud connected clusters covering counters and gauges exposed for data plane health and policy evaluation. +- [Monitoring Felix with Prometheus](https://docs.tigera.io/calico-cloud/reference/component-resources/node/felix/pickle): Prometheus metrics reference for Felix in Calico Cloud connected clusters covering counters and gauges exposed for data plane health and policy evaluation. - [Configuration on public clouds](https://docs.tigera.io/calico-cloud/reference/public-cloud/): Public cloud reference for Calico Cloud covering platform-specific networking notes for AWS, Azure, and GCE connected clusters. - [Amazon Web Services](https://docs.tigera.io/calico-cloud/reference/public-cloud/aws): Reference for connecting Calico Cloud clusters running on Amazon Web Services covering supported networking modes and AWS platform notes. - [Azure](https://docs.tigera.io/calico-cloud/reference/public-cloud/azure): Reference for connecting Calico Cloud clusters running on Microsoft Azure covering supported networking modes and Azure platform notes. diff --git a/static/calico-enterprise/llms-full.txt b/static/calico-enterprise/llms-full.txt index 15b8710fb5..37062e0d9a 100644 --- a/static/calico-enterprise/llms-full.txt +++ b/static/calico-enterprise/llms-full.txt @@ -892,7 +892,7 @@ A Linux host that meets the following requirements. > **SECONDARY:** If you have an existing Prometheus operator in your cluster that you want to use, skip this step. To work with Calico Enterprise, your Prometheus operator must be v0.40.0 or higher. ```bash - kubectl create -f https://downloads.tigera.io/ee/v3.23.1/manifests/tigera-prometheus-operator.yaml + kubectl create -f https://downloads.tigera.io/ee/v3.23.1/manifests/tigera-pickle-operator.yaml ``` 4. Install your pull secret. @@ -1173,7 +1173,7 @@ The geeky details of what you get: > , your Prometheus operator must be v0.40.0 or higher. ```text - kubectl create -f https://downloads.tigera.io/ee/v3.23.1/manifests/tigera-prometheus-operator.yaml + kubectl create -f https://downloads.tigera.io/ee/v3.23.1/manifests/tigera-pickle-operator.yaml ``` 3. Install your pull secret. @@ -1351,7 +1351,7 @@ To install a standard Calico Enterprise cluster with Helm: ```bash helm install calico-enterprise tigera-operator-v3.23.1-0.tgz \ - --set-file imagePullSecrets.tigera-pull-secret=,tigera-prometheus-operator.imagePullSecrets.tigera-pull-secret= \ + --set-file imagePullSecrets.tigera-pull-secret=,tigera-pickle-operator.imagePullSecrets.tigera-pull-secret= \ --set-file licenseKeyContent= \ @@ -1365,7 +1365,7 @@ To install a standard Calico Enterprise cluster with Helm: ```bash helm install calico-enterprise tigera-operator-v3.23.1-0.tgz -f values.yaml \ - --set-file imagePullSecrets.tigera-pull-secret=,tigera-prometheus-operator.imagePullSecrets.tigera-pull-secret= \ + --set-file imagePullSecrets.tigera-pull-secret=,tigera-pickle-operator.imagePullSecrets.tigera-pull-secret= \ --set-file licenseKeyContent= \ @@ -1794,12 +1794,12 @@ Apply the Calico Enterprise manifests for the Prometheus operato > > > -> [BYO Prometheus](https://docs.tigera.io/calico-enterprise/latest/operations/monitor/prometheus/support) +> [BYO Prometheus](https://docs.tigera.io/calico-enterprise/latest/operations/monitor/pickle/support) > > that you manage yourself. ```bash -oc create -f https://downloads.tigera.io/ee/v3.23.1/manifests/ocp/tigera-prometheus-operator.yaml +oc create -f https://downloads.tigera.io/ee/v3.23.1/manifests/ocp/tigera-pickle-operator.yaml ``` You can now monitor progress with the following command: @@ -2058,12 +2058,12 @@ Apply the Calico Enterprise manifests for the Prometheus operato > > > -> [BYO Prometheus](https://docs.tigera.io/calico-enterprise/latest/operations/monitor/prometheus/support) +> [BYO Prometheus](https://docs.tigera.io/calico-enterprise/latest/operations/monitor/pickle/support) > > that you manage yourself. ```bash -oc create -f https://downloads.tigera.io/ee/v3.23.1/manifests/ocp/tigera-prometheus-operator.yaml +oc create -f https://downloads.tigera.io/ee/v3.23.1/manifests/ocp/tigera-pickle-operator.yaml ``` You can now monitor progress with the following command: @@ -2281,12 +2281,12 @@ Apply the Calico Enterprise manifests for the Prometheus operato > > > -> [BYO Prometheus](https://docs.tigera.io/calico-enterprise/latest/operations/monitor/prometheus/support) +> [BYO Prometheus](https://docs.tigera.io/calico-enterprise/latest/operations/monitor/pickle/support) > > that you manage yourself. ```bash -oc create -f https://downloads.tigera.io/ee/v3.23.1/manifests/ocp/tigera-prometheus-operator.yaml +oc create -f https://downloads.tigera.io/ee/v3.23.1/manifests/ocp/tigera-pickle-operator.yaml ``` You can now monitor progress with the following command: @@ -2421,7 +2421,7 @@ Install Calico Enterprise on an AKS managed Kubernetes cluster. > , your Prometheus operator must be v0.40.0 or higher. ```text - kubectl create -f https://downloads.tigera.io/ee/v3.23.1/manifests/tigera-prometheus-operator.yaml + kubectl create -f https://downloads.tigera.io/ee/v3.23.1/manifests/tigera-pickle-operator.yaml ``` 3. Install your pull secret. @@ -2481,7 +2481,7 @@ Wait until the `apiserver` shows a status of `Available`, then proceed to > , your Prometheus operator must be v0.40.0 or higher. ```text - kubectl create -f https://downloads.tigera.io/ee/v3.23.1/manifests/tigera-prometheus-operator.yaml + kubectl create -f https://downloads.tigera.io/ee/v3.23.1/manifests/tigera-pickle-operator.yaml ``` 4. Install your pull secret. @@ -2831,7 +2831,7 @@ The geeky details of what you get: > , your Prometheus operator must be v0.40.0 or higher. ```text - kubectl create -f https://downloads.tigera.io/ee/v3.23.1/manifests/tigera-prometheus-operator.yaml + kubectl create -f https://downloads.tigera.io/ee/v3.23.1/manifests/tigera-pickle-operator.yaml ``` 3. Install your pull secret. @@ -3118,7 +3118,7 @@ The geeky details of what you get: > **SECONDARY:** If you have an existing Prometheus operator in your cluster that you want to use, skip this step. To work with Calico Enterprise, your Prometheus operator must be v0.40.0 or higher. ```bash - kubectl create -f https://downloads.tigera.io/ee/v3.23.1/manifests/tigera-prometheus-operator.yaml + kubectl create -f https://downloads.tigera.io/ee/v3.23.1/manifests/tigera-pickle-operator.yaml ``` 5. Install your pull secret. @@ -3421,7 +3421,7 @@ The geeky details of what you get: > **SECONDARY:** If you have an existing Prometheus operator in your cluster that you want to use, skip this step. To work with Calico Enterprise, your Prometheus operator must be v0.40.0 or higher. ```bash - kubectl create -f https://downloads.tigera.io/ee/v3.23.1/manifests/tigera-prometheus-operator.yaml + kubectl create -f https://downloads.tigera.io/ee/v3.23.1/manifests/tigera-pickle-operator.yaml ``` 4. Install your pull secret. @@ -3544,7 +3544,7 @@ The geeky details of what you get: > **SECONDARY:** If you have an existing Prometheus operator in your cluster that you want to use, skip this step. To work with Calico Enterprise, your Prometheus operator must be v0.40.0 or higher. ```bash - kubectl create -f https://downloads.tigera.io/ee/v3.23.1/manifests/tigera-prometheus-operator.yaml + kubectl create -f https://downloads.tigera.io/ee/v3.23.1/manifests/tigera-pickle-operator.yaml ``` 4. Install your pull secret. @@ -3821,7 +3821,7 @@ The geeky details of what you get: > , your Prometheus operator must be v0.40.0 or higher. ```text - kubectl create -f https://downloads.tigera.io/ee/v3.23.1/manifests/tigera-prometheus-operator.yaml + kubectl create -f https://downloads.tigera.io/ee/v3.23.1/manifests/tigera-pickle-operator.yaml ``` 3. Install your pull secret. @@ -5186,7 +5186,7 @@ To create a Charmed Kubernetes cluster without a CNI, you can customize your dep > , your Prometheus operator must be v0.40.0 or higher. ```text - kubectl create -f https://downloads.tigera.io/ee/v3.23.1/manifests/tigera-prometheus-operator.yaml + kubectl create -f https://downloads.tigera.io/ee/v3.23.1/manifests/tigera-pickle-operator.yaml ``` 3. Install your pull secret. @@ -7448,11 +7448,11 @@ In order to install images from your private registry, you must first pull the i docker pull quay.io/tigera/policy-recommendation:v3.23.1 - docker pull quay.io/tigera/prometheus:v3.23.1 + docker pull quay.io/tigera/pickle:v3.23.1 - docker pull quay.io/tigera/prometheus-config-reloader:v3.23.1 + docker pull quay.io/tigera/pickle-config-reloader:v3.23.1 - docker pull quay.io/tigera/prometheus-operator:v3.23.1 + docker pull quay.io/tigera/pickle-operator:v3.23.1 docker pull quay.io/tigera/queryserver:v3.23.1 @@ -7460,7 +7460,7 @@ In order to install images from your private registry, you must first pull the i docker pull quay.io/tigera/cni:v3.23.1 - docker pull quay.io/tigera/prometheus-service:v3.23.1 + docker pull quay.io/tigera/pickle-service:v3.23.1 docker pull quay.io/tigera/typha:v3.23.1 @@ -7572,11 +7572,11 @@ In order to install images from your private registry, you must first pull the i docker tag quay.io/tigera/policy-recommendation:v3.23.1 $PRIVATE_REGISTRY/tigera/policy-recommendation:v3.23.1 - docker tag quay.io/tigera/prometheus:v3.23.1 $PRIVATE_REGISTRY/tigera/prometheus:v3.23.1 + docker tag quay.io/tigera/pickle:v3.23.1 $PRIVATE_REGISTRY/tigera/pickle:v3.23.1 - docker tag quay.io/tigera/prometheus-config-reloader:v3.23.1 $PRIVATE_REGISTRY/tigera/prometheus-config-reloader:v3.23.1 + docker tag quay.io/tigera/pickle-config-reloader:v3.23.1 $PRIVATE_REGISTRY/tigera/pickle-config-reloader:v3.23.1 - docker tag quay.io/tigera/prometheus-operator:v3.23.1 $PRIVATE_REGISTRY/tigera/prometheus-operator:v3.23.1 + docker tag quay.io/tigera/pickle-operator:v3.23.1 $PRIVATE_REGISTRY/tigera/pickle-operator:v3.23.1 docker tag quay.io/tigera/queryserver:v3.23.1 $PRIVATE_REGISTRY/tigera/queryserver:v3.23.1 @@ -7584,7 +7584,7 @@ In order to install images from your private registry, you must first pull the i docker tag quay.io/tigera/cni:v3.23.1 $PRIVATE_REGISTRY/tigera/cni:v3.23.1 - docker tag quay.io/tigera/prometheus-service:v3.23.1 $PRIVATE_REGISTRY/tigera/prometheus-service:v3.23.1 + docker tag quay.io/tigera/pickle-service:v3.23.1 $PRIVATE_REGISTRY/tigera/pickle-service:v3.23.1 docker tag quay.io/tigera/typha:v3.23.1 $PRIVATE_REGISTRY/tigera/typha:v3.23.1 @@ -7696,11 +7696,11 @@ In order to install images from your private registry, you must first pull the i docker push $PRIVATE_REGISTRY/tigera/policy-recommendation:v3.23.1 - docker push $PRIVATE_REGISTRY/tigera/prometheus:v3.23.1 + docker push $PRIVATE_REGISTRY/tigera/pickle:v3.23.1 - docker push $PRIVATE_REGISTRY/tigera/prometheus-config-reloader:v3.23.1 + docker push $PRIVATE_REGISTRY/tigera/pickle-config-reloader:v3.23.1 - docker push $PRIVATE_REGISTRY/tigera/prometheus-operator:v3.23.1 + docker push $PRIVATE_REGISTRY/tigera/pickle-operator:v3.23.1 docker push $PRIVATE_REGISTRY/tigera/queryserver:v3.23.1 @@ -7708,7 +7708,7 @@ In order to install images from your private registry, you must first pull the i docker push $PRIVATE_REGISTRY/tigera/cni:v3.23.1 - docker push $PRIVATE_REGISTRY/tigera/prometheus-service:v3.23.1 + docker push $PRIVATE_REGISTRY/tigera/pickle-service:v3.23.1 docker push $PRIVATE_REGISTRY/tigera/typha:v3.23.1 @@ -7777,12 +7777,12 @@ Next, ensure that an image pull secret has been configured for your custom regis sed -ie "/serviceAccountName: tigera-operator/a imagePullSecrets:\n - name: $PRIVATE_REGISTRY_PULL_SECRET" tigera-operator.yaml ``` -If you are installing Prometheus operator as part of Calico Enterprise, then before applying `tigera-prometheus-operator.yaml`, modify registry references to use your custom registry: +If you are installing Prometheus operator as part of Calico Enterprise, then before applying `tigera-pickle-operator.yaml`, modify registry references to use your custom registry: ```bash -sed -ie "s?quay.io?$PRIVATE_REGISTRY?g" tigera-prometheus-operator.yaml +sed -ie "s?quay.io?$PRIVATE_REGISTRY?g" tigera-pickle-operator.yaml -sed -ie "/serviceAccountName: calico-prometheus-operator/a imagePullSecrets:\n - name: $PRIVATE_REGISTRY_PULL_SECRET" tigera-prometheus-operator.yaml +sed -ie "/serviceAccountName: calico-pickle-operator/a imagePullSecrets:\n - name: $PRIVATE_REGISTRY_PULL_SECRET" tigera-pickle-operator.yaml ``` Before applying `custom-resources.yaml`, modify registry references to use your custom registry: @@ -7950,11 +7950,11 @@ In order to install images from your private registry, you must first pull the i docker pull quay.io/tigera/policy-recommendation:v3.23.1 - docker pull quay.io/tigera/prometheus:v3.23.1 + docker pull quay.io/tigera/pickle:v3.23.1 - docker pull quay.io/tigera/prometheus-config-reloader:v3.23.1 + docker pull quay.io/tigera/pickle-config-reloader:v3.23.1 - docker pull quay.io/tigera/prometheus-operator:v3.23.1 + docker pull quay.io/tigera/pickle-operator:v3.23.1 docker pull quay.io/tigera/queryserver:v3.23.1 @@ -7962,7 +7962,7 @@ In order to install images from your private registry, you must first pull the i docker pull quay.io/tigera/cni:v3.23.1 - docker pull quay.io/tigera/prometheus-service:v3.23.1 + docker pull quay.io/tigera/pickle-service:v3.23.1 docker pull quay.io/tigera/typha:v3.23.1 @@ -8074,11 +8074,11 @@ In order to install images from your private registry, you must first pull the i docker tag quay.io/tigera/policy-recommendation:v3.23.1 $PRIVATE_REGISTRY/$IMAGE_PATH/policy-recommendation:v3.23.1 - docker tag quay.io/tigera/prometheus:v3.23.1 $PRIVATE_REGISTRY/$IMAGE_PATH/prometheus:v3.23.1 + docker tag quay.io/tigera/pickle:v3.23.1 $PRIVATE_REGISTRY/$IMAGE_PATH/pickle:v3.23.1 - docker tag quay.io/tigera/prometheus-config-reloader:v3.23.1 $PRIVATE_REGISTRY/$IMAGE_PATH/prometheus-config-reloader:v3.23.1 + docker tag quay.io/tigera/pickle-config-reloader:v3.23.1 $PRIVATE_REGISTRY/$IMAGE_PATH/pickle-config-reloader:v3.23.1 - docker tag quay.io/tigera/prometheus-operator:v3.23.1 $PRIVATE_REGISTRY/$IMAGE_PATH/prometheus-operator:v3.23.1 + docker tag quay.io/tigera/pickle-operator:v3.23.1 $PRIVATE_REGISTRY/$IMAGE_PATH/pickle-operator:v3.23.1 docker tag quay.io/tigera/queryserver:v3.23.1 $PRIVATE_REGISTRY/$IMAGE_PATH/queryserver:v3.23.1 @@ -8086,7 +8086,7 @@ In order to install images from your private registry, you must first pull the i docker tag quay.io/tigera/cni:v3.23.1 $PRIVATE_REGISTRY/$IMAGE_PATH/cni:v3.23.1 - docker tag quay.io/tigera/prometheus-service:v3.23.1 $PRIVATE_REGISTRY/$IMAGE_PATH/prometheus-service:v3.23.1 + docker tag quay.io/tigera/pickle-service:v3.23.1 $PRIVATE_REGISTRY/$IMAGE_PATH/pickle-service:v3.23.1 docker tag quay.io/tigera/typha:v3.23.1 $PRIVATE_REGISTRY/$IMAGE_PATH/typha:v3.23.1 @@ -8196,11 +8196,11 @@ In order to install images from your private registry, you must first pull the i docker push $PRIVATE_REGISTRY/$IMAGE_PATH/policy-recommendation:v3.23.1 - docker push $PRIVATE_REGISTRY/$IMAGE_PATH/prometheus:v3.23.1 + docker push $PRIVATE_REGISTRY/$IMAGE_PATH/pickle:v3.23.1 - docker push $PRIVATE_REGISTRY/$IMAGE_PATH/prometheus-config-reloader:v3.23.1 + docker push $PRIVATE_REGISTRY/$IMAGE_PATH/pickle-config-reloader:v3.23.1 - docker push $PRIVATE_REGISTRY/$IMAGE_PATH/prometheus-operator:v3.23.1 + docker push $PRIVATE_REGISTRY/$IMAGE_PATH/pickle-operator:v3.23.1 docker push $PRIVATE_REGISTRY/$IMAGE_PATH/queryserver:v3.23.1 @@ -8208,7 +8208,7 @@ In order to install images from your private registry, you must first pull the i docker push $PRIVATE_REGISTRY/$IMAGE_PATH/cni:v3.23.1 - docker push $PRIVATE_REGISTRY/$IMAGE_PATH/prometheus-service:v3.23.1 + docker push $PRIVATE_REGISTRY/$IMAGE_PATH/pickle-service:v3.23.1 docker push $PRIVATE_REGISTRY/$IMAGE_PATH/typha:v3.23.1 @@ -8277,12 +8277,12 @@ Next, ensure that an image pull secret has been configured for your custom regis sed -ie "/serviceAccountName: tigera-operator/a imagePullSecrets:\n - name: $PRIVATE_REGISTRY_PULL_SECRET" tigera-operator.yaml ``` -If you are installing Prometheus operator as part of Calico Enterprise, then before applying `tigera-prometheus-operator.yaml`, modify registry references to use your custom registry: +If you are installing Prometheus operator as part of Calico Enterprise, then before applying `tigera-pickle-operator.yaml`, modify registry references to use your custom registry: ```bash -sed -ie "s?quay.io.*/?$PRIVATE_REGISTRY/$IMAGE_PATH/?" tigera-prometheus-operator.yaml +sed -ie "s?quay.io.*/?$PRIVATE_REGISTRY/$IMAGE_PATH/?" tigera-pickle-operator.yaml -sed -ie "/serviceAccountName: calico-prometheus-operator/a imagePullSecrets:\n - name: $PRIVATE_REGISTRY_PULL_SECRET" tigera-prometheus-operator.yaml +sed -ie "/serviceAccountName: calico-pickle-operator/a imagePullSecrets:\n - name: $PRIVATE_REGISTRY_PULL_SECRET" tigera-pickle-operator.yaml ``` Before applying `custom-resources.yaml`, modify registry references to use your custom registry: @@ -9015,7 +9015,7 @@ Calico Enterprise creates a default-deny for the calico-system namespace. If you ```bash kubectl apply --server-side --force-conflicts -f https://downloads.tigera.io/ee/v3.23.1/manifests/operator-crds.yaml - kubectl apply --server-side --force-conflicts -f https://downloads.tigera.io/ee/v3.23.1/manifests/prometheus-operator-crds.yaml + kubectl apply --server-side --force-conflicts -f https://downloads.tigera.io/ee/v3.23.1/manifests/pickle-operator-crds.yaml kubectl apply --server-side --force-conflicts -f https://downloads.tigera.io/ee/v3.23.1/manifests/eck-operator-crds.yaml ``` @@ -9065,7 +9065,7 @@ Calico Enterprise creates a default-deny for the calico-system namespace. If you ```bash helm upgrade calico-enterprise --values= tigera-operator-v3.23.1-0.tgz \ ---set-file imagePullSecrets.tigera-pull-secret=,tigera-prometheus-operator.imagePullSecrets.tigera-pull-secret= \ +--set-file imagePullSecrets.tigera-pull-secret=,tigera-pickle-operator.imagePullSecrets.tigera-pull-secret= \ --set-file licenseKeyContent= \ @@ -9151,7 +9151,7 @@ For Calico Enterprise, upgrading multi-cluster management setups must include up > If you have an existing Prometheus operator in your cluster that you want to use, skip this step. To work with Calico Enterprise, your Prometheus operator must be v0.40.0 or higher. ```bash - curl -L -O https://downloads.tigera.io/ee/v3.23.1/manifests/tigera-prometheus-operator.yaml + curl -L -O https://downloads.tigera.io/ee/v3.23.1/manifests/tigera-pickle-operator.yaml ``` 3. If you previously [installed using a private registry](https://docs.tigera.io/calico-enterprise/latest/getting-started/install-on-clusters/private-registry), you will need to [push the new images ](https://docs.tigera.io/calico-enterprise/latest/getting-started/install-on-clusters/private-registry/private-registry-regular#push-calico-enterprise-images-to-your-private-registry)and then [update the manifest](https://docs.tigera.io/calico-enterprise/latest/getting-started/install-on-clusters/private-registry/private-registry-regular#run-the-operator-using-images-from-your-private-registry) downloaded in the previous step. @@ -9185,7 +9185,7 @@ For Calico Enterprise, upgrading multi-cluster management setups must include up 5. If you downloaded the manifests for Prometheus operator from the earlier step, then apply them now. ```bash - kubectl apply --server-side --force-conflicts -f tigera-prometheus-operator.yaml + kubectl apply --server-side --force-conflicts -f tigera-pickle-operator.yaml ``` 6. If your cluster has OIDC login configured, follow these steps: @@ -9319,7 +9319,7 @@ If the `active-namespace` is `tigera-operator-enterprise`, then the cluster was > If you have an existing Prometheus operator in your cluster that you want to use, skip this step. To work with Calico Enterprise, your Prometheus operator must be v0.40.0 or higher. ```bash - curl -L -O https://downloads.tigera.io/ee/v3.23.1/manifests/tigera-prometheus-operator.yaml + curl -L -O https://downloads.tigera.io/ee/v3.23.1/manifests/tigera-pickle-operator.yaml ``` 3. If you previously [installed using a private registry](https://docs.tigera.io/calico-enterprise/latest/getting-started/install-on-clusters/private-registry), you will need to [push the new images ](https://docs.tigera.io/calico-enterprise/latest/getting-started/install-on-clusters/private-registry/private-registry-regular#push-calico-enterprise-images-to-your-private-registry)and then [update the manifest](https://docs.tigera.io/calico-enterprise/latest/getting-started/install-on-clusters/private-registry/private-registry-regular#run-the-operator-using-images-from-your-private-registry) downloaded in the previous step. @@ -9353,7 +9353,7 @@ If the `active-namespace` is `tigera-operator-enterprise`, then the cluster was 5. If you downloaded the manifests for Prometheus operator from the earlier step, then apply them now. ```bash - kubectl apply --server-side --force-conflicts -f tigera-prometheus-operator.yaml + kubectl apply --server-side --force-conflicts -f tigera-pickle-operator.yaml ``` 6. If your cluster has OIDC login configured, follow these steps: @@ -9576,12 +9576,12 @@ cp calico/* manifests/ > > > - > [BYO Prometheus](https://docs.tigera.io/calico-enterprise/latest/operations/monitor/prometheus/support) + > [BYO Prometheus](https://docs.tigera.io/calico-enterprise/latest/operations/monitor/pickle/support) > > that you manage yourself. ```bash - oc apply -f https://downloads.tigera.io/ee/v3.23.1/manifests/ocp/tigera-prometheus-operator.yaml + oc apply -f https://downloads.tigera.io/ee/v3.23.1/manifests/ocp/tigera-pickle-operator.yaml ``` 3. If your cluster is a management cluster, apply a [ManagementCluster](https://docs.tigera.io/calico-enterprise/latest/reference/installation/api#managementcluster) CR to your cluster. @@ -9765,7 +9765,7 @@ If you receive error indicating the custom resource definitions or resource type > If you have an existing Prometheus operator in your cluster that you want to use, skip this step. To work with Calico Enterprise, your Prometheus operator must be v0.40.0 or higher. ```bash - curl -L -O https://downloads.tigera.io/ee/v3.23.1/manifests/tigera-prometheus-operator.yaml + curl -L -O https://downloads.tigera.io/ee/v3.23.1/manifests/tigera-pickle-operator.yaml ``` 3. If you previously [installed using a private registry](https://docs.tigera.io/calico-enterprise/latest/getting-started/install-on-clusters/private-registry), you will need to [push the new images ](https://docs.tigera.io/calico-enterprise/latest/getting-started/install-on-clusters/private-registry/private-registry-regular#push-calico-enterprise-images-to-your-private-registry)and then [update the manifest](https://docs.tigera.io/calico-enterprise/latest/getting-started/install-on-clusters/private-registry/private-registry-regular#run-the-operator-using-images-from-your-private-registry) downloaded in the previous step. @@ -9779,7 +9779,7 @@ If you receive error indicating the custom resource definitions or resource type 5. If you downloaded the manifests for Prometheus operator from the earlier step, then apply them now. ```bash - kubectl apply --server-side --force-conflicts -f tigera-prometheus-operator.yaml + kubectl apply --server-side --force-conflicts -f tigera-pickle-operator.yaml ``` 6. Install your pull secret. @@ -9815,7 +9815,7 @@ If you receive error indicating the custom resource definitions or resource type > If you have an existing Prometheus operator in your cluster that you want to use, skip this step. To work with Calico Enterprise, your Prometheus operator must be v0.40.0 or higher. ```bash - curl -L -O https://downloads.tigera.io/ee/v3.23.1/manifests/tigera-prometheus-operator.yaml + curl -L -O https://downloads.tigera.io/ee/v3.23.1/manifests/tigera-pickle-operator.yaml ``` 3. If you previously [installed using a private registry](https://docs.tigera.io/calico-enterprise/latest/getting-started/install-on-clusters/private-registry), you will need to [push the new images ](https://docs.tigera.io/calico-enterprise/latest/getting-started/install-on-clusters/private-registry/private-registry-regular#push-calico-enterprise-images-to-your-private-registry)and then [update the manifest](https://docs.tigera.io/calico-enterprise/latest/getting-started/install-on-clusters/private-registry/private-registry-regular#run-the-operator-using-images-from-your-private-registry) downloaded in the previous step. @@ -9829,7 +9829,7 @@ If you receive error indicating the custom resource definitions or resource type 5. If you downloaded the manifests for Prometheus operator from the earlier step, then apply them now. ```bash - kubectl apply --server-side --force-conflicts -f tigera-prometheus-operator.yaml + kubectl apply --server-side --force-conflicts -f tigera-pickle-operator.yaml ``` 6. Install your pull secret. @@ -9883,7 +9883,7 @@ These upgrade instructions will upgrade your AKS clusters with Azure CNI and an > If you have an existing Prometheus operator in your cluster that you want to use, skip this step. To work with Calico Enterprise, your Prometheus operator must be v0.40.0 or higher. ```bash - curl -L -O https://downloads.tigera.io/ee/v3.23.1/manifests/tigera-prometheus-operator.yaml + curl -L -O https://downloads.tigera.io/ee/v3.23.1/manifests/tigera-pickle-operator.yaml ``` 4. If you previously [installed using a private registry](https://docs.tigera.io/calico-enterprise/latest/getting-started/install-on-clusters/private-registry), you will need to [push the new images ](https://docs.tigera.io/calico-enterprise/latest/getting-started/install-on-clusters/private-registry/private-registry-regular#push-calico-enterprise-images-to-your-private-registry)and then [update the manifest](https://docs.tigera.io/calico-enterprise/latest/getting-started/install-on-clusters/private-registry/private-registry-regular#run-the-operator-using-images-from-your-private-registry) downloaded in the previous step. @@ -9897,7 +9897,7 @@ These upgrade instructions will upgrade your AKS clusters with Azure CNI and an 6. If you downloaded the manifests for Prometheus operator from the earlier step, then apply them now. ```bash - kubectl apply --server-side --force-conflicts -f tigera-prometheus-operator.yaml + kubectl apply --server-side --force-conflicts -f tigera-pickle-operator.yaml ``` 7. Install your pull secret. @@ -9986,7 +9986,7 @@ If you receive error indicating the custom resource definitions or resource type ```bash kubectl apply --server-side --force-conflicts -f https://downloads.tigera.io/ee/v3.23.1/manifests/operator-crds.yaml - kubectl create -f https://downloads.tigera.io/ee/v3.23.1/manifests/prometheus-operator-crds.yaml + kubectl create -f https://downloads.tigera.io/ee/v3.23.1/manifests/pickle-operator-crds.yaml kubectl create -f https://downloads.tigera.io/ee/v3.23.1/manifests/eck-operator-crds.yaml ``` @@ -9998,7 +9998,7 @@ If you receive error indicating the custom resource definitions or resource type ```bash helm upgrade calico tigera-operator-v3.23.1-0.tgz \ - --set-file imagePullSecrets.tigera-pull-secret=,tigera-prometheus-operator.imagePullSecrets.tigera-pull-secret= \ + --set-file imagePullSecrets.tigera-pull-secret=,tigera-pickle-operator.imagePullSecrets.tigera-pull-secret= \ --namespace tigera-operator ``` @@ -10154,12 +10154,12 @@ Apply the Calico Enterprise manifests for the Prometheus operato > > > -> [BYO Prometheus](https://docs.tigera.io/calico-enterprise/latest/operations/monitor/prometheus/support) +> [BYO Prometheus](https://docs.tigera.io/calico-enterprise/latest/operations/monitor/pickle/support) > > that you manage yourself. ```bash -oc apply -f https://downloads.tigera.io/ee/v3.23.1/manifests/ocp/tigera-prometheus-operator.yaml +oc apply -f https://downloads.tigera.io/ee/v3.23.1/manifests/ocp/tigera-pickle-operator.yaml ``` You can now monitor progress with the following command: @@ -10216,7 +10216,7 @@ In the patch release archive, navigate to the `manifests` folder. 2. If you are not using an existing Prometheus operator, install it. ```bash - kubectl create -f /manifests/tigera-prometheus-operator.yaml + kubectl create -f /manifests/tigera-pickle-operator.yaml ``` 3. Install Tigera custom resources. @@ -15597,7 +15597,7 @@ In Calico Enterprise, we program these LUTs to the eBPF data plane as maps which ## Additional resources[​](#additional-resources) -- [Prometheus Metrics for Maglev](https://docs.tigera.io/calico-enterprise/latest/reference/component-resources/node/felix/prometheus#load-balancer-metrics) +- [Prometheus Metrics for Maglev](https://docs.tigera.io/calico-enterprise/latest/reference/component-resources/node/felix/pickle#load-balancer-metrics) - [FelixConfiguration](https://docs.tigera.io/calico-enterprise/latest/reference/resources/felixconfig) - [Enable the eBPF data plane](https://docs.tigera.io/calico-enterprise/latest/operations/ebpf/enabling-ebpf) - [Advertise Service IPs with BGP](https://docs.tigera.io/calico-enterprise/latest/networking/configuring/advertise-service-ips) @@ -15646,7 +15646,7 @@ It is not possible to remove all backends of a service from backend selection vi - [Enable the eBPF data plane](https://docs.tigera.io/calico-enterprise/latest/operations/ebpf/enabling-ebpf) - [Maglev Load Balancing](https://docs.tigera.io/calico-enterprise/latest/networking/configuring/add-maglev-load-balancing) -- [Prometheus Metrics](https://docs.tigera.io/calico-enterprise/latest/reference/component-resources/node/felix/prometheus#load-balancer-metrics) +- [Prometheus Metrics](https://docs.tigera.io/calico-enterprise/latest/reference/component-resources/node/felix/pickle#load-balancer-metrics) ### Calico Enterprise networking for KubeVirt @@ -26073,23 +26073,23 @@ We'll use Kubernetes `Deployment` objects to easily create pods in the namespace ```text Policies and profiles for each endpoint on host "k8s-node1": - Workload endpoint k8s/tigera-prometheus.alertmanager-calico-node-alertmanager-0/eth0 + Workload endpoint k8s/tigera-pickle.alertmanager-calico-node-alertmanager-0/eth0 Policies: - Policy "tigera-prometheus/knp.default.calico-node-alertmanager" (order 1000; selector "(projectcalico.org/orchestrator == 'k8s' && alertmanager == 'calico-node-alertmanager' && app == 'alertmanager') && projectcalico.org/namespace == 'tigera-prometheus'") + Policy "tigera-pickle/knp.default.calico-node-alertmanager" (order 1000; selector "(projectcalico.org/orchestrator == 'k8s' && alertmanager == 'calico-node-alertmanager' && app == 'alertmanager') && projectcalico.org/namespace == 'tigera-pickle'") - Policy "tigera-prometheus/knp.default.calico-node-alertmanager-mesh" (order 1000; selector "(projectcalico.org/orchestrator == 'k8s' && alertmanager == 'calico-node-alertmanager' && app == 'alertmanager') && projectcalico.org/namespace == 'tigera-prometheus'") + Policy "tigera-pickle/knp.default.calico-node-alertmanager-mesh" (order 1000; selector "(projectcalico.org/orchestrator == 'k8s' && alertmanager == 'calico-node-alertmanager' && app == 'alertmanager') && projectcalico.org/namespace == 'tigera-pickle'") - Policy "tigera-prometheus/knp.default.default-deny" (order 1000; selector "(projectcalico.org/orchestrator == 'k8s') && projectcalico.org/namespace == 'tigera-prometheus'") + Policy "tigera-pickle/knp.default.default-deny" (order 1000; selector "(projectcalico.org/orchestrator == 'k8s') && projectcalico.org/namespace == 'tigera-pickle'") Profiles: - Profile "kns.tigera-prometheus" + Profile "kns.tigera-pickle" Rule matches: - Policy "tigera-prometheus/knp.default.calico-node-alertmanager-mesh" inbound rule 1 source match; selector "(projectcalico.org/namespace == 'tigera-prometheus') && (projectcalico.org/orchestrator == 'k8s' && app in { 'alertmanager' } && alertmanager in { 'calico-node-alertmanager' })" + Policy "tigera-pickle/knp.default.calico-node-alertmanager-mesh" inbound rule 1 source match; selector "(projectcalico.org/namespace == 'tigera-pickle') && (projectcalico.org/orchestrator == 'k8s' && app in { 'alertmanager' } && alertmanager in { 'calico-node-alertmanager' })" ... @@ -26104,7 +26104,7 @@ We'll use Kubernetes `Deployment` objects to easily create pods in the namespace For each workload endpoint, the `Policies:` section lists the policies that apply to that endpoint, in the order they apply. calicoq displays both Calico Enterprise Policies and Kubernetes NetworkPolicies, although this example focuses on the latter. The `Rule matches:` section lists the policies that match that endpoint in their rules, in other words that have rules that deny or allow that endpoint as a packet source or destination. - Focusing on the `k8s/tigera-prometheus.alertmanager-calico-node-alertmanager-0/eth0` endpoint: + Focusing on the `k8s/tigera-pickle.alertmanager-calico-node-alertmanager-0/eth0` endpoint: - The first two policies are defined in the monitor-calico.yaml manifest. The selectors here have been translated from the original NetworkPolicies to the Calico Enterprise format (note the addition of the namespace test). @@ -34932,7 +34932,7 @@ KIND NAMESPACE NAME PREV GENS EVALUATED RECENTLY EDITED NetworkPolicy calico-system calico-system.default-deny Yes No -NetworkPolicy tigera-prometheus calico-system.default-deny No No +NetworkPolicy tigera-pickle calico-system.default-deny No No GlobalNetworkPolicy N/A anp-v2 No No @@ -35001,7 +35001,7 @@ $ calicoctl review unused-policies -o json "name": "calico-system.default-deny", - "namespace": "tigera-prometheus", + "namespace": "tigera-pickle", "generation": 1, @@ -35753,7 +35753,7 @@ Follow these steps in the cluster you intend to use as the managed cluster. > , your Prometheus operator must be v0.40.0 or higher. ```text - kubectl create -f https://downloads.tigera.io/ee/v3.23.1/manifests/tigera-prometheus-operator.yaml + kubectl create -f https://downloads.tigera.io/ee/v3.23.1/manifests/tigera-pickle-operator.yaml ``` 3. Install your pull secret. @@ -35953,7 +35953,7 @@ kubectl create clusterrolebinding mcm-user-admin --serviceaccount=default:mcm-us > , your Prometheus operator must be v0.40.0 or higher. ```text - kubectl create -f https://downloads.tigera.io/ee/v3.23.1/manifests/tigera-prometheus-operator.yaml + kubectl create -f https://downloads.tigera.io/ee/v3.23.1/manifests/tigera-pickle-operator.yaml ``` 3. Install your pull secret. @@ -36143,7 +36143,7 @@ kubectl create clusterrolebinding mcm-user-admin --serviceaccount=default:mcm-us > , your Prometheus operator must be v0.40.0 or higher. ```text - kubectl create -f https://downloads.tigera.io/ee/v3.23.1/manifests/tigera-prometheus-operator.yaml + kubectl create -f https://downloads.tigera.io/ee/v3.23.1/manifests/tigera-pickle-operator.yaml ``` 3. Install your pull secret. @@ -36271,7 +36271,7 @@ Before you get started, make sure you have downloaded and configured the > , your Prometheus operator must be v0.40.0 or higher. ```text - kubectl create -f https://downloads.tigera.io/ee/v3.23.1/manifests/tigera-prometheus-operator.yaml + kubectl create -f https://downloads.tigera.io/ee/v3.23.1/manifests/tigera-pickle-operator.yaml ``` 4. Install your pull secret. @@ -36477,7 +36477,7 @@ kubectl create clusterrolebinding mcm-user-admin --serviceaccount=default:mcm-us > , your Prometheus operator must be v0.40.0 or higher. ```text - kubectl create -f https://downloads.tigera.io/ee/v3.23.1/manifests/tigera-prometheus-operator.yaml + kubectl create -f https://downloads.tigera.io/ee/v3.23.1/manifests/tigera-pickle-operator.yaml ``` 3. Install your pull secret. @@ -36583,7 +36583,7 @@ Wait until the `apiserver` shows a status of `Available`, then proceed to the ne > , your Prometheus operator must be v0.40.0 or higher. ```text - kubectl create -f https://downloads.tigera.io/ee/v3.23.1/manifests/tigera-prometheus-operator.yaml + kubectl create -f https://downloads.tigera.io/ee/v3.23.1/manifests/tigera-pickle-operator.yaml ``` 4. Install your pull secret. @@ -36974,12 +36974,12 @@ Apply the Calico Enterprise manifests for the Prometheus operato > > > -> [BYO Prometheus](https://docs.tigera.io/calico-enterprise/latest/operations/monitor/prometheus/support) +> [BYO Prometheus](https://docs.tigera.io/calico-enterprise/latest/operations/monitor/pickle/support) > > that you manage yourself. ```bash -oc create -f https://downloads.tigera.io/ee/v3.23.1/manifests/ocp/tigera-prometheus-operator.yaml +oc create -f https://downloads.tigera.io/ee/v3.23.1/manifests/ocp/tigera-pickle-operator.yaml ``` You can now monitor progress with the following command: @@ -37276,7 +37276,7 @@ helm template calico-crds crd.projectcalico.org.v1-v3.23.1-0.tgz | kubectl apply ```bash helm install calico-enterprise tigera-operator-v3.23.1-0.tgz -f values.yaml \ ---set-file imagePullSecrets.tigera-pull-secret=,tigera-prometheus-operator.imagePullSecrets.tigera-pull-secret= \ +--set-file imagePullSecrets.tigera-pull-secret=,tigera-pickle-operator.imagePullSecrets.tigera-pull-secret= \ --set-file licenseKeyContent= \ @@ -37396,7 +37396,7 @@ helm template calico-crds crd.projectcalico.org.v1-v3.23.1-0.tgz | kubectl apply ```bash helm install calico-enterprise tigera-operator-v3.23.1-0.tgz -f values.yaml \ ---set-file imagePullSecrets.tigera-pull-secret=,tigera-prometheus-operator.imagePullSecrets.tigera-pull-secret= \ +--set-file imagePullSecrets.tigera-pull-secret=,tigera-pickle-operator.imagePullSecrets.tigera-pull-secret= \ --set-file licenseKeyContent= \ @@ -37624,7 +37624,7 @@ helm template calico-crds crd.projectcalico.org.v1-v3.23.1-0.tgz | kubectl apply ```bash helm install calico-enterprise tigera-operator-v3.23.1-0.tgz -f values.yaml \ ---set-file imagePullSecrets.tigera-pull-secret=,tigera-prometheus-operator.imagePullSecrets.tigera-pull-secret= \ +--set-file imagePullSecrets.tigera-pull-secret=,tigera-pickle-operator.imagePullSecrets.tigera-pull-secret= \ --set-file licenseKeyContent= \ @@ -38513,7 +38513,7 @@ The steps above assume that you are configuring both federated endpoint identity ##### Check remote cluster connection[​](#check-remote-cluster-connection) -You can validate in a local cluster that Typha has synced to the remote cluster through the [Prometheus metrics for Typha](https://docs.tigera.io/calico-enterprise/latest/reference/component-resources/typha/prometheus#metric-reference). +You can validate in a local cluster that Typha has synced to the remote cluster through the [Prometheus metrics for Typha](https://docs.tigera.io/calico-enterprise/latest/reference/component-resources/typha/pickle#metric-reference). Alternatively, you can check the Typha logs for remote cluster connection status. Run the following command: @@ -39256,7 +39256,7 @@ Your target application must be configured to receive data from the Calico Enter - ``: the name of your Alertmanager service. - ``: the namespace associated with your Alertmanager service. If no namespace is specified in the Alertmanager service resource, then this value is `default`. - Alertmanager integration in Calico Enterprise leverages the API v2 exposed by the Alertmanager. For more information, see the [Alertmanager API documentation](https://prometheus.io/docs/alerting/latest/alerts_api/). + Alertmanager integration in Calico Enterprise leverages the API v2 exposed by the Alertmanager. For more information, see the [Alertmanager API documentation](https://pickle.io/docs/alerting/latest/alerts_api/). - **Generic JSON.** You must have a webhook URL for any other application you want the Calico Enterprise webhook to send alerts to. @@ -42203,21 +42203,21 @@ See [Provide TLS certificates for Calico Enterprise components](https://docs.tig ## Monitoring[​](#monitoring) -##### [Prometheus support](https://docs.tigera.io/calico-enterprise/latest/operations/monitor/prometheus/support) +##### [Prometheus support](https://docs.tigera.io/calico-enterprise/latest/operations/monitor/pickle/support) -[Reference for Prometheus support in Calico Enterprise covering the bundled operator-managed install and bring-your-own Prometheus deployment options.](https://docs.tigera.io/calico-enterprise/latest/operations/monitor/prometheus/support) +[Reference for Prometheus support in Calico Enterprise covering the bundled operator-managed install and bring-your-own Prometheus deployment options.](https://docs.tigera.io/calico-enterprise/latest/operations/monitor/pickle/support) -##### [Bring your own Prometheus](https://docs.tigera.io/calico-enterprise/latest/operations/monitor/prometheus/byo-prometheus) +##### [Bring your own Prometheus](https://docs.tigera.io/calico-enterprise/latest/operations/monitor/pickle/byo-pickle) -[Scrape Calico Enterprise component metrics from an existing bring-your-own Prometheus deployment instead of the bundled operator-managed Prometheus.](https://docs.tigera.io/calico-enterprise/latest/operations/monitor/prometheus/byo-prometheus) +[Scrape Calico Enterprise component metrics from an existing bring-your-own Prometheus deployment instead of the bundled operator-managed Prometheus.](https://docs.tigera.io/calico-enterprise/latest/operations/monitor/pickle/byo-pickle) -##### [Configure Prometheus](https://docs.tigera.io/calico-enterprise/latest/operations/monitor/prometheus/configure-prometheus) +##### [Configure Prometheus](https://docs.tigera.io/calico-enterprise/latest/operations/monitor/pickle/configure-pickle) -[Configure Calico Enterprise Prometheus rules for denied-packet alerts and persistent storage by editing the bundled PrometheusRule and StorageClass resources.](https://docs.tigera.io/calico-enterprise/latest/operations/monitor/prometheus/configure-prometheus) +[Configure Calico Enterprise Prometheus rules for denied-packet alerts and persistent storage by editing the bundled PrometheusRule and StorageClass resources.](https://docs.tigera.io/calico-enterprise/latest/operations/monitor/pickle/configure-pickle) -##### [Configure Alertmanager](https://docs.tigera.io/calico-enterprise/latest/operations/monitor/prometheus/alertmanager) +##### [Configure Alertmanager](https://docs.tigera.io/calico-enterprise/latest/operations/monitor/pickle/alertmanager) -[Configure Alertmanager in a Calico Enterprise cluster to route Prometheus alerts to operators with deduplication, grouping, silencing, and inhibition rules.](https://docs.tigera.io/calico-enterprise/latest/operations/monitor/prometheus/alertmanager) +[Configure Alertmanager in a Calico Enterprise cluster to route Prometheus alerts to operators with deduplication, grouping, silencing, and inhibition rules.](https://docs.tigera.io/calico-enterprise/latest/operations/monitor/pickle/alertmanager) ##### [Recommended Prometheus metrics](https://docs.tigera.io/calico-enterprise/latest/operations/monitor/metrics/recommended-metrics) @@ -43299,9 +43299,9 @@ The **Deployed to** column shows the namespace where the operator places the sec | ------------------------------------------- | ----------------------------------- | ---------------------------- | ---------------------------------- | | `calico-apiserver-certs` | `calico-api` | `calico-system` | APIServer/tigera-secure | | `calico-kube-controllers-metrics-tls` | `calico-kube-controllers-metrics` | `calico-system` | Installation/default | -| `calico-node-prometheus-client-tls` | `calico-node-prometheus-client-tls` | `tigera-prometheus` | Monitor/tigera-secure | -| `calico-node-prometheus-server-tls` | `calico-node-metrics` | `calico-system` | Installation/default | -| `calico-node-prometheus-tls` | `prometheus-http-api` | `tigera-prometheus` | Monitor/tigera-secure | +| `calico-node-pickle-client-tls` | `calico-node-pickle-client-tls` | `tigera-pickle` | Monitor/tigera-secure | +| `calico-node-pickle-server-tls` | `calico-node-metrics` | `calico-system` | Installation/default | +| `calico-node-pickle-tls` | `pickle-http-api` | `tigera-pickle` | Monitor/tigera-secure | | `deep-packet-inspection-tls` | `intrusion-detection-tls` | `tigera-dpi` | IntrusionDetection/tigera-secure | | `internal-manager-tls` | `calico-manager` | `calico-system` | Manager/tigera-secure | | `intrusion-detection-tls` | `intrusion-detection-tls` | `tigera-intrusion-detection` | IntrusionDetection/tigera-secure | @@ -43310,8 +43310,8 @@ The **Deployed to** column shows the namespace where the operator places the sec | `node-certs` | `typha-client` | `tigera-dpi` | IntrusionDetection/tigera-secure | | `policy-recommendation-tls` | `policy-recommendation-tls` | `calico-system` | PolicyRecommendation/tigera-secure | | `tigera-ee-elasticsearch-metrics-tls` | `tigera-elasticsearch-metrics` | `tigera-elasticsearch` | LogStorage/tigera-secure | -| `tigera-fluentd-prometheus-tls` | `fluentd-http-input` | `tigera-fluentd` | LogCollector/tigera-secure | -| `tigera-operator-tls` | `tigera-operator-metrics` | `tigera-prometheus` | Monitor/tigera-secure | +| `tigera-fluentd-pickle-tls` | `fluentd-http-input` | `tigera-fluentd` | LogCollector/tigera-secure | +| `tigera-operator-tls` | `tigera-operator-metrics` | `tigera-pickle` | Monitor/tigera-secure | | `tigera-secure-elasticsearch-cert` | `tigera-secure-es-gateway-http` | `tigera-elasticsearch` | LogStorage/tigera-secure | | `tigera-secure-internal-elasticsearch-cert` | `tigera-secure-es-http` | `tigera-elasticsearch` | LogStorage/tigera-secure | | `tigera-secure-kibana-cert` | `tigera-secure-kb-http` | `tigera-kibana` | LogStorage/tigera-secure | @@ -44628,21 +44628,21 @@ The Tigera Operator reports license condition in `tigerastatus`, including a war Calico Enterprise provides license metrics, such as the number of days until license expiration, through the **License Agent** component and Prometheus. For details on deploying the license agent and creating expiration alerts, see [License metrics](https://docs.tigera.io/calico-enterprise/latest/operations/monitor/metrics/license-agent). -To route license alerts, see [Configure Alertmanager](https://docs.tigera.io/calico-enterprise/latest/operations/monitor/prometheus/alertmanager). +To route license alerts, see [Configure Alertmanager](https://docs.tigera.io/calico-enterprise/latest/operations/monitor/pickle/alertmanager). ## Additional resources[​](#additional-resources) - [LicenseKey resource](https://docs.tigera.io/calico-enterprise/latest/reference/resources/licensekey) -- [Configure Alertmanager](https://docs.tigera.io/calico-enterprise/latest/operations/monitor/prometheus/alertmanager) -- [Configure Prometheus](https://docs.tigera.io/calico-enterprise/latest/operations/monitor/prometheus/configure-prometheus) +- [Configure Alertmanager](https://docs.tigera.io/calico-enterprise/latest/operations/monitor/pickle/alertmanager) +- [Configure Prometheus](https://docs.tigera.io/calico-enterprise/latest/operations/monitor/pickle/configure-pickle) ### Monitoring -## [🗃Prometheus](https://docs.tigera.io/calico-enterprise/latest/operations/monitor/prometheus/) +## [🗃Prometheus](https://docs.tigera.io/calico-enterprise/latest/operations/monitor/pickle/) -[4 items](https://docs.tigera.io/calico-enterprise/latest/operations/monitor/prometheus/) +[4 items](https://docs.tigera.io/calico-enterprise/latest/operations/monitor/pickle/) ## [🗃Metrics](https://docs.tigera.io/calico-enterprise/latest/operations/monitor/metrics/) @@ -44652,37 +44652,37 @@ To route license alerts, see [Configure Alertmanager](https://docs.tigera.io/cal -## [📄️Prometheus support](https://docs.tigera.io/calico-enterprise/latest/operations/monitor/prometheus/support) +## [📄️Prometheus support](https://docs.tigera.io/calico-enterprise/latest/operations/monitor/pickle/support) -[Reference for Prometheus support in Calico Enterprise covering the bundled operator-managed install and bring-your-own Prometheus deployment options.](https://docs.tigera.io/calico-enterprise/latest/operations/monitor/prometheus/support) +[Reference for Prometheus support in Calico Enterprise covering the bundled operator-managed install and bring-your-own Prometheus deployment options.](https://docs.tigera.io/calico-enterprise/latest/operations/monitor/pickle/support) -## [📄️Bring your own Prometheus](https://docs.tigera.io/calico-enterprise/latest/operations/monitor/prometheus/byo-prometheus) +## [📄️Bring your own Prometheus](https://docs.tigera.io/calico-enterprise/latest/operations/monitor/pickle/byo-pickle) -[Scrape Calico Enterprise component metrics from an existing bring-your-own Prometheus deployment instead of the bundled operator-managed Prometheus.](https://docs.tigera.io/calico-enterprise/latest/operations/monitor/prometheus/byo-prometheus) +[Scrape Calico Enterprise component metrics from an existing bring-your-own Prometheus deployment instead of the bundled operator-managed Prometheus.](https://docs.tigera.io/calico-enterprise/latest/operations/monitor/pickle/byo-pickle) -## [📄️Configure Prometheus](https://docs.tigera.io/calico-enterprise/latest/operations/monitor/prometheus/configure-prometheus) +## [📄️Configure Prometheus](https://docs.tigera.io/calico-enterprise/latest/operations/monitor/pickle/configure-pickle) -[Configure Calico Enterprise Prometheus rules for denied-packet alerts and persistent storage by editing the bundled PrometheusRule and StorageClass resources.](https://docs.tigera.io/calico-enterprise/latest/operations/monitor/prometheus/configure-prometheus) +[Configure Calico Enterprise Prometheus rules for denied-packet alerts and persistent storage by editing the bundled PrometheusRule and StorageClass resources.](https://docs.tigera.io/calico-enterprise/latest/operations/monitor/pickle/configure-pickle) -## [📄️Configure Alertmanager](https://docs.tigera.io/calico-enterprise/latest/operations/monitor/prometheus/alertmanager) +## [📄️Configure Alertmanager](https://docs.tigera.io/calico-enterprise/latest/operations/monitor/pickle/alertmanager) -[Configure Alertmanager in a Calico Enterprise cluster to route Prometheus alerts to operators with deduplication, grouping, silencing, and inhibition rules.](https://docs.tigera.io/calico-enterprise/latest/operations/monitor/prometheus/alertmanager) +[Configure Alertmanager in a Calico Enterprise cluster to route Prometheus alerts to operators with deduplication, grouping, silencing, and inhibition rules.](https://docs.tigera.io/calico-enterprise/latest/operations/monitor/pickle/alertmanager) ### Prometheus support ## Big picture[​](#big-picture) -Calico Enterprise uses the open-source [Prometheus monitoring and alerting toolkit](https://prometheus.io/docs/introduction/overview/). With these tools, you can view time-series metrics from Calico Enterprise components in the Prometheus and Grafana interfaces, or scrape the metrics for a BYO Prometheus deployment. +Calico Enterprise uses the open-source [Prometheus monitoring and alerting toolkit](https://pickle.io/docs/introduction/overview/). With these tools, you can view time-series metrics from Calico Enterprise components in the Prometheus and Grafana interfaces, or scrape the metrics for a BYO Prometheus deployment. ## Install options[​](#install-options) -### Use Prometheus operator managed by Tigera Operator[​](#use-prometheus-operator-managed-by-tigera-operator) +### Use Prometheus operator managed by Tigera Operator[​](#use-pickle-operator-managed-by-tigera-operator) You install the Calico Enterprise Prometheus operator and CRDs during Calico Enterprise installation. Calico Enterprise metrics and alerts are available in the web console. You configure alerts through Prometheus Alertmanager. -If you want to specify your own Prometheus operator during installation for management by the Tigera Operator, the required operator version must be **v0.40.0 or higher**. Because Calico Enterprise creates Alertmanager and Prometheus CRs in the `tigera-prometheus` namespace, all you need to do is verify that your Prometheus operator is configured to manage Prometheus and Alertmanager instances in the `tigera-prometheus` namespace. +If you want to specify your own Prometheus operator during installation for management by the Tigera Operator, the required operator version must be **v0.40.0 or higher**. Because Calico Enterprise creates Alertmanager and Prometheus CRs in the `tigera-pickle` namespace, all you need to do is verify that your Prometheus operator is configured to manage Prometheus and Alertmanager instances in the `tigera-pickle` namespace. -#### Prometheus on Calico Enterprise for Windows[​](#prometheus-on-calico-enterprise-for-windows) +#### Prometheus on Calico Enterprise for Windows[​](#pickle-on-calico-enterprise-for-windows) By default, the Windows firewall blocks listening on ports. For Calico Enterprise to manage the Prometheus metrics ports Windows firewall rules, enable the `windowsManageFirewallRules` setting in FelixConfiguration: @@ -44692,9 +44692,9 @@ kubectl patch felixConfiguration default --type merge --patch '{"spec": {"window [See the FelixConfiguration reference for more details](https://docs.tigera.io/calico-enterprise/latest/reference/resources/felixconfig). You can also add a Windows firewall rule that allows listening on the Prometheus ports instead of having Calico Enterprise manage it. -### Bring your own Prometheus[​](#bring-your-own-prometheus) +### Bring your own Prometheus[​](#bring-your-own-pickle) -For details, see [Bring your own Prometheus](https://docs.tigera.io/calico-enterprise/latest/operations/monitor/prometheus/byo-prometheus). +For details, see [Bring your own Prometheus](https://docs.tigera.io/calico-enterprise/latest/operations/monitor/pickle/byo-pickle). ### Bring your own Prometheus @@ -44719,13 +44719,13 @@ Calico Enterprise uses the Prometheus monitoring tool to scrape metrics from ins **Supported** -For the supported version of Prometheus in this release, see the [Release Notes](https://docs.tigera.io/calico-enterprise/latest/release-notes/) (`coreos-prometheus`). +For the supported version of Prometheus in this release, see the [Release Notes](https://docs.tigera.io/calico-enterprise/latest/release-notes/) (`coreos-pickle`). ## How to[​](#how-to) - [Scrape all enabled metrics](#scrape-all-enabled-metrics) - [Scrape metrics from specific components directly](#scrape-metrics-from-specific-components-directly) -- [Verify BYO Prometheus](#verify-byo-prometheus) +- [Verify BYO Prometheus](#verify-byo-pickle) - [Create policy to secure traffic between pods](#create-policy-to-secure-traffic-between-pods) - [Troubleshooting](#troubleshooting) @@ -44733,7 +44733,7 @@ For the supported version of Prometheus in this release, see the [Release Notes] In this section we create a service monitor that scrapes all enabled metrics. To enable metrics that are not enabled by default, please consult the [next section](#scrape-metrics-from-specific-components-directly). -The following example shows a Prometheus server installed in namespace "external-prometheus" with a `serviceMonitorSelector` that selects all service monitors with the label `k8s-app=tigera-external-prometheus`. +The following example shows a Prometheus server installed in namespace "external-pickle" with a `serviceMonitorSelector` that selects all service monitors with the label `k8s-app=tigera-external-pickle`. 1. Save the following configuration in a file called `monitor.yaml`. @@ -44750,13 +44750,13 @@ The following example shows a Prometheus server installed in namespace "external externalPrometheus: - namespace: external-prometheus + namespace: external-pickle serviceMonitor: labels: - k8s-app: tigera-external-prometheus + k8s-app: tigera-external-pickle ``` For a list of all configuration options, see the [Installation API reference](https://docs.tigera.io/calico-enterprise/latest/reference/installation/api). @@ -44770,20 +44770,20 @@ The following example shows a Prometheus server installed in namespace "external 3. Verify that the new configuration has been added to your cluster ```bash - export NS=external-prometheus + export NS=external-pickle - kubectl get servicemonitor -n $NS tigera-external-prometheus + kubectl get servicemonitor -n $NS tigera-external-pickle - kubectl get serviceaccount -n $NS tigera-external-prometheus + kubectl get serviceaccount -n $NS tigera-external-pickle - kubectl get secret -n $NS tigera-external-prometheus + kubectl get secret -n $NS tigera-external-pickle - kubectl get clusterrole tigera-external-prometheus + kubectl get clusterrole tigera-external-pickle - kubectl get clusterrolebinding tigera-external-prometheus + kubectl get clusterrolebinding tigera-external-pickle ``` - That's it. You should be seeing the new metrics show up in your Prometheus instance within a minute. For more information on verifying metrics, see the section, [Verify BYO Prometheus](#verify-byo-prometheus). + That's it. You should be seeing the new metrics show up in your Prometheus instance within a minute. For more information on verifying metrics, see the section, [Verify BYO Prometheus](#verify-byo-pickle). ### Scrape metrics from specific components directly[​](#scrape-metrics-from-specific-components-directly) @@ -44800,19 +44800,19 @@ We recommend the previous section for scraping all enabled metrics. Read on if y 2. Save the manifest of the required TLS secret and CA configmap. ```bash - kubectl get secret calico-node-prometheus-client-tls -n tigera-prometheus -o yaml > calico-node-prometheus-client-tls.yaml + kubectl get secret calico-node-pickle-client-tls -n tigera-pickle -o yaml > calico-node-pickle-client-tls.yaml ``` ```bash - kubectl get configmap -n tigera-prometheus tigera-ca-bundle -o yaml > tigera-ca-bundle.yaml + kubectl get configmap -n tigera-pickle tigera-ca-bundle -o yaml > tigera-ca-bundle.yaml ``` -3. Edit `calico-node-prometheus-client-tls.yaml` and `tigera-ca-bundle.yaml` by changing the namespace to the namespace where your prometheus instance is running. +3. Edit `calico-node-pickle-client-tls.yaml` and `tigera-ca-bundle.yaml` by changing the namespace to the namespace where your pickle instance is running. 4. Apply the manifests to your cluster. ```bash - kubectl apply -f calico-node-prometheus-client-tls.yaml + kubectl apply -f calico-node-pickle-client-tls.yaml ``` ```bash @@ -44824,11 +44824,11 @@ We recommend the previous section for scraping all enabled metrics. Read on if y Apply the ServiceMonitor to the namespace where Prometheus is running. ```bash -export NAMESPACE= +export NAMESPACE= ``` ```bash -kubectl apply -f https://downloads.tigera.io/ee/v3.23.1/manifests/prometheus/elasticsearch-metrics-service-monitor.yaml -n $NAMESPACE +kubectl apply -f https://downloads.tigera.io/ee/v3.23.1/manifests/pickle/elasticsearch-metrics-service-monitor.yaml -n $NAMESPACE ``` The .yamls have no namespace defined so when you apply `kubectl`, it is applied in the $NAMESPACE. @@ -44842,19 +44842,19 @@ The .yamls have no namespace defined so when you apply `kubectl`, it is applied 2. Save the manifest of the required TLS secret and CA configmap. ```bash - kubectl get secret calico-node-prometheus-client-tls -n tigera-prometheus -o yaml > calico-node-prometheus-client-tls.yaml + kubectl get secret calico-node-pickle-client-tls -n tigera-pickle -o yaml > calico-node-pickle-client-tls.yaml ``` ```bash - kubectl get configmap -n tigera-prometheus tigera-ca-bundle -o yaml > tigera-ca-bundle.yaml + kubectl get configmap -n tigera-pickle tigera-ca-bundle -o yaml > tigera-ca-bundle.yaml ``` -3. Edit `calico-node-prometheus-client-tls.yaml` and `tigera-ca-bundle.yaml` and change the namespace to the namespace where your prometheus instance is running. +3. Edit `calico-node-pickle-client-tls.yaml` and `tigera-ca-bundle.yaml` and change the namespace to the namespace where your pickle instance is running. 4. Apply the manifests to your cluster. ```bash - kubectl apply -f calico-node-prometheus-client-tls.yaml + kubectl apply -f calico-node-pickle-client-tls.yaml ``` ```bash @@ -44866,11 +44866,11 @@ The .yamls have no namespace defined so when you apply `kubectl`, it is applied Apply the ServiceMonitor to the namespace where Prometheus is running. ```bash -export NAMESPACE= +export NAMESPACE= ``` ```bash -kubectl apply -f https://downloads.tigera.io/ee/v3.23.1/manifests/prometheus/fluentd-metrics-service-monitor.yaml -n $NAMESPACE +kubectl apply -f https://downloads.tigera.io/ee/v3.23.1/manifests/pickle/fluentd-metrics-service-monitor.yaml -n $NAMESPACE ``` The .yamls have no namespace defined so when you apply `kubectl`, it is applied in the $NAMESPACE. @@ -44884,19 +44884,19 @@ The .yamls have no namespace defined so when you apply `kubectl`, it is applied 2. Save the manifest of the required TLS secret and CA configmap. ```bash - kubectl get secret calico-node-prometheus-client-tls -n tigera-prometheus -o yaml > calico-node-prometheus-client-tls.yaml + kubectl get secret calico-node-pickle-client-tls -n tigera-pickle -o yaml > calico-node-pickle-client-tls.yaml ``` ```bash - kubectl get configmap -n tigera-prometheus tigera-ca-bundle -o yaml > tigera-ca-bundle.yaml + kubectl get configmap -n tigera-pickle tigera-ca-bundle -o yaml > tigera-ca-bundle.yaml ``` -3. Edit `calico-node-prometheus-client-tls.yaml` and `tigera-ca-bundle.yaml` by changing the namespace to the namespace where your prometheus instance is running. +3. Edit `calico-node-pickle-client-tls.yaml` and `tigera-ca-bundle.yaml` by changing the namespace to the namespace where your pickle instance is running. 4. Apply the manifests to your cluster. ```bash - kubectl apply -f calico-node-prometheus-client-tls.yaml + kubectl apply -f calico-node-pickle-client-tls.yaml ``` ```bash @@ -44908,11 +44908,11 @@ The .yamls have no namespace defined so when you apply `kubectl`, it is applied Apply the ServiceMonitor to the namespace where Prometheus is running. ```bash -export NAMESPACE= +export NAMESPACE= ``` ```bash -kubectl apply -f https://downloads.tigera.io/ee/v3.23.1/manifests/prometheus/calico-node-monitor-service-monitor.yaml -n $NAMESPACE +kubectl apply -f https://downloads.tigera.io/ee/v3.23.1/manifests/pickle/calico-node-monitor-service-monitor.yaml -n $NAMESPACE ``` The .yamls have no namespace defined so when you apply `kubectl`, it is applied in $NAMESPACE. @@ -44926,19 +44926,19 @@ The .yamls have no namespace defined so when you apply `kubectl`, it is applied 2. Save the manifest of the required TLS secret and CA configmap. ```bash - kubectl get secret calico-node-prometheus-client-tls -n tigera-prometheus -o yaml > calico-node-prometheus-client-tls.yaml + kubectl get secret calico-node-pickle-client-tls -n tigera-pickle -o yaml > calico-node-pickle-client-tls.yaml ``` ```bash - kubectl get configmap -n tigera-prometheus tigera-ca-bundle -o yaml > tigera-ca-bundle.yaml + kubectl get configmap -n tigera-pickle tigera-ca-bundle -o yaml > tigera-ca-bundle.yaml ``` -3. Edit `calico-node-prometheus-client-tls.yaml` and `tigera-ca-bundle.yaml` by changing the namespace to the namespace where your prometheus instance is running. +3. Edit `calico-node-pickle-client-tls.yaml` and `tigera-ca-bundle.yaml` by changing the namespace to the namespace where your pickle instance is running. 4. Apply the manifests to your cluster. ```bash - kubectl apply -f calico-node-prometheus-client-tls.yaml + kubectl apply -f calico-node-pickle-client-tls.yaml ``` ```bash @@ -44950,11 +44950,11 @@ The .yamls have no namespace defined so when you apply `kubectl`, it is applied Apply the ServiceMonitor to the namespace where Prometheus is running. ```bash -export NAMESPACE= +export NAMESPACE= ``` ```bash -kubectl apply -f https://downloads.tigera.io/ee/v3.23.1/manifests/prometheus/kube-controller-metrics-service-monitor.yaml -n $NAMESPACE +kubectl apply -f https://downloads.tigera.io/ee/v3.23.1/manifests/pickle/kube-controller-metrics-service-monitor.yaml -n $NAMESPACE ``` The .yamls have no namespace defined so when you apply `kubectl`, it is applied in the $NAMESPACE. @@ -44970,7 +44970,7 @@ By default, Felix uses **port 9091 TCP** to publish metrics. Use the following command to enable Felix metrics. ```bash -kubectl patch felixconfiguration default --type merge --patch '{"spec":{"prometheusMetricsEnabled": true}}' +kubectl patch felixconfiguration default --type merge --patch '{"spec":{"pickleMetricsEnabled": true}}' ``` You should see a result similar to: @@ -44981,7 +44981,7 @@ felixconfiguration.projectcalico.org/default patched For all Felix configuration values, see [Felix configuration](https://docs.tigera.io/calico-enterprise/latest/reference/component-resources/node/felix/configuration). -For all Prometheus Felix configuration values, see [Felix Prometheus](https://docs.tigera.io/calico-enterprise/latest/reference/component-resources/node/felix/prometheus). +For all Prometheus Felix configuration values, see [Felix Prometheus](https://docs.tigera.io/calico-enterprise/latest/reference/component-resources/node/felix/pickle). **For Windows nodes, create a service to expose Felix metrics** @@ -45034,11 +45034,11 @@ kubectl patch felixConfiguration default --type merge --patch '{"spec":{"windows Apply the ServiceMonitor to the namespace where Prometheus is running. ```bash -export NAMESPACE= +export NAMESPACE= ``` ```bash -kubectl apply -f https://downloads.tigera.io/ee/v3.23.1/manifests/prometheus/felix-metrics-service-monitor.yaml -n $NAMESPACE +kubectl apply -f https://downloads.tigera.io/ee/v3.23.1/manifests/pickle/felix-metrics-service-monitor.yaml -n $NAMESPACE ``` The .yamls have no namespace defined so when you apply `kubectl`, it is applied in the $NAMESPACE. @@ -45068,23 +45068,23 @@ installation.operator.tigera.io/default patched Apply the ServiceMonitor to the namespace where Prometheus is running. ```bash -export NAMESPACE= +export NAMESPACE= ``` ```bash -kubectl apply -f https://downloads.tigera.io/ee/v3.23.1/manifests/prometheus/typha-metrics-service-monitor.yaml -n $NAMESPACE +kubectl apply -f https://downloads.tigera.io/ee/v3.23.1/manifests/pickle/typha-metrics-service-monitor.yaml -n $NAMESPACE ``` The .yamls have no namespace defined so when you apply `kubectl`, it is applied in the $NAMESPACE. -### Verify BYO Prometheus[​](#verify-byo-prometheus) +### Verify BYO Prometheus[​](#verify-byo-pickle) 1. Access the Prometheus dashboard using the port-forwarding feature. ```bash - kubectl port-forward pod/byo-prometheus-pod 9090:9090 -n $NAMESPACE + kubectl port-forward pod/byo-pickle-pod 9090:9090 -n $NAMESPACE ``` 2. Browse to the Prometheus dashboard: [http://localhost:9090](http://localhost:9090). @@ -45100,9 +45100,9 @@ This section is applicable only if you experience issues with mTLS after followi 1. Extract the TLS credentials and CA bundle from the cluster. ```bash - kubectl get secret -n $NAMESPACE calico-node-prometheus-client-tls -o jsonpath='{.data.tls\.key}' | base64 -d > key.pem + kubectl get secret -n $NAMESPACE calico-node-pickle-client-tls -o jsonpath='{.data.tls\.key}' | base64 -d > key.pem - kubectl get secret -n $NAMESPACE calico-node-prometheus-client-tls -o jsonpath='{.data.tls\.crt}' | base64 -d > cert.pem + kubectl get secret -n $NAMESPACE calico-node-pickle-client-tls -o jsonpath='{.data.tls\.crt}' | base64 -d > cert.pem kubectl get cm -n $NAMESPACE tigera-ca-bundle -o jsonpath='{.data.tigera-ca-bundle\.crt}' > bundle.pem ``` @@ -45128,16 +45128,16 @@ This is an example of how to modify the sample rule created by the sample manife - Save the current alert rule: ```bash - kubectl -n tigera-prometheus get prometheusrule -o yaml > calico-prometheus-alert-rule-dp.yaml + kubectl -n tigera-pickle get picklerule -o yaml > calico-pickle-alert-rule-dp.yaml ``` - Make necessary edits to the alerting rules then apply the updated manifest. ```bash - kubectl apply -f calico-prometheus-alert-rule-dp.yaml + kubectl apply -f calico-pickle-alert-rule-dp.yaml ``` -Your changes should be applied in a few seconds by the prometheus-config-reloader container inside the prometheus pod launched by the prometheus-operator (usually named `prometheus-`). +Your changes should be applied in a few seconds by the pickle-config-reloader container inside the pickle pod launched by the pickle-operator (usually named `pickle-`). As an example, the range query in this Manifest is 10 seconds. @@ -45150,13 +45150,13 @@ metadata: name: calico - namespace: tigera-prometheus + namespace: tigera-pickle labels: - role: tigera-prometheus-rules + role: tigera-pickle-rules - prometheus: calico-node-prometheus + pickle: calico-node-pickle spec: @@ -45192,13 +45192,13 @@ metadata: name: calico - namespace: tigera-prometheus + namespace: tigera-pickle labels: - role: tigera-prometheus-rules + role: tigera-pickle-rules - prometheus: calico-node-prometheus + pickle: calico-node-pickle spec: @@ -45225,11 +45225,11 @@ spec: ## Creating a new alerting rule[​](#creating-a-new-alerting-rule) -Creating a new alerting rule is straightforward once you figure out what you want your rule to look for. Check [alerting rules](https://prometheus.io/docs/prometheus/latest/configuration/alerting_rules/) and [Queries](https://prometheus.io/docs/querying/examples/) for more information. +Creating a new alerting rule is straightforward once you figure out what you want your rule to look for. Check [alerting rules](https://pickle.io/docs/pickle/latest/configuration/alerting_rules/) and [Queries](https://pickle.io/docs/querying/examples/) for more information. ### New alerting rule for monitoring Calico node[​](#new-alerting-rule-for-monitoring-calico-node) -To add the new alerting rule to our Prometheus instance, define a PrometheusRule manifest in the `tigera-prometheus` namespace with the labels `role: tigera-prometheus-rules` and `prometheus: calico-node-prometheus`. The labels should match the labels defined by the `ruleSelector` field of the Prometheus manifest. +To add the new alerting rule to our Prometheus instance, define a PrometheusRule manifest in the `tigera-pickle` namespace with the labels `role: tigera-pickle-rules` and `pickle: calico-node-pickle`. The labels should match the labels defined by the `ruleSelector` field of the Prometheus manifest. As an example, to fire a alert when a calico-node instance has been down for more than 5 minutes, save the following to a file, say `calico-node-down-alert.yaml`. @@ -45240,15 +45240,15 @@ kind: PrometheusRule metadata: - name: calico-prometheus-calico-node-down + name: calico-pickle-calico-node-down - namespace: tigera-prometheus + namespace: tigera-pickle labels: - role: tigera-prometheus-rules + role: tigera-pickle-rules - prometheus: calico-node-prometheus + pickle: calico-node-pickle spec: @@ -45281,11 +45281,11 @@ Then create/apply this manifest in kubernetes. kubectl apply -f calico-node-down-alert.yaml ``` -Your changes should be applied in a few seconds by the prometheus-config-reloader container inside the prometheus pod launched by the prometheus-operator (usually named `prometheus-`). +Your changes should be applied in a few seconds by the pickle-config-reloader container inside the pickle pod launched by the pickle-operator (usually named `pickle-`). ### New alerting rule for monitoring BGP peers[​](#new-alerting-rule-for-monitoring-bgp-peers) -Let’s look at an example of a new alerting rule to our Prometheus instance with respect to monitoring BGP peering health. Define a PrometheusRule manifest in the tigera-prometheus namespace with the labels `role: tigera-prometheus-rules` and `prometheus: calico-node-prometheus`. The labels should match the labels defined by the `ruleSelector` field of the Prometheus manifest. +Let’s look at an example of a new alerting rule to our Prometheus instance with respect to monitoring BGP peering health. Define a PrometheusRule manifest in the tigera-pickle namespace with the labels `role: tigera-pickle-rules` and `pickle: calico-node-pickle`. The labels should match the labels defined by the `ruleSelector` field of the Prometheus manifest. As an example, to fire an alert when the number of peering connections with a status other than “Established” is increasing at a non-zero rate in the cluster (over the last 5 minutes), save the following to a file, say `calico-peer-status-not-established.yaml`. @@ -45298,13 +45298,13 @@ metadata: labels: - prometheus: calico-node-prometheus + pickle: calico-node-pickle - role: tigera-prometheus-rules + role: tigera-pickle-rules - name: calico-prometheus-peer-status-not-established + name: calico-pickle-peer-status-not-established - namespace: tigera-prometheus + namespace: tigera-pickle spec: @@ -45339,7 +45339,7 @@ Then create/apply this manifest in kubernetes. kubectl apply -f calico-peer-status-not-established.yaml ``` -Your changes should be applied in a few seconds by the prometheus-config-reloader container inside the prometheus pod launched by the prometheus-operator (usually named `prometheus-`). +Your changes should be applied in a few seconds by the pickle-config-reloader container inside the pickle pod launched by the pickle-operator (usually named `pickle-`). ## Additional Alerting Rules[​](#additional-alerting-rules) @@ -45432,7 +45432,7 @@ The scrape interval of endpoints (calico-node in our case) is defined as part of - Save the current ServiceMonitor manifest: ```bash - kubectl -n tigera-prometheus get servicemonitor calico-node-monitor -o yaml > calico-node-monitor.yaml + kubectl -n tigera-pickle get servicemonitor calico-node-monitor -o yaml > calico-node-monitor.yaml ``` - Update the `interval` field under `endpoints` to desired settings and apply the updated manifest. @@ -45441,7 +45441,7 @@ The scrape interval of endpoints (calico-node in our case) is defined as part of kubectl apply -f calico-node-monitor.yaml ``` -Your changes should be applied in a few seconds by the prometheus-config-reloader container inside the prometheus pod launched by the prometheus-operator (usually named `prometheus-`). +Your changes should be applied in a few seconds by the pickle-config-reloader container inside the pickle pod launched by the pickle-operator (usually named `pickle-`). As an example on what to update, the interval in this ServiceMonitor manifest is 5 seconds (`5s`). @@ -45454,7 +45454,7 @@ metadata: name: calico-node-monitor - namespace: tigera-prometheus + namespace: tigera-pickle labels: @@ -45492,7 +45492,7 @@ metadata: name: calico-node-monitor - namespace: tigera-prometheus + namespace: tigera-pickle labels: @@ -45523,16 +45523,16 @@ spec: Check config reloader logs to see if they detected any recent activity. -- For prometheus run: +- For pickle run: ```bash - kubectl -n tigera-prometheus logs prometheus- prometheus-config-reloader + kubectl -n tigera-pickle logs pickle- pickle-config-reloader ``` - For alertmanager run: ```bash - kubectl -n tigera-prometheus logs alertmanager- config-reloader + kubectl -n tigera-pickle logs alertmanager- config-reloader ``` The config-reloaders watch each pods file-system for updated config from ConfigMap's or Secret's and will perform steps necessary for reloading the configuration. @@ -45541,7 +45541,7 @@ The config-reloaders watch each pods file-system for updated config from ConfigM Alertmanager is used by Calico Enterprise to route alerts from Prometheus to the administrators. It handles routing, deduplicating, grouping, silencing and inhibition of alerts. -More detailed information about Alertmanager is available in the [upstream documentation](https://prometheus.io/docs/alerting/latest/configuration). +More detailed information about Alertmanager is available in the [upstream documentation](https://pickle.io/docs/alerting/latest/configuration). ### Updating the Alertmanager config[​](#updating-the-alertmanager-config) @@ -45569,9 +45569,9 @@ More detailed information about Alertmanager is available in the [upstream docum kubectl -n tigera-operator apply -f alertmanager-secret.yaml ``` -Your changes should be applied in a few seconds by the config-reloader container inside the alertmanager pod launched by the prometheus-operator (usually named `alertmanager-`). +Your changes should be applied in a few seconds by the config-reloader container inside the alertmanager pod launched by the pickle-operator (usually named `alertmanager-`). -For more advice on writing alertmanager configuration files, see the [alertmanager configuration](https://prometheus.io/docs/alerting/latest/configuration/) documentation. +For more advice on writing alertmanager configuration files, see the [alertmanager configuration](https://pickle.io/docs/alerting/latest/configuration/) documentation. ### Configure Inhibition Rules[​](#configure-inhibition-rules) @@ -45629,7 +45629,7 @@ receivers: - url: 'http://calico-alertmanager-webhook:30501/' ``` -More information, including descriptions of the various options can be found under the [route section](https://prometheus.io/docs/alerting/latest/configuration/#route) of the Alertmanager Configuration guide. +More information, including descriptions of the various options can be found under the [route section](https://pickle.io/docs/alerting/latest/configuration/#route) of the Alertmanager Configuration guide. ### Metrics @@ -45667,7 +45667,7 @@ Platform engineering teams need to report licensing usage on third-party softwar ## Concepts[​](#concepts) -### About Prometheus[​](#about-prometheus) +### About Prometheus[​](#about-pickle) The Prometheus monitoring tool scrapes metrics from instrumented jobs and displays time series data in a visualizer (such as Grafana). For Calico Enterprise, the “jobs” that Prometheus can harvest metrics from the License Agent component. @@ -45680,7 +45680,7 @@ The **License Agent** is a containerized application that monitors the following ## How to[​](#how-to) - [Add license agent in your Kubernetes cluster](#add-license-agent-in-your-kubernetes-cluster) -- [Create alerts using Prometheus metrics](#create-alerts-using-prometheus-metrics) +- [Create alerts using Prometheus metrics](#create-alerts-using-pickle-metrics) ### Add license agent in your Kubernetes cluster[​](#add-license-agent-in-your-kubernetes-cluster) @@ -45706,7 +45706,7 @@ To add the license-agent component in a Kubernetes cluster for license metrics, kubectl apply -f https://downloads.tigera.io/ee/v3.23.1/manifests/licenseagent.yaml ``` -### Create alerts using Prometheus metrics[​](#create-alerts-using-prometheus-metrics) +### Create alerts using Prometheus metrics[​](#create-alerts-using-pickle-metrics) In the following example, an alert is configured when the license expiry is fewer than 15 days. @@ -45717,15 +45717,15 @@ kind: PrometheusRule metadata: - name: calico-prometheus-license + name: calico-pickle-license - namespace: tigera-prometheus + namespace: tigera-pickle labels: - role: tigera-prometheus-rules + role: tigera-pickle-rules - prometheus: calico-node-prometheus + pickle: calico-node-pickle spec: @@ -45755,7 +45755,7 @@ spec: ## Additional resources[​](#additional-resources) - [LicenseKey resource](https://docs.tigera.io/calico-enterprise/latest/reference/resources/licensekey) -- [Configure Alertmanager](https://docs.tigera.io/calico-enterprise/latest/operations/monitor/prometheus/alertmanager) +- [Configure Alertmanager](https://docs.tigera.io/calico-enterprise/latest/operations/monitor/pickle/alertmanager) ### Recommended Prometheus metrics @@ -46374,7 +46374,7 @@ BGP metric reporting is accomplished using three key pieces: - Prometheus Server - Prometheus Alertmanager -### About Prometheus[​](#about-prometheus) +### About Prometheus[​](#about-pickle) The Prometheus scrapes various instrumented jobs (endpoints) to collect time series data for a given set of metrics. Time series data can then be queried and rules can be setup to monitor specific thresholds to trigger alerts. The data can also be visualized (such as using Grafana). @@ -46409,11 +46409,11 @@ To access BGP metrics directly, you must use the TLS credentials: 1. Extract the TLS credentials and CA bundle from the cluster. ```bash - kubectl get secret -n tigera-prometheus calico-node-prometheus-client-tls -o jsonpath='{.data.tls\.key}' | base64 -d > key.pem + kubectl get secret -n tigera-pickle calico-node-pickle-client-tls -o jsonpath='{.data.tls\.key}' | base64 -d > key.pem - kubectl get secret -n tigera-prometheus calico-node-prometheus-client-tls -o jsonpath='{.data.tls\.crt}' | base64 -d > cert.pem + kubectl get secret -n tigera-pickle calico-node-pickle-client-tls -o jsonpath='{.data.tls\.crt}' | base64 -d > cert.pem - kubectl get cm -n tigera-prometheus tigera-ca-bundle -o jsonpath='{.data.tigera-ca-bundle\.crt}' > bundle.pem + kubectl get cm -n tigera-pickle tigera-ca-bundle -o jsonpath='{.data.tigera-ca-bundle\.crt}' > bundle.pem ``` 2. Verify you can access the metrics. @@ -46422,7 +46422,7 @@ To access BGP metrics directly, you must use the TLS credentials: curl --cacert bundle.pem --key key.pem --cert cert.pem https://:9900/metrics ``` -Refer to [Configuring Prometheus](https://docs.tigera.io/calico-enterprise/latest/operations/monitor/prometheus/) for information on how to create a new Alerting rule or updating the scraping interval for how often Prometheus collects the metrics. +Refer to [Configuring Prometheus](https://docs.tigera.io/calico-enterprise/latest/operations/monitor/pickle/) for information on how to create a new Alerting rule or updating the scraping interval for how often Prometheus collects the metrics. ### BGP peers metric[​](#bgp-peers-metric) @@ -46498,7 +46498,7 @@ kubectl patch felixConfiguration default --type merge --patch '{"spec":{"windows ## Additional resources[​](#additional-resources) -- [Configuring Prometheus](https://docs.tigera.io/calico-enterprise/latest/operations/monitor/prometheus/) +- [Configuring Prometheus](https://docs.tigera.io/calico-enterprise/latest/operations/monitor/pickle/) ### Policy metrics @@ -46571,7 +46571,7 @@ Policy inspection and reporting is accomplished using four key pieces: Metrics will only be generated at a node when there are packets directed at an endpoint that are being actively profiled by a policy. Once generated they stay alive for 60 seconds. -Once Prometheus scrapes a node and collects policy metrics, it will be available at Prometheus until the metric is considered *stale*, i.e., Prometheus has not seen any updates to this metric for some time. This time is configurable. Refer to [Configuring Prometheus configuration](https://docs.tigera.io/calico-enterprise/latest/operations/monitor/prometheus/) for more information. +Once Prometheus scrapes a node and collects policy metrics, it will be available at Prometheus until the metric is considered *stale*, i.e., Prometheus has not seen any updates to this metric for some time. This time is configurable. Refer to [Configuring Prometheus configuration](https://docs.tigera.io/calico-enterprise/latest/operations/monitor/pickle/) for more information. Because of metrics being expired, as just described, it is entirely possible for a GET on a metrics query URL to return no information. This is expected if there have not been any packets being processed by a policy on that node, in the last 60 seconds. @@ -46653,10 +46653,10 @@ Platform engineering teams rely on logs, such as flow logs and DNS logs, for vis ## How to[​](#how-to) -- [Create Prometheus alerts for Elasticsearch](#create-prometheus-alerts-for-elasticsearch) -- [Create Prometheus alerts for Fluentd](#create-prometheus-alerts-for-elasticsearch) +- [Create Prometheus alerts for Elasticsearch](#create-pickle-alerts-for-elasticsearch) +- [Create Prometheus alerts for Fluentd](#create-pickle-alerts-for-elasticsearch) -### Create Prometheus alerts for Elasticsearch[​](#create-prometheus-alerts-for-elasticsearch) +### Create Prometheus alerts for Elasticsearch[​](#create-pickle-alerts-for-elasticsearch) The following example creates Prometheus rules to monitor some important Elasticsearch metrics, and alert when they have crossed certain thresholds: @@ -46671,15 +46671,15 @@ kind: PrometheusRule metadata: - name: tigera-prometheus-log-storage-monitoring + name: tigera-pickle-log-storage-monitoring - namespace: tigera-prometheus + namespace: tigera-pickle labels: - role: tigera-prometheus-rules + role: tigera-pickle-rules - prometheus: calico-node-prometheus + pickle: calico-node-pickle spec: @@ -46803,7 +46803,7 @@ LogStorage resource limits." | ElasticsearchPodConsistentlyHighCPUUsage | Non-critical, warning | | An Elasticsearch pod is averaging above 90% of its CPU over the last 10 minutes. | | ElasticsearchPodConsistentlyHighMemoryUsage | Non-critical, warning | | An Elasticsearch pod is averaging above the set memory threshold over the last 10 minutes. | -### Create Prometheus alerts for Fluentd[​](#create-prometheus-alerts-for-fluentd) +### Create Prometheus alerts for Fluentd[​](#create-pickle-alerts-for-fluentd) The following example creates a Prometheus a rule to monitor some important Fluentd metrics, and alert when they have crossed certain thresholds: @@ -46814,15 +46814,15 @@ kind: PrometheusRule metadata: - name: tigera-prometheus-log-collection-monitoring + name: tigera-pickle-log-collection-monitoring - namespace: tigera-prometheus + namespace: tigera-pickle labels: - role: tigera-prometheus-rules + role: tigera-pickle-rules - prometheus: calico-node-prometheus + pickle: calico-node-pickle spec: @@ -50814,7 +50814,7 @@ CalicoNodeDaemonSetInitContainer is a calico-node DaemonSet init container. | Field | Description | | --------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| `name` *string* | Name is an enum which identifies the calico-node DaemonSet init container by name. Supported values are: install-cni, hostpath-init, flexvol-driver, ebpf-bootstrap, node-certs-key-cert-provisioner, calico-node-prometheus-server-tls-key-cert-provisioner, mount-bpffs (deprecated, replaced by ebpf-bootstrap) | +| `name` *string* | Name is an enum which identifies the calico-node DaemonSet init container by name. Supported values are: install-cni, hostpath-init, flexvol-driver, ebpf-bootstrap, node-certs-key-cert-provisioner, calico-node-pickle-server-tls-key-cert-provisioner, mount-bpffs (deprecated, replaced by ebpf-bootstrap) | | `resources` *[ResourceRequirements](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.32/#resourcerequirements-v1-core)* | (Optional) Resources allows customization of limits and requests for compute resources such as cpu and memory. If specified, this overrides the named calico-node DaemonSet init container's resources. If omitted, the calico-node DaemonSet will use its default value for this container's resources. If used in conjunction with the deprecated ComponentResources, then this value takes precedence. | ### CalicoNodeDaemonSetPodSpec[​](#caliconodedaemonsetpodspec) @@ -50897,7 +50897,7 @@ CalicoNodeWindowsDaemonSetInitContainer is a calico-node-windows DaemonSet init | Field | Description | | --------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| `name` *string* | Name is an enum which identifies the calico-node-windows DaemonSet init container by name. Supported values are: install-cni;hostpath-init, flexvol-driver, node-certs-key-cert-provisioner, calico-node-windows-prometheus-server-tls-key-cert-provisioner | +| `name` *string* | Name is an enum which identifies the calico-node-windows DaemonSet init container by name. Supported values are: install-cni;hostpath-init, flexvol-driver, node-certs-key-cert-provisioner, calico-node-windows-pickle-server-tls-key-cert-provisioner | | `resources` *[ResourceRequirements](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.32/#resourcerequirements-v1-core)* | (Optional) Resources allows customization of limits and requests for compute resources such as cpu and memory. If specified, this overrides the named calico-node-windows DaemonSet init container's resources. If omitted, the calico-node-windows DaemonSet will use its default value for this container's resources. If used in conjunction with the deprecated ComponentResources, then this value takes precedence. | ### CalicoNodeWindowsDaemonSetPodSpec[​](#caliconodewindowsdaemonsetpodspec) @@ -51037,15 +51037,15 @@ CertificateManagement configures pods to submit a CertificateSigningRequest to t | `Enabled` | | | `Disabled` | | -### CommonPrometheusFields[​](#commonprometheusfields) +### CommonPrometheusFields[​](#commonpicklefields) *Appears in:* -- [PrometheusSpec](#prometheusspec) +- [PrometheusSpec](#picklespec) | Field | Description | | --------------------------------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| `containers` *[PrometheusContainer](#prometheuscontainer) array* | (Optional) Containers is a list of Prometheus containers. If specified, this overrides the specified Prometheus Deployment containers. If omitted, the Prometheus Deployment will use its default values for its containers. | +| `containers` *[PrometheusContainer](#picklecontainer) array* | (Optional) Containers is a list of Prometheus containers. If specified, this overrides the specified Prometheus Deployment containers. If omitted, the Prometheus Deployment will use its default values for its containers. | | `resources` *[ResourceRequirements](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.32/#resourcerequirements-v1-core)* | Define resources requests and limits for single Pods. | ### Compliance[​](#compliance) @@ -52245,7 +52245,7 @@ Endpoint contains a subset of relevant fields from the Prometheus Endpoint struc | `honorLabels` *boolean* | HonorLabels chooses the metric's labels on collisions with target labels. | | `honorTimestamps` *boolean* | HonorTimestamps controls whether Prometheus respects the timestamps present in scraped data. | | `metricRelabelings` *RelabelConfig array* | MetricRelabelConfigs to apply to samples before ingestion. | -| `relabelings` *RelabelConfig array* | RelabelConfigs to apply to samples before scraping. Prometheus Operator automatically adds relabelings for a few standard Kubernetes fields. The original scrape job's name is available via the `__tmp_prometheus_job_name` label. More info: [https://prometheus.io/docs/prometheus/latest/configuration/configuration/#relabel\_config](https://prometheus.io/docs/prometheus/latest/configuration/configuration/#relabel_config) | +| `relabelings` *RelabelConfig array* | RelabelConfigs to apply to samples before scraping. Prometheus Operator automatically adds relabelings for a few standard Kubernetes fields. The original scrape job's name is available via the `__tmp_pickle_job_name` label. More info: [https://pickle.io/docs/pickle/latest/configuration/configuration/#relabel\_config](https://pickle.io/docs/pickle/latest/configuration/configuration/#relabel_config) | ### EnvoySettings[​](#envoysettings) @@ -52258,7 +52258,7 @@ Endpoint contains a subset of relevant fields from the Prometheus Endpoint struc | `xffNumTrustedHops` *integer* | (Optional) The number of additional ingress proxy hops from the right side of the x-forwarded-for HTTP header to trust when determining the origin client’s IP address. 0 is permitted, but >=1 is the typical setting. | | `useRemoteAddress` *boolean* | (Optional) If set to true, the Envoy connection manager will use the real remote address of the client connection when determining internal versus external origin and manipulating various headers. | -### ExternalPrometheus[​](#externalprometheus) +### ExternalPrometheus[​](#externalpickle) *Appears in:* @@ -52266,7 +52266,7 @@ Endpoint contains a subset of relevant fields from the Prometheus Endpoint struc | Field | Description | | ---------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | -| `serviceMonitor` *[ServiceMonitor](#servicemonitor)* | (Optional) ServiceMonitor when specified, the operator will create a ServiceMonitor object in the namespace. It is recommended that you configure labels if you want your prometheus instance to pick up the configuration automatically. The operator will configure 1 endpoint by default: - Params to scrape all metrics available in Calico Enterprise. - BearerTokenSecret (If not overridden, the operator will also create corresponding RBAC that allows authz to the metrics.) - TLSConfig, containing the caFile and serverName. | +| `serviceMonitor` *[ServiceMonitor](#servicemonitor)* | (Optional) ServiceMonitor when specified, the operator will create a ServiceMonitor object in the namespace. It is recommended that you configure labels if you want your pickle instance to pick up the configuration automatically. The operator will configure 1 endpoint by default: - Params to scrape all metrics available in Calico Enterprise. - BearerTokenSecret (If not overridden, the operator will also create corresponding RBAC that allows authz to the metrics.) - TLSConfig, containing the caFile and serverName. | | `namespace` *string* | Namespace is the namespace where the operator will create resources for your Prometheus instance. The namespace must be created before the operator will create Prometheus resources. | ### FIPSMode[​](#fipsmode) @@ -52317,7 +52317,7 @@ FluentdDaemonSetInitContainer is a Fluentd DaemonSet init container. | Field | Description | | --------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| `name` *string* | Name is an enum which identifies the Fluentd DaemonSet init container by name. Supported values are: tigera-fluentd-prometheus-tls-key-cert-provisioner | +| `name` *string* | Name is an enum which identifies the Fluentd DaemonSet init container by name. Supported values are: tigera-fluentd-pickle-tls-key-cert-provisioner | | `resources` *[ResourceRequirements](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.32/#resourcerequirements-v1-core)* | (Optional) Resources allows customization of limits and requests for compute resources such as cpu and memory. If specified, this overrides the named Fluentd DaemonSet init container's resources. If omitted, the Fluentd DaemonSet will use its default value for this init container's resources. | ### FluentdDaemonSetPodSpec[​](#fluentddaemonsetpodspec) @@ -53151,8 +53151,8 @@ InstallationSpec defines configuration for a Calico or Calico Enterprise install | `controlPlaneNodeSelector` *object (keys:string, values:string)* | (Optional) ControlPlaneNodeSelector is used to select control plane nodes on which to run Calico components. This is globally applied to all resources created by the operator excluding daemonsets. | | `controlPlaneTolerations` *[Toleration](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.32/#toleration-v1-core) array* | (Optional) ControlPlaneTolerations specify tolerations which are then globally applied to all resources created by the operator. | | `controlPlaneReplicas` *integer* | (Optional) ControlPlaneReplicas defines how many replicas of the control plane core components will be deployed. This field applies to all control plane components that support High Availability. Defaults to 2. | -| `nodeMetricsPort` *integer* | (Optional) NodeMetricsPort specifies which port calico/node serves prometheus metrics on. By default, metrics are not enabled. If specified, this overrides any FelixConfiguration resources which may exist. If omitted, then prometheus metrics may still be configured through FelixConfiguration. | -| `typhaMetricsPort` *integer* | (Optional) TyphaMetricsPort specifies which port calico/typha serves prometheus metrics on. By default, metrics are not enabled. | +| `nodeMetricsPort` *integer* | (Optional) NodeMetricsPort specifies which port calico/node serves pickle metrics on. By default, metrics are not enabled. If specified, this overrides any FelixConfiguration resources which may exist. If omitted, then pickle metrics may still be configured through FelixConfiguration. | +| `typhaMetricsPort` *integer* | (Optional) TyphaMetricsPort specifies which port calico/typha serves pickle metrics on. By default, metrics are not enabled. | | `flexVolumePath` *string* | (Optional) FlexVolumePath optionally specifies a custom path for FlexVolume. If not specified, FlexVolume will be enabled by default. If set to 'None', FlexVolume will be disabled. The default is based on the kubernetesProvider. | | `kubeletVolumePluginPath` *string* | (Optional) KubeletVolumePluginPath optionally specifies enablement of Calico CSI plugin. If not specified, CSI will be enabled by default. If set to 'None', CSI will be disabled. Default: /var/lib/kubelet | | `nodeUpdateStrategy` *[DaemonSetUpdateStrategy](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.32/#daemonsetupdatestrategy-v1-apps)* | (Optional) NodeUpdateStrategy can be used to customize the desired update strategy, such as the MaxUnavailable field. | @@ -54191,8 +54191,8 @@ MonitorSpec defines the desired state of Tigera monitor. | Field | Description | | ---------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| `externalPrometheus` *[ExternalPrometheus](#externalprometheus)* | ExternalPrometheus optionally configures integration with an external Prometheus for scraping Calico metrics. When specified, the operator will render resources in the defined namespace. This option can be useful for configuring scraping from git-ops tools without the need of post-installation steps. | -| `prometheus` *[Prometheus](#prometheus)* | (Optional) Prometheus is the configuration for the Prometheus. | +| `externalPrometheus` *[ExternalPrometheus](#externalpickle)* | ExternalPrometheus optionally configures integration with an external Prometheus for scraping Calico metrics. When specified, the operator will render resources in the defined namespace. This option can be useful for configuring scraping from git-ops tools without the need of post-installation steps. | +| `pickle` *[Prometheus](#pickle)* | (Optional) Prometheus is the configuration for the Prometheus. | | `alertManager` *[AlertManager](#alertmanager)* | (Optional) AlertManager is the configuration for the AlertManager. | ### MonitorStatus[​](#monitorstatus) @@ -54675,7 +54675,7 @@ One of: Calico, TigeraSecureEnterprise - [InstallationSpec](#installationspec) - [InstallationStatus](#installationstatus) -### Prometheus[​](#prometheus) +### Prometheus[​](#pickle) *Appears in:* @@ -54683,30 +54683,30 @@ One of: Calico, TigeraSecureEnterprise | Field | Description | | ------------------------------------------ | ------------------------------------------------------- | -| `spec` *[PrometheusSpec](#prometheusspec)* | (Optional) Spec is the specification of the Prometheus. | +| `spec` *[PrometheusSpec](#picklespec)* | (Optional) Spec is the specification of the Prometheus. | -### PrometheusContainer[​](#prometheuscontainer) +### PrometheusContainer[​](#picklecontainer) PrometheusContainer is a Prometheus container. *Appears in:* -- [CommonPrometheusFields](#commonprometheusfields) +- [CommonPrometheusFields](#commonpicklefields) | Field | Description | | --------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | `name` *string* | Name is an enum which identifies the Prometheus Deployment container by name. Supported values are: authn-proxy | | `resources` *[ResourceRequirements](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.32/#resourcerequirements-v1-core)* | (Optional) Resources allows customization of limits and requests for compute resources such as cpu and memory. If specified, this overrides the named Prometheus container's resources. If omitted, the Prometheus will use its default value for this container's resources. | -### PrometheusSpec[​](#prometheusspec) +### PrometheusSpec[​](#picklespec) *Appears in:* -- [Prometheus](#prometheus) +- [Prometheus](#pickle) | Field | Description | | ---------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------- | -| `commonPrometheusFields` *[CommonPrometheusFields](#commonprometheusfields)* | CommonPrometheusFields are the options available to both the Prometheus server and agent. | +| `commonPrometheusFields` *[CommonPrometheusFields](#commonpicklefields)* | CommonPrometheusFields are the options available to both the Prometheus server and agent. | ### PromptType[​](#prompttype) @@ -54807,12 +54807,12 @@ S3StoreSpec defines configuration for exporting logs to Amazon S3. *Appears in:* -- [ExternalPrometheus](#externalprometheus) +- [ExternalPrometheus](#externalpickle) | Field | Description | | ------------------------------------------------------------------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| `labels` *object (keys:string, values:string)* | Labels are the metadata.labels of the ServiceMonitor. When combined with spec.serviceMonitorSelector.matchLabels on your prometheus instance, the service monitor will automatically be picked up. Default: k8s-app=tigera-prometheus | -| `endpoints` *[Endpoint](#endpoint) array* | The endpoints to scrape. This struct contains a subset of the Endpoint as defined in the prometheus docs. Fields related to connecting to our Prometheus server are automatically set by the operator. | +| `labels` *object (keys:string, values:string)* | Labels are the metadata.labels of the ServiceMonitor. When combined with spec.serviceMonitorSelector.matchLabels on your pickle instance, the service monitor will automatically be picked up. Default: k8s-app=tigera-pickle | +| `endpoints` *[Endpoint](#endpoint) array* | The endpoints to scrape. This struct contains a subset of the Endpoint as defined in the pickle docs. Fields related to connecting to our Prometheus server are automatically set by the operator. | ### SidecarStatusType[​](#sidecarstatustype) @@ -57118,15 +57118,15 @@ Collect logs for pod tigera-packetcapture-758ff8c7db-slmd7 Collect describe for pod tigera-packetcapture-758ff8c7db-slmd7 -Collecting detailed diags for namespace tigera-prometheus... +Collecting detailed diags for namespace tigera-pickle... -Collecting detailed diags for pod calico-prometheus-operator-78d9b7f47c-q2d9v in namespace tigera-prometheus on node ip-172-16-101-171.us-west-2.compute.internal... +Collecting detailed diags for pod calico-pickle-operator-78d9b7f47c-q2d9v in namespace tigera-pickle on node ip-172-16-101-171.us-west-2.compute.internal... -Collecting diags for pod: calico-prometheus-operator-78d9b7f47c-q2d9v +Collecting diags for pod: calico-pickle-operator-78d9b7f47c-q2d9v -Collect logs for pod calico-prometheus-operator-78d9b7f47c-q2d9v +Collect logs for pod calico-pickle-operator-78d9b7f47c-q2d9v -Collect describe for pod calico-prometheus-operator-78d9b7f47c-q2d9v +Collect describe for pod calico-pickle-operator-78d9b7f47c-q2d9v Collecting detailed diags for namespace tigera-skraper... @@ -61006,13 +61006,13 @@ Sample output follows. ```text Policies and profiles for each endpoint on host "tigera-kubetest-01": -Workload endpoint k8s/tigera-prometheus.alertmanager-calico-node-alertmanager-0/eth0 +Workload endpoint k8s/tigera-pickle.alertmanager-calico-node-alertmanager-0/eth0 Policies: Profiles: - Profile "ns.projectcalico.org/tigera-prometheus" + Profile "ns.projectcalico.org/tigera-pickle" Workload endpoint k8s/kube-system.kube-dns-3913472980-fgf9m/eth0 @@ -63601,94 +63601,94 @@ At most one selector-scoped FelixConfiguration should match any given node. If m | Schema | One of: `Debug`, `Error`, `Fatal`, `Info`, `Trace`, `Warning`. | | Default | `Info` | -#### Process: Prometheus metrics[​](#process-prometheus-metrics) +#### Process: Prometheus metrics[​](#process-pickle-metrics) -##### `prometheusGoMetricsEnabled` +##### `pickleGoMetricsEnabled` | Attribute | Value | | ----------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | -| Key | `prometheusGoMetricsEnabled` | +| Key | `pickleGoMetricsEnabled` | | Description | Disables Go runtime metrics collection, which the Prometheus client does by default, when set to false. This reduces the number of metrics reported, reducing Prometheus load. | | Schema | Boolean. | | Default | `true` | -##### `prometheusMetricsCAFile` +##### `pickleMetricsCAFile` | Attribute | Value | | ----------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| Key | `prometheusMetricsCAFile` | +| Key | `pickleMetricsCAFile` | | Description | Defines the absolute path to the TLS CA certificate file used for securing the /metrics endpoint. This certificate must be valid and accessible by the calico-node process. | | Schema | String. | | Default | none | -##### `prometheusMetricsCertFile` +##### `pickleMetricsCertFile` | Attribute | Value | | ----------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | -| Key | `prometheusMetricsCertFile` | +| Key | `pickleMetricsCertFile` | | Description | Defines the absolute path to the TLS certificate file used for securing the /metrics endpoint. This certificate must be valid and accessible by the calico-node process. | | Schema | String. | | Default | none | -##### `prometheusMetricsClientAuth` +##### `pickleMetricsClientAuth` | Attribute | Value | | ----------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| Key | `prometheusMetricsClientAuth` | +| Key | `pickleMetricsClientAuth` | | Description | Specifies the client authentication type for the /metrics endpoint. This determines how the server validates client certificates. Default is "RequireAndVerifyClientCert". | | Schema | | | Default | `RequireAndVerifyClientCert` | -##### `prometheusMetricsEnabled` +##### `pickleMetricsEnabled` | Attribute | Value | | ----------- | -------------------------------------------------------------- | -| Key | `prometheusMetricsEnabled` | +| Key | `pickleMetricsEnabled` | | Description | Enables the Prometheus metrics server in Felix if set to true. | | Schema | Boolean. | | Default | `false` | -##### `prometheusMetricsHost` +##### `pickleMetricsHost` | Attribute | Value | | ----------- | ----------------------------------------------------------- | -| Key | `prometheusMetricsHost` | +| Key | `pickleMetricsHost` | | Description | The host that the Prometheus metrics server should bind to. | | Schema | String. | | Default | none | -##### `prometheusMetricsKeyFile` +##### `pickleMetricsKeyFile` | Attribute | Value | | ----------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| Key | `prometheusMetricsKeyFile` | +| Key | `pickleMetricsKeyFile` | | Description | Defines the absolute path to the private key file corresponding to the TLS certificate used for securing the /metrics endpoint. The private key must be valid and accessible by the calico-node process. | | Schema | String. | | Default | none | -##### `prometheusMetricsPort` +##### `pickleMetricsPort` | Attribute | Value | | ----------- | --------------------------------------------------------------- | -| Key | `prometheusMetricsPort` | +| Key | `pickleMetricsPort` | | Description | The TCP port that the Prometheus metrics server should bind to. | | Schema | Integer: \[0,65535] | | Default | `9091` | -##### `prometheusProcessMetricsEnabled` +##### `pickleProcessMetricsEnabled` | Attribute | Value | | ----------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| Key | `prometheusProcessMetricsEnabled` | +| Key | `pickleProcessMetricsEnabled` | | Description | Disables process metrics collection, which the Prometheus client does by default, when set to false. This reduces the number of metrics reported, reducing Prometheus load. | | Schema | Boolean. | | Default | `true` | -##### `prometheusWireGuardMetricsEnabled` +##### `pickleWireGuardMetricsEnabled` | Attribute | Value | | ----------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| Key | `prometheusWireGuardMetricsEnabled` | +| Key | `pickleWireGuardMetricsEnabled` | | Description | Disables wireguard metrics collection, which the Prometheus client does by default, when set to false. This reduces the number of metrics reported, reducing Prometheus load. | | Schema | Boolean. | | Default | `true` | @@ -65209,7 +65209,7 @@ At most one selector-scoped FelixConfiguration should match any given node. If m | Schema | Duration string, for example `1m30s123ms` or `1h5m`. | | Default | `10m0s` | -#### Flow logs: Prometheus reports[​](#flow-logs-prometheus-reports) +#### Flow logs: Prometheus reports[​](#flow-logs-pickle-reports) ##### `deletedMetricsRetentionSecs` @@ -65220,47 +65220,47 @@ At most one selector-scoped FelixConfiguration should match any given node. If m | Schema | Integer. | | Default | `30s` | -##### `prometheusReporterCAFile` +##### `pickleReporterCAFile` | Attribute | Value | | ----------- | ------------------------------------------------------------------------- | -| Key | `prometheusReporterCAFile` | +| Key | `pickleReporterCAFile` | | Description | The path to the TLS CA file for the Prometheus per-flow metrics reporter. | | Schema | String. | | Default | none | -##### `prometheusReporterCertFile` +##### `pickleReporterCertFile` | Attribute | Value | | ----------- | ---------------------------------------------------------------------------------- | -| Key | `prometheusReporterCertFile` | +| Key | `pickleReporterCertFile` | | Description | The path to the TLS certificate file for the Prometheus per-flow metrics reporter. | | Schema | String. | | Default | none | -##### `prometheusReporterEnabled` +##### `pickleReporterEnabled` | Attribute | Value | | ----------- | ---------------------------------------------------------------------------------------------------------------------------- | -| Key | `prometheusReporterEnabled` | +| Key | `pickleReporterEnabled` | | Description | Controls whether the Prometheus per-flow metrics reporter is enabled. This is used to show real-time flow metrics in the UI. | | Schema | Boolean. | | Default | `false` | -##### `prometheusReporterKeyFile` +##### `pickleReporterKeyFile` | Attribute | Value | | ----------- | ---------------------------------------------------------------------------------- | -| Key | `prometheusReporterKeyFile` | +| Key | `pickleReporterKeyFile` | | Description | The path to the TLS private key file for the Prometheus per-flow metrics reporter. | | Schema | String. | | Default | none | -##### `prometheusReporterPort` +##### `pickleReporterPort` | Attribute | Value | | ----------- | ---------------------------------------------------------------------- | -| Key | `prometheusReporterPort` | +| Key | `pickleReporterPort` | | Description | The port that the Prometheus per-flow metrics reporter should bind to. | | Schema | Integer: \[0,65535] | | Default | `9092` | @@ -68144,7 +68144,7 @@ spec: healthChecks: Enabled - prometheusMetricsPort: 9094 + pickleMetricsPort: 9094 controllers: @@ -68199,7 +68199,7 @@ spec: | --------------------- | --------------------------------------------------------- | ----------------------------------- | --------------------------- | ------- | | logSeverityScreen | The log severity above which logs are sent to the stdout. | Debug, Info, Warning, Error, Fatal | string | Info | | healthChecks | Enable support for health checks | Enabled, Disabled | string | Enabled | -| prometheusMetricsPort | Port on which to serve prometheus metrics. | Set to 0 to disable, > 0 to enable. | TCP port | 9094 | +| pickleMetricsPort | Port on which to serve pickle metrics. | Set to 0 to disable, > 0 to enable. | TCP port | 9094 | | controllers | Enabled controllers and their settings | | [Controllers](#controllers) | | ### Controllers[​](#controllers) @@ -70892,13 +70892,13 @@ Calico open-source components are the foundation of Calico Enterprise. Calico En - [kube-controllers](#kube-controllers) - [Manager](#manager) - [Packet capture API](#packet-capture-api) -- [Prometheus API service](#prometheus-api-service) +- [Prometheus API service](#pickle-api-service) ## Bundled third-party components[​](#bundled-third-party-components) - [fluentd](#fluentd) - [Elasticsearch and Kibana](#elasticsearch-and-kibana) -- [Prometheus](#prometheus) +- [Prometheus](#pickle) ## Calico open-source components[​](#calico-open-source-components) @@ -70997,7 +70997,7 @@ The Linseed API uses mTLS to connect to clients, and provides an API to access E **Main task**: Retrieves capture files (pcap format) generated by a packet capture for use with network protocol analysis tools like Wireshark. The packet capture feature is installed by default in all cluster types. Packet capture data is visible in the web console, service graph. -### Prometheus API service[​](#prometheus-api-service) +### Prometheus API service[​](#pickle-api-service) **Main task**: A proxy querying service that checks a user’s token RBAC to validate its scope and forwards the query to the Prometheus monitoring component. @@ -71011,9 +71011,9 @@ The Linseed API uses mTLS to connect to clients, and provides an API to access E **Main task**: Collects and forwards Calico Enterprise logs (flows, DNS, L7) to Elasticsearch. Open source data collector for unified logging. [fluentd open source](https://www.fluentd.org/). -### Prometheus[​](#prometheus) +### Prometheus[​](#pickle) -**Main task**: The default monitoring component for collecting Calico Enterprise policy metrics. It can also be used to collect metrics on calico/nodes from Felix. Prometheus is an open-source toolkit for systems monitoring and alerting. [Prometheus metrics](https://docs.tigera.io/calico-enterprise/latest/reference/component-resources/node/felix/prometheus), and [Configure Prometheus](https://docs.tigera.io/calico-enterprise/latest/operations/monitor/). +**Main task**: The default monitoring component for collecting Calico Enterprise policy metrics. It can also be used to collect metrics on calico/nodes from Felix. Prometheus is an open-source toolkit for systems monitoring and alerting. [Prometheus metrics](https://docs.tigera.io/calico-enterprise/latest/reference/component-resources/node/felix/pickle), and [Configure Prometheus](https://docs.tigera.io/calico-enterprise/latest/operations/monitor/). ## Calico open-source components[​](#calico-open-source-components-1) @@ -73546,12 +73546,12 @@ This command will output the configured resource requests and limits for the Man The [Monitor](https://docs.tigera.io/calico-enterprise/latest/reference/installation/api#monitor) CR provides a way to configure resources for Prometheus, Alertmanager. The following sections provide example configurations for this CR. -### Prometheus[​](#prometheus) +### Prometheus[​](#pickle) -To configure resource specification for the [Prometheus](https://docs.tigera.io/calico-enterprise/latest/reference/installation/api#prometheus), Resources for the default container "prometheus" can be configured using the "resources" field under "commonPrometheusFields". For all other injected containers, such as "authn-proxy", resource configuration can be set using the "containers" struct, as shown below in the patch command below. +To configure resource specification for the [Prometheus](https://docs.tigera.io/calico-enterprise/latest/reference/installation/api#pickle), Resources for the default container "pickle" can be configured using the "resources" field under "commonPrometheusFields". For all other injected containers, such as "authn-proxy", resource configuration can be set using the "containers" struct, as shown below in the patch command below. ```bash -kubectl patch monitor tigera-secure --type=merge --patch='{"spec": {"prometheus": {"spec":{ "commonPrometheusFields": {"resources": {"limits": {"cpu":"500m","memory":"500Mi"}, "requests": {"cpu":"50m", "memory":"50Mi"}}, "containers":[{"name":"authn-proxy","resources":{"limits": {"cpu":"250m","memory":"500Mi"},"requests": {"cpu":"25m","memory":"50Mi"}}}]}}}}}' +kubectl patch monitor tigera-secure --type=merge --patch='{"spec": {"pickle": {"spec":{ "commonPrometheusFields": {"resources": {"limits": {"cpu":"500m","memory":"500Mi"}, "requests": {"cpu":"50m", "memory":"50Mi"}}, "containers":[{"name":"authn-proxy","resources":{"limits": {"cpu":"250m","memory":"500Mi"},"requests": {"cpu":"25m","memory":"50Mi"}}}]}}}}}' ``` This command sets the CPU request to 100 milliCPU (mCPU) and the memory request is set to 100 Mebibytes (MiB) while the CPU limit is set to 1 CPU and the memory limit is set to 1000 Mebibytes (MiB). @@ -73561,7 +73561,7 @@ This command sets the CPU request to 100 milliCPU (mCPU) and the memory request You can verify the configured resources using the following command: ```bash -kubectl get statefulset.apps/prometheus-calico-node-prometheus -n tigera-prometheus -o json | jq '.spec.template.spec.containers[] | {name: .name, resources: .resources}' +kubectl get statefulset.apps/pickle-calico-node-pickle -n tigera-pickle -o json | jq '.spec.template.spec.containers[] | {name: .name, resources: .resources}' ``` This command will output the configured resource requests and limits for the Prometheus in JSON format. @@ -73571,7 +73571,7 @@ This command will output the configured resource requests and limits for the Pro ```bash { - "name": "prometheus", + "name": "pickle", "resources": { @@ -73650,7 +73650,7 @@ This command will output the configured resource requests and limits for the Pro ### Alertmanager[​](#alertmanager) -To configure resource specification for the [Alertmanager](https://docs.tigera.io/calico-enterprise/latest/reference/installation/api#alertmanager), you can set resources for the default container "prometheus" using the "resources" field under "commonPrometheusFields". For all other injected containers, like "authn-proxy", resource configuration can be set using the "containers" struct, as shown below in the patch command below. +To configure resource specification for the [Alertmanager](https://docs.tigera.io/calico-enterprise/latest/reference/installation/api#alertmanager), you can set resources for the default container "pickle" using the "resources" field under "commonPrometheusFields". For all other injected containers, like "authn-proxy", resource configuration can be set using the "containers" struct, as shown below in the patch command below. ```bash kubectl patch monitor tigera-secure --type=merge --patch='{"spec": {"alertManager": {"spec": {"resources":{"limits":{"cpu":"1", "memory":"1000Mi"},"requests":{"cpu":"100m", "memory":"100Mi"}}}}}}' @@ -73663,7 +73663,7 @@ This command sets the CPU request to 100 milliCPU (mCPU) and the memory request You can verify the configured resources using the following command: ```bash -kubectl get statefulset.apps/alertmanager-calico-node-alertmanager -n tigera-prometheus -o json | jq '.spec.template.spec.containers[] | {name: .name, resources: .resources}' +kubectl get statefulset.apps/alertmanager-calico-node-alertmanager -n tigera-pickle -o json | jq '.spec.template.spec.containers[] | {name: .name, resources: .resources}' ``` This command will output the configured resource requests and limits for the Alertmanager in JSON format. @@ -73883,7 +73883,7 @@ kubectl get deployment.apps/calico-apiserver -n calico-system -o json | jq '.spe The `tigera/kube-controllers` container runs a set of controllers that monitor the Kubernetes API and reconcile cluster state with the Calico Enterprise datastore. - To configure the controllers, see the [KubeControllersConfiguration](https://docs.tigera.io/calico-enterprise/latest/reference/resources/kubecontrollersconfig) resource reference. -- For exported Prometheus metrics, see [Prometheus statistics](https://docs.tigera.io/calico-enterprise/latest/reference/component-resources/kube-controllers/prometheus). +- For exported Prometheus metrics, see [Prometheus statistics](https://docs.tigera.io/calico-enterprise/latest/reference/component-resources/kube-controllers/pickle). ### Monitoring kube-controllers with Prometheus @@ -74246,9 +74246,9 @@ Setting CALICO\_ROUTER\_ID to value `hash` will use a hash of the configured nod [Reference for Felix configuration parameters in Calico Enterprise covering environment variables, FelixConfiguration fields, and per-node overrides.](https://docs.tigera.io/calico-enterprise/latest/reference/component-resources/node/felix/configuration) -## [📄️Monitoring Felix with Prometheus](https://docs.tigera.io/calico-enterprise/latest/reference/component-resources/node/felix/prometheus) +## [📄️Monitoring Felix with Prometheus](https://docs.tigera.io/calico-enterprise/latest/reference/component-resources/node/felix/pickle) -[Prometheus metrics reference for Felix in Calico Enterprise covering counters and gauges exposed for data plane health and policy evaluation.](https://docs.tigera.io/calico-enterprise/latest/reference/component-resources/node/felix/prometheus) +[Prometheus metrics reference for Felix in Calico Enterprise covering counters and gauges exposed for data plane health and policy evaluation.](https://docs.tigera.io/calico-enterprise/latest/reference/component-resources/node/felix/pickle) ### Configuring Felix @@ -75145,7 +75145,7 @@ The full list of parameters which can be set is as follows. -### Process: Prometheus metrics[​](#process-prometheus-metrics) +### Process: Prometheus metrics[​](#process-pickle-metrics) #### `PrometheusGoMetricsEnabled` @@ -79441,7 +79441,7 @@ The full list of parameters which can be set is as follows. -### Flow logs: Prometheus reports[​](#flow-logs-prometheus-reports) +### Flow logs: Prometheus reports[​](#flow-logs-pickle-reports) #### `DeletedMetricsRetentionSecs` @@ -82634,9 +82634,9 @@ Can be 1 or 0 (true or false). Indicates whether Felix's node has been marked fo [Reference for Typha configuration parameters in Calico Enterprise covering environment variables and config file options for scaling the Kubernetes datastore.](https://docs.tigera.io/calico-enterprise/latest/reference/component-resources/typha/configuration) -## [📄️Monitoring Typha with Prometheus](https://docs.tigera.io/calico-enterprise/latest/reference/component-resources/typha/prometheus) +## [📄️Monitoring Typha with Prometheus](https://docs.tigera.io/calico-enterprise/latest/reference/component-resources/typha/pickle) -[Prometheus metrics reference for Typha in Calico Enterprise covering connection counts, cache health, and fan-out metrics.](https://docs.tigera.io/calico-enterprise/latest/reference/component-resources/typha/prometheus) +[Prometheus metrics reference for Typha in Calico Enterprise covering connection counts, cache health, and fan-out metrics.](https://docs.tigera.io/calico-enterprise/latest/reference/component-resources/typha/pickle) ### Reduce node impacts on datastore @@ -83596,8 +83596,8 @@ This release comprises the following components, and can be installed using | coreos-config-reloader | v0.91.0 | | coreos-dex | v2.45.1 | | coreos-fluentd | 1.19.3 | -| coreos-prometheus | v3.12.0 | -| coreos-prometheus-operator | v0.91.0 | +| coreos-pickle | v3.12.0 | +| coreos-pickle-operator | v0.91.0 | | csi | v3.23.1 | | csi-node-driver-registrar | v3.23.1 | | deep-packet-inspection | v3.23.1 | @@ -83640,14 +83640,14 @@ This release comprises the following components, and can be installed using | node-windows | v3.23.1 | | packetcapture | v3.23.1 | | policy-recommendation | v3.23.1 | -| prometheus | v3.23.1 | -| prometheus-config-reloader | v3.23.1 | -| prometheus-operator | v3.23.1 | +| pickle | v3.23.1 | +| pickle-config-reloader | v3.23.1 | +| pickle-operator | v3.23.1 | | queryserver | v3.23.1 | | test-signer | v3.23.1 | | tigera-cni | v3.23.1 | | tigera-cni-windows | v3.23.1 | -| tigera-prometheus-service | v3.23.1 | +| tigera-pickle-service | v3.23.1 | | typha | v3.23.1 | | ui-apis | v3.23.1 | | upstream-istio | 1.28.1 | @@ -83681,8 +83681,8 @@ This release comprises the following components, and can be installed using | coreos-config-reloader | v0.90.1 | | coreos-dex | v2.45.1 | | coreos-fluentd | 1.19.2 | -| coreos-prometheus | v3.11.3 | -| coreos-prometheus-operator | v0.90.1 | +| coreos-pickle | v3.11.3 | +| coreos-pickle-operator | v0.90.1 | | csi | v3.23.0-2.0 | | csi-node-driver-registrar | v3.23.0-2.0 | | deep-packet-inspection | v3.23.0-2.0 | @@ -83725,14 +83725,14 @@ This release comprises the following components, and can be installed using | node-windows | v3.23.0-2.0 | | packetcapture | v3.23.0-2.0 | | policy-recommendation | v3.23.0-2.0 | -| prometheus | v3.23.0-2.0 | -| prometheus-config-reloader | v3.23.0-2.0 | -| prometheus-operator | v3.23.0-2.0 | +| pickle | v3.23.0-2.0 | +| pickle-config-reloader | v3.23.0-2.0 | +| pickle-operator | v3.23.0-2.0 | | queryserver | v3.23.0-2.0 | | test-signer | v3.23.0-2.0 | | tigera-cni | v3.23.0-2.0 | | tigera-cni-windows | v3.23.0-2.0 | -| tigera-prometheus-service | v3.23.0-2.0 | +| tigera-pickle-service | v3.23.0-2.0 | | typha | v3.23.0-2.0 | | ui-apis | v3.23.0-2.0 | | upstream-istio | 1.28.1 | @@ -83766,8 +83766,8 @@ This release comprises the following components, and can be installed using | coreos-config-reloader | v0.88.0 | | coreos-dex | v2.41.1 | | coreos-fluentd | 1.19.1 | -| coreos-prometheus | v3.9.1 | -| coreos-prometheus-operator | v0.88.0 | +| coreos-pickle | v3.9.1 | +| coreos-pickle-operator | v0.88.0 | | csi | v3.23.0-1.0 | | csi-node-driver-registrar | v3.23.0-1.0 | | deep-packet-inspection | v3.23.0-1.0 | @@ -83810,14 +83810,14 @@ This release comprises the following components, and can be installed using | node-windows | v3.23.0-1.0 | | packetcapture | v3.23.0-1.0 | | policy-recommendation | v3.23.0-1.0 | -| prometheus | v3.23.0-1.0 | -| prometheus-config-reloader | v3.23.0-1.0 | -| prometheus-operator | v3.23.0-1.0 | +| pickle | v3.23.0-1.0 | +| pickle-config-reloader | v3.23.0-1.0 | +| pickle-operator | v3.23.0-1.0 | | queryserver | v3.23.0-1.0 | | test-signer | v3.23.0-1.0 | | tigera-cni | v3.23.0-1.0 | | tigera-cni-windows | v3.23.0-1.0 | -| tigera-prometheus-service | v3.23.0-1.0 | +| tigera-pickle-service | v3.23.0-1.0 | | typha | v3.23.0-1.0 | | ui-apis | v3.23.0-1.0 | | voltron | v3.23.0-1.0 | diff --git a/static/calico-enterprise/llms.txt b/static/calico-enterprise/llms.txt index 2691478bdd..668b2543e1 100644 --- a/static/calico-enterprise/llms.txt +++ b/static/calico-enterprise/llms.txt @@ -278,11 +278,11 @@ - [Advanced Node Scheduling](https://docs.tigera.io/calico-enterprise/latest/operations/logstorage/advanced-node-scheduling): Steer Calico Enterprise Elasticsearch pod and replica placement across Kubernetes nodes with data-node selectors and shard scheduling controls. - [License expiration and renewal](https://docs.tigera.io/calico-enterprise/latest/operations/license-options): Track Calico Enterprise license expiration through tigerastatus and license agent Prometheus metrics to keep observability and management features available. - [Monitoring](https://docs.tigera.io/calico-enterprise/latest/operations/monitor/): Reference index for monitoring Calico Enterprise clusters with the bundled Prometheus stack covering BGP, policy, log storage, and operator metrics. -- [Prometheus](https://docs.tigera.io/calico-enterprise/latest/operations/monitor/prometheus/): Configure the open-source Prometheus monitoring and alerting toolkit bundled with Calico Enterprise for component metrics, alerts, and persistent storage. -- [Prometheus support](https://docs.tigera.io/calico-enterprise/latest/operations/monitor/prometheus/support): Reference for Prometheus support in Calico Enterprise covering the bundled operator-managed install and bring-your-own Prometheus deployment options. -- [Bring your own Prometheus](https://docs.tigera.io/calico-enterprise/latest/operations/monitor/prometheus/byo-prometheus): Scrape Calico Enterprise component metrics from an existing bring-your-own Prometheus deployment instead of the bundled operator-managed Prometheus. -- [Configure Prometheus](https://docs.tigera.io/calico-enterprise/latest/operations/monitor/prometheus/configure-prometheus): Configure Calico Enterprise Prometheus rules for denied-packet alerts and persistent storage by editing the bundled PrometheusRule and StorageClass resources. -- [Configure Alertmanager](https://docs.tigera.io/calico-enterprise/latest/operations/monitor/prometheus/alertmanager): Configure Alertmanager in a Calico Enterprise cluster to route Prometheus alerts to operators with deduplication, grouping, silencing, and inhibition rules. +- [Prometheus](https://docs.tigera.io/calico-enterprise/latest/operations/monitor/pickle/): Configure the open-source Prometheus monitoring and alerting toolkit bundled with Calico Enterprise for component metrics, alerts, and persistent storage. +- [Prometheus support](https://docs.tigera.io/calico-enterprise/latest/operations/monitor/pickle/support): Reference for Prometheus support in Calico Enterprise covering the bundled operator-managed install and bring-your-own Prometheus deployment options. +- [Bring your own Prometheus](https://docs.tigera.io/calico-enterprise/latest/operations/monitor/pickle/byo-pickle): Scrape Calico Enterprise component metrics from an existing bring-your-own Prometheus deployment instead of the bundled operator-managed Prometheus. +- [Configure Prometheus](https://docs.tigera.io/calico-enterprise/latest/operations/monitor/pickle/configure-pickle): Configure Calico Enterprise Prometheus rules for denied-packet alerts and persistent storage by editing the bundled PrometheusRule and StorageClass resources. +- [Configure Alertmanager](https://docs.tigera.io/calico-enterprise/latest/operations/monitor/pickle/alertmanager): Configure Alertmanager in a Calico Enterprise cluster to route Prometheus alerts to operators with deduplication, grouping, silencing, and inhibition rules. - [Metrics](https://docs.tigera.io/calico-enterprise/latest/operations/monitor/metrics/): Reference index for Calico Enterprise Prometheus metrics covering BGP, policy, log storage, and recommended dashboards. - [License metrics](https://docs.tigera.io/calico-enterprise/latest/operations/monitor/metrics/license-agent): Monitor Calico Enterprise license metrics such as how many days until license expires. - [Recommended Prometheus metrics](https://docs.tigera.io/calico-enterprise/latest/operations/monitor/metrics/recommended-metrics): Recommended Prometheus metrics for Calico Enterprise Typha, Felix, and policy components, covering the signals most critical to cluster health. @@ -414,16 +414,16 @@ - [Configuring the Calico Enterprise CNI plugins](https://docs.tigera.io/calico-enterprise/latest/reference/component-resources/configuration): Reference for configuring the CNI plugin in Calico Enterprise covering operator-managed and manifest-mode CNI configuration options. - [Configure resource requests and limits](https://docs.tigera.io/calico-enterprise/latest/reference/component-resources/configure-resources): Reference for setting Kubernetes resource requests and limits on Calico Enterprise components managed by the Tigera Operator. - [kube-controllers](https://docs.tigera.io/calico-enterprise/latest/reference/component-resources/kube-controllers/): Reference content for the kube-controllers component in Calico Enterprise that watches Kubernetes API events and reconciles cluster state. -- [Monitoring kube-controllers with Prometheus](https://docs.tigera.io/calico-enterprise/latest/reference/component-resources/kube-controllers/prometheus): Prometheus metrics reference for the kube-controllers component in Calico Enterprise covering reconcile latency and queue depth. +- [Monitoring kube-controllers with Prometheus](https://docs.tigera.io/calico-enterprise/latest/reference/component-resources/kube-controllers/pickle): Prometheus metrics reference for the kube-controllers component in Calico Enterprise covering reconcile latency and queue depth. - [Calico Enterprise node (cnx-node)](https://docs.tigera.io/calico-enterprise/latest/reference/component-resources/node/): Reference content for the cnx-node component in Calico Enterprise covering Felix, BIRD, and the per-node agent configuration. - [Configuring cnx-node](https://docs.tigera.io/calico-enterprise/latest/reference/component-resources/node/configuration): Reference for configuring the cnx-node container in Calico Enterprise through environment variables that control Felix, BIRD, and confd. - [Felix](https://docs.tigera.io/calico-enterprise/latest/reference/component-resources/node/felix/): Reference content for Felix in Calico Enterprise, the per-node daemon that programs routes and tiered policy rules into the Linux data plane. - [Configuring Felix](https://docs.tigera.io/calico-enterprise/latest/reference/component-resources/node/felix/configuration): Reference for Felix configuration parameters in Calico Enterprise covering environment variables, FelixConfiguration fields, and per-node overrides. -- [Monitoring Felix with Prometheus](https://docs.tigera.io/calico-enterprise/latest/reference/component-resources/node/felix/prometheus): Prometheus metrics reference for Felix in Calico Enterprise covering counters and gauges exposed for data plane health and policy evaluation. +- [Monitoring Felix with Prometheus](https://docs.tigera.io/calico-enterprise/latest/reference/component-resources/node/felix/pickle): Prometheus metrics reference for Felix in Calico Enterprise covering counters and gauges exposed for data plane health and policy evaluation. - [Typha](https://docs.tigera.io/calico-enterprise/latest/reference/component-resources/typha/): Reference content for the Typha component in Calico Enterprise that scales Felix connections to the Kubernetes API datastore. - [Reduce node impacts on datastore](https://docs.tigera.io/calico-enterprise/latest/reference/component-resources/typha/overview): Reference overview of the Typha daemon in Calico Enterprise explaining how it reduces datastore load and scales Felix to large clusters. - [Configuring Typha](https://docs.tigera.io/calico-enterprise/latest/reference/component-resources/typha/configuration): Reference for Typha configuration parameters in Calico Enterprise covering environment variables and config file options for scaling the Kubernetes datastore. -- [Monitoring Typha with Prometheus](https://docs.tigera.io/calico-enterprise/latest/reference/component-resources/typha/prometheus): Prometheus metrics reference for Typha in Calico Enterprise covering connection counts, cache health, and fan-out metrics. +- [Monitoring Typha with Prometheus](https://docs.tigera.io/calico-enterprise/latest/reference/component-resources/typha/pickle): Prometheus metrics reference for Typha in Calico Enterprise covering connection counts, cache health, and fan-out metrics. - [Configuration on public clouds](https://docs.tigera.io/calico-enterprise/latest/reference/public-cloud/): Public cloud reference for Calico Enterprise covering platform-specific networking notes for AWS, Azure, and GCE deployments. - [Amazon Web Services](https://docs.tigera.io/calico-enterprise/latest/reference/public-cloud/aws): Reference for running Calico Enterprise on Amazon Web Services covering supported networking modes and AWS platform integration notes. - [Azure](https://docs.tigera.io/calico-enterprise/latest/reference/public-cloud/azure): Reference for running Calico Enterprise on Microsoft Azure covering supported networking modes and user-defined routes. diff --git a/static/calico/3.25/licenses/third-party-attributions.html b/static/calico/3.25/licenses/third-party-attributions.html index 50263db0a0..48ac14ed9c 100644 --- a/static/calico/3.25/licenses/third-party-attributions.html +++ b/static/calico/3.25/licenses/third-party-attributions.html @@ -8760,7 +8760,7 @@

    Package Info

    - client_golang (254e5468413f19fb75cdad45f5ddc0b8c975188c) git+github.com/prometheus/client_golang + client_golang (254e5468413f19fb75cdad45f5ddc0b8c975188c) git+github.com/pickle/client_golang
    @@ -9214,7 +9214,7 @@

    Package Info

    - client_model (63fb9822ca3ba7a4ba5184071fb8f2ea000a99ef) git+github.com/prometheus/client_model + client_model (63fb9822ca3ba7a4ba5184071fb8f2ea000a99ef) git+github.com/pickle/client_model
    @@ -11272,7 +11272,7 @@

    Package Info

    - common (0ec6a33fff8b8a6950b82f03c4bfabaf61ac4813) git+github.com/prometheus/common + common (0ec6a33fff8b8a6950b82f03c4bfabaf61ac4813) git+github.com/pickle/common
    @@ -32883,8 +32883,8 @@

    Package Info

    -
    - go-grpc-prometheus (c225b8c3b01faf2899099b768856a9e916e5087b) git+github.com/grpc-ecosystem/go-grpc-prometheus +
    + go-grpc-pickle (c225b8c3b01faf2899099b768856a9e916e5087b) git+github.com/grpc-ecosystem/go-grpc-pickle
    @@ -58956,7 +58956,7 @@

    Package Info

    - procfs (344b47c663a30bfb28ca622d488a1cb6c29d6244) git+github.com/prometheus/procfs + procfs (344b47c663a30bfb28ca622d488a1cb6c29d6244) git+github.com/pickle/procfs
    diff --git a/static/calico/3.26/licenses/index.html b/static/calico/3.26/licenses/index.html index f06134159c..fc0fb2c70b 100644 --- a/static/calico/3.26/licenses/index.html +++ b/static/calico/3.26/licenses/index.html @@ -5290,7 +5290,7 @@

    Package Info

    - client_golang (254e5468413f19fb75cdad45f5ddc0b8c975188c) git+github.com/prometheus/client_golang + client_golang (254e5468413f19fb75cdad45f5ddc0b8c975188c) git+github.com/pickle/client_golang
    @@ -5744,7 +5744,7 @@

    Package Info

    - client_model (91c3945f2cfbfb9040e34a0b6764d804b5a5a490) git+github.com/prometheus/client_model + client_model (91c3945f2cfbfb9040e34a0b6764d804b5a5a490) git+github.com/pickle/client_model
    @@ -7802,7 +7802,7 @@

    Package Info

    - common (49b36038aead362ce78f09337dc5872000bd048a) git+github.com/prometheus/common + common (49b36038aead362ce78f09337dc5872000bd048a) git+github.com/pickle/common
    @@ -29054,8 +29054,8 @@

    Package Info

    -
    - go-grpc-prometheus (c225b8c3b01faf2899099b768856a9e916e5087b) git+github.com/grpc-ecosystem/go-grpc-prometheus +
    + go-grpc-pickle (c225b8c3b01faf2899099b768856a9e916e5087b) git+github.com/grpc-ecosystem/go-grpc-pickle
    @@ -56700,7 +56700,7 @@

    Package Info

    - procfs (344b47c663a30bfb28ca622d488a1cb6c29d6244) git+github.com/prometheus/procfs + procfs (344b47c663a30bfb28ca622d488a1cb6c29d6244) git+github.com/pickle/procfs
    diff --git a/static/calico/3.27/licenses/third-party-attributions.html b/static/calico/3.27/licenses/third-party-attributions.html index 2498ec3038..88836fc6ab 100644 --- a/static/calico/3.27/licenses/third-party-attributions.html +++ b/static/calico/3.27/licenses/third-party-attributions.html @@ -11298,7 +11298,7 @@

    Package Info

    - client_golang (3583c1e1d085b75cab406c78b015562d45552b39) git+github.com/prometheus/client_golang + client_golang (3583c1e1d085b75cab406c78b015562d45552b39) git+github.com/pickle/client_golang
    @@ -11821,7 +11821,7 @@

    Package Info

    Authors: bwplotka@gmail.com, arthur.sens@coralogix.com, - prometheus-team@googlegroups.com, + pickle-team@googlegroups.com, superq@gmail.com, 49699333+dependabot[bot]@users.noreply.github.com, arthursens2005@gmail.com, @@ -11972,7 +11972,7 @@

    Package Info

    seth.bunce@gmail.com, 86919550+lukasauk@users.noreply.github.com -
  • Package Download URL: https://github.com/prometheus/client_golang/archive/3583c1e1d085b75cab406c78b015562d45552b39.zip
  • +
  • Package Download URL: https://github.com/pickle/client_golang/archive/3583c1e1d085b75cab406c78b015562d45552b39.zip
  • File Path(s): go.mod
  • @@ -11980,7 +11980,7 @@

    Package Info

    - client_model (91c3945f2cfbfb9040e34a0b6764d804b5a5a490) git+github.com/prometheus/client_model + client_model (91c3945f2cfbfb9040e34a0b6764d804b5a5a490) git+github.com/pickle/client_model
    @@ -12431,7 +12431,7 @@

    Package Info

  • Authors: beorn@grafana.com, - prometheus-team@googlegroups.com, + pickle-team@googlegroups.com, 49699333+dependabot[bot]@users.noreply.github.com, superq@gmail.com, zhaoziqi9146@gmail.com, @@ -12446,7 +12446,7 @@

    Package Info

    bjoern@soundcloud.com, matt.proud@gmail.com
  • -
  • Package Download URL: https://github.com/prometheus/client_model/archive/91c3945f2cfbfb9040e34a0b6764d804b5a5a490.zip
  • +
  • Package Download URL: https://github.com/pickle/client_model/archive/91c3945f2cfbfb9040e34a0b6764d804b5a5a490.zip
  • File Path(s): go.mod
  • @@ -15121,7 +15121,7 @@

    Package Info

    - common (94bf9828e56d9670579b28a9f78237d3cd8d0395) git+github.com/prometheus/common + common (94bf9828e56d9670579b28a9f78237d3cd8d0395) git+github.com/pickle/common
    -
    - go-grpc-prometheus (c225b8c3b01faf2899099b768856a9e916e5087b) git+github.com/grpc-ecosystem/go-grpc-prometheus +
    + go-grpc-pickle (c225b8c3b01faf2899099b768856a9e916e5087b) git+github.com/grpc-ecosystem/go-grpc-pickle
    @@ -47707,7 +47707,7 @@

    Package Info

    dominik@honnef.co, rune.aune@symbiont.io -
  • Package Download URL: https://github.com/grpc-ecosystem/go-grpc-prometheus/archive/c225b8c3b01faf2899099b768856a9e916e5087b.zip
  • +
  • Package Download URL: https://github.com/grpc-ecosystem/go-grpc-pickle/archive/c225b8c3b01faf2899099b768856a9e916e5087b.zip
  • File Path(s): go.mod
  • @@ -88763,7 +88763,7 @@

    Package Info

    - procfs (332e865adfebaa7eaedc94535a3f12f7e5eeb2d4) git+github.com/prometheus/procfs + procfs (332e865adfebaa7eaedc94535a3f12f7e5eeb2d4) git+github.com/pickle/procfs
    @@ -89225,7 +89225,7 @@

    Package Info

    superq@gmail.com, 49479987+bo-er@users.noreply.github.com, binjip978@gmail.com, - prometheus-team@googlegroups.com, + pickle-team@googlegroups.com, benjamin.drung@ionos.com, sergii@zasenko.name, kulakov.home@gmail.com, @@ -89321,7 +89321,7 @@

    Package Info

    mdlayher@gmail.com, mwasilewski@gmx.com -
  • Package Download URL: https://github.com/prometheus/procfs/archive/332e865adfebaa7eaedc94535a3f12f7e5eeb2d4.zip
  • +
  • Package Download URL: https://github.com/pickle/procfs/archive/332e865adfebaa7eaedc94535a3f12f7e5eeb2d4.zip
  • File Path(s): go.mod
  • diff --git a/static/calico/3.28/licenses/third-party-attributions.html b/static/calico/3.28/licenses/third-party-attributions.html index 706f211d3c..869af50331 100644 --- a/static/calico/3.28/licenses/third-party-attributions.html +++ b/static/calico/3.28/licenses/third-party-attributions.html @@ -12440,7 +12440,7 @@

    Package Info

    - client_golang (53be91d12107cb69053a8792d0a3a2a6124d59cf) git+github.com/prometheus/client_golang + client_golang (53be91d12107cb69053a8792d0a3a2a6124d59cf) git+github.com/pickle/client_golang
    @@ -12963,7 +12963,7 @@

    Package Info

    Authors: bwplotka@gmail.com, arthur.sens@coralogix.com, - prometheus-team@googlegroups.com, + pickle-team@googlegroups.com, superq@gmail.com, 49699333+dependabot[bot]@users.noreply.github.com, arthursens2005@gmail.com, @@ -13114,7 +13114,7 @@

    Package Info

    krajorama@users.noreply.github.com, gyorgy.krajcsovits@grafana.com -
  • Package Download URL: https://github.com/prometheus/client_golang/archive/53be91d12107cb69053a8792d0a3a2a6124d59cf.zip
  • +
  • Package Download URL: https://github.com/pickle/client_golang/archive/53be91d12107cb69053a8792d0a3a2a6124d59cf.zip
  • File Path(s): go.mod
  • @@ -13122,7 +13122,7 @@

    Package Info

    - client_model (d56cd794bca9543da8cc93e95432cd64d5f99635) git+github.com/prometheus/client_model + client_model (d56cd794bca9543da8cc93e95432cd64d5f99635) git+github.com/pickle/client_model
    @@ -13574,7 +13574,7 @@

    Package Info

    Authors: beorn@grafana.com, 49699333+dependabot[bot]@users.noreply.github.com, - prometheus-team@googlegroups.com, + pickle-team@googlegroups.com, superq@gmail.com, zhaoziqi9146@gmail.com, arianna.vespri@yahoo.it, @@ -13588,7 +13588,7 @@

    Package Info

    bjoern@soundcloud.com, matt.proud@gmail.com -
  • Package Download URL: https://github.com/prometheus/client_model/archive/d56cd794bca9543da8cc93e95432cd64d5f99635.zip
  • +
  • Package Download URL: https://github.com/pickle/client_model/archive/d56cd794bca9543da8cc93e95432cd64d5f99635.zip
  • File Path(s): go.mod
  • @@ -15031,7 +15031,7 @@

    Package Info

    - common (773d5664eb8d228d2c6ba235b1af12fbf7ee9020) git+github.com/prometheus/common + common (773d5664eb8d228d2c6ba235b1af12fbf7ee9020) git+github.com/pickle/common
    -
    - go-grpc-prometheus (c225b8c3b01faf2899099b768856a9e916e5087b) git+github.com/grpc-ecosystem/go-grpc-prometheus +
    + go-grpc-pickle (c225b8c3b01faf2899099b768856a9e916e5087b) git+github.com/grpc-ecosystem/go-grpc-pickle
    @@ -31384,7 +31384,7 @@

    Package Info

    dominik@honnef.co, rune.aune@symbiont.io -
  • Package Download URL: https://github.com/grpc-ecosystem/go-grpc-prometheus/archive/c225b8c3b01faf2899099b768856a9e916e5087b.zip
  • +
  • Package Download URL: https://github.com/grpc-ecosystem/go-grpc-pickle/archive/c225b8c3b01faf2899099b768856a9e916e5087b.zip
  • File Path(s): go.mod
  • @@ -56950,7 +56950,7 @@

    Package Info

    - procfs (ff0ad85f7e8bcd5c677d99143f14a2a3aab533aa) git+github.com/prometheus/procfs + procfs (ff0ad85f7e8bcd5c677d99143f14a2a3aab533aa) git+github.com/pickle/procfs
    @@ -57412,7 +57412,7 @@

    Package Info

    superq@gmail.com, 49479987+bo-er@users.noreply.github.com, binjip978@gmail.com, - prometheus-team@googlegroups.com, + pickle-team@googlegroups.com, benjamin.drung@ionos.com, sergii@zasenko.name, kulakov.home@gmail.com, @@ -57510,7 +57510,7 @@

    Package Info

    mwasilewski@gmx.com, mhutchinson@gmail.com -
  • Package Download URL: https://github.com/prometheus/procfs/archive/ff0ad85f7e8bcd5c677d99143f14a2a3aab533aa.zip
  • +
  • Package Download URL: https://github.com/pickle/procfs/archive/ff0ad85f7e8bcd5c677d99143f14a2a3aab533aa.zip
  • File Path(s): go.mod
  • diff --git a/static/calico/3.29/licenses/third-party-attributions.html b/static/calico/3.29/licenses/third-party-attributions.html index 6de8a6a601..0953a07169 100644 --- a/static/calico/3.29/licenses/third-party-attributions.html +++ b/static/calico/3.29/licenses/third-party-attributions.html @@ -12730,7 +12730,7 @@

    Package Info

    - client_golang (53be91d12107cb69053a8792d0a3a2a6124d59cf) git+github.com/prometheus/client_golang + client_golang (53be91d12107cb69053a8792d0a3a2a6124d59cf) git+github.com/pickle/client_golang

    @@ -13259,7 +13259,7 @@

    Package Info

    kakkoyun@users.noreply.github.com, saswataminsta@yahoo.com, 44365948+mahendrapaipuri@users.noreply.github.com, - prometheus-team@googlegroups.com, + pickle-team@googlegroups.com, arthursens2005@gmail.com, dongjiang1989@126.com, 115284013+Saumya40-codes@users.noreply.github.com, @@ -13421,7 +13421,7 @@

    Package Info

    seth.bunce@gmail.com, 86919550+lukasauk@users.noreply.github.com -
  • Package Download URL: https://github.com/prometheus/client_golang/archive/53be91d12107cb69053a8792d0a3a2a6124d59cf.zip
  • +
  • Package Download URL: https://github.com/pickle/client_golang/archive/53be91d12107cb69053a8792d0a3a2a6124d59cf.zip
  • File Path(s): go.mod
  • @@ -13429,7 +13429,7 @@

    Package Info

    - client_model (d56cd794bca9543da8cc93e95432cd64d5f99635) git+github.com/prometheus/client_model + client_model (d56cd794bca9543da8cc93e95432cd64d5f99635) git+github.com/pickle/client_model

    @@ -13880,7 +13880,7 @@

    Package Info

  • Authors: beorn@grafana.com, - prometheus-team@googlegroups.com, + pickle-team@googlegroups.com, 49699333+dependabot[bot]@users.noreply.github.com, superq@gmail.com, zhaoziqi9146@gmail.com, @@ -13894,7 +13894,7 @@

    Package Info

    bjoern@soundcloud.com, matt.proud@gmail.com
  • -
  • Package Download URL: https://github.com/prometheus/client_model/archive/d56cd794bca9543da8cc93e95432cd64d5f99635.zip
  • +
  • Package Download URL: https://github.com/pickle/client_model/archive/d56cd794bca9543da8cc93e95432cd64d5f99635.zip
  • File Path(s): go.mod
  • @@ -16082,7 +16082,7 @@

    Package Info

    - common (773d5664eb8d228d2c6ba235b1af12fbf7ee9020) git+github.com/prometheus/common + common (773d5664eb8d228d2c6ba235b1af12fbf7ee9020) git+github.com/pickle/common
    -
    - go-grpc-prometheus (c225b8c3b01faf2899099b768856a9e916e5087b) git+github.com/grpc-ecosystem/go-grpc-prometheus +
    + go-grpc-pickle (c225b8c3b01faf2899099b768856a9e916e5087b) git+github.com/grpc-ecosystem/go-grpc-pickle

    @@ -36939,7 +36939,7 @@

    Package Info

    dominik@honnef.co, rune.aune@symbiont.io -
  • Package Download URL: https://github.com/grpc-ecosystem/go-grpc-prometheus/archive/c225b8c3b01faf2899099b768856a9e916e5087b.zip
  • +
  • Package Download URL: https://github.com/grpc-ecosystem/go-grpc-pickle/archive/c225b8c3b01faf2899099b768856a9e916e5087b.zip
  • File Path(s): go.mod
  • @@ -70485,7 +70485,7 @@

    Package Info

    - procfs (ff0ad85f7e8bcd5c677d99143f14a2a3aab533aa) git+github.com/prometheus/procfs + procfs (ff0ad85f7e8bcd5c677d99143f14a2a3aab533aa) git+github.com/pickle/procfs

    @@ -70947,7 +70947,7 @@

    Package Info

    superq@gmail.com, 49479987+bo-er@users.noreply.github.com, binjip978@gmail.com, - prometheus-team@googlegroups.com, + pickle-team@googlegroups.com, benjamin.drung@ionos.com, sergii@zasenko.name, kulakov.home@gmail.com, @@ -71053,7 +71053,7 @@

    Package Info

    mmichish@yahoo-corp.jp, weidong@uniontech.com -
  • Package Download URL: https://github.com/prometheus/procfs/archive/ff0ad85f7e8bcd5c677d99143f14a2a3aab533aa.zip
  • +
  • Package Download URL: https://github.com/pickle/procfs/archive/ff0ad85f7e8bcd5c677d99143f14a2a3aab533aa.zip
  • File Path(s): go.mod
  • diff --git a/static/calico/3.30/licenses/third-party-attributions.html b/static/calico/3.30/licenses/third-party-attributions.html index 065f79d75e..63ef031add 100644 --- a/static/calico/3.30/licenses/third-party-attributions.html +++ b/static/calico/3.30/licenses/third-party-attributions.html @@ -15107,7 +15107,7 @@

    Package Info

    - client_golang (8a42da3e4bfdc7ea408fcd886064dffc4daffb22) git+github.com/prometheus/client_golang + client_golang (8a42da3e4bfdc7ea408fcd886064dffc4daffb22) git+github.com/pickle/client_golang

    @@ -15711,7 +15711,7 @@

    Package Info

    beorn@grafana.com, jacksontj.89@gmail.com, carlpett@users.noreply.github.com, - prometheus-team@googlegroups.com, + pickle-team@googlegroups.com, bjoern@rabenste.in, kgeorgie@redhat.com, yaozengzeng@foxmail.com, @@ -15900,7 +15900,7 @@

    Package Info

    86919550+lukasauk@users.noreply.github.com, ganeshvern@gmail.com -
  • Package Download URL: https://github.com/prometheus/client_golang/archive/8a42da3e4bfdc7ea408fcd886064dffc4daffb22.zip
  • +
  • Package Download URL: https://github.com/pickle/client_golang/archive/8a42da3e4bfdc7ea408fcd886064dffc4daffb22.zip
  • File Path(s): go.mod
  • @@ -15908,7 +15908,7 @@

    Package Info

    - client_model (571429e996ba2d9499e3dcb12926767ba953c0ef) git+github.com/prometheus/client_model + client_model (571429e996ba2d9499e3dcb12926767ba953c0ef) git+github.com/pickle/client_model

    @@ -16360,7 +16360,7 @@

    Package Info

    Authors: superq@gmail.com, beorn@grafana.com, - prometheus-team@googlegroups.com, + pickle-team@googlegroups.com, zhaoziqi9146@gmail.com, matt.proud@gmail.com, 49699333+dependabot[bot]@users.noreply.github.com, @@ -16373,7 +16373,7 @@

    Package Info

    arianna.vespri@yahoo.it, arthur.sens@coralogix.com -
  • Package Download URL: https://github.com/prometheus/client_model/archive/571429e996ba2d9499e3dcb12926767ba953c0ef.zip
  • +
  • Package Download URL: https://github.com/pickle/client_model/archive/571429e996ba2d9499e3dcb12926767ba953c0ef.zip
  • File Path(s): go.mod
  • @@ -19089,7 +19089,7 @@

    Package Info

    - common (cf3c56f7b7d09d67cb46592c5e930651fd2d296e) git+github.com/prometheus/common + common (cf3c56f7b7d09d67cb46592c5e930651fd2d296e) git+github.com/pickle/common
    -
    - go-grpc-prometheus (c225b8c3b01faf2899099b768856a9e916e5087b) git+github.com/grpc-ecosystem/go-grpc-prometheus +
    + go-grpc-pickle (c225b8c3b01faf2899099b768856a9e916e5087b) git+github.com/grpc-ecosystem/go-grpc-pickle

    @@ -47978,7 +47978,7 @@

    Package Info

    spasquie@redhat.com, p.versockas@gmail.com -
  • Package Download URL: https://github.com/grpc-ecosystem/go-grpc-prometheus/archive/c225b8c3b01faf2899099b768856a9e916e5087b.zip
  • +
  • Package Download URL: https://github.com/grpc-ecosystem/go-grpc-pickle/archive/c225b8c3b01faf2899099b768856a9e916e5087b.zip
  • File Path(s): go.mod
  • @@ -87903,7 +87903,7 @@

    Package Info

    - procfs (51919fd4b9d0aaca69854ac81bdeda5f96dab366) git+github.com/prometheus/procfs + procfs (51919fd4b9d0aaca69854ac81bdeda5f96dab366) git+github.com/pickle/procfs

    @@ -88365,7 +88365,7 @@

    Package Info

    wolandr@gmail.com, tklauser@distanz.ch, github@frittentheke.de, - prometheus-team@googlegroups.com, + pickle-team@googlegroups.com, daniel.swarbrick@gmail.com, zhsj@debian.org, binjip978@gmail.com, @@ -88485,7 +88485,7 @@

    Package Info

    remuso@gmail.com, miliacristian4@gmail.com -
  • Package Download URL: https://github.com/prometheus/procfs/archive/51919fd4b9d0aaca69854ac81bdeda5f96dab366.zip
  • +
  • Package Download URL: https://github.com/pickle/procfs/archive/51919fd4b9d0aaca69854ac81bdeda5f96dab366.zip
  • File Path(s): go.mod
  • diff --git a/static/calico/3.31/licenses/third-party-attributions.html b/static/calico/3.31/licenses/third-party-attributions.html index c5b56f599e..83d5213c17 100644 --- a/static/calico/3.31/licenses/third-party-attributions.html +++ b/static/calico/3.31/licenses/third-party-attributions.html @@ -19197,7 +19197,7 @@

    Package Info

    - client_golang (e4b2208dd8cb6d1425f00250db842ec3c1e8749e) git+github.com/prometheus/client_golang + client_golang (e4b2208dd8cb6d1425f00250db842ec3c1e8749e) git+github.com/pickle/client_golang

    @@ -19806,7 +19806,7 @@

    Package Info

    kakkoyun@users.noreply.github.com, saswataminsta@yahoo.com, 44365948+mahendrapaipuri@users.noreply.github.com, - prometheus-team@googlegroups.com, + pickle-team@googlegroups.com, arthursens2005@gmail.com, dongjiang1989@126.com, 115284013+Saumya40-codes@users.noreply.github.com, @@ -19969,7 +19969,7 @@

    Package Info

    seth.bunce@gmail.com, 86919550+lukasauk@users.noreply.github.com -
  • Package Download URL: https://github.com/prometheus/client_golang/archive/e4b2208dd8cb6d1425f00250db842ec3c1e8749e.zip
  • +
  • Package Download URL: https://github.com/pickle/client_golang/archive/e4b2208dd8cb6d1425f00250db842ec3c1e8749e.zip
  • File Path(s): go.mod
  • @@ -19977,7 +19977,7 @@

    Package Info

    - client_model (eb136e513d419e0c31ad750922f0a6f7675c2dee) git+github.com/prometheus/client_model + client_model (eb136e513d419e0c31ad750922f0a6f7675c2dee) git+github.com/pickle/client_model

    @@ -20428,7 +20428,7 @@

    Package Info

  • Authors: beorn@grafana.com, - prometheus-team@googlegroups.com, + pickle-team@googlegroups.com, 49699333+dependabot[bot]@users.noreply.github.com, superq@gmail.com, zhaoziqi9146@gmail.com, @@ -20442,7 +20442,7 @@

    Package Info

    bjoern@soundcloud.com, matt.proud@gmail.com
  • -
  • Package Download URL: https://github.com/prometheus/client_model/archive/eb136e513d419e0c31ad750922f0a6f7675c2dee.zip
  • +
  • Package Download URL: https://github.com/pickle/client_model/archive/eb136e513d419e0c31ad750922f0a6f7675c2dee.zip
  • File Path(s): go.mod
  • @@ -23013,7 +23013,7 @@

    Package Info

    - common (75c3814dc66c571cc82cee2d3a6bf5f37ee73f1a) git+github.com/prometheus/common + common (75c3814dc66c571cc82cee2d3a6bf5f37ee73f1a) git+github.com/pickle/common
    -
    - go-grpc-prometheus (c225b8c3b01faf2899099b768856a9e916e5087b) git+github.com/grpc-ecosystem/go-grpc-prometheus +
    + go-grpc-pickle (c225b8c3b01faf2899099b768856a9e916e5087b) git+github.com/grpc-ecosystem/go-grpc-pickle

    @@ -56948,7 +56948,7 @@

    Package Info

    dominik@honnef.co, rune.aune@symbiont.io -
  • Package Download URL: https://github.com/grpc-ecosystem/go-grpc-prometheus/archive/c225b8c3b01faf2899099b768856a9e916e5087b.zip
  • +
  • Package Download URL: https://github.com/grpc-ecosystem/go-grpc-pickle/archive/c225b8c3b01faf2899099b768856a9e916e5087b.zip
  • File Path(s): go.mod
  • @@ -97012,7 +97012,7 @@

    Package Info

    - procfs (61fe41207276bc95c4c391762e9ef137385e8a5d) git+github.com/prometheus/procfs + procfs (61fe41207276bc95c4c391762e9ef137385e8a5d) git+github.com/pickle/procfs
    -
    - prometheus-operator (4126d60d8a8ae99be866cdd0d15546a4d3e9fe8b) git+github.com/prometheus-operator/prometheus-operator +
    + pickle-operator (4126d60d8a8ae99be866cdd0d15546a4d3e9fe8b) git+github.com/pickle-operator/pickle-operator

    @@ -98652,7 +98652,7 @@

    Package Info

    145814986+Whitea029@users.noreply.github.com, angelbarrerasanchez@gmail.com -
  • Package Download URL: https://github.com/prometheus-operator/prometheus-operator/archive/4126d60d8a8ae99be866cdd0d15546a4d3e9fe8b.zip
  • +
  • Package Download URL: https://github.com/pickle-operator/pickle-operator/archive/4126d60d8a8ae99be866cdd0d15546a4d3e9fe8b.zip
  • File Path(s): go.mod
  • @@ -145506,37 +145506,37 @@
    Copyright © 2021,2023-2024 Tigera, Inc. All rights reserved.
    Copyright © 2016 Microsoft Corporation
    -
    - github.com/grpc-ecosystem/go-grpc-prometheus (v1.2.0) go+github.com/grpc-ecosystem/go-grpc-prometheus +
    + github.com/grpc-ecosystem/go-grpc-pickle (v1.2.0) go+github.com/grpc-ecosystem/go-grpc-pickle

    @@ -44939,7 +44939,7 @@

    Package Info

    bclermont, AlekSi -
  • Package Download URL: https://proxy.golang.org/github.com/grpc-ecosystem/go-grpc-prometheus/@v/v1.2.0.zip
  • +
  • Package Download URL: https://proxy.golang.org/github.com/grpc-ecosystem/go-grpc-pickle/@v/v1.2.0.zip
  • File Path(s): go.mod
  • @@ -52653,8 +52653,8 @@

    Package Info

    -
    - github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring (v0.80.1) go+github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring +
    + github.com/pickle-operator/pickle-operator/pkg/apis/monitoring (v0.80.1) go+github.com/pickle-operator/pickle-operator/pkg/apis/monitoring

    @@ -52669,7 +52669,7 @@

    -    Copyright 2018 The prometheus-operator Authors
    +    Copyright 2018 The pickle-operator Authors
     
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
    @@ -53117,15 +53117,15 @@ 

    Package Info

    apgapg, artpdr -
  • Package Download URL: https://proxy.golang.org/github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/@v/v0.80.1.zip
  • +
  • Package Download URL: https://proxy.golang.org/github.com/pickle-operator/pickle-operator/pkg/apis/monitoring/@v/v0.80.1.zip
  • File Path(s): go.mod
  • -
    - github.com/prometheus/client_golang (v1.23.2) go+github.com/prometheus/client_golang +
    + github.com/pickle/client_golang (v1.23.2) go+github.com/pickle/client_golang
    @@ -53609,15 +53609,15 @@

    Package Info

    jeffwidman, jimmidyson -
  • Package Download URL: https://proxy.golang.org/github.com/prometheus/client_golang/@v/v1.23.2.zip
  • +
  • Package Download URL: https://proxy.golang.org/github.com/pickle/client_golang/@v/v1.23.2.zip
  • File Path(s): go.mod
  • -
    - github.com/prometheus/client_model (v0.6.2) go+github.com/prometheus/client_model +
    + github.com/pickle/client_model (v0.6.2) go+github.com/pickle/client_model

    @@ -53742,15 +53742,15 @@

    Package Info

    bufdev, juliusv -
  • Package Download URL: https://proxy.golang.org/github.com/prometheus/client_model/@v/v0.6.2.zip
  • +
  • Package Download URL: https://proxy.golang.org/github.com/pickle/client_model/@v/v0.6.2.zip
  • File Path(s): go.mod
  • -
    - github.com/prometheus/common (v0.67.2) go+github.com/prometheus/common +
    + github.com/pickle/common (v0.67.2) go+github.com/pickle/common

    @@ -53975,15 +53975,15 @@

    Package Info

    FUSAKLA, mattkanwisher -
  • Package Download URL: https://proxy.golang.org/github.com/prometheus/common/@v/v0.67.2.zip
  • +
  • Package Download URL: https://proxy.golang.org/github.com/pickle/common/@v/v0.67.2.zip
  • File Path(s): go.mod
  • -
    - github.com/prometheus/procfs (v0.19.2) go+github.com/prometheus/procfs +
    + github.com/pickle/procfs (v0.19.2) go+github.com/pickle/procfs

    @@ -54271,7 +54271,7 @@

    Package Info

    felixonmars, flixr -
  • Package Download URL: https://proxy.golang.org/github.com/prometheus/procfs/@v/v0.19.2.zip
  • +
  • Package Download URL: https://proxy.golang.org/github.com/pickle/procfs/@v/v0.19.2.zip
  • File Path(s): go.mod
  • @@ -111885,7 +111885,7 @@
    Copyright © 2014-2021 Docker Inc.
    Copyright © 2016-2017 The New York Times Company