Merge branch 'development' of https://github.com/mmguero-dev/Malcolm …

…into v23.04.0_merge_cisagov
cisagov · Apr 5, 2023 · 462b7d3 · 462b7d3
2 parents 2c8d3dd + c998dac
commit 462b7d3
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/.github/workflows/nginx-build-and-push-ghcr.yml b/.github/workflows/nginx-build-and-push-ghcr.yml
@@ -17,6 +17,7 @@ on:
       - '_includes/**'
       - '_layouts/**'
       - 'docs/**'
+      - '!docs/download.md'
       - 'Gemfile'
       - 'README.md'
   workflow_dispatch:

diff --git a/dashboards/anomaly_detectors/malcolm_init_dummy.json b/dashboards/anomaly_detectors/malcolm_init_dummy.json
@@ -1,7 +1,7 @@
 {
   "name": "malcolm_init_dummy",
   "description": "A dummy detector to force opensearch anomaly detection index creation",
-  "time_field": "timestamp",
+  "time_field": "firstPacket",
   "indices": [
     "arkime_sessions3-*"
   ],

diff --git a/docs/download.md b/docs/download.md
@@ -16,7 +16,7 @@ While official downloads of the Malcolm installer ISO are not provided, an **uno
 
 | ISO | SHA256 |
 |---|---|
-| [malcolm-23.04.0.iso](/iso/malcolm-23.04.0.iso) (5.2GiB) |  [`c37721bf070b557e61cfadfeb83e37fd3a7294f14776037476e61a334e44face`](/iso/malcolm-23.04.0.iso.sha256.txt) |
+| [malcolm-23.04.0.iso](/iso/malcolm-23.04.0.iso) (5.2GiB) |  [`6f8292a3c0c0c43b3ea7919b0b5ad1caa1140796da315a779522cb998dea8d13`](/iso/malcolm-23.04.0.iso.sha256.txt) |
 
 ## Hedgehog Linux
 

diff --git a/scripts/control.py b/scripts/control.py
@@ -747,6 +747,11 @@ def start():
     global dockerBin
     global dockerComposeBin
 
+    # touch the htadmin metadata file and .opensearch.*.curlrc files
+    open(os.path.join(MalcolmPath, os.path.join('htadmin', 'metadata')), 'a').close()
+    open(os.path.join(MalcolmPath, '.opensearch.primary.curlrc'), 'a').close()
+    open(os.path.join(MalcolmPath, '.opensearch.secondary.curlrc'), 'a').close()
+
     # make sure the auth files exist. if we are in an interactive shell and we're
     # missing any of the auth files, prompt to create them now
     if sys.__stdin__.isatty() and (not MalcolmAuthFilesExist()):
@@ -758,11 +763,6 @@ def start():
             'Malcolm administrator account authentication files are missing, please run ./scripts/auth_setup to generate them'
         )
 
-    # touch the htadmin metadata file and .opensearch.*.curlrc files
-    open(os.path.join(MalcolmPath, os.path.join('htadmin', 'metadata')), 'a').close()
-    open(os.path.join(MalcolmPath, '.opensearch.primary.curlrc'), 'a').close()
-    open(os.path.join(MalcolmPath, '.opensearch.secondary.curlrc'), 'a').close()
-
     # if the OpenSearch keystore doesn't exist exist, create empty ones
     if not os.path.isfile(os.path.join(MalcolmPath, os.path.join('opensearch', 'opensearch.keystore'))):
         keystore_op('opensearch', True, 'create')