Merge branch '20482-installer-improvements'. Closes #20482

[arvados.git] / tools / salt-install / config_examples / multi_host / aws / pillars / prometheus_server.sls

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 3988f3c126f3e81e6c6906e5be09e243483f29e1..bbf997b7be364700372d55b308ad527b7a7a9aae 100644 (file)
--- 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
@@ -32,11 +32,27 @@ prometheus:
                   cluster: __CLUSTER__
 
             ## Arvados unique jobs
+            - job_name: arvados_ws
+              bearer_token: __MANAGEMENT_TOKEN__
+              scheme: https
+              static_configs:
+                - targets: ['ws.__DOMAIN__:443']
+                  labels:
+                    instance: ws.__CLUSTER__
+                    cluster: __CLUSTER__
+            - job_name: arvados_controller
+              bearer_token: __MANAGEMENT_TOKEN__
+              scheme: https
+              static_configs:
+                - targets: ['__DOMAIN__:443']
+                  labels:
+                    instance: controller.__CLUSTER__
+                    cluster: __CLUSTER__
             - job_name: keep_web
               bearer_token: __MANAGEMENT_TOKEN__
               scheme: https
               static_configs:
-                - targets: ['keep.__CLUSTER__.__DOMAIN__:443']
+                - targets: ['keep.__DOMAIN__:443']
                   labels:
                     instance: keep-web.__CLUSTER__
                     cluster: __CLUSTER__
@@ -54,10 +70,6 @@ prometheus:
                   labels:
                     instance: keep0.__CLUSTER__
                     cluster: __CLUSTER__
-                - targets: ['__KEEPSTORE1_INT_IP__:25107']
-                  labels:
-                    instance: keep1.__CLUSTER__
-                    cluster: __CLUSTER__
             - job_name: arvados_dispatch_cloud
               bearer_token: __MANAGEMENT_TOKEN__
               static_configs:
@@ -83,12 +95,10 @@ prometheus:
                 {% for node in [
                   'controller',
                   'keep0',
-                  'keep1',
-                  'keep',
                   'workbench',
                   'shell',
                 ] %}
-                - targets: [ "{{ node }}.__CLUSTER__.__DOMAIN__:9100" ]
+                - targets: [ "{{ node }}.__DOMAIN__:9100" ]
                   labels:
                     instance: "{{ node }}.__CLUSTER__"
                     cluster: __CLUSTER__