diff --git a/dashboards/ShifterDashboards/HLTFarmStatus/HLTFarmStatus.json b/dashboards/ShifterDashboards/HLTFarmStatus/HLTFarmStatus.json index 74627568880f90bb5a26e17ba97b28789f645a08..0af7aa4ff4474ca77f77f988dfb9f12d802b983a 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 91d1a580b797289ffb2d56fd44d79cb893553aa2..dca582b81c7f4eaf5997a37c406d15145ec33853 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 8daffa846bd2c0740a22a74ff19ff712c7e19dc8..e2a662bbf29fad5294186f59984284201efb9ec8 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 2aac614d9f7f7ce796a92949f40385a2976f0a1d..d37efaf769bf8f4c9910df5bb1193527d1312cef 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 fce8981624c476b82a1e40b091495bceda1f68dc..d350f4166776b858041b30ace9efe9f05b61151b 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 4b56c79578a1c8553dff4a3221d31c84b1dd75f2..7c41ce9517ec5329132804bc2cb1ca9e7de9ca4b 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 0f9e377414de9d8d2a18aca4010b12f4560ef94a..c551ac3aaedff4cca285e53d84894698e7674e6e 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 c3abd878c443e49483272567c4615742ed3f5947..cc18b029f29d877baa401b1317cebacd2ee24b9a 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 94e5c998ac254849ef94043e3e6936cefd4576dc..f396cc3655ca85edfa876b1b0e6b4444cd4ad49c 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" }