From cf7e6af2cbbb1471d15d66402ea55c2fb2290e3e Mon Sep 17 00:00:00 2001 From: Jake Hutchinson Date: Fri, 16 Feb 2024 09:46:11 +0000 Subject: [PATCH] Various capacity fixes --- doc/source/configuration/monitoring.rst | 4 ++-- etc/kayobe/ansible/templates/os_capacity-clouds.yml.j2 | 4 ++-- etc/kayobe/stackhpc-monitoring.yml | 6 ++++++ 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/doc/source/configuration/monitoring.rst b/doc/source/configuration/monitoring.rst index 312fa8436..db449a139 100644 --- a/doc/source/configuration/monitoring.rst +++ b/doc/source/configuration/monitoring.rst @@ -175,14 +175,14 @@ via Kayobe. .. code-block:: console - kayobe playbook run ansible/deploy-os-capacity-exporter.yml + kayobe playbook run $KAYOBE_CONFIG_PATH/ansible/deploy-os-capacity-exporter.yml It is required that you re-configure the Prometheus, Grafana and HAProxy services following deployment, to do this run the following Kayobe command. .. code-block:: console - kayobe overcloud service reconfigure -kt grafana,prometheus,haproxy + kayobe overcloud service reconfigure -kt grafana,prometheus,loadbalancer If you notice ``HaproxyServerDown`` or ``HaproxyBackendDown`` prometheus alerts after deployment it's likely the os_exporter secrets have not been diff --git a/etc/kayobe/ansible/templates/os_capacity-clouds.yml.j2 b/etc/kayobe/ansible/templates/os_capacity-clouds.yml.j2 index 876d40c5e..f3c3d75b9 100644 --- a/etc/kayobe/ansible/templates/os_capacity-clouds.yml.j2 +++ b/etc/kayobe/ansible/templates/os_capacity-clouds.yml.j2 @@ -1,10 +1,10 @@ clouds: openstack: auth: - auth_url: "{{ secrets_os_capacity_auth_url }}" + auth_url: "{{ stackhpc_os_capacity_auth_url }}" application_credential_id: "{{ secrets_os_capacity_credential_id }}" application_credential_secret: "{{ secrets_os_capacity_credential_secret }}" - region_name: "RegionOne" + region_name: "{{ openstack_region_name }}" interface: "internal" identity_api_version: 3 auth_type: "v3applicationcredential" diff --git a/etc/kayobe/stackhpc-monitoring.yml b/etc/kayobe/stackhpc-monitoring.yml index 79421b1b5..6db1391eb 100644 --- a/etc/kayobe/stackhpc-monitoring.yml +++ b/etc/kayobe/stackhpc-monitoring.yml @@ -16,6 +16,12 @@ alertmanager_low_memory_threshold_gib: 5 # targets being templated during deployment. stackhpc_enable_os_capacity: false +# Keystone authentication URL for OpenStack Capacity +stackhpc_os_capacity_auth_url: "{{ public_openrc_auth_url }}" + +# OpenStack region for OpenStack Capacity +stackhpc_os_capacity_openstack_region_name: "{{ openstack_region_name | default(RegionOne) }}" + # Whether TLS certificate verification is enabled for the OpenStack Capacity # exporter during Keystone authentication. stackhpc_os_capacity_openstack_verify: true