From e33e33d18b768593d38238da2aeb586921b8f6e8 Mon Sep 17 00:00:00 2001 From: Adrian Coveney Date: Mon, 15 May 2023 14:11:49 +0100 Subject: [PATCH 1/4] Correct time period change introduced in 4b387e --- dashboards/iris/iris.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dashboards/iris/iris.json b/dashboards/iris/iris.json index dd1d037..7c6c889 100644 --- a/dashboards/iris/iris.json +++ b/dashboards/iris/iris.json @@ -160,7 +160,7 @@ }, "paceLength": 10, "percentage": false, - "pluginVersion": "9.4.3", + "pluginVersion": "9.5.2", "pointradius": 2, "points": false, "renderer": "flot", @@ -2303,8 +2303,8 @@ ] }, "time": { - "from": "2015-05-05T16:27:38.205Z", - "to": "2025-12-23T22:37:05.385Z" + "from": "2018-01-01T00:00:00.000Z", + "to": "now" }, "timepicker": { "refresh_intervals": [ From fcbcc9741642ff5a3ff074d15692f83107142c53 Mon Sep 17 00:00:00 2001 From: Adrian Coveney Date: Mon, 15 May 2023 14:16:28 +0100 Subject: [PATCH 2/4] Reorder drop downs --- dashboards/iris/iris.json | 56 +++++++++++++++++++-------------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/dashboards/iris/iris.json b/dashboards/iris/iris.json index 7c6c889..e24b634 100644 --- a/dashboards/iris/iris.json +++ b/dashboards/iris/iris.json @@ -2239,6 +2239,34 @@ "type": "query", "useTags": false }, + { + "current": { + "selected": true, + "text": [ + "All" + ], + "value": [ + "$__all" + ] + }, + "datasource": { + "type": "mysql", + "uid": "P4815E41304F4136B" + }, + "definition": "SELECT VOGroup FROM VCombinedSummaries WHERE VO in ($VO)", + "hide": 0, + "includeAll": true, + "label": "Sub-Activity", + "multi": true, + "name": "VOGroup", + "options": [], + "query": "SELECT VOGroup FROM VCombinedSummaries WHERE VO in ($VO)", + "refresh": 1, + "regex": "", + "skipUrlSync": false, + "sort": 0, + "type": "query" + }, { "current": { "selected": true, @@ -2271,34 +2299,6 @@ "queryValue": "", "skipUrlSync": false, "type": "custom" - }, - { - "current": { - "selected": true, - "text": [ - "All" - ], - "value": [ - "$__all" - ] - }, - "datasource": { - "type": "mysql", - "uid": "P4815E41304F4136B" - }, - "definition": "SELECT VOGroup FROM VCombinedSummaries WHERE VO in ($VO)", - "hide": 0, - "includeAll": true, - "label": "Sub-Activity", - "multi": true, - "name": "VOGroup", - "options": [], - "query": "SELECT VOGroup FROM VCombinedSummaries WHERE VO in ($VO)", - "refresh": 1, - "regex": "", - "skipUrlSync": false, - "sort": 0, - "type": "query" } ] }, From 9da9dfaa5715b6ee33b14c9f8878d53f8006c00b Mon Sep 17 00:00:00 2001 From: Adrian Coveney Date: Mon, 15 May 2023 14:39:42 +0100 Subject: [PATCH 3/4] Add main tags on IRIS dashboards --- dashboards/iris/activity_view.json | 19 ++-- dashboards/iris/iris.json | 4 +- dashboards/iris/provider_view.json | 20 +++-- dashboards/iris/resource_manager.json | 119 ++++++++++++++------------ 4 files changed, 90 insertions(+), 72 deletions(-) diff --git a/dashboards/iris/activity_view.json b/dashboards/iris/activity_view.json index 441474e..e60a6fa 100644 --- a/dashboards/iris/activity_view.json +++ b/dashboards/iris/activity_view.json @@ -24,7 +24,7 @@ "editable": true, "fiscalYearStartMonth": 0, "graphTooltip": 0, - "id": 20, + "id": 4, "links": [ { "asDropdown": false, @@ -137,7 +137,7 @@ }, "paceLength": 10, "percentage": false, - "pluginVersion": "9.4.3", + "pluginVersion": "9.5.2", "pointradius": 2, "points": false, "renderer": "flot", @@ -358,7 +358,7 @@ }, "paceLength": 10, "percentage": false, - "pluginVersion": "9.4.3", + "pluginVersion": "9.5.2", "pointradius": 5, "points": false, "renderer": "flot", @@ -533,7 +533,7 @@ }, "paceLength": 10, "percentage": false, - "pluginVersion": "9.4.3", + "pluginVersion": "9.5.2", "pointradius": 5, "points": false, "renderer": "flot", @@ -646,8 +646,7 @@ "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" }, { "color": "red", @@ -750,7 +749,9 @@ "revision": 1, "schemaVersion": 38, "style": "dark", - "tags": [], + "tags": [ + "main" + ], "templating": { "list": [ { @@ -929,6 +930,6 @@ "timezone": "", "title": "Activity View", "uid": "TfxgjgJZk", - "version": 9, + "version": 3, "weekStart": "" -} \ No newline at end of file +} diff --git a/dashboards/iris/iris.json b/dashboards/iris/iris.json index e24b634..2f2f460 100644 --- a/dashboards/iris/iris.json +++ b/dashboards/iris/iris.json @@ -2144,7 +2144,9 @@ "revision": 1, "schemaVersion": 38, "style": "dark", - "tags": [], + "tags": [ + "main" + ], "templating": { "list": [ { diff --git a/dashboards/iris/provider_view.json b/dashboards/iris/provider_view.json index 8bf70d1..e4d5069 100644 --- a/dashboards/iris/provider_view.json +++ b/dashboards/iris/provider_view.json @@ -25,7 +25,7 @@ "editable": true, "fiscalYearStartMonth": 0, "graphTooltip": 0, - "id": 19, + "id": 3, "links": [ { "asDropdown": false, @@ -92,7 +92,7 @@ "alertThreshold": true }, "percentage": false, - "pluginVersion": "9.4.3", + "pluginVersion": "9.5.2", "pointradius": 2, "points": false, "renderer": "flot", @@ -339,7 +339,7 @@ }, "paceLength": 10, "percentage": false, - "pluginVersion": "9.4.3", + "pluginVersion": "9.5.2", "pointradius": 2, "points": false, "renderer": "flot", @@ -565,7 +565,7 @@ }, "paceLength": 10, "percentage": false, - "pluginVersion": "9.4.3", + "pluginVersion": "9.5.2", "pointradius": 5, "points": false, "renderer": "flot", @@ -745,7 +745,7 @@ }, "paceLength": 10, "percentage": false, - "pluginVersion": "9.4.3", + "pluginVersion": "9.5.2", "pointradius": 5, "points": false, "renderer": "flot", @@ -929,7 +929,7 @@ }, "paceLength": 10, "percentage": false, - "pluginVersion": "9.4.3", + "pluginVersion": "9.5.2", "pointradius": 2, "points": false, "renderer": "flot", @@ -1163,7 +1163,9 @@ "revision": 1, "schemaVersion": 38, "style": "dark", - "tags": [], + "tags": [ + "main" + ], "templating": { "list": [ { @@ -1342,6 +1344,6 @@ "timezone": "", "title": "Provider View", "uid": "TEXgjgJZk", - "version": 11, + "version": 3, "weekStart": "" -} \ No newline at end of file +} diff --git a/dashboards/iris/resource_manager.json b/dashboards/iris/resource_manager.json index 886defd..20b1413 100644 --- a/dashboards/iris/resource_manager.json +++ b/dashboards/iris/resource_manager.json @@ -3,7 +3,10 @@ "list": [ { "builtIn": 1, - "datasource": "-- Grafana --", + "datasource": { + "type": "datasource", + "uid": "grafana" + }, "enable": true, "hide": true, "iconColor": "rgba(0, 211, 255, 1)", @@ -13,9 +16,9 @@ ] }, "editable": true, - "gnetId": null, + "fiscalYearStartMonth": 0, "graphTooltip": 0, - "iteration": 1614179417286, + "id": 5, "links": [ { "icon": "external link", @@ -25,6 +28,7 @@ "type": "dashboards" } ], + "liveNow": false, "panels": [ { "aliasColors": { @@ -61,12 +65,9 @@ "vo.cta.in2p3.fr": "#23628F" }, "columns": [], - "datasource": "IRIS Shared MySQL Database", - "fieldConfig": { - "defaults": { - "custom": {} - }, - "overrides": [] + "datasource": { + "type": "mysql", + "uid": "P4815E41304F4136B" }, "fontSize": "100%", "gridPos": { @@ -76,7 +77,6 @@ "y": 0 }, "id": 28, - "pageSize": null, "scroll": true, "showHeader": true, "sort": { @@ -94,7 +94,6 @@ { "alias": "", "align": "auto", - "colorMode": null, "colors": [ "rgba(245, 54, 54, 0.9)", "rgba(237, 129, 40, 0.89)", @@ -131,7 +130,6 @@ { "alias": "", "align": "auto", - "colorMode": null, "colors": [ "rgba(245, 54, 54, 0.9)", "rgba(237, 129, 40, 0.89)", @@ -149,6 +147,10 @@ ], "targets": [ { + "datasource": { + "type": "mysql", + "uid": "P4815E41304F4136B" + }, "format": "table", "group": [], "metricColumn": "none", @@ -177,6 +179,10 @@ ] }, { + "datasource": { + "type": "mysql", + "uid": "P4815E41304F4136B" + }, "format": "table", "group": [], "metricColumn": "none", @@ -205,8 +211,6 @@ ] } ], - "timeFrom": null, - "timeShift": null, "title": "Previous Month Usage vs Current Month Projection (Elapsed time * Number of Processors)", "transform": "table", "type": "table-old" @@ -246,12 +250,9 @@ "vo.cta.in2p3.fr": "#23628F" }, "columns": [], - "datasource": "IRIS Shared MySQL Database", - "fieldConfig": { - "defaults": { - "custom": {} - }, - "overrides": [] + "datasource": { + "type": "mysql", + "uid": "P4815E41304F4136B" }, "fontSize": "100%", "gridPos": { @@ -261,7 +262,6 @@ "y": 0 }, "id": 29, - "pageSize": null, "scroll": true, "showHeader": true, "sort": { @@ -279,7 +279,6 @@ { "alias": "", "align": "auto", - "colorMode": null, "colors": [ "rgba(245, 54, 54, 0.9)", "rgba(237, 129, 40, 0.89)", @@ -316,7 +315,6 @@ { "alias": "", "align": "auto", - "colorMode": null, "colors": [ "rgba(245, 54, 54, 0.9)", "rgba(237, 129, 40, 0.89)", @@ -334,6 +332,10 @@ ], "targets": [ { + "datasource": { + "type": "mysql", + "uid": "P4815E41304F4136B" + }, "format": "table", "group": [], "metricColumn": "none", @@ -362,6 +364,10 @@ ] }, { + "datasource": { + "type": "mysql", + "uid": "P4815E41304F4136B" + }, "format": "table", "group": [], "metricColumn": "none", @@ -390,8 +396,6 @@ ] } ], - "timeFrom": null, - "timeShift": null, "title": "Cumulative Usage and Allocation for Selected Time Period", "transform": "table", "type": "table-old" @@ -437,13 +441,14 @@ "vo.cta.in2p3.fr": "#23628F" }, "bars": true, - "cacheTimeout": null, "dashLength": 10, "dashes": false, - "datasource": "-- Mixed --", + "datasource": { + "type": "datasource", + "uid": "-- Mixed --" + }, "fieldConfig": { "defaults": { - "custom": {}, "links": [] }, "overrides": [] @@ -482,7 +487,7 @@ }, "paceLength": 10, "percentage": false, - "pluginVersion": "7.3.6", + "pluginVersion": "9.5.2", "pointradius": 2, "points": false, "renderer": "flot", @@ -492,7 +497,10 @@ "steppedLine": false, "targets": [ { - "datasource": "IRIS Grid MySQL Database", + "datasource": { + "type": "mysql", + "uid": "P9C45EB8A2EC077CB" + }, "format": "time_series", "group": [], "metricColumn": "none", @@ -521,7 +529,10 @@ ] }, { - "datasource": "IRIS Cloud MySQL Database", + "datasource": { + "type": "mysql", + "uid": "P4F607087F2DEDCD9" + }, "format": "time_series", "group": [ { @@ -575,7 +586,10 @@ ] }, { - "datasource": "IRIS Grid MySQL Database", + "datasource": { + "type": "mysql", + "uid": "P9C45EB8A2EC077CB" + }, "format": "time_series", "group": [], "metricColumn": "none", @@ -604,7 +618,10 @@ ] }, { - "datasource": "IRIS Cloud MySQL Database", + "datasource": { + "type": "mysql", + "uid": "P4F607087F2DEDCD9" + }, "format": "time_series", "group": [], "metricColumn": "none", @@ -636,7 +653,6 @@ "thresholds": [], "timeFrom": "now/M", "timeRegions": [], - "timeShift": null, "title": "Projected Usage", "tooltip": { "shared": false, @@ -646,9 +662,7 @@ "transparent": true, "type": "graph", "xaxis": { - "buckets": null, "mode": "series", - "name": null, "show": true, "values": [ "total" @@ -660,7 +674,6 @@ "format": "short", "label": "", "logBase": 1, - "max": null, "min": "0", "show": true }, @@ -669,25 +682,23 @@ "format": "short", "label": "", "logBase": 1, - "max": null, - "min": null, "show": false } ], "yaxis": { - "align": false, - "alignLevel": null + "align": false } } ], - "refresh": false, - "schemaVersion": 26, + "refresh": "", + "schemaVersion": 38, "style": "dark", - "tags": [], + "tags": [ + "main" + ], "templating": { "list": [ { - "allValue": null, "current": { "selected": true, "text": [ @@ -697,9 +708,11 @@ "$__all" ] }, - "datasource": "IRIS Shared MySQL Database", + "datasource": { + "type": "mysql", + "uid": "P4815E41304F4136B" + }, "definition": "SELECT Site FROM Projects", - "error": null, "hide": 0, "includeAll": true, "label": "Site", @@ -712,13 +725,11 @@ "skipUrlSync": false, "sort": 0, "tagValuesQuery": "", - "tags": [], "tagsQuery": "", "type": "query", "useTags": false }, { - "allValue": null, "current": { "selected": true, "text": [ @@ -728,9 +739,11 @@ "$__all" ] }, - "datasource": "IRIS Shared MySQL Database", + "datasource": { + "type": "mysql", + "uid": "P4815E41304F4136B" + }, "definition": "SELECT * FROM IrisVOs", - "error": null, "hide": 0, "includeAll": true, "label": "Activity", @@ -743,7 +756,6 @@ "skipUrlSync": false, "sort": 0, "tagValuesQuery": "", - "tags": [], "tagsQuery": "", "type": "query", "useTags": false @@ -771,5 +783,6 @@ "timezone": "", "title": "Resource Manager", "uid": "feTpkMumkc", - "version": 2 + "version": 2, + "weekStart": "" } From 043f41847a5b0c5d309373634e6f49a9b0935f2b Mon Sep 17 00:00:00 2001 From: Adrian Coveney Date: Mon, 15 May 2023 15:02:05 +0100 Subject: [PATCH 4/4] Re-add missing Line Series variable --- dashboards/iris/iris.json | 43 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 41 insertions(+), 2 deletions(-) diff --git a/dashboards/iris/iris.json b/dashboards/iris/iris.json index 2f2f460..bcb7c62 100644 --- a/dashboards/iris/iris.json +++ b/dashboards/iris/iris.json @@ -25,7 +25,7 @@ "editable": true, "fiscalYearStartMonth": 0, "graphTooltip": 0, - "id": 18, + "id": 2, "links": [ { "asDropdown": false, @@ -2301,6 +2301,45 @@ "queryValue": "", "skipUrlSync": false, "type": "custom" + }, + { + "current": { + "selected": true, + "text": "Both", + "value": "Both" + }, + "description": "Select which line series appear.", + "hide": 0, + "includeAll": false, + "label": "Line Series", + "multi": false, + "name": "LineSeries", + "options": [ + { + "selected": true, + "text": "Both", + "value": "Both" + }, + { + "selected": false, + "text": "Just Allocation", + "value": "Just Allocation" + }, + { + "selected": false, + "text": "Just Capacity", + "value": "Just Capacity" + }, + { + "selected": false, + "text": "Neither", + "value": "Neither" + } + ], + "query": "Both,Just Allocation,Just Capacity,Neither", + "queryValue": "", + "skipUrlSync": false, + "type": "custom" } ] }, @@ -2325,6 +2364,6 @@ "timezone": "", "title": "IRIS Accounting Dashboard", "uid": "feTpkMumk", - "version": 17, + "version": 8, "weekStart": "" }