Skip to content

Commit 2a9f5ad

Browse files
authored
Merge branch 'master' into alexy_ck_job_6b
2 parents 543e08f + 96591ff commit 2a9f5ad

3 files changed

Lines changed: 12 additions & 63 deletions

File tree

roles/test_alerts/tasks/main.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,6 @@
1010
ansible.builtin.include_tasks:
1111
file: get_observability_api.yml
1212

13-
- name: "Test Creating an alert rule in Prometheus"
14-
ansible.builtin.include_tasks:
15-
file: test_create_an_alert.yml
16-
1713
- name: "Test Creating a standard alert route in Alertmanager"
1814
ansible.builtin.include_tasks:
1915
file: test_creating_a_standard_alert_route_in_alert_manager.yml

roles/test_alerts/tasks/test_create_an_alert.yml

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

roles/test_alerts/tasks/test_creating_a_standard_alert_route_in_alert_manager.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,18 @@
6666
register: cmd_output
6767
failed_when: cmd_output.rc != 0
6868

69+
- name: "RHELOSP-144480 Check that the alert was created"
70+
ansible.builtin.command:
71+
cmd: |
72+
curl -k {{ prom_auth_string }} https://{{ prom_url }}/api/v1/rules
73+
register: cmd_output
74+
retries: 30
75+
delay: 10
76+
changed_when: true
77+
# when there are no rules, there is still a response and rc == 0
78+
# e.g. {\"status\":\"success\",\"data\":{\"groups\":[]}}
79+
until: '"FVT_TESTING Collectd metrics receive rate is zero" in cmd_output.stdout'
80+
6981
- name: "RHELOSP-148697 Interrupt metrics flow by preventing the QDR from running"
7082
ansible.builtin.shell:
7183
cmd: |

0 commit comments

Comments
 (0)