updates for v26.06.1

Author: mmguero

Dockerfiles/dashboards-helper.Dockerfile

@@ -125,7 +125,7 @@ RUN export BINARCH=$(uname -m | sed 's/x86_64/amd64/' | sed 's/aarch64/arm64/')
                                 /opt/templates && \
     chmod 755 /usr/local/bin/*.sh /usr/local/bin/*.py /data/init && \
     chmod 400 /opt/maps/* && \
-    (echo "*/2 * * * * /usr/local/bin/shared-object-creation.sh\n5 * * * * /usr/local/bin/index-refresh.py -vvv --index MALCOLM_NETWORK_INDEX_PATTERN --template malcolm_template --unassigned\n35 * * * * /usr/local/bin/index-refresh.py --index MALCOLM_OTHER_INDEX_PATTERN --template malcolm_beats_template --unassigned\n*/20 * * * * /usr/local/bin/opensearch_index_size_prune.py" > ${SUPERCRONIC_CRONTAB})
+    (echo "*/2 * * * * /usr/local/bin/shared-object-creation.sh\n5,35 * * * * /usr/local/bin/index-init.sh\n*/20 * * * * /usr/local/bin/opensearch_index_size_prune.py" > ${SUPERCRONIC_CRONTAB})
 
 EXPOSE $OFFLINE_REGION_MAPS_PORT
 

dashboards/scripts/index-init.sh

@@ -0,0 +1,22 @@
+#!/bin/bash
+
+# Copyright (c) 2026 Battelle Energy Alliance, LLC.  All rights reserved.
+
+sleep ${1:-0}
+/usr/local/bin/opensearch_status.sh -w
+
+INDEX_PATTERNS=(MALCOLM_NETWORK_INDEX_PATTERN MALCOLM_OTHER_INDEX_PATTERN)
+TEMPLATES=(malcolm_template malcolm_beats_template)
+
+for i in "${!INDEX_PATTERNS[@]}"; do
+  /usr/local/bin/opensearch_status.sh -t "${TEMPLATES[$i]}"
+  /usr/local/bin/index-refresh.py -vvv \
+    --dashboards "${DASHBOARDS_URL}" \
+    --opensearch "${OPENSEARCH_URL}" \
+    --opensearch-mode "${OPENSEARCH_PRIMARY}" \
+    --opensearch-curlrc "${OPENSEARCH_CREDS_CONFIG_FILE}" \
+    --opensearch-ssl-verify "${OPENSEARCH_SSL_CERTIFICATE_VERIFICATION}" \
+    --index "${INDEX_PATTERNS[$i]}" \
+    --template "${TEMPLATES[$i]}" \
+    --unassigned
+done

dashboards/scripts/index-refresh.py

@@ -511,7 +511,6 @@ def main():
     else:
         logline = "success (dry run only, no write performed)"
     logging.info(logline)
-    print(logline)
 
     if args.opensearch_mode == DatabaseMode.OpenSearchLocal and args.fix_unassigned and not args.dryrun:
         # set some configuration-related indexes' (e.g., opensearch/opendistro) replica count to 0

dashboards/supervisord.conf

@@ -18,7 +18,7 @@ supervisor.rpcinterface_factory=supervisor.rpcinterface:make_main_rpcinterface
 serverurl=unix:///tmp/supervisor.sock
 
 [program:idxinit]
