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

…into install_back
mmguero-dev · Aug 28, 2024 · ebc061b · ebc061b
2 parents 4cb7644 + b4d4278
commit ebc061b
Show file tree

Hide file tree

Showing 46 changed files with 213 additions and 213 deletions.
diff --git a/Dockerfiles/arkime.Dockerfile b/Dockerfiles/arkime.Dockerfile
@@ -148,7 +148,7 @@ RUN export DEBARCH=$(dpkg --print-architecture) && \
     mkdir -p "${ARKIME_DIR}"/plugins && \
       curl -fsSL -o "${ARKIME_DIR}/plugins/ja4plus.${DEBARCH}.so" "$(echo "${ARKIME_JA4_SO_URL}" | sed "s/XXX/${DEBARCH}/g")" && \
       chmod 755 "${ARKIME_DIR}/plugins/ja4plus.${DEBARCH}.so" && \
-    python3 -m pip install --break-system-packages --no-compile --no-cache-dir beautifulsoup4 pyzmq watchdog && \
+    python3 -m pip install --break-system-packages --no-compile --no-cache-dir beautifulsoup4 pyzmq watchdog==4.0.2 && \
     ln -sfr $ARKIME_DIR/bin/npm /usr/local/bin/npm && \
       ln -sfr $ARKIME_DIR/bin/node /usr/local/bin/node && \
       ln -sfr $ARKIME_DIR/bin/npx /usr/local/bin/npx && \

diff --git a/Dockerfiles/file-monitor.Dockerfile b/Dockerfiles/file-monitor.Dockerfile
@@ -159,7 +159,7 @@ RUN export BINARCH=$(uname -m | sed 's/x86_64/amd64/' | sed 's/aarch64/arm64/')
       python-magic \
       stream-zip \
       supervisor \
-      watchdog \
+      watchdog==4.0.2 \
       yara-python && \
     curl -fsSL -o /usr/local/bin/supercronic "${SUPERCRONIC_URL}${BINARCH}" && \
       chmod +x /usr/local/bin/supercronic && \

diff --git a/Dockerfiles/filebeat.Dockerfile b/Dockerfiles/filebeat.Dockerfile
@@ -101,7 +101,7 @@ RUN export EVTXARCH=$(uname -m | sed 's/arm64/aarch64/') && \
         unar \
         unzip \
         xz-utils && \
-    python3 -m pip install --no-compile --no-cache-dir patool entrypoint2 pyunpack python-magic ordered-set supervisor watchdog && \
+    python3 -m pip install --no-compile --no-cache-dir patool entrypoint2 pyunpack python-magic ordered-set supervisor watchdog==4.0.2 && \
     curl -fsSL -o /usr/local/bin/supercronic "${SUPERCRONIC_URL}${BINARCH}" && \
       chmod +x /usr/local/bin/supercronic && \
     curl -fsSL -o /usr/local/bin/yq "${YQ_URL}${BINARCH}" && \

diff --git a/Dockerfiles/netbox.Dockerfile b/Dockerfiles/netbox.Dockerfile
@@ -31,6 +31,7 @@ ENV SUPERCRONIC_URL "https://github.com/aptible/supercronic/releases/download/v$
 ENV SUPERCRONIC_CRONTAB "/etc/crontab"
 
 ENV NETBOX_INITIALIZERS_VERSION "50d077d"
+ENV NETBOX_TOPOLOGY_VERSION "4.0.1"
 
 ENV YQ_VERSION "4.44.3"
 ENV YQ_URL "https://github.com/mikefarah/yq/releases/download/v${YQ_VERSION}/yq_linux_"
@@ -85,6 +86,7 @@ RUN export BINARCH=$(uname -m | sed 's/x86_64/amd64/' | sed 's/aarch64/arm64/')
       tini && \
     "${NETBOX_PATH}/venv/bin/python" -m pip install --break-system-packages --no-compile --no-cache-dir \
       "git+https://github.com/tobiasge/netbox-initializers@${NETBOX_INITIALIZERS_VERSION}" \
+      "git+https://github.com/netbox-community/netbox-topology-views@v${NETBOX_TOPOLOGY_VERSION}" \
       psycopg2 \
       pynetbox \
       python-magic \

diff --git a/Dockerfiles/pcap-monitor.Dockerfile b/Dockerfiles/pcap-monitor.Dockerfile
@@ -68,7 +68,7 @@ RUN apt-get -q update && \
       python-magic \
       pyzmq \
       requests \
-      watchdog && \
+      watchdog==4.0.2 && \
     groupadd --gid ${DEFAULT_GID} ${PGROUP} && \
       useradd -M --uid ${DEFAULT_UID} --gid ${DEFAULT_GID} ${PUSER}
 

