From 37868777e7aa7e580f0f8b084f8cdbe68375cae5 Mon Sep 17 00:00:00 2001
From: Ulric Qin <ulric.qin@gmail.com>
Date: Sun, 31 Jan 2021 10:59:01 +0800
Subject: [PATCH] release 3.6.0

---
 changelog | 6 ++++++
 control   | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/changelog b/changelog
index 93ccc57c..62ba2473 100644
--- a/changelog
+++ b/changelog
@@ -84,3 +84,9 @@
 升级方法：
   - 替换n9e-prober n9e-monapi二进制，升级pub下的前端资源文件
 
+3.6.0
+升级内容：
+  - prober模块支持nginx、elasticsearch、prometheus的监控采集，prometheus转换时姑且干掉了 Histogram 和 Summary
+  - 告警消息中节点挂载关系做了去重处理
+升级方法：
+  - 替换n9e-prober n9e-monapi二进制
\ No newline at end of file
diff --git a/control b/control
index 54c3976a..5600fcfa 100755
--- a/control
+++ b/control
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # release version
-version=3.5.2
+version=3.6.0
 
 CWD=$(cd $(dirname $0)/; pwd)
 cd $CWD
-- 
GitLab