Merge branch 'develop' into 'master'

Develop

See merge request bitsensor/back-end/elastalert!36

Author: martijnrondeel

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bitsensor/elastalert",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "description": "A server that runs ElastAlert and exposes REST API's for manipulating rules and alerts.",
   "license": "MIT",
   "main": "index.js",

src/common/config/schema.js

@@ -7,6 +7,7 @@ const schema = Joi.object().keys({
   'es_port': Joi.number().default(9200),
   'writeback_index': Joi.string().default('elastalert_status'),
   'port': Joi.number().default(3030),
+  'wsport': Joi.number().default(3333),
   'elastalertPath': Joi.string().default('/opt/elastalert'),
   'rulesPath': Joi.object().keys({
     'relative': Joi.boolean().default(true),