Major improvement in OSM charms

[osm/devops.git] / installers / charm / grafana / src / pod_spec.py

diff --git a/installers/charm/grafana/src/pod_spec.py b/installers/charm/grafana/src/pod_spec.py
index 8d525f3..1701df0 100644 (file)
--- a/installers/charm/grafana/src/pod_spec.py
+++ b/installers/charm/grafana/src/pod_spec.py
@@ -97,10 +97,12 @@ def _validate_data(config_data: Dict[str, Any], relation_data: Dict[str, Any]) -
         else True,
     }
     relation_validators = {
-        "prometheus_host": lambda value, _: isinstance(value, str) and len(value) > 0,
-        "prometheus_port": lambda value, _: isinstance(value, str)
-        and len(value) > 0
-        and int(value) > 0,
+        "prometheus_hostname": lambda value, _: (
+            isinstance(value, str) and len(value) > 0
+        ),
+        "prometheus_port": lambda value, _: (
+            isinstance(value, str) and len(value) > 0 and int(value) > 0
+        ),
     }
     problems = []
 
@@ -117,6 +119,7 @@ def _validate_data(config_data: Dict[str, Any], relation_data: Dict[str, Any]) -
             problems.append(key)
 
     if len(problems) > 0:
+        logger.debug(relation_data)
         raise ValueError("Errors found in: {}".format(", ".join(problems)))
 
     return True
@@ -246,33 +249,25 @@ def _make_pod_files(
             [
                 {
                     "path": "kafka_exporter_dashboard.yaml",
-                    "content": Template(
-                        Path("files/kafka_exporter_dashboard.yaml").read_text()
-                    ),
+                    "content": Path("files/kafka_exporter_dashboard.yaml").read_text(),
                 },
                 {
                     "path": "mongodb_exporter_dashboard.yaml",
-                    "content": Template(
-                        Path("files/mongodb_exporter_dashboard.yaml").read_text()
-                    ),
+                    "content": Path(
+                        "files/mongodb_exporter_dashboard.yaml"
+                    ).read_text(),
                 },
                 {
                     "path": "mysql_exporter_dashboard.yaml",
-                    "content": Template(
-                        Path("files/mysql_exporter_dashboard.yaml").read_text()
-                    ),
+                    "content": Path("files/mysql_exporter_dashboard.yaml").read_text(),
                 },
                 {
                     "path": "nodes_exporter_dashboard.yaml",
-                    "content": Template(
-                        Path("files/nodes_exporter_dashboard.yaml").read_text()
-                    ),
+                    "content": Path("files/nodes_exporter_dashboard.yaml").read_text(),
                 },
                 {
                     "path": "summary_dashboard.yaml",
-                    "content": Template(
-                        Path("files/summary_dashboard.yaml").read_text()
-                    ),
+                    "content": Path("files/summary_dashboard.yaml").read_text(),
                 },
             ]
         )
@@ -280,7 +275,7 @@ def _make_pod_files(
     dashboards.append(
         {
             "path": "dashboard_osm.yaml",
-            "content": Template(Path("files/default_dashboards.yaml").read_text()),
+            "content": Path("files/default_dashboards.yaml").read_text(),
         }
     )
 
@@ -376,7 +371,7 @@ def make_pod_spec(
 
     ports = _make_pod_ports(port)
     env_config = _make_pod_envconfig(config, relation_state)
-    files = _make_pod_files(relation_state)
+    files = _make_pod_files(config, relation_state)
     readiness_probe = _make_readiness_probe(port)
     liveness_probe = _make_liveness_probe(port)
     ingress_resources = _make_pod_ingress_resources(config, app_name, port)