Commit Graph

9712 Commits

Author SHA1 Message Date
Mike Reeves
5d949de146 Merge pull request #7246 from Security-Onion-Solutions/TOoSmOotH-patch-2
Update networks.cfg.jinja
2022-02-18 11:28:57 -05:00
Mike Reeves
6f4ee4123a Update networks.cfg.jinja 2022-02-18 11:26:58 -05:00
Mike Reeves
e4148818d8 Merge pull request #7226 from Security-Onion-Solutions/zeekhn
Add Zeek Homenet in networks.cfg
2022-02-18 11:11:56 -05:00
Mike Reeves
becdc34677 Merge pull request #7227 from hacker0ni/patch-1
Allow downgrades in docker_install
2022-02-18 11:10:26 -05:00
Mike Reeves
95eab61615 Rename to the .jinja standard 2022-02-18 11:06:33 -05:00
Mike Reeves
9341669a15 Merge pull request #7244 from christopherwoodall/patch-6
Update config.map.jinja
2022-02-18 09:57:33 -05:00
Jason Ertel
fdc63b5816 Clarify so-user update usage/help 2022-02-18 09:41:09 -05:00
Christopher Woodall
eaff6a12de Update config.map.jinja
Extend the array instead of appending.
2022-02-18 08:50:28 -05:00
weslambert
6ee3287d2d Update component -> index association for file/scan mappings for Strelka 2022-02-18 08:12:34 -05:00
James Conroy
91c207cd38 Update salt/common/tools/sbin/so-status
Removed # {% raw %} from line 170

Co-authored-by: William Wernert <william.wernert@gmail.com>
2022-02-17 20:37:43 -06:00
James Conroy
b774e62dfa Update salt/common/tools/sbin/so-status
Add salt raw directive

