Merge pull request #2980 from Security-Onion-Solutions/issue/2915

Issue/2915

salt/common/tools/sbin/so-config-backup

@@ -38,9 +38,10 @@ if [ ! -f $BACKUPFILE ]; then
 
 fi
 
-# Find oldest backup file and remove it
+# Find oldest backup files and remove them
 NUMBACKUPS=$(find /nsm/backup/ -type f -name "so-config-backup*" | wc -l)
-OLDESTBACKUP=$(find /nsm/backup/ -type f -name "so-config-backup*" | ls -1t | tail -1)
+while [ "$NUMBACKUPS" -gt "$MAXBACKUPS" ]; do
-if [ "$NUMBACKUPS" -gt "$MAXBACKUPS" ]; then
+  OLDESTBACKUP=$(find /nsm/backup/ -type f -name "so-config-backup*" -type f -printf '%T+ %p\n' | sort | head -n 1 | awk -F" " '{print $2}')
-  rm -f /nsm/backup/$OLDESTBACKUP
+  rm -f $OLDESTBACKUP
-fi
+  NUMBACKUPS=$(find /nsm/backup/ -type f -name "so-config-backup*" | wc -l)
+done

salt/kibana/etc/config.json

@@ -5,6 +5,6 @@
           "discover:sampleSize":"100",
           "dashboard:defaultDarkTheme":true,
           "theme:darkMode":true,
-          "timepicker:timeDefaults":"{\n  \"from\": \"now-24h\",\n  \"to\": \"now\",\n  \"mode\": \"quick\"\n}"
+          "timepicker:timeDefaults":"{\n  \"from\": \"now-24h\",\n  \"to\": \"now\"\n}"
         }
 }

salt/kibana/etc/kibana.yml

@@ -13,3 +13,4 @@ elasticsearch.hosts: [ "http://{{ ES }}:9200" ]
 elasticsearch.requestTimeout: 90000
 logging.dest: /var/log/kibana/kibana.log
 telemetry.enabled: false
+security.showInsecureClusterWarning: false