fix: 修复 check-alert.sh 假阳性 + collect-business.sh 窗口对齐
- check-alert.sh 新增 Step0 数据新鲜度前置检查:business_metrics 超 30min 过期 → 先告警采集脚本挂了,跳过业务层检测,防止读旧数据乱报推送断档 - collect-business.sh msg_log_hourly 窗口从 1h 改为 15min(和 crontab 频率对齐) - CURR_HOUR 用 10# 算术强制十进制,防 08/09 被解析成 octal
This commit is contained in:
1 parent
2e7504baf8
commit
90be249a72
10 files changed
+829
No files matched your search
Executable
+50
@@ -0,0 +1,50 @@
|
||||
#!/usr/bin/env bash
|
||||
# ============================================================================
|
||||
# OA Monitor · 业务指标采集(每 15 分钟,crontab: */15 * * * *)
|
||||
# v2 修复(2026-10-28):
|
||||
# - msg_log_hourly 实际用 15min 窗口(和 crontab 频率对齐),跨天逻辑简化
|
||||
# - 时间字段正确使用 CREATEDATE varchar(10) + CREATETIME varchar(8)
|
||||
# ecology_message_log 没有 DATETIME 类型的 pushlog_time 字段!
|
||||
# ============================================================================
|
||||
set -u
|
||||
SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
|
||||
source "${SCRIPT_DIR}/../lib/common.sh"
|
||||
|
||||
NOW=$(date +%s)
|
||||
NOW_DATE=$(date '+%Y-%m-%d')
|
||||
|
||||
# --- 1. ecology_message_log 15 分钟增量 ---
|
||||
# v2 简化:15min 窗口几乎不跨天,直接用 CURDATE()
|
||||
MSG_WINDOW=15
|
||||
MSG_COUNT=$(MYSQL_PWD="${DB_PASS}" timeout 30 mysql -h39.100.72.102 -P3306 -uecology ecology -N -e "
|
||||
SELECT COUNT(*) FROM ecology_message_log
|
||||
WHERE CREATEDATE = CURDATE()
|
||||
AND CREATETIME >= DATE_FORMAT(NOW() - INTERVAL ${MSG_WINDOW} MINUTE, '%H:%i:%s');
|
||||
" 2>/dev/null | tail -1)
|
||||
MSG_COUNT=${MSG_COUNT:-0}
|
||||
|
||||
# --- 2. 正在流转的审批数 ---
|
||||
ONGOING=$(MYSQL_PWD="${DB_PASS}" timeout 30 mysql -h39.100.72.102 -P3306 -uecology ecology -N -e "
|
||||
SELECT COUNT(*) FROM workflow_requestbase
|
||||
WHERE CURRENTNODEID > 0 AND (STATUS IS NULL OR STATUS NOT LIKE '%归档%');
|
||||
" 2>/dev/null | tail -1)
|
||||
ONGOING=${ONGOING:-0}
|
||||
|
||||
# --- 3. 今日新建审批数 ---
|
||||
NEW_TODAY=$(MYSQL_PWD="${DB_PASS}" timeout 30 mysql -h39.100.72.102 -P3306 -uecology ecology -N -e "
|
||||
SELECT COUNT(*) FROM workflow_requestbase WHERE CREATEDATE = '${NOW_DATE}';
|
||||
" 2>/dev/null | tail -1)
|
||||
NEW_TODAY=${NEW_TODAY:-0}
|
||||
|
||||
# --- 4. 超时任务数 ---
|
||||
OVERDUE=$(MYSQL_PWD="${DB_PASS}" timeout 30 mysql -h39.100.72.102 -P3306 -uecology ecology -N -e "
|
||||
SELECT COUNT(*) FROM workflow_requestlog
|
||||
WHERE timeout = 1 AND operatedate >= DATE_SUB(CURDATE(), INTERVAL 1 DAY);
|
||||
" 2>/dev/null | tail -1)
|
||||
OVERDUE=${OVERDUE:-0}
|
||||
|
||||
sqlite_exec "INSERT INTO business_metrics VALUES (
|
||||
${NOW}, ${MSG_COUNT}, 0.0, ${ONGOING}, ${OVERDUE}
|
||||
);"
|
||||
|
||||
log_info "[BIZ] ✅ msg_15min=${MSG_COUNT} ongoing=${ONGOING} new_today=${NEW_TODAY} overdue=${OVERDUE}"
|
||||
Reference in new issue
Block a user