Merge branch 'master' into L2SS-429-timescaledb-container

docker-compose/device-observation_control.yml

@@ -25,17 +25,16 @@ services:
       - control
     ports:
       - "5703:5703" # unique port for this DS
+    extra_hosts:
+      - "host.docker.internal:host-gateway"
     volumes:
         - ..:/opt/lofar/tango:rw
     environment:
       - TANGO_HOST=${TANGO_HOST}
+    working_dir: /opt/lofar/tango
     entrypoint:
-      - /usr/local/bin/wait-for-it.sh
-      - ${TANGO_HOST}
-      - --timeout=30
-      - --strict
-      - --
+      - bin/start-ds.sh
       # configure CORBA to _listen_ on 0:port, but tell others we're _reachable_ through ${HOSTNAME}:port, since CORBA
       # can't know about our Docker port forwarding
-      - python3 -u /opt/lofar/tango/devices/devices/observation_control.py LTS -v -ORBendPoint giop:tcp:0:5703 -ORBendPointPublish giop:tcp:${HOSTNAME}:5703
+      - l2ss-observation-control ObservationControl LTS -v -ORBendPoint giop:tcp:0:5703 -ORBendPointPublish giop:tcp:${HOSTNAME}:5703
     restart: unless-stopped

docker-compose/device-recv.yml

@@ -26,17 +26,16 @@ services:
       - control
     ports:
       - "5707:5707" # unique port for this DS
+    extra_hosts:
+      - "host.docker.internal:host-gateway"
     volumes:
         - ..:/opt/lofar/tango:rw
     environment:
       - TANGO_HOST=${TANGO_HOST}
+    working_dir: /opt/lofar/tango
     entrypoint:
-      - /usr/local/bin/wait-for-it.sh
-      - ${TANGO_HOST}
-      - --timeout=30
-      - --strict
-      - --
+      - bin/start-ds.sh
       # configure CORBA to _listen_ on 0:port, but tell others we're _reachable_ through ${HOSTNAME}:port, since CORBA
       # can't know about our Docker port forwarding
-      - python3 -u /opt/lofar/tango/devices/devices/recv.py LTS -v -ORBendPoint giop:tcp:0:5707 -ORBendPointPublish giop:tcp:${HOSTNAME}:5707
+      - l2ss-receiver RECV LTS -v -ORBendPoint giop:tcp:0:5707 -ORBendPointPublish giop:tcp:${HOSTNAME}:5707
     restart: unless-stopped

docker-compose/device-sdp.yml

@@ -26,17 +26,16 @@ services:
       - control
     ports:
       - "5701:5701" # unique port for this DS
+    extra_hosts:
+      - "host.docker.internal:host-gateway"
     volumes:
         - ..:/opt/lofar/tango:rw
     environment:
       - TANGO_HOST=${TANGO_HOST}
+    working_dir: /opt/lofar/tango
     entrypoint:
-      - /usr/local/bin/wait-for-it.sh
-      - ${TANGO_HOST}
-      - --timeout=30
-      - --strict
-      - --
+      - bin/start-ds.sh
       # configure CORBA to _listen_ on 0:port, but tell others we're _reachable_ through ${HOSTNAME}:port, since CORBA
       # can't know about our Docker port forwarding
-      - python3 -u /opt/lofar/tango/devices/devices/sdp/sdp.py LTS -v -ORBendPoint giop:tcp:0:5701 -ORBendPointPublish giop:tcp:${HOSTNAME}:5701
+      - l2ss-sdp SDP LTS -v -ORBendPoint giop:tcp:0:5701 -ORBendPointPublish giop:tcp:${HOSTNAME}:5701
     restart: unless-stopped

docker-compose/device-sst.yml

@@ -29,17 +29,16 @@ services:
         - "5001:5001/udp" # port to receive SST UDP packets on
         - "5101:5101/tcp" # port to emit SST TCP packets on
         - "5702:5702" # unique port for this DS
+    extra_hosts:
+      - "host.docker.internal:host-gateway"
     volumes:
         - ..:/opt/lofar/tango:rw
     environment:
       - TANGO_HOST=${TANGO_HOST}
+    working_dir: /opt/lofar/tango
     entrypoint:
