From 3664b849b6f4f12a11f7ea9509b28c0a9a74fac1 Mon Sep 17 00:00:00 2001 From: Lucas Di Pentima Date: Wed, 26 Jul 2023 19:43:57 -0300 Subject: [PATCH] 20610: Fixes prometheus configuration to track the controller nodes. Also, fixes a-d-c config, as it was also assumed to be on the controller node. Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima --- .../aws/pillars/prometheus_server.sls | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/tools/salt-install/config_examples/multi_host/aws/pillars/prometheus_server.sls b/tools/salt-install/config_examples/multi_host/aws/pillars/prometheus_server.sls index e64694f4f4..6dc90c840b 100644 --- a/tools/salt-install/config_examples/multi_host/aws/pillars/prometheus_server.sls +++ b/tools/salt-install/config_examples/multi_host/aws/pillars/prometheus_server.sls @@ -3,6 +3,9 @@ # # SPDX-License-Identifier: AGPL-3.0 +{%- set controller_nodes = "__CONTROLLER_NODES__".split(',') %} +{%- set enable_balancer = ("__ENABLE_BALANCER__"|to_bool) %} + ### PROMETHEUS prometheus: wanted: @@ -42,12 +45,25 @@ prometheus: cluster: __CLUSTER__ - job_name: arvados_controller bearer_token: __MANAGEMENT_TOKEN__ + {%- if enable_balancer %} + scheme: http + {%- else %} scheme: https + {%- endif %} static_configs: + {%- if enable_balancer %} + {%- for controller in controller_nodes %} + - targets: ['{{ controller }}'] + labels: + instance: {{ controller.split('.')[0] }}.__CLUSTER__ + cluster: __CLUSTER__ + {%- endfor %} + {%- else %} - targets: ['__DOMAIN__:443'] labels: instance: controller.__CLUSTER__ cluster: __CLUSTER__ + {%- endif %} - job_name: keep_web bearer_token: __MANAGEMENT_TOKEN__ scheme: https @@ -73,7 +89,7 @@ prometheus: - job_name: arvados_dispatch_cloud bearer_token: __MANAGEMENT_TOKEN__ static_configs: - - targets: ['__CONTROLLER_INT_IP__:9006'] + - targets: ['__DISPATCHER_INT_IP__:9006'] labels: instance: arvados-dispatch-cloud.__CLUSTER__ cluster: __CLUSTER__ -- 2.30.2