projects
/
osm
/
devops.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix grafana datasource authentication in Charmed OSM
[osm/devops.git]
/
installers
/
charm
/
prometheus
/
tests
/
test_charm.py
diff --git
a/installers/charm/prometheus/tests/test_charm.py
b/installers/charm/prometheus/tests/test_charm.py
index
b1848bd
..
687c38a
100644
(file)
--- a/
installers/charm/prometheus/tests/test_charm.py
+++ b/
installers/charm/prometheus/tests/test_charm.py
@@
-23,10
+23,10
@@
import sys
from typing import NoReturn
import unittest
import sys
from typing import NoReturn
import unittest
-from ops.model import ActiveStatus
-from ops.testing import Harness
from charm import PrometheusCharm
from charm import PrometheusCharm
+from ops.model import ActiveStatus
+from ops.testing import Harness
class TestCharm(unittest.TestCase):
class TestCharm(unittest.TestCase):
@@
-44,8
+44,11
@@
class TestCharm(unittest.TestCase):
"max_file_size": 0,
"ingress_whitelist_source_range": "",
"tls_secret_name": "",
"max_file_size": 0,
"ingress_whitelist_source_range": "",
"tls_secret_name": "",
- "site_url": "https://prometheus.192.168.100.100.xip.io",
+ "site_url": "https://prometheus.192.168.100.100.nip.io",
+ "cluster_issuer": "vault-issuer",
"enable_web_admin_api": False,
"enable_web_admin_api": False,
+ "web_config_username": "admin",
+ "web_config_password": "1234",
}
self.harness.update_config(self.config)
}
self.harness.update_config(self.config)
@@
-76,6
+79,8
@@
class TestCharm(unittest.TestCase):
expected_result = {
"hostname": "prometheus",
"port": "9090",
expected_result = {
"hostname": "prometheus",
"port": "9090",
+ "user": "admin",
+ "password": "1234",
}
relation_id = self.harness.add_relation("prometheus", "mon")
}
relation_id = self.harness.add_relation("prometheus", "mon")