21316: Merge commit '1416f698b72de4b09350d9c2fb25c1405c3247bc' into 21316-left-panel...

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

diff --git a/tools/salt-install/config_examples/multi_host/aws/pillars/grafana.sls b/tools/salt-install/config_examples/multi_host/aws/pillars/grafana.sls
index 1869dbdc21ac3bbc2e575a22119e19b15fe93870..b46615609777cebe6c92dd81a4a6ae29d98fdc3e 100644 (file)
--- a/tools/salt-install/config_examples/multi_host/aws/pillars/grafana.sls
+++ b/tools/salt-install/config_examples/multi_host/aws/pillars/grafana.sls
@@ -4,9 +4,20 @@
 # SPDX-License-Identifier: AGPL-3.0
 
 grafana:
+  pkg:
+    name: grafana
+    use_upstream_archive: false
+    use_upstream_repo: true
+    repo:
+      humanname: grafana_official
+      name: deb https://apt.grafana.com/ stable main
+      file: /etc/apt/sources.list.d/grafana.list
+      key_url: https://apt.grafana.com/gpg.key
+      require_in:
+        - pkg: grafana
   config:
     default:
-      instance_name: __CLUSTER__.__DOMAIN__
+      instance_name: __DOMAIN__
     security:
       admin_user: {{ "__MONITORING_USERNAME__" | yaml_dquote }}
       admin_password: {{ "__MONITORING_PASSWORD__" | yaml_dquote }}
@@ -15,6 +26,5 @@ grafana:
       protocol: http
       http_addr: 127.0.0.1
       http_port: 3000
-      domain: grafana.__CLUSTER__.__DOMAIN__
-      root_url: https://grafana.__CLUSTER__.__DOMAIN__
-
+      domain: grafana.__DOMAIN__
+      root_url: https://grafana.__DOMAIN__