diff --git a/README.md b/README.md
index 95a0edf..39f24e7 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
# 哪吒监控
-   
+   
:trollface: 哪吒监控 一站式轻监控轻运维系统。支持系统状态、HTTP(SSL 证书变更、即将到期、到期)、TCP、Ping 监控报警，命令批量执行和计划任务。
diff --git a/cmd/playground/main.go b/cmd/playground/main.go
index 388e53c..2baeaaa 100644
--- a/cmd/playground/main.go
+++ b/cmd/playground/main.go
@@ -12,15 +12,17 @@ import (
"github.com/go-ping/ping"
"github.com/naiba/nezha/pkg/utils"
+ "github.com/shirou/gopsutil/v3/cpu"
"github.com/shirou/gopsutil/v3/disk"
+ "github.com/shirou/gopsutil/v3/host"
)
func main() {
// icmp()
// tcpping()
// httpWithSSLInfo()
- // diskinfo()
- cmdExec()
+ sysinfo()
+ // cmdExec()
}
func tcpping() {
@@ -34,8 +36,26 @@ func tcpping() {
fmt.Println(time.Now().Sub(start).Microseconds(), float32(time.Now().Sub(start).Microseconds())/1000.0)
}
-func diskinfo() {
- // 硬盘信息
+func sysinfo() {
+ hi, _ := host.Info()
+ var cpuType string
+ if hi.VirtualizationSystem != "" {
+ cpuType = "Virtual"
+ } else {
+ cpuType = "Physical"
+ }
+ cpuModelCount := make(map[string]int)
+ ci, _ := cpu.Info()
+ for i := 0; i < len(ci); i++ {
+ cpuModelCount[ci[i].ModelName]++
+ }
+ var cpus []string
+ for model, count := range cpuModelCount {
+ cpus = append(cpus, fmt.Sprintf("%s %d %s Core", model, count, cpuType))
+ }
+ log.Println(cpus)
+ os.Exit(0)
+ // 硬盘信息，不使用的原因是会重复统计 Linux、Mac
dparts, _ := disk.Partitions(false)
for _, part := range dparts {
u, _ := disk.Usage(part.Mountpoint)
diff --git a/model/host.go b/model/host.go
index 3e1ebcb..6e4431e 100644
--- a/model/host.go
+++ b/model/host.go
@@ -1,8 +1,6 @@
package model
import (
- "fmt"
-
pb "github.com/naiba/nezha/proto"
)
@@ -85,22 +83,10 @@ func (h *Host) PB() *pb.Host {
}
func PB2Host(h *pb.Host) Host {
-
- cpuCount := make(map[string]int, 0)
- cpus := h.GetCpu()
- for _, u := range cpus {
- cpuCount[u]++
- }
-
- var distCpu []string
- for u, num := range cpuCount {
- distCpu = append(distCpu, fmt.Sprintf("%sx%d", u, num))
- }
-
return Host{
Platform: h.GetPlatform(),
PlatformVersion: h.GetPlatformVersion(),
- CPU: distCpu,
+ CPU: h.GetCpu(),
MemTotal: h.GetMemTotal(),
DiskTotal: h.GetDiskTotal(),
SwapTotal: h.GetSwapTotal(),
diff --git a/model/server.go b/model/server.go
index f759d96..9dc5bf9 100644
--- a/model/server.go
+++ b/model/server.go
@@ -1,6 +1,7 @@
package model
import (
+ "encoding/json"
"fmt"
"html/template"
"time"
@@ -25,5 +26,10 @@ type Server struct {
}
func (s Server) Marshal() template.JS {
- return template.JS(fmt.Sprintf(`{"ID":%d,"Name":"%s","Secret":"%s","DisplayIndex":%d,"Tag":"%s","Note":"%s"}`, s.ID, s.Name, s.Secret, s.DisplayIndex, s.Tag, s.Note))
+ name, _ := json.Marshal(s.Name)
+ tag, _ := json.Marshal(s.Tag)
+ note, _ := json.Marshal(s.Note)
+ secret, _ := json.Marshal(s.Secret)
+ return template.JS(fmt.Sprintf(`{"ID":%d,"Name":%s,"Secret":%s,"DisplayIndex":%d,"Tag":%s,"Note":%s}`,
+ s.ID, name, secret, s.DisplayIndex, tag, note))
}
diff --git a/model/server_test.go b/model/server_test.go
new file mode 100644
index 0000000..6fa5abd
--- /dev/null
+++ b/model/server_test.go
@@ -0,0 +1,27 @@
+package model
+
+import (
+ "encoding/json"
+ "testing"
+
+ "github.com/stretchr/testify/assert"
+)
+
+func TestServerMarshal(t *testing.T) {
+ patterns := []string{
+ "asd > asd",
+ "asd \" asd",
+ "asd } asd",
+ }
+
+ for i := 0; i < len(patterns); i++ {
+ server := Server{
+ Name: patterns[i],
+ Tag: patterns[i],
+ }
+ serverStr := string(server.Marshal())
+ var serverRestore Server
+ assert.Nil(t, json.Unmarshal([]byte(serverStr), &serverRestore))
+ assert.Equal(t, server, serverRestore)
+ }
+}
diff --git a/resource/template/common/menu.html b/resource/template/common/menu.html
index 373eb81..063463d 100644
--- a/resource/template/common/menu.html
+++ b/resource/template/common/menu.html
@@ -40,7 +40,7 @@
{{else}}
- 登录
+ 登录
{{end}}
diff --git a/script/install.sh b/script/install.sh
index d693912..be17ff5 100755
--- a/script/install.sh
+++ b/script/install.sh
@@ -10,7 +10,7 @@ NZ_BASE_PATH="/opt/nezha"
NZ_DASHBOARD_PATH="${NZ_BASE_PATH}/dashboard"
NZ_AGENT_PATH="${NZ_BASE_PATH}/agent"
NZ_AGENT_SERVICE="/etc/systemd/system/nezha-agent.service"
-NZ_VERSION="v0.4.6"
+NZ_VERSION="v0.4.7"
red='\033[0;31m'
green='\033[0;32m'
@@ -149,12 +149,12 @@ install_dashboard() {
command -v docker-compose >/dev/null 2>&1
if [[ $? != 0 ]]; then
echo -e "正在安装 Docker Compose"
- wget -O /usr/local/bin/docker-compose "https://${GITHUB_URL}/docker/compose/releases/latest/download/docker-compose-$(uname -s)-$(uname -m)" >/dev/null 2>&1 &&
- chmod +x /usr/local/bin/docker-compose
+ wget -O /usr/local/bin/docker-compose "https://${GITHUB_URL}/docker/compose/releases/latest/download/docker-compose-$(uname -s)-$(uname -m)" >/dev/null 2>&1
if [[ $? != 0 ]]; then
echo -e "${red}下载脚本失败，请检查本机能否连接 ${GITHUB_URL}${plain}"
return 0
fi
+ chmod +x /usr/local/bin/docker-compose
echo -e "${green}Docker Compose${plain} 安装成功"
fi
diff --git a/service/dao/dao.go b/service/dao/dao.go
index 2a64c3f..41d9a9b 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.4.9" // ！！记得修改 README 重的 badge 版本！！
+var Version = "v0.4.11" // ！！记得修改 README 重的 badge 版本！！
const (
SnapshotDelay = 3
diff --git a/service/monitor/monitor.go b/service/monitor/monitor.go
index 16ad4d0..11a7bd9 100644
--- a/service/monitor/monitor.go
+++ b/service/monitor/monitor.go
@@ -28,10 +28,20 @@ var netInSpeed, netOutSpeed, netInTransfer, netOutTransfer, lastUpdate uint64
func GetHost() *model.Host {
hi, _ := host.Info()
- var cpus []string
+ var cpuType string
+ if hi.VirtualizationSystem != "" {
+ cpuType = "Virtual"
+ } else {
+ cpuType = "Physical"
+ }
+ cpuModelCount := make(map[string]int)
ci, _ := cpu.Info()
for i := 0; i < len(ci); i++ {
- cpus = append(cpus, fmt.Sprintf("%v-%vC%vT", ci[i].ModelName, ci[i].Cores, ci[i].Stepping))
+ cpuModelCount[ci[i].ModelName]++
+ }
+ var cpus []string
+ for model, count := range cpuModelCount {
+ cpus = append(cpus, fmt.Sprintf("%s %d %s Core", model, count, cpuType))
}
mv, _ := mem.VirtualMemory()
ms, _ := mem.SwapMemory()
@@ -47,7 +57,11 @@ func GetHost() *model.Host {
if err == nil {
defer resp.Body.Close()
body, _ := ioutil.ReadAll(resp.Body)
- ip.IP = fmt.Sprintf("ip(v4: %s, v6: %s)", ip.IP, body)
+ if ip.IP == "" {
+ ip.IP = string(body)
+ } else {
+ ip.IP = fmt.Sprintf("ip(v4: %s, v6: %s)", ip.IP, body)
+ }
}
return &model.Host{
Platform: hi.OS,
diff --git a/service/rpc/nezha.go b/service/rpc/nezha.go
index f6b4316..2546ae5 100644
--- a/service/rpc/nezha.go
+++ b/service/rpc/nezha.go
@@ -26,7 +26,7 @@ func (s *NezhaHandler) ReportTask(c context.Context, r *pb.TaskResult) (*pb.Rece
var errMsg string
if strings.HasPrefix(r.GetData(), "SSL证书错误：") {
// 排除超时错误
- if !strings.HasSuffix(r.GetData(), "i/o timeout") {
+ if !strings.HasSuffix(r.GetData(), "timeout") {
errMsg = r.GetData()
}
} else {