Various os_capacity fixes

Author: assumptionsandg

.yamllint

@@ -20,3 +20,4 @@ ignore: |
   .github/
   .gitlab/
   .gitlab-ci.yml
+  *etc/kayobe/kolla/config/prometheus/prometheus.yml.d/70-oscapacity.yml

doc/source/configuration/monitoring.rst

@@ -141,17 +141,25 @@ OpenStack Capacity
 ==================
 
 OpenStack Capacity allows you to see how much space you have avaliable
-in your cloud. StackHPC Kayobe Config includes this exporter by default
-and it's necessary that some variables are set to allow deployment.
+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:
 
 .. code-block:: yaml
 
-    secrets_os_exporter_auth_url: <some_auth_url>
-    secrets_os_exporter_credential_id: <some_credential_id>
-    secrets_os_exporter_credential_secret: <some_credential_secret>
+    secrets_os_capacity_auth_url: <some_auth_url>
+    secrets_os_capacity_credential_id: <some_credential_id>
+    secrets_os_capacity_credential_secret: <some_credential_secret>
+
+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
 using the ``ansible/deploy-os-capacity-exporter.yml`` Ansible playbook

etc/kayobe/ansible/deploy-os-capacity-exporter.yml

@@ -4,22 +4,36 @@
 
   tasks:
     - name: Create os-capacity directory
-      ansible.builtin.file:
+      file:
         path: /opt/kayobe/os-capacity/
         state: directory
 
-    - name: Template clouds.yml
-      ansible.builtin.template:
-        src: templates/os_capacity-clouds.yml.j2
-        dest: /opt/kayobe/os-capacity/clouds.yaml
+    - name: Create env-file
+      file:
+        path: /opt/kayobe/os-capacity/env-file
+        state: touch
+
+    - name: Read admin-openrc file
+      shell:
+        cmd: "cat $KOLLA_CONFIG_PATH/admin-openrc.sh | awk '{print $2}' | tail -n +5"
+      register: credentials
+
+    - name: Write environment variables to env-file
+      copy:
+        content: "{{ credentials.stdout_lines }}"
+        dest: /opt/kayobe/os-capacity/env-file
+
+    - name: Set TLS verification to false.
+      lineinfile:
+        path: /opt/kayobe/os-capacity/env-file
+        line: "OS_INSECURE=1"
+      when: kolla_enable_tls_internal | bool
 
     - name: Ensure os_capacity container is running
       docker_container:
         name: os_capacity
         image: ghcr.io/stackhpc/os-capacity:master
-        env:
-          OS_CLOUD: openstack
-          OS_CLIENT_CONFIG_FILE: /etc/openstack/clouds.yaml
+        env-file: /opt/kayobe/os-capacity/env-file
         mounts:
           - type: bind
             source: /opt/kayobe/os-capacity/

etc/kayobe/ansible/templates/os_capacity-clouds.yml.j2

@@ -1,10 +1,13 @@
 clouds:
   openstack:
     auth:
-      auth_url: "{{ secrets_os_exporter_auth_url }}"
-      application_credential_id: "{{ secrets_os_exporter_credential_id }}"
-      application_credential_secret: "{{ secrets_os_exporter_credential_secret }}"
+      auth_url: "{{ secrets_os_capacity_auth_url }}"
+      application_credential_id: "{{ secrets_os_capacity_credential_id }}"
+      application_credential_secret: "{{ secrets_os_capacity_credential_secret }}"
     region_name: "RegionOne"
     interface: "internal"
     identity_api_version: 3
     auth_type: "v3applicationcredential"
+{% if kolla_enable_tls_internal | bool %}
+    verify: False
+{% endif %}

etc/kayobe/kolla/config/grafana/dashboards/openstack/grafana_cloud_dashboard.json

@@ -1,4 +1,3 @@
-{% raw %}
 {
   "annotations": {
     "list": [
@@ -25,7 +24,6 @@
   "editable": true,
   "fiscalYearStartMonth": 0,
   "graphTooltip": 0,
-  "id": 2084495,
   "links": [],
   "liveNow": false,
   "panels": [
@@ -86,7 +84,7 @@
         },
         "textMode": "auto"
       },
-      "pluginVersion": "9.4.7",
+      "pluginVersion": "10.1.2",
       "repeat": "flavors",
       "repeatDirection": "h",
       "targets": [
@@ -424,6 +422,7 @@
               "tooltip": false,
               "viz": false
             },
+            "insertNulls": false,
             "lineInterpolation": "linear",
             "lineWidth": 1,
             "pointSize": 5,
@@ -465,6 +464,7 @@
         "y": 17
       },
       "id": 5,
+      "interval": "30m",
       "options": {
         "legend": {
           "calcs": [
@@ -522,6 +522,7 @@
               "tooltip": false,
               "viz": false
             },
+            "insertNulls": false,
             "lineInterpolation": "linear",
             "lineWidth": 1,
             "pointSize": 5,
@@ -563,6 +564,7 @@
         "y": 17
       },
       "id": 16,
+      "interval": "30m",
       "options": {
         "legend": {
           "calcs": [
@@ -646,6 +648,7 @@
               "tooltip": false,
               "viz": false
             },
+            "insertNulls": false,
             "lineInterpolation": "smooth",
             "lineStyle": {
               "fill": "solid"
@@ -689,6 +692,7 @@
         "y": 26
       },
       "id": 6,
+      "interval": "30m",
       "options": {
         "legend": {
           "calcs": [
@@ -750,6 +754,7 @@
               "tooltip": false,
               "viz": false
             },
+            "insertNulls": false,
             "lineInterpolation": "linear",
             "lineWidth": 1,
             "pointSize": 5,
@@ -791,6 +796,7 @@
         "y": 26
       },
       "id": 4,
+      "interval": "30m",
       "options": {
         "legend": {
           "calcs": [
@@ -836,7 +842,7 @@
         "current": {
           "selected": false,
           "text": "Prometheus",
-          "value": "Prometheus"
+          "value": "PBFA97CFB590B2093"
         },
         "description": "The prometheus datasource used for queries.",
         "hide": 0,
@@ -885,7 +891,7 @@
     ]
   },
   "time": {
-    "from": "now-24h",
+    "from": "now-2d",
     "to": "now"
   },
   "timepicker": {},
@@ -894,5 +900,4 @@
   "uid": "g__ksD67z",
   "version": 1,
   "weekStart": ""
-}
-{% endraw %}
+}