Skip to content
Snippets Groups Projects
Commit decf0ce8 authored by Jan David Mol's avatar Jan David Mol
Browse files

Improved beamlet dashboard, added beamlet pps sync to clock dashboard

parent 5b57af8e
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
grafana-central/dashboards/Station/apsct.json
+ 131
− 35
View file @ decf0ce8
...@@ -3,7 +3,10 @@ ...@@ -3,7 +3,10 @@
"list": [ "list": [
{ {
"builtIn": 1, "builtIn": 1,
"datasource": "-- Grafana --", "datasource": {
"type": "datasource",
"uid": "grafana"
},
"enable": true, "enable": true,
"hide": true, "hide": true,
"iconColor": "rgba(0, 211, 255, 1)", "iconColor": "rgba(0, 211, 255, 1)",
...@@ -21,7 +24,8 @@ ...@@ -21,7 +24,8 @@
"editable": true, "editable": true,
"fiscalYearStartMonth": 0, "fiscalYearStartMonth": 0,
"graphTooltip": 0, "graphTooltip": 0,
"id": 15, "id": 3,
"iteration": 1654782224769,
"links": [ "links": [
{ {
"asDropdown": true, "asDropdown": true,
...@@ -42,6 +46,10 @@ ...@@ -42,6 +46,10 @@
"panels": [ "panels": [
{ {
"collapsed": false, "collapsed": false,
"datasource": {
"type": "prometheus",
"uid": "prometheus"
},
"gridPos": { "gridPos": {
"h": 1, "h": 1,
"w": 24, "w": 24,
...@@ -121,7 +129,7 @@ ...@@ -121,7 +129,7 @@
"h": 5, "h": 5,
"w": 3, "w": 3,
"x": 0, "x": 0,
"y": 6 "y": 1
}, },
"id": 12, "id": 12,
"options": { "options": {
...@@ -138,7 +146,7 @@ ...@@ -138,7 +146,7 @@
}, },
"textMode": "auto" "textMode": "auto"
}, },
"pluginVersion": "8.4.5", "pluginVersion": "8.5.3",
"targets": [ "targets": [
{ {
"datasource": { "datasource": {
...@@ -187,7 +195,7 @@ ...@@ -187,7 +195,7 @@
"h": 5, "h": 5,
"w": 4, "w": 4,
"x": 3, "x": 3,
"y": 6 "y": 1
}, },
"id": 13, "id": 13,
"options": { "options": {
...@@ -207,7 +215,7 @@ ...@@ -207,7 +215,7 @@
}, },
"textMode": "auto" "textMode": "auto"
}, },
"pluginVersion": "8.4.5", "pluginVersion": "8.5.3",
"targets": [ "targets": [
{ {
"datasource": { "datasource": {
...@@ -296,7 +304,7 @@ ...@@ -296,7 +304,7 @@
"h": 5, "h": 5,
"w": 4, "w": 4,
"x": 7, "x": 7,
"y": 6 "y": 1
}, },
"id": 14, "id": 14,
"options": { "options": {
...@@ -391,7 +399,7 @@ ...@@ -391,7 +399,7 @@
"h": 3, "h": 3,
"w": 3, "w": 3,
"x": 0, "x": 0,
"y": 11 "y": 6
}, },
"id": 31, "id": 31,
"options": { "options": {
...@@ -408,7 +416,7 @@ ...@@ -408,7 +416,7 @@
}, },
"textMode": "value" "textMode": "value"
}, },
"pluginVersion": "8.4.5", "pluginVersion": "8.5.3",
"targets": [ "targets": [
{ {
"datasource": { "datasource": {
...@@ -458,7 +466,7 @@ ...@@ -458,7 +466,7 @@
"h": 3, "h": 3,
"w": 20, "w": 20,
"x": 3, "x": 3,
"y": 11 "y": 6
}, },
"id": 5, "id": 5,
"options": { "options": {
...@@ -475,7 +483,7 @@ ...@@ -475,7 +483,7 @@
}, },
"textMode": "name" "textMode": "name"
}, },
"pluginVersion": "8.4.5", "pluginVersion": "8.5.3",
"targets": [ "targets": [
{ {
"datasource": { "datasource": {
...@@ -612,11 +620,15 @@ ...@@ -612,11 +620,15 @@
}, },
{ {
"collapsed": true, "collapsed": true,
"datasource": {
"type": "prometheus",
"uid": "prometheus"
},
"gridPos": { "gridPos": {
"h": 1, "h": 1,
"w": 24, "w": 24,
"x": 0, "x": 0,
"y": 14 "y": 9
}, },
"id": 33, "id": 33,
"panels": [ "panels": [
...@@ -671,7 +683,7 @@ ...@@ -671,7 +683,7 @@
"h": 5, "h": 5,
"w": 23, "w": 23,
"x": 0, "x": 0,
"y": 16 "y": 10
}, },
"id": 42, "id": 42,
"patterns": [], "patterns": [],
...@@ -713,7 +725,8 @@ ...@@ -713,7 +725,8 @@
"mode": "absolute", "mode": "absolute",
"steps": [ "steps": [
{ {
"color": "transparent" "color": "transparent",
"value": null
}, },
{ {
"color": "red", "color": "red",
...@@ -732,7 +745,7 @@ ...@@ -732,7 +745,7 @@
"h": 2, "h": 2,
"w": 23, "w": 23,
"x": 0, "x": 0,
"y": 21 "y": 15
}, },
"id": 35, "id": 35,
"options": { "options": {
...@@ -750,7 +763,7 @@ ...@@ -750,7 +763,7 @@
"text": {}, "text": {},
"textMode": "name" "textMode": "name"
}, },
"pluginVersion": "8.4.5", "pluginVersion": "8.5.3",
"targets": [ "targets": [
{ {
"datasource": { "datasource": {
...@@ -783,7 +796,8 @@ ...@@ -783,7 +796,8 @@
"mode": "absolute", "mode": "absolute",
"steps": [ "steps": [
{ {
"color": "transparent" "color": "transparent",
"value": null
}, },
{ {
"color": "red", "color": "red",
...@@ -814,7 +828,7 @@ ...@@ -814,7 +828,7 @@
"h": 2, "h": 2,
"w": 23, "w": 23,
"x": 0, "x": 0,
"y": 23 "y": 17
}, },
"id": 37, "id": 37,
"options": { "options": {
...@@ -832,7 +846,7 @@ ...@@ -832,7 +846,7 @@
"text": {}, "text": {},
"textMode": "value" "textMode": "value"
}, },
"pluginVersion": "8.4.5", "pluginVersion": "8.5.3",
"targets": [ "targets": [
{ {
"datasource": { "datasource": {
...@@ -848,6 +862,76 @@ ...@@ -848,6 +862,76 @@
], ],
"title": "SDP FPGA Measured Clock", "title": "SDP FPGA Measured Clock",
"type": "stat" "type": "stat"
},
{
"datasource": {
"type": "prometheus",
"uid": "prometheus"
},
"description": "Whether the beamlets are in sync with the PPS",
"fieldConfig": {
"defaults": {
"color": {
"mode": "thresholds"
},
"mappings": [],
"thresholds": {
"mode": "absolute",
"steps": [
{
"color": "transparent",
"value": null
},
{
"color": "red",
"value": 10
},
{
"color": "green",
"value": 11
}
]
}
},
"overrides": []
},
"gridPos": {
"h": 2,
"w": 23,
"x": 0,
"y": 19
},
"id": 44,
"options": {
"colorMode": "background",
"graphMode": "none",
"justifyMode": "auto",
"orientation": "auto",
"reduceOptions": {
"calcs": [
"lastNotNull"
],
"fields": "",
"values": false
},
"textMode": "name"
},
"pluginVersion": "8.5.3",
"targets": [
{
"datasource": {
"type": "prometheus",
"uid": "prometheus"
},
"exemplar": true,
"expr": "(device_attribute{host=\"$station\",device=\"stat/beamlet/1\", name=\"FPGA_beamlet_output_nof_packets_R\"} > bool -1)\r\n+ on(x) (10 * device_attribute{host=\"$station\",device=\"stat/sdp/1\", name=\"TR_fpga_mask_R\"})\r\n",
"interval": "",
"legendFormat": "{{x}}",
"refId": "A"
}
],
"title": "Beamlet PPS Sync",
"type": "stat"
} }
], ],
"title": "Downstream Clocks", "title": "Downstream Clocks",
...@@ -855,11 +939,15 @@ ...@@ -855,11 +939,15 @@
}, },
{ {
"collapsed": true, "collapsed": true,
"datasource": {
"type": "prometheus",
"uid": "prometheus"
},
"gridPos": { "gridPos": {
"h": 1, "h": 1,
"w": 24, "w": 24,
"x": 0, "x": 0,
"y": 15 "y": 10
}, },
"id": 19, "id": 19,
"panels": [ "panels": [
...@@ -908,7 +996,8 @@ ...@@ -908,7 +996,8 @@
"mode": "absolute", "mode": "absolute",
"steps": [ "steps": [
{ {
"color": "transparent" "color": "transparent",
"value": null
} }
] ]
}, },
...@@ -920,7 +1009,7 @@ ...@@ -920,7 +1009,7 @@
"h": 9, "h": 9,
"w": 6, "w": 6,
"x": 0, "x": 0,
"y": 16 "y": 11
}, },
"id": 30, "id": 30,
"options": { "options": {
...@@ -1007,7 +1096,8 @@ ...@@ -1007,7 +1096,8 @@
"mode": "absolute", "mode": "absolute",
"steps": [ "steps": [
{ {
"color": "transparent" "color": "transparent",
"value": null
} }
] ]
}, },
...@@ -1019,7 +1109,7 @@ ...@@ -1019,7 +1109,7 @@
"h": 9, "h": 9,
"w": 6, "w": 6,
"x": 6, "x": 6,
"y": 16 "y": 11
}, },
"id": 21, "id": 21,
"options": { "options": {
...@@ -1118,7 +1208,8 @@ ...@@ -1118,7 +1208,8 @@
"mode": "absolute", "mode": "absolute",
"steps": [ "steps": [
{ {
"color": "transparent" "color": "transparent",
"value": null
} }
] ]
}, },
...@@ -1130,7 +1221,7 @@ ...@@ -1130,7 +1221,7 @@
"h": 9, "h": 9,
"w": 6, "w": 6,
"x": 12, "x": 12,
"y": 16 "y": 11
}, },
"id": 29, "id": 29,
"options": { "options": {
...@@ -1205,7 +1296,8 @@ ...@@ -1205,7 +1296,8 @@
"mode": "absolute", "mode": "absolute",
"steps": [ "steps": [
{ {
"color": "transparent" "color": "transparent",
"value": null
} }
] ]
}, },
...@@ -1217,7 +1309,7 @@ ...@@ -1217,7 +1309,7 @@
"h": 9, "h": 9,
"w": 6, "w": 6,
"x": 18, "x": 18,
"y": 16 "y": 11
}, },
"id": 22, "id": 22,
"options": { "options": {
...@@ -1253,11 +1345,15 @@ ...@@ -1253,11 +1345,15 @@
}, },
{ {
"collapsed": true, "collapsed": true,
"datasource": {
"type": "prometheus",
"uid": "prometheus"
},
"gridPos": { "gridPos": {
"h": 1, "h": 1,
"w": 24, "w": 24,
"x": 0, "x": 0,
"y": 16 "y": 11
}, },
"id": 26, "id": 26,
"panels": [ "panels": [
...@@ -1353,7 +1449,7 @@ ...@@ -1353,7 +1449,7 @@
} }
], ],
"refresh": false, "refresh": false,
"schemaVersion": 35, "schemaVersion": 36,
"style": "dark", "style": "dark",
"tags": [ "tags": [
"station" "station"
...@@ -1362,9 +1458,9 @@ ...@@ -1362,9 +1458,9 @@
"list": [ "list": [
{ {
"current": { "current": {
"selected": false, "selected": true,
"text": "test-lcu2", "text": "dop496",
"value": "test-lcu2" "value": "dop496"
}, },
"datasource": { "datasource": {
"type": "prometheus", "type": "prometheus",
...@@ -1391,13 +1487,13 @@ ...@@ -1391,13 +1487,13 @@
] ]
}, },
"time": { "time": {
"from": "now-6h", "from": "now-30m",
"to": "now" "to": "now"
}, },
"timepicker": {}, "timepicker": {},
"timezone": "", "timezone": "",
"title": "APSCT", "title": "APSCT",
"uid": "apsct", "uid": "apsct",
"version": 14, "version": 4,
"weekStart": "" "weekStart": ""
} }
grafana-central/dashboards/Station/beamlet.json
+ 720
− 718
View file @ decf0ce8
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
"fiscalYearStartMonth": 0, "fiscalYearStartMonth": 0,
"graphTooltip": 0, "graphTooltip": 0,
"id": 18, "id": 18,
"iteration": 1654778559701, "iteration": 1654783249169,
"links": [ "links": [
{ {
"asDropdown": true, "asDropdown": true,
...@@ -728,7 +728,9 @@ ...@@ -728,7 +728,9 @@
"refresh": false, "refresh": false,
"schemaVersion": 36, "schemaVersion": 36,
"style": "dark", "style": "dark",
"tags": [], "tags": [
"station"
],
"templating": { "templating": {
"list": [ "list": [
{ {
...@@ -769,6 +771,6 @@ ...@@ -769,6 +771,6 @@
"timezone": "", "timezone": "",
"title": "Beamlet", "title": "Beamlet",
"uid": "beamlet", "uid": "beamlet",
"version": 5, "version": 7,
"weekStart": "" "weekStart": ""
} }
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment