Merge branch 'master' of https://github.com/didi/nightingale

changelog

@@ -14,3 +14,6 @@
 影响模块：index judge monapi rdb transfer tsdb
 更新内容：把hbs的逻辑从monapi挪到rdb，拆分监控的权限点
 
+3.1.5
+影响模块：monapi
+更新内容：清理策略的时候会空指针，node删除了，策略还在，此时会复现

control

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # release version
-version=3.1.4
+version=3.1.5
 
 CWD=$(cd $(dirname $0)/; pwd)
 cd $CWD
@@ -180,7 +180,7 @@ pack()
 	clock=$(date +%s)
 	mkdir $clock
 	mv etc/*.local.yml $clock
-	tar zcvf n9e-${version}.tar.gz control sql etc n9e-*
+	tar zcvf n9e-${version}.tar.gz script control sql etc n9e-*
 	mv $clock/* etc/
 	rm -rf $clock
 }

script/send_im

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+echo "$1" >> /tmp/send_im.txt
+echo "$2" >> /tmp/send_im.txt
+echo "" >> /tmp/send_im.txt