Add enable_web_admin_api config to prometheus charm

[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 0f902a5..87d7bc5 100644 (file)
--- a/installers/charm/prometheus/tests/test_charm.py
+++ b/installers/charm/prometheus/tests/test_charm.py
@@ -63,26 +63,24 @@ class TestCharm(unittest.TestCase):
                                 {
                                     "path": "prometheus.yml",
                                     "content": (
-                                        "global:"
-                                        "  scrape_interval: 15s"
-                                        "  evaluation_interval: 15s"
-                                        "alerting:"
-                                        "  alertmanagers:"
-                                        "    - static_configs:"
-                                        "        - targets:"
-                                        "rule_files:"
-                                        "scrape_configs:"
-                                        "  - job_name: 'prometheus'"
-                                        "    static_configs:"
-                                        "      - targets: [{}]".format("")
+                                        "global:\n"
+                                        "  scrape_interval: 15s\n"
+                                        "  evaluation_interval: 15s\n"
+                                        "alerting:\n"
+                                        "  alertmanagers:\n"
+                                        "    - static_configs:\n"
+                                        "        - targets:\n"
+                                        "rule_files:\n"
+                                        "scrape_configs:\n"
+                                        "  - job_name: 'prometheus'\n"
+                                        "    static_configs:\n"
+                                        "      - targets: [{}]\n".format("")
                                     ),
                                 }
                             ],
                         }
                     ],
                     "command": [
-                        "sh",
-                        "-c",
                         "/bin/prometheus",
                         "--config.file=/etc/prometheus/prometheus.yml",
                         "--storage.tsdb.path=/prometheus",
@@ -148,26 +146,24 @@ class TestCharm(unittest.TestCase):
                                 {
                                     "path": "prometheus.yml",
                                     "content": (
-                                        "global:"
-                                        "  scrape_interval: 15s"
-                                        "  evaluation_interval: 15s"
-                                        "alerting:"
-                                        "  alertmanagers:"
-                                        "    - static_configs:"
-                                        "        - targets:"
-                                        "rule_files:"
-                                        "scrape_configs:"
-                                        "  - job_name: 'prometheus'"
-                                        "    static_configs:"
-                                        "      - targets: [{}]".format("")
+                                        "global:\n"
+                                        "  scrape_interval: 15s\n"
+                                        "  evaluation_interval: 15s\n"
+                                        "alerting:\n"
+                                        "  alertmanagers:\n"
+                                        "    - static_configs:\n"
+                                        "        - targets:\n"
+                                        "rule_files:\n"
+                                        "scrape_configs:\n"
+                                        "  - job_name: 'prometheus'\n"
+                                        "    static_configs:\n"
+                                        "      - targets: [{}]\n".format("")
                                     ),
                                 }
                             ],
                         }
                     ],
                     "command": [
-                        "sh",
-                        "-c",
                         "/bin/prometheus",
                         "--config.file=/etc/prometheus/prometheus.yml",
                         "--storage.tsdb.path=/prometheus",
@@ -260,26 +256,24 @@ class TestCharm(unittest.TestCase):
                                 {
                                     "path": "prometheus.yml",
                                     "content": (
-                                        "global:"
-                                        "  scrape_interval: 15s"
-                                        "  evaluation_interval: 15s"
-                                        "alerting:"
-                                        "  alertmanagers:"
-                                        "    - static_configs:"
-                                        "        - targets:"
-                                        "rule_files:"
-                                        "scrape_configs:"
-                                        "  - job_name: 'prometheus'"
-                                        "    static_configs:"
-                                        "      - targets: [{}]".format("")
+                                        "global:\n"
+                                        "  scrape_interval: 15s\n"
+                                        "  evaluation_interval: 15s\n"
+                                        "alerting:\n"
+                                        "  alertmanagers:\n"
+                                        "    - static_configs:\n"
+                                        "        - targets:\n"
+                                        "rule_files:\n"
+                                        "scrape_configs:\n"
+                                        "  - job_name: 'prometheus'\n"
+                                        "    static_configs:\n"
+                                        "      - targets: [{}]\n".format("")
                                     ),
                                 }
                             ],
                         }
                     ],
                     "command": [
-                        "sh",
-                        "-c",
                         "/bin/prometheus",
                         "--config.file=/etc/prometheus/prometheus.yml",
                         "--storage.tsdb.path=/prometheus",
@@ -376,26 +370,24 @@ class TestCharm(unittest.TestCase):
                                 {
                                     "path": "prometheus.yml",
                                     "content": (
-                                        "global:"
-                                        "  scrape_interval: 15s"
-                                        "  evaluation_interval: 15s"
-                                        "alerting:"
-                                        "  alertmanagers:"
-                                        "    - static_configs:"
-                                        "        - targets:"
-                                        "rule_files:"
-                                        "scrape_configs:"
-                                        "  - job_name: 'prometheus'"
-                                        "    static_configs:"
-                                        "      - targets: [{}]".format("")
+                                        "global:\n"
+                                        "  scrape_interval: 15s\n"
+                                        "  evaluation_interval: 15s\n"
+                                        "alerting:\n"
+                                        "  alertmanagers:\n"
+                                        "    - static_configs:\n"
+                                        "        - targets:\n"
+                                        "rule_files:\n"
+                                        "scrape_configs:\n"
+                                        "  - job_name: 'prometheus'\n"
+                                        "    static_configs:\n"
+                                        "      - targets: [{}]\n".format("")
                                     ),
                                 }
                             ],
                         }
                     ],
                     "command": [
-                        "sh",
-                        "-c",
                         "/bin/prometheus",
                         "--config.file=/etc/prometheus/prometheus.yml",
                         "--storage.tsdb.path=/prometheus",