Co-authored-by: William Wernert <william.wernert@gmail.com>
2022-02-17 20:37:25 -06:00
Josh Brower
f995d0768f IDH - Initial firewall support 2022-02-17 15:54:20 -05:00
Doug Burks
3b887c7b1a Merge pull request #7239 from Security-Onion-Solutions/dougburks-patch-1
so-ip-update needs to queue the Kibana dashboard update
2022-02-17 15:54:10 -05:00
Doug Burks
b4b7938ce2 so-ip-update needs to queue the Kibana dashboard update in case a salt operation is already running 2022-02-17 15:47:33 -05:00
Doug Burks
e5d7c1c77a Merge pull request #7238 from Security-Onion-Solutions/dougburks-patch-1-1
so-ip-update needs to update Kibana dashboards
2022-02-17 14:53:31 -05:00
Doug Burks
1a96162966 so-ip-update needs to update Kibana dashboards 2022-02-17 14:49:55 -05:00
hacker0ni
bc72b3da91 Allow downgrades in docker_install
When running the installer again on a new node, it tries to pull the docker packages but since the installer ran again before, the install command fails on Ubuntu 18.04 stating that the `--allow-downgrades` is not specified in the command. This change adds that to circumvent the issue.
2022-02-17 11:47:36 -05:00
Mike Reeves
3e194c9b4b Walk the homenet for zeek 2022-02-17 11:33:22 -05:00
Josh Brower
6c124733b5 IDH - Enable default states 2022-02-17 10:50:26 -05:00
weslambert
6842099e11 Merge pull request #7224 from Security-Onion-Solutions/fix/zeek_viz
Switch from dns.answers to dns.answers.name for DTC
2022-02-17 10:05:46 -05:00
Wes Lambert
5c1f61bda8 Switch from dns.answers to dns.answers.name for DTC 2022-02-17 15:03:46 +00:00
weslambert
53c7ad6041 Merge pull request #7223 from Security-Onion-Solutions/fix/shard_settings_setup
Ensure setup configures pillar correctly for index settings
2022-02-17 09:48:11 -05:00
Josh Brower
ef4df58510 IDH - Jinjafy hostname 2022-02-17 09:00:57 -05:00
weslambert
c0f9cb188b Add missing colon 2022-02-17 07:58:05 -05:00
weslambert
d309c4fc0a Update pillar structure for index_settings/shards 2022-02-17 07:10:29 -05:00
Jason Ertel
cb9712aa08 Merge pull request #7217 from Security-Onion-Solutions/kilo
MFA
2022-02-16 16:47:40 -05:00
weslambert
d084625ee0 Merge pull request #7218 from Security-Onion-Solutions/fix/composable_templates_soup
Add pillar update for ES index templates for 2.3.110
2022-02-16 16:24:57 -05:00
weslambert
e71b606dd6 Add pillar update for ES index templates for 2.3.110 2022-02-16 16:22:06 -05:00
weslambert
f1f9322bee Merge pull request #7216 from Security-Onion-Solutions/fix/es_template_netflow_mappings_indent
Fix indent for so-netflow component template references
2022-02-16 14:47:31 -05:00
weslambert
185ea2fd99 Fix indent for so-netflow component template references 2022-02-16 14:46:12 -05:00
Mike Reeves
89eb2d0a8b Add netowrks.cfg to Zeek 2022-02-16 14:24:58 -05:00
Jason Ertel
2c4ba75c0c Merge branch 'dev' into kilo 2022-02-15 17:05:24 -05:00
weslambert
9e222b1464 Merge pull request #7206 from Security-Onion-Solutions/feature/template-reorg
Re-organize Elasticsearch Index Templates
2022-02-15 16:50:14 -05:00
Josh Brower
3ccef12df7 IDH - Pillarize OpenCanary Config 2022-02-15 13:57:31 -05:00
Wes Lambert
4fa3749418 Remove bind or ES templates 2022-02-15 18:08:03 +00:00
Wes Lambert
786a189f65 Merge branch 'feature/template-reorg' of https://github.com/security-onion-solutions/securityonion into feature/template-reorg 2022-02-15 17:06:02 +00:00
Wes Lambert
de731fc05d Remove default templates from ES template pillar since they are now managed in the defaults file. 2022-02-15 17:04:57 +00:00
Wes Lambert
3df58eadd1 Modify logic to include custom templates 2022-02-15 17:00:24 +00:00
weslambert
1a53ec4372 Fix malformed copy/paste 2022-02-15 11:14:10 -05:00
Wes Lambert
dce3b7a874 Update defaults file to include ES index templates 2022-02-15 15:53:07 +00:00
Jason Ertel
377fe1987d Merge branch 'dev' into kilo 2022-02-15 07:49:26 -05:00
Jason Ertel
d97423e9f8 Enable MFA support 2022-02-15 07:49:12 -05:00
Wes Lambert
8e389bf6e5 Add ES template map file 2022-02-14 15:38:32 +00:00
Wes Lambert
ebce67060f Initial template refactor 2022-02-14 15:20:33 +00:00
James Conroy
a43ac2aea2 Move the jinja endraw directive below is_tty
This will prevent jninja from interpreting the shell string length
expansion as the start of jninja comments
2022-02-12 12:25:24 -06:00
James Conroy
95b4f7b4ef Update the PADDING_CONSTENT to 15
As suggested by @rwwiv

Co-authored-by: William Wernert <william.wernert@gmail.com>
2022-02-12 12:25:24 -06:00
James Conroy
3046e811f0 Use spaces to define centerd justification output
As suggested by @rwwiv

Co-authored-by: William Wernert <william.wernert@gmail.com>
2022-02-12 12:25:24 -06:00
James Conroy
6a1e586b8c Changed color variables to Attributes
As suggested by @rwwiv

Co-authored-by: William Wernert <william.wernert@gmail.com>
2022-02-12 12:25:24 -06:00
James Conroy
01346cbb06 Changed color variables to Attributes
As suggested by @rwwiv

Co-authored-by: William Wernert <william.wernert@gmail.com>
2022-02-12 12:25:24 -06:00
James Conroy
3adb6c1389 Renamed colors to attributes
Also correctly used tput to assign blue color

As suggested by @rwwiv

Co-authored-by: William Wernert <william.wernert@gmail.com>
2022-02-12 12:25:23 -06:00