Skip to content

Commit

Permalink
build wise vueapp
Browse files Browse the repository at this point in the history
  • Loading branch information
awick committed Jul 17, 2020
1 parent fca9356 commit d292e2f
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 6 deletions.
8 changes: 6 additions & 2 deletions CHANGELOG
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 0 additions & 3 deletions screwdriver.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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
Expand Down
6 changes: 5 additions & 1 deletion wiseService/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit d292e2f

Please sign in to comment.