Skip to content

Commit 2dd9b74

Browse files
sulochanthe2hill
authored andcommitted
Fix: Include alerting rules from base genestack (#947)
We are not applying the rules found in base genestack helm config when installing prometheus. This patch changes this to take the rules from base and also allow extra rules to be defined in /etc/genestack directory. This allows us to define custom rules in /etc/ while also allowing us to define general openstack and k8s specific rule in the generl genestack repo. This also adds a new rules directory for this purpose. (cherry picked from commit 832e86d)
1 parent 7e3ccc1 commit 2dd9b74

File tree

5 files changed

+328
-208
lines changed

5 files changed

+328
-208
lines changed

.github/workflows/helm-prometheus.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@ jobs:
3232
--create-namespace \
3333
--namespace=prometheus \
3434
-f ${{ github.workspace }}//base-helm-configs/prometheus/prometheus-helm-overrides.yaml \
35-
-f ${{ github.workspace }}//base-helm-configs/prometheus/alerting_rules.yaml \
35+
-f ${{ github.workspace }}//base-helm-configs/prometheus/rules/alerting_rules.yaml \
36+
-f ${{ github.workspace }}//base-helm-configs/prometheus/rules/rabbitmq_alerting_rules.yaml \
3637
-f ${{ github.workspace }}//base-helm-configs/prometheus/alertmanager_config.yaml \
3738
--post-renderer ${{ github.workspace }}/base-kustomize/kustomize.sh \
3839
--post-renderer-args prometheus/${{ matrix.overlays }} > /tmp/rendered.yaml

base-helm-configs/prometheus/alerting_rules.yaml

Lines changed: 0 additions & 207 deletions
This file was deleted.

0 commit comments

Comments
 (0)