Merge branch 'develop' into 'master'

Develop

See merge request bitsensor/front-end/elastalert-kibana-plugin!5

Author: martijnrondeel

.nvmrc

@@ -1 +1 @@
-8.11.4
+10.14.1

README.md

@@ -12,11 +12,11 @@
 ![Showcase](showcase.gif)
 
 ## Requirements
-- Our [ElastAlert](https://github.com/bitsensor/elastalert) fork
+- Our [ElastAlert server](https://github.com/bitsensor/elastalert) fork
 - Kibana 6.3.1 or higher
 
 ## Installation
-Check the [releases](https://github.com/bitsensor/elastalert-kibana-plugin/releases) page to download and install the latest version of this plugin that is compatible with your Kibana version.
+Check the [releases](https://github.com/bitsensor/elastalert-kibana-plugin/releases) page to download and install the latest version of this plugin that is compatible with your Kibana version. Please be aware that you will need a running [ElastAlert server](https://github.com/bitsensor/elastalert#installation) to make use of this plugin.
 
 ## Configuration
 By default the plugin will connect to `localhost:3030`. If your ElastAlert server is running on a different host or port add/change the following options in your `config/kibana.yml` file: 

package.json

@@ -1,16 +1,17 @@
 {
   "name": "elastalert-kibana-plugin",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "Create, test and edit ElastAlert rules within Kibana.",
   "main": "index.js",
   "license": "SEE LICENSE IN LICENSE.md",
   "kibana": {
-    "version": "6.4.2",
+    "version": "6.6.0",
     "templateVersion": "1.0.0"
   },
   "scripts": {
     "preinstall": "node ../../kibana/preinstall_check",
     "kbn": "node ../../kibana/scripts/kbn",
+    "es": "node ../../kibana/scripts/es",
     "lint": "eslint .",
     "start": "plugin-helpers start",
     "test:server": "plugin-helpers test:server",
@@ -21,18 +22,19 @@
     "@elastic/eslint-config-kibana": "link:../../kibana/packages/eslint-config-kibana",
     "@elastic/eslint-import-resolver-kibana": "link:../../kibana/packages/kbn-eslint-import-resolver-kibana",
     "@kbn/plugin-helpers": "link:../../kibana/packages/kbn-plugin-helpers",
-    "babel-eslint": "^8.0.2",
-    "eslint": "^4.11.0",
-    "eslint-plugin-babel": "^4.1.1",
-    "eslint-plugin-import": "^2.3.0",
-    "eslint-plugin-jest": "^21.3.2",
-    "eslint-plugin-mocha": "^4.9.0",
+    "babel-eslint": "^9.0.0",
+    "eslint": "^5.6.0",
+    "eslint-plugin-babel": "^5.2.0",
+    "eslint-plugin-import": "^2.14.0",
+    "eslint-plugin-jest": "^21.22.1",
+    "eslint-plugin-jsx-a11y": "^6.1.2",
+    "eslint-plugin-mocha": "^5.2.0",
     "eslint-plugin-no-unsanitized": "^3.0.2",
     "eslint-plugin-prefer-object-spread": "^1.2.1",
-    "eslint-plugin-react": "^7.0.1",
+    "eslint-plugin-react": "^7.11.1",
     "expect.js": "^0.3.1"
   },
   "dependencies": {
-    "@elastic/eui": "^4.2.0"
+    "@elastic/eui": "^6.8.0"
   }
 }

server/routes/elastalert.js

@@ -1,4 +1,4 @@
-export default function (server, options) {
+export default function(server, options) {
   const baseUri = `http${options.serverSsl ? 's' : ''}://${options.serverHost}:${options.serverPort}`;
 
   // Route every request to the ElastAlert API
@@ -7,8 +7,8 @@ export default function (server, options) {
     method: ['GET', 'POST', 'DELETE'],
     handler: {
       proxy: {
-        mapUri: function (request, callback) {
-          callback(null, `${baseUri}/${request.params.path || ''}`);
+        mapUri: request => {
+          return { uri: `${baseUri}/${request.params.path || ''}` };
         }
       }
     }