From a263abb4c84bf639b5169749a992454d0948d3d3 Mon Sep 17 00:00:00 2001 From: Peter Amstutz Date: Tue, 28 Mar 2023 18:07:43 -0400 Subject: [PATCH] 16379: Add prometheus and grafana to workbench aliases Arvados-DCO-1.1-Signed-off-by: Peter Amstutz --- doc/install/salt-multi-host.html.textile.liquid | 10 ++++++++++ tools/salt-install/terraform/aws/vpc/locals.tf | 3 +-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/doc/install/salt-multi-host.html.textile.liquid b/doc/install/salt-multi-host.html.textile.liquid index ed6a20197d..1740c24aff 100644 --- a/doc/install/salt-multi-host.html.textile.liquid +++ b/doc/install/salt-multi-host.html.textile.liquid @@ -29,6 +29,7 @@ SPDX-License-Identifier: CC-BY-SA-3.0 ## "Iterating on config changes":#iterating ## "Common problems and solutions":#common-problems # "Initial user and login":#initial_user +# "Monitoring and Metrics":#monitoring # "After the installation":#post_install h2(#introduction). Introduction @@ -62,6 +63,7 @@ In the default configuration these are: # @workbench2.${CLUSTER}.${DOMAIN}@ # @webshell.${CLUSTER}.${DOMAIN}@ # @shell.${CLUSTER}.${DOMAIN}@ +# @monitoring.${CLUSTER}.${DOMAIN}@ For more information, see "DNS entries and TLS certificates":install-manual-prerequisites.html#dnstls. @@ -452,6 +454,14 @@ If you did *not* "configure a different authentication provider":#authentication If you *did* configure a different authentication provider, the first user to log in will automatically be given Arvados admin privileges. +h2(#monitoring). Monitoring and Metrics + +You can monitor the health and performance of the system using the admin dashboard: + +https://grafana.@${CLUSTER}.${DOMAIN}@ + +Use the username and password you gave in @local.conf@ to log in. + h2(#post_install). After the installation As part of the operation of @installer.sh@, it automatically creates a @git@ repository with your configuration templates. You should retain this repository but *be aware that it contains sensitive information* (passwords and tokens used by the Arvados services as well as cloud credentials if you used Terraform to create the infrastructure). diff --git a/tools/salt-install/terraform/aws/vpc/locals.tf b/tools/salt-install/terraform/aws/vpc/locals.tf index 289eb3e04a..00e9d9494c 100644 --- a/tools/salt-install/terraform/aws/vpc/locals.tf +++ b/tools/salt-install/terraform/aws/vpc/locals.tf @@ -21,7 +21,7 @@ locals { } aliases = { controller: ["ws"] - workbench: ["workbench2", "webshell", "keep", "download", "*.collections"] + workbench: ["workbench2", "webshell", "keep", "download", "prometheus", "grafana", "*.collections"] } cname_by_host = flatten([ for host, aliases in local.aliases : [ @@ -32,4 +32,3 @@ locals { ] ]) } - -- 2.30.2