Commit Graph

7737 Commits

Author SHA1 Message Date
Jason Ertel
95c7a7e9de Merge pull request #4629 from Security-Onion-Solutions/influxdb_cqs
Influxdb cqs
2021-06-29 10:01:07 -04:00
m0duspwnens
ca152ab04c redefine measurements 2021-06-29 09:54:17 -04:00
m0duspwnens
bf8bba7b84 only set measurements if conditions are met 2021-06-29 08:57:51 -04:00
m0duspwnens
3f2f699449 Merge remote-tracking branch 'remotes/origin/dev' into influxdb_cqs 2021-06-29 07:46:42 -04:00
m0duspwnens
6b68a39cbe handle senario where there are no measurements 2021-06-29 07:46:25 -04:00
Jason Ertel
8867840215 Merge pull request #4628 from Security-Onion-Solutions/influxdb_cqs
Influxdb cqs
2021-06-28 17:10:27 -04:00
m0duspwnens
1c516daa96 fix measurement list 2021-06-28 17:05:32 -04:00
m0duspwnens
21c9388ee6 generate measurement list and cq for each 2021-06-28 16:12:36 -04:00
Jason Ertel
6d2761b155 Merge pull request #4625 from Security-Onion-Solutions/foxtrot
Add Elasticsearch and Kibana to list of services that use webuser creds
2021-06-25 15:58:56 -04:00
Doug Burks
127afe1582 Merge pull request #4624 from Security-Onion-Solutions/fix/soup-grammar
fix soup grammar
2021-06-25 11:19:22 -04:00
doug
a3d7f4e35d fix grammar 2021-06-25 11:16:26 -04:00
Mike Reeves
8eb163532d Merge pull request #4620 from Security-Onion-Solutions/modulefix
Fix filebeat modules
2021-06-24 15:59:16 -04:00
Mike Reeves
ea50023ca5 Fix filebeat modules 2021-06-24 15:53:14 -04:00
Mike Reeves
143f2eb1a8 Merge pull request #4616 from Security-Onion-Solutions/airsoup
remove some debug statements
2021-06-24 13:31:17 -04:00
Mike Reeves
3f8cb23cf6 remove some debug statements 2021-06-24 13:29:16 -04:00
Mike Reeves
f92709b03b Merge pull request #4614 from Security-Onion-Solutions/airsoup
Airsoup
2021-06-24 11:37:16 -04:00
Mike Reeves
81bb7c6534 remove a net check 2021-06-24 11:32:01 -04:00
Mike Reeves
bdd1074be7 remove a net check 2021-06-24 11:24:12 -04:00
Mike Reeves
42a63f8ea5 remove a net check 2021-06-24 11:15:16 -04:00
Mike Reeves
3c85db1769 Fix regression 2021-06-24 11:04:56 -04:00
Mike Reeves
930d5b3627 Revert "Move up script verification"
This reverts commit 66e88cef42.
2021-06-24 10:52:53 -04:00
Mike Reeves
a1ec40b547 Revert "Move up script verification"
This reverts commit 2681903c93.
2021-06-24 10:52:27 -04:00
William Wernert
022f9ea76e Add Elasticsearch and Kibana to list of services that use webuser creds 2021-06-24 10:45:12 -04:00
Mike Reeves
2681903c93 Move up script verification 2021-06-24 10:24:00 -04:00
Jason Ertel
403d10cc75 Merge pull request #4611 from Security-Onion-Solutions/airsoup
Move up script verification
2021-06-24 10:05:05 -04:00
Mike Reeves
66e88cef42 Move up script verification 2021-06-24 10:03:38 -04:00
Jason Ertel
8f9d1b99e2 Merge pull request #4610 from Security-Onion-Solutions/airsoup
Fix airgap check
2021-06-24 09:51:47 -04:00
Mike Reeves
4af2f6d84a Fix airgap check 2021-06-24 09:49:57 -04:00
Jason Ertel
5189f38766 Merge pull request #4601 from Security-Onion-Solutions/kilo
Elastic auth related adjustments; Soup error handling corrections, ES pipeline load improvements
2021-06-23 14:46:05 -04:00
Jason Ertel
243e888717 Add queue=True -- needed for all salt commands, not just state changes 2021-06-23 14:41:38 -04:00
weslambert
c5b81f2f4b Fix output so that it can be redirected to local file with appropriate syntax 2021-06-23 14:41:38 -04:00
Mike Reeves
caa14e0cad Fix Retry Spam 2021-06-23 14:41:38 -04:00
weslambert
d411a9e1ff Merge pull request #4597 from Security-Onion-Solutions/fix/pipeline-view-output
Fix output so that it can be redirected to local file with appropriat…
2021-06-23 09:24:41 -04:00
weslambert
3fbc850774 Fix output so that it can be redirected to local file with appropriate syntax 2021-06-23 09:17:37 -04:00
Jason Ertel
d16febcae1 Merge pull request #4591 from Security-Onion-Solutions/kilo
Require either true | false in parameter to so-elastic-auth and ensur…
2021-06-22 15:31:48 -04:00
Jason Ertel
26bb6cc011 Require either true | false in parameter to so-elastic-auth and ensure all minions are fully updated with the new auth setting 2021-06-22 15:29:48 -04:00
Jason Ertel
bc80ef9a80 Merge pull request #4590 from Security-Onion-Solutions/kilo
only attempt to upgrade salt on minions if the minion count it > 1
2021-06-22 11:36:37 -04:00
m0duspwnens
9fad0876c5 only attempt to upgrade salt on minions if the minion count it > 1 2021-06-22 11:31:31 -04:00
Jason Ertel
914e635b4a Merge pull request #4589 from Security-Onion-Solutions/TOoSmOotH-patch-1
Fix Retry Spam
2021-06-22 10:15:39 -04:00
Mike Reeves
85bb234cf9 Fix Retry Spam 2021-06-22 10:14:33 -04:00
Mike Reeves
f7675a5dea Merge pull request #4588 from Security-Onion-Solutions/souperduper
let the first highstate pass
2021-06-22 09:58:00 -04:00
Josh Patterson
7b662055dd Merge pull request #4587 from Security-Onion-Solutions/kilo
fix timeout for docker_container.running for so-dockerregistry
2021-06-22 09:56:24 -04:00
m0duspwnens
d78c6f1a74 Merge branch 'kilo' of https://github.com/Security-Onion-Solutions/securityonion into kilo 2021-06-22 09:54:35 -04:00
m0duspwnens
9fa83d1cee change to client_timeout 2021-06-22 09:54:25 -04:00
Jason Ertel
2ca8da0710 Merge pull request #4585 from Security-Onion-Solutions/kilo
Kilo
2021-06-22 08:38:39 -04:00
Jason Ertel
c3deabae36 Update init.sls 2021-06-22 08:30:54 -04:00
m0duspwnens
9cdbcb72ac Merge branch 'kilo' of https://github.com/Security-Onion-Solutions/securityonion into kilo 2021-06-22 08:23:26 -04:00
m0duspwnens
bc86590411 only add sosyncuser cron if startup_states: highstate is set in minion config 2021-06-22 08:23:16 -04:00
Jason Ertel
cb167f3d74 Merge pull request #4584 from Security-Onion-Solutions/kilo
retry on so-dockerregistry
2021-06-22 08:08:28 -04:00
Jason Ertel
8ddc99e91f Allow for adjusting SOC session timeout 2021-06-22 08:07:52 -04:00