diff --git a/docker-compose/grafana/dashboards/home.json b/docker-compose/grafana/dashboards/home.json
index 6d4641a656c20b40ceaa8a18d2b02da47b0b55ba..7c0f1c0c0e010fd6edc5984b5c960fa63d37f04f 100644
--- a/docker-compose/grafana/dashboards/home.json
+++ b/docker-compose/grafana/dashboards/home.json
@@ -22,7 +22,7 @@
"fiscalYearStartMonth": 0,
"gnetId": null,
"graphTooltip": 0,
- "id": 6,
+ "id": 5,
"links": [],
"liveNow": false,
"panels": [
@@ -493,6 +493,300 @@
"x": 0,
"y": 10
},
+ "id": 49,
+ "panels": [],
+ "title": "APSCT & APSPU",
+ "type": "row"
+ },
+ {
+ "datasource": "Prometheus",
+ "description": "State of APSCT",
+ "fieldConfig": {
+ "defaults": {
+ "color": {
+ "mode": "thresholds"
+ },
+ "mappings": [],
+ "thresholds": {
+ "mode": "absolute",
+ "steps": [
+ {
+ "color": "green",
+ "value": null
+ },
+ {
+ "color": "red",
+ "value": 1
+ }
+ ]
+ }
+ },
+ "overrides": []
+ },
+ "gridPos": {
+ "h": 3,
+ "w": 21,
+ "x": 0,
+ "y": 11
+ },
+ "id": 24,
+ "options": {
+ "colorMode": "background",
+ "graphMode": "none",
+ "justifyMode": "auto",
+ "orientation": "auto",
+ "reduceOptions": {
+ "calcs": [
+ "lastNotNull"
+ ],
+ "fields": "",
+ "values": false
+ },
+ "text": {},
+ "textMode": "name"
+ },
+ "pluginVersion": "8.2.1",
+ "targets": [
+ {
+ "exemplar": true,
+ "expr": "1-device_attribute{device=\"lts/apsct/1\",name=\"APSCT_PWR_on_R\"}",
+ "interval": "",
+ "legendFormat": "Power",
+ "refId": "A"
+ },
+ {
+ "exemplar": true,
+ "expr": "device_attribute{device=\"lts/apsct/1\",name=\"APSCTTR_I2C_error_R\"}",
+ "hide": false,
+ "interval": "",
+ "legendFormat": "I2C",
+ "refId": "B"
+ },
+ {
+ "exemplar": true,
+ "expr": "device_attribute{device=\"lts/apsct/1\",name=\"APSCT_PLL_200MHz_error_R\"}",
+ "hide": false,
+ "interval": "",
+ "legendFormat": "PLL",
+ "refId": "C"
+ },
+ {
+ "exemplar": true,
+ "expr": "1-device_attribute{device=\"lts/apsct/1\",name=\"APSCT_PLL_200MHz_locked_R\"}",
+ "hide": false,
+ "interval": "",
+ "legendFormat": "PLL Lock",
+ "refId": "D"
+ },
+ {
+ "exemplar": true,
+ "expr": "1-device_attribute{device=\"lts/apsct/1\",name=\"APSCT_INPUT_10MHz_good_R\"}",
+ "hide": false,
+ "interval": "",
+ "legendFormat": "10MHz",
+ "refId": "E"
+ },
+ {
+ "exemplar": true,
+ "expr": "1-device_attribute{device=\"lts/apsct/1\",name=\"APSCT_INPUT_PPS_good_R\"}",
+ "hide": false,
+ "interval": "",
+ "legendFormat": "PPS",
+ "refId": "F"
+ },
+ {
+ "exemplar": true,
+ "expr": "device_attribute{device=\"lts/apsct/1\",name=\"APSCT_PPS_ignore_R\"}",
+ "hide": false,
+ "interval": "",
+ "legendFormat": "PPS used",
+ "refId": "G"
+ }
+ ],
+ "title": "APS Clock State",
+ "type": "stat"
+ },
+ {
+ "datasource": "Prometheus",
+ "description": "State of APSPU",
+ "fieldConfig": {
+ "defaults": {
+ "color": {
+ "mode": "thresholds"
+ },
+ "mappings": [],
+ "thresholds": {
+ "mode": "absolute",
+ "steps": [
+ {
+ "color": "green",
+ "value": null
+ },
+ {
+ "color": "red",
+ "value": 1
+ }
+ ]
+ }
+ },
+ "overrides": []
+ },
+ "gridPos": {
+ "h": 3,
+ "w": 3,
+ "x": 21,
+ "y": 11
+ },
+ "id": 50,
+ "options": {
+ "colorMode": "background",
+ "graphMode": "none",
+ "justifyMode": "auto",
+ "orientation": "auto",
+ "reduceOptions": {
+ "calcs": [
+ "lastNotNull"
+ ],
+ "fields": "",
+ "values": false
+ },
+ "text": {},
+ "textMode": "name"
+ },
+ "pluginVersion": "8.2.1",
+ "targets": [
+ {
+ "exemplar": true,
+ "expr": "device_attribute{device=\"lts/apspu/1\",name=\"APSPUTR_I2C_error_R\"}",
+ "hide": false,
+ "interval": "",
+ "legendFormat": "I2C",
+ "refId": "B"
+ }
+ ],
+ "title": "APS Power Unit State",
+ "type": "stat"
+ },
+ {
+ "collapsed": true,
+ "datasource": null,
+ "gridPos": {
+ "h": 1,
+ "w": 24,
+ "x": 0,
+ "y": 14
+ },
+ "id": 53,
+ "panels": [],
+ "title": "UNB2",
+ "type": "row"
+ },
+ {
+ "datasource": "Prometheus",
+ "description": "State of Unboard 2 I2C Bus",
+ "fieldConfig": {
+ "defaults": {
+ "color": {
+ "mode": "thresholds"
+ },
+ "mappings": [],
+ "thresholds": {
+ "mode": "absolute",
+ "steps": [
+ {
+ "color": "transparent",
+ "value": null
+ },
+ {
+ "color": "green",
+ "value": 1
+ },
+ {
+ "color": "red",
+ "value": 2
+ }
+ ]
+ }
+ },
+ "overrides": []
+ },
+ "gridPos": {
+ "h": 3,
+ "w": 24,
+ "x": 0,
+ "y": 15
+ },
+ "id": 54,
+ "options": {
+ "colorMode": "background",
+ "graphMode": "none",
+ "justifyMode": "auto",
+ "orientation": "auto",
+ "reduceOptions": {
+ "calcs": [
+ "lastNotNull"
+ ],
+ "fields": "",
+ "values": false
+ },
+ "text": {},
+ "textMode": "name"
+ },
+ "pluginVersion": "8.2.1",
+ "targets": [
+ {
+ "exemplar": true,
+ "expr": "(1 + (device_attribute{device=\"lts/unb2/1\",name=\"UNB2TR_I2C_bus_error_R\"} != bool 0)) * on(x) device_attribute{device=\"lts/recv/1\",name=\"RCU_mask_RW\"}",
+ "hide": false,
+ "interval": "",
+ "legendFormat": "I2C {{x}}",
+ "refId": "A"
+ },
+ {
+ "exemplar": true,
+ "expr": "(1 + device_attribute{device=\"lts/unb2/1\",name=\"UNB2TR_I2C_bus_PS_error_R\"}) * on(x) device_attribute{device=\"lts/recv/1\",name=\"RCU_mask_RW\"}",
+ "hide": false,
+ "interval": "",
+ "legendFormat": "PS {{x}}",
+ "refId": "B"
+ },
+ {
+ "exemplar": true,
+ "expr": "(1 + sum by (x) (device_attribute{device=\"lts/unb2/1\",name=\"UNB2TR_I2C_bus_FPGA_PS_error_R\"})) * on(x) device_attribute{device=\"lts/recv/1\",name=\"RCU_mask_RW\"}",
+ "hide": false,
+ "interval": "",
+ "legendFormat": "FPGA PS {{x}}",
+ "refId": "C"
+ },
+ {
+ "exemplar": true,
+ "expr": "(1 + sum by (x) (device_attribute{device=\"lts/unb2/1\",name=\"UNB2TR_I2C_bus_DDR4_error_R\"})) * on(x) device_attribute{device=\"lts/recv/1\",name=\"RCU_mask_RW\"}",
+ "hide": false,
+ "interval": "",
+ "legendFormat": "DDR {{x}}",
+ "refId": "D"
+ },
+ {
+ "exemplar": true,
+ "expr": "(1 + sum by (x) (device_attribute{device=\"lts/unb2/1\",name=\"UNB2TR_I2C_bus_QSFP_error_R\"})) * on(x) device_attribute{device=\"lts/recv/1\",name=\"RCU_mask_RW\"}",
+ "hide": false,
+ "interval": "",
+ "legendFormat": "QSFP {{x}}",
+ "refId": "E"
+ }
+ ],
+ "title": "UNB2 I2C State",
+ "type": "stat"
+ },
+ {
+ "collapsed": false,
+ "datasource": null,
+ "gridPos": {
+ "h": 1,
+ "w": 24,
+ "x": 0,
+ "y": 18
+ },
"id": 17,
"panels": [],
"title": "RECV",
@@ -530,12 +824,12 @@
"h": 8,
"w": 6,
"x": 0,
- "y": 11
+ "y": 19
},
"id": 21,
"options": {
"colorMode": "background",
- "graphMode": "area",
+ "graphMode": "none",
"justifyMode": "auto",
"orientation": "auto",
"reduceOptions": {
@@ -552,13 +846,14 @@
"targets": [
{
"exemplar": true,
- "expr": "sum by (x)(1 + (device_attribute{device=\"lts/recv/1\",name=\"RCU_ADC_lock_R\"} == bool 129)) * on(x) device_attribute{device=\"lts/recv/1\",name=\"RCU_mask_RW\"} - 3",
+ "expr": "sum by (x)(1 + (device_attribute{device=\"lts/recv/1\",name=\"RCU_ADC_locked_R\"})) * on(x) device_attribute{device=\"lts/recv/1\",name=\"RCU_mask_RW\"} - 3",
+ "instant": false,
"interval": "",
"legendFormat": "{{y}}",
"refId": "A"
}
],
- "title": "RCU ADC lock",
+ "title": "RCU Clock Lock",
"type": "stat"
},
{
@@ -593,12 +888,12 @@
"h": 8,
"w": 6,
"x": 6,
- "y": 11
+ "y": 19
},
"id": 25,
"options": {
"colorMode": "background",
- "graphMode": "area",
+ "graphMode": "none",
"justifyMode": "auto",
"orientation": "auto",
"reduceOptions": {
@@ -615,17 +910,20 @@
"targets": [
{
"exemplar": true,
- "expr": "(2 - device_attribute{device=\"lts/recv/1\",name=\"RCU_I2C_STATUS_R\"}) * on(x) device_attribute{device=\"lts/recv/1\",name=\"RCU_mask_RW\"}",
+ "expr": "(1 + (device_attribute{device=\"lts/recv/1\",name=\"RECVTR_I2C_error_R\"} == bool 0)) * on(x) device_attribute{device=\"lts/recv/1\",name=\"RCU_mask_RW\"}",
+ "hide": false,
+ "instant": false,
"interval": "",
"legendFormat": "{{y}}",
"refId": "A"
}
],
- "title": "RCU I2C status",
+ "title": "RCU I2C State",
"type": "stat"
},
{
"datasource": "Prometheus",
+ "description": "",
"fieldConfig": {
"defaults": {
"color": {
@@ -636,12 +934,16 @@
"mode": "absolute",
"steps": [
{
- "color": "green",
+ "color": "transparent",
"value": null
},
{
"color": "red",
"value": 1
+ },
+ {
+ "color": "green",
+ "value": 2
}
]
}
@@ -649,12 +951,12 @@
"overrides": []
},
"gridPos": {
- "h": 5,
- "w": 3,
+ "h": 8,
+ "w": 6,
"x": 12,
- "y": 11
+ "y": 19
},
- "id": 24,
+ "id": 51,
"options": {
"colorMode": "background",
"graphMode": "none",
@@ -674,37 +976,15 @@
"targets": [
{
"exemplar": true,
- "expr": "1-device_attribute{device=\"lts/apsct/1\",name=\"APSCT_PWR_on_R\"}",
- "interval": "",
- "legendFormat": "Power",
- "refId": "A"
- },
- {
- "exemplar": true,
- "expr": "device_attribute{device=\"lts/apsct/1\",name=\"APSCT_I2C_error_R\"}",
- "hide": false,
- "interval": "",
- "legendFormat": "I2C",
- "refId": "B"
- },
- {
- "exemplar": true,
- "expr": "device_attribute{device=\"lts/apsct/1\",name=\"APSCT_PLL_200MHz_error_R\"}",
- "hide": false,
- "interval": "",
- "legendFormat": "PLL",
- "refId": "C"
- },
- {
- "exemplar": true,
- "expr": "1-device_attribute{device=\"lts/apsct/1\",name=\"APSCT_PLL_200MHz_locked_R\"}",
+ "expr": "(1 + device_attribute{device=\"lts/recv/1\",name=\"RCU_PWR_good_R\"}) * on(x) device_attribute{device=\"lts/recv/1\",name=\"RCU_mask_RW\"}",
"hide": false,
+ "instant": false,
"interval": "",
- "legendFormat": "PLL Lock",
- "refId": "D"
+ "legendFormat": "{{y}}",
+ "refId": "A"
}
],
- "title": "Clock",
+ "title": "RCU Power good",
"type": "stat"
},
{
@@ -714,7 +994,7 @@
"h": 1,
"w": 24,
"x": 0,
- "y": 19
+ "y": 27
},
"id": 19,
"panels": [],
@@ -754,7 +1034,7 @@
"h": 8,
"w": 5,
"x": 0,
- "y": 20
+ "y": 28
},
"id": 11,
"options": {
@@ -822,7 +1102,7 @@
"h": 8,
"w": 5,
"x": 5,
- "y": 20
+ "y": 28
},
"id": 9,
"options": {
@@ -896,7 +1176,7 @@
"h": 4,
"w": 3,
"x": 10,
- "y": 20
+ "y": 28
},
"id": 12,
"options": {
@@ -938,7 +1218,7 @@
"h": 1,
"w": 24,
"x": 0,
- "y": 28
+ "y": 36
},
"id": 27,
"panels": [],
@@ -978,7 +1258,7 @@
"h": 8,
"w": 5,
"x": 0,
- "y": 29
+ "y": 37
},
"id": 28,
"options": {
@@ -1076,7 +1356,7 @@
"h": 8,
"w": 5,
"x": 5,
- "y": 29
+ "y": 37
},
"id": 29,
"options": {
@@ -1185,7 +1465,7 @@
"h": 8,
"w": 5,
"x": 10,
- "y": 29
+ "y": 37
},
"id": 30,
"options": {
@@ -1278,7 +1558,7 @@
"h": 8,
"w": 5,
"x": 15,
- "y": 29
+ "y": 37
},
"id": 33,
"options": {
@@ -1373,7 +1653,7 @@
"h": 8,
"w": 3,
"x": 20,
- "y": 29
+ "y": 37
},
"id": 34,
"options": {
@@ -1410,7 +1690,7 @@
"h": 1,
"w": 24,
"x": 0,
- "y": 37
+ "y": 45
},
"id": 36,
"panels": [],
@@ -1447,10 +1727,10 @@
"overrides": []
},
"gridPos": {
- "h": 8,
+ "h": 4,
"w": 5,
"x": 0,
- "y": 38
+ "y": 46
},
"id": 37,
"options": {
@@ -1548,7 +1828,7 @@
"h": 8,
"w": 5,
"x": 5,
- "y": 38
+ "y": 46
},
"id": 38,
"options": {
@@ -1657,7 +1937,7 @@
"h": 8,
"w": 5,
"x": 10,
- "y": 38
+ "y": 46
},
"id": 39,
"options": {
@@ -1750,7 +2030,7 @@
"h": 8,
"w": 5,
"x": 15,
- "y": 38
+ "y": 46
},
"id": 40,
"options": {
@@ -1845,7 +2125,7 @@
"h": 8,
"w": 3,
"x": 20,
- "y": 38
+ "y": 46
},
"id": 41,
"options": {
@@ -1905,10 +2185,10 @@
"overrides": []
},
"gridPos": {
- "h": 8,
+ "h": 4,
"w": 5,
"x": 0,
- "y": 46
+ "y": 50
},
"id": 45,
"options": {
@@ -1959,5 +2239,5 @@
"timezone": "",
"title": "Home",
"uid": "nC8N_kO7k",
- "version": 5
+ "version": 6
}