Skip to content

Commit 5cf1c9b

Browse files
committed
Merge remote-tracking branch 'origin/stackhpc/2024.1' into sync-2024.1
2 parents fff74e2 + 4b7481b commit 5cf1c9b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+3555
-1903
lines changed

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@ jobs:
1818
pull-requests: read
1919
name: Check changed files
2020
if: github.repository == 'stackhpc/stackhpc-kayobe-config'
21+
needs:
22+
- lint
23+
- tox
2124
outputs:
2225
aio: ${{ steps.changes.outputs.aio }}
2326
build-kayobe-image: ${{ steps.changes.outputs.build-kayobe-image }}

doc/source/configuration/cephadm.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -390,7 +390,7 @@ The set of commands below configure all of these.
390390
- "config set client.rgw rgw_keystone_admin_user 'ceph_rgw'"
391391
- "config set client.rgw rgw_keystone_api_version '3'"
392392
- "config set client.rgw rgw_keystone_token_cache_size '10000'"
393-
- "config set client.rgw rgw_keystone_url https://{{ kolla_internal_fqdn }}:5000"
393+
- "config set client.rgw rgw_keystone_url {{ 'https' if kolla_enable_tls_internal | bool else 'http' }}://{{ kolla_internal_fqdn }}:5000"
394394
- "config set client.rgw rgw_keystone_verify_ssl false"
395395
- "config set client.rgw rgw_max_attr_name_len '1000'"
396396
- "config set client.rgw rgw_max_attr_size '1000'"

doc/source/configuration/index.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ the various features provided.
1313
lvm
1414
cephadm
1515
monitoring
16+
openbao
1617
vault
1718
wazuh
1819
walled-garden

doc/source/configuration/monitoring.rst

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,8 @@ on the overcloud hosts:
8181
SMART reporting should now be enabled along with a Prometheus alert for
8282
unhealthy disks and a Grafana dashboard called ``Hardware Overview``.
8383

84-
Alertmanager and Slack
85-
======================
84+
Alertmanager, Slack and Microsoft Teams
85+
=======================================
8686

8787
StackHPC Kayobe configuration comes bundled with an array of alerts but does not
8888
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
119119
need to be added to one of the ``*.rules`` files in the prometheus configuration
120120
directory.
121121

122+
If however you are using Microsoft Teams instead of Slack, you can use Prometheus
123+
Alertmanager's built-in support for the new message format based on Power Automate flows.
124+
You will need an incoming webhook URL for your Teams channel.
125+
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>`__.
126+
To set up a receiver, create a ``prometheus-alertmanager.yml`` file under
127+
``etc/kayobe/kolla/config/prometheus/``.
128+
An example config is stored in this directory known as ``prometheus-alertmanager.msteamvs2.yml.example``.
129+
The example configuration uses two Slack channels.
130+
One channel receives all alerts while the other only receives alerts tagged as critical.
131+
Feel free to modify the example configuration to suit your needs.
132+
122133
Ceph Monitoring
123134
===============
124135

0 commit comments

Comments
 (0)