merge 2.4/dev

Signed-off-by: reyesj2 <94730068+reyesj2@users.noreply.github.com>

salt/docker/defaults.yaml

@@ -84,6 +84,13 @@ docker:
       custom_bind_mounts: []
       extra_hosts: []
       extra_env: []
+    'so-nginx-fleet-node':
+      final_octet: 31
+      port_bindings:
+        - 8443:8443
+      custom_bind_mounts: []
+      extra_hosts: []
+      extra_env: []
     'so-playbook':
       final_octet: 32
       port_bindings:
@@ -159,11 +166,6 @@ docker:
       custom_bind_mounts: []
       extra_hosts: []
       extra_env: []
-    'so-curator':
-      final_octet: 43
-      custom_bind_mounts: []
-      extra_hosts: []
-      extra_env: []
     'so-elastic-fleet-package-registry':
       final_octet: 44
       port_bindings:

salt/docker/soc_docker.yaml

@@ -48,6 +48,7 @@ docker:
     so-logstash: *dockerOptions
     so-mysql: *dockerOptions
     so-nginx: *dockerOptions
+    so-nginx-fleet-node: *dockerOptions
     so-playbook: *dockerOptions
     so-redis: *dockerOptions
     so-sensoroni: *dockerOptions
@@ -60,7 +61,6 @@ docker:
     so-strelka-gatekeeper: *dockerOptions
     so-strelka-coordinator: *dockerOptions
     so-elastalert: *dockerOptions
-    so-curator: *dockerOptions
     so-elastic-fleet-package-registry: *dockerOptions
     so-idh: *dockerOptions
     so-elastic-agent: *dockerOptions