diff --git a/selfprivacy_api/migrations/__init__.py b/selfprivacy_api/migrations/__init__.py index 5eb3194..327bb28 100644 --- a/selfprivacy_api/migrations/__init__.py +++ b/selfprivacy_api/migrations/__init__.py @@ -15,12 +15,12 @@ from selfprivacy_api.migrations.check_for_system_rebuild_jobs import ( CheckForSystemRebuildJobs, ) from selfprivacy_api.migrations.add_roundcube import AddRoundcube -from selfprivacy_api.migrations.add_prometheus import AddPrometheus +from selfprivacy_api.migrations.add_monitoring import AddMonitoring migrations = [ WriteTokenToRedis(), CheckForSystemRebuildJobs(), - AddPrometheus(), + AddMonitoring(), AddRoundcube(), ] diff --git a/selfprivacy_api/migrations/add_prometheus.py b/selfprivacy_api/migrations/add_monitoring.py similarity index 50% rename from selfprivacy_api/migrations/add_prometheus.py rename to selfprivacy_api/migrations/add_monitoring.py index 93089ff..965e234 100644 --- a/selfprivacy_api/migrations/add_prometheus.py +++ b/selfprivacy_api/migrations/add_monitoring.py @@ -2,35 +2,36 @@ from selfprivacy_api.migrations.migration import Migration from selfprivacy_api.services.flake_service_manager import FlakeServiceManager from selfprivacy_api.utils import ReadUserData, WriteUserData +from selfprivacy_api.utils.block_devices import BlockDevices -class AddPrometheus(Migration): - """Adds the Prometheus if it is not present.""" +class AddMonitoring(Migration): + """Adds monitoring service if it is not present.""" def get_migration_name(self) -> str: - return "add_prometheus" + return "add_monitoring" def get_migration_description(self) -> str: - return "Adds the Prometheus if it is not present." + return "Adds the Monitoring if it is not present." def is_migration_needed(self) -> bool: with FlakeServiceManager() as manager: - if "prometheus" not in manager.services: + if "monitoring" not in manager.services: return True with ReadUserData() as data: - if "prometheus" not in data["modules"]: + if "monitoring" not in data["modules"]: return True return False def migrate(self) -> None: with FlakeServiceManager() as manager: - if "prometheus" not in manager.services: + if "monitoring" not in manager.services: manager.services[ - "prometheus" - ] = "git+https://git.selfprivacy.org/SelfPrivacy/selfprivacy-nixos-config.git?ref=flakes&dir=sp-modules/prometheus" + "monitoring" + ] = "git+https://git.selfprivacy.org/SelfPrivacy/selfprivacy-nixos-config.git?ref=flakes&dir=sp-modules/monitoring" with WriteUserData() as data: - if "prometheus" not in data["modules"]: - data["modules"]["prometheus"] = { - "enable": False, - "subdomain": "prometheus", + if "monitoring" not in data["modules"]: + data["modules"]["monitoring"] = { + "enable": True, + "location": BlockDevices().get_root_block_device().name } diff --git a/selfprivacy_api/utils/prometheus.py b/selfprivacy_api/utils/prometheus.py index e1911e6..41dd0d9 100644 --- a/selfprivacy_api/utils/prometheus.py +++ b/selfprivacy_api/utils/prometheus.py @@ -39,7 +39,7 @@ class PrometheusQueries: json = response.json() print(json) return PrometheusQueryResult( - result_type=json["result_type"], result=json["result"] + result_type=json["resultType"], result=json["result"] ) except Exception as error: raise Exception("Prometheus request failed! " + str(error))