Merge pull request #211 from AkkiaS7/feat-api

update: 服务器状态API增加上次汇报时间的unix时间戳 Co-authored-by: AkkiaS7 <[email protected]>
nezhahq · May 20, 2022 · 4d5a6cd · 4d5a6cd
2 parents 1ba6b3e + 962aba9
commit 4d5a6cd
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 32 deletions.
diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@
   <br>
   <small><i>LOGO designed by <a href="https://xio.ng" target="_blank">熊大</a> .</i></small>
   <br><br>
-<img src="https://img.shields.io/github/workflow/status/naiba/nezha/Dashboard%20image?label=Dash%20v0.13.17&logo=github&style=for-the-badge">&nbsp;<img src="https://img.shields.io/github/v/release/naiba/nezha?color=brightgreen&label=Agent&style=for-the-badge&logo=github">&nbsp;<img src="https://img.shields.io/github/workflow/status/naiba/nezha/Agent%20release?label=Agent%20CI&logo=github&style=for-the-badge">&nbsp;<img src="https://img.shields.io/badge/Installer-v0.10.2-brightgreen?style=for-the-badge&logo=linux">
+<img src="https://img.shields.io/github/workflow/status/naiba/nezha/Dashboard%20image?label=Dash%20v0.13.18&logo=github&style=for-the-badge">&nbsp;<img src="https://img.shields.io/github/v/release/naiba/nezha?color=brightgreen&label=Agent&style=for-the-badge&logo=github">&nbsp;<img src="https://img.shields.io/github/workflow/status/naiba/nezha/Agent%20release?label=Agent%20CI&logo=github&style=for-the-badge">&nbsp;<img src="https://img.shields.io/badge/Installer-v0.10.2-brightgreen?style=for-the-badge&logo=linux">
   <br>
   <br>
   <p>:trollface: <b>Nezha Monitoring</b> self-hosted lightweight monitoring and operation system. Supports system status, HTTP (SSL certificate change, upcoming expiration, expiration), TCP, Ping <b>monitoring</b> and <b>alerting</b>, execute scheduled tasks and <b>web terminal</b>.</p>

diff --git a/service/singleton/api.go b/service/singleton/api.go
@@ -23,12 +23,13 @@ type CommonResponse struct {
 }
 
 type CommonServerInfo struct {
-	ID      uint64 `json:"id"`
-	Name    string `json:"name"`
-	Tag     string `json:"tag"`
-	IPV4    string `json:"ipv4"`
-	IPV6    string `json:"ipv6"`
-	ValidIP string `json:"valid_ip"`
+	ID         uint64 `json:"id"`
+	Name       string `json:"name"`
+	Tag        string `json:"tag"`
+	LastActive int64  `json:"last_active"`
+	IPV4       string `json:"ipv4"`
+	IPV6       string `json:"ipv6"`
+	ValidIP    string `json:"valid_ip"`
 }
 
 // StatusResponse 服务器状态子结构 包含服务器信息与状态信息
@@ -80,12 +81,13 @@ func (s *ServerAPIService) GetStatusByIDList(idList []uint64) *ServerStatusRespo
 		}
 		ipv4, ipv6, validIP := utils.SplitIPAddr(server.Host.IP)
 		info := CommonServerInfo{
-			ID:      server.ID,
-			Name:    server.Name,
-			Tag:     server.Tag,
-			IPV4:    ipv4,
-			IPV6:    ipv6,
-			ValidIP: validIP,
+			ID:         server.ID,
+			Name:       server.Name,
+			Tag:        server.Tag,
+			LastActive: server.LastActive.Unix(),
+			IPV4:       ipv4,
+			IPV6:       ipv6,
+			ValidIP:    validIP,
 		}
 		res.Result = append(res.Result, &StatusResponse{
 			CommonServerInfo: info,
@@ -119,12 +121,13 @@ func (s *ServerAPIService) GetAllStatus() *ServerStatusResponse {
 		}
 		ipv4, ipv6, validIP := utils.SplitIPAddr(host.IP)
 		info := CommonServerInfo{
-			ID:      v.ID,
-			Name:    v.Name,
-			Tag:     v.Tag,
-			IPV4:    ipv4,
-			IPV6:    ipv6,
-			ValidIP: validIP,
+			ID:         v.ID,
+			Name:       v.Name,
+			Tag:        v.Tag,
+			LastActive: v.LastActive.Unix(),
+			IPV4:       ipv4,
+			IPV6:       ipv6,
+			ValidIP:    validIP,
 		}
 		res.Result = append(res.Result, &StatusResponse{
 			CommonServerInfo: info,
@@ -153,12 +156,13 @@ func (s *ServerAPIService) GetListByTag(tag string) *ServerInfoResponse {
 		}
 		ipv4, ipv6, validIP := utils.SplitIPAddr(host.IP)
 		info := &CommonServerInfo{
-			ID:      v,
-			Name:    ServerList[v].Name,
-			Tag:     ServerList[v].Tag,
-			IPV4:    ipv4,
-			IPV6:    ipv6,
-			ValidIP: validIP,
+			ID:         v,
+			Name:       ServerList[v].Name,
+			Tag:        ServerList[v].Tag,
+			LastActive: ServerList[v].LastActive.Unix(),
+			IPV4:       ipv4,
+			IPV6:       ipv6,
+			ValidIP:    validIP,
 		}
 		res.Result = append(res.Result, info)
 	}
@@ -183,12 +187,13 @@ func (s *ServerAPIService) GetAllList() *ServerInfoResponse {
 		}
 		ipv4, ipv6, validIP := utils.SplitIPAddr(host.IP)
 		info := &CommonServerInfo{
-			ID:      v.ID,
-			Name:    v.Name,
-			Tag:     v.Tag,
-			IPV4:    ipv4,
-			IPV6:    ipv6,
-			ValidIP: validIP,
+			ID:         v.ID,
+			Name:       v.Name,
+			Tag:        v.Tag,
+			LastActive: v.LastActive.Unix(),
+			IPV4:       ipv4,
+			IPV6:       ipv6,
+			ValidIP:    validIP,
 		}
 		res.Result = append(res.Result, info)
 	}

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