diff --git a/brian_dashboard_manager/templating/templates/homedashboard.json.j2 b/brian_dashboard_manager/templating/templates/homedashboard.json.j2
index c55c5e7f44e8c219b0e23af47a2e45607bd87a31..d29f738a29a70e797cf521ce556be9a88f0a2e76 100644
--- a/brian_dashboard_manager/templating/templates/homedashboard.json.j2
+++ b/brian_dashboard_manager/templating/templates/homedashboard.json.j2
@@ -986,7 +986,7 @@
"steppedLine": false,
"targets": [
{
- "alias": "Customer",
+ "alias": "Private",
"groupBy": [
{
"params": [
@@ -1004,9 +1004,7 @@
"measurement": "interface_rates",
"orderByTime": "ASC",
"policy": "default",
- "query": "SELECT mean(\"ingress\") *8 FROM \"interface_rates\" WHERE (\"interface_name\" = 'PHY_CUSTOMER') AND $timeFilter GROUP BY time($__interval) fill(linear)",
- "rawQuery": false,
- "refId": "A",
+ "refId": "B",
"resultFormat": "time_series",
"select": [
[
@@ -1032,12 +1030,12 @@
{
"key": "interface_name",
"operator": "=",
- "value": "PHY_CUSTOMER"
+ "value": "PHY_PRIVATE"
}
]
},
{
- "alias": "Private",
+ "alias": "R&E Interconnect",
"groupBy": [
{
"params": [
@@ -1047,7 +1045,7 @@
},
{
"params": [
- "linear"
+ "null"
],
"type": "fill"
}
@@ -1055,7 +1053,7 @@
"measurement": "interface_rates",
"orderByTime": "ASC",
"policy": "default",
- "refId": "B",
+ "refId": "C",
"resultFormat": "time_series",
"select": [
[
@@ -1071,7 +1069,7 @@
},
{
"params": [
- "*8"
+ "* 8"
],
"type": "math"
}
@@ -1081,12 +1079,12 @@
{
"key": "interface_name",
"operator": "=",
- "value": "PHY_PRIVATE"
+ "value": "PHY_RE_INTERCONNECT"
}
]
},
{
- "alias": "R&E Interconnect",
+ "alias": "Public",
"groupBy": [
{
"params": [
@@ -1104,7 +1102,7 @@
"measurement": "interface_rates",
"orderByTime": "ASC",
"policy": "default",
- "refId": "C",
+ "refId": "D",
"resultFormat": "time_series",
"select": [
[
@@ -1130,12 +1128,12 @@
{
"key": "interface_name",
"operator": "=",
- "value": "PHY_RE_INTERCONNECT"
+ "value": "PHY_PUBLIC"
}
]
},
{
- "alias": "Public",
+ "alias": "Upstream",
"groupBy": [
{
"params": [
@@ -1153,7 +1151,7 @@
"measurement": "interface_rates",
"orderByTime": "ASC",
"policy": "default",
- "refId": "D",
+ "refId": "E",
"resultFormat": "time_series",
"select": [
[
@@ -1179,12 +1177,12 @@
{
"key": "interface_name",
"operator": "=",
- "value": "PHY_PUBLIC"
+ "value": "PHY_UPSTREAM"
}
]
},
{
- "alias": "Upstream",
+ "alias": "Customer",
"groupBy": [
{
"params": [
@@ -1194,7 +1192,7 @@
},
{
"params": [
- "null"
+ "linear"
],
"type": "fill"
}
@@ -1202,7 +1200,9 @@
"measurement": "interface_rates",
"orderByTime": "ASC",
"policy": "default",
- "refId": "E",
+ "query": "SELECT mean(\"ingress\") *8 FROM \"interface_rates\" WHERE (\"interface_name\" = 'PHY_CUSTOMER') AND $timeFilter GROUP BY time($__interval) fill(linear)",
+ "rawQuery": false,
+ "refId": "A",
"resultFormat": "time_series",
"select": [
[
@@ -1218,7 +1218,7 @@
},
{
"params": [
- "* 8"
+ "*8"
],
"type": "math"
}
@@ -1228,7 +1228,7 @@
{
"key": "interface_name",
"operator": "=",
- "value": "PHY_UPSTREAM"
+ "value": "PHY_CUSTOMER"
}
]
}
@@ -1322,7 +1322,7 @@
"steppedLine": false,
"targets": [
{
- "alias": "Customer",
+ "alias": "Private",
"groupBy": [
{
"params": [
@@ -1340,9 +1340,7 @@
"measurement": "interface_rates",
"orderByTime": "ASC",
"policy": "default",
- "query": "SELECT mean(\"ingress\") *8 FROM \"interface_rates\" WHERE (\"interface_name\" = 'PHY_CUSTOMER') AND $timeFilter GROUP BY time($__interval) fill(linear)",
- "rawQuery": false,
- "refId": "A",
+ "refId": "B",
"resultFormat": "time_series",
"select": [
[
@@ -1368,12 +1366,12 @@
{
"key": "interface_name",
"operator": "=",
- "value": "PHY_CUSTOMER"
+ "value": "PHY_PRIVATE"
}
]
},
{
- "alias": "Private",
+ "alias": "R&E Interconnect",
"groupBy": [
{
"params": [
@@ -1383,7 +1381,7 @@
},
{
"params": [
- "linear"
+ "null"
],
"type": "fill"
}
@@ -1391,7 +1389,7 @@
"measurement": "interface_rates",
"orderByTime": "ASC",
"policy": "default",
- "refId": "B",
+ "refId": "C",
"resultFormat": "time_series",
"select": [
[
@@ -1407,7 +1405,7 @@
},
{
"params": [
- "*8"
+ "* 8"
],
"type": "math"
}
@@ -1417,12 +1415,12 @@
{
"key": "interface_name",
"operator": "=",
- "value": "PHY_PRIVATE"
+ "value": "PHY_RE_INTERCONNECT"
}
]
},
{
- "alias": "R&E Interconnect",
+ "alias": "Public",
"groupBy": [
{
"params": [
@@ -1440,7 +1438,7 @@
"measurement": "interface_rates",
"orderByTime": "ASC",
"policy": "default",
- "refId": "C",
+ "refId": "D",
"resultFormat": "time_series",
"select": [
[
@@ -1466,12 +1464,12 @@
{
"key": "interface_name",
"operator": "=",
- "value": "PHY_RE_INTERCONNECT"
+ "value": "PHY_PUBLIC"
}
]
},
{
- "alias": "Public",
+ "alias": "Upstream",
"groupBy": [
{
"params": [
@@ -1489,7 +1487,7 @@
"measurement": "interface_rates",
"orderByTime": "ASC",
"policy": "default",
- "refId": "D",
+ "refId": "E",
"resultFormat": "time_series",
"select": [
[
@@ -1515,12 +1513,12 @@
{
"key": "interface_name",
"operator": "=",
- "value": "PHY_PUBLIC"
+ "value": "PHY_UPSTREAM"
}
]
},
{
- "alias": "Upstream",
+ "alias": "Customer",
"groupBy": [
{
"params": [
@@ -1530,7 +1528,7 @@
},
{
"params": [
- "null"
+ "linear"
],
"type": "fill"
}
@@ -1538,7 +1536,9 @@
"measurement": "interface_rates",
"orderByTime": "ASC",
"policy": "default",
- "refId": "E",
+ "query": "SELECT mean(\"ingress\") *8 FROM \"interface_rates\" WHERE (\"interface_name\" = 'PHY_CUSTOMER') AND $timeFilter GROUP BY time($__interval) fill(linear)",
+ "rawQuery": false,
+ "refId": "A",
"resultFormat": "time_series",
"select": [
[
@@ -1554,7 +1554,7 @@
},
{
"params": [
- "* 8"
+ "*8"
],
"type": "math"
}
@@ -1564,7 +1564,7 @@
{
"key": "interface_name",
"operator": "=",
- "value": "PHY_UPSTREAM"
+ "value": "PHY_CUSTOMER"
}
]
}
diff --git a/changelog.md b/changelog.md
index ede1942c9d6f16e395ce61686c1aeeaee9a42e6f..2afc491ea5be064f57cf882fe167cde58e96746c 100644
--- a/changelog.md
+++ b/changelog.md
@@ -2,6 +2,9 @@
All notable changes to this project will be documented in this file.
+## [0.56] - 2023-02-15
+- Change Customers on home dashboard to be the first series shown
+
## [0.55] - 2023-02-12
- POL1-648 minor change/fix: don't show IPv6 graph sections for dashboards lacking IPv6 graphs
diff --git a/setup.py b/setup.py
index 16ee3abb8d527501d1a778ab7ce360431ad3075e..4540eabc667d2b8b86f6d2f187d62c08b018b2c6 100644
--- a/setup.py
+++ b/setup.py
@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
setup(
name='brian-dashboard-manager',
- version="0.55",
+ version="0.56",
author='GEANT',
author_email='swd@geant.org',
description='',