From 439b53404c8a09c81552105790bccf3338caa752 Mon Sep 17 00:00:00 2001 From: Will Szumski Date: Tue, 10 Mar 2026 13:21:20 +0000 Subject: [PATCH 1/4] Update webhook URLs to use mandatory secrets Current default never makes sense. --- .../prometheus/prometheus-alertmanager.msteamsv2.yml.example | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/etc/kayobe/kolla/config/prometheus/prometheus-alertmanager.msteamsv2.yml.example b/etc/kayobe/kolla/config/prometheus/prometheus-alertmanager.msteamsv2.yml.example index f41401e886..ec725057ac 100644 --- a/etc/kayobe/kolla/config/prometheus/prometheus-alertmanager.msteamsv2.yml.example +++ b/etc/kayobe/kolla/config/prometheus/prometheus-alertmanager.msteamsv2.yml.example @@ -18,11 +18,11 @@ route: receivers: - name: 'msteamsv2-notifications' msteamsv2_configs: - - webhook_url: '{{ secrets_msteams_notification_channel_url | default('https://prod-01.westeurope.logic.azure.com/workflows/') }}' + - webhook_url: '{{ secrets_msteams_notification_channel_url | ansible.builtin.mandatory }}' send_resolved: true - name: 'msteamsv2-critical-notifications' msteamsv2_configs: - - webhook_url: '{{ secrets_msteams_notification_critical_channel_url | default('https://prod-01.westeurope.logic.azure.com/workflows/') }}' + - webhook_url: '{{ secrets_msteams_notification_critical_channel_url | ansible.builtin.mandatory }}' send_resolved: true templates: From 1f6d8ae031bc2efe96921ad6c8c326031e7b5b4d Mon Sep 17 00:00:00 2001 From: Will Szumski Date: Tue, 10 Mar 2026 13:46:41 +0000 Subject: [PATCH 2/4] Improve error message --- .../prometheus/prometheus-alertmanager.msteamsv2.yml.example | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/etc/kayobe/kolla/config/prometheus/prometheus-alertmanager.msteamsv2.yml.example b/etc/kayobe/kolla/config/prometheus/prometheus-alertmanager.msteamsv2.yml.example index ec725057ac..dcce25ccf3 100644 --- a/etc/kayobe/kolla/config/prometheus/prometheus-alertmanager.msteamsv2.yml.example +++ b/etc/kayobe/kolla/config/prometheus/prometheus-alertmanager.msteamsv2.yml.example @@ -18,11 +18,11 @@ route: receivers: - name: 'msteamsv2-notifications' msteamsv2_configs: - - webhook_url: '{{ secrets_msteams_notification_channel_url | ansible.builtin.mandatory }}' + - webhook_url: '{{ secrets_msteams_notification_channel_url | ansible.builtin.mandatory(msg="secrets_msteams_notification_channel_url is undefined. Please add this variable to secrets.yml when using the Microsoft Teams Alertmanager integration.") }}' send_resolved: true - name: 'msteamsv2-critical-notifications' msteamsv2_configs: - - webhook_url: '{{ secrets_msteams_notification_critical_channel_url | ansible.builtin.mandatory }}' + - webhook_url: '{{ secrets_msteams_notification_critical_channel_url | ansible.builtin.mandatory(msg="secrets_msteams_notification_critical_channel_url is undefined. Please add this variable to secrets.yml when using the Microsoft Teams Alertmanager integration.") }}' send_resolved: true templates: From 5edc1e6fa8584a74a0a59d33951086640b084968 Mon Sep 17 00:00:00 2001 From: Will Szumski Date: Wed, 11 Mar 2026 14:03:46 +0000 Subject: [PATCH 3/4] Do not copy .example files into generated config directory --- etc/kayobe/kolla.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml index 89e080eb4d..156c2532b6 100644 --- a/etc/kayobe/kolla.yml +++ b/etc/kayobe/kolla.yml @@ -844,7 +844,11 @@ kolla_enable_prometheus: true # Extra items to add to kolla_openstack_custom_config_rules_default # to produce kolla_openstack_custom_config_rules. -#kolla_openstack_custom_config_rules_extra: +kolla_openstack_custom_config_rules_extra: + # Files ending with .example should not be copied + - glob: **/*.example + strategy: noop + priority: 1 ############################################################################### # Passwords and credentials. From dad44eeaeb9bce1ce7174bdd616833c93826a786 Mon Sep 17 00:00:00 2001 From: Will Szumski Date: Wed, 11 Mar 2026 14:06:44 +0000 Subject: [PATCH 4/4] Values with * need to be quoted --- etc/kayobe/kolla.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml index 156c2532b6..db4788c08d 100644 --- a/etc/kayobe/kolla.yml +++ b/etc/kayobe/kolla.yml @@ -846,7 +846,7 @@ kolla_enable_prometheus: true # to produce kolla_openstack_custom_config_rules. kolla_openstack_custom_config_rules_extra: # Files ending with .example should not be copied - - glob: **/*.example + - glob: "**/*.example" strategy: noop priority: 1