diff --git a/README.md b/README.md index af7e87b..95a0edf 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # 哪吒监控 -![GitHub Workflow Status](https://img.shields.io/github/workflow/status/naiba/nezha/Dashboard%20image?label=管理面板%20v0.4.8&logo=github&style=for-the-badge) ![Agent release](https://img.shields.io/github/v/release/naiba/nezha?color=brightgreen&label=Agent&style=for-the-badge&logo=github) ![GitHub Workflow Status](https://img.shields.io/github/workflow/status/naiba/nezha/Agent%20release?label=Agent%20CI&logo=github&style=for-the-badge) ![shell](https://img.shields.io/badge/安装脚本-v0.4.6-brightgreen?style=for-the-badge&logo=linux) +![GitHub Workflow Status](https://img.shields.io/github/workflow/status/naiba/nezha/Dashboard%20image?label=管理面板%20v0.4.9&logo=github&style=for-the-badge) ![Agent release](https://img.shields.io/github/v/release/naiba/nezha?color=brightgreen&label=Agent&style=for-the-badge&logo=github) ![GitHub Workflow Status](https://img.shields.io/github/workflow/status/naiba/nezha/Agent%20release?label=Agent%20CI&logo=github&style=for-the-badge) ![shell](https://img.shields.io/badge/安装脚本-v0.4.6-brightgreen?style=for-the-badge&logo=linux) :trollface: 哪吒监控 一站式轻监控轻运维系统。支持系统状态、HTTP(SSL 证书变更、即将到期、到期)、TCP、Ping 监控报警，命令批量执行和计划任务。 @@ -8,7 +8,7 @@ \>> [我们的用户](https://www.google.com/search?q="powered+by+哪吒"+"监控%7C面板"&filter=0) (Google) -| 默认主题 | DayNight [@JackieSung](https://github.com/JackieSung4ev) | hotaru [@CokeMine](https://github.com/CokeMine) | +| 默认主题 | DayNight [@JackieSung](https://github.com/JackieSung4ev) | hotaru | | ------------------------------------------------------- | -------------------------------------------------------- | ---------------------------------------------------------------------- | | ![首页截图1](https://s3.ax1x.com/2020/12/07/DvTCwD.jpg) | | | diff --git a/resource/template/common/menu.html b/resource/template/common/menu.html index d38f60e..373eb81 100644 --- a/resource/template/common/menu.html +++ b/resource/template/common/menu.html @@ -5,13 +5,16 @@ {{if .IsAdminPage}} - Agent - Service - Cron - 报警 + 资产 + 服务 + 任务 + 报警 + + 设置 + {{else}} - 首页 - 服务状态 + 首页 + 服务状态 {{end}}
@@ -23,9 +26,6 @@
{{if .IsAdminPage}} - - 系统设置 - 返回前台 diff --git a/resource/template/theme-hotaru/viewpassword.html b/resource/template/theme-hotaru/viewpassword.html index d4a41a6..77b4e18 100644 --- a/resource/template/theme-hotaru/viewpassword.html +++ b/resource/template/theme-hotaru/viewpassword.html @@ -1,4 +1,4 @@ -{{define "theme-horaru/viewpassword"}} +{{define "theme-hotaru/viewpassword"}} {{template "common/header" .}} {{if ts .CustomCode}} {{.CustomCode|safe}} diff --git a/script/install.sh b/script/install.sh index 5be9a21..d693912 100755 --- a/script/install.sh +++ b/script/install.sh @@ -149,7 +149,7 @@ 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/download/1.25.0/docker-compose-$(uname -s)-$(uname -m)" >/dev/null 2>&1 && + 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 if [[ $? != 0 ]]; then echo -e "${red}下载脚本失败，请检查本机能否连接 ${GITHUB_URL}${plain}" diff --git a/service/dao/dao.go b/service/dao/dao.go index 11b345d..2a64c3f 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.8" // ！！记得修改 README 重的 badge 版本！！ +var Version = "v0.4.9" // ！！记得修改 README 重的 badge 版本！！ const ( SnapshotDelay = 3 diff --git a/service/rpc/nezha.go b/service/rpc/nezha.go index 04d8010..f6b4316 100644 --- a/service/rpc/nezha.go +++ b/service/rpc/nezha.go @@ -25,8 +25,10 @@ func (s *NezhaHandler) ReportTask(c context.Context, r *pb.TaskResult) (*pb.Rece // SSL 证书报警 var errMsg string if strings.HasPrefix(r.GetData(), "SSL证书错误：") { - // 证书错误提醒 - errMsg = r.GetData() + // 排除超时错误 + if !strings.HasSuffix(r.GetData(), "i/o timeout") { + errMsg = r.GetData() + } } else { var last model.MonitorHistory var newCert = strings.Split(r.GetData(), "|")