Merge remote-tracking branch 'origin/stackhpc/2024.1' into sync-2024.1

Author: Alex-Welsh

.github/workflows/stackhpc-pull-request.yml

@@ -18,6 +18,9 @@ jobs:
       pull-requests: read
     name: Check changed files
     if: github.repository == 'stackhpc/stackhpc-kayobe-config'
+    needs:
+      - lint
+      - tox
     outputs:
       aio: ${{ steps.changes.outputs.aio }}
       build-kayobe-image: ${{ steps.changes.outputs.build-kayobe-image }}

doc/source/configuration/cephadm.rst

@@ -390,7 +390,7 @@ The set of commands below configure all of these.
   - "config set client.rgw rgw_keystone_admin_user 'ceph_rgw'"
   - "config set client.rgw rgw_keystone_api_version '3'"
   - "config set client.rgw rgw_keystone_token_cache_size '10000'"
-  - "config set client.rgw rgw_keystone_url https://{{ kolla_internal_fqdn }}:5000"
+  - "config set client.rgw rgw_keystone_url {{ 'https' if kolla_enable_tls_internal | bool else 'http' }}://{{ kolla_internal_fqdn }}:5000"
   - "config set client.rgw rgw_keystone_verify_ssl false"
   - "config set client.rgw rgw_max_attr_name_len '1000'"
   - "config set client.rgw rgw_max_attr_size '1000'"

doc/source/configuration/index.rst

@@ -13,6 +13,7 @@ the various features provided.
    lvm
    cephadm
    monitoring
+   openbao
    vault
    wazuh
    walled-garden

doc/source/configuration/monitoring.rst

@@ -81,8 +81,8 @@ on the overcloud hosts:
 SMART reporting should now be enabled along with a Prometheus alert for
 unhealthy disks and a Grafana dashboard called ``Hardware Overview``.
 
-Alertmanager and Slack
-======================
+Alertmanager, Slack and Microsoft Teams
+=======================================
 
 StackHPC Kayobe configuration comes bundled with an array of alerts but does not
 enable any receivers for notifications by default. Various receivers can be
@@ -119,6 +119,17 @@ available `here <https://awesome-prometheus-alerts.grep.to/>`__. They simply
 need to be added to one of the ``*.rules`` files in the prometheus configuration
 directory.
 
+If however you are using Microsoft Teams instead of Slack, you can use Prometheus
+Alertmanager's built-in support for the new message format based on Power Automate flows.
+You will need an incoming webhook URL for your Teams channel.
+This can be done by following `these instructions <https://support.microsoft.com/en-gb/office/create-incoming-webhooks-with-workflows-for-microsoft-teams-8ae491c7-0394-4861-ba59-055e33f75498>`__.
+To set up a receiver, create a ``prometheus-alertmanager.yml`` file under
+``etc/kayobe/kolla/config/prometheus/``.
+An example config is stored in this directory known as ``prometheus-alertmanager.msteamvs2.yml.example``.
+The example configuration uses two Slack channels.
+One channel receives all alerts while the other only receives alerts tagged as critical.
+Feel free to modify the example configuration to suit your needs.
+
 Ceph Monitoring
 ===============