From 412dc1d184dcab31c539f6dcb7c1c74e304c8413 Mon Sep 17 00:00:00 2001 From: Seth Grover Date: Wed, 16 Oct 2024 11:19:37 -0600 Subject: [PATCH] some code cleanup, moving things out of 'shared' that don't need to be in 'shared' --- .github/workflows/api-build-and-push-ghcr.yml | 3 --- .github/workflows/arkime-build-and-push-ghcr.yml | 3 --- .github/workflows/dashboards-build-and-push-ghcr.yml | 3 --- .github/workflows/dashboards-helper-build-and-push-ghcr.yml | 3 --- .github/workflows/file-monitor-build-and-push-ghcr.yml | 3 --- .github/workflows/file-upload-build-and-push-ghcr.yml | 3 --- .github/workflows/filebeat-build-and-push-ghcr.yml | 3 --- .github/workflows/freq-build-and-push-ghcr.yml | 3 --- .github/workflows/htadmin-build-and-push-ghcr.yml | 3 --- .github/workflows/logstash-build-and-push-ghcr.yml | 3 --- .github/workflows/malcolm-iso-build-docker-wrap-push-ghcr.yml | 1 - .github/workflows/netbox-build-and-push-ghcr.yml | 3 --- .github/workflows/nginx-build-and-push-ghcr.yml | 3 --- .github/workflows/opensearch-build-and-push-ghcr.yml | 3 --- .github/workflows/pcap-capture-build-and-push-ghcr.yml | 3 --- .github/workflows/pcap-monitor-build-and-push-ghcr.yml | 3 --- .github/workflows/postgresql-build-and-push-ghcr.yml | 3 --- .github/workflows/redis-build-and-push-ghcr.yml | 3 --- .github/workflows/suricata-build-and-push-ghcr.yml | 3 --- .github/workflows/zeek-build-and-push-ghcr.yml | 3 --- Dockerfiles/dashboards-helper.Dockerfile | 2 -- Dockerfiles/logstash.Dockerfile | 1 - .../bin => dashboards/scripts}/opensearch_index_size_prune.py | 0 {shared/bin => dashboards/scripts}/opensearch_read_only.py | 0 docs/malcolm-config.md | 2 +- .../config/includes.chroot/usr/local}/bin/configure-capture.py | 0 .../config/includes.chroot/usr/local}/bin/sensor-init.sh | 0 .../includes.chroot/usr/local}/bin/ufw_allow_requests.sh | 0 {shared/bin => logstash/scripts}/manuf-oui-parse.py | 0 .../config/includes.chroot/usr/local}/bin/agg-init.sh | 0 .../config/includes.chroot/usr/local}/bin/docker-load-wait.sh | 0 .../usr/local}/bin/malcolm-first-run-configure.sh | 0 .../includes.chroot/usr/local}/bin/set-malcolm-gtk-bookmark.sh | 0 {shared/bin => scripts}/ics-oui-parse.py | 0 shared/bin/capa-build.sh | 0 shared/bin/keystore-bootstrap.sh | 0 36 files changed, 1 insertion(+), 62 deletions(-) rename {shared/bin => dashboards/scripts}/opensearch_index_size_prune.py (100%) rename {shared/bin => dashboards/scripts}/opensearch_read_only.py (100%) rename {shared => hedgehog-iso/config/includes.chroot/usr/local}/bin/configure-capture.py (100%) rename {shared => hedgehog-iso/config/includes.chroot/usr/local}/bin/sensor-init.sh (100%) rename {shared => hedgehog-iso/config/includes.chroot/usr/local}/bin/ufw_allow_requests.sh (100%) rename {shared/bin => logstash/scripts}/manuf-oui-parse.py (100%) rename {shared => malcolm-iso/config/includes.chroot/usr/local}/bin/agg-init.sh (100%) rename {shared => malcolm-iso/config/includes.chroot/usr/local}/bin/docker-load-wait.sh (100%) rename {shared => malcolm-iso/config/includes.chroot/usr/local}/bin/malcolm-first-run-configure.sh (100%) rename {shared => malcolm-iso/config/includes.chroot/usr/local}/bin/set-malcolm-gtk-bookmark.sh (100%) rename {shared/bin => scripts}/ics-oui-parse.py (100%) mode change 100644 => 100755 shared/bin/capa-build.sh mode change 100644 => 100755 shared/bin/keystore-bootstrap.sh diff --git a/.github/workflows/api-build-and-push-ghcr.yml b/.github/workflows/api-build-and-push-ghcr.yml index b3b80ad35..9768c749f 100644 --- a/.github/workflows/api-build-and-push-ghcr.yml +++ b/.github/workflows/api-build-and-push-ghcr.yml @@ -9,16 +9,13 @@ on: - 'api/**' - 'Dockerfiles/api.Dockerfile' - 'shared/bin/*' - - '!shared/bin/agg-init.sh' - '!shared/bin/capa-build.sh' - '!shared/bin/common-init.sh' - - '!shared/bin/sensor-init.sh' - '!shared/bin/os-disk-config.py' - '!shared/bin/extracted_files_http_server.py' - '!shared/bin/web-ui-asset-download.sh' - '!shared/bin/preseed_late_user_config.sh' - '!shared/bin/configure-interfaces.py' - - '!shared/bin/configure-capture.py' - '!shared/bin/suricata*' - '!shared/bin/zeek*' - '.trigger_workflow_build' diff --git a/.github/workflows/arkime-build-and-push-ghcr.yml b/.github/workflows/arkime-build-and-push-ghcr.yml index 6202c0138..b3e96c275 100644 --- a/.github/workflows/arkime-build-and-push-ghcr.yml +++ b/.github/workflows/arkime-build-and-push-ghcr.yml @@ -9,16 +9,13 @@ on: - 'arkime/**' - 'Dockerfiles/arkime.Dockerfile' - 'shared/bin/*' - - '!shared/bin/agg-init.sh' - '!shared/bin/capa-build.sh' - '!shared/bin/common-init.sh' - - '!shared/bin/sensor-init.sh' - '!shared/bin/extracted_files_http_server.py' - '!shared/bin/web-ui-asset-download.sh' - '!shared/bin/os-disk-config.py' - '!shared/bin/preseed_late_user_config.sh' - '!shared/bin/configure-interfaces.py' - - '!shared/bin/configure-capture.py' - '!shared/bin/suricata*' - '!shared/bin/zeek*' - '.trigger_workflow_build' diff --git a/.github/workflows/dashboards-build-and-push-ghcr.yml b/.github/workflows/dashboards-build-and-push-ghcr.yml index 52706f552..dcc4b8420 100644 --- a/.github/workflows/dashboards-build-and-push-ghcr.yml +++ b/.github/workflows/dashboards-build-and-push-ghcr.yml @@ -9,16 +9,13 @@ on: - 'dashboards/**' - 'Dockerfiles/dashboards.Dockerfile' - 'shared/bin/*' - - '!shared/bin/agg-init.sh' - '!shared/bin/capa-build.sh' - '!shared/bin/common-init.sh' - - '!shared/bin/sensor-init.sh' - '!shared/bin/extracted_files_http_server.py' - '!shared/bin/web-ui-asset-download.sh' - '!shared/bin/os-disk-config.py' - '!shared/bin/preseed_late_user_config.sh' - '!shared/bin/configure-interfaces.py' - - '!shared/bin/configure-capture.py' - '!shared/bin/suricata*' - '!shared/bin/zeek*' - '.trigger_workflow_build' diff --git a/.github/workflows/dashboards-helper-build-and-push-ghcr.yml b/.github/workflows/dashboards-helper-build-and-push-ghcr.yml index 4afffa301..5d49c5e04 100644 --- a/.github/workflows/dashboards-helper-build-and-push-ghcr.yml +++ b/.github/workflows/dashboards-helper-build-and-push-ghcr.yml @@ -9,16 +9,13 @@ on: - 'dashboards/**' - 'Dockerfiles/dashboards-helper.Dockerfile' - 'shared/bin/*' - - '!shared/bin/agg-init.sh' - '!shared/bin/capa-build.sh' - '!shared/bin/common-init.sh' - - '!shared/bin/sensor-init.sh' - '!shared/bin/extracted_files_http_server.py' - '!shared/bin/web-ui-asset-download.sh' - '!shared/bin/os-disk-config.py' - '!shared/bin/preseed_late_user_config.sh' - '!shared/bin/configure-interfaces.py' - - '!shared/bin/configure-capture.py' - '!shared/bin/suricata*' - '!shared/bin/zeek*' - '.trigger_workflow_build' diff --git a/.github/workflows/file-monitor-build-and-push-ghcr.yml b/.github/workflows/file-monitor-build-and-push-ghcr.yml index 867e8ebc8..4219cbf87 100644 --- a/.github/workflows/file-monitor-build-and-push-ghcr.yml +++ b/.github/workflows/file-monitor-build-and-push-ghcr.yml @@ -9,13 +9,10 @@ on: - 'file-monitor/**' - 'Dockerfiles/file-monitor.Dockerfile' - 'shared/bin/*' - - '!shared/bin/agg-init.sh' - '!shared/bin/common-init.sh' - - '!shared/bin/sensor-init.sh' - '!shared/bin/os-disk-config.py' - '!shared/bin/preseed_late_user_config.sh' - '!shared/bin/configure-interfaces.py' - - '!shared/bin/configure-capture.py' - '!shared/bin/suricata*' - '!shared/bin/zeek*.sh' - '.trigger_workflow_build' diff --git a/.github/workflows/file-upload-build-and-push-ghcr.yml b/.github/workflows/file-upload-build-and-push-ghcr.yml index 727280a0f..fb0a60067 100644 --- a/.github/workflows/file-upload-build-and-push-ghcr.yml +++ b/.github/workflows/file-upload-build-and-push-ghcr.yml @@ -9,16 +9,13 @@ on: - 'file-upload/**' - 'Dockerfiles/file-upload.Dockerfile' - 'shared/bin/*' - - '!shared/bin/agg-init.sh' - '!shared/bin/capa-build.sh' - '!shared/bin/common-init.sh' - - '!shared/bin/sensor-init.sh' - '!shared/bin/extracted_files_http_server.py' - '!shared/bin/web-ui-asset-download.sh' - '!shared/bin/os-disk-config.py' - '!shared/bin/preseed_late_user_config.sh' - '!shared/bin/configure-interfaces.py' - - '!shared/bin/configure-capture.py' - '!shared/bin/suricata*' - '!shared/bin/zeek*' - '.trigger_workflow_build' diff --git a/.github/workflows/filebeat-build-and-push-ghcr.yml b/.github/workflows/filebeat-build-and-push-ghcr.yml index e43152c86..47759d34b 100644 --- a/.github/workflows/filebeat-build-and-push-ghcr.yml +++ b/.github/workflows/filebeat-build-and-push-ghcr.yml @@ -9,16 +9,13 @@ on: - 'filebeat/**' - 'Dockerfiles/filebeat.Dockerfile' - 'shared/bin/*' - - '!shared/bin/agg-init.sh' - '!shared/bin/capa-build.sh' - '!shared/bin/common-init.sh' - - '!shared/bin/sensor-init.sh' - '!shared/bin/extracted_files_http_server.py' - '!shared/bin/web-ui-asset-download.sh' - '!shared/bin/os-disk-config.py' - '!shared/bin/preseed_late_user_config.sh' - '!shared/bin/configure-interfaces.py' - - '!shared/bin/configure-capture.py' - '!shared/bin/suricata*' - '!shared/bin/zeek*' - '.trigger_workflow_build' diff --git a/.github/workflows/freq-build-and-push-ghcr.yml b/.github/workflows/freq-build-and-push-ghcr.yml index acdc4f6e8..4c359f714 100644 --- a/.github/workflows/freq-build-and-push-ghcr.yml +++ b/.github/workflows/freq-build-and-push-ghcr.yml @@ -9,16 +9,13 @@ on: - 'freq-server/**' - 'Dockerfiles/freq.Dockerfile' - 'shared/bin/*' - - '!shared/bin/agg-init.sh' - '!shared/bin/capa-build.sh' - '!shared/bin/common-init.sh' - - '!shared/bin/sensor-init.sh' - '!shared/bin/extracted_files_http_server.py' - '!shared/bin/web-ui-asset-download.sh' - '!shared/bin/os-disk-config.py' - '!shared/bin/preseed_late_user_config.sh' - '!shared/bin/configure-interfaces.py' - - '!shared/bin/configure-capture.py' - '!shared/bin/suricata*' - '!shared/bin/zeek*' - '.trigger_workflow_build' diff --git a/.github/workflows/htadmin-build-and-push-ghcr.yml b/.github/workflows/htadmin-build-and-push-ghcr.yml index dbcb71779..0bf33fec7 100644 --- a/.github/workflows/htadmin-build-and-push-ghcr.yml +++ b/.github/workflows/htadmin-build-and-push-ghcr.yml @@ -9,16 +9,13 @@ on: - 'htadmin/**' - 'Dockerfiles/htadmin.Dockerfile' - 'shared/bin/*' - - '!shared/bin/agg-init.sh' - '!shared/bin/capa-build.sh' - '!shared/bin/common-init.sh' - - '!shared/bin/sensor-init.sh' - '!shared/bin/extracted_files_http_server.py' - '!shared/bin/web-ui-asset-download.sh' - '!shared/bin/os-disk-config.py' - '!shared/bin/preseed_late_user_config.sh' - '!shared/bin/configure-interfaces.py' - - '!shared/bin/configure-capture.py' - '!shared/bin/suricata*' - '!shared/bin/zeek*' - '.trigger_workflow_build' diff --git a/.github/workflows/logstash-build-and-push-ghcr.yml b/.github/workflows/logstash-build-and-push-ghcr.yml index 407c302ae..e835829a6 100644 --- a/.github/workflows/logstash-build-and-push-ghcr.yml +++ b/.github/workflows/logstash-build-and-push-ghcr.yml @@ -9,16 +9,13 @@ on: - 'logstash/**' - 'Dockerfiles/logstash.Dockerfile' - 'shared/bin/*' - - '!shared/bin/agg-init.sh' - '!shared/bin/capa-build.sh' - '!shared/bin/common-init.sh' - - '!shared/bin/sensor-init.sh' - '!shared/bin/extracted_files_http_server.py' - '!shared/bin/web-ui-asset-download.sh' - '!shared/bin/os-disk-config.py' - '!shared/bin/preseed_late_user_config.sh' - '!shared/bin/configure-interfaces.py' - - '!shared/bin/configure-capture.py' - '!shared/bin/suricata*' - '!shared/bin/zeek*' - '.trigger_workflow_build' diff --git a/.github/workflows/malcolm-iso-build-docker-wrap-push-ghcr.yml b/.github/workflows/malcolm-iso-build-docker-wrap-push-ghcr.yml index 01b4ff5a1..cb5e69eb1 100644 --- a/.github/workflows/malcolm-iso-build-docker-wrap-push-ghcr.yml +++ b/.github/workflows/malcolm-iso-build-docker-wrap-push-ghcr.yml @@ -9,7 +9,6 @@ on: - 'malcolm-iso/**' - 'shared/bin/*' - '!shared/bin/capa-build.sh' - - '!shared/bin/configure-capture.py' - '!shared/bin/extracted_files_http_server.py' - '!shared/bin/web-ui-asset-download.sh' - '!shared/bin/zeek*' diff --git a/.github/workflows/netbox-build-and-push-ghcr.yml b/.github/workflows/netbox-build-and-push-ghcr.yml index 5063f5787..8a9e9c922 100644 --- a/.github/workflows/netbox-build-and-push-ghcr.yml +++ b/.github/workflows/netbox-build-and-push-ghcr.yml @@ -9,16 +9,13 @@ on: - 'netbox/**' - 'Dockerfiles/netbox.Dockerfile' - 'shared/bin/*' - - '!shared/bin/agg-init.sh' - '!shared/bin/capa-build.sh' - '!shared/bin/common-init.sh' - - '!shared/bin/sensor-init.sh' - '!shared/bin/extracted_files_http_server.py' - '!shared/bin/web-ui-asset-download.sh' - '!shared/bin/os-disk-config.py' - '!shared/bin/preseed_late_user_config.sh' - '!shared/bin/configure-interfaces.py' - - '!shared/bin/configure-capture.py' - '!shared/bin/zeek*' - '!shared/bin/suricata*' - '.trigger_workflow_build' diff --git a/.github/workflows/nginx-build-and-push-ghcr.yml b/.github/workflows/nginx-build-and-push-ghcr.yml index eb8d89012..6758e023e 100644 --- a/.github/workflows/nginx-build-and-push-ghcr.yml +++ b/.github/workflows/nginx-build-and-push-ghcr.yml @@ -9,16 +9,13 @@ on: - 'nginx/**' - 'Dockerfiles/nginx.Dockerfile' - 'shared/bin/*' - - '!shared/bin/agg-init.sh' - '!shared/bin/capa-build.sh' - '!shared/bin/common-init.sh' - - '!shared/bin/sensor-init.sh' - '!shared/bin/extracted_files_http_server.py' - '!shared/bin/web-ui-asset-download.sh' - '!shared/bin/os-disk-config.py' - '!shared/bin/preseed_late_user_config.sh' - '!shared/bin/configure-interfaces.py' - - '!shared/bin/configure-capture.py' - '!shared/bin/zeek*' - '!shared/bin/suricata*' - '.trigger_workflow_build' diff --git a/.github/workflows/opensearch-build-and-push-ghcr.yml b/.github/workflows/opensearch-build-and-push-ghcr.yml index d3c1f52b5..3253ac8ae 100644 --- a/.github/workflows/opensearch-build-and-push-ghcr.yml +++ b/.github/workflows/opensearch-build-and-push-ghcr.yml @@ -8,16 +8,13 @@ on: paths: - 'Dockerfiles/opensearch.Dockerfile' - 'shared/bin/*' - - '!shared/bin/agg-init.sh' - '!shared/bin/capa-build.sh' - '!shared/bin/common-init.sh' - - '!shared/bin/sensor-init.sh' - '!shared/bin/os-disk-config.py' - '!shared/bin/extracted_files_http_server.py' - '!shared/bin/web-ui-asset-download.sh' - '!shared/bin/preseed_late_user_config.sh' - '!shared/bin/configure-interfaces.py' - - '!shared/bin/configure-capture.py' - '!shared/bin/zeek*' - '!shared/bin/suricata*' - '.trigger_workflow_build' diff --git a/.github/workflows/pcap-capture-build-and-push-ghcr.yml b/.github/workflows/pcap-capture-build-and-push-ghcr.yml index 3d0bf4e7f..6e5ce485d 100644 --- a/.github/workflows/pcap-capture-build-and-push-ghcr.yml +++ b/.github/workflows/pcap-capture-build-and-push-ghcr.yml @@ -9,16 +9,13 @@ on: - 'pcap-capture/**' - 'Dockerfiles/pcap-capture.Dockerfile' - 'shared/bin/*' - - '!shared/bin/agg-init.sh' - '!shared/bin/capa-build.sh' - '!shared/bin/common-init.sh' - - '!shared/bin/sensor-init.sh' - '!shared/bin/os-disk-config.py' - '!shared/bin/extracted_files_http_server.py' - '!shared/bin/web-ui-asset-download.sh' - '!shared/bin/preseed_late_user_config.sh' - '!shared/bin/configure-interfaces.py' - - '!shared/bin/configure-capture.py' - '!shared/bin/zeek*' - '!shared/bin/suricata*' - '.trigger_workflow_build' diff --git a/.github/workflows/pcap-monitor-build-and-push-ghcr.yml b/.github/workflows/pcap-monitor-build-and-push-ghcr.yml index f66cb71a1..24a54ccbe 100644 --- a/.github/workflows/pcap-monitor-build-and-push-ghcr.yml +++ b/.github/workflows/pcap-monitor-build-and-push-ghcr.yml @@ -9,16 +9,13 @@ on: - 'pcap-monitor/**' - 'Dockerfiles/pcap-monitor.Dockerfile' - 'shared/bin/*' - - '!shared/bin/agg-init.sh' - '!shared/bin/capa-build.sh' - '!shared/bin/common-init.sh' - - '!shared/bin/sensor-init.sh' - '!shared/bin/os-disk-config.py' - '!shared/bin/extracted_files_http_server.py' - '!shared/bin/web-ui-asset-download.sh' - '!shared/bin/preseed_late_user_config.sh' - '!shared/bin/configure-interfaces.py' - - '!shared/bin/configure-capture.py' - '!shared/bin/zeek*' - '!shared/bin/suricata*' - '.trigger_workflow_build' diff --git a/.github/workflows/postgresql-build-and-push-ghcr.yml b/.github/workflows/postgresql-build-and-push-ghcr.yml index 9369feff2..d10e377d0 100644 --- a/.github/workflows/postgresql-build-and-push-ghcr.yml +++ b/.github/workflows/postgresql-build-and-push-ghcr.yml @@ -8,16 +8,13 @@ on: paths: - 'Dockerfiles/postgresql.Dockerfile' - 'shared/bin/*' - - '!shared/bin/agg-init.sh' - '!shared/bin/capa-build.sh' - '!shared/bin/common-init.sh' - - '!shared/bin/sensor-init.sh' - '!shared/bin/os-disk-config.py' - '!shared/bin/extracted_files_http_server.py' - '!shared/bin/web-ui-asset-download.sh' - '!shared/bin/preseed_late_user_config.sh' - '!shared/bin/configure-interfaces.py' - - '!shared/bin/configure-capture.py' - '!shared/bin/zeek*' - '!shared/bin/suricata*' - '.trigger_workflow_build' diff --git a/.github/workflows/redis-build-and-push-ghcr.yml b/.github/workflows/redis-build-and-push-ghcr.yml index 635728f2f..060a5c056 100644 --- a/.github/workflows/redis-build-and-push-ghcr.yml +++ b/.github/workflows/redis-build-and-push-ghcr.yml @@ -8,16 +8,13 @@ on: paths: - 'Dockerfiles/redis.Dockerfile' - 'shared/bin/*' - - '!shared/bin/agg-init.sh' - '!shared/bin/capa-build.sh' - '!shared/bin/common-init.sh' - - '!shared/bin/sensor-init.sh' - '!shared/bin/os-disk-config.py' - '!shared/bin/extracted_files_http_server.py' - '!shared/bin/web-ui-asset-download.sh' - '!shared/bin/preseed_late_user_config.sh' - '!shared/bin/configure-interfaces.py' - - '!shared/bin/configure-capture.py' - '!shared/bin/zeek*' - '!shared/bin/suricata*' - '.trigger_workflow_build' diff --git a/.github/workflows/suricata-build-and-push-ghcr.yml b/.github/workflows/suricata-build-and-push-ghcr.yml index ec6ebadc6..01b83f663 100644 --- a/.github/workflows/suricata-build-and-push-ghcr.yml +++ b/.github/workflows/suricata-build-and-push-ghcr.yml @@ -9,16 +9,13 @@ on: - 'suricata/**' - 'Dockerfiles/suricata.Dockerfile' - 'shared/bin/*' - - '!shared/bin/agg-init.sh' - '!shared/bin/capa-build.sh' - '!shared/bin/common-init.sh' - - '!shared/bin/sensor-init.sh' - '!shared/bin/os-disk-config.py' - '!shared/bin/extracted_files_http_server.py' - '!shared/bin/web-ui-asset-download.sh' - '!shared/bin/preseed_late_user_config.sh' - '!shared/bin/configure-interfaces.py' - - '!shared/bin/configure-capture.py' - '!shared/bin/zeek*' - '.trigger_workflow_build' workflow_dispatch: diff --git a/.github/workflows/zeek-build-and-push-ghcr.yml b/.github/workflows/zeek-build-and-push-ghcr.yml index 8d2dda621..64126d69c 100644 --- a/.github/workflows/zeek-build-and-push-ghcr.yml +++ b/.github/workflows/zeek-build-and-push-ghcr.yml @@ -9,16 +9,13 @@ on: - 'zeek/**' - 'Dockerfiles/zeek.Dockerfile' - 'shared/bin/*' - - '!shared/bin/agg-init.sh' - '!shared/bin/capa-build.sh' - '!shared/bin/common-init.sh' - - '!shared/bin/sensor-init.sh' - '!shared/bin/os-disk-config.py' - '!shared/bin/extracted_files_http_server.py' - '!shared/bin/web-ui-asset-download.sh' - '!shared/bin/preseed_late_user_config.sh' - '!shared/bin/configure-interfaces.py' - - '!shared/bin/configure-capture.py' - '!shared/bin/suricata*' - '.trigger_workflow_build' workflow_dispatch: diff --git a/Dockerfiles/dashboards-helper.Dockerfile b/Dockerfiles/dashboards-helper.Dockerfile index 543049c41..bc7305167 100644 --- a/Dockerfiles/dashboards-helper.Dockerfile +++ b/Dockerfiles/dashboards-helper.Dockerfile @@ -60,8 +60,6 @@ COPY --chmod=755 shared/bin/docker-uid-gid-setup.sh /usr/local/bin/ COPY --chmod=755 shared/bin/service_check_passthrough.sh /usr/local/bin/ COPY --from=ghcr.io/mmguero-dev/gostatic --chmod=755 /goStatic /usr/bin/goStatic COPY --chmod=755 shared/bin/opensearch_status.sh /data/ -COPY --chmod=755 shared/bin/opensearch_index_size_prune.py /data/ -COPY --chmod=755 shared/bin/opensearch_read_only.py /data/ ADD scripts/malcolm_utils.py /data/ RUN export BINARCH=$(uname -m | sed 's/x86_64/amd64/' | sed 's/aarch64/arm64/') && \ diff --git a/Dockerfiles/logstash.Dockerfile b/Dockerfiles/logstash.Dockerfile index 11e065e68..5a34ca7d8 100644 --- a/Dockerfiles/logstash.Dockerfile +++ b/Dockerfiles/logstash.Dockerfile @@ -83,7 +83,6 @@ COPY --chmod=755 shared/bin/docker-uid-gid-setup.sh /usr/local/bin/ COPY --chmod=755 shared/bin/service_check_passthrough.sh /usr/local/bin/ COPY --chmod=755 shared/bin/opensearch_status.sh /usr/local/bin/ COPY --from=ghcr.io/mmguero-dev/gostatic --chmod=755 /goStatic /usr/bin/goStatic -COPY --chmod=755 shared/bin/manuf-oui-parse.py /usr/local/bin/ COPY --chmod=755 shared/bin/jdk-cacerts-auto-import.sh /usr/local/bin/ COPY --chmod=755 shared/bin/keystore-bootstrap.sh /usr/local/bin/ ADD logstash/maps/*.yaml /etc/ diff --git a/shared/bin/opensearch_index_size_prune.py b/dashboards/scripts/opensearch_index_size_prune.py similarity index 100% rename from shared/bin/opensearch_index_size_prune.py rename to dashboards/scripts/opensearch_index_size_prune.py diff --git a/shared/bin/opensearch_read_only.py b/dashboards/scripts/opensearch_read_only.py similarity index 100% rename from shared/bin/opensearch_read_only.py rename to dashboards/scripts/opensearch_read_only.py diff --git a/docs/malcolm-config.md b/docs/malcolm-config.md index 653251002..b598dc06e 100644 --- a/docs/malcolm-config.md +++ b/docs/malcolm-config.md @@ -175,6 +175,6 @@ In instances where Malcolm is deployed with the intention of running indefinitel - `EXTRACTED_FILE_PRUNE_THRESHOLD_MAX_SIZE` - specifies the maximum size, specified either in gigabytes or as a human-readable data size (e.g., `250G`), that the `./zeek-logs/extract_files/` directory is allowed to contain before the prune condition triggers - `EXTRACTED_FILE_PRUNE_THRESHOLD_TOTAL_DISK_USAGE_PERCENT` - specifies a maximum fill percentage for the file system containing the `./zeek-logs/extract_files/`; in other words, if the disk is more than this percentage utilized, the prune condition triggers - `EXTRACTED_FILE_PRUNE_INTERVAL_SECONDS` - the interval between checking the prune conditions, in seconds (default `300`) -* [Index management policies](index-management.md) can be handled via plugins provided as part of the OpenSearch and Elasticsearch platforms, respectively. In addition to those tools, the `OPENSEARCH_INDEX_SIZE_PRUNE_LIMIT` variable in **`dashboards-helper.env`** defines a maximum cumulative that OpenSearch indices are allowed to consume before the oldest indices [are deleted]({{ site.github.repository_url }}/blob/{{ site.github.build_revision }}/shared/bin/opensearch_index_size_prune.py), specified as either as a human-readable data size (e.g., `250G`) or as a percentage of the total disk size (e.g., `70%`): e.g., a value of `500G` means "delete the oldest OpenSearch indices if the total space consumed by Malcolm's indices exceeds five hundred gigabytes." +* [Index management policies](index-management.md) can be handled via plugins provided as part of the OpenSearch and Elasticsearch platforms, respectively. In addition to those tools, the `OPENSEARCH_INDEX_SIZE_PRUNE_LIMIT` variable in **`dashboards-helper.env`** defines a maximum cumulative that OpenSearch indices are allowed to consume before the oldest indices [are deleted]({{ site.github.repository_url }}/blob/{{ site.github.build_revision }}/dashboards/scripts/opensearch_index_size_prune.py), specified as either as a human-readable data size (e.g., `250G`) or as a percentage of the total disk size (e.g., `70%`): e.g., a value of `500G` means "delete the oldest OpenSearch indices if the total space consumed by Malcolm's indices exceeds five hundred gigabytes." Similar settings exist for managing disk usage on [Hedgehog Linux](malcolm-hedgehog-e2e-iso-install.md#HedgehogDiskUsage). diff --git a/shared/bin/configure-capture.py b/hedgehog-iso/config/includes.chroot/usr/local/bin/configure-capture.py similarity index 100% rename from shared/bin/configure-capture.py rename to hedgehog-iso/config/includes.chroot/usr/local/bin/configure-capture.py diff --git a/shared/bin/sensor-init.sh b/hedgehog-iso/config/includes.chroot/usr/local/bin/sensor-init.sh similarity index 100% rename from shared/bin/sensor-init.sh rename to hedgehog-iso/config/includes.chroot/usr/local/bin/sensor-init.sh diff --git a/shared/bin/ufw_allow_requests.sh b/hedgehog-iso/config/includes.chroot/usr/local/bin/ufw_allow_requests.sh similarity index 100% rename from shared/bin/ufw_allow_requests.sh rename to hedgehog-iso/config/includes.chroot/usr/local/bin/ufw_allow_requests.sh diff --git a/shared/bin/manuf-oui-parse.py b/logstash/scripts/manuf-oui-parse.py similarity index 100% rename from shared/bin/manuf-oui-parse.py rename to logstash/scripts/manuf-oui-parse.py diff --git a/shared/bin/agg-init.sh b/malcolm-iso/config/includes.chroot/usr/local/bin/agg-init.sh similarity index 100% rename from shared/bin/agg-init.sh rename to malcolm-iso/config/includes.chroot/usr/local/bin/agg-init.sh diff --git a/shared/bin/docker-load-wait.sh b/malcolm-iso/config/includes.chroot/usr/local/bin/docker-load-wait.sh similarity index 100% rename from shared/bin/docker-load-wait.sh rename to malcolm-iso/config/includes.chroot/usr/local/bin/docker-load-wait.sh diff --git a/shared/bin/malcolm-first-run-configure.sh b/malcolm-iso/config/includes.chroot/usr/local/bin/malcolm-first-run-configure.sh similarity index 100% rename from shared/bin/malcolm-first-run-configure.sh rename to malcolm-iso/config/includes.chroot/usr/local/bin/malcolm-first-run-configure.sh diff --git a/shared/bin/set-malcolm-gtk-bookmark.sh b/malcolm-iso/config/includes.chroot/usr/local/bin/set-malcolm-gtk-bookmark.sh similarity index 100% rename from shared/bin/set-malcolm-gtk-bookmark.sh rename to malcolm-iso/config/includes.chroot/usr/local/bin/set-malcolm-gtk-bookmark.sh diff --git a/shared/bin/ics-oui-parse.py b/scripts/ics-oui-parse.py similarity index 100% rename from shared/bin/ics-oui-parse.py rename to scripts/ics-oui-parse.py diff --git a/shared/bin/capa-build.sh b/shared/bin/capa-build.sh old mode 100644 new mode 100755 diff --git a/shared/bin/keystore-bootstrap.sh b/shared/bin/keystore-bootstrap.sh old mode 100644 new mode 100755