From fe13f90394c7e82a99de424d9a1802e9b5348476 Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Mon, 20 Mar 2023 15:33:22 -0400 Subject: [PATCH] Adjust docker annotations --- salt/docker/defaults.yaml | 7 + salt/docker/soc_docker.yaml | 282 ++++-------------------------------- 2 files changed, 34 insertions(+), 255 deletions(-) diff --git a/salt/docker/defaults.yaml b/salt/docker/defaults.yaml index 1fcc114b1..ebb979281 100644 --- a/salt/docker/defaults.yaml +++ b/salt/docker/defaults.yaml @@ -19,6 +19,7 @@ docker: - 0.0.0.0:9300:9300/tcp 'so-idstools': final_octet: 25 + port_bindings: [] 'so-influxdb': final_octet: 26 port_bindings: @@ -72,14 +73,17 @@ docker: - 0.0.0.0:7000:7000 'so-strelka-backend': final_octet: 36 + port_bindings: [] 'so-strelka-filestream': final_octet: 37 + port_bindings: [] 'so-strelka-frontend': final_octet: 38 port_bindings: - 0.0.0.0:57314:57314 'so-strelka-manager': final_octet: 39 + port_bindings: [] 'so-strelka-gatekeeper': final_octet: 40 port_bindings: @@ -90,11 +94,14 @@ docker: - 0.0.0.0:6380:6379 'so-elastalert': final_octet: 42 + port_bindings: [] 'so-curator': final_octet: 43 + port_bindings: [] 'so-elastic-fleet-package-registry': final_octet: 44 port_bindings: - 0.0.0.0:8080:8080/tcp 'so-idh': final_octet: 45 + port_bindings: [] diff --git a/salt/docker/soc_docker.yaml b/salt/docker/soc_docker.yaml index 87f23cd64..ba0f053fa 100644 --- a/salt/docker/soc_docker.yaml +++ b/salt/docker/soc_docker.yaml @@ -10,272 +10,44 @@ docker: sobip: description: Bind IP for the SO docker interface. helpLink: docker.html + advanced: True sorange: description: IP range for the SO docker containers. helpLink: docker.html advanced: True containers: - so-curator: + so-curator: &dockerOptions final_octet: description: Last octet of the container IP address. helpLink: docker.html readonly: True advanced: True + global: True port_bindings: description: List of port bindings for the container. helpLink: docker.html advanced: True - multilint: True - so-dockerregistry: - final_octet: - description: Last octet of the container IP address. - helpLink: docker.html - readonly: True - advanced: True - port_bindings: - description: List of port bindings for the container. - helpLink: docker.html - advanced: True - multilint: True - so-elastalert: - final_octet: - description: Last octet of the container IP address. - helpLink: docker.html - readonly: True - advanced: True - port_bindings: - description: List of port bindings for the container. - helpLink: docker.html - advanced: True - multilint: True - so-elastic-fleet-package-registry: - final_octet: - description: Last octet of the container IP address. - helpLink: docker.html - readonly: True - advanced: True - port_bindings: - description: List of port bindings for the container. - helpLink: docker.html - advanced: True - multilint: True - so-elastic-fleet: - final_octet: - description: Last octet of the container IP address. - helpLink: docker.html - readonly: True - advanced: True - port_bindings: - description: List of port bindings for the container. - helpLink: docker.html - advanced: True - multilint: True - so-elasticsearch: - final_octet: - description: Last octet of the container IP address. - helpLink: docker.html - readonly: True - advanced: True - port_bindings: - description: List of port bindings for the container. - helpLink: docker.html - advanced: True - multilint: True - so-idh: - final_octet: - description: Last octet of the container IP address. - helpLink: docker.html - readonly: True - advanced: True - port_bindings: - description: List of port bindings for the container. - helpLink: docker.html - advanced: True - multilint: True - so-idstools: - final_octet: - description: Last octet of the container IP address. - helpLink: docker.html - readonly: True - advanced: True - port_bindings: - description: List of port bindings for the container. - helpLink: docker.html - advanced: True - multilint: True - so-influxdb: - final_octet: - description: Last octet of the container IP address. - helpLink: docker.html - readonly: True - advanced: True - port_bindings: - description: List of port bindings for the container. - helpLink: docker.html - advanced: True - multilint: True - so-kibana: - final_octet: - description: Last octet of the container IP address. - helpLink: docker.html - readonly: True - advanced: True - port_bindings: - description: List of port bindings for the container. - helpLink: docker.html - advanced: True - multilint: True - so-kratos: - final_octet: - description: Last octet of the container IP address. - helpLink: docker.html - readonly: True - advanced: True - port_bindings: - description: List of port bindings for the container. - helpLink: docker.html - advanced: True - multilint: True - so-logstash: - final_octet: - description: Last octet of the container IP address. - helpLink: docker.html - readonly: True - advanced: True - port_bindings: - description: List of port bindings for the container. - helpLink: docker.html - advanced: True - multilint: True - so-mysql: - final_octet: - description: Last octet of the container IP address. - helpLink: docker.html - readonly: True - advanced: True - port_bindings: - description: List of port bindings for the container. - helpLink: docker.html - advanced: True - multilint: True - so-nginx: - final_octet: - description: Last octet of the container IP address. - helpLink: docker.html - readonly: True - advanced: True - port_bindings: - description: List of port bindings for the container. - helpLink: docker.html - advanced: True - multilint: True - so-playbook: - final_octet: - description: Last octet of the container IP address. - helpLink: docker.html - readonly: True - advanced: True - port_bindings: - description: List of port bindings for the container. - helpLink: docker.html - advanced: True - multilint: True - so-redis: - final_octet: - description: Last octet of the container IP address. - helpLink: docker.html - readonly: True - advanced: True - port_bindings: - description: List of port bindings for the container. - helpLink: docker.html - advanced: True - multilint: True - so-soc: - final_octet: - description: Last octet of the container IP address. - helpLink: docker.html - readonly: True - advanced: True - port_bindings: - description: List of port bindings for the container. - helpLink: docker.html - advanced: True - multilint: True - so-soctopus: - final_octet: - description: Last octet of the container IP address. - helpLink: docker.html - readonly: True - advanced: True - port_bindings: - description: List of port bindings for the container. - helpLink: docker.html - advanced: True - multilint: True - so-strelka-backend: - final_octet: - description: Last octet of the container IP address. - helpLink: docker.html - readonly: True - advanced: True - port_bindings: - description: List of port bindings for the container. - helpLink: docker.html - advanced: True - multilint: True - so-strelka-coordinator: - final_octet: - description: Last octet of the container IP address. - helpLink: docker.html - readonly: True - advanced: True - port_bindings: - description: List of port bindings for the container. - helpLink: docker.html - advanced: True - multilint: True - so-strelka-filestream: - final_octet: - description: Last octet of the container IP address. - helpLink: docker.html - readonly: True - advanced: True - port_bindings: - description: List of port bindings for the container. - helpLink: docker.html - advanced: True - multilint: True - so-strelka-frontend: - final_octet: - description: Last octet of the container IP address. - helpLink: docker.html - readonly: True - advanced: True - port_bindings: - description: List of port bindings for the container. - helpLink: docker.html - advanced: True - multilint: True - so-strelka-gatekeeper: - final_octet: - description: Last octet of the container IP address. - helpLink: docker.html - readonly: True - advanced: True - port_bindings: - description: List of port bindings for the container. - helpLink: docker.html - advanced: True - multilint: True - so-strelka-manager: - final_octet: - description: Last octet of the container IP address. - helpLink: docker.html - readonly: True - advanced: True - port_bindings: - description: List of port bindings for the container. - helpLink: docker.html - advanced: True - multilint: True \ No newline at end of file + multiline: True + so-dockerregistry: *dockerOptions + so-elastalert: *dockerOptions + so-elastic-fleet-package-registry: *dockerOptions + so-elastic-fleet: *dockerOptions + so-elasticsearch: *dockerOptions + so-idh: *dockerOptions + so-idstools: *dockerOptions + so-influxdb: *dockerOptions + so-kibana: *dockerOptions + so-kratos: *dockerOptions + so-logstash: *dockerOptions + so-mysql: *dockerOptions + so-nginx: *dockerOptions + so-playbook: *dockerOptions + so-redis: *dockerOptions + so-soc: *dockerOptions + so-soctopus: *dockerOptions + so-strelka-backend: *dockerOptions + so-strelka-coordinator: *dockerOptions + so-strelka-filestream: *dockerOptions + so-strelka-frontend: *dockerOptions + so-strelka-gatekeeper: *dockerOptions + so-strelka-manager: *dockerOptions \ No newline at end of file