diff --git a/docker-compose/grafana/dashboards/lofar2.0-station.json b/docker-compose/grafana/dashboards/lofar2.0-station.json
index cf4b480c9c4021ff682f28bfe6924093fe048deb..fbe43030df4cfe9a25832eecd3c9664b3bf9d8c9 100644
--- a/docker-compose/grafana/dashboards/lofar2.0-station.json
+++ b/docker-compose/grafana/dashboards/lofar2.0-station.json
@@ -24,6 +24,20 @@
"id": 1,
"links": [],
"panels": [
+ {
+ "collapsed": false,
+ "datasource": null,
+ "gridPos": {
+ "h": 1,
+ "w": 24,
+ "x": 0,
+ "y": 0
+ },
+ "id": 15,
+ "panels": [],
+ "title": "Devices",
+ "type": "row"
+ },
{
"datasource": "Prometheus",
"fieldConfig": {
@@ -81,10 +95,10 @@
"overrides": []
},
"gridPos": {
- "h": 8,
+ "h": 4,
"w": 12,
"x": 0,
- "y": 0
+ "y": 1
},
"id": 4,
"options": {
@@ -116,9 +130,111 @@
"title": "Device States",
"type": "stat"
},
+ {
+ "collapsed": false,
+ "datasource": null,
+ "gridPos": {
+ "h": 1,
+ "w": 24,
+ "x": 0,
+ "y": 5
+ },
+ "id": 17,
+ "panels": [],
+ "title": "PCC",
+ "type": "row"
+ },
{
"datasource": "Prometheus",
"description": "",
+ "fieldConfig": {
+ "defaults": {
+ "color": {
+ "mode": "palette-classic"
+ },
+ "custom": {
+ "axisLabel": "",
+ "axisPlacement": "auto",
+ "barAlignment": 0,
+ "drawStyle": "line",
+ "fillOpacity": 0,
+ "gradientMode": "none",
+ "hideFrom": {
+ "legend": false,
+ "tooltip": false,
+ "viz": false
+ },
+ "lineInterpolation": "linear",
+ "lineWidth": 1,
+ "pointSize": 5,
+ "scaleDistribution": {
+ "type": "linear"
+ },
+ "showPoints": "auto",
+ "spanNulls": false,
+ "stacking": {
+ "group": "A",
+ "mode": "none"
+ },
+ "thresholdsStyle": {
+ "mode": "off"
+ }
+ },
+ "mappings": [],
+ "min": 0,
+ "thresholds": {
+ "mode": "absolute",
+ "steps": [
+ {
+ "color": "green",
+ "value": null
+ },
+ {
+ "color": "red",
+ "value": 80
+ }
+ ]
+ },
+ "unit": "celsius"
+ },
+ "overrides": []
+ },
+ "gridPos": {
+ "h": 8,
+ "w": 5,
+ "x": 0,
+ "y": 6
+ },
+ "id": 22,
+ "options": {
+ "legend": {
+ "calcs": [],
+ "displayMode": "hidden",
+ "placement": "bottom"
+ },
+ "tooltip": {
+ "mode": "single"
+ }
+ },
+ "pluginVersion": "8.1.2",
+ "targets": [
+ {
+ "exemplar": true,
+ "expr": "device_attribute{device=\"lts/pcc/1\",name=\"RCU_temperature_R\"} - 273.15",
+ "format": "time_series",
+ "hide": false,
+ "instant": false,
+ "interval": "",
+ "legendFormat": "{{x}}",
+ "refId": "A"
+ }
+ ],
+ "title": "RCU temperatures",
+ "transformations": [],
+ "type": "timeseries"
+ },
+ {
+ "datasource": "Prometheus",
"fieldConfig": {
"defaults": {
"color": {
@@ -133,12 +249,12 @@
"value": null
},
{
- "color": "green",
- "value": 50
+ "color": "red",
+ "value": 0
},
{
- "color": "red",
- "value": 100
+ "color": "green",
+ "value": 3
}
]
}
@@ -147,11 +263,11 @@
},
"gridPos": {
"h": 8,
- "w": 5,
- "x": 0,
- "y": 8
+ "w": 6,
+ "x": 5,
+ "y": 6
},
- "id": 11,
+ "id": 21,
"options": {
"colorMode": "background",
"graphMode": "area",
@@ -171,22 +287,17 @@
"targets": [
{
"exemplar": true,
- "expr": "(50+50*device_attribute{device=\"lts/sdp/1\",name=\"TR_fpga_communication_error_R\"}) * on(x) device_attribute{device=\"lts/sdp/1\",name=\"TR_fpga_mask_RW\"}",
- "format": "time_series",
- "hide": false,
- "instant": true,
+ "expr": "sum by (x)(1 + (device_attribute{device=\"lts/pcc/1\",name=\"RCU_ADC_lock_R\"} == bool 129)) * on(x) device_attribute{device=\"lts/pcc/1\",name=\"RCU_mask_RW\"} - 3",
"interval": "",
- "legendFormat": "{{x}}",
+ "legendFormat": "{{y}}",
"refId": "A"
}
],
- "title": "FPGA communication",
- "transformations": [],
+ "title": "RCU ADC lock",
"type": "stat"
},
{
"datasource": "Prometheus",
- "description": "",
"fieldConfig": {
"defaults": {
"color": {
@@ -201,12 +312,12 @@
"value": null
},
{
- "color": "green",
- "value": 50
+ "color": "red",
+ "value": 1
},
{
- "color": "red",
- "value": 100
+ "color": "green",
+ "value": 2
}
]
}
@@ -215,11 +326,11 @@
},
"gridPos": {
"h": 8,
- "w": 5,
- "x": 5,
- "y": 8
+ "w": 6,
+ "x": 11,
+ "y": 6
},
- "id": 9,
+ "id": 25,
"options": {
"colorMode": "background",
"graphMode": "area",
@@ -239,48 +350,23 @@
"targets": [
{
"exemplar": true,
- "expr": "(100-50*device_attribute{device=\"lts/sdp/1\",name=\"FPGA_processing_enable_R\"}) * on(x) device_attribute{device=\"lts/sdp/1\",name=\"TR_fpga_mask_RW\"}",
- "format": "time_series",
- "hide": false,
- "instant": true,
+ "expr": "(2 - device_attribute{device=\"lts/pcc/1\",name=\"RCU_I2C_STATUS_R\"}) * on(x) device_attribute{device=\"lts/pcc/1\",name=\"RCU_mask_RW\"}",
"interval": "",
- "legendFormat": "{{x}}",
+ "legendFormat": "{{y}}",
"refId": "A"
}
],
- "title": "FPGA processing enabled",
- "transformations": [],
+ "title": "RCU I2C status",
"type": "stat"
},
{
"datasource": "Prometheus",
- "description": "Number of inputs that are fed from the SDP wave-form generator",
"fieldConfig": {
"defaults": {
"color": {
"mode": "thresholds"
},
- "mappings": [
- {
- "options": {
- "0": {
- "index": 0,
- "text": "OFF"
- }
- },
- "type": "value"
- },
- {
- "options": {
- "match": "null",
- "result": {
- "color": "transparent",
- "index": 1
- }
- },
- "type": "special"
- }
- ],
+ "mappings": [],
"thresholds": {
"mode": "absolute",
"steps": [
@@ -299,14 +385,14 @@
},
"gridPos": {
"h": 5,
- "w": 2,
- "x": 10,
- "y": 8
+ "w": 3,
+ "x": 17,
+ "y": 6
},
- "id": 12,
+ "id": 24,
"options": {
"colorMode": "background",
- "graphMode": "area",
+ "graphMode": "none",
"justifyMode": "auto",
"orientation": "auto",
"reduceOptions": {
@@ -317,25 +403,59 @@
"values": false
},
"text": {},
- "textMode": "value"
+ "textMode": "name"
},
"pluginVersion": "8.1.2",
"targets": [
{
"exemplar": true,
- "expr": "sum(sum by(x) (device_attribute{device=\"lts/sdp/1\",name=\"FPGA_wg_enable_R\"}) * on(x) device_attribute{device=\"lts/sdp/1\",name=\"TR_fpga_mask_R\"})",
- "format": "time_series",
- "hide": false,
- "instant": true,
+ "expr": "1-device_attribute{device=\"lts/pcc/1\",name=\"CLK_Enable_PWR_R\"}",
"interval": "",
- "legendFormat": "{{x}}",
+ "legendFormat": "Power",
"refId": "A"
+ },
+ {
+ "exemplar": true,
+ "expr": "device_attribute{device=\"lts/pcc/1\",name=\"CLK_I2C_STATUS_R\"}",
+ "hide": false,
+ "interval": "",
+ "legendFormat": "I2C",
+ "refId": "B"
+ },
+ {
+ "exemplar": true,
+ "expr": "device_attribute{device=\"lts/pcc/1\",name=\"CLK_PLL_error_R\"}",
+ "hide": false,
+ "interval": "",
+ "legendFormat": "PLL",
+ "refId": "C"
+ },
+ {
+ "exemplar": true,
+ "expr": "1-device_attribute{device=\"lts/pcc/1\",name=\"CLK_PLL_locked_R\"}",
+ "hide": false,
+ "interval": "",
+ "legendFormat": "PLL Lock",
+ "refId": "D"
}
],
- "title": "Waveform generator",
- "transformations": [],
+ "title": "Clock",
"type": "stat"
},
+ {
+ "collapsed": false,
+ "datasource": null,
+ "gridPos": {
+ "h": 1,
+ "w": 24,
+ "x": 0,
+ "y": 14
+ },
+ "id": 19,
+ "panels": [],
+ "title": "SDP",
+ "type": "row"
+ },
{
"datasource": "Prometheus",
"description": "",
@@ -393,7 +513,7 @@
"h": 8,
"w": 5,
"x": 0,
- "y": 16
+ "y": 15
},
"id": 5,
"options": {
@@ -423,13 +543,149 @@
"transformations": [],
"type": "timeseries"
},
+ {
+ "datasource": "Prometheus",
+ "description": "",
+ "fieldConfig": {
+ "defaults": {
+ "color": {
+ "mode": "thresholds"
+ },
+ "mappings": [],
+ "thresholds": {
+ "mode": "absolute",
+ "steps": [
+ {
+ "color": "transparent",
+ "value": null
+ },
+ {
+ "color": "green",
+ "value": 50
+ },
+ {
+ "color": "red",
+ "value": 100
+ }
+ ]
+ }
+ },
+ "overrides": []
+ },
+ "gridPos": {
+ "h": 8,
+ "w": 5,
+ "x": 5,
+ "y": 15
+ },
+ "id": 11,
+ "options": {
+ "colorMode": "background",
+ "graphMode": "area",
+ "justifyMode": "auto",
+ "orientation": "auto",
+ "reduceOptions": {
+ "calcs": [
+ "lastNotNull"
+ ],
+ "fields": "",
+ "values": false
+ },
+ "text": {},
+ "textMode": "name"
+ },
+ "pluginVersion": "8.1.2",
+ "targets": [
+ {
+ "exemplar": true,
+ "expr": "(50+50*device_attribute{device=\"lts/sdp/1\",name=\"TR_fpga_communication_error_R\"}) * on(x) device_attribute{device=\"lts/sdp/1\",name=\"TR_fpga_mask_R\"}",
+ "format": "time_series",
+ "hide": false,
+ "instant": true,
+ "interval": "",
+ "legendFormat": "{{x}}",
+ "refId": "A"
+ }
+ ],
+ "title": "FPGA communication",
+ "transformations": [],
+ "type": "stat"
+ },
+ {
+ "datasource": "Prometheus",
+ "description": "",
+ "fieldConfig": {
+ "defaults": {
+ "color": {
+ "mode": "thresholds"
+ },
+ "mappings": [],
+ "thresholds": {
+ "mode": "absolute",
+ "steps": [
+ {
+ "color": "transparent",
+ "value": null
+ },
+ {
+ "color": "green",
+ "value": 50
+ },
+ {
+ "color": "red",
+ "value": 100
+ }
+ ]
+ }
+ },
+ "overrides": []
+ },
+ "gridPos": {
+ "h": 8,
+ "w": 5,
+ "x": 10,
+ "y": 15
+ },
+ "id": 9,
+ "options": {
+ "colorMode": "background",
+ "graphMode": "area",
+ "justifyMode": "auto",
+ "orientation": "auto",
+ "reduceOptions": {
+ "calcs": [
+ "lastNotNull"
+ ],
+ "fields": "",
+ "values": false
+ },
+ "text": {},
+ "textMode": "name"
+ },
+ "pluginVersion": "8.1.2",
+ "targets": [
+ {
+ "exemplar": true,
+ "expr": "(100-50*device_attribute{device=\"lts/sdp/1\",name=\"FPGA_processing_enable_R\"}) * on(x) device_attribute{device=\"lts/sdp/1\",name=\"TR_fpga_mask_R\"}",
+ "format": "time_series",
+ "hide": false,
+ "instant": false,
+ "interval": "",
+ "legendFormat": "{{x}}",
+ "refId": "A"
+ }
+ ],
+ "title": "FPGA processing enabled",
+ "transformations": [],
+ "type": "stat"
+ },
{
"datasource": "Prometheus",
"description": "Measured difference between PTP and PPS",
"fieldConfig": {
"defaults": {
"color": {
- "mode": "palette-classic"
+ "mode": "thresholds"
},
"custom": {
"axisLabel": "",
@@ -450,7 +706,7 @@
"type": "linear"
},
"showPoints": "auto",
- "spanNulls": false,
+ "spanNulls": 60000,
"stacking": {
"group": "A",
"mode": "none"
@@ -459,6 +715,7 @@
"mode": "off"
}
},
+ "decimals": 2,
"mappings": [],
"thresholds": {
"mode": "absolute",
@@ -476,15 +733,16 @@
"value": 0.1
}
]
- }
+ },
+ "unit": "s"
},
"overrides": []
},
"gridPos": {
"h": 8,
"w": 5,
- "x": 5,
- "y": 16
+ "x": 15,
+ "y": 15
},
"id": 13,
"options": {
@@ -501,7 +759,7 @@
"targets": [
{
"exemplar": true,
- "expr": "device_attribute{device=\"lts/sdp/1\",name=\"TR_tod_pps_delta_R\"} / 1e9",
+ "expr": "device_attribute{device=\"lts/sdp/1\",name=\"TR_tod_pps_delta_R\"}",
"format": "time_series",
"hide": false,
"instant": false,
@@ -513,6 +771,80 @@
"title": "FPGA Clock offset",
"transformations": [],
"type": "timeseries"
+ },
+ {
+ "datasource": "Prometheus",
+ "description": "Number of inputs that are fed from the SDP wave-form generator",
+ "fieldConfig": {
+ "defaults": {
+ "color": {
+ "mode": "thresholds"
+ },
+ "mappings": [
+ {
+ "options": {
+ "0": {
+ "index": 0,
+ "text": "OFF"
+ }
+ },
+ "type": "value"
+ }
+ ],
+ "thresholds": {
+ "mode": "absolute",
+ "steps": [
+ {
+ "color": "green",
+ "value": null
+ },
+ {
+ "color": "red",
+ "value": 1
+ }
+ ]
+ }
+ },
+ "overrides": []
+ },
+ "gridPos": {
+ "h": 4,
+ "w": 3,
+ "x": 20,
+ "y": 15
+ },
+ "id": 12,
+ "options": {
+ "colorMode": "background",
+ "graphMode": "area",
+ "justifyMode": "auto",
+ "orientation": "auto",
+ "reduceOptions": {
+ "calcs": [
+ "lastNotNull"
+ ],
+ "fields": "",
+ "values": false
+ },
+ "text": {},
+ "textMode": "value"
+ },
+ "pluginVersion": "8.1.2",
+ "targets": [
+ {
+ "exemplar": true,
+ "expr": "sum(sum by(x) (device_attribute{device=\"lts/sdp/1\",name=\"FPGA_wg_enable_RW\"}) * on(x) device_attribute{device=\"lts/sdp/1\",name=\"TR_fpga_mask_R\"})",
+ "format": "time_series",
+ "hide": false,
+ "instant": true,
+ "interval": "",
+ "legendFormat": "{{x}}",
+ "refId": "A"
+ }
+ ],
+ "title": "Waveform generator",
+ "transformations": [],
+ "type": "stat"
}
],
"refresh": false,
@@ -530,5 +862,5 @@
"timezone": "",
"title": "LOFAR2.0 Station",
"uid": "6f7Pv8Vnz",
- "version": 1
+ "version": 8
}