From 55cbbcafe647873ddd22744469ae994c2297c15e Mon Sep 17 00:00:00 2001 From: Akkia Date: Fri, 22 Apr 2022 16:30:05 +0800 Subject: [PATCH 1/2] =?UTF-8?q?update:=20=E5=A2=9E=E5=8A=A0TCP=E8=BF=9E?= =?UTF-8?q?=E6=8E=A5=E6=95=B0=E4=B8=8EUDP=E8=BF=9E=E6=8E=A5=E6=95=B0?= =?UTF-8?q?=E7=9A=84=E5=8D=A0=E4=BD=8D=E7=AC=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- model/notification.go | 4 ++++ resource/template/component/notification.html | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/model/notification.go b/model/notification.go index 3e631d4..448d31b 100644 --- a/model/notification.go +++ b/model/notification.go @@ -175,6 +175,8 @@ func replaceParamsInString(s *Server, str string, message string, mod func(strin str = strings.ReplaceAll(str, "#SERVER.LOAD1#", mod(fmt.Sprintf("%f", s.State.Load1))) str = strings.ReplaceAll(str, "#SERVER.LOAD5#", mod(fmt.Sprintf("%f", s.State.Load5))) str = strings.ReplaceAll(str, "#SERVER.LOAD15#", mod(fmt.Sprintf("%f", s.State.Load15))) + str = strings.ReplaceAll(str, "#SERVER.TCPCONNCOUNT#", mod(fmt.Sprintf("%d", s.State.TcpConnCount))) + str = strings.ReplaceAll(str, "#SERVER.UDPCONNCOUNT#", mod(fmt.Sprintf("%d", s.State.UdpConnCount))) } } else { str = strings.ReplaceAll(str, "#NEZHA#", message) @@ -192,6 +194,8 @@ func replaceParamsInString(s *Server, str string, message string, mod func(strin str = strings.ReplaceAll(str, "#SERVER.LOAD1#", fmt.Sprintf("%f", s.State.Load1)) str = strings.ReplaceAll(str, "#SERVER.LOAD5#", fmt.Sprintf("%f", s.State.Load5)) str = strings.ReplaceAll(str, "#SERVER.LOAD15#", fmt.Sprintf("%f", s.State.Load15)) + str = strings.ReplaceAll(str, "#SERVER.TCPCONNCOUNT#", fmt.Sprintf("%d", s.State.TcpConnCount)) + str = strings.ReplaceAll(str, "#SERVER.UDPCONNCOUNT#", fmt.Sprintf("%d", s.State.UdpConnCount)) } } return str diff --git a/resource/template/component/notification.html b/resource/template/component/notification.html index 693468e..f44d26f 100644 --- a/resource/template/component/notification.html +++ b/resource/template/component/notification.html @@ -36,7 +36,7 @@
- +
From 213b2ee2e3efc46049f2636b0908f0ba84e34a0d Mon Sep 17 00:00:00 2001 From: naiba Date: Fri, 22 Apr 2022 17:02:25 +0800 Subject: [PATCH 2/2] dashboard v0.12.22 --- README.md | 2 +- service/singleton/singleton.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index fe24c6a..14bc8ac 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@
LOGO designed by 熊大 .

-    +   

:trollface: 哪吒监控 一站式轻监控轻运维系统。支持系统状态、HTTP(SSL 证书变更、即将到期、到期)、TCP、Ping 监控报警，计划任务和在线终端。

diff --git a/service/singleton/singleton.go b/service/singleton/singleton.go index e1a1177..b280dd9 100644 --- a/service/singleton/singleton.go +++ b/service/singleton/singleton.go @@ -12,7 +12,7 @@ import ( "github.com/naiba/nezha/pkg/utils" ) -var Version = "v0.12.21" // ！！记得修改 README 中的 badge 版本！！ +var Version = "v0.12.22" // ！！记得修改 README 中的 badge 版本！！ var ( Conf *model.Config