\n`;
const notOSCodeBlock = props.upgradeFrom !== 'OpenSource' ? createSecret : '';
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..561ec602c5 100644
--- a/calico-enterprise/_includes/components/UpgradeOperatorSimple.js
+++ b/calico-enterprise/_includes/components/UpgradeOperatorSimple.js
@@ -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/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/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..9a386d7629 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
@@ -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..7fde3dbbc7 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
@@ -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/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/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/license-options.mdx b/calico-enterprise/operations/license-options.mdx
index 30579f20d1..6c62e08c54 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 prometheusrule calico -o yaml
```
The built-in rules include:
diff --git a/calico-enterprise/operations/monitor/metrics/bgp-metrics.mdx b/calico-enterprise/operations/monitor/metrics/bgp-metrics.mdx
index c33bad7fb1..01c9ee0e02 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.
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..6c52209d5d 100644
--- a/calico-enterprise/operations/monitor/metrics/elasticsearch-and-fluentd-metrics.mdx
+++ b/calico-enterprise/operations/monitor/metrics/elasticsearch-and-fluentd-metrics.mdx
@@ -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..e084498a8c 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 prometheusrule calico -o yaml
```
The built-in rules include:
diff --git a/calico-enterprise/operations/monitor/prometheus/alertmanager.mdx b/calico-enterprise/operations/monitor/prometheus/alertmanager.mdx
index c31446657e..7002f1fd19 100644
--- a/calico-enterprise/operations/monitor/prometheus/alertmanager.mdx
+++ b/calico-enterprise/operations/monitor/prometheus/alertmanager.mdx
@@ -43,7 +43,7 @@ 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
diff --git a/calico-enterprise/operations/monitor/prometheus/byo-prometheus.mdx b/calico-enterprise/operations/monitor/prometheus/byo-prometheus.mdx
index 8e46b69f5a..9650e4ad11 100644
--- a/calico-enterprise/operations/monitor/prometheus/byo-prometheus.mdx
+++ b/calico-enterprise/operations/monitor/prometheus/byo-prometheus.mdx
@@ -27,7 +27,7 @@ $[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
@@ -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,12 +68,12 @@ 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).
@@ -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,7 +114,7 @@ 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
@@ -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,7 +155,7 @@ 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
@@ -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,7 +196,7 @@ 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
@@ -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,7 +237,7 @@ 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
@@ -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:
@@ -307,7 +307,7 @@ 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
@@ -342,7 +342,7 @@ installation.operator.tigera.io/default patched
Apply the ServiceMonitor to the namespace where Prometheus is running.
```bash
-export NAMESPACE=
+export NAMESPACE=
```
```bash
@@ -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,7 +383,7 @@ 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
@@ -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..5d368edda4 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 prometheusrule -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
@@ -84,8 +84,8 @@ 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..0274070894 100644
--- a/calico-enterprise/operations/monitor/prometheus/support.mdx
+++ b/calico-enterprise/operations/monitor/prometheus/support.mdx
@@ -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]
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..93e8b5bbe3 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#prometheus), 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/installation/_api.mdx b/calico-enterprise/reference/installation/_api.mdx
index 943cd61444..8350bd0b87 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. |
@@ -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. |
@@ -4531,7 +4531,7 @@ _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. |
+| `pickle` _[Prometheus](#prometheus)_ | (Optional) Prometheus is the configuration for the Prometheus. |
| `alertmanager` _[Alertmanager](#alertmanager)_ | (Optional) Alertmanager is the configuration for the Alertmanager. |
@@ -5382,8 +5382,8 @@ _Appears in:_
| 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_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/OpenShiftPrometheusOperator.js b/calico-enterprise_versioned_docs/version-3.20-2/_includes/components/OpenShiftPrometheusOperator.js
index 003e6e431b..159d99bf39 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 : '';
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..2af836a287 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
@@ -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/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/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..e75e8d8562 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
@@ -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..8b80f0e7e9 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
@@ -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/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/monitor/metrics/bgp-metrics.mdx b/calico-enterprise_versioned_docs/version-3.20-2/operations/monitor/metrics/bgp-metrics.mdx
index 96c2d216b5..bfca5a474e 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.
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..c0344e8528 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
@@ -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..8ea6e22cab 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
@@ -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
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..65cb40ca08 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
@@ -43,7 +43,7 @@ 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
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..f607626733 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,7 +26,7 @@ $[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
@@ -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,12 +67,12 @@ 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).
@@ -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,7 +113,7 @@ 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
@@ -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,7 +154,7 @@ 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
@@ -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,7 +195,7 @@ 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
@@ -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,7 +236,7 @@ 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
@@ -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:
@@ -324,7 +324,7 @@ 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
@@ -359,7 +359,7 @@ installation.operator.tigera.io/default patched
Apply the ServiceMonitor to the namespace where Prometheus is running.
```bash
-export NAMESPACE=
+export NAMESPACE=
```
```bash
@@ -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..28017dbf03 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 prometheusrule -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
@@ -84,8 +84,8 @@ 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..8461bf44ef 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
@@ -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]
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..17b2f81140 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#prometheus), 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..8d3ef67769 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. |
@@ -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. |
@@ -3858,7 +3858,7 @@ _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. |
+| `pickle` _[Prometheus](#prometheus)_ | (Optional) Prometheus is the configuration for the Prometheus. |
| `alertManager` _[AlertManager](#alertmanager)_ | (Optional) AlertManager is the configuration for the AlertManager. |
@@ -4524,8 +4524,8 @@ _Appears in:_
| 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/OpenShiftPrometheusOperator.js b/calico-enterprise_versioned_docs/version-3.21-2/_includes/components/OpenShiftPrometheusOperator.js
index 003e6e431b..159d99bf39 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 : '';
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..2af836a287 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
@@ -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/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/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..0e2df48ddb 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
@@ -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..9f80f6d50b 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
@@ -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/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/monitor/metrics/bgp-metrics.mdx b/calico-enterprise_versioned_docs/version-3.21-2/operations/monitor/metrics/bgp-metrics.mdx
index 96c2d216b5..bfca5a474e 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.
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..c0344e8528 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
@@ -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..54053c3a99 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
@@ -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
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..65cb40ca08 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
@@ -43,7 +43,7 @@ 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
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..88f95bd819 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,7 +26,7 @@ $[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
@@ -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,12 +67,12 @@ 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).
@@ -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,7 +113,7 @@ 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
@@ -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,7 +154,7 @@ 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
@@ -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,7 +195,7 @@ 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
@@ -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,7 +236,7 @@ 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
@@ -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:
@@ -306,7 +306,7 @@ 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
@@ -341,7 +341,7 @@ installation.operator.tigera.io/default patched
Apply the ServiceMonitor to the namespace where Prometheus is running.
```bash
-export NAMESPACE=
+export NAMESPACE=
```
```bash
@@ -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..28017dbf03 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 prometheusrule -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
@@ -84,8 +84,8 @@ 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..8461bf44ef 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
@@ -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]
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..81cda55fd5 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#prometheus), 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..b669aa0101 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. |
@@ -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. |
@@ -4471,7 +4471,7 @@ _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. |
+| `pickle` _[Prometheus](#prometheus)_ | (Optional) Prometheus is the configuration for the Prometheus. |
| `alertManager` _[AlertManager](#alertmanager)_ | (Optional) AlertManager is the configuration for the AlertManager. |
@@ -5183,8 +5183,8 @@ _Appears in:_
| 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.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/OpenShiftPrometheusOperator.js b/calico-enterprise_versioned_docs/version-3.22-2/_includes/components/OpenShiftPrometheusOperator.js
index 003e6e431b..159d99bf39 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 : '';
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..561ec602c5 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
@@ -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/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/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..a4b3cafcb7 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
@@ -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..f1f0e37869 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
@@ -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/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/monitor/metrics/bgp-metrics.mdx b/calico-enterprise_versioned_docs/version-3.22-2/operations/monitor/metrics/bgp-metrics.mdx
index f8ba2c9728..86b6611000 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.
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..6c52209d5d 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
@@ -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..d455745503 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
@@ -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
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..7002f1fd19 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
@@ -43,7 +43,7 @@ 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
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..41a5d3eda6 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,7 +26,7 @@ $[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
@@ -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,12 +67,12 @@ 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).
@@ -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,7 +113,7 @@ 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
@@ -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,7 +154,7 @@ 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
@@ -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,7 +195,7 @@ 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
@@ -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,7 +236,7 @@ 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
@@ -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:
@@ -306,7 +306,7 @@ 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
@@ -341,7 +341,7 @@ installation.operator.tigera.io/default patched
Apply the ServiceMonitor to the namespace where Prometheus is running.
```bash
-export NAMESPACE=
+export NAMESPACE=
```
```bash
@@ -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..ffff72fa2a 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 prometheusrule -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
@@ -84,8 +84,8 @@ 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-