Parametrize default grafana time range on startup

uyuni-project · Oct 18, 2024 · db1d93f · db1d93f
1 parent b1363b7
commit db1d93f
Show file tree

Hide file tree

Showing 12 changed files with 34 additions and 917 deletions.
diff --git a/health-check/.gitignore b/health-check/.gitignore
@@ -7,3 +7,4 @@ promtail-linux-amd64
 __pycache__
 **/config/exporter/config.yaml
 **/config/promtail/config.yaml
+**/config/grafana/dashboards/supportconfig_with_logs.json
diff --git a/..._health_check/grafana/conf/dashboard.yaml → ...ealth_check/config/grafana/dashboard.yaml b/..._health_check/grafana/conf/dashboard.yaml → ...ealth_check/config/grafana/dashboard.yaml
diff --git a/.../conf/dashboards/dashboard_with_logs.json → ...afana/dashboards/dashboard_with_logs.json b/.../conf/dashboards/dashboard_with_logs.json → ...afana/dashboards/dashboard_with_logs.json
diff --git a/...heck/grafana/conf/dashboards/example.json → ...ck/config/grafana/dashboards/example.json b/...heck/grafana/conf/dashboards/example.json → ...ck/config/grafana/dashboards/example.json
diff --git a/...ealth_check/grafana/conf/datasources.yaml → ...lth_check/config/grafana/datasources.yaml b/...ealth_check/grafana/conf/datasources.yaml → ...lth_check/config/grafana/datasources.yaml
diff --git a/health-check/src/uyuni_health_check/config_loader.py b/health-check/src/uyuni_health_check/config_loader.py
@@ -1,6 +1,7 @@
 import os
 import configparser
 import yaml
+import json
 from jinja2 import Environment, FileSystemLoader
 
 class ConfigLoader:
@@ -24,15 +25,22 @@ def load_yaml(self, filename):
 
     def load_jinja_template(self, template_name):
         return self.jinja_env.get_template(template_name)
+
+    def get_json_template_filepath(self, json_relative_path):
+        return os.path.join(self.templates_dir, json_relative_path)
 
     def load_dockerfile_dir(self, dockerfile_dir):
         dockerfile_dir = os.path.join(self.containers_dir, dockerfile_dir)
         return dockerfile_dir
 
-    def write_config(self, component, content):
-        file_path = os.path.join(self.config_dir, component, "config.yaml")
+    def write_config(self, component, config_file_path, content, isjson=False):
+        file_path = os.path.join(self.config_dir, component, config_file_path)
         with open(file_path, "w") as file:
-            file.write(content)
+            if isjson:
+                json.dump(content, file)
+            else:
+                file.write(content)
+
 
     def get_config_file_path(self, component):
         return os.path.join(self.base_dir, "config", component, "config.yaml")
@@ -41,7 +49,7 @@ def get_sources_path(self):
         return self.base_dir
 
     def get_grafana_config_dir(self):
-        return os.path.join(self.base_dir, "grafana", "conf")
+        return os.path.join(self.config_dir, "grafana")
 
     def get_prometheus_config_dir(self):
         return os.path.join(self.base_dir, "prometheus", "conf")

diff --git a/health-check/src/uyuni_health_check/exporters/supportconfig/exporter.py b/health-check/src/uyuni_health_check/exporters/supportconfig/exporter.py
@@ -72,5 +72,5 @@ def prepare_exporter(config=None, verbose=False, supportconfig_path=None):
 def create_supportconfig_exporter_cfg(config=None, supportconfig_path=None):
     exporter_template = config.load_jinja_template("exporter/exporter.yaml.j2")
     opts = {"supportconfig_path": supportconfig_path}
-    exporter_config_file_path = config.get_config_file_path("exporter")
-    config.write_config("exporter", exporter_template.render(**opts))
+    #exporter_config_file_path = config.get_config_file_path("exporter")
+    config.write_config("exporter", "config.yaml", exporter_template.render(**opts))