Skip to content
Snippets Groups Projects
Commit 7fd12d1e authored by Release Webservice's avatar Release Webservice
Browse files

Finished release 0.33.

parents 816ca232 d6233a9a
No related branches found
Tags 0.33
No related merge requests found
Hide whitespace changes
Inline Side-by-side
brian_dashboard_manager/config.py
+ 3
− 1
View file @ 7fd12d1e
......@@ -29,8 +29,10 @@ If the value is a list, dashboard titles within the list should be excluded.
import json
import jsonschema
import tempfile
STATE_PATH = '/tmp/briandashboardmanager-state.json'
STATE_PATH = tempfile.gettempdir() + '/briandashboardmanager-state.json'
DEFAULT_ORGANIZATIONS = [
{
......
brian_dashboard_manager/templating/templates/homedashboard.json.j2
+ 657
− 47
View file @ 7fd12d1e
......@@ -640,66 +640,676 @@
}
{% else %}
{
"aliasColors": {},
"bars": false,
"dashLength": 10,
"dashes": false,
"datasource": null,
"fieldConfig": {
"defaults": {
"custom": {}
},
"overrides": []
"defaults": {
"custom": {}
},
"overrides": []
},
"fill": 1,
"fillGradient": 0,
"gridPos": {
"h": 10,
"w": 24,
"x": 0,
"y": 0
"h": 8,
"w": 12,
"x": 0,
"y": 0
},
"hiddenSeries": false,
"id": 6,
"legend": {
"avg": false,
"current": false,
"max": false,
"min": false,
"show": true,
"total": false,
"values": false
},
"id": 4,
"lines": true,
"linewidth": 1,
"nullPointMode": "null",
"options": {
"content": "<center><img src=\"https://connect.geant.org/wp-content/uploads/2021/04/geant_logo.png\" alt=\"GEANT Logo\" height=\"308\" width=\"616\"></center>",
"mode": "html"
"alertThreshold": true
},
"pluginVersion": "7.1.0",
"percentage": false,
"pluginVersion": "7.2.1",
"pointradius": 2,
"points": false,
"renderer": "flot",
"seriesOverrides": [],
"spaceLength": 10,
"stack": true,
"steppedLine": false,
"targets": [
{
"groupBy": [
{
"params": [
"$__interval"
],
"type": "time"
},
{
"params": [
"null"
],
"type": "fill"
}
{
"alias": "Customer",
"groupBy": [
{
"params": [
"15m"
],
"type": "time"
},
{
"params": [
"linear"
],
"type": "fill"
}
],
"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",
"resultFormat": "time_series",
"select": [
[
{
"params": [
"ingress"
],
"type": "field"
},
{
"params": [],
"type": "mean"
},
{
"params": [
"*8"
],
"type": "math"
}
]
],
"tags": [
{
"key": "interface_name",
"operator": "=",
"value": "PHY_CUSTOMER"
}
]
},
{
"alias": "Private",
"groupBy": [
{
"params": [
"15m"
],
"type": "time"
},
{
"params": [
"linear"
],
"type": "fill"
}
],
"measurement": "interface_rates",
"orderByTime": "ASC",
"policy": "default",
"refId": "B",
"resultFormat": "time_series",
"select": [
[
{
"params": [
"ingress"
],
"type": "field"
},
{
"params": [],
"type": "mean"
},
{
"params": [
"*8"
],
"type": "math"
}
]
],
"tags": [
{
"key": "interface_name",
"operator": "=",
"value": "PHY_PRIVATE"
}
]
},
{
"alias": "R&E Interconnect",
"groupBy": [
{
"params": [
"15m"
],
"type": "time"
},
{
"params": [
"null"
],
"type": "fill"
}
],
"measurement": "interface_rates",
"orderByTime": "ASC",
"policy": "default",
"refId": "C",
"resultFormat": "time_series",
"select": [
[
{
"params": [
"ingress"
],
"type": "field"
},
{
"params": [],
"type": "mean"
},
{
"params": [
"* 8"
],
"type": "math"
}
]
],
"tags": [
{
"key": "interface_name",
"operator": "=",
"value": "PHY_RE_INTERCONNECT"
}
]
},
{
"alias": "Public",
"groupBy": [
{
"params": [
"15m"
],
"type": "time"
},
{
"params": [
"null"
],
"type": "fill"
}
],
"measurement": "interface_rates",
"orderByTime": "ASC",
"policy": "default",
"refId": "D",
"resultFormat": "time_series",
"select": [
[
{
"params": [
"ingress"
],
"type": "field"
},
{
"params": [],
"type": "mean"
},
{
"params": [
"* 8"
],
"type": "math"
}
]
],
"tags": [
{
"key": "interface_name",
"operator": "=",
"value": "PHY_PUBLIC"
}
]
},
{
"alias": "Upstream",
"groupBy": [
{
"params": [
"15m"
],
"orderByTime": "ASC",
"policy": "default",
"refId": "A",
"resultFormat": "time_series",
"select": [
[
{
"params": [
"value"
],
"type": "field"
},
{
"params": [],
"type": "mean"
}
]
"type": "time"
},
{
"params": [
"null"
],
"tags": []
}
"type": "fill"
}
],
"measurement": "interface_rates",
"orderByTime": "ASC",
"policy": "default",
"refId": "E",
"resultFormat": "time_series",
"select": [
[
{
"params": [
"ingress"
],
"type": "field"
},
{
"params": [],
"type": "mean"
},
{
"params": [
"* 8"
],
"type": "math"
}
]
],
"tags": [
{
"key": "interface_name",
"operator": "=",
"value": "PHY_UPSTREAM"
}
]
}
],
"thresholds": [],
"timeFrom": null,
"timeRegions": [],
"timeShift": null,
"title": "BRIAN",
"type": "text"
"title": "Network Aggregate (Ingress)",
"tooltip": {
"shared": true,
"sort": 0,
"value_type": "individual"
},
"type": "graph",
"xaxis": {
"buckets": null,
"mode": "time",
"name": null,
"show": true,
"values": []
},
"yaxes": [
{
"format": "bps",
"label": null,
"logBase": 1,
"max": null,
"min": null,
"show": true
},
{
"format": "short",
"label": null,
"logBase": 1,
"max": null,
"min": null,
"show": true
}
],
"yaxis": {
"align": false,
"alignLevel": null
}
},
{
"aliasColors": {},
"bars": false,
"dashLength": 10,
"dashes": false,
"datasource": null,
"fieldConfig": {
"defaults": {
"custom": {}
},
"overrides": []
},
"fill": 1,
"fillGradient": 0,
"gridPos": {
"h": 8,
"w": 12,
"x": 12,
"y": 0
},
"hiddenSeries": false,
"id": 7,
"legend": {
"avg": false,
"current": false,
"max": false,
"min": false,
"show": true,
"total": false,
"values": false
},
"lines": true,
"linewidth": 1,
"nullPointMode": "null",
"options": {
"alertThreshold": true
},
"percentage": false,
"pluginVersion": "7.2.1",
"pointradius": 2,
"points": false,
"renderer": "flot",
"seriesOverrides": [],
"spaceLength": 10,
"stack": true,
"steppedLine": false,
"targets": [
{
"alias": "Customer",
"groupBy": [
{
"params": [
"15m"
],
"type": "time"
},
{
"params": [
"linear"
],
"type": "fill"
}
],
"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",
"resultFormat": "time_series",
"select": [
[
{
"params": [
"egress"
],
"type": "field"
},
{
"params": [],
"type": "mean"
},
{
"params": [
"*8"
],
"type": "math"
}
]
],
"tags": [
{
"key": "interface_name",
"operator": "=",
"value": "PHY_CUSTOMER"
}
]
},
{
"alias": "Private",
"groupBy": [
{
"params": [
"15m"
],
"type": "time"
},
{
"params": [
"linear"
],
"type": "fill"
}
],
"measurement": "interface_rates",
"orderByTime": "ASC",
"policy": "default",
"refId": "B",
"resultFormat": "time_series",
"select": [
[
{
"params": [
"egress"
],
"type": "field"
},
{
"params": [],
"type": "mean"
},
{
"params": [
"*8"
],
"type": "math"
}
]
],
"tags": [
{
"key": "interface_name",
"operator": "=",
"value": "PHY_PRIVATE"
}
]
},
{
"alias": "R&E Interconnect",
"groupBy": [
{
"params": [
"15m"
],
"type": "time"
},
{
"params": [
"null"
],
"type": "fill"
}
],
"measurement": "interface_rates",
"orderByTime": "ASC",
"policy": "default",
"refId": "C",
"resultFormat": "time_series",
"select": [
[
{
"params": [
"egress"
],
"type": "field"
},
{
"params": [],
"type": "mean"
},
{
"params": [
"* 8"
],
"type": "math"
}
]
],
"tags": [
{
"key": "interface_name",
"operator": "=",
"value": "PHY_RE_INTERCONNECT"
}
]
},
{
"alias": "Public",
"groupBy": [
{
"params": [
"15m"
],
"type": "time"
},
{
"params": [
"null"
],
"type": "fill"
}
],
"measurement": "interface_rates",
"orderByTime": "ASC",
"policy": "default",
"refId": "D",
"resultFormat": "time_series",
"select": [
[
{
"params": [
"egress"
],
"type": "field"
},
{
"params": [],
"type": "mean"
},
{
"params": [
"* 8"
],
"type": "math"
}
]
],
"tags": [
{
"key": "interface_name",
"operator": "=",
"value": "PHY_PUBLIC"
}
]
},
{
"alias": "Upstream",
"groupBy": [
{
"params": [
"15m"
],
"type": "time"
},
{
"params": [
"null"
],
"type": "fill"
}
],
"measurement": "interface_rates",
"orderByTime": "ASC",
"policy": "default",
"refId": "E",
"resultFormat": "time_series",
"select": [
[
{
"params": [
"egress"
],
"type": "field"
},
{
"params": [],
"type": "mean"
},
{
"params": [
"* 8"
],
"type": "math"
}
]
],
"tags": [
{
"key": "interface_name",
"operator": "=",
"value": "PHY_UPSTREAM"
}
]
}
],
"thresholds": [],
"timeFrom": null,
"timeRegions": [],
"timeShift": null,
"title": "Network Aggregate (Egress)",
"tooltip": {
"shared": true,
"sort": 0,
"value_type": "individual"
},
"type": "graph",
"xaxis": {
"buckets": null,
"mode": "time",
"name": null,
"show": true,
"values": []
},
"yaxes": [
{
"format": "bps",
"label": null,
"logBase": 1,
"max": null,
"min": null,
"show": true
},
{
"format": "short",
"label": null,
"logBase": 1,
"max": null,
"min": null,
"show": true
}
],
"yaxis": {
"align": false,
"alignLevel": null
}
}
{% endif %}
],
......
changelog.md
+ 3
− 0
View file @ 7fd12d1e
......@@ -2,6 +2,9 @@
All notable changes to this project will be documented in this file.
## [0.33] - 2022-01-26
- POL1-520: Change home dashboard to show network aggregate ingress and egress rates
## [0.32] - 2021-12-14
- Fix bug with field *8 multiplier introduced for aggregate graphs
......
docker-setup/config/grafana.ini
+ 1
− 2
View file @ 7fd12d1e
......@@ -57,8 +57,7 @@ logging = true
[database]
# Either "mysql", "postgres" or "sqlite3", it's your choice
type = postgres
host = postgres
type = sqlite3
name = grafana
user = grafana
password = grafana
......
docker-setup/docker-compose.yaml
+ 0
− 13
View file @ 7fd12d1e
......@@ -10,17 +10,4 @@ services:
- ./config:/etc/grafana/
environment:
- GF_INSTALL_PLUGINS=grafana-simple-json-datasource
postgres:
restart: always
build:
context: .
args:
DBUSER: grafana
DBPASS: grafana
DBNAME: grafana
hostname: postgres
ports:
- "5432:5432"
volumes:
- ./postgresdata:/var/lib/postgresql:z
docker-setup/entrypoint.sh deleted 100755 → 0
+ 0
− 43
View file @ 816ca232
#!/bin/sh
# Entrypoint for the containerized database
# Ensures the required setup is performed on the share before
# starting the database
if [ "$PGDATA" = "" ]
then
echo "Environment variable PGDATA is not set"
exit 1
fi
if [ ! -d "$PGDATA" ]
then
echo "Directory $PGDATA does not exist - no volume mounted?"
exit 2
fi
# Postgres will refuse to work on a non-empty folder when initializing and the
# mount point might have a dotfile
PGDATA="$PGDATA/9.6"
echo $PGDATA
echo $DBNAME
echo $DBUSER
if [ ! -d "$PGDATA" ]
then
echo "Database seems to be uninitialized - doing so"
mkdir $PGDATA
initdb --pgdata=$PGDATA && \
pg_ctl start && \
sleep 4 && \
createuser -d -l -s $DBUSER && \
createdb -O $DBUSER $DBNAME && \
psql -c "ALTER ROLE $DBUSER WITH PASSWORD '$DBPASS'" && \
psql -a $DBNAME -c 'CREATE EXTENSION "uuid-ossp" WITH SCHEMA pg_catalog' && \
echo "host all all all md5" >> $PGDATA/pg_hba.conf && \
echo "listen_addresses = '0.0.0.0'" >> $PGDATA/postgresql.conf && \
pg_ctl stop
fi
exec /usr/bin/postgres
setup.py
+ 1
− 1
View file @ 7fd12d1e
......@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
setup(
name='brian-dashboard-manager',
version="0.32",
version="0.33",
author='GEANT',
author_email='swd@geant.org',
description='',
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment