Merge remote-tracking branch 'remotes/origin/2.4/dev' into fleet-sa

This commit is contained in:
Josh Brower
2023-04-03 07:27:04 -04:00
572 changed files with 7060 additions and 31492 deletions
+5 -13
View File
@@ -1,8 +1,8 @@
docker:
bip: '172.17.0.1'
range: '172.17.0.0/24'
sosrange: '172.17.1.0/24'
sosbip: '172.17.1.1'
sorange: '172.17.1.0/24'
sobip: '172.17.1.1'
containers:
'so-dockerregistry':
final_octet: 20
@@ -17,16 +17,6 @@ docker:
port_bindings:
- 0.0.0.0:9200:9200/tcp
- 0.0.0.0:9300:9300/tcp
'so-filebeat':
final_octet: 23
port_bindings:
- 0.0.0.0:514:514/udp
- 0.0.0.0:514:514/tcp
- 0.0.0.0:5066:5066/tcp
'so-grafana':
final_octet: 24
port_bindings:
- 0.0.0.0:3000:3000
'so-idstools':
final_octet: 25
'so-influxdb':
@@ -67,7 +57,7 @@ docker:
'so-playbook':
final_octet: 32
port_bindings:
- 0.0.0.0:3200:3000
- 0.0.0.0:3000:3000
'so-redis':
final_octet: 33
port_bindings:
@@ -107,3 +97,5 @@ docker:
final_octet: 44
port_bindings:
- 0.0.0.0:8080:8080/tcp
'so-idh':
final_octet: 45