9768 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Jason Ertel	cec9cba40e	Create .gitleaks.toml	2022-03-15 09:47:57 -04:00
Jason Ertel	8ebeeb497f	add configuration to override leak detector defaults	2022-03-15 09:43:09 -04:00
Wes Lambert	ba24f75893	Fix index typo	2022-03-11 18:11:16 +00:00
Wes Lambert	70ed20f691	Add new sls file for custom ES index templates	2022-03-11 18:07:23 +00:00
Wes Lambert	d12ff503c2	Chage role loading verbiage	2022-03-11 16:23:19 +00:00
Wes Lambert	dc258cf043	Load custom component templates in so-elasticsearch-templates-load	2022-03-11 16:22:55 +00:00
Wes Lambert	8e43a6e571	Don't generate index template if index_template definition is not present in pillar	2022-03-11 16:22:06 +00:00
m0duspwnens	e1e8a20e11	make sure values exist in data structure	2022-03-10 17:09:00 -05:00
Mike Reeves	3725130128	Merge pull request #7481 from Security-Onion-Solutions/dev ... 2.3.110 2.3.110-20220309	2022-03-09 14:44:40 -05:00
Mike Reeves	2c66fa1883	Merge pull request #7482 from Security-Onion-Solutions/kilo ... Merge master with .100 hotfix #3 into dev	2022-03-09 12:24:04 -05:00
Jason Ertel	61a3155dfa	merge from master	2022-03-09 12:22:24 -05:00
Mike Reeves	99f25deb80	Merge pull request #7480 from Security-Onion-Solutions/2.3.110rel ... 2.3.110	2022-03-09 12:16:31 -05:00
Mike Reeves	0cb628f565	2.3.110	2022-03-09 12:12:32 -05:00
weslambert	262e68cb75	Merge pull request #7469 from Security-Onion-Solutions/fix/kibana_config_load_template ... Add .template extension to ensure we are loading the template and not the resultant file	2022-03-08 21:12:29 -05:00
weslambert	c83b63d0d8	Add .template extension to load template file	2022-03-08 20:53:16 -05:00
weslambert	8d9ddf5f1b	Add .template extension to load template	2022-03-08 20:52:13 -05:00
weslambert	8115da358f	Add .template extension to load template file	2022-03-08 20:51:50 -05:00
Doug Burks	06efef7b81	Merge pull request #7467 from Security-Onion-Solutions/dougburks-patch-1 ... Revert security_opt addition in telegraf init.sls	2022-03-08 18:51:52 -05:00
Doug Burks	b76c01ef53	Revert security_opt addition in telegraf init.sls	2022-03-08 18:27:15 -05:00
weslambert	5f3c29b7f8	Merge pull request #7466 from Security-Onion-Solutions/fix/process_name_keyword ... Add process.name.keyword	2022-03-08 12:47:31 -05:00
weslambert	65f998d6f7	Remove process.name.keyword for future-proofing	2022-03-08 12:44:51 -05:00
weslambert	406267a892	Add process.name.keyword	2022-03-08 12:42:34 -05:00
weslambert	d9c3160fbf	Merge pull request #7465 from Security-Onion-Solutions/fix/kibana_saved_objects_load ... Kibana dashboard/saved objects loading improvements	2022-03-08 12:22:55 -05:00
Wes Lambert	d392cb258c	Switch Kibana state to kibana.so_savedobjects_defaults in top file	2022-03-08 16:59:48 +00:00
Wes Lambert	86e228b200	Add .template extension for future-proofing config files	2022-03-08 16:58:37 +00:00
Wes Lambert	a6fd1023b4	Fix criteria for successful execution	2022-03-08 16:57:26 +00:00
Wes Lambert	3f31f7fd41	Add .template extension to fix script behavior and not modify watched file	2022-03-08 16:43:43 +00:00
Jason Ertel	f64da9632f	Merge pull request #7461 from Security-Onion-Solutions/kilo ... Gracefully handle situations where another process is using the Kratos DB while so-user executes	2022-03-08 11:02:14 -05:00
Jason Ertel	0cec5879bb	Gracefully handle situations when another process is using the Kratos DB	2022-03-08 10:55:26 -05:00
Jason Ertel	d8ca4976be	Merge branch 'dev' into kilo	2022-03-08 10:41:40 -05:00
Jason Ertel	914d81ca07	Revert "Gracefully handle situations when another process is using the Kratos DB" ... This reverts commit f2865d8b7f.	2022-03-08 10:40:20 -05:00
Jason Ertel	f2865d8b7f	Gracefully handle situations when another process is using the Kratos DB	2022-03-08 10:38:05 -05:00
Wes Lambert	28554164cd	Remove drop file when securitySolution saved objects change	2022-03-08 14:39:23 +00:00
Wes Lambert	14dddd8649	Remove drop file when config saved objects change	2022-03-08 14:37:15 +00:00
Wes Lambert	c0f49f6fb0	Remove drop file when dashbaord saved objects change	2022-03-08 14:35:04 +00:00
Wes Lambert	d10d4acf9f	Modify Kibana config load script to drop file if successfully executed	2022-03-08 14:33:15 +00:00
Doug Burks	da8e885ede	Merge pull request #7451 from Security-Onion-Solutions/fix/docker-apparmor ... Update init.sls to avoid telegraf apparmor issues	2022-03-07 17:06:42 -05:00
Doug Burks	104de2a3c9	Update init.sls to avoid telegraf apparmor issues ... See #2560	2022-03-07 16:11:22 -05:00
Mike Reeves	fb59421f5b	Merge pull request #7446 from Security-Onion-Solutions/fixpipelineload ... Only load pipelines on change	2022-03-07 15:17:32 -05:00
weslambert	e2bda255cc	Merge pull request #7447 from Security-Onion-Solutions/fix/es_templates_soup ... Remove old Elasticsearch index templates during SOUP	2022-03-07 15:10:44 -05:00
Mike Reeves	4eb37fd5a9	Update init.sls	2022-03-07 15:09:36 -05:00
Wes Lambert	fa9be58b23	Specify index templates	2022-03-07 20:04:23 +00:00
Wes Lambert	647b316a96	Remove old ES index templates ... Signed-off-by: Wes Lambert <wlambertts@gmail.com>	2022-03-07 20:02:45 +00:00
Mike Reeves	d33db6fb23	Only load pipelines on change	2022-03-07 14:25:46 -05:00
weslambert	eac120f4c2	Merge pull request #7444 from Security-Onion-Solutions/fix/dtc_client_override ... Add DTC client mappings	2022-03-07 13:38:19 -05:00
Wes Lambert	c549b20221	Add DTC client mappings	2022-03-07 18:36:26 +00:00
Mike Reeves	e6132be4e6	Merge pull request #7443 from Security-Onion-Solutions/fixtemplates ... Only load templates on change	2022-03-07 10:42:51 -05:00
Mike Reeves	c67604590d	Only load templates on change	2022-03-07 09:52:18 -05:00
weslambert	5600b55f05	Merge pull request #7427 from Security-Onion-Solutions/fix/syslog_kibana_viz ... Replace syslog facility and severity with label fields in Kibana syslog dashboard	2022-03-07 08:14:35 -05:00
Doug Burks	a59779905f	Merge pull request #7437 from Security-Onion-Solutions/dougburks-patch-1 ... fix typo	2022-03-07 08:05:07 -05:00