diff --git a/dashboards/apsct.json b/dashboards/apsct.json
index 0bfb0faba57214e61592f48a32ef59c2c4b896f0..465e45c29c2772e91bdcdafe6db351d331d1f20c 100644
--- a/dashboards/apsct.json
+++ b/dashboards/apsct.json
@@ -1457,7 +1457,7 @@
"uid": "prometheus"
},
"exemplar": false,
- "expr": "device_attribute{host=\"$station\",device=~\"stat/recv/1\",name=\"RCU_ADC_locked_R\"}\r\n+ on(x, y) (10 * device_attribute{host=\"$station\",device=~\"stat/recv/1\", name=\"ANT_mask_RW\"})",
+ "expr": "device_attribute{host=\"$station\",device=~\"stat/recv[hl]/$subrack\",name=\"RCU_ADC_locked_R\"}\r\n+ on(x, y) (10 * device_attribute{host=\"$station\",device=~\"stat/recv[hl]/$subrack\", name=\"ANT_mask_RW\"})",
"instant": true,
"interval": "",
"legendFormat": "{{x}} - input {{y}}",
@@ -1528,7 +1528,7 @@
"uid": "prometheus"
},
"exemplar": true,
- "expr": "device_attribute{host=\"$station\",device=~\"stat/sdp/1\",name=\"FPGA_pps_present_R\"}\r\n+ on(x) (10 * device_attribute{host=\"$station\",device=~\"stat/sdp/1\",name=\"TR_fpga_mask_R\"})",
+ "expr": "device_attribute{host=\"$station\",device=~\"stat/sdpfirmware/.*\",name=\"FPGA_pps_present_R\"}\r\n+ on(device, x) (10 * device_attribute{host=\"$station\",device=~\"stat/sdpfirmware/.*\",name=\"TR_fpga_mask_R\"})",
"interval": "",
"legendFormat": "{{x}}",
"refId": "A"
@@ -1610,7 +1610,7 @@
"uid": "prometheus"
},
"exemplar": true,
- "expr": "device_attribute{host=\"$station\",device=~\"stat/sdp/1\",name=\"FPGA_pps_capture_cnt_R\"} / 1000000",
+ "expr": "device_attribute{host=\"$station\",device=~\"stat/sdpfirmware/.*\",name=\"FPGA_pps_capture_cnt_R\"} / 1000000",
"interval": "",
"legendFormat": "{{x}}",
"refId": "A"
@@ -1679,7 +1679,7 @@
"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",
+ "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/sdpfirmware/1\", name=\"TR_fpga_mask_R\"})\r\n",
"interval": "",
"legendFormat": "{{x}}",
"refId": "A"
diff --git a/dashboards/beamlet.json b/dashboards/beamlet.json
index da16f3bbd33ae736293acc471eecc51e3c739d49..066f46c405fa07eca05ce343633f294a017505a1 100644
--- a/dashboards/beamlet.json
+++ b/dashboards/beamlet.json
@@ -385,7 +385,7 @@
"uid": "prometheus"
},
"exemplar": true,
- "expr": "device_attribute{host=\"$station\",device=\"stat/sdp/1\",name=\"TR_fpga_mask_R\"}",
+ "expr": "device_attribute{host=\"$station\",device=\"stat/sdpfirmware/$antennafield\",name=\"TR_fpga_mask_R\"}",
"interval": "",
"legendFormat": "{{x}}",
"refId": "A"
@@ -459,7 +459,7 @@
"uid": "prometheus"
},
"exemplar": true,
- "expr": "device_attribute{host=\"$station\",device=\"stat/beamlet/$antennafield\", name=\"FPGA_beamlet_output_enable_R\"}\r\n+ on(x) (10 * device_attribute{host=\"$station\",device=\"stat/sdp/1\", name=\"TR_fpga_mask_R\"})\r\n",
+ "expr": "device_attribute{host=\"$station\",device=\"stat/beamlet/$antennafield\", name=\"FPGA_beamlet_output_enable_R\"}\r\n+ on(x) (10 * device_attribute{host=\"$station\",device=\"stat/sdpfirmware/$antennafield\", name=\"TR_fpga_mask_R\"})\r\n",
"interval": "",
"legendFormat": "{{x}}",
"refId": "A"
@@ -529,7 +529,7 @@
"uid": "prometheus"
},
"exemplar": true,
- "expr": "(device_attribute{host=\"$station\",device=\"stat/beamlet/$antennafield\", 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",
+ "expr": "(device_attribute{host=\"$station\",device=\"stat/beamlet/$antennafield\", name=\"FPGA_beamlet_output_nof_packets_R\"} > bool -1)\r\n+ on(x) (10 * device_attribute{host=\"$station\",device=\"stat/sdpfirmware/$antennafield\", name=\"TR_fpga_mask_R\"})\r\n",
"interval": "",
"legendFormat": "{{x}}",
"refId": "A"
diff --git a/dashboards/clock.json b/dashboards/clock.json
index 512cb7f88d145ae2204524e537ae49bddc8dea1c..211bac6e4dd44fad60f4c8d753a6d9283aa55aef 100644
--- a/dashboards/clock.json
+++ b/dashboards/clock.json
@@ -428,7 +428,7 @@
},
"editorMode": "code",
"exemplar": true,
- "expr": "device_attribute{host=\"$station\",device=\"stat/sdp/$antennafield\",name=\"FPGA_pps_present_R\"}\r\n+ on(x) (10 * device_attribute{host=\"$station\",device=\"stat/sdp/$antennafield\",name=\"TR_fpga_mask_R\"})",
+ "expr": "device_attribute{host=\"$station\",device=\"stat/sdpfirmware/$antennafield\",name=\"FPGA_pps_present_R\"}\r\n+ on(x) (10 * device_attribute{host=\"$station\",device=\"stat/sdpfirmware/$antennafield\",name=\"TR_fpga_mask_R\"})",
"interval": "",
"legendFormat": "FPGA {{x}}",
"range": true,
@@ -517,7 +517,7 @@
},
"editorMode": "code",
"exemplar": true,
- "expr": "device_attribute{host=\"$station\",device=\"stat/sdp/$antennafield\",name=\"FPGA_pps_capture_cnt_R\"} / 1000000",
+ "expr": "device_attribute{host=\"$station\",device=\"stat/sdpfirmware/$antennafield\",name=\"FPGA_pps_capture_cnt_R\"} / 1000000",
"interval": "",
"legendFormat": "FPGA {{x}}",
"range": true,
@@ -614,7 +614,7 @@
"uid": "prometheus"
},
"exemplar": true,
- "expr": "device_attribute{host=\"$station\",device=\"stat/sdp/$antennafield\",name=\"FPGA_time_since_last_pps_R\"}",
+ "expr": "device_attribute{host=\"$station\",device=\"stat/sdpfirmware/$antennafield\",name=\"FPGA_time_since_last_pps_R\"}",
"interval": "",
"legendFormat": "{{x}}",
"refId": "A"
diff --git a/dashboards/sdp.json b/dashboards/sdp.json
index b2e347f64b9c80cddaddd7e5d0158f61506b305a..3a305d52eebf7fe4a45a173735b020e89d41a969 100644
--- a/dashboards/sdp.json
+++ b/dashboards/sdp.json
@@ -765,7 +765,7 @@
"uid": "prometheus"
},
"exemplar": true,
- "expr": "device_attribute{host=\"$station\",device=\"stat/sdp/$antennafield\",name=\"TR_fpga_mask_R\"}",
+ "expr": "device_attribute{host=\"$station\",device=\"stat/sdpfirmware/$antennafield\",name=\"TR_fpga_mask_R\"}",
"interval": "",
"legendFormat": "{{x}}",
"refId": "A"
@@ -835,7 +835,7 @@
"uid": "prometheus"
},
"exemplar": true,
- "expr": "device_attribute{host=\"$station\",device=\"stat/sdp/$antennafield\",name=\"TR_fpga_communication_error_R\"}\r\n+ on(x) (device_attribute{host=\"$station\",device=\"stat/sdp/$antennafield\",name=\"FPGA_firmware_version_R\"} == bool 0)\r\n+ on(x) (10 * device_attribute{host=\"$station\",device=\"stat/sdp/$antennafield\",name=\"TR_fpga_mask_R\"})",
+ "expr": "device_attribute{host=\"$station\",device=\"stat/sdp/$antennafield\",name=\"TR_fpga_communication_error_R\"}\r\n+ on(x) (device_attribute{host=\"$station\",device=\"stat/sdpfirmware/$antennafield\",name=\"FPGA_firmware_version_R\"} == bool 0)\r\n+ on(x) (10 * device_attribute{host=\"$station\",device=\"stat/sdpfirmware/$antennafield\",name=\"TR_fpga_mask_R\"})",
"interval": "",
"legendFormat": "{{x}}",
"refId": "A"
@@ -934,7 +934,7 @@
"uid": "prometheus"
},
"exemplar": true,
- "expr": "device_attribute{host=\"$station\",device=\"stat/sdp/$antennafield\",name=\"FPGA_time_since_last_pps_R\"}",
+ "expr": "device_attribute{host=\"$station\",device=\"stat/sdpfirmware/$antennafield\",name=\"FPGA_time_since_last_pps_R\"}",
"interval": "",
"legendFormat": "{{x}}",
"refId": "A"
@@ -1004,7 +1004,7 @@
"uid": "prometheus"
},
"exemplar": true,
- "expr": "device_attribute{host=\"$station\",device=\"stat/sdp/$antennafield\",name=\"FPGA_pps_present_R\"}\r\n+ on(x) (10 * device_attribute{host=\"$station\",device=\"stat/sdp/$antennafield\",name=\"TR_fpga_mask_R\"})",
+ "expr": "device_attribute{host=\"$station\",device=\"stat/sdpfirmware/$antennafield\",name=\"FPGA_pps_present_R\"}\r\n+ on(x) (10 * device_attribute{host=\"$station\",device=\"stat/sdpfirmware/$antennafield\",name=\"TR_fpga_mask_R\"})",
"interval": "",
"legendFormat": "{{x}}",
"refId": "A"
@@ -1145,7 +1145,7 @@
"uid": "prometheus"
},
"exemplar": true,
- "expr": "device_attribute{host=\"$station\",device=\"stat/sdp/$antennafield\",name=\"FPGA_temp_R\"}",
+ "expr": "device_attribute{host=\"$station\",device=\"stat/sdpfirmware/$antennafield\",name=\"FPGA_temp_R\"}",
"interval": "",
"legendFormat": "{{x}}",
"refId": "A"
@@ -1215,7 +1215,7 @@
"uid": "prometheus"
},
"exemplar": true,
- "expr": "(sum by (x) (device_attribute{host=\"$station\",device=\"stat/sdp/$antennafield\", name=\"FPGA_signal_input_rms_R\"}) == bool 0)\r\n+ on(x) (10 * device_attribute{host=\"$station\",device=\"stat/sdp/$antennafield\", name=\"TR_fpga_mask_R\"})\r\n",
+ "expr": "(sum by (x) (device_attribute{host=\"$station\",device=\"stat/sdp/$antennafield\", name=\"FPGA_signal_input_rms_R\"}) == bool 0)\r\n+ on(x) (10 * device_attribute{host=\"$station\",device=\"stat/sdpfirmware/$antennafield\", name=\"TR_fpga_mask_R\"})\r\n",
"instant": false,
"interval": "",
"legendFormat": "{{x}}",
@@ -1286,7 +1286,7 @@
"uid": "prometheus"
},
"exemplar": true,
- "expr": "(1 - device_attribute{host=\"$station\",device=\"stat/sdp/$antennafield\", name=\"FPGA_processing_enable_R\"})\r\n+ on(x) (device_attribute{host=\"$station\",device=\"stat/sdp/$antennafield\", name=\"FPGA_boot_image_R\"} != bool 1)\r\n+ on(x) (10 * device_attribute{host=\"$station\",device=\"stat/sdp/$antennafield\", name=\"TR_fpga_mask_R\"})",
+ "expr": "(1 - device_attribute{host=\"$station\",device=\"stat/sdp/$antennafield\", name=\"FPGA_processing_enable_R\"})\r\n+ on(x) (device_attribute{host=\"$station\",device=\"stat/sdp/$antennafield\", name=\"FPGA_boot_image_R\"} != bool 1)\r\n+ on(x) (10 * device_attribute{host=\"$station\",device=\"stat/sdpfirmware/$antennafield\", name=\"TR_fpga_mask_R\"})",
"hide": false,
"instant": false,
"interval": "",
@@ -3620,7 +3620,7 @@
"uid": "prometheus"
},
"exemplar": true,
- "expr": "device_attribute{host=\"$station\",device=\"stat/sdp/$antennafield\",name=\"FPGA_temp_R\"} > 0",
+ "expr": "device_attribute{host=\"$station\",device=\"stat/sdpfirmware/$antennafield\",name=\"FPGA_temp_R\"} > 0",
"interval": "",
"legendFormat": "Uniboard {{y}} - FPGA {{x}}",
"refId": "A"
@@ -4149,7 +4149,7 @@
"uid": "prometheus"
},
"exemplar": false,
- "expr": "device_attribute{host=\"$station\",device=\"stat/sdp/$antennafield\",name=\"TR_fpga_mask_R\"}",
+ "expr": "device_attribute{host=\"$station\",device=\"stat/sdpfirmware/$antennafield\",name=\"TR_fpga_mask_R\"}",
"format": "time_series",
"instant": true,
"interval": "",
diff --git a/dashboards/sensors.json b/dashboards/sensors.json
index 90f6a0efd25af3820fb3b208a8d03e63842f0956..9970a04d220fad7131744f281eff5f3d44b20930 100644
--- a/dashboards/sensors.json
+++ b/dashboards/sensors.json
@@ -127,7 +127,7 @@
"targets": [
{
"exemplar": true,
- "expr": "device_attribute{host=\"$station\",device=\"stat/sdp/$antennafield\",name=\"FPGA_temp_R\"} != 0",
+ "expr": "device_attribute{host=\"$station\",device=\"stat/sdpfirmware/$antennafield\",name=\"FPGA_temp_R\"} != 0",
"format": "time_series",
"hide": false,
"instant": false,