diff --git a/brian_dashboard_manager/config.py b/brian_dashboard_manager/config.py index 49d8a3a9b1349caed8b2b06a1e0f566034fe8f31..dab824b939eb34c7d1b0915c99c2113f85290ad2 100644 --- a/brian_dashboard_manager/config.py +++ b/brian_dashboard_manager/config.py @@ -48,10 +48,12 @@ DEFAULT_ORGANIZATIONS = [ "excluded_dashboards": [ "GÉANT Office devices", "GÉANT VM", - "Lab Devices" + "Lab Devices", + "EUMETSAT" ], "excluded_folders": { - "Aggregates": ["CAE1"] + "Aggregates": ["CAE1"], + "EUMETSAT Multicast": True } }, { @@ -68,7 +70,8 @@ DEFAULT_ORGANIZATIONS = [ "GÉANT VM", "Lab Devices", "IAS", - "IAS Peers" + "IAS Peers", + "EUMETSAT" ], "excluded_folders": { "Aggregates": ["CAE1", "GWS UPSTREAMS", "IAS PEERS"], @@ -79,6 +82,7 @@ DEFAULT_ORGANIZATIONS = [ "GWS PHY Upstream": True, "GWS Direct": True, "GWS Indirect": True, + "EUMETSAT Multicast": True } }, { @@ -93,9 +97,10 @@ DEFAULT_ORGANIZATIONS = [ "GÉANT Office devices", "GÉANT VM", "Lab Devices", + "EUMETSAT" ], "excluded_folders": { - + "EUMETSAT Multicast": True } }, { @@ -112,7 +117,8 @@ DEFAULT_ORGANIZATIONS = [ "GÉANT VM", "Lab Devices", "IAS", - "IAS Peers" + "IAS Peers", + "EUMETSAT" ], "excluded_folders": { "Aggregates": ["GWS UPSTREAMS", "IAS PEERS"], @@ -121,6 +127,7 @@ DEFAULT_ORGANIZATIONS = [ "IAS PUBLIC": True, "IAS UPSTREAM": True, "GWS PHY Upstream": True, + "EUMETSAT Multicast": True } } ] diff --git a/brian_dashboard_manager/dashboards/services_eumetsat.json b/brian_dashboard_manager/dashboards/services_eumetsat.json new file mode 100755 index 0000000000000000000000000000000000000000..6cc2b5afcd725ff7a51f77a5fe30b677c4d391f1 --- /dev/null +++ b/brian_dashboard_manager/dashboards/services_eumetsat.json @@ -0,0 +1,120 @@ +{ + "annotations": { + "list": [ + { + "builtIn": 1, + "datasource": "-- Grafana --", + "enable": true, + "hide": true, + "iconColor": "rgba(0, 211, 255, 1)", + "name": "Annotations & Alerts", + "type": "dashboard" + } + ] + }, + "editable": true, + "gnetId": null, + "graphTooltip": 0, + "id": 454, + "links": [ + ], + "panels": [ + { + "datasource": null, + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, + "folderId": null, + "gridPos": { + "h": 25, + "w": 24, + "x": 0, + "y": 0 + }, + "headings": false, + "id": 2, + "limit": 100, + "pluginVersion": "7.1.4", + "query": "", + "recent": false, + "search": true, + "starred": false, + "tags": [ + "EUMET_MULTICAST" + ], + "targets": [ + { + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], + "orderByTime": "ASC", + "policy": "default", + "refId": "A", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "value" + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], + "tags": [] + } + ], + "timeFrom": null, + "timeShift": null, + "title": "EUMETSAT Multicast", + "type": "dashlist" + } + ], + "schemaVersion": 26, + "style": "dark", + "tags": [ + "services" + ], + "templating": { + "list": [] + }, + "time": { + "from": "now-6h", + "to": "now" + }, + "timepicker": { + "refresh_intervals": [ + "5s", + "10s", + "30s", + "1m", + "5m", + "15m", + "30m", + "1h", + "2h", + "1d" + ] + }, + "timezone": "", + "title": "EUMETSAT", + "version": 1 +} diff --git a/brian_dashboard_manager/templating/templates/shared/panel_target.json.j2 b/brian_dashboard_manager/templating/templates/shared/panel_target.json.j2 index 7247e1723a84bbca4e9ad1de260f6101d3ef6958..c9bd6c35fb9c7d942698888bd2be4e545a89e2bd 100644 --- a/brian_dashboard_manager/templating/templates/shared/panel_target.json.j2 +++ b/brian_dashboard_manager/templating/templates/shared/panel_target.json.j2 @@ -3,7 +3,7 @@ "groupBy": [ {% if not percentile %} { - "params": ["5m"], + "params": ["$__interval"], "type": "time" }, { diff --git a/changelog.md b/changelog.md index 65c24fb06e387e5a7df14d6dcdf07cbc593694db..c38f580816ea8b29fc8257817d7f57b708b654de 100644 --- a/changelog.md +++ b/changelog.md @@ -2,6 +2,10 @@ All notable changes to this project will be documented in this file. +## [0.27] - 2021-11-01 +- POL1-463: Added a menu item to a dashboard list for EUMETSAT multicast +- changed group by window from '5m' to '$__interval', globally + ## [0.26] - 2021-10-12 - increase thread pool sizes from 1 to 4 diff --git a/setup.py b/setup.py index 4282b3cd06649b20b3033119970abf983afd5ff5..01e056d338f302c14f3bf4438240bdfad891488c 100644 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ from setuptools import setup, find_packages setup( name='brian-dashboard-manager', - version="0.26", + version="0.27", author='GEANT', author_email='swd@geant.org', description='',