💬 统一措辞
This commit is contained in:
		
							parent
							
								
									75a255101f
								
							
						
					
					
						commit
						355c625414
					
				@ -1,7 +1,7 @@
 | 
				
			|||||||
<div align="center">
 | 
					<div align="center">
 | 
				
			||||||
  <img width="500" style="max-width:100%" src="resource/static/brand.png" title="哪吒监控">
 | 
					  <img width="500" style="max-width:100%" src="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.8.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.1-brightgreen?style=for-the-badge&logo=linux">
 | 
					<img src="https://img.shields.io/github/workflow/status/naiba/nezha/Dashboard%20image?label=Dash%20v0.8.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.1-brightgreen?style=for-the-badge&logo=linux">
 | 
				
			||||||
  <br>
 | 
					  <br>
 | 
				
			||||||
  <br>
 | 
					  <br>
 | 
				
			||||||
  <p>:trollface: <b>哪吒监控</b> 一站式轻监控轻运维系统。支持系统状态、HTTP(SSL 证书变更、即将到期、到期)、TCP、Ping 监控报警,命令批量执行和计划任务。</p>	
 | 
					  <p>:trollface: <b>哪吒监控</b> 一站式轻监控轻运维系统。支持系统状态、HTTP(SSL 证书变更、即将到期、到期)、TCP、Ping 监控报警,命令批量执行和计划任务。</p>	
 | 
				
			||||||
@ -102,9 +102,9 @@ URL 里面也可放置占位符,请求时会进行简单的字符串替换。
 | 
				
			|||||||
  - offline:不支持 Min/Max 参数
 | 
					  - offline:不支持 Min/Max 参数
 | 
				
			||||||
- Duration:持续秒数,监控比较简陋,取持续时间内的 70% 采样结果
 | 
					- Duration:持续秒数,监控比较简陋,取持续时间内的 70% 采样结果
 | 
				
			||||||
- Cover `[{"Type":"offline","Duration":10, "Cover": 0, "Ignore":{"5": true}}]`
 | 
					- Cover `[{"Type":"offline","Duration":10, "Cover": 0, "Ignore":{"5": true}}]`
 | 
				
			||||||
  - `0` 监控所有,通过 `Ignore` 忽略指定服务器
 | 
					  - `0` 监控所有,通过 `Ignore` 忽略特定服务器
 | 
				
			||||||
  - `1` 忽略所有,通过 `Ignore` 监控指定服务器
 | 
					  - `1` 忽略所有,通过 `Ignore` 监控特定服务器
 | 
				
			||||||
- Ignore: `{"1": true, "2":false}` 指定服务器,搭配 `Cover` 使用
 | 
					- Ignore: `{"1": true, "2":false}` 特定服务器,搭配 `Cover` 使用
 | 
				
			||||||
</details>
 | 
					</details>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
<details>
 | 
					<details>
 | 
				
			||||||
 | 
				
			|||||||
							
								
								
									
										5
									
								
								go.sum
									
									
									
									
									
								
							
							
						
						
									
										5
									
								
								go.sum
									
									
									
									
									
								
							@ -89,7 +89,7 @@ github.com/gin-gonic/gin v1.6.3/go.mod h1:75u5sXoLsGZoRN5Sgbi1eraJ4GU3++wFwWzhwv
 | 
				
			|||||||
github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
 | 
					github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
 | 
				
			||||||
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
 | 
					github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
 | 
				
			||||||
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
 | 
					github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
 | 
				
			||||||
github.com/go-kit/kit v0.8.1/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
 | 
					github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
 | 
				
			||||||
github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
 | 
					github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
 | 
				
			||||||
github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
 | 
					github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
 | 
				
			||||||
github.com/go-ole/go-ole v1.2.4 h1:nNBDSCOigTSiarFpYE9J/KtEA1IOW4CNeqT9TQDqCxI=
 | 
					github.com/go-ole/go-ole v1.2.4 h1:nNBDSCOigTSiarFpYE9J/KtEA1IOW4CNeqT9TQDqCxI=
 | 
				
			||||||
@ -259,6 +259,7 @@ github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaR
 | 
				
			|||||||
github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ=
 | 
					github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ=
 | 
				
			||||||
github.com/pelletier/go-toml v1.2.0 h1:T5zMGML61Wp+FlcbWjRDT7yAxhJNAiPPLOFECq181zc=
 | 
					github.com/pelletier/go-toml v1.2.0 h1:T5zMGML61Wp+FlcbWjRDT7yAxhJNAiPPLOFECq181zc=
 | 
				
			||||||
github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
 | 
					github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
 | 
				
			||||||
 | 
					github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 | 
				
			||||||
github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 | 
					github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 | 
				
			||||||
github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 | 
					github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 | 
				
			||||||
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 | 
					github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 | 
				
			||||||
@ -524,7 +525,7 @@ golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1N
 | 
				
			|||||||
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 | 
					golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 | 
				
			||||||
google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE=
 | 
					google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE=
 | 
				
			||||||
google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M=
 | 
					google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M=
 | 
				
			||||||
google.golang.org/api v0.8.1/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg=
 | 
					google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg=
 | 
				
			||||||
google.golang.org/api v0.9.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg=
 | 
					google.golang.org/api v0.9.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg=
 | 
				
			||||||
google.golang.org/api v0.13.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
 | 
					google.golang.org/api v0.13.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
 | 
				
			||||||
