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
+53
@@ -0,0 +1,53 @@
|
||||
#!/usr/bin/env bash
|
||||
# ============================================================================
|
||||
# OA Monitor · 基础设施层采集(每 30 秒)
|
||||
# 在 DSH 上直接执行 docker / df / du
|
||||
# ============================================================================
|
||||
set -u
|
||||
SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
|
||||
source "${SCRIPT_DIR}/../lib/common.sh"
|
||||
|
||||
NOW=$(date +%s)
|
||||
DOCKER_ROOT="/var/lib/docker"
|
||||
|
||||
# ---- Docker daemon + 容器数 ----
|
||||
CONTAINER_COUNT=$(docker ps -q 2>/dev/null | wc -l | tr -d ' ')
|
||||
if [[ "${CONTAINER_COUNT}" =~ ^[0-9]+$ ]] && [[ ${CONTAINER_COUNT} -ge 0 ]]; then
|
||||
DOCKER_OK=1
|
||||
else
|
||||
DOCKER_OK=0
|
||||
CONTAINER_COUNT=0
|
||||
fi
|
||||
|
||||
# ---- Docker root 写入量 ----
|
||||
# docker_root_write_mb 字段存储 "上一次 du overlay2 的总大小 MB"
|
||||
# 告警脚本里直接看 "本次 du - 上次存的值" 的差值
|
||||
PREV_TOTAL_MB=$(sqlite_exec "SELECT COALESCE(docker_root_write_mb, 0) FROM infra_metrics ORDER BY ts DESC LIMIT 1;")
|
||||
CURRENT_TOTAL_MB=$(du -sm "${DOCKER_ROOT}/overlay2" 2>/dev/null | cut -f1 | tr -d ' ')
|
||||
PREV_TOTAL_MB=${PREV_TOTAL_MB:-0}
|
||||
CURRENT_TOTAL_MB=${CURRENT_TOTAL_MB:-0}
|
||||
|
||||
# 计算增量(日志用)
|
||||
DELTA=0
|
||||
if [[ "${PREV_TOTAL_MB}" =~ ^[0-9]+$ ]] && [[ ${CURRENT_TOTAL_MB} -gt ${PREV_TOTAL_MB} ]]; then
|
||||
DELTA=$(( CURRENT_TOTAL_MB - PREV_TOTAL_MB ))
|
||||
elif [[ ! "${PREV_TOTAL_MB}" =~ ^[0-9]+$ ]]; then
|
||||
DELTA=-1 # 首次采,设 -1 表示"无对比"
|
||||
fi
|
||||
|
||||
# ---- 磁盘 / inode / load ----
|
||||
DISK_PCT=$(df / | tail -1 | awk '{print $5}' | tr -d '%')
|
||||
INODE_PCT=$(df -i / | tail -1 | awk '{print $5}' | tr -d '%')
|
||||
LOADAVG=$(cat /proc/loadavg | awk '{print $1}')
|
||||
DISK_PCT=${DISK_PCT:-0}
|
||||
INODE_PCT=${INODE_PCT:-0}
|
||||
LOADAVG=${LOADAVG:-0}
|
||||
|
||||
# 写 SQLite(把"当前总大小 MB"存起来,下次算差值)
|
||||
# 注意 docker_root_write_mb 存的是整数 MB(du -sm 输出本身就是整数,.0 是 sqlite REAL 类型加的)
|
||||
sqlite_exec "INSERT INTO infra_metrics VALUES (
|
||||
${NOW}, ${DOCKER_OK}, ${CONTAINER_COUNT}, CAST(${CURRENT_TOTAL_MB} AS INTEGER),
|
||||
${DISK_PCT}, ${INODE_PCT}, ${LOADAVG}
|
||||
);"
|
||||
|
||||
log_info "[INFRA] ✅ docker_ok=${DOCKER_OK} containers=${CONTAINER_COUNT} root_overlay2=${CURRENT_TOTAL_MB}MB delta=${DELTA}MB disk=${DISK_PCT}% inode=${INODE_PCT}% loadavg=${LOADAVG}"
|
||||
Reference in new issue
Block a user