From 6f565ba022239d279602aa785ddc4572ae697fc4 Mon Sep 17 00:00:00 2001 From: naiba Date: Thu, 22 Apr 2021 11:17:51 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=B8=20=E5=A2=9E=E5=A4=A7=E5=BD=93?= =?UTF-8?q?=E5=89=8D=E6=9C=8D=E5=8A=A1=E7=8A=B6=E6=80=81=E5=AE=B9=E9=94=99?= =?UTF-8?q?=E7=8E=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- service/dao/dao.go | 2 +- service/dao/servicesentinel.go | 8 +++++--- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 5c9bc75..6c30292 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@


-    +   

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

diff --git a/service/dao/dao.go b/service/dao/dao.go index 149a20a..03f3461 100644 --- a/service/dao/dao.go +++ b/service/dao/dao.go @@ -13,7 +13,7 @@ import ( pb "github.com/naiba/nezha/proto" ) -var Version = "v0.6.1" // ！！记得修改 README 重的 badge 版本！！ +var Version = "v0.6.2" // ！！记得修改 README 重的 badge 版本！！ const ( SnapshotDelay = 3 diff --git a/service/dao/servicesentinel.go b/service/dao/servicesentinel.go index ae1237d..83798bc 100644 --- a/service/dao/servicesentinel.go +++ b/service/dao/servicesentinel.go @@ -11,6 +11,8 @@ import ( pb "github.com/naiba/nezha/proto" ) +const _CurrentStatusSize = 60 // 统计 10 分钟内的数据为当前状态 + var ServiceSentinelShared *ServiceSentinel func NewServiceSentinel() { @@ -99,7 +101,7 @@ func (ss *ServiceSentinel) OnMonitorUpdate() { for i := 0; i < len(monitors); i++ { ss.monitors[monitors[i].ID] = monitors[i] if len(ss.serviceCurrentStatusData[monitors[i].ID]) == 0 { - ss.serviceCurrentStatusData[monitors[i].ID] = make([]model.MonitorHistory, 20) + ss.serviceCurrentStatusData[monitors[i].ID] = make([]model.MonitorHistory, _CurrentStatusSize) } } } @@ -184,7 +186,7 @@ func (ss *ServiceSentinel) LoadStats() map[uint64]*model.ServiceItemResponse { msm[k].Delay[29] = (msm[k].Delay[29]*float32(msm[k].Up[29]) + v[i].Delay) / float32(msm[k].Up[29]+1) } } - // 最后20分钟的状态 与 monitor 对象填充 + // 最后 10 分钟的状态 与 monitor 对象填充 for k, v := range ss.serviceResponseDataStoreCurrentDown { msm[k].CurrentDown = v } @@ -242,7 +244,7 @@ func (ss *ServiceSentinel) worker() { // 写入当前数据 ss.serviceCurrentStatusData[mh.MonitorID][ss.serviceCurrentStatusIndex[mh.MonitorID]] = mh ss.serviceCurrentStatusIndex[mh.MonitorID]++ - if ss.serviceCurrentStatusIndex[mh.MonitorID] == 20 { + if ss.serviceCurrentStatusIndex[mh.MonitorID] == _CurrentStatusSize { ss.serviceCurrentStatusIndex[mh.MonitorID] = 0 } // 更新当前状态