google.golang.org/api v0.14.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
 | 
					google.golang.org/api v0.14.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
 | 
				
			||||||
 | 
				
			|||||||
							
								
								
									
										6
									
								
								resource/template/component/cron.html
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										6
									
								
								resource/template/component/cron.html
									
									
									
									
										vendored
									
									
								
							@ -19,12 +19,12 @@
 | 
				
			|||||||
            <div class="field">
 | 
					            <div class="field">
 | 
				
			||||||
                <label>覆盖范围</label>
 | 
					                <label>覆盖范围</label>
 | 
				
			||||||
                <select name="Cover" class="ui fluid dropdown">
 | 
					                <select name="Cover" class="ui fluid dropdown">
 | 
				
			||||||
                    <option value="0">忽略所有,仅通过指定服务器执行</option>
 | 
					                    <option value="0">忽略所有,仅通过特定服务器执行</option>
 | 
				
			||||||
                    <option value="1">覆盖所有,仅指定服务器不执行</option>
 | 
					                    <option value="1">覆盖所有,仅特定服务器不执行</option>
 | 
				
			||||||
                </select>
 | 
					                </select>
 | 
				
			||||||
            </div>
 | 
					            </div>
 | 
				
			||||||
            <div class="field">
 | 
					            <div class="field">
 | 
				
			||||||
                <label>指定服务器</label>
 | 
					                <label>特定服务器</label>
 | 
				
			||||||
                <div class="ui fluid multiple servers search selection dropdown">
 | 
					                <div class="ui fluid multiple servers search selection dropdown">
 | 
				
			||||||
                    <input type="hidden" name="ServersRaw">
 | 
					                    <input type="hidden" name="ServersRaw">
 | 
				
			||||||
                    <i class="dropdown icon"></i>
 | 
					                    <i class="dropdown icon"></i>
 | 
				
			||||||
 | 
				
			|||||||
							
								
								
									
										6
									
								
								resource/template/component/monitor.html
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										6
									
								
								resource/template/component/monitor.html
									
									
									
									
										vendored
									
									
								
							@ -27,12 +27,12 @@
 | 
				
			|||||||
      <div class="field">
 | 
					      <div class="field">
 | 
				
			||||||
        <label>覆盖范围</label>
 | 
					        <label>覆盖范围</label>
 | 
				
			||||||
        <select name="Cover" class="ui fluid dropdown">
 | 
					        <select name="Cover" class="ui fluid dropdown">
 | 
				
			||||||
          <option value="0">覆盖所有,仅忽略指定服务器</option>
 | 
					          <option value="0">覆盖所有,仅忽略特定服务器</option>
 | 
				
			||||||
          <option value="1">忽略所有,仅通过指定服务器请求</option>
 | 
					          <option value="1">忽略所有,仅通过特定服务器请求</option>
 | 
				
			||||||
        </select>
 | 
					        </select>
 | 
				
			||||||
      </div>
 | 
					      </div>
 | 
				
			||||||
      <div class="field">
 | 
					      <div class="field">
 | 
				
			||||||
        <label>指定服务器</label>
 | 
					        <label>特定服务器</label>
 | 
				
			||||||
        <div class="ui fluid multiple servers search selection dropdown">
 | 
					        <div class="ui fluid multiple servers search selection dropdown">
 | 
				
			||||||
          <input type="hidden" name="SkipServersRaw" />
 | 
					          <input type="hidden" name="SkipServersRaw" />
 | 
				
			||||||
          <i class="dropdown icon"></i>
 | 
					          <i class="dropdown icon"></i>
 | 
				
			||||||
 | 
				
			|||||||
@ -19,7 +19,7 @@
 | 
				
			|||||||
                    <th>命令</th>
 | 
					                    <th>命令</th>
 | 
				
			||||||
                    <th>成功推送</th>
 | 
					                    <th>成功推送</th>
 | 
				
			||||||
                    <th>覆盖范围</th>
 | 
					                    <th>覆盖范围</th>
 | 
				
			||||||
                    <th>排除服务器</th>
 | 
					                    <th>特定服务器</th>
 | 
				
			||||||
                    <th>最后执行</th>
 | 
					                    <th>最后执行</th>
 | 
				
			||||||
                    <th>最后结果</th>
 | 
					                    <th>最后结果</th>
 | 
				
			||||||
                    <th>管理</th>
 | 
					                    <th>管理</th>
 | 
				
			||||||
 | 
				
			|||||||
@ -16,7 +16,7 @@
 | 
				
			|||||||
          <th>名称</th>
 | 
					          <th>名称</th>
 | 
				
			||||||
          <th>目标</th>
 | 
					          <th>目标</th>
 | 
				
			||||||
          <th>覆盖范围</th>
 | 
					          <th>覆盖范围</th>
 | 
				
			||||||
          <th>排除服务器</th>
 | 
					          <th>特定服务器</th>
 | 
				
			||||||
          <th>类型</th>
 | 
					          <th>类型</th>
 | 
				
			||||||
          <th>通知</th>
 | 
					          <th>通知</th>
 | 
				
			||||||
          <th>管理</th>
 | 
					          <th>管理</th>
 | 
				
			||||||
 | 
				
			|||||||
@ -13,7 +13,7 @@ import (
 | 
				
			|||||||
	pb "github.com/naiba/nezha/proto"
 | 
						pb "github.com/naiba/nezha/proto"
 | 
				
			||||||
)
 | 
					)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
var Version = "v0.8.1" // !!记得修改 README 中的 badge 版本!!
 | 
					var Version = "v0.8.2" // !!记得修改 README 中的 badge 版本!!
 | 
				
			||||||
 | 
					
 | 
				
			||||||
const (
 | 
					const (
 | 
				
			||||||
	SnapshotDelay = 3
 | 
						SnapshotDelay = 3
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user