Merge branch 'dev' of github.com:Security-Onion-Solutions/securityonion into dev

This commit is contained in:
William Wernert
2020-10-09 08:51:45 -04:00
7 changed files with 8 additions and 7 deletions

View File

@@ -52,4 +52,5 @@ zeek:
- frameworks/signatures/detect-windows-shells - frameworks/signatures/detect-windows-shells
redef: redef:
- LogAscii::use_json = T; - LogAscii::use_json = T;
- LogAscii::json_timestamps = JSON::TS_ISO8601; - LogAscii::json_timestamps = JSON::TS_ISO8601;
- CaptureLoss::watch_interval = 5 mins;

View File

@@ -4591,7 +4591,7 @@
] ]
}, },
"time": { "time": {
"from": "now-15m", "from": "now-1h",
"to": "now" "to": "now"
}, },
"timepicker": { "timepicker": {

View File

@@ -4137,7 +4137,7 @@
] ]
}, },
"time": { "time": {
"from": "now-15m", "from": "now-1h",
"to": "now" "to": "now"
}, },
"timepicker": { "timepicker": {

View File

@@ -4883,7 +4883,7 @@
] ]
}, },
"time": { "time": {
"from": "now-30m", "from": "now-1h",
"to": "now" "to": "now"
}, },
"timepicker": { "timepicker": {

View File

@@ -3658,7 +3658,7 @@
] ]
}, },
"time": { "time": {
"from": "now-30m", "from": "now-1h",
"to": "now" "to": "now"
}, },
"timepicker": { "timepicker": {

View File

@@ -4396,7 +4396,7 @@
] ]
}, },
"time": { "time": {
"from": "now-15m", "from": "now-1h",
"to": "now" "to": "now"
}, },
"timepicker": { "timepicker": {

View File

@@ -6651,7 +6651,7 @@
] ]
}, },
"time": { "time": {
"from": "now-15m", "from": "now-1h",
"to": "now" "to": "now"
}, },
"timepicker": { "timepicker": {