From 28bd47409a9ac8f647d6798618b2ef22661d8fbc Mon Sep 17 00:00:00 2001
From: Maarten de Waard <maarten@greenhost.nl>
Date: Wed, 8 Apr 2020 15:55:22 +0200
Subject: [PATCH] fix tests for new prometheus setup
---
test/pytest/test_helmreleases.py | 8 ++++++--
test/pytest/test_prometheus.py | 2 +-
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/test/pytest/test_helmreleases.py b/test/pytest/test_helmreleases.py
index 4a02602f4..c6711a4db 100644
--- a/test/pytest/test_helmreleases.py
+++ b/test/pytest/test_helmreleases.py
@@ -16,7 +16,8 @@ EXPECTED_RELEASES = {
'cert-manager',
'ingress',
'local-storage',
- 'monitoring',
+ 'prometheus',
+ 'grafana',
'loki-stack',
'single-sign-on'
],
@@ -35,7 +36,10 @@ EXPECTED_APP_LABELS = {
'label_selector': 'app.kubernetes.io/instance=rocketchat'},
'grafana': {
'namespace': 'oas',
- 'label_selector': 'app=grafana'}
+ 'label_selector': 'app=grafana'},
+ 'prometheus': {
+ 'namespace': 'oas',
+ 'label_selector': 'app=prometheus'}
}
diff --git a/test/pytest/test_prometheus.py b/test/pytest/test_prometheus.py
index e0eef8260..9ddcdb9a3 100755
--- a/test/pytest/test_prometheus.py
+++ b/test/pytest/test_prometheus.py
@@ -64,7 +64,7 @@ def test_prometheus_alerts(host):
print("Starting prometheus test...")
- url = 'http://monitoring-prometheus-oper-prometheus.oas.svc.cluster.local:9090/api/v1/alerts'
+ url = 'http://prometheus-server.oas.svc.cluster.local/api/v1/alerts'
alert_json = json.loads(host.check_output('curl ' + url))
status = alert_json["status"]
--
GitLab