-      - /usr/local/bin/wait-for-it.sh
-      - ${TANGO_HOST}
-      - --timeout=30
-      - --strict
-      - --
+      - bin/start-ds.sh
       # configure CORBA to _listen_ on 0:port, but tell others we're _reachable_ through ${HOSTNAME}:port, since CORBA
       # can't know about our Docker port forwarding
-      - python3 -u /opt/lofar/tango/devices/devices/sdp/sst.py LTS -v -ORBendPoint giop:tcp:0:5702 -ORBendPointPublish giop:tcp:${HOSTNAME}:5702
+      - l2ss-sst SST LTS -v -ORBendPoint giop:tcp:0:5702 -ORBendPointPublish giop:tcp:${HOSTNAME}:5702
     restart: unless-stopped

docker-compose/device-unb2.yml

@@ -26,17 +26,16 @@ services:
       - control
     ports:
       - "5704:5704" # unique port for this DS
+    extra_hosts:
+      - "host.docker.internal:host-gateway"
     volumes:
         - ..:/opt/lofar/tango:rw
     environment:
       - TANGO_HOST=${TANGO_HOST}
+    working_dir: /opt/lofar/tango
     entrypoint:
-      - /usr/local/bin/wait-for-it.sh
-      - ${TANGO_HOST}
-      - --timeout=30
-      - --strict
-      - --
+      - bin/start-ds.sh
       # configure CORBA to _listen_ on 0:port, but tell others we're _reachable_ through ${HOSTNAME}:port, since CORBA
       # can't know about our Docker port forwarding
-      - python3 -u /opt/lofar/tango/devices/devices/unb2.py LTS -v -ORBendPoint giop:tcp:0:5704 -ORBendPointPublish giop:tcp:${HOSTNAME}:5704
+      - l2ss-unb2 UNB2 LTS -v -ORBendPoint giop:tcp:0:5704 -ORBendPointPublish giop:tcp:${HOSTNAME}:5704
     restart: unless-stopped

docker-compose/device-xst.yml

@@ -29,17 +29,16 @@ services:
         - "5002:5002/udp" # port to receive XST UDP packets on
         - "5102:5102/tcp" # port to emit XST TCP packets on
         - "5706:5706" # unique port for this DS
+    extra_hosts:
+      - "host.docker.internal:host-gateway"
     volumes:
         - ..:/opt/lofar/tango:rw
     environment:
       - TANGO_HOST=${TANGO_HOST}
+    working_dir: /opt/lofar/tango
     entrypoint:
-      - /usr/local/bin/wait-for-it.sh
-      - ${TANGO_HOST}
-      - --timeout=30
-      - --strict
-      - --
+      - bin/start-ds.sh
       # configure CORBA to _listen_ on 0:port, but tell others we're _reachable_ through ${HOSTNAME}:port, since CORBA
       # can't know about our Docker port forwarding
-      - python3 -u /opt/lofar/tango/devices/devices/sdp/xst.py LTS -v -ORBendPoint giop:tcp:0:5706 -ORBendPointPublish giop:tcp:${HOSTNAME}:5706
+      - l2ss-xst XST LTS -v -ORBendPoint giop:tcp:0:5706 -ORBendPointPublish giop:tcp:${HOSTNAME}:5706
     restart: unless-stopped

docker-compose/elk.yml

@@ -34,7 +34,8 @@ services:
       - "5601:5601" # kibana
       - "9200:9200" # elasticsearch
       - "5044:5044" # logstash beats input
-      - "1514:1514" # logstash syslog input
+      - "1514:1514/tcp" # logstash syslog input
+      - "1514:1514/udp" # logstash syslog input
       - "5959:5959" # logstash tcp json input
     depends_on:
       - elk-configure-host

docker-compose/elk/logstash/conf.d/20-parse-grafana.conf

+filter {
+  if [program] == "grafana" {
+    kv { }
+    mutate {
+      rename => {
+        "t" => "timestamp"
+        "lvl" => "level"
+        "msg" => "message"
+      }
+      uppercase => [ "level" ]
+    }
+    date {
+      match => [ "timestamp", "ISO8601" ]
+    }
+  }
+}

docker-compose/elk/logstash/conf.d/21-parse-prometheus.conf

