From 11877985bb2a03505e2a0be5dc7d5f1cc438c01c Mon Sep 17 00:00:00 2001 From: Seth Grover Date: Fri, 5 Jan 2024 12:12:47 -0700 Subject: [PATCH] more consistently differentiate between uploaded and live-captured traffic idaholab/Malcolm#321 WIP --- arkime/scripts/docker_entrypoint.sh | 1 + arkime/scripts/viewer_service.sh | 2 ++ 2 files changed, 3 insertions(+) diff --git a/arkime/scripts/docker_entrypoint.sh b/arkime/scripts/docker_entrypoint.sh index e3ceaba22..ddea2fc2f 100755 --- a/arkime/scripts/docker_entrypoint.sh +++ b/arkime/scripts/docker_entrypoint.sh @@ -60,6 +60,7 @@ if [[ ! -f "${ARKIME_CONFIG_FILE}" ]] && [[ -r "${ARKIME_DIR}"/etc/config.orig.i sed -i "s/^\(freeSpaceG=\).*/\1"${ARKIME_FREESPACEG}"/" "${ARKIME_CONFIG_FILE}" sed -i "s/^\(viewPort=\).*/\1"${VIEWER_PORT}"/" "${ARKIME_CONFIG_FILE}" sed -i "s/^\(pcapDir=\).*/\1\/data\/pcap\/arkime-live/" "${ARKIME_CONFIG_FILE}" + # note: when setting the node name, the viewer_service.sh script needs to match sed -i "s/MALCOLM_PCAP_NODE_NAME/${NODE_NAME}-upload/g" "${ARKIME_CONFIG_FILE}" # performance tuning parameters diff --git a/arkime/scripts/viewer_service.sh b/arkime/scripts/viewer_service.sh index 04184390a..b6064fcdb 100755 --- a/arkime/scripts/viewer_service.sh +++ b/arkime/scripts/viewer_service.sh @@ -2,6 +2,8 @@ # Copyright (c) 2024 Battelle Energy Alliance, LLC. All rights reserved. +# note: when setting the node name, the docker_entrypoint.sh script around +# MALCOLM_PCAP_NODE_NAME as it gets written into config.ini needs to match [[ "${ARKIME_LIVE_CAPTURE:-false}" == "true" ]] && NODE_NAME_FLAG= || NODE_NAME_FLAG=-upload while true; do