merge with 2.4.120, fix merge conflicts

This commit is contained in:
m0duspwnens
2024-10-25 15:09:38 -04:00
520 changed files with 12109 additions and 250 deletions

View File

@@ -10,6 +10,7 @@ firewall:
elasticsearch_rest: []
endgame: []
eval: []
external_suricata: []
fleet: []
heavynode: []
hypervisor: []
@@ -87,6 +88,10 @@ firewall:
tcp:
- 3765
udp: []
external_suricata:
tcp:
- 7789
udp: []
influxdb:
tcp:
- 8086
@@ -217,6 +222,9 @@ firewall:
analyst:
portgroups:
- nginx
external_suricata:
portgroups:
- external_suricata
customhostgroup0:
portgroups: []
customhostgroup1:
@@ -463,6 +471,9 @@ firewall:
endgame:
portgroups:
- endgame
external_suricata:
portgroups:
- external_suricata
desktop:
portgroups:
- docker_registry
@@ -667,6 +678,9 @@ firewall:
endgame:
portgroups:
- endgame
external_suricata:
portgroups:
- external_suricata
desktop:
portgroups:
- docker_registry
@@ -863,6 +877,9 @@ firewall:
endgame:
portgroups:
- endgame
external_suricata:
portgroups:
- external_suricata
strelka_frontend:
portgroups:
- strelka_frontend
@@ -1229,6 +1246,9 @@ firewall:
- elastic_agent_control
- elastic_agent_data
- elastic_agent_update
external_suricata:
portgroups:
- external_suricata
analyst:
portgroups:
- nginx

View File

@@ -32,6 +32,7 @@ firewall:
elasticsearch_rest: *hostgroupsettingsadv
endgame: *hostgroupsettingsadv
eval: *hostgroupsettings
external_suricata: *hostgroupsettings
fleet: *hostgroupsettings
heavynode: *hostgroupsettings
idh: *hostgroupsettings
@@ -117,10 +118,16 @@ firewall:
endgame:
tcp: *tcpsettings
udp: *udpsettings
external_suricata:
tcp: *tcpsettings
udp: *udpsettings
influxdb:
tcp: *tcpsettings
udp: *udpsettings
kafka:
kafka_controller:
tcp: *tcpsettings
udp: *udpsettings
kafka_data:
tcp: *tcpsettings
udp: *udpsettings
kibana:
@@ -212,6 +219,8 @@ firewall:
portgroups: *portgroupsdocker
elastic_agent_endpoint:
portgroups: *portgroupsdocker
external_suricata:
portgroups: *portgroupsdocker
strelka_frontend:
portgroups: *portgroupsdocker
syslog:
@@ -367,6 +376,8 @@ firewall:
portgroups: *portgroupsdocker
endgame:
portgroups: *portgroupsdocker
external_suricata:
portgroups: *portgroupsdocker
analyst:
portgroups: *portgroupsdocker
desktop:
@@ -460,6 +471,8 @@ firewall:
portgroups: *portgroupsdocker
analyst:
portgroups: *portgroupsdocker
external_suricata:
portgroups: *portgroupsdocker
desktop:
portgroups: *portgroupsdocker
customhostgroup0:
@@ -551,6 +564,8 @@ firewall:
portgroups: *portgroupsdocker
endgame:
portgroups: *portgroupsdocker
external_suricata:
portgroups: *portgroupsdocker
strelka_frontend:
portgroups: *portgroupsdocker
syslog:
@@ -825,6 +840,8 @@ firewall:
portgroups: *portgroupsdocker
analyst:
portgroups: *portgroupsdocker
external_suricata:
portgroups: *portgroupsdocker
desktop:
portgroups: *portgroupsdocker
customhostgroup0: