Conditional removal and docs update

Author: assumptionsandg

doc/source/configuration/monitoring.rst

@@ -145,37 +145,28 @@ in your cloud. StackHPC Kayobe Config includes a playbook for manual
 deployment, and it's necessary that some variables are set before
 running this playbook.
 
-To successfully deploy OpenStack Capacity, you are required to specify
-the OpenStack application credentials in ``kayobe/secrets.yml`` as:
+OpenStack Capacity is deployed automatically using a service deploy hook
+with the generated kolla-ansible admin credentials, you can override these
+by setting the authentication url, username, password, project name and 
+project domain name in ``kayobe/stackhpc-monitoring.yml``:
 
 .. code-block:: yaml
 
-    secrets_os_capacity_auth_url: <some_auth_url>
-    secrets_os_capacity_credential_id: <some_credential_id>
-    secrets_os_capacity_credential_secret: <some_credential_secret>
+    os_capacity_auth_url: <keystone_auth_url>
+    os_capacity_username: <openstack_username>
+    os_capacity_password: <openstack_password_encrypted_with_vault>
+    os_capacity_project_name: <openstack_project_name>
+    os_capacity_domain_name: <openstack_project_domain_name>
 
-Additionally, you are required to enable a conditional flag to allow
-HAProxy configuration to be templated to controllers during deployment.
-
-.. code-block:: yaml
-
-    stackhpc_enable_os_capacity: true
-
-After defining your credentials, You may deploy OpenStack Capacity
+Additionally, you should ensure these credentials have the correct permissions
+for the exporter. After defining your credentials, You may redeploy OpenStack Capacity
 using the ``ansible/deploy-os-capacity-exporter.yml`` Ansible playbook
 via Kayobe.
 
 .. code-block:: console
 
     kayobe playbook run 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
-
 If you notice ``HaproxyServerDown`` or ``HaproxyBackendDown`` prometheus
 alerts after deployment it's likely the os_exporter secrets have not been
 set correctly, double check you have entered the correct authentication

etc/kayobe/kolla/config/haproxy/services.d/os_capacity.cfg

@@ -1,4 +1,3 @@
-{% if stackhpc_enable_os_capacity | bool %}
 {% raw %}
 frontend os_capacity_frontend
     mode http
@@ -22,4 +21,3 @@ backend os_capacity_backend
     server {{ host_name }} {{ host_ip }}:9000 check inter 2000 rise 2 fall 5
 {% endfor %}
 {% endraw %}
-{% endif %}

etc/kayobe/kolla/config/prometheus/prometheus.yml.d/70-oscapacity.yml

@@ -1,4 +1,3 @@
-{% if stackhpc_enable_os_capacity | bool %}
 {% raw %}
 scrape_configs:
   - job_name: os-capacity
@@ -11,4 +10,3 @@ scrape_configs:
     scheme: https
 {% endif %}
 {% endraw %}
-{% endif %}

etc/kayobe/stackhpc-monitoring.yml

@@ -9,12 +9,3 @@
 alertmanager_low_memory_threshold_gib: 5
 
 ###############################################################################
-
-# Exporter configuration
-
-# Whether the OpenStack Capacity exporter is enabled.
-# Enabling this flag will result in HAProxy configuration and Prometheus scrape
-# targets being templated during deployment.
-stackhpc_enable_os_capacity: false
-
-###############################################################################