mirror of
https://github.com/nezhahq/nezha.git
synced 2025-02-08 12:38:13 -05:00
🐛 修复 IPv6 only 机器取 IP 问题
This commit is contained in:
naiba
parent
7d5ea7ab99
commit
1c35caf0fb
10
README.md
10
README.md
@ -1,14 +1,15 @@
|
|||||||
<div align="center" style="background-color: white">
|
<div align="center" style="background-color: white">
|
||||||
<img width="500" style="max-width:100%" src="https://raw.githubusercontent.com/naiba/nezha/master/resource/static/brand.png" title="哪吒监控">
|
<img width="500" style="max-width:100%" src="https://raw.githubusercontent.com/naiba/nezha/master/resource/static/brand.png" title="哪吒监控">
|
||||||
<br><br>
|
<br><br>
|
||||||
<img src="https://img.shields.io/github/workflow/status/naiba/nezha/Dashboard%20image?label=Dash%20v0.7.1&logo=github&style=for-the-badge"> <img src="https://img.shields.io/github/v/release/naiba/nezha?color=brightgreen&label=Agent&style=for-the-badge&logo=github"> <img src="https://img.shields.io/github/workflow/status/naiba/nezha/Agent%20release?label=Agent%20CI&logo=github&style=for-the-badge"> <img src="https://img.shields.io/badge/Installer-v0.6.0-brightgreen?style=for-the-badge&logo=linux">
|
<img src="https://img.shields.io/github/workflow/status/naiba/nezha/Dashboard%20image?label=Dash%20v0.7.2&logo=github&style=for-the-badge"> <img src="https://img.shields.io/github/v/release/naiba/nezha?color=brightgreen&label=Agent&style=for-the-badge&logo=github"> <img src="https://img.shields.io/github/workflow/status/naiba/nezha/Agent%20release?label=Agent%20CI&logo=github&style=for-the-badge"> <img src="https://img.shields.io/badge/Installer-v0.6.0-brightgreen?style=for-the-badge&logo=linux">
|
||||||
<br>
|
<br>
|
||||||
<p>:trollface: 哪吒监控 一站式轻监控轻运维系统。支持系统状态、HTTP(SSL 证书变更、即将到期、到期)、TCP、Ping 监控报警，命令批量执行和计划任务。</p>
|
<p>:trollface: 哪吒监控 一站式轻监控轻运维系统。支持系统状态、HTTP(SSL 证书变更、即将到期、到期)、TCP、Ping 监控报警，命令批量执行和计划任务。</p>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
\>> 交流论坛：[打杂社区](https://daza.net/c/nezha) (Lemmy)
|
\>> 交流论坛：[打杂社区](https://daza.net/c/nezha) (Lemmy)
|
||||||
|
|
||||||
\>> QQ 交流群：872069346 **加群要求：已搭建好哪吒监控 & 有 2+ 服务器**
|
\>> QQ 交流群：872069346 **加群要求：已搭建好哪吒监控 & 有 2+ 服务器**<br>
|
||||||
|
群友互助/服务器交流，作者不答疑，找 naiba 请至论坛发帖
|
||||||
|
|
||||||
\>> [我们的用户](https://www.google.com/search?q="powered+by+哪吒监控%7C哪吒面板"&filter=0) (Google)
|
\>> [我们的用户](https://www.google.com/search?q="powered+by+哪吒监控%7C哪吒面板"&filter=0) (Google)
|
||||||
|
|
||||||
@ -22,17 +23,18 @@
|
|||||||
|
|
||||||
```shell
|
```shell
|
||||||
curl -sSL https://raw.githubusercontent.com/naiba/nezha/master/script/fetch.sh | bash
|
curl -sSL https://raw.githubusercontent.com/naiba/nezha/master/script/fetch.sh | bash
|
||||||
/opt/nezha/nezha.sh
|
sudo /opt/nezha/nezha.sh
|
||||||
```
|
```
|
||||||
|
|
||||||
国内镜像加速：
|
国内镜像加速：
|
||||||
|
|
||||||
```shell
|
```shell
|
||||||
curl -sSL https://cdn.jsdelivr.net/gh/naiba/nezha@master/script/fetch.sh | CN=true bash
|
curl -sSL https://cdn.jsdelivr.net/gh/naiba/nezha@master/script/fetch.sh | CN=true bash
|
||||||
CN=true /opt/nezha/nezha.sh
|
CN=true sudo /opt/nezha/nezha.sh
|
||||||
```
|
```
|
||||||
|
|
||||||
再次运行仅需:
|
再次运行仅需:
|
||||||
|
|
||||||
```
|
```
|
||||||
/opt/nezha/nezha.sh
|
/opt/nezha/nezha.sh
|
||||||
```
|
```
|
||||||
|
|||||||
@ -108,8 +108,13 @@ func resolveIP(addr string, ipv6 bool) (string, error) {
|
|||||||
}
|
}
|
||||||
m.RecursionDesired = true
|
m.RecursionDesired = true
|
||||||
|
|
||||||
|
dnsServer := "2606:4700:4700::1111"
|
||||||
|
if !ipv6 {
|
||||||
|
dnsServer = "1.1.1.1"
|
||||||
|
}
|
||||||
|
|
||||||
c := new(dns.Client)
|
c := new(dns.Client)
|
||||||
r, _, err := c.Exchange(m, net.JoinHostPort("1.1.1.1", "53"))
|
r, _, err := c.Exchange(m, net.JoinHostPort(dnsServer, "53"))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return "", err
|
return "", err
|
||||||
}
|
}
|
||||||
|
|||||||
146
resource/template/theme-default/home.html
vendored
146
resource/template/theme-default/home.html
vendored
@ -1,40 +1,59 @@
|
|||||||
{{define "theme-default/home"}}
|
{{define "theme-default/home"}} {{template "common/header" .}} {{if ts
|
||||||
{{template "common/header" .}}
|
.CustomCode}} {{.CustomCode|safe}} {{end}} {{template "common/menu" .}}
|
||||||
{{if ts .CustomCode}}
|
|
||||||
{{.CustomCode|safe}}
|
|
||||||
{{end}}
|
|
||||||
{{template "common/menu" .}}
|
|
||||||
<div class="nb-container">
|
<div class="nb-container">
|
||||||
<div class="ui container">
|
<div class="ui container">
|
||||||
<div id="app">
|
<div id="app">
|
||||||
|
|
||||||
<div class="ui styled fluid accordion" v-for="group in groups">
|
<div class="ui styled fluid accordion" v-for="group in groups">
|
||||||
<div class="active title"><i class="dropdown icon"></i>@#(group.Tag!==''?group.Tag:'默认')#@</div>
|
<div class="active title">
|
||||||
|
<i class="dropdown icon"></i>@#(group.Tag!==''?group.Tag:'默认')#@
|
||||||
|
</div>
|
||||||
<div class="active content">
|
<div class="active content">
|
||||||
<div class="ui four stackable status cards">
|
<div class="ui four stackable status cards">
|
||||||
<div v-for='server in group.data' :id="server.ID" class="ui card">
|
<div v-for="server in group.data" :id="server.ID" class="ui card">
|
||||||
<div class="content" v-if='server.Host' style="margin-top: 10px;padding-bottom: 5px">
|
<div
|
||||||
<div class="header"><i :class="server.Host.CountryCode + ' flag'"></i><i
|
class="content"
|
||||||
v-if='server.Host.Platform == "darwin"' class="apple icon"></i><i
|
v-if="server.Host"
|
||||||
v-if='server.Host.Platform == "linux"' class="linux icon"></i><i
|
style="margin-top: 10px; padding-bottom: 5px"
|
||||||
v-if='server.Host.Platform == "windows"' class="windows icon"></i><i
|
>
|
||||||
v-if='server.Host.Platform == "freebsd"' class="freebsd icon"></i>@#server.Name
|
<div class="header">
|
||||||
+
|
<i :class="server.Host.CountryCode + ' flag'"></i
|
||||||
(server.live?'':' [已离线]')#@
|
><i
|
||||||
|
v-if='server.Host.Platform == "darwin"'
|
||||||
|
class="apple icon"
|
||||||
|
></i
|
||||||
|
><i
|
||||||
|
v-if='server.Host.Platform == "linux"'
|
||||||
|
class="linux icon"
|
||||||
|
></i
|
||||||
|
><i
|
||||||
|
v-if='server.Host.Platform == "windows"'
|
||||||
|
class="windows icon"
|
||||||
|
></i
|
||||||
|
><i
|
||||||
|
v-if='server.Host.Platform == "freebsd"'
|
||||||
|
class="freebsd icon"
|
||||||
|
></i
|
||||||
|
>@#server.Name + (server.live?'':' [已离线]')#@
|
||||||
<i class="yellow info circle icon"></i>
|
<i class="yellow info circle icon"></i>
|
||||||
<div class='ui content popup' style="margin-bottom: 0">
|
<div class="ui content popup" style="margin-bottom: 0">
|
||||||
系统：@#server.Host.Platform#@-@#server.Host.PlatformVersion#@ [<span
|
系统：@#server.Host.Platform#@-@#server.Host.PlatformVersion#@
|
||||||
v-if='server.Host.Virtualization'>@#server.Host.Virtualization#@:</span>@#server.Host.Arch#@]<br>
|
[<span v-if="server.Host.Virtualization"
|
||||||
CPU：@#server.Host.CPU#@<br>
|
>@#server.Host.Virtualization#@:</span
|
||||||
硬盘：@#formatByteSize(server.State.DiskUsed)#@/@#formatByteSize(server.Host.DiskTotal)#@<br>
|
>@#server.Host.Arch#@]<br />
|
||||||
内存：@#formatByteSize(server.State.MemUsed)#@/@#formatByteSize(server.Host.MemTotal)#@<br>
|
CPU：@#server.Host.CPU#@<br />
|
||||||
交换：@#formatByteSize(server.State.SwapUsed)#@/@#formatByteSize(server.Host.SwapTotal)#@<br>
|
硬盘：@#formatByteSize(server.State.DiskUsed)#@/@#formatByteSize(server.Host.DiskTotal)#@<br />
|
||||||
|
内存：@#formatByteSize(server.State.MemUsed)#@/@#formatByteSize(server.Host.MemTotal)#@<br />
|
||||||
|
交换：@#formatByteSize(server.State.SwapUsed)#@/@#formatByteSize(server.Host.SwapTotal)#@<br />
|
||||||
流量：<i
|
流量：<i
|
||||||
class='arrow alternate circle down outline icon'></i>@#formatByteSize(server.State.NetInTransfer)#@<i
|
class="arrow alternate circle down outline icon"
|
||||||
class='arrow alternate circle up outline icon'></i>@#formatByteSize(server.State.NetOutTransfer)#@<br>
|
></i
|
||||||
启动：@# formatTimestamp(server.Host.BootTime) #@<br>
|
>@#formatByteSize(server.State.NetInTransfer)#@<i
|
||||||
活动：@# new Date(server.LastActive).toLocaleString() #@<br>
|
class="arrow alternate circle up outline icon"
|
||||||
版本：@#server.Host.Version#@<br>
|
></i
|
||||||
|
>@#formatByteSize(server.State.NetOutTransfer)#@<br />
|
||||||
|
启动：@# formatTimestamp(server.Host.BootTime) #@<br />
|
||||||
|
活动：@# new Date(server.LastActive).toLocaleString() #@<br />
|
||||||
|
版本：@#server.Host.Version#@<br />
|
||||||
</div>
|
</div>
|
||||||
<div class="ui divider" style="margin-bottom: 5px"></div>
|
<div class="ui divider" style="margin-bottom: 5px"></div>
|
||||||
</div>
|
</div>
|
||||||
@ -42,30 +61,46 @@
|
|||||||
<div class="ui grid">
|
<div class="ui grid">
|
||||||
<div class="three wide column">CPU</div>
|
<div class="three wide column">CPU</div>
|
||||||
<div class="thirteen wide column">
|
<div class="thirteen wide column">
|
||||||
<div :class="formatPercent(server.live,server.State.CPU, 100).class">
|
<div
|
||||||
<div class="bar"
|
:class="formatPercent(server.live,server.State.CPU, 100).class"
|
||||||
:style="formatPercent(server.live,server.State.CPU, 100).style">
|
>
|
||||||
<small>@#formatPercent(server.live,server.State.CPU,100).percent#@%</small>
|
<div
|
||||||
|
class="bar"
|
||||||
|
:style="formatPercent(server.live,server.State.CPU, 100).style"
|
||||||
|
>
|
||||||
|
<small
|
||||||
|
>@#formatPercent(server.live,server.State.CPU,100).percent#@%</small
|
||||||
|
>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="three wide column">内存</div>
|
<div class="three wide column">内存</div>
|
||||||
<div class="thirteen wide column">
|
<div class="thirteen wide column">
|
||||||
<div
|
<div
|
||||||
:class="formatPercent(server.live,server.State.MemUsed, server.Host.MemTotal).class">
|
:class="formatPercent(server.live,server.State.MemUsed, server.Host.MemTotal).class"
|
||||||
<div class="bar"
|
>
|
||||||
:style="formatPercent(server.live,server.State.MemUsed, server.Host.MemTotal).style">
|
<div
|
||||||
<small>@#parseInt(server.State?server.State.MemUsed/server.Host.MemTotal*100:0)#@%</small>
|
class="bar"
|
||||||
|
:style="formatPercent(server.live,server.State.MemUsed, server.Host.MemTotal).style"
|
||||||
|
>
|
||||||
|
<small
|
||||||
|
>@#parseInt(server.State?server.State.MemUsed/server.Host.MemTotal*100:0)#@%</small
|
||||||
|
>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="three wide column">交换</div>
|
<div class="three wide column">交换</div>
|
||||||
<div class="thirteen wide column">
|
<div class="thirteen wide column">
|
||||||
<div
|
<div
|
||||||
:class="formatPercent(server.live,server.State.SwapUsed, server.Host.SwapTotal).class">
|
:class="formatPercent(server.live,server.State.SwapUsed, server.Host.SwapTotal).class"
|
||||||
<div class="bar"
|
>
|
||||||
:style="formatPercent(server.live,server.State.SwapUsed, server.Host.SwapTotal).style">
|
<div
|
||||||
<small>@#parseInt(server.State?server.State.SwapUsed/server.Host.SwapTotal*100:0)#@%</small>
|
class="bar"
|
||||||
|
:style="formatPercent(server.live,server.State.SwapUsed, server.Host.SwapTotal).style"
|
||||||
|
>
|
||||||
|
<small
|
||||||
|
>@#parseInt(server.State?server.State.SwapUsed/server.Host.SwapTotal*100:0)#@%</small
|
||||||
|
>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@ -79,16 +114,22 @@
|
|||||||
<div class="three wide column">硬盘</div>
|
<div class="three wide column">硬盘</div>
|
||||||
<div class="thirteen wide column">
|
<div class="thirteen wide column">
|
||||||
<div
|
<div
|
||||||
:class="formatPercent(server.live,server.State.DiskUsed, server.Host.DiskTotal).class">
|
:class="formatPercent(server.live,server.State.DiskUsed, server.Host.DiskTotal).class"
|
||||||
<div class="bar"
|
>
|
||||||
:style="formatPercent(server.live,server.State.DiskUsed, server.Host.DiskTotal).style">
|
<div
|
||||||
<small>@#parseInt(server.State?server.State.DiskUsed/server.Host.DiskTotal*100:0)#@%</small>
|
class="bar"
|
||||||
|
:style="formatPercent(server.live,server.State.DiskUsed, server.Host.DiskTotal).style"
|
||||||
|
>
|
||||||
|
<small
|
||||||
|
>@#parseInt(server.State?server.State.DiskUsed/server.Host.DiskTotal*100:0)#@%</small
|
||||||
|
>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="three wide column">在线</div>
|
<div class="three wide column">在线</div>
|
||||||
<div class="thirteen wide column">
|
<div class="thirteen wide column">
|
||||||
<i class="clock icon"></i>@#secondToDate(server.State.Uptime)#@
|
<i class="clock icon"></i
|
||||||
|
>@#secondToDate(server.State.Uptime)#@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@ -127,7 +168,6 @@
|
|||||||
methods: {
|
methods: {
|
||||||
group() {
|
group() {
|
||||||
this.groups = groupingData(this.data, "Tag")
|
this.groups = groupingData(this.data, "Tag")
|
||||||
console.log(this.groups)
|
|
||||||
},
|
},
|
||||||
formatPercent(live, used, total) {
|
formatPercent(live, used, total) {
|
||||||
const percent = live ? (parseInt(used / total * 100) || 0) : -1
|
const percent = live ? (parseInt(used / total * 100) || 0) : -1
|
||||||
@ -182,35 +222,23 @@
|
|||||||
|
|
||||||
function groupingData(data, filed) {
|
function groupingData(data, filed) {
|
||||||
let map = {};
|
let map = {};
|
||||||
|
|
||||||
let dest = [];
|
let dest = [];
|
||||||
|
|
||||||
data.forEach(item => {
|
data.forEach(item => {
|
||||||
if (!map[item[filed]]) {
|
if (!map[item[filed]]) {
|
||||||
dest.push({
|
dest.push({
|
||||||
[filed]: item[filed],
|
[filed]: item[filed],
|
||||||
|
|
||||||
data: [item]
|
data: [item]
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|
||||||
map[item[filed]] = item;
|
map[item[filed]] = item;
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
dest.forEach(dItem => {
|
dest.forEach(dItem => {
|
||||||
if (dItem[filed] == item[filed]) {
|
if (dItem[filed] == item[filed]) {
|
||||||
dItem.data.push(item);
|
dItem.data.push(item);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
})
|
})
|
||||||
|
|
||||||
return dest;
|
return dest;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
const wsProtocol = window.location.protocol == "https:" ? "wss" : "ws"
|
const wsProtocol = window.location.protocol == "https:" ? "wss" : "ws"
|
||||||
|
|||||||
@ -13,7 +13,7 @@ import (
|
|||||||
pb "github.com/naiba/nezha/proto"
|
pb "github.com/naiba/nezha/proto"
|
||||||
)
|
)
|
||||||
|
|
||||||
var Version = "v0.7.1" // ！！记得修改 README 中的 badge 版本！！
|
var Version = "v0.7.2" // ！！记得修改 README 中的 badge 版本！！
|
||||||
|
|
||||||
const (
|
const (
|
||||||
SnapshotDelay = 3
|
SnapshotDelay = 3
|
||||||
|
|||||||
@ -275,7 +275,7 @@ func (ss *ServiceSentinel) worker() {
|
|||||||
}
|
}
|
||||||
stateStr := getStateStr(upPercent)
|
stateStr := getStateStr(upPercent)
|
||||||
if Conf.Debug {
|
if Conf.Debug {
|
||||||
log.Println(ss.monitors[mh.MonitorID].Target, stateStr, "Agent:", r.Reporter, "Successful:", mh.Successful, "Response:", mh.Data)
|
log.Println("服务监控上报:", ss.monitors[mh.MonitorID].Target, stateStr, "上报者:", r.Reporter, "是否正常:", mh.Successful, "请求输出:", mh.Data)
|
||||||
}
|
}
|
||||||
if stateStr == "故障" || stateStr != ss.lastStatus[mh.MonitorID] {
|
if stateStr == "故障" || stateStr != ss.lastStatus[mh.MonitorID] {
|
||||||
ss.monitorsLock.RLock()
|
ss.monitorsLock.RLock()
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user