Fix severity patterns. Add command to get_probes()

lwindolf · Jan 7, 2024 · ac7e493 · ac7e493
1 parent 9650021
commit ac7e493
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/probes/default.json b/probes/default.json
@@ -27,13 +27,13 @@
    },
    "who": {
 	"name"   : "Active Users",
-	"command": "who",
+	"command": "who -q",
 	"initial": "True",
         "refresh": 30,
         "render" : {
              "type" : "lines",
              "severity": {
-                "warning" : ".+\n.+"
+                "warning" : "^# users=[^1]"
 	     }
         }
    },
@@ -91,7 +91,7 @@
         "render" : {
             "type"    : "lines",
             "severity": {
-                "warning" : "warn|masked|maintenance",
+                "warning" : "(warn|masked|maintenance)",
                 "critical": "failed"
             }
          }
@@ -103,7 +103,7 @@
         "render" : {
             "type"    : "lines",
             "severity": {
-                "critical" : "error|fatal|critical",
+                "critical" : "(error|fatal|critical)",
                 "warning"  : "\\w+"
             }
          }
@@ -351,7 +351,7 @@
            "type" : "table",
            "split": "\\s+",
            "severity": {
-               "warning" : "pending|shutting-down"
+               "warning" : "(pending|shutting-down)"
            }
        }
    },

diff --git a/server.js b/server.js
@@ -94,6 +94,7 @@ function get_probes(socket) {
 		let p = probes[probe];
 		output[probe] = {
 			name: p.name,
+			command: p.command,
 			initial: p.initial,
 			refresh: p.refresh,
 			local: p.local,