From 3829314818915e4b1f233b8bb736d8ccc0c89751 Mon Sep 17 00:00:00 2001 From: Bill Murrin Date: Fri, 5 Jan 2018 20:25:15 -1000 Subject: [PATCH 1/3] create search URL properly for undefined stream_id --- src/web/components/QuickValuesPlusVisualization.jsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/web/components/QuickValuesPlusVisualization.jsx b/src/web/components/QuickValuesPlusVisualization.jsx index de57cb1..b8a23cf 100644 --- a/src/web/components/QuickValuesPlusVisualization.jsx +++ b/src/web/components/QuickValuesPlusVisualization.jsx @@ -234,7 +234,8 @@ const QuickValuesPlusVisualization = React.createClass({ //Properly format strings containing spaces, backslashes and colons. let escTerm = this.escape(`${d.term}`); let appendQuery = (this.props.config.query == "") ? this.props.config.field + ":" + escTerm : this.props.config.query + " AND " + this.props.config.field + ":" + escTerm; - let replayURL = Routes.stream_search(this.props.config.stream_id, appendQuery, this._getTimeRange(), this.props.config.interval); + let replayURL = (this.props.config.stream_id == undefined) ? Routes.search(appendQuery, this._getTimeRange(), this.props.config.interval) : Routes.stream_search(this.props.config.stream_id, appendQuery, this._getTimeRange(), this.props.config.interval); + return `${colourBadge} ${d.term}`; } From 1ad3fe8ed9097c8a666bbd339973ebfe739f5779 Mon Sep 17 00:00:00 2001 From: Bill Murrin Date: Fri, 5 Jan 2018 23:09:53 -1000 Subject: [PATCH 2/3] Update travis config (#38) * update travis - attempting to fix deb and rpm generation issues * tweaking * attempting to build web component via travis * travis.yml update * travis.yml update * travis.yml update * travis.yml update * travis.yml update * travis.yml update --- .travis.yml | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index f6de9dc..491d9e9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,16 +2,24 @@ sudo: required dist: trusty language: java jdk: -- oraclejdk8 + - oraclejdk8 install: -- mvn install -DskipTests=true -Dmaven.javadoc.skip=true -Dskip.web.build=true -B - -V + - npm install webpack -g + - pwd + - cd ../ + - git clone -b "2.3.2" https://github.com/Graylog2/graylog2-server.git + - cd graylog2-server/graylog2-web-interface + - npm install + - webpack --config webpack.vendor.js + - pwd + - cd ../../graylog-plugin-quickvaluesplus-widget + - mvn install -DskipTests=true -Dmaven.javadoc.skip=true -B -V script: -- mvn test -Dskip.web.build=true -B + - mvn test addons: apt: packages: - - rpm + - rpm before_deploy: - mvn jdeb:jdeb && export RELEASE_DEB_FILE=$(ls target/*.deb) - mvn rpm:rpm && export RELEASE_RPM_FILE=$(find target/ -name '*.rpm' | tail -1) @@ -24,11 +32,11 @@ deploy: secure: e1lIcnvHdc3suR294QbSBKKH4bUewTZztslx1zA0wofFJwcYg76yrcbUIbrC6ZsrxVovVIJaeMIkgwYhaUfZaipq3/jolx8V3acYYUPNfoglamxWBinCoO85SmXQWnLjgEgt5B+HaRz/TK3BBhAifq5/jSwqUbmegkDnYLIxQ5BsRKKYIXeHQ55Mv+QEhofNSpexCS4t1OUByFPihUIyWcdsUvmMQ6SELiWW7ootFHexifU8usJ58BUSmmHmuItLxdF7CV8qA1HAc/sgroN+JHHznpSusfRb7eyO3RykqoAByYhk/K/cp5TtQwRzlBJCnMVkcsuDIYSjgQFFrHh4vg24sfq4fuxhLthYI6Lsff9/JhRf8kpNeSwV1UrkEf9BY3qtYsRI4VFCn9bvfloRxd+zos4PBkRPKYDWS/aKHplM2ElbVdRkiU5AvA3vcbupSbfYlznEfY2fZ7ehaWA3Y3ZvvmAAAUD0zU9aOg8EoKSdYdPiTPLYNCZnm5Mj3Ly6H56axW7jPmkhjt7dODLqcG2O/6QF+JncTd6o+QoGlF658jvfShwbxRKu3840NkofT7o0X6uZN9vZmzsFmOYwKcmItjyg/Yte0bXM4poklYMF+EmRD1yQoSvewXNylqM92zCHWCSqbJpeeEyNIRQwTXm+nICXbp0NxVcEU9FxAXM= file_glob: true file: - - "**/target/*.jar" - - "**/target/*.deb" - - "**/target/**/*.rpm" + - "${RELEASE_PKG_FILE}" + - "${RELEASE_DEB_FILE}" + - "${RELEASE_RPM_FILE}" skip_cleanup: true on: repo: billmurrin/graylog-plugin-quickvaluesplus-widget tags: true - jdk: oraclejdk8 + jdk: oraclejdk8 \ No newline at end of file From f6718a94f74ea3657f955f9a852b57752f8ab76d Mon Sep 17 00:00:00 2001 From: Bill Murrin Date: Fri, 5 Jan 2018 23:15:07 -1000 Subject: [PATCH 3/3] updated version numbers --- package.json | 4 ++-- pom.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 78cc883..36b8507 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "QuickValuesPlusWidget", - "version": "3.0.1", + "version": "3.0.2", "description": "GrayLog2 QuickValuesPlus Widget Plugin", "repository": { "type": "git", @@ -14,7 +14,7 @@ "graylog" ], "author": "Bill Murrin ", - "license": "MIT", + "license": "GPL-3.0", "dependencies": { "bootstrap": "3.3.6", "reflux": "^0.2.12", diff --git a/pom.xml b/pom.xml index a658461..fa9db95 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ org.graylog.plugins graylog-plugin-quickvaluesplus-widget - 3.0.1 + 3.0.2 jar ${project.artifactId}