-command=bash -c "sleep 180 && /usr/local/bin/opensearch_status.sh -w && ( /usr/local/bin/index-refresh.py -vvv --dashboards \"%(ENV_DASHBOARDS_URL)s\" --opensearch \"%(ENV_OPENSEARCH_URL)s\" --opensearch-mode \"%(ENV_OPENSEARCH_PRIMARY)s\" --opensearch-curlrc \"%(ENV_OPENSEARCH_CREDS_CONFIG_FILE)s\" --opensearch-ssl-verify %(ENV_OPENSEARCH_SSL_CERTIFICATE_VERIFICATION)s --index MALCOLM_NETWORK_INDEX_PATTERN --template malcolm_template --unassigned ; /usr/local/bin/index-refresh.py -vvv --dashboards \"%(ENV_DASHBOARDS_URL)s\" --opensearch \"%(ENV_OPENSEARCH_URL)s\" --opensearch-mode \"%(ENV_OPENSEARCH_PRIMARY)s\" --opensearch-curlrc \"%(ENV_OPENSEARCH_CREDS_CONFIG_FILE)s\" --opensearch-ssl-verify %(ENV_OPENSEARCH_SSL_CERTIFICATE_VERIFICATION)s --index MALCOLM_OTHER_INDEX_PATTERN --template malcolm_beats_template --unassigned )"
+command=/usr/local/bin/index-init.sh 180
 autostart=true
 autorestart=false
 startsecs=0

shared/bin/opensearch_status.sh

@@ -84,32 +84,32 @@ until [[ "$(curl "${CURL_CONFIG_PARAMS[@]}" -fsSL "$OPENSEARCH_URL/_cat/health?h
   sleep 1
 done
 
-echo "$OPENSEARCH_PRIMARY is up and healthy at "$OPENSEARCH_URL"" >&2
+echo "$OPENSEARCH_PRIMARY is up and healthy at "$OPENSEARCH_URL""
 
 if [[ -n "$WAIT_FOR_TEMPLATE_LEGACY" ]]; then
   sleep 1
-  echo "Waiting until $OPENSEARCH_PRIMARY has legacy template \"$WAIT_FOR_TEMPLATE_LEGACY\"..." >&2
+  echo "Waiting until $OPENSEARCH_PRIMARY has legacy template \"$WAIT_FOR_TEMPLATE_LEGACY\"..."
   until ( curl "${CURL_CONFIG_PARAMS[@]}" -fs -H'Content-Type: application/json' -XGET "$OPENSEARCH_URL/_template/$WAIT_FOR_TEMPLATE_LEGACY" 2>/dev/null | grep -q mappings ); do
     sleep 5
   done
-  echo "$OPENSEARCH_PRIMARY legacy template \"$WAIT_FOR_TEMPLATE_LEGACY\" exists" >&2
+  echo "$OPENSEARCH_PRIMARY legacy template \"$WAIT_FOR_TEMPLATE_LEGACY\" exists"
   sleep 5
 fi
 
 if [[ -n "$WAIT_FOR_TEMPLATE" ]]; then
   sleep 1
-  echo "Waiting until $OPENSEARCH_PRIMARY has index template \"$WAIT_FOR_TEMPLATE\"..." >&2
+  echo "Waiting until $OPENSEARCH_PRIMARY has index template \"$WAIT_FOR_TEMPLATE\"..."
   until ( curl "${CURL_CONFIG_PARAMS[@]}" -fs -H'Content-Type: application/json' -XGET "$OPENSEARCH_URL/_index_template/$WAIT_FOR_TEMPLATE" 2>/dev/null | grep -q index_templates ); do
     sleep 5
   done
-  echo "$OPENSEARCH_PRIMARY index template \"$WAIT_FOR_TEMPLATE\" exists" >&2
+  echo "$OPENSEARCH_PRIMARY index template \"$WAIT_FOR_TEMPLATE\" exists"
   sleep 5
 fi
 
 if (( $WAIT_FOR_LOG_DATA == 1 )); then
   sleep 1
 
-  echo "Waiting until $OPENSEARCH_PRIMARY has logs..." >&2
+  echo "Waiting until $OPENSEARCH_PRIMARY has logs..."
 
   # wait until at least one network traffic log index exists (get index count where docs.count > 0)
   FOUND_INDEX=
@@ -130,5 +130,5 @@ if (( $WAIT_FOR_LOG_DATA == 1 )); then
     fi
     [[ -n "$FOUND_INDEX" ]] && break || sleep 5
   done
-  echo "Logs exist." >&2
-fi
+  echo "Logs exist."
+fi