diff --git a/CHANGELOG b/CHANGELOG index 8b10672da9..c7f5f1e1e8 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -18,14 +18,18 @@ Node Versions: NOTICE: Restart wiseService before capture when upgrading -2.4.0 2020/07/xx +2.4.0 2020/08/xx - NOTE - RHEL/Centos 6 is no longer supported, Node 12 required - - release - node 12.18.2, glib 2.64.3 + - release - node 12.18.2, glib 2.64.3, curl 7.71.1 - viewer - aes256Encryption now defaults to true - viewer - added a clear cache button to ES Admin tab + - viewer - quote expressions with [ or ] in them - capture - http2 decoding for PRI * h2 sessions - capture - set http2 protocol when alpn is h2 - capture - upgrade h2c http2 decoding + - capture - ES Nodes can now show shards/segments per node + - capture - no longer use internal libpcap function + - wise - simple UI 2.3.2 2020/06/29 - NOTE - 2.3.x will be the last version to support RHEL/Centos 6 diff --git a/screwdriver.yaml b/screwdriver.yaml index 14164a78ec..d10fa0e7d8 100644 --- a/screwdriver.yaml +++ b/screwdriver.yaml @@ -122,7 +122,6 @@ jobs: - installing: make install - cp -r capture/plugins/lua/samples /data/moloch/lua - linting: npm run lint - - install-for-tests: (cd wiseService; npm ci --production) - run-es: (chown -R elasticsearch /elasticsearch-7.5.1; cd /elasticsearch-7.5.1 ; su elasticsearch -c "ES_JAVA_OPTS='-Xms700m -Xmx700m' bin/elasticsearch" > /tmp/es &) - test-capture: (cd tests ; ./tests.pl) - sleep 30 @@ -227,7 +226,6 @@ jobs: - cp -r capture/plugins/lua/samples /data/moloch/lua - linting: npm run lint - run-es: (chown -R elasticsearch /elasticsearch-7.5.1; cd /elasticsearch-7.5.1 ; su elasticsearch -c "ES_JAVA_OPTS='-Xms700m -Xmx700m' bin/elasticsearch" > /tmp/es &) - - install-for-tests: (cd wiseService; npm ci --production) - sleep 30 - cat /tmp/es - test-viewer: (cd tests ; G_SLICE=always-malloc ./tests.pl --viewer) @@ -255,7 +253,6 @@ jobs: - installing: make install - cp -r capture/plugins/lua/samples /data/moloch/lua - linting: npm run lint - - install-for-tests: (cd wiseService; npm ci --production) - run-es: (chown -R elasticsearch /elasticsearch-7.5.1; cd /elasticsearch-7.5.1 ; su elasticsearch -c "ES_JAVA_OPTS='-Xms700m -Xmx700m' bin/elasticsearch" > /tmp/es &) - test-capture: (cd tests ; ./tests.pl) - sleep 30 diff --git a/wiseService/Makefile.in b/wiseService/Makefile.in index 5810a0ea49..a70507900d 100644 --- a/wiseService/Makefile.in +++ b/wiseService/Makefile.in @@ -12,8 +12,12 @@ check: npm ci --production install: - @mkdir -p "$(WISEDIR)" + @mkdir -p "$(WISEDIR)" "$(WISEDIR)/vueapp" $(INSTALL) *.js wiseService.ini.sample package.json package-lock.json $(WISEDIR) + npm ci + npm run build + $(CP) -pr favicon.ico $(WISEDIR) + $(CP) -pr vueapp/dist "$(WISEDIR)/vueapp" (cd $(WISEDIR) ; npm ci --production) rm -f $(VIEWERDIR)/package-lock.json