diff --git a/Dockerfiles/suricata.Dockerfile b/Dockerfiles/suricata.Dockerfile
@@ -108,7 +108,7 @@ RUN export BINARCH=$(uname -m | sed 's/x86_64/amd64/' | sed 's/aarch64/arm64/')
     apt-get install -q -y --no-install-recommends -t bookworm-backports \
         suricata=${SURICATA_VERSION_PATTERN} \
         suricata-update && \
-    python3 -m pip install --break-system-packages --no-compile --no-cache-dir watchdog && \
+    python3 -m pip install --break-system-packages --no-compile --no-cache-dir watchdog==4.0.2 && \
     curl -fsSL -o /usr/local/bin/supercronic "${SUPERCRONIC_URL}${BINARCH}" && \
       chmod +x /usr/local/bin/supercronic && \
     curl -fsSL -o /usr/bin/yq "${YQ_URL}${BINARCH}" && \

diff --git a/docker-compose-dev.yml b/docker-compose-dev.yml
@@ -5,7 +5,7 @@ services:
     build:
       context: .
       dockerfile: Dockerfiles/opensearch.Dockerfile
-    image: ghcr.io/idaholab/malcolm/opensearch:24.08.0
+    image: ghcr.io/idaholab/malcolm/opensearch:24.09.0
     # Technically the "hedgehog" profile doesn't have OpenSearch, but in that case
     #   OPENSEARCH_PRIMARY will be set to remote, which means the container will
     #   start but not actually run OpenSearch. It's included in both profiles to
@@ -82,7 +82,7 @@ services:
     build:
       context: .
       dockerfile: Dockerfiles/dashboards-helper.Dockerfile
-    image: ghcr.io/idaholab/malcolm/dashboards-helper:24.08.0
+    image: ghcr.io/idaholab/malcolm/dashboards-helper:24.09.0
     profiles: ["malcolm"]
     logging:
       driver: local
@@ -135,7 +135,7 @@ services:
     build:
       context: .
       dockerfile: Dockerfiles/dashboards.Dockerfile
-    image: ghcr.io/idaholab/malcolm/dashboards:24.08.0
+    image: ghcr.io/idaholab/malcolm/dashboards:24.09.0
     profiles: ["malcolm"]
     logging:
       driver: local
@@ -181,7 +181,7 @@ services:
     build:
       context: .
       dockerfile: Dockerfiles/logstash.Dockerfile
-    image: ghcr.io/idaholab/malcolm/logstash-oss:24.08.0
+    image: ghcr.io/idaholab/malcolm/logstash-oss:24.09.0
     profiles: ["malcolm"]
     logging:
       driver: local
@@ -295,7 +295,7 @@ services:
     build:
       context: .
       dockerfile: Dockerfiles/filebeat.Dockerfile
-    image: ghcr.io/idaholab/malcolm/filebeat-oss:24.08.0
+    image: ghcr.io/idaholab/malcolm/filebeat-oss:24.09.0
     profiles: ["malcolm", "hedgehog"]
     logging:
       driver: local
@@ -371,7 +371,7 @@ services:
     build:
       context: .
       dockerfile: Dockerfiles/arkime.Dockerfile
-    image: ghcr.io/idaholab/malcolm/arkime:24.08.0
+    image: ghcr.io/idaholab/malcolm/arkime:24.09.0
     profiles: ["malcolm", "hedgehog"]
     logging:
       driver: local
@@ -450,7 +450,7 @@ services:
     build:
       context: .
       dockerfile: Dockerfiles/arkime.Dockerfile
-    image: ghcr.io/idaholab/malcolm/arkime:24.08.0
+    image: ghcr.io/idaholab/malcolm/arkime:24.09.0
     profiles: ["malcolm", "hedgehog"]
     logging:
       driver: local
@@ -528,7 +528,7 @@ services:
     build:
       context: .
       dockerfile: Dockerfiles/zeek.Dockerfile
-    image: ghcr.io/idaholab/malcolm/zeek:24.08.0
+    image: ghcr.io/idaholab/malcolm/zeek:24.09.0
     profiles: ["malcolm", "hedgehog"]
     logging:
       driver: local
@@ -600,7 +600,7 @@ services:
     build:
       context: .
       dockerfile: Dockerfiles/zeek.Dockerfile
-    image: ghcr.io/idaholab/malcolm/zeek:24.08.0
+    image: ghcr.io/idaholab/malcolm/zeek:24.09.0
     profiles: ["malcolm", "hedgehog"]
     logging:
       driver: local
@@ -664,7 +664,7 @@ services:
     build:
       context: .
       dockerfile: Dockerfiles/suricata.Dockerfile