+filter {
+  if [program] == "prometheus" {
+    kv { }
+    mutate {
+      rename => {
+        "ts" => "timestamp"
+        "msg" => "message"
+      }
+      uppercase => [ "level" ]
+    }
+    date {
+      match => [ "timestamp", "ISO8601" ]
+    }
+  }
+}

docker-compose/elk/logstash/conf.d/22-parse-tango-rest.conf

+filter {
+  if [program] == "tango-rest" {
+    grok {
+      match => {
+        "message" => "%{TIMESTAMP_ISO8601:timestamp} %{WORD:level} %{GREEDYDATA:message}"
+      }
+      "overwrite" => [ "timestamp", "level", "message" ]
+    }
+    date {
+      match => [ "timestamp", "YYYY-MM-dd HH:mm:ss,SSS" ]
+      timezone => "UTC"
+    }
+  }
+}

docker-compose/elk/logstash/conf.d/23-parse-maria-db.conf

+filter {
+  # mark all our mariadb instances
+  grok {
+    match => {
+      "program" => [ "archiver-maria-db", "tangodb" ]
+    }
+    add_tag => [ "mariadb" ]
+  }
+
+  # parse mariadb output
+  if "mariadb" in [tags] {
+    grok {
+      match => {
+        "message" => [
+          "%{TIMESTAMP_ISO8601:timestamp} .%{WORD:level}. %{GREEDYDATA:message}",
+          "%{TIMESTAMP_ISO8601:timestamp} 0 .%{WORD:level}. %{GREEDYDATA:message}"
+        ]
+      }
+      "overwrite" => [ "timestamp", "level", "message" ]
+    }
+    mutate {
+      gsub => [
+        "level", "Note", "Info"
+      ]
+      uppercase => [ "level" ]
+    }
+    date {
+      match => [ "timestamp", "YYYY-MM-dd HH:mm:ssZZ", "YYYY-MM-dd HH:mm:ss", "YYYY-MM-dd  H:mm:ss"  ]
+      timezone => "UTC"
+    }
+  }
+}

docker-compose/grafana.yml

@@ -23,4 +23,10 @@ services:
     #  - grafana-configs:/etc/grafana
     ports:
       - "3000:3000"
+    logging:
+      driver: syslog
+      options:
+        syslog-address: udp://${LOG_HOSTNAME}:1514
+        syslog-format: rfc3164
+        tag: "{{.Name}}"
     restart: unless-stopped

docker-compose/grafana/Dockerfile

 FROM grafana/grafana
 
+# Install some plugins
+RUN grafana-cli plugins install briangann-datatable-panel
+RUN grafana-cli plugins install ae3e-plotly-panel
+
 COPY grafana.ini /etc/grafana/
 
 # Add default configuration through provisioning (see https://grafana.com/docs/grafana/latest/administration/provisioning)

docker-compose/grafana/dashboards/sensors.json

@@ -22,7 +22,6 @@
   "fiscalYearStartMonth": 0,
   "gnetId": null,
   "graphTooltip": 0,
-  "id": 4,
   "links": [],
   "liveNow": false,
   "panels": [
@@ -75,7 +74,6 @@
             }
           },
           "mappings": [],
