Merge pull request #2 from nsano-rururu/zabbix-sns

added Zabbix / SNS patch & library Change / library Update

Dockerfile

@@ -35,8 +35,12 @@ COPY config/elastalert.yaml /opt/elastalert/config.yaml
 COPY config/config.json config/config.json
 COPY rule_templates/ /opt/elastalert/rule_templates
 COPY elastalert_modules/ /opt/elastalert/elastalert_modules
-# Fix until https://github.com/Yelp/elastalert/pull/2783 is merged
+# Fix until https://github.com/Yelp/elastalert/pull/2783 and https://github.com/Yelp/elastalert/pull/2640 is merged
 COPY patches/loaders.py /opt/elastalert/elastalert/loaders.py
+# Fix until https://github.com/Yelp/elastalert/pull/2640 is merged
+COPY patches/zabbix.py /opt/elastalert/elastalert/zabbix.py
+# Fix until https://github.com/Yelp/elastalert/pull/2793 is merged
+COPY patches/alerts.py /opt/elastalert/elastalert/alerts.py
 
 # Add default rules directory
 # Set permission as unpriviledged user (1000:1000), compatible with Kubernetes

package.json

@@ -18,41 +18,39 @@
     "test": "./test"
   },
   "dependencies": {
-    "@babel/cli": "^7.10.1",
-    "@babel/core": "^7.10.2",
-    "@babel/preset-env": "^7.10.2",
-    "@babel/register": "^7.10.1",
+    "@babel/cli": "^7.10.5",
+    "@babel/core": "^7.11.0",
+    "@babel/preset-env": "^7.11.0",
+    "@babel/register": "^7.10.5",
+    "@hapi/joi": "^17.1.1",
     "body-parser": "^1.19.0",
-    "bunyan": "^1.8.12",
+    "bunyan": "^1.8.14",
     "cors": "^2.8.5",
     "cpu-stat": "^2.0.1",
     "elasticsearch": "^16.7.1",
     "express": "^4.17.1",
     "fs-extra": "^9.0.1",
-    "joi": "^14.3.1",
     "js-yaml": "^3.14.0",
-    "lodash": "^4.17.15",
+    "lodash": "^4.17.19",
     "mkdirp": "^1.0.4",
     "object-resolve-path": "^1.1.1",
     "randomstring": "^1.1.5",
     "raven": "^2.6.4",
     "readdirp": "^3.4.0",
     "recursive-readdir": "^2.2.2",
     "request": "^2.88.2",
-    "request-promise-native": "^1.0.8",
+    "request-promise-native": "^1.0.9",
     "tar": "^6.0.2",
-    "ws": "^7.3.0"
+    "ws": "^7.3.1"
   },
   "devDependencies": {
-    "eslint": "^7.2.0",
+    "eslint": "^7.6.0",
     "husky": "^4.2.5",
-    "istanbul": "^0.4.5",
-    "mocha": "~8.0.1"
+    "mocha": "~8.1.0"
   },
   "scripts": {
     "build": "babel src -d lib",
     "start": "sh ./scripts/start.sh",
-    "test": "./scripts/test.sh",
     "update-authors": "./scripts/update-authors.sh",
     "precommit": "./node_modules/eslint/bin/eslint.js ."
   }