tum 1 kuukausi sitten
vanhempi
commit
7e39c9d3b9
2 muutettua tiedostoa jossa 8 lisäystä ja 8 poistoa
  1. 1 1
      Shuffle/docker-compose.yml
  2. 7 7
      run-combined-stack.sh

+ 1 - 1
Shuffle/docker-compose.yml

65
     hostname: shuffle-opensearch
65
     hostname: shuffle-opensearch
66
     container_name: shuffle-opensearch
66
     container_name: shuffle-opensearch
67
     environment:
67
     environment:
68
-      - "OPENSEARCH_JAVA_OPTS=-Xms3072m -Xmx3072m" # minimum and maximum Java heap size, recommend setting both to 50% of system RAM
68
+      - "OPENSEARCH_JAVA_OPTS=${SHUFFLE_OPENSEARCH_JAVA_OPTS:--Xms1024m -Xmx1024m}" # override in .env for larger hosts
69
       - bootstrap.memory_lock=true
69
       - bootstrap.memory_lock=true
70
       - DISABLE_PERFORMANCE_ANALYZER_AGENT_CLI=true
70
       - DISABLE_PERFORMANCE_ANALYZER_AGENT_CLI=true
71
       - cluster.initial_master_nodes=shuffle-opensearch
71
       - cluster.initial_master_nodes=shuffle-opensearch

+ 7 - 7
run-combined-stack.sh

67
     --project-directory "${ROOT_DIR}/wazuh-docker/single-node" \
67
     --project-directory "${ROOT_DIR}/wazuh-docker/single-node" \
68
     -f "${ROOT_DIR}/wazuh-docker/single-node/docker-compose.yml" \
68
     -f "${ROOT_DIR}/wazuh-docker/single-node/docker-compose.yml" \
69
     -f "${ROOT_DIR}/compose-overrides/wazuh.shared-network.yml" \
69
     -f "${ROOT_DIR}/compose-overrides/wazuh.shared-network.yml" \
70
-    "${COMMAND}" "${ARGS[@]}"
70
+    "${COMMAND}" ${ARGS[@]+"${ARGS[@]}"}
71
 }
71
 }
72
 
72
 
73
 run_iris() {
73
 run_iris() {
76
     --project-directory "${ROOT_DIR}/iris-web" \
76
     --project-directory "${ROOT_DIR}/iris-web" \
77
     -f "${ROOT_DIR}/iris-web/docker-compose.yml" \
77
     -f "${ROOT_DIR}/iris-web/docker-compose.yml" \
78
     -f "${ROOT_DIR}/compose-overrides/iris.shared-network.yml" \
78
     -f "${ROOT_DIR}/compose-overrides/iris.shared-network.yml" \
79
-    "${COMMAND}" "${ARGS[@]}"
79
+    "${COMMAND}" ${ARGS[@]+"${ARGS[@]}"}
80
 }
80
 }
81
 
81
 
82
 run_shuffle() {
82
 run_shuffle() {
85
     --project-directory "${ROOT_DIR}/Shuffle" \
85
     --project-directory "${ROOT_DIR}/Shuffle" \
86
     -f "${ROOT_DIR}/Shuffle/docker-compose.yml" \
86
     -f "${ROOT_DIR}/Shuffle/docker-compose.yml" \
87
     -f "${ROOT_DIR}/compose-overrides/shuffle.shared-network.yml" \
87
     -f "${ROOT_DIR}/compose-overrides/shuffle.shared-network.yml" \
88
-    "${COMMAND}" "${ARGS[@]}"
88
+    "${COMMAND}" ${ARGS[@]+"${ARGS[@]}"}
89
 }
89
 }
90
 
90
 
91
 run_pagerduty_stub() {
91
 run_pagerduty_stub() {
93
     --project-name pagerduty-stub \
93
     --project-name pagerduty-stub \
94
     --project-directory "${ROOT_DIR}" \
94
     --project-directory "${ROOT_DIR}" \
95
     -f "${ROOT_DIR}/compose-overrides/pagerduty.stub.yml" \
95
     -f "${ROOT_DIR}/compose-overrides/pagerduty.stub.yml" \
96
-    "${COMMAND}" "${ARGS[@]}"
96
+    "${COMMAND}" ${ARGS[@]+"${ARGS[@]}"}
97
 }
97
 }
98
 
98
 
99
 run_soc_integrator() {
99
 run_soc_integrator() {
101
     --project-name soc-integrator \
101
     --project-name soc-integrator \
102
     --project-directory "${ROOT_DIR}/compose-overrides" \
102
     --project-directory "${ROOT_DIR}/compose-overrides" \
103
     -f "${ROOT_DIR}/compose-overrides/soc-integrator.yml" \
103
     -f "${ROOT_DIR}/compose-overrides/soc-integrator.yml" \
104
-    "${COMMAND}" "${ARGS[@]}"
104
+    "${COMMAND}" ${ARGS[@]+"${ARGS[@]}"}
105
 }
105
 }
106
 
106
 
107
 run_target() {
107
 run_target() {
222
       run_logs_for_target "all"
222
       run_logs_for_target "all"
223
       ;;
223
       ;;
224
     *)
224
     *)
225
-      for arg in "${ARGS[@]}"; do
225
+      for arg in ${ARGS[@]+"${ARGS[@]}"}; do
226
         if [[ "${arg}" == "-f" || "${arg}" == "--follow" ]]; then
226
         if [[ "${arg}" == "-f" || "${arg}" == "--follow" ]]; then
227
           echo "For follow mode, specify one target:"
227
           echo "For follow mode, specify one target:"
228
           echo "./run-combined-stack.sh logs <wazuh|iris|shuffle|pagerduty|integrator> -f"
228
           echo "./run-combined-stack.sh logs <wazuh|iris|shuffle|pagerduty|integrator> -f"
242
     all|--all)
242
     all|--all)
243
       ARGS=("${ARGS[@]:1}")
243
       ARGS=("${ARGS[@]:1}")
244
       HAS_DETACH="false"
244
       HAS_DETACH="false"
245
-      for arg in "${ARGS[@]}"; do
245
+      for arg in ${ARGS[@]+"${ARGS[@]}"}; do
246
         if [[ "${arg}" == "-d" || "${arg}" == "--detach" ]]; then
246
         if [[ "${arg}" == "-d" || "${arg}" == "--detach" ]]; then
247
           HAS_DETACH="true"
247
           HAS_DETACH="true"
248
           break
248
           break