diff --git a/docker-compose/grafana/dashboards/sdp.json b/docker-compose/grafana/dashboards/sdp.json
index c479a9072ddbb5aab53bf8ea99ce72eabcf90e51..24da11a5f6557652e5d4cc9ff72f28dca37644bf 100644
--- a/docker-compose/grafana/dashboards/sdp.json
+++ b/docker-compose/grafana/dashboards/sdp.json
@@ -428,8 +428,9 @@
"type": "prometheus",
"uid": "6W2nM-Vnz"
},
- "exemplar": true,
+ "exemplar": false,
"expr": "device_attribute{device=\"stat/sdp/1\",name=\"State\"}",
+ "instant": true,
"interval": "",
"legendFormat": "{{device}}",
"refId": "A"
@@ -439,9 +440,10 @@
"type": "prometheus",
"uid": "6W2nM-Vnz"
},
- "exemplar": true,
+ "exemplar": false,
"expr": "device_attribute{device=\"stat/unb2/1\",name=\"State\"}",
"hide": false,
+ "instant": true,
"interval": "",
"legendFormat": "{{device}}",
"refId": "B"
@@ -522,9 +524,10 @@
"type": "prometheus",
"uid": "6W2nM-Vnz"
},
- "exemplar": true,
+ "exemplar": false,
"expr": "device_attribute{device=~\"stat/unb2/1\",name=\"Status\"}",
"hide": false,
+ "instant": true,
"interval": "",
"legendFormat": "",
"refId": "B"
@@ -664,69 +667,181 @@
"type": "row"
},
{
+ "activePatternIndex": 1,
"datasource": {
"type": "prometheus",
"uid": "6W2nM-Vnz"
},
- "fieldConfig": {
- "defaults": {
- "color": {
- "mode": "thresholds"
- },
- "mappings": [],
- "thresholds": {
- "mode": "absolute",
- "steps": [
- {
- "color": "green",
- "value": null
- },
- {
- "color": "red",
- "value": 1
- }
- ]
- }
+ "debug_mode": false,
+ "defaultPattern": {
+ "bgColors": "green|orange|red",
+ "bgColors_overrides": "0->green|2->red|1->yellow",
+ "clickable_cells_link": "",
+ "col_name": "",
+ "decimals": 2,
+ "defaultBGColor": "red",
+ "defaultTextColor": "",
+ "delimiter": ".",
+ "displayTemplate": "_value_",
+ "enable_bgColor": false,
+ "enable_bgColor_overrides": false,
+ "enable_clickable_cells": false,
+ "enable_textColor": false,
+ "enable_textColor_overrides": false,
+ "enable_time_based_thresholds": false,
+ "enable_transform": false,
+ "enable_transform_overrides": false,
+ "filter": {
+ "value_above": "",
+ "value_below": ""
},
- "overrides": []
+ "format": "bool_on_off",
+ "name": "Default Pattern",
+ "null_color": "",
+ "null_textcolor": "black",
+ "null_value": "No data",
+ "pattern": "*",
+ "row_col_wrapper": "_",
+ "row_name": "_series_",
+ "textColors": "red|orange|green",
+ "textColors_overrides": "0->red|2->green|1->yellow",
+ "thresholds": "70,90",
+ "time_based_thresholds": [],
+ "tooltipTemplate": "Series : _series_ <br/>Row Name : _row_name_ <br/>Col Name : _col_name_ <br/>Value : _value_",
+ "transform_values": "_value_|_value_|_value_",
+ "transform_values_overrides": "0->down|1->up",
+ "valueName": "current"
},
+ "default_title_for_rows": "",
+ "description": "",
"gridPos": {
- "h": 2,
- "w": 3,
+ "h": 4,
+ "w": 8,
"x": 0,
"y": 12
},
- "id": 31,
- "options": {
- "colorMode": "background",
- "graphMode": "none",
- "justifyMode": "auto",
- "orientation": "auto",
- "reduceOptions": {
- "calcs": [
- "lastNotNull"
- ],
- "fields": "",
- "values": false
- },
- "textMode": "name"
- },
+ "hide_first_column": false,
+ "hide_headers": false,
+ "id": 76,
+ "non_matching_cells_text": "-",
+ "patterns": [
+ {
+ "bgColors": "green|orange|red",
+ "bgColors_overrides": "-2->black|-1->green|0->red|1->green",
+ "clickable_cells_link": "",
+ "col_name": "_1_",
+ "decimals": "0",
+ "defaultBGColor": "green",
+ "defaultTextColor": "",
+ "delimiter": "-",
+ "displayTemplate": "",
+ "enable_bgColor": false,
+ "enable_bgColor_overrides": true,
+ "enable_clickable_cells": false,
+ "enable_textColor": false,
+ "enable_textColor_overrides": true,
+ "enable_time_based_thresholds": false,
+ "enable_transform": false,
+ "enable_transform_overrides": true,
+ "filter": {
+ "value_above": "",
+ "value_below": ""
+ },
+ "format": "bool_yes_no",
+ "name": "New Pattern",
+ "null_color": "red",
+ "null_textcolor": "black",
+ "null_value": "ERR",
+ "pattern": "^(.*) - (.*)$",
+ "row_col_wrapper": "_",
+ "row_name": "_0_",
+ "textColors": "red|orange|green",
+ "textColors_overrides": "-2->white|-1->white|0->black|1->white",
+ "thresholds": "-1|0|1",
+ "time_based_thresholds": [],
+ "tooltipTemplate": "Series : _series_ <br/>Row Name : _row_name_ <br/>Col Name : _col_name_ <br/>Value : _value_",
+ "transform_values": "NO|ERR|OK",
+ "transform_values_overrides": "-2->NO|-1->YES|0->ERR|1->OK",
+ "valueName": "current"
+ }
+ ],
"pluginVersion": "8.4.5",
+ "row_col_wrapper": "_",
+ "sorting_props": {
+ "col_index": -1,
+ "direction": "desc"
+ },
"targets": [
{
"datasource": {
"type": "prometheus",
"uid": "6W2nM-Vnz"
},
- "exemplar": true,
- "expr": "device_attribute{device=\"stat/unb2/1\",name=\"UNB2_error_R\"}",
+ "exemplar": false,
+ "expr": "device_attribute{device=\"stat/unb2/1\",name=\"UNB2_mask_RW\"} - 2",
+ "format": "time_series",
+ "instant": true,
"interval": "",
- "legendFormat": "{{x}}",
+ "intervalFactor": 1,
+ "legendFormat": "Uniboard {{x}} - 0: Mask",
"refId": "A"
+ },
+ {
+ "datasource": {
+ "type": "prometheus",
+ "uid": "6W2nM-Vnz"
+ },
+ "exemplar": false,
+ "expr": "device_attribute{device=\"stat/unb2/1\",name=\"UNB2_PWR_on_R\"}",
+ "hide": false,
+ "instant": true,
+ "interval": "",
+ "legendFormat": "Uniboard {{x}} - 1: Power",
+ "refId": "B"
+ },
+ {
+ "datasource": {
+ "type": "prometheus",
+ "uid": "6W2nM-Vnz"
+ },
+ "exemplar": false,
+ "expr": "1 - device_attribute{device=\"stat/unb2/1\",name=\"UNB2_VOUT_error_R\"}",
+ "hide": false,
+ "instant": true,
+ "interval": "",
+ "legendFormat": "Uniboard {{x}} - 2: Voltage",
+ "refId": "C"
+ },
+ {
+ "datasource": {
+ "type": "prometheus",
+ "uid": "6W2nM-Vnz"
+ },
+ "exemplar": false,
+ "expr": "1 - device_attribute{device=\"stat/unb2/1\",name=\"UNB2_IOUT_error_R\"}",
+ "hide": false,
+ "instant": true,
+ "interval": "",
+ "legendFormat": "Uniboard {{x}} - 3: Current",
+ "refId": "D"
+ },
+ {
+ "datasource": {
+ "type": "prometheus",
+ "uid": "6W2nM-Vnz"
+ },
+ "exemplar": false,
+ "expr": "1 - device_attribute{device=\"stat/unb2/1\",name=\"UNB2_TEMP_error_R\"}",
+ "hide": false,
+ "instant": true,
+ "interval": "",
+ "legendFormat": "Uniboard {{x}} - 4: Temperatures",
+ "refId": "E"
}
],
- "title": "Translator <-> Uniboard Communication",
- "type": "stat"
+ "text_alignment_values": "CENTER",
+ "title": "Uniboard Status",
+ "type": "yesoreyeram-boomtable-panel"
},
{
"datasource": {
@@ -781,9 +896,9 @@
"overrides": []
},
"gridPos": {
- "h": 2,
- "w": 3,
- "x": 3,
+ "h": 3,
+ "w": 2,
+ "x": 8,
"y": 12
},
"id": 35,
@@ -791,7 +906,7 @@
"colorMode": "background",
"graphMode": "none",
"justifyMode": "auto",
- "orientation": "auto",
+ "orientation": "horizontal",
"reduceOptions": {
"calcs": [
"lastNotNull"
@@ -811,218 +926,20 @@
"exemplar": true,
"expr": "device_attribute{device=\"stat/unb2/1\",name=\"UNB2_Front_Panel_LED_colour_R\"}",
"interval": "",
- "legendFormat": "{{x}}",
+ "legendFormat": "Uniboard {{x}}",
"refId": "A"
}
],
"title": "LED colour",
"type": "stat"
},
- {
- "datasource": {
- "type": "prometheus",
- "uid": "6W2nM-Vnz"
- },
- "description": "",
- "fieldConfig": {
- "defaults": {
- "color": {
- "mode": "thresholds"
- },
- "mappings": [],
- "thresholds": {
- "mode": "absolute",
- "steps": [
- {
- "color": "green",
- "value": null
- },
- {
- "color": "red",
- "value": 1
- }
- ]
- }
- },
- "overrides": []
- },
- "gridPos": {
- "h": 2,
- "w": 3,
- "x": 6,
- "y": 12
- },
- "id": 32,
- "options": {
- "colorMode": "background",
- "graphMode": "none",
- "justifyMode": "auto",
- "orientation": "auto",
- "reduceOptions": {
- "calcs": [
- "lastNotNull"
- ],
- "fields": "",
- "values": false
- },
- "textMode": "name"
- },
- "pluginVersion": "8.4.5",
- "targets": [
- {
- "datasource": {
- "type": "prometheus",
- "uid": "6W2nM-Vnz"
- },
- "exemplar": true,
- "expr": "device_attribute{device=\"stat/unb2/1\",name=\"UNB2_VOUT_error_R\"}",
- "interval": "",
- "legendFormat": "{{x}}",
- "refId": "A"
- }
- ],
- "title": "Voltages",
- "type": "stat"
- },
- {
- "datasource": {
- "type": "prometheus",
- "uid": "6W2nM-Vnz"
- },
- "description": "",
- "fieldConfig": {
- "defaults": {
- "color": {
- "mode": "thresholds"
- },
- "mappings": [],
- "thresholds": {
- "mode": "absolute",
- "steps": [
- {
- "color": "green",
- "value": null
- },
- {
- "color": "red",
- "value": 1
- }
- ]
- }
- },
- "overrides": []
- },
- "gridPos": {
- "h": 2,
- "w": 3,
- "x": 9,
- "y": 12
- },
- "id": 33,
- "options": {
- "colorMode": "background",
- "graphMode": "none",
- "justifyMode": "auto",
- "orientation": "auto",
- "reduceOptions": {
- "calcs": [
- "lastNotNull"
- ],
- "fields": "",
- "values": false
- },
- "textMode": "name"
- },
- "pluginVersion": "8.4.5",
- "targets": [
- {
- "datasource": {
- "type": "prometheus",
- "uid": "6W2nM-Vnz"
- },
- "exemplar": true,
- "expr": "device_attribute{device=\"stat/unb2/1\",name=\"UNB2_IOUT_error_R\"}",
- "interval": "",
- "legendFormat": "{{x}}",
- "refId": "A"
- }
- ],
- "title": "Currents",
- "type": "stat"
- },
- {
- "datasource": {
- "type": "prometheus",
- "uid": "6W2nM-Vnz"
- },
- "description": "",
- "fieldConfig": {
- "defaults": {
- "color": {
- "mode": "thresholds"
- },
- "mappings": [],
- "thresholds": {
- "mode": "absolute",
- "steps": [
- {
- "color": "green",
- "value": null
- },
- {
- "color": "red",
- "value": 1
- }
- ]
- }
- },
- "overrides": []
- },
- "gridPos": {
- "h": 2,
- "w": 3,
- "x": 12,
- "y": 12
- },
- "id": 34,
- "options": {
- "colorMode": "background",
- "graphMode": "none",
- "justifyMode": "auto",
- "orientation": "auto",
- "reduceOptions": {
- "calcs": [
- "lastNotNull"
- ],
- "fields": "",
- "values": false
- },
- "textMode": "name"
- },
- "pluginVersion": "8.4.5",
- "targets": [
- {
- "datasource": {
- "type": "prometheus",
- "uid": "6W2nM-Vnz"
- },
- "exemplar": true,
- "expr": "device_attribute{device=\"stat/unb2/1\",name=\"UNB2_TEMP_error_R\"}",
- "interval": "",
- "legendFormat": "{{x}}",
- "refId": "A"
- }
- ],
- "title": "Temperatures",
- "type": "stat"
- },
{
"collapsed": false,
"gridPos": {
"h": 1,
"w": 24,
"x": 0,
- "y": 14
+ "y": 16
},
"id": 27,
"panels": [],
@@ -1061,7 +978,7 @@
"h": 2,
"w": 8,
"x": 0,
- "y": 15
+ "y": 17
},
"id": 2,
"options": {
@@ -1131,7 +1048,7 @@
"h": 2,
"w": 8,
"x": 8,
- "y": 15
+ "y": 17
},
"id": 16,
"options": {
@@ -1231,7 +1148,7 @@
"h": 6,
"w": 7,
"x": 16,
- "y": 15
+ "y": 17
},
"id": 21,
"options": {
@@ -1297,7 +1214,7 @@
"h": 2,
"w": 8,
"x": 0,
- "y": 17
+ "y": 19
},
"id": 23,
"options": {
@@ -1363,7 +1280,7 @@
"h": 2,
"w": 8,
"x": 8,
- "y": 17
+ "y": 19
},
"id": 18,
"options": {
@@ -1438,7 +1355,7 @@
"h": 2,
"w": 8,
"x": 0,
- "y": 19
+ "y": 21
},
"id": 19,
"options": {
@@ -1508,7 +1425,7 @@
"h": 2,
"w": 8,
"x": 8,
- "y": 19
+ "y": 21
},
"id": 17,
"options": {
@@ -1579,7 +1496,7 @@
"h": 2,
"w": 8,
"x": 8,
- "y": 21
+ "y": 23
},
"id": 15,
"options": {
@@ -1682,7 +1599,7 @@
"h": 6,
"w": 7,
"x": 16,
- "y": 21
+ "y": 23
},
"id": 22,
"options": {
@@ -1719,7 +1636,7 @@
"h": 1,
"w": 24,
"x": 0,
- "y": 27
+ "y": 29
},
"id": 39,
"panels": [
@@ -3639,7 +3556,7 @@
"h": 1,
"w": 24,
"x": 0,
- "y": 28
+ "y": 30
},
"id": 61,
"panels": [
@@ -3702,7 +3619,7 @@
"h": 8,
"w": 11,
"x": 0,
- "y": 29
+ "y": 31
},
"id": 63,
"options": {
@@ -3792,7 +3709,7 @@
"h": 8,
"w": 12,
"x": 11,
- "y": 29
+ "y": 31
},
"id": 64,
"options": {
@@ -3815,7 +3732,7 @@
"exemplar": true,
"expr": "device_attribute{device=\"stat/sdp/1\",name=\"FPGA_temp_R\"} > 0",
"interval": "",
- "legendFormat": "FPGA {{x}}",
+ "legendFormat": "Uniboard {{y}} - FPGA {{x}}",
"refId": "A"
}
],
@@ -3832,7 +3749,7 @@
"h": 1,
"w": 24,
"x": 0,
- "y": 29
+ "y": 31
},
"id": 66,
"panels": [
@@ -3882,13 +3799,13 @@
"transform_values_overrides": "0->down|1->up",
"valueName": "current"
},
- "default_title_for_rows": "Metric",
+ "default_title_for_rows": "",
"description": "",
"gridPos": {
"h": 7,
"w": 6,
"x": 0,
- "y": 30
+ "y": 32
},
"id": 70,
"non_matching_cells_text": "-",
@@ -3955,11 +3872,12 @@
"refId": "A"
}
],
+ "text_alignment_values": "center",
"title": "Uniboard Bus Errors",
"type": "yesoreyeram-boomtable-panel"
},
{
- "activePatternIndex": 1,
+ "activePatternIndex": -3,
"datasource": {
"type": "prometheus",
"uid": "6W2nM-Vnz"
@@ -4004,13 +3922,13 @@
"transform_values_overrides": "0->down|1->up",
"valueName": "current"
},
- "default_title_for_rows": "Metric",
+ "default_title_for_rows": "",
"description": "",
"gridPos": {
"h": 7,
"w": 9,
"x": 6,
- "y": 30
+ "y": 32
},
"id": 69,
"non_matching_cells_text": "-",
@@ -4077,11 +3995,12 @@
"refId": "A"
}
],
+ "text_alignment_values": "center",
"title": "FPGA Bus Errors",
"type": "yesoreyeram-boomtable-panel"
},
{
- "activePatternIndex": 1,
+ "activePatternIndex": -3,
"datasource": {
"type": "prometheus",
"uid": "6W2nM-Vnz"
@@ -4126,13 +4045,13 @@
"transform_values_overrides": "0->down|1->up",
"valueName": "current"
},
- "default_title_for_rows": "Metric",
+ "default_title_for_rows": "",
"description": "",
"gridPos": {
"h": 5,
"w": 15,
"x": 0,
- "y": 37
+ "y": 39
},
"id": 67,
"non_matching_cells_text": "-",
@@ -4199,11 +4118,12 @@
"refId": "A"
}
],
+ "text_alignment_values": "center",
"title": "QSFP Bus Errors",
"type": "yesoreyeram-boomtable-panel"
}
],
- "title": "Busses",
+ "title": "Bus Errors",
"type": "row"
},
{
@@ -4212,7 +4132,7 @@
"h": 1,
"w": 24,
"x": 0,
- "y": 30
+ "y": 32
},
"id": 73,
"panels": [
@@ -4268,7 +4188,7 @@
"h": 17,
"w": 2,
"x": 0,
- "y": 31
+ "y": 33
},
"id": 74,
"non_matching_cells_text": "-",
@@ -4390,7 +4310,7 @@
"h": 17,
"w": 8,
"x": 2,
- "y": 31
+ "y": 33
},
"id": 68,
"non_matching_cells_text": "-",
@@ -4512,7 +4432,7 @@
"h": 17,
"w": 8,
"x": 10,
- "y": 31
+ "y": 33
},
"id": 71,
"non_matching_cells_text": "-",
@@ -4583,7 +4503,7 @@
"type": "yesoreyeram-boomtable-panel"
}
],
- "title": "Input signals",
+ "title": "Input Signals",
"type": "row"
}
],
@@ -4602,6 +4522,6 @@
"timezone": "",
"title": "SDP",
"uid": "sdp",
- "version": 26,
+ "version": 30,
"weekStart": ""
}