-          "min": 0,
           "thresholds": {
             "mode": "absolute",
             "steps": [
@@ -99,7 +97,7 @@
         "x": 0,
         "y": 1
       },
-      "id": 2,
+      "id": 6,
       "options": {
         "legend": {
           "calcs": [],
@@ -114,7 +112,7 @@
       "targets": [
         {
           "exemplar": true,
-          "expr": "device_attribute{device=\"lts/recv/1\",name=\"RCU_temperature_R\"} - 273.15",
+          "expr": "device_attribute{device=\"lts/sdp/1\",name=\"FPGA_temp_R\"} != 0",
           "format": "time_series",
           "hide": false,
           "instant": false,
@@ -123,13 +121,13 @@
           "refId": "A"
         }
       ],
-      "title": "RCU temperatures",
+      "title": "FPGA Temperatures",
       "transformations": [],
       "type": "timeseries"
     },
     {
       "datasource": "Prometheus",
-      "description": "Temperature sensors of each node on each board",
+      "description": "",
       "fieldConfig": {
         "defaults": {
           "color": {
@@ -202,14 +200,14 @@
       "targets": [
         {
           "exemplar": true,
-          "expr": "device_attribute{device=\"lts/unb2/1\",name=\"UNB2_FPGA_POL_CORE_TEMP_R\"}",
+          "expr": "device_attribute{device=\"lts/unb2/1\",name=\"UNB2_FPGA_POL_CORE_TEMP_R\"} ",
           "interval": "",
           "legendFormat": "Core board {{x}} node {{y}}",
           "refId": "A"
         },
         {
           "exemplar": true,
-          "expr": "device_attribute{device=\"lts/unb2/1\",name=\"UNB2_FPGA_POL_ERAM_TEMP_R\"}",
+          "expr": "device_attribute{device=\"lts/unb2/1\",name=\"UNB2_FPGA_POL_ERAM_TEMP_R\"} ",
           "hide": false,
           "interval": "",
           "legendFormat": "ERAM board {{x}} node {{y}}",
@@ -217,7 +215,7 @@
         },
         {
           "exemplar": true,
-          "expr": "device_attribute{device=\"lts/unb2/1\",name=\"UNB2_FPGA_POL_RXGXB_TEMP_R\"}",
+          "expr": "device_attribute{device=\"lts/unb2/1\",name=\"UNB2_FPGA_POL_RXGXB_TEMP_R\"} ",
           "hide": false,
           "interval": "",
           "legendFormat": "TrRx board {{x}} node {{y}}",
@@ -225,7 +223,7 @@
         },
         {
           "exemplar": true,
-          "expr": "device_attribute{device=\"lts/unb2/1\",name=\"UNB2_FPGA_POL_TXGB_TEMP_R\"}",
+          "expr": "device_attribute{device=\"lts/unb2/1\",name=\"UNB2_FPGA_POL_TXGB_TEMP_R\"} ",
           "hide": false,
           "interval": "",
           "legendFormat": "TrHx board {{x}} node {{y}}",
@@ -233,23 +231,28 @@
         },
         {
           "exemplar": true,
-          "expr": "device_attribute{device=\"lts/unb2/1\",name=\"UNB2_FPGA_POL_PGM_TEMP_R\"}",
+          "expr": "device_attribute{device=\"lts/unb2/1\",name=\"UNB2_FPGA_POL_PGM_TEMP_R\"} ",
           "hide": false,
           "interval": "",
           "legendFormat": "IO board {{x}} node {{y}}",
           "refId": "E"
         },
         {
+          "exemplar": true,
+          "expr": "device_attribute{device=\"lts/unb2/1\",name=\"UNB2_FPGA_POL_HGXB_TEMP_R\"} ",
           "hide": false,
+          "interval": "",
+          "legendFormat": "HGXB board {{x}} node {{y}}",
           "refId": "F"
         }
       ],
-      "title": "Uniboard2 Node Temperatures",
+      "title": "Uniboard2 FPGA POL Temperatures",
+      "transformations": [],
       "type": "timeseries"
     },
     {
       "datasource": "Prometheus",
-      "description": "Temperature sensors of the power supply on each board",
+      "description": "",
       "fieldConfig": {
         "defaults": {
           "color": {
@@ -308,7 +311,7 @@
         "x": 10,
         "y": 1
       },
-      "id": 8,
+      "id": 22,
       "options": {
         "legend": {
           "calcs": [],
@@ -322,62 +325,287 @@
       "targets": [
         {
           "exemplar": true,
-          "expr": "device_attribute{device=\"lts/unb2/1\",name=\"UNB2_POL_QSFP_N01_TEMP_R\"}",
+          "expr": "device_attribute{device=\"lts/unb2/1\",name=\"UNB2_FPGA_QSFP_CAGE_TEMP_R\"}",
           "interval": "",
-          "legendFormat": "QSFP N01 board {{x}} ",
+          "legendFormat": "FPGA QSFP Cage {{x}}, {{y}} ",
           "refId": "A"
+        }
+      ],
+      "title": "Uniboard2 QSFP Cage Temperatures",
+      "type": "timeseries"
+    },
+    {
+      "datasource": "Prometheus",
+      "description": "",
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic",
+            "seriesBy": "max"
+          },
+          "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": "never",
+            "spanNulls": false,
+            "stacking": {
+              "group": "A",
+              "mode": "none"
+            },
+            "thresholdsStyle": {
+              "mode": "line"
+            }
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 85
+              }
+            ]
+          },
+          "unit": "celsius"
         },
-        {
-          "exemplar": true,
-          "expr": "device_attribute{device=\"lts/unb2/1\",name=\"UNB2_POL_QSFP_N23_TEMP_R\"}",
-          "hide": false,
-          "interval": "",
-          "legendFormat": "QSFP N23 board {{x}}",
-          "refId": "B"
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 5,
+        "x": 15,
+        "y": 1
+      },
+      "id": 23,
+      "options": {
+        "legend": {
+          "calcs": [],
+          "displayMode": "hidden",
+          "placement": "bottom"
         },
+        "tooltip": {
+          "mode": "single"
+        }
+      },
+      "targets": [
         {
           "exemplar": true,
-          "expr": "device_attribute{device=\"lts/unb2/1\",name=\"UNB2_POL_SWITCH_1V2_TEMP_R\"}",
-          "hide": false,
+          "expr": "device_attribute{device=\"lts/unb2/1\",name=\"UNB2_FPGA_DDR4_SLOT_TEMP_R\"}",
           "interval": "",
-          "legendFormat": "Switch 1v2 board {{x}}",
-          "refId": "C"
+          "legendFormat": "FPGA QSFP Cage {{x}}, {{y}} ",
+          "refId": "A"
+        }
+      ],
+      "title": "Uniboard2  DDR4 Temperatures",
+      "type": "timeseries"
+    },
+    {
+      "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": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          },
+          "unit": "celsius"
         },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 5,
+        "x": 0,
+        "y": 9
+      },
+      "id": 2,
+      "options": {
+        "legend": {
+          "calcs": [],
+          "displayMode": "hidden",
+          "placement": "bottom"
+        },
+        "tooltip": {
+          "mode": "single"
+        }
+      },
+      "pluginVersion": "8.1.2",
+      "targets": [
         {
           "exemplar": true,
-          "expr": "device_attribute{device=\"lts/unb2/1\",name=\"UNB2_POL_SWITCH_PHY_TEMP_R\"}",
+          "expr": "device_attribute{device=\"lts/recv/1\",name=\"RCU_TEMP_R\"}",
+          "format": "time_series",
           "hide": false,
+          "instant": false,
           "interval": "",
-          "legendFormat": "Switch PHY board {{x}}",
-          "refId": "D"
+          "legendFormat": "{{x}}",
+          "refId": "A"
+        }
+      ],
+      "title": "RCU Temperatures",
+      "transformations": [],
+      "type": "timeseries"
+    },
+    {
+      "datasource": "Prometheus",
+      "description": "Temperatures reported by APSCT and APSPU",
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic",
+            "seriesBy": "max"
+          },
+          "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": "never",
+            "spanNulls": false,
+            "stacking": {
+              "group": "A",
+              "mode": "none"
+            },
+            "thresholdsStyle": {
+              "mode": "line"
+            }
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 85
+              }
+            ]
+          },
+          "unit": "celsius"
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 5,
+        "x": 5,
+        "y": 9
+      },
+      "id": 24,
+      "options": {
+        "legend": {
+          "calcs": [],
+          "displayMode": "hidden",
+          "placement": "bottom"
         },
+        "tooltip": {
+          "mode": "single"
+        }
+      },
+      "targets": [
         {
           "exemplar": true,
-          "expr": "device_attribute{device=\"lts/unb2/1\",name=\"UNB2_POL_CLOCK_TEMP_R\"}",
-          "hide": false,
+          "expr": "device_attribute{device=\"lts/apsct/1\",name=~\"APSCT_TEMP_R\"}",
           "interval": "",
-          "legendFormat": "Clock PWR board {{x}}",
-          "refId": "E"
+          "legendFormat": "{{name}}",
+          "refId": "A"
         },
         {
           "exemplar": true,
-          "expr": "device_attribute{device=\"lts/unb2/1\",name=\"UNB2_DC_DC_48V_12V_TEMP_R\"}",
+          "expr": "device_attribute{device=\"lts/apspu/1\",name=~\"APSPU_.*_TEMP_R\"}",
           "hide": false,
           "interval": "",
-          "legendFormat": "DC-DC board {{x}}",
-          "refId": "F"
+          "legendFormat": "{{name}}",
+          "refId": "B"
         }
       ],
