💥 v2.0 必须更新面板，新增服务监控

service/dao/dao.go

@@ -8,7 +8,6 @@ import (
 	"gorm.io/gorm"
 
 	"github.com/naiba/nezha/model"
-	pb "github.com/naiba/nezha/proto"
 )
 
 const (
@@ -16,30 +15,18 @@ const (
 	ReportDelay   = 2
 )
 
-// Conf ..
 var Conf *model.Config
 
-// Cache ..
 var Cache *cache.Cache
 
-// DB ..
 var DB *gorm.DB
 
-// ServerList ..
 var ServerList map[uint64]*model.Server
 var SortedServerList []*model.Server
 
-// ServerLock ..
 var ServerLock sync.RWMutex
 
-// Version ..
-var Version = "debug"
-
-func init() {
-	if len(Version) > 7 {
-		Version = Version[:7]
-	}
-}
+var Version = "v0.2.0"
 
 func ReSortServer() {
 	SortedServerList = []*model.Server{}
@@ -51,19 +38,3 @@ func ReSortServer() {
 		return SortedServerList[i].DisplayIndex > SortedServerList[j].DisplayIndex
 	})
 }
-
-// SendCommand ..
-func SendCommand(cmd *pb.Command) {
-	ServerLock.RLock()
-	defer ServerLock.RUnlock()
-	var err error
-	for _, server := range ServerList {
-		if server.Stream != nil {
-			err = server.Stream.Send(cmd)
-			if err != nil {
-				close(server.StreamClose)
-				server.Stream = nil
-			}
-		}
-	}
-}

service/monitor/monitor.go

