Merge pull request #11970 from Security-Onion-Solutions/jertel/hfm

grid page enhancements

salt/telegraf/defaults.yaml

@@ -14,6 +14,7 @@ telegraf:
       - checkfiles.sh
       - influxdbsize.sh
       - oldpcap.sh
+      - os.sh
       - raid.sh
       - sostatus.sh
       - stenoloss.sh
@@ -25,6 +26,7 @@ telegraf:
       - eps.sh
       - influxdbsize.sh
       - oldpcap.sh
+      - os.sh
       - raid.sh
       - redis.sh
       - sostatus.sh
@@ -34,20 +36,24 @@ telegraf:
       - zeekloss.sh
     manager:
       - influxdbsize.sh
+      - os.sh
       - raid.sh
       - redis.sh
       - sostatus.sh
     managersearch:
       - eps.sh
       - influxdbsize.sh
+      - os.sh
       - raid.sh
       - redis.sh
       - sostatus.sh
     import:
+      - os.sh
       - sostatus.sh
     sensor:
       - checkfiles.sh
       - oldpcap.sh
+      - os.sh
       - raid.sh
       - sostatus.sh
       - stenoloss.sh
@@ -58,6 +64,7 @@ telegraf:
       - checkfiles.sh
       - eps.sh
       - oldpcap.sh
+      - os.sh
       - raid.sh
       - redis.sh
       - sostatus.sh
@@ -66,17 +73,22 @@ telegraf:
       - zeekcaptureloss.sh
       - zeekloss.sh
     idh:
+      - os.sh
       - sostatus.sh
     searchnode:
       - eps.sh
+      - os.sh
       - raid.sh
       - sostatus.sh
     receiver:
       - eps.sh
+      - os.sh
       - raid.sh
       - redis.sh
       - sostatus.sh
     fleet:
+      - os.sh
       - sostatus.sh
     desktop:
+      - os.sh
       - sostatus.sh

salt/telegraf/scripts/os.sh

@@ -0,0 +1,29 @@
+#!/bin/bash
+#
+# Copyright Security Onion Solutions LLC and/or licensed to Security Onion Solutions LLC under one
+# or more contributor license agreements. Licensed under the Elastic License 2.0 as shown at 
+# https://securityonion.net/license; you may not use this file except in compliance with the
+# Elastic License 2.0.
+
+# if this script isn't already running
+if [[ ! "`pidof -x $(basename $0) -o %PPID`" ]]; then
+
+    NEEDS_RESTART=0
+
+    if which needs-restarting &> /dev/null; then
+        # DNF/RPM family
+        if ! needs-restarting -r &> /dev/null; then
+            NEEDS_RESTART=1
+        fi
+    else
+        # APT family
+        if [ -f /var/run/reboot-required ]; then
+            NEEDS_RESTART=1
+        fi
+    fi
+
+    echo "os restart=$NEEDS_RESTART"
+
+fi
+
+exit 0