16379: Updates for grafana install

Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz@curii.com>

diff --git a/doc/install/salt-multi-host.html.textile.liquid b/doc/install/salt-multi-host.html.textile.liquid
index 1740c24affd3ff82c6090461ba8d196026b925ee..2a8708fd7f850efed732f59446c52a7aab8622ad 100644 (file)
--- a/doc/install/salt-multi-host.html.textile.liquid
+++ b/doc/install/salt-multi-host.html.textile.liquid
@@ -460,7 +460,15 @@ You can monitor the health and performance of the system using the admin dashboa
 
 https://grafana.@${CLUSTER}.${DOMAIN}@
 
-Use the username and password you gave in @local.conf@ to log in.
+To log in, use username "admin" and @${INITIAL_USER_PASSWORD}@ from @local.conf@.
+
+Once logged in, you will want to add the dashboards to the front page.
+
+# On the left icon bar, click on "Browse"
+# If the check box next to "Starred" is selected, click on it to de-select it
+# You should see a folder with "Arvados cluster overview", "Node exporter" and "Postgres exporter"
+# You can visit each dashboard and click on the star next to the title to "Mark as favorite"
+# They should now be linked on the front page.
 
 h2(#post_install). After the installation
 

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..1cdff39a62b5ac364050b4746bc2ebfca242a32b 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,6 +4,17 @@
 # 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__
@@ -17,4 +28,3 @@ grafana:
       http_port: 3000
       domain: grafana.__CLUSTER__.__DOMAIN__
       root_url: https://grafana.__CLUSTER__.__DOMAIN__
-

diff --git a/tools/salt-install/local.params.example.multiple_hosts b/tools/salt-install/local.params.example.multiple_hosts
index 20a04872cf1546622e0457217ad0511d4a7f6265..ef682c3193f0bfb06e912e44e3a3ab698554a694 100644 (file)
--- a/tools/salt-install/local.params.example.multiple_hosts
+++ b/tools/salt-install/local.params.example.multiple_hosts
@@ -133,6 +133,7 @@ MONITORING_EMAIL=${INITIAL_USER_EMAIL}
 # The directory to check for the config files (pillars, states) you want to use.
 # There are a few examples under 'config_examples'.
 # CONFIG_DIR="local_config_dir"
+
 # Extra states to apply. If you use your own subdir, change this value accordingly
 # EXTRA_STATES_DIR="${CONFIG_DIR}/states"
 

diff --git a/tools/salt-install/local.params.example.single_host_multiple_hostnames b/tools/salt-install/local.params.example.single_host_multiple_hostnames
index 56ecf9f92e19b05a0b155fa9a35ef5fbaa90202f..b94d687e4b529a828f8e93b26ebd1b751b0eac51 100644 (file)
--- a/tools/salt-install/local.params.example.single_host_multiple_hostnames
+++ b/tools/salt-install/local.params.example.single_host_multiple_hostnames
@@ -63,6 +63,13 @@ SSL_MODE="self-signed"
 SSL_KEY_ENCRYPTED="no"
 SSL_KEY_AWS_SECRET_NAME="${CLUSTER}-arvados-ssl-privkey-password"
 
+# Customize Prometheus & Grafana web UI access credentials
+MONITORING_USERNAME=${INITIAL_USER}
+MONITORING_PASSWORD=${INITIAL_USER_PASSWORD}
+MONITORING_EMAIL=${INITIAL_USER_EMAIL}
+# Sets the directory for Grafana dashboards
+# GRAFANA_DASHBOARDS_DIR="${SCRIPT_DIR}/local_config_dir/dashboards"
+
 # The directory to check for the config files (pillars, states) you want to use.
 # There are a few examples under 'config_examples'.
 # CONFIG_DIR="local_config_dir"

diff --git a/tools/salt-install/local.params.example.single_host_single_hostname b/tools/salt-install/local.params.example.single_host_single_hostname
index 54a78b619985eaefb86533ee43197f01ee318814..42c1ebb72b65cec0d6e7abbdcf866e6b0e4f8e29 100644 (file)
--- a/tools/salt-install/local.params.example.single_host_single_hostname
+++ b/tools/salt-install/local.params.example.single_host_single_hostname
@@ -73,6 +73,13 @@ SSL_MODE="self-signed"
 SSL_KEY_ENCRYPTED="no"
 SSL_KEY_AWS_SECRET_NAME="${CLUSTER}-arvados-ssl-privkey-password"
 
+# Customize Prometheus & Grafana web UI access credentials
+MONITORING_USERNAME=${INITIAL_USER}
+MONITORING_PASSWORD=${INITIAL_USER_PASSWORD}
+MONITORING_EMAIL=${INITIAL_USER_EMAIL}
+# Sets the directory for Grafana dashboards
+# GRAFANA_DASHBOARDS_DIR="${SCRIPT_DIR}/local_config_dir/dashboards"
+
 # The directory to check for the config files (pillars, states) you want to use.
 # There are a few examples under 'config_examples'.
 # CONFIG_DIR="local_config_dir"