-    image: ghcr.io/idaholab/malcolm/suricata:24.08.0
+    image: ghcr.io/idaholab/malcolm/suricata:24.09.0
     profiles: ["malcolm", "hedgehog"]
     logging:
       driver: local
@@ -723,7 +723,7 @@ services:
     build:
       context: .
       dockerfile: Dockerfiles/suricata.Dockerfile
-    image: ghcr.io/idaholab/malcolm/suricata:24.08.0
+    image: ghcr.io/idaholab/malcolm/suricata:24.09.0
     profiles: ["malcolm", "hedgehog"]
     logging:
       driver: local
@@ -780,7 +780,7 @@ services:
     build:
       context: .
       dockerfile: Dockerfiles/file-monitor.Dockerfile
-    image: ghcr.io/idaholab/malcolm/file-monitor:24.08.0
+    image: ghcr.io/idaholab/malcolm/file-monitor:24.09.0
     profiles: ["malcolm", "hedgehog"]
     logging:
       driver: local
@@ -835,7 +835,7 @@ services:
     build:
       context: .
       dockerfile: Dockerfiles/pcap-capture.Dockerfile
-    image: ghcr.io/idaholab/malcolm/pcap-capture:24.08.0
+    image: ghcr.io/idaholab/malcolm/pcap-capture:24.09.0
     profiles: ["malcolm", "hedgehog"]
     logging:
       driver: local
@@ -881,7 +881,7 @@ services:
     build:
       context: .
       dockerfile: Dockerfiles/pcap-monitor.Dockerfile
-    image: ghcr.io/idaholab/malcolm/pcap-monitor:24.08.0
+    image: ghcr.io/idaholab/malcolm/pcap-monitor:24.09.0
     profiles: ["malcolm", "hedgehog"]
     logging:
       driver: local
@@ -935,7 +935,7 @@ services:
     build:
       context: .
       dockerfile: Dockerfiles/file-upload.Dockerfile
-    image: ghcr.io/idaholab/malcolm/file-upload:24.08.0
+    image: ghcr.io/idaholab/malcolm/file-upload:24.09.0
     profiles: ["malcolm"]
     logging:
       driver: local
@@ -976,7 +976,7 @@ services:
       retries: 3
       start_period: 60s
   htadmin:
-    image: ghcr.io/idaholab/malcolm/htadmin:24.08.0
+    image: ghcr.io/idaholab/malcolm/htadmin:24.09.0
     profiles: ["malcolm"]
     logging:
       driver: local
@@ -1028,7 +1028,7 @@ services:
       retries: 3
       start_period: 60s
   freq:
-    image: ghcr.io/idaholab/malcolm/freq:24.08.0
+    image: ghcr.io/idaholab/malcolm/freq:24.09.0
     profiles: ["malcolm"]
     logging:
       driver: local
@@ -1065,7 +1065,7 @@ services:
       retries: 3
       start_period: 60s
   netbox:
-    image: ghcr.io/idaholab/malcolm/netbox:24.08.0
+    image: ghcr.io/idaholab/malcolm/netbox:24.09.0
     profiles: ["malcolm"]
     logging:
       driver: local
@@ -1131,7 +1131,7 @@ services:
       retries: 3
       start_period: 120s
   netbox-postgres:
-    image: ghcr.io/idaholab/malcolm/postgresql:24.08.0
+    image: ghcr.io/idaholab/malcolm/postgresql:24.09.0
     profiles: ["malcolm"]
     logging:
       driver: local
@@ -1174,7 +1174,7 @@ services:
       retries: 3
       start_period: 45s
   netbox-redis:
-    image: ghcr.io/idaholab/malcolm/redis:24.08.0
+    image: ghcr.io/idaholab/malcolm/redis:24.09.0
     profiles: ["malcolm"]
     logging:
       driver: local
@@ -1221,7 +1221,7 @@ services:
       retries: 3
       start_period: 45s
   netbox-redis-cache:
-    image: ghcr.io/idaholab/malcolm/redis:24.08.0
+    image: ghcr.io/idaholab/malcolm/redis:24.09.0
     profiles: ["malcolm"]
     logging:
       driver: local
@@ -1263,7 +1263,7 @@ services:
       retries: 3
       start_period: 45s
   api:
-    image: ghcr.io/idaholab/malcolm/api:24.08.0
+    image: ghcr.io/idaholab/malcolm/api:24.09.0
     profiles: ["malcolm"]
     logging:
       driver: local
@@ -1311,7 +1311,7 @@ services:
     build:
       context: .
       dockerfile: Dockerfiles/nginx.Dockerfile
-    image: ghcr.io/idaholab/malcolm/nginx-proxy:24.08.0
+    image: ghcr.io/idaholab/malcolm/nginx-proxy:24.09.0
     profiles: ["malcolm"]
     logging:
       driver: local