Skip to content

Commit b5f64ed

Browse files
authored
Merge branch 'master' into rob-2395_improved_secret_docs_for_sinks
2 parents a83367f + f7a22f7 commit b5f64ed

File tree

7 files changed

+486
-77
lines changed

7 files changed

+486
-77
lines changed

docs/configuration/metric-providers-external.rst

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,17 @@ Authentication
5555
prometheus_auth: "Bearer YOUR_TOKEN_HERE"
5656
alertmanager_auth: "Bearer YOUR_TOKEN_HERE"
5757
58+
On some clusters, the pod service account token is used for Prometheus/Alertmanager authentication.
59+
To use this token add the following env var to the ``runner``:
60+
61+
.. code-block:: yaml
62+
63+
runner:
64+
additional_env_vars:
65+
- name: PROMETHEUS_CLUSTER_TOKEN_AUTH
66+
value: "true"
67+
68+
5869
**Basic Authentication**:
5970

6071
.. code-block:: yaml

docs/configuration/metric-providers-in-cluster.rst

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,16 @@ If Prometheus and/or AlertManager require authentication, add the following:
9292
9393
These settings may be configured independently.
9494

95+
On some clusters, the pod service account token is used for Prometheus/Alertmanager authentication.
96+
To use this token add the following env var to the ``runner``:
97+
98+
.. code-block:: yaml
99+
100+
runner:
101+
additional_env_vars:
102+
- name: PROMETHEUS_CLUSTER_TOKEN_AUTH
103+
value: "true"
104+
95105
SSL Verification
96106
^^^^^^^^^^^^^^^^
97107

src/robusta/core/model/env_vars.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,11 +109,13 @@ def load_bool(env_var, default: bool):
109109
IMAGE_REGISTRY = os.environ.get("IMAGE_REGISTRY", "robustadev")
110110

111111
FIO_IMAGE = os.environ.get("FIO_IMAGE", "robusta-fio-benchmark:1.0")
112-
DISK_TOOLS_IMAGE = os.environ.get("DISK_TOOLS_IMAGE", "disk-tools:1.7")
112+
DISK_TOOLS_IMAGE = os.environ.get("DISK_TOOLS_IMAGE", "disk-tools:1.8")
113113

114114
CLUSTER_DOMAIN = os.environ.get("CLUSTER_DOMAIN", "cluster.local")
115115

116116
IS_OPENSHIFT = load_bool("IS_OPENSHIFT", False)
117+
PROMETHEUS_CLUSTER_TOKEN_AUTH = load_bool("PROMETHEUS_CLUSTER_TOKEN_AUTH", False)
118+
117119
OPENSHIFT_GROUPS = load_bool("OPENSHIFT_GROUPS", False)
118120

119121
ENABLE_GRAPH_BLOCK = load_bool("ENABLE_GRAPH_BLOCK", True)

0 commit comments

Comments
 (0)