Correct IDs, update ERS to ersstream

DUNE-DAQ · Dec 8, 2023 · 5079592 · 5079592
1 parent 41b1ba4
commit 5079592
Show file tree

Hide file tree

Showing 4 changed files with 319 additions and 143 deletions.
diff --git a/dashboards/ERS.json b/dashboards/ERS.json
@@ -18,12 +18,13 @@
   "editable": true,
   "fiscalYearStartMonth": 0,
   "graphTooltip": 0,
-  "id": 44,
+  "id": 67,
   "links": [],
   "liveNow": false,
   "panels": [
     {
       "datasource": {
+        "type": "postgres",
         "uid": "${postgresql}"
       },
       "fieldConfig": {
@@ -159,11 +160,12 @@
           "datasource": {
             "uid": "${postgresql}"
           },
+          "editorMode": "code",
           "format": "table",
           "group": [],
           "metricColumn": "none",
           "rawQuery": true,
-          "rawSql": "SELECT severity,time,application_name,message,issue_name,host_name\nFROM public.\"ErrorReports\"\nWHERE partition='${partition}' AND time >= ${__from} AND time <= ${__to} AND severity in ([[severity]]) AND issue_name in ([[issue_full_name]]) AND application_name in ([[application_in]]) AND application_name not in ([[application_out]]) AND host_name in ([[host]]) AND message ~ '[[message_regex]]'   \nORDER BY -time\n",
+          "rawSql": "SELECT severity,time/1000000 as time,application_name,message,issue_name,host_name\nFROM \"ERSstream\"\nWHERE session='${partition}' AND time/1000000 >= ${__from} AND time/1000000 <= ${__to} AND severity in ([[severity]]) AND issue_name in ([[issue_full_name]]) AND application_name in ([[application_in]]) AND application_name not in ([[application_out]]) AND host_name in ([[host]]) AND message ~ '[[message_regex]]'   \nORDER BY -time\n",
           "refId": "A",
           "select": [
             [
@@ -175,6 +177,23 @@
               }
             ]
           ],
+          "sql": {
+            "columns": [
+              {
+                "parameters": [],
+                "type": "function"
+              }
+            ],
+            "groupBy": [
+              {
+                "property": {
+                  "type": "string"
+                },
+                "type": "groupBy"
+              }
+            ],
+            "limit": 50
+          },
           "timeColumn": "time",
           "where": [
             {
@@ -219,8 +238,8 @@
       {
         "current": {
           "selected": false,
-          "text": "schhibra-test",
-          "value": "schhibra-test"
+          "text": "coldbbox-timing-tlu",
+          "value": "coldbbox-timing-tlu"
         },
         "datasource": {
           "uid": "${postgresql}"
@@ -243,12 +262,10 @@
         "current": {
           "selected": true,
           "text": [
-            "INFO",
             "WARNING",
             "ERROR"
           ],
           "value": [
-            "INFO",
             "WARNING",
             "ERROR"
           ]
@@ -273,16 +290,8 @@
       {
         "current": {
           "selected": false,
-          "text": [
-            "trigger",
-            "fakehsi",
-            "rulocalhost0"
-          ],
-          "value": [
-            "trigger",
-            "fakehsi",
-            "rulocalhost0"
-          ]
+          "text": "thi",
+          "value": "thi"
         },
         "datasource": {
           "uid": "${postgresql}"
@@ -303,13 +312,9 @@
       },
       {
         "current": {
-          "selected": true,
-          "text": [
-            "trigger"
-          ],
-          "value": [
-            "trigger"
-          ]
+          "selected": false,
+          "text": "thi",
+          "value": "thi"
         },
         "datasource": {
           "uid": "${postgresql}"
@@ -350,31 +355,9 @@
       },
       {
         "current": {
-          "selected": true,
-          "text": [
-            "trigger::TriggerEndOfRun",
-            "hsilibs::ProgressUpdate",
-            "trigger::TriggerPaused",
-            "trigger::TriggerActive",
-            "trigger::TriggerStartOfRun",
-            "readoutlibs::VerboseRequestTimedOut",
-            "trigger::TriggerInhibited",
-            "iomanager::QueueTimeoutExpired",
-            "readoutlibs::CannotWriteToQueue",
-            "iomanager::TimeoutExpired"
-          ],
-          "value": [
-            "trigger::TriggerEndOfRun",
-            "hsilibs::ProgressUpdate",
-            "trigger::TriggerPaused",
-            "trigger::TriggerActive",
-            "trigger::TriggerStartOfRun",
-            "readoutlibs::VerboseRequestTimedOut",
-            "trigger::TriggerInhibited",
-            "iomanager::QueueTimeoutExpired",
-            "readoutlibs::CannotWriteToQueue",
-            "iomanager::TimeoutExpired"
-          ]
+          "selected": false,
+          "text": "timinglibs::FailedToCollectOpMonInfo",
+          "value": "timinglibs::FailedToCollectOpMonInfo"
         },
         "datasource": {
           "uid": "${postgresql}"
@@ -396,12 +379,8 @@
       {
         "current": {
           "selected": false,
-          "text": [
-            "np04-srv-016"
-          ],
-          "value": [
-            "np04-srv-016"
-          ]
+          "text": "np04-srv-012",
+          "value": "np04-srv-012"
         },
         "datasource": {
           "uid": "${postgresql}"
@@ -430,6 +409,6 @@
   "timezone": "",
   "title": "ERS",
   "uid": "v5_0_0-ers",
-  "version": 1,
+  "version": 2,
   "weekStart": ""
 }
diff --git a/dashboards/daq_overview.json b/dashboards/daq_overview.json
@@ -24,7 +24,7 @@
   "editable": true,
   "fiscalYearStartMonth": 0,
   "graphTooltip": 0,
-  "id": 63,
+  "id": 64,
   "links": [
     {
       "asDropdown": true,
@@ -2765,7 +2765,7 @@
   },
   "timezone": "",
   "title": "DAQ overview",
-  "uid": "sdfgsg",
-  "version": 4,
+  "uid": "v5_0_0-overview",
+  "version": 1,
   "weekStart": ""
 }