-      "title": "Uniboard2 Power Supply Temperatures",
+      "title": "APS Temperatures",
       "type": "timeseries"
     },
     {
       "datasource": "Prometheus",
-      "description": "",
+      "description": "Temperature sensors of the power supply on each board",
       "fieldConfig": {
         "defaults": {
           "color": {
-            "mode": "palette-classic"
+            "mode": "palette-classic",
+            "seriesBy": "max"
           },
           "custom": {
             "axisLabel": "",
@@ -397,14 +625,14 @@
             "scaleDistribution": {
               "type": "linear"
             },
-            "showPoints": "auto",
+            "showPoints": "never",
             "spanNulls": false,
             "stacking": {
               "group": "A",
               "mode": "none"
             },
             "thresholdsStyle": {
-              "mode": "off"
+              "mode": "line"
             }
           },
           "mappings": [],
@@ -417,7 +645,7 @@
               },
               {
                 "color": "red",
-                "value": 80
+                "value": 85
               }
             ]
           },
@@ -429,9 +657,9 @@
         "h": 8,
         "w": 5,
         "x": 15,
-        "y": 1
+        "y": 9
       },
-      "id": 6,
+      "id": 8,
       "options": {
         "legend": {
           "calcs": [],
@@ -442,21 +670,56 @@
           "mode": "single"
         }
       },
