From 197de17aa56ad89c1108097251e047e5da37099c Mon Sep 17 00:00:00 2001 From: Diamantis Tziotzios Date: Mon, 6 Dec 2021 15:32:38 +0200 Subject: [PATCH 1/2] no message --- .../main/java/eu/eudat/logic/managers/MetricsManager.java | 6 ++++++ .../web/src/main/java/eu/eudat/types/MetricNames.java | 1 + 2 files changed, 7 insertions(+) diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/MetricsManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/MetricsManager.java index 03a153947..8fe25d561 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/MetricsManager.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/MetricsManager.java @@ -109,6 +109,9 @@ public class MetricsManager { {MetricNames.NEXUS + MetricNames.DMP_WITH_GRANT, Gauge.build().name(MetricNames.NEXUS + MetricNames.DMP_WITH_GRANT).help("Number of Grants based on the status of the DMP that is using them during Nexus").labelNames("status").register(registry.getPrometheusRegistry())} + {MetricNames.INSTALLATIONS, Gauge.build().name(MetricNames.INSTALLATIONS).help("Number of Installations").register(registry.getPrometheusRegistry())}, + {MetricNames.NEXUS + MetricNames.INSTALLATIONS, Gauge.build().name(MetricNames.NEXUS + MetricNames.INSTALLATIONS).help("Number of Installations").register(registry.getPrometheusRegistry())}, + }).collect(Collectors.toMap(data -> (String)data[0], data -> (Gauge) data[1])); } @@ -172,6 +175,9 @@ public class MetricsManager { long files = Files.list(Paths.get(this.environment.getProperty("userguide.path"))).count(); calculateValue(MetricNames.LANGUAGES, (int) files, null); + calculateValue(MetricNames.INSTALLATIONS, 1, null); + calculateValue(MetricNames.NEXUS + MetricNames.INSTALLATIONS, 1, null); + logger.info("Metrics calculation Completed"); } diff --git a/dmp-backend/web/src/main/java/eu/eudat/types/MetricNames.java b/dmp-backend/web/src/main/java/eu/eudat/types/MetricNames.java index 20d8c0c52..a1d7dab89 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/types/MetricNames.java +++ b/dmp-backend/web/src/main/java/eu/eudat/types/MetricNames.java @@ -2,6 +2,7 @@ package eu.eudat.types; public class MetricNames { public static final String DATASET_TEMPLATE = "argos_dataset_templates"; + public static final String INSTALLATIONS = "installations"; public static final String USERS = "argos_users"; public static final String DMP = "argos_managed_dmps"; public static final String DATASET = "argos_managed_dataset_descriptions"; From 2cb985c23c4ceda99efc78bcc8e77b3eceeb0bcf Mon Sep 17 00:00:00 2001 From: Diamantis Tziotzios Date: Tue, 7 Dec 2021 16:52:49 +0200 Subject: [PATCH 2/2] bug fix --- .../src/main/java/eu/eudat/logic/managers/MetricsManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/MetricsManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/MetricsManager.java index 8fe25d561..aa356d1a0 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/MetricsManager.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/MetricsManager.java @@ -107,7 +107,7 @@ public class MetricsManager { {MetricNames.DMP_WITH_GRANT, Gauge.build().name(MetricNames.DMP_WITH_GRANT).help("Number of Grants based on the status of the DMP that is using them").labelNames("status").register(registry.getPrometheusRegistry())}, - {MetricNames.NEXUS + MetricNames.DMP_WITH_GRANT, Gauge.build().name(MetricNames.NEXUS + MetricNames.DMP_WITH_GRANT).help("Number of Grants based on the status of the DMP that is using them during Nexus").labelNames("status").register(registry.getPrometheusRegistry())} + {MetricNames.NEXUS + MetricNames.DMP_WITH_GRANT, Gauge.build().name(MetricNames.NEXUS + MetricNames.DMP_WITH_GRANT).help("Number of Grants based on the status of the DMP that is using them during Nexus").labelNames("status").register(registry.getPrometheusRegistry())}, {MetricNames.INSTALLATIONS, Gauge.build().name(MetricNames.INSTALLATIONS).help("Number of Installations").register(registry.getPrometheusRegistry())}, {MetricNames.NEXUS + MetricNames.INSTALLATIONS, Gauge.build().name(MetricNames.NEXUS + MetricNames.INSTALLATIONS).help("Number of Installations").register(registry.getPrometheusRegistry())},