innov
/
nightingale1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

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

This commit is contained in:
710leo 2020-10-22 21:23:59 +08:00
parent cc3b3575b6 ecacc71596
commit 228ffcfbc9
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
changelog
View File

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

4
control
View File

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
# release version # release version
version=3.1.4 version=3.1.5
CWD=$(cd $(dirname $0)/; pwd) CWD=$(cd $(dirname $0)/; pwd)
cd $CWD cd $CWD
@ -180,7 +180,7 @@ pack()
clock=$(date +%s) clock=$(date +%s)
mkdir $clock mkdir $clock
mv etc/*.local.yml $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/ mv $clock/* etc/
rm -rf $clock rm -rf $clock
} }

5
script/send_im Executable file
View File

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