-      "pluginVersion": "8.1.2",
       "targets": [
         {
           "exemplar": true,
-          "expr": "device_attribute{device=\"lts/sdp/1\",name=\"FPGA_temp_R\"}",
-          "format": "time_series",
-          "hide": false,
-          "instant": false,
+          "expr": "device_attribute{device=\"lts/unb2/1\",name=\"UNB2_POL_QSFP_N01_TEMP_R\"} ",
           "interval": "",
-          "legendFormat": "{{x}}",
+          "legendFormat": "QSFP N01 board {{x}}",
           "refId": "A"
+        },
+        {
+          "exemplar": true,
+          "expr": "device_attribute{device=\"lts/unb2/1\",name=\"UNB2_POL_QSFP_N23_TEMP_R\"} ",
+          "hide": false,
+          "interval": "",
+          "legendFormat": "QSFP N23 board {{x}}",
+          "refId": "B"
+        },
+        {
+          "exemplar": true,
+          "expr": "device_attribute{device=\"lts/unb2/1\",name=\"UNB2_POL_SWITCH_1V2_TEMP_R\"} ",
+          "hide": false,
+          "interval": "",
+          "legendFormat": "Switch 1v2 board {{x}}",
+          "refId": "C"
+        },
+        {
+          "exemplar": true,
+          "expr": "device_attribute{device=\"lts/unb2/1\",name=\"UNB2_POL_SWITCH_PHY_TEMP_R\"} ",
+          "hide": false,
+          "interval": "",
+          "legendFormat": "Switch PHY board {{x}}",
+          "refId": "D"
+        },
+        {
+          "exemplar": true,
+          "expr": "device_attribute{device=\"lts/unb2/1\",name=\"UNB2_POL_CLOCK_TEMP_R\"} ",
+          "hide": false,
+          "interval": "",
+          "legendFormat": "Clock PWR board {{x}}",
+          "refId": "E"
+        },
+        {
+          "exemplar": true,
+          "expr": "device_attribute{device=\"lts/unb2/1\",name=\"UNB2_DC_DC_48V_12V_TEMP_R\"} ",
+          "hide": false,
+          "interval": "",
+          "legendFormat": "DC-DC board {{x}}",
+          "refId": "F"
         }
       ],
-      "title": "FPGA temperatures",
-      "transformations": [],
+      "title": "Uniboard2 Power Supply Temperatures",
       "type": "timeseries"
     },
     {
@@ -466,7 +729,7 @@
         "h": 1,
         "w": 24,
         "x": 0,
-        "y": 9
+        "y": 17
       },
       "id": 18,
       "panels": [],
@@ -534,7 +797,7 @@
         "h": 8,
         "w": 5,
         "x": 0,
-        "y": 10
+        "y": 18
       },
       "id": 21,
       "options": {
@@ -619,7 +882,7 @@
         "h": 8,
         "w": 5,
         "x": 5,
-        "y": 10
+        "y": 18
       },
       "id": 10,
       "options": {
@@ -736,7 +999,7 @@
         "h": 8,
         "w": 5,
         "x": 10,
-        "y": 10
+        "y": 18
       },
       "id": 12,
       "options": {
@@ -808,7 +1071,7 @@
         "h": 1,
         "w": 24,
         "x": 0,
-        "y": 18
+        "y": 26
       },
       "id": 20,
       "panels": [],
@@ -878,7 +1141,7 @@
         "h": 8,
         "w": 5,
         "x": 0,
-        "y": 19
+        "y": 27
       },
       "id": 14,
       "options": {
@@ -923,5 +1186,5 @@
   "timezone": "",
   "title": "Sensors",
   "uid": "KMRmQzd7z",
-  "version": 3
+  "version": 1
 }

docker-compose/integration-test.yml

@@ -15,11 +15,13 @@ services:
     container_name: ${CONTAINER_NAME_PREFIX}integration-test
     networks:
       - control
+    extra_hosts:
+      - "host.docker.internal:host-gateway"
     volumes:
         - ..:/opt/lofar/tango:rw
     environment:
       - TANGO_HOST=${TANGO_HOST}
-    working_dir: /opt/lofar/tango/devices
+    working_dir: /opt/lofar/tango/tangostationcontrol
     entrypoint:
       - /usr/local/bin/wait-for-it.sh
       - ${TANGO_HOST}

docker-compose/itango.yml

@@ -21,6 +21,8 @@ services:
     container_name: ${CONTAINER_NAME_PREFIX}itango
     networks:
       - control
+    extra_hosts:
+      - "host.docker.internal:host-gateway"
     volumes:
         - ..:/opt/lofar/tango:rw
         - ${HOME}:/hosthome

docker-compose/itango/lofar-requirements.txt

+# Do not put tangostationcontrol dependencies here
 parso == 0.7.1
 jedi == 0.17.2
-asyncua
-astropy 
-python-logstash-async
-gitpython
-PyMySQL[rsa]
-sqlalchemy
+astropy

docker-compose/jupyter/Dockerfile

@@ -25,6 +25,7 @@ RUN sudo pip3 install notebook-as-pdf
 
 # see https://github.com/jupyter/nbconvert/issues/1434
 RUN sudo bash -c "echo DEFAULT_ARGS += [\\\"--no-sandbox\\\"] >> /usr/local/lib/python3.7/dist-packages/pyppeteer/launcher.py"
+RUN sudo apt-get update -y
 RUN sudo apt-get install -y gconf-service libasound2 libatk1.0-0 libatk-bridge2.0-0 libc6 libcairo2 libcups2 libdbus-1-3 libexpat1 libfontconfig1 libgcc1 libgconf-2-4 libgdk-pixbuf2.0-0 libglib2.0-0 libgtk-3-0 libnspr4 libpango-1.0-0 libpangocairo-1.0-0 libstdc++6 libx11-6 libx11-xcb1 libxcb1 libxcomposite1 libxcursor1 libxdamage1 libxext6 libxfixes3 libxi6 libxrandr2 libxrender1 libxss1 libxtst6 ca-certificates fonts-liberation libappindicator1 libnss3 lsb-release xdg-utils wget libcairo-gobject2 libxinerama1 libgtk2.0-0 libpangoft2-1.0-0 libthai0 libpixman-1-0 libxcb-render0 libharfbuzz0b libdatrie1 libgraphite2-3 libgbm1
 
 # Allow Download as -> PDF via LaTeX

docker-compose/lofar-device-base.yml

@@ -20,5 +20,9 @@ services:
         args:
             SOURCE_IMAGE: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}-tango-itango:${TANGO_ITANGO_VERSION}
     container_name: ${CONTAINER_NAME_PREFIX}lofar-device-base
+    # These parameters are just visual queues, you have to define them again
+    # in derived docker-compose files!
     networks:
       - control
+    extra_hosts:
+      - "host.docker.internal:host-gateway"