From e9776b0e69dab920f0cc0b209911b227210e9aef Mon Sep 17 00:00:00 2001
From: cppla <i@cpp.la>
Date: Wed, 18 Sep 2024 10:07:43 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=87=8D=E8=A6=81=E8=8A=82?=
 =?UTF-8?q?=E7=82=B9=E4=B8=A2=E5=8C=85=E7=8E=87=E7=9B=91=E6=8E=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md          | 24 ++++++++++++++++++------
 server/config.json |  6 ++++++
 2 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 4bd466c..3fb1974 100644
--- a/README.md
+++ b/README.md
@@ -93,10 +93,16 @@ cd ServerStatus/server && make
 	],
 	"monitors": [
 		{
-			"name": "监测网站以及MySQL、Redis，默认为七天在线率",
+			"name": "监测网站，默认为一天在线率",
 			"host": "https://www.baidu.com",
-			"interval": 60,
+			"interval": 300,
 			"type": "https"
+		},
+		{
+			"name": "监测tcp服务端口",
+			"host": "114.114.114.114:53",
+			"interval": 300,
+			"type": "tcp"
 		}
 	],
 	"watchdog":
@@ -108,8 +114,8 @@ cd ServerStatus/server && make
 			"callback": "https://yourSMSurl"
 		},
 		{
-                        "name": "服务器内存使用率过高监控",
-                        "rule": "(memory_used/memory_total)*100>90",
+                        "name": "服务器内存使用率过高监控，排除小于1G的机器",
+                        "rule": "(memory_used/memory_total)*100>90&memory_total>1048576",
                         "interval": 600,
                         "callback": "https://yourSMSurl"
                 },
@@ -120,8 +126,8 @@ cd ServerStatus/server && make
                         "callback": "https://yourSMSurl"
                 },
 		{
-                        "name": "DDOS和CC攻击监控",
-                        "rule": "tcp_count>600",
+                        "name": "DDOS和CC攻击监控，限制甲骨文机器",
+                        "rule": "tcp_count>600&type='Oracle'",
                         "interval": 300,
                         "callback": "https://yourSMSurl"
                 },
@@ -137,6 +143,12 @@ cd ServerStatus/server && make
 			"interval": 3600,
 			"callback": "https://yourSMSurl"
 		},
+		{
+			"name": "重要线路丢包率过高检查",
+			"rule": "(ping_10010>5|ping_189>5|ping_10086>5)&(host='sgp'|host='qqhk'|host='hk-21-x'|host='hk-31-x')",
+			"interval": 600,
+			"callback": "https://yourSMSurl"
+		},
 		{
 			"name": "你可以组合任何已知字段的表达式",
 			"rule": "(hdd_used/hdd_total)*100>95",
diff --git a/server/config.json b/server/config.json
index 37daf8e..58d011a 100644
--- a/server/config.json
+++ b/server/config.json
@@ -89,6 +89,12 @@
 			"interval": 3600,
 			"callback": "https://yourSMSurl"
 		},
+		{
+			"name": "packet loss rate warning",
+			"rule": "(ping_10010>5|ping_189>5|ping_10086>5)&(host='sgp'|host='qqhk'|host='hk-21-x'|host='hk-31-x')",
+			"interval": 3600,
+			"callback": "https://yourSMSurl"
+		},
 		{
 			"name": "you can parse an expression combining any known field",
 			"rule": "load_5>3",