diff --git a/Dockerfiles/arkime.Dockerfile b/Dockerfiles/arkime.Dockerfile index edbe1e19c..16ccde49c 100644 --- a/Dockerfiles/arkime.Dockerfile +++ b/Dockerfiles/arkime.Dockerfile @@ -62,7 +62,7 @@ RUN apt-get -q update && \ python3 /opt/bs4_remove_div.py -i ./viewer/vueapp/src/components/users/Users.vue -o ./viewer/vueapp/src/components/users/Users.new -c "new-user-form" && \ mv -vf ./viewer/vueapp/src/components/users/Users.new ./viewer/vueapp/src/components/users/Users.vue && \ sed -i 's/v-if.*password.*"/v-if="false"/g' ./viewer/vueapp/src/components/settings/Settings.vue && \ - rm -rf ./viewer/vueapp/src/components/upload ./capture/plugins/suricata* && \ + rm -rf ./capture/plugins/suricata* && \ sed -i "s/^\(ARKIME_LOCALELASTICSEARCH=\).*/\1"$ARKIME_LOCALELASTICSEARCH"/" ./release/Configure && \ sed -i "s/^\(ARKIME_INET=\).*/\1"$ARKIME_INET"/" ./release/Configure && \ ./easybutton-build.sh && \ diff --git a/arkime/etc/config.ini b/arkime/etc/config.ini index c4d057fb5..0aff4df59 100644 --- a/arkime/etc/config.ini +++ b/arkime/etc/config.ini @@ -49,6 +49,7 @@ pluginsDir=/opt/arkime/plugins plugins=wise.so viewerPlugins=wise.js spiDataMaxIndices=7 +uploadCommand= packetThreads=2 pcapWriteMethod=simple pcapWriteSize=262143 diff --git a/arkime/patch/remove_upload.patch b/arkime/patch/remove_upload.patch deleted file mode 100644 index 4c17cc35c..000000000 --- a/arkime/patch/remove_upload.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/viewer/vueapp/src/router/index.js b/viewer/vueapp/src/router/index.js -index 104506cf..0850f2cd 100644 ---- a/viewer/vueapp/src/router/index.js -+++ b/viewer/vueapp/src/router/index.js -@@ -12,7 +12,6 @@ import Spiview from '@/components/spiview/Spiview'; - import Spigraph from '@/components/spigraph/Spigraph'; - import Connections from '@/components/connections/Connections'; - import Settings from '@/components/settings/Settings'; --import Upload from '@/components/upload/Upload'; - import Hunt from '@/components/hunt/Hunt'; - import Moloch404 from '@/components/utils/404'; - -@@ -92,11 +91,6 @@ const router = new Router({ - name: 'Settings', - component: Settings - }, -- { -- path: '/upload', -- name: 'Upload', -- component: Upload -- }, - { - path: '/hunt', - name: 'Hunt', diff --git a/sensor-iso/interface/sensor_ctl/arkime/config.ini b/sensor-iso/interface/sensor_ctl/arkime/config.ini index 3214dbec3..9b67ff43e 100644 --- a/sensor-iso/interface/sensor_ctl/arkime/config.ini +++ b/sensor-iso/interface/sensor_ctl/arkime/config.ini @@ -34,6 +34,7 @@ smtpIpHeaders=X-Originating-IP:;X-Barracuda-Apparent-Source-IP: parsersDir=/dummy/parsers pluginsDir=/dummy/plugins spiDataMaxIndices=2 +uploadCommand= compressES=false maxESConns=30 maxESRequests=500