@@ -26,7 +26,6 @@ type ipDotSbGeoIP struct {
 
 var netInSpeed, netOutSpeed, netInTransfer, netOutTransfer, lastUpdate uint64
 
-// GetHost ..
 func GetHost() *model.Host {
 	hi, _ := host.Info()
 	var cpus []string
@@ -60,8 +59,7 @@ func GetHost() *model.Host {
 	}
 }
 
-// GetState ..
-func GetState(delay int64) *model.State {
+func GetState(delay int64) *model.HostState {
 	hi, _ := host.Info()
 	// Memory
 	mv, _ := mem.VirtualMemory()
@@ -75,7 +73,7 @@ func GetState(delay int64) *model.State {
 	// Disk
 	u, _ := disk.Usage("/")
 
-	return &model.State{
+	return &model.HostState{
 		CPU:            cpuPercent,
 		MemUsed:        mv.Used,
 		SwapUsed:       ms.Used,
@@ -88,7 +86,6 @@ func GetState(delay int64) *model.State {
 	}
 }
 
-// TrackNetworkSpeed ..
 func TrackNetworkSpeed() {
 	var innerNetInTransfer, innerNetOutTransfer uint64
 	nc, err := net.IOCounters(false)

service/rpc/auth.go

@@ -10,23 +10,19 @@ import (
 	"google.golang.org/grpc/status"
 )
 
-// AuthHandler ..
 type AuthHandler struct {
 	ClientID     string
 	ClientSecret string
 }
 
-// GetRequestMetadata ..
 func (a *AuthHandler) GetRequestMetadata(ctx context.Context, uri ...string) (map[string]string, error) {
 	return map[string]string{"client_id": a.ClientID, "client_secret": a.ClientSecret}, nil
 }
 
-// RequireTransportSecurity ..
 func (a *AuthHandler) RequireTransportSecurity() bool {
 	return !dao.Conf.Debug
 }
 
-// Check ..
 func (a *AuthHandler) Check(ctx context.Context) (clientID uint64, err error) {
 	md, ok := metadata.FromIncomingContext(ctx)
 	if !ok {

service/rpc/nezha.go

@@ -3,7 +3,6 @@ package rpc
 import (
 	"context"
 	"fmt"
-	"log"
 	"time"
 
 	"github.com/naiba/nezha/model"
@@ -12,13 +11,60 @@ import (
 	"github.com/naiba/nezha/service/dao"
 )
 
-// NezhaHandler ..
 type NezhaHandler struct {
 	Auth *AuthHandler
 }
 
-// ReportState ..
-func (s *NezhaHandler) ReportState(c context.Context, r *pb.State) (*pb.Receipt, error) {
+func (s *NezhaHandler) ReportTask(c context.Context, r *pb.TaskResult) (*pb.Receipt, error) {
+	var err error
+	if _, err = s.Auth.Check(c); err != nil {
+		return nil, err
+	}
+	if r.GetType() == model.MonitorTypeHTTPGET {
+		// SSL 证书变更报警
+		var last model.MonitorHistory
+		if err := dao.DB.Where("monitor_id = ?", r.GetId()).Order("id DESC").First(&last).Error; err == nil {
+			if last.Data != "" && last.Data != r.GetData() {
+				var monitor model.Monitor
+				dao.DB.First(&monitor, "id = ?", last.MonitorID)
+				alertmanager.SendNotification(fmt.Sprintf(
+					"监控：%s SSL证书变更，旧：%s，新：%s。",
+					monitor.Name, last.Data, r.GetData()))
+			}
+		}
+	}
+	// 存入历史记录
+	mh := model.PB2MonitorHistory(r)
+	if err := dao.DB.Create(&mh).Error; err != nil {
+		return nil, err
+	}
+	// 更新最后检测时间
+	var m model.Monitor
+	m.ID = r.GetId()
+	if err := dao.DB.Model(&m).Update("last_check", time.Now()).Error; err != nil {
+		return nil, err
+	}
+	return &pb.Receipt{Proced: true}, nil
+}
+
+func (s *NezhaHandler) RequestTask(h *pb.Host, stream pb.NezhaService_RequestTaskServer) error {
+	var clientID uint64
+	var err error
+	if clientID, err = s.Auth.Check(stream.Context()); err != nil {
+		return err
+	}
+	closeCh := make(chan error)
+	dao.ServerLock.Lock()
+	dao.ServerList[clientID].TaskStream = stream
+	dao.ServerList[clientID].TaskClose = closeCh
+	dao.ServerLock.Unlock()
+	select {
+	case err = <-closeCh:
+		return err
+	}
+}
+
+func (s *NezhaHandler) ReportSystemState(c context.Context, r *pb.State) (*pb.Receipt, error) {
 	var clientID uint64
 	var err error
 	if clientID, err = s.Auth.Check(c); err != nil {
@@ -32,28 +78,7 @@ func (s *NezhaHandler) ReportState(c context.Context, r *pb.State) (*pb.Receipt,
 	return &pb.Receipt{Proced: true}, nil
 }
 
-// Heartbeat ..
-func (s *NezhaHandler) Heartbeat(r *pb.Beat, stream pb.NezhaService_HeartbeatServer) error {
-	var clientID uint64
-	var err error
-	defer log.Printf("Heartbeat exit server:%v err:%v", clientID, err)
-	if clientID, err = s.Auth.Check(stream.Context()); err != nil {
-		return err
-	}
-	// 放入在线服务器列表
-	dao.ServerLock.RLock()
-	closeCh := make(chan error)
-	dao.ServerList[clientID].StreamClose = closeCh
-	dao.ServerList[clientID].Stream = stream
-	dao.ServerLock.RUnlock()
-	select {
-	case err = <-closeCh:
-		return err
-	}
-}
-
-// Register ..
-func (s *NezhaHandler) Register(c context.Context, r *pb.Host) (*pb.Receipt, error) {
+func (s *NezhaHandler) ReportSystemInfo(c context.Context, r *pb.Host) (*pb.Receipt, error) {
 	var clientID uint64
 	var err error
 	if clientID, err = s.Auth.Check(c); err != nil {