From 559cb6246ffdc60b38468d0956aa72902243dfb3 Mon Sep 17 00:00:00 2001 From: Federico Stagni <federico.stagni@cern.ch> Date: Fri, 5 Apr 2024 15:06:33 +0200 Subject: [PATCH] Merge branch 'fixDashboards' into 'master' from hourly metrics to 15min metrics See merge request lhcb-dirac/LHCbDIRAC!1540 (cherry picked from commit bc1676f7f2c075010dd56bf7d065a0c9e2a63c16) 665c2faf from hourly metrics to 15min metrics a0781a25 Merge branch 'master' into fixDashboards --- .../HLTFarmStatus/HLTFarmStatus.json | 6 +++--- .../ShifterDashboards/HPCSites/HPCSites.json | 6 +++--- .../JobExecutionRateOverview.json | 14 +++++++------- .../ShifterDashboards/Overview/Overview.json | 4 ++-- .../T0-1Sites-RunningJobs.json | 4 ++-- .../ShifterDashboards/T0-1Sites/T0-1Sites.json | 4 ++-- .../ShifterDashboards/WMSOverview/WMSOverview.json | 12 ++++++------ dashboards/WMSMonitoring/README.md | 2 +- dashboards/WMSMonitoring/WMSMonitoring.json | 10 +++++----- 9 files changed, 31 insertions(+), 31 deletions(-) diff --git a/dashboards/ShifterDashboards/HLTFarmStatus/HLTFarmStatus.json b/dashboards/ShifterDashboards/HLTFarmStatus/HLTFarmStatus.json index 7462756888..0af7aa4ff4 100644 --- a/dashboards/ShifterDashboards/HLTFarmStatus/HLTFarmStatus.json +++ b/dashboards/ShifterDashboards/HLTFarmStatus/HLTFarmStatus.json @@ -42,7 +42,7 @@ "showLineNumbers": false, "showMiniMap": false }, - "content": "When querying over long time ranges, grafana aggregates (sums) `Metric` over larger time bins than the default ElasticSearch/OpenSearch ones (15m) to lower the number of data points\nit has to plot.\n\nTo account for this, `Metric` is calculated as the `Metric` per hour, regardless of the actual bin size displayed", + "content": "When querying over long time ranges, grafana aggregates (sums) `Metric` over larger time bins than the default ElasticSearch/OpenSearch ones (15m) to lower the number of data points\nit has to plot.\n\nTo account for this, `Metric` is calculated as the `Metric` per 15min, regardless of the actual bin size displayed", "mode": "markdown" }, "pluginVersion": "10.1.5", @@ -164,7 +164,7 @@ "field": "Jobs", "id": "1", "settings": { - "script": "_value * 3600 / $__interval_ms * 1000" + "script": "_value * 3600 / $__interval_ms * 250" }, "type": "sum" } @@ -190,7 +190,7 @@ "custom": { "axisCenteredZero": false, "axisColorMode": "text", - "axisLabel": "Jobs", + "axisLabel": "Jobs/15min", "axisPlacement": "auto", "barAlignment": 0, "drawStyle": "line", diff --git a/dashboards/ShifterDashboards/HPCSites/HPCSites.json b/dashboards/ShifterDashboards/HPCSites/HPCSites.json index 91d1a580b7..dca582b81c 100644 --- a/dashboards/ShifterDashboards/HPCSites/HPCSites.json +++ b/dashboards/ShifterDashboards/HPCSites/HPCSites.json @@ -46,7 +46,7 @@ "showLineNumbers": false, "showMiniMap": false }, - "content": "When querying over long time ranges, grafana aggregates (sums) `Metric` over larger time bins than the default ElasticSearch/OpenSearch ones (15m) to lower the number of data points\nit has to plot.\n\nTo account for this, `Metric` is calculated as the `Metric` per hour, regardless of the actual bin size displayed", + "content": "When querying over long time ranges, grafana aggregates (sums) `Metric` over larger time bins than the default ElasticSearch/OpenSearch ones (15m) to lower the number of data points\nit has to plot.\n\nTo account for this, `Metric` is calculated as the `Metric` per 15min, regardless of the actual bin size displayed", "mode": "markdown" }, "pluginVersion": "10.1.5", @@ -348,7 +348,7 @@ "custom": { "axisCenteredZero": false, "axisColorMode": "text", - "axisLabel": "jobs/hour", + "axisLabel": "jobs/15min", "axisPlacement": "auto", "barAlignment": 0, "drawStyle": "line", @@ -454,7 +454,7 @@ "field": "Jobs", "id": "1", "settings": { - "script": "_value * 3600 / $__interval_ms * 1000" + "script": "_value * 3600 / $__interval_ms * 250" }, "type": "sum" } diff --git a/dashboards/ShifterDashboards/JobExecutionRateOverview/JobExecutionRateOverview.json b/dashboards/ShifterDashboards/JobExecutionRateOverview/JobExecutionRateOverview.json index 8daffa846b..e2a662bbf2 100644 --- a/dashboards/ShifterDashboards/JobExecutionRateOverview/JobExecutionRateOverview.json +++ b/dashboards/ShifterDashboards/JobExecutionRateOverview/JobExecutionRateOverview.json @@ -47,7 +47,7 @@ "showLineNumbers": false, "showMiniMap": false }, - "content": "# Notes\n\nInvestigate time difference between dirac and grafana ->\n'Last 26 hours' delta in grafana recreates view from dirac\n\nWhen querying over long time ranges, grafana aggregates (sums) `Metric` over larger time bins than the default ElasticSearch/OpenSearch ones (15m) to lower the number of data points\nit has to plot.\n\nTo account for this, `Metric` is calculated as the `Metric` per hour, regardless of the actual bin size displayed", + "content": "# Notes\n\nInvestigate time difference between dirac and grafana ->\n'Last 26 hours' delta in grafana recreates view from dirac\n\nWhen querying over long time ranges, grafana aggregates (sums) `Metric` over larger time bins than the default ElasticSearch/OpenSearch ones (15m) to lower the number of data points\nit has to plot.\n\nTo account for this, `Metric` is calculated as the `Metric` per 15min, regardless of the actual bin size displayed", "mode": "markdown" }, "pluginVersion": "10.1.5", @@ -325,7 +325,7 @@ "field": "Jobs", "id": "1", "settings": { - "script": "_value * 3600 / $__interval_ms * 1000" + "script": "_value * 3600 / $__interval_ms * 250" }, "type": "sum" } @@ -458,7 +458,7 @@ "field": "Jobs", "id": "1", "settings": { - "script": "_value * 3600 / $__interval_ms * 1000" + "script": "_value * 3600 / $__interval_ms * 250" }, "type": "sum" } @@ -734,7 +734,7 @@ "field": "Jobs", "id": "1", "settings": { - "script": "_value * 3600 / $__interval_ms * 1000" + "script": "_value * 3600 / $__interval_ms * 250" }, "type": "sum" } @@ -867,7 +867,7 @@ "field": "Jobs", "id": "1", "settings": { - "script": "_value * 3600 / $__interval_ms * 1000" + "script": "_value * 3600 / $__interval_ms * 250" }, "type": "sum" } @@ -1133,7 +1133,7 @@ "field": "Jobs", "id": "1", "settings": { - "script": "_value * 3600 / $__interval_ms * 1000" + "script": "_value * 3600 / $__interval_ms * 250" }, "type": "sum" } @@ -1261,7 +1261,7 @@ "field": "Jobs", "id": "1", "settings": { - "script": "_value * 3600 / $__interval_ms * 1000" + "script": "_value * 3600 / $__interval_ms * 250" }, "type": "sum" } diff --git a/dashboards/ShifterDashboards/Overview/Overview.json b/dashboards/ShifterDashboards/Overview/Overview.json index 2aac614d9f..d37efaf769 100644 --- a/dashboards/ShifterDashboards/Overview/Overview.json +++ b/dashboards/ShifterDashboards/Overview/Overview.json @@ -46,7 +46,7 @@ "showLineNumbers": false, "showMiniMap": false }, - "content": "When querying over long time ranges, grafana aggregates (sums) `Metric` over larger time bins than the default ElasticSearch/OpenSearch ones (15m) to lower the number of data points\nit has to plot.\n\nTo account for this, `Metric` is calculated as the `Metric` per hour, regardless of the actual bin size displayed", + "content": "When querying over long time ranges, grafana aggregates (sums) `Metric` over larger time bins than the default ElasticSearch/OpenSearch ones (15m) to lower the number of data points\nit has to plot.\n\nTo account for this, `Metric` is calculated as the `Metric` per 15min, regardless of the actual bin size displayed", "mode": "markdown" }, "pluginVersion": "10.1.5", @@ -529,7 +529,7 @@ "field": "Jobs", "id": "1", "settings": { - "script": "_value * 3600 / $__interval_ms * 1000" + "script": "_value * 3600 / $__interval_ms * 250" }, "type": "sum" } diff --git a/dashboards/ShifterDashboards/T0-1Sites-RunningJobs/T0-1Sites-RunningJobs.json b/dashboards/ShifterDashboards/T0-1Sites-RunningJobs/T0-1Sites-RunningJobs.json index fce8981624..d350f41667 100644 --- a/dashboards/ShifterDashboards/T0-1Sites-RunningJobs/T0-1Sites-RunningJobs.json +++ b/dashboards/ShifterDashboards/T0-1Sites-RunningJobs/T0-1Sites-RunningJobs.json @@ -46,7 +46,7 @@ "showLineNumbers": false, "showMiniMap": false }, - "content": "When querying over long time ranges, grafana aggregates (sums) `Metric` over larger time bins than the default ElasticSearch/OpenSearch ones (15m) to lower the number of data points\nit has to plot.\n\nTo account for this, `Metric` is calculated as the `Metric` per hour, regardless of the actual bin size displayed", + "content": "When querying over long time ranges, grafana aggregates (sums) `Metric` over larger time bins than the default ElasticSearch/OpenSearch ones (15m) to lower the number of data points\nit has to plot.\n\nTo account for this, `Metric` is calculated as the `Metric` per 15min, regardless of the actual bin size displayed", "mode": "markdown" }, "pluginVersion": "10.1.5", @@ -171,7 +171,7 @@ "field": "Jobs", "id": "1", "settings": { - "script": "_value * 3600 / $__interval_ms * 1000" + "script": "_value * 3600 / $__interval_ms * 250" }, "type": "sum" } diff --git a/dashboards/ShifterDashboards/T0-1Sites/T0-1Sites.json b/dashboards/ShifterDashboards/T0-1Sites/T0-1Sites.json index 4b56c79578..7c41ce9517 100644 --- a/dashboards/ShifterDashboards/T0-1Sites/T0-1Sites.json +++ b/dashboards/ShifterDashboards/T0-1Sites/T0-1Sites.json @@ -46,7 +46,7 @@ "showLineNumbers": false, "showMiniMap": false }, - "content": "When querying over long time ranges, grafana aggregates (sums) `Metric` over larger time bins than the default ElasticSearch/OpenSearch ones (15m) to lower the number of data points\nit has to plot.\n\nTo account for this, `Metric` is calculated as the `Metric` per hour, regardless of the actual bin size displayed", + "content": "When querying over long time ranges, grafana aggregates (sums) `Metric` over larger time bins than the default ElasticSearch/OpenSearch ones (15m) to lower the number of data points\nit has to plot.\n\nTo account for this, `Metric` is calculated as the `Metric` per 15min, regardless of the actual bin size displayed", "mode": "markdown" }, "pluginVersion": "10.1.5", @@ -173,7 +173,7 @@ "id": "1", "settings": { "missing": "0", - "script": "_value * 3600 / $__interval_ms * 1000" + "script": "_value * 3600 / $__interval_ms * 250" }, "type": "sum" } diff --git a/dashboards/ShifterDashboards/WMSOverview/WMSOverview.json b/dashboards/ShifterDashboards/WMSOverview/WMSOverview.json index 0f9e377414..c551ac3aae 100644 --- a/dashboards/ShifterDashboards/WMSOverview/WMSOverview.json +++ b/dashboards/ShifterDashboards/WMSOverview/WMSOverview.json @@ -46,7 +46,7 @@ "showLineNumbers": false, "showMiniMap": false }, - "content": "When querying over long time ranges, grafana aggregates (sums) `Metric` over larger time bins than the default ElasticSearch/OpenSearch ones (15m) to lower the number of data points\nit has to plot.\n\nTo account for this, `Metric` is calculated as the `Metric` per hour, regardless of the actual bin size displayed", + "content": "When querying over long time ranges, grafana aggregates (sums) `Metric` over larger time bins than the default ElasticSearch/OpenSearch ones (15m) to lower the number of data points\nit has to plot.\n\nTo account for this, `Metric` is calculated as the `Metric` per 15min, regardless of the actual bin size displayed", "mode": "markdown" }, "pluginVersion": "10.1.5", @@ -183,7 +183,7 @@ "field": "Jobs", "id": "1", "settings": { - "script": "_value * 3600 / $__interval_ms * 1000" + "script": "_value * 3600 / $__interval_ms * 250" }, "type": "sum" } @@ -311,7 +311,7 @@ "field": "Jobs", "id": "1", "settings": { - "script": "_value * 3600 / $__interval_ms * 1000" + "script": "_value * 3600 / $__interval_ms * 250" }, "type": "sum" } @@ -439,7 +439,7 @@ "field": "Jobs", "id": "1", "settings": { - "script": "_value * 3600 / $__interval_ms * 1000" + "script": "_value * 3600 / $__interval_ms * 250" }, "type": "sum" } @@ -569,7 +569,7 @@ "field": "Jobs", "id": "1", "settings": { - "script": "_value * 3600 / $__interval_ms * 1000" + "script": "_value * 3600 / $__interval_ms * 250" }, "type": "sum" } @@ -699,7 +699,7 @@ "field": "Jobs", "id": "1", "settings": { - "script": "_value * 3600 / $__interval_ms * 1000" + "script": "_value * 3600 / $__interval_ms * 250" }, "type": "sum" } diff --git a/dashboards/WMSMonitoring/README.md b/dashboards/WMSMonitoring/README.md index c3abd878c4..cc18b029f2 100644 --- a/dashboards/WMSMonitoring/README.md +++ b/dashboards/WMSMonitoring/README.md @@ -1,7 +1,7 @@ # WMS Monitoring (OpenSearch) This dashboard creates plots based on the WMS monitoring data stored on OpenSearch (index: lhcb-production_wmshistory_*). -Grafana aggregates (sums) data when querying for large time intervals to lower the amount of data points it has to plot. Because of this, the bin size and scale of the y-axis are dependent on the time interval chosen. This is countered by calculating the metric as metric per hour: `metric = metric / BIN_SIZE_IN_S * 3600`. +Grafana aggregates (sums) data when querying for large time intervals to lower the amount of data points it has to plot. Because of this, the bin size and scale of the y-axis are dependent on the time interval chosen. This is countered by calculating the metric as metric per 15m: `metric = metric / BIN_SIZE_IN_S * 3600 / 4`. The metrics can be filtered on the following fields: - `MinorStatus` diff --git a/dashboards/WMSMonitoring/WMSMonitoring.json b/dashboards/WMSMonitoring/WMSMonitoring.json index 94e5c998ac..f396cc3655 100644 --- a/dashboards/WMSMonitoring/WMSMonitoring.json +++ b/dashboards/WMSMonitoring/WMSMonitoring.json @@ -47,7 +47,7 @@ "showLineNumbers": false, "showMiniMap": false }, - "content": "\n\nThis dashboard lets users create plots based on the WMS monitoring data that is stored on ElasticSearch/OpenSearch.\n\nWhen querying over long time ranges, grafana aggregates (sums) `Metric` over larger time bins than the default ElasticSearch/OpenSearch ones (15m) to lower the number of data points\nit has to plot.\n\nTo account for this, `Metric` is calculated as the `Metric` per hour, regardless of the actual bin size displayed", + "content": "\n\nThis dashboard lets users create plots based on the WMS monitoring data that is stored on ElasticSearch/OpenSearch.\n\nWhen querying over long time ranges, grafana aggregates (sums) `Metric` over larger time bins than the default ElasticSearch/OpenSearch ones (15m) to lower the number of data points\nit has to plot.\n\nTo account for this and show consistent values, `Metric` is calculated as the `Metric` per 15m, regardless of the actual bin size displayed", "mode": "markdown" }, "pluginVersion": "10.1.5", @@ -67,7 +67,7 @@ "custom": { "axisCenteredZero": false, "axisColorMode": "text", - "axisLabel": "Jobs/hour", + "axisLabel": "Jobs/15m", "axisPlacement": "auto", "barAlignment": 0, "drawStyle": "line", @@ -171,7 +171,7 @@ "field": "$Metric", "id": "1", "settings": { - "script": "_value * 3600 / $__interval_ms * 1000" + "script": "_value * 3600 / $__interval_ms * 250" }, "type": "sum" } @@ -199,7 +199,7 @@ "custom": { "axisCenteredZero": false, "axisColorMode": "text", - "axisLabel": "Jobs/hour", + "axisLabel": "Jobs/15m", "axisPlacement": "auto", "barAlignment": 0, "drawStyle": "line", @@ -305,7 +305,7 @@ "hide": false, "id": "1", "settings": { - "script": "_value * 3600 / $__interval_ms * 1000" + "script": "_value * 3600 / $__interval_ms * 250" }, "type": "avg" } -- GitLab