Skip to content

Commit eb56666

Browse files
committed
fix(monit-query,skill): "datasource" names two unrelated surfaces — say which
Two leftovers from splitting the monit card. The `monit-query` group description still advertised `diagnose/rows support prometheus|victorialogs|loki|mysql`. `diagnose` never accepted mysql — it pairs `log_patterns` with loki/victorialogs and `metric_trends` with prometheus — and `rows` has been deprecated and hidden since `data` replaced it, so the group blurb was pointing at a command the help output no longer lists. The bigger one: this product uses "datasource" for two unrelated things. `POST /monit/datasource/*` is the Flashmonit config surface — the systems Flashmonit queries. `POST /datasource/*` is On-call, holding IM-integration plumbing, and On-call's *integrations* — what actually receives alerts into a channel — are a third surface again. Giving datasources their own card made this worse, because the router now hands the bare word "数据源 / datasource" straight to Flashmonit, and an On-call integration question matches that row. So the card says which one it is, in the first paragraph a reader sees, and names where the other two live. The router row is qualified the same way, and the channel row picks up 告警来源 so the On-call sense has a keyword of its own. The index card carries a one-line version for readers who land there first.
1 parent 14ddcdf commit eb56666

4 files changed

Lines changed: 7 additions & 5 deletions

File tree

internal/cli/monit_query.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
)
1313

1414
func newMonitQueryCmd() *cobra.Command {
15-
cmd := newGroupCmd("monit-query", "Probe monit-backed datasources (9 types via data; diagnose/rows support prometheus|victorialogs|loki|mysql)")
15+
cmd := newGroupCmd("monit-query", "Probe monit-backed datasources (9 types via data; diagnose: loki|victorialogs log patterns, prometheus metric trends)")
1616
cmd.AddCommand(newMonitQueryDiagnoseCmd())
1717
cmd.AddCommand(newMonitQueryDataCmd())
1818
cmd.AddCommand(newMonitQueryRowsCmd())

skills/flashduty/SKILL.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,13 +71,13 @@ Some asks span several commands. For those the skill ships a script that fetches
7171
| change / 变更 / deployment 部署 / release 发布 / correlated change 变更关联 / what changed | **`reference/change.md`** |
7272
| monitor / 监控 / inspection 巡检 — unsure which Flashmonit surface | **`reference/monit.md`** (index; routes to the four below) |
7373
| alert rule 告警规则 / rule config 规则配置 / rule folder 规则文件夹 / rule export 规则导出 | **`reference/monit-rule.md`** |
74-
| datasource 数据源 / connect a datasource 连接数据源 / SLS project / logstore | **`reference/monit-datasource.md`** |
74+
| datasource 数据源 = a system Flashmonit queries (Prometheus / Loki / SQL / SLS) / connect a datasource 连接数据源 / SLS project / logstore | **`reference/monit-datasource.md`** |
7575
| service map 服务地图 / topology 拓扑 / service dependencies 服务依赖 / agent fleet 探针队列 | **`reference/monit-servicemap.md`** |
7676
| store ruleset 规则集 / 规则模板库 | **`reference/monit-ruleset.md`** |
7777
| automation / 自动化 / 定时 AI SRE / scheduled AI task / daily brief / weekly report / webhook trigger / POST trigger / chat-created automation | **`reference/automation.md`** |
7878
| metric/log query / 指标查询 / 日志查询 / PromQL / LogsQL / SQL / trend 趋势 / log clustering 日志聚类 / datasource RCA 数据源排查 | **`reference/monit-query.md`** |
7979
| host diagnostics / 主机诊断 / on-box / process 进程 / load 负载 / lock 锁 / slow query 慢查询 / mysql / reachability 可达性 | **`reference/monit-agent.md`** |
80-
| channel / 协作空间 / collaboration space / 频道 / integration 集成 / alert grouping 告警分组 | **`reference/channel.md`** |
80+
| channel / 协作空间 / collaboration space / 频道 / integration 集成 / 告警来源 alert source / alert grouping 告警分组 | **`reference/channel.md`** |
8181
| dispatch rule 分派策略 / 分派规则 / escalation rule 升级规则 / notify layers 通知层级 / who gets paged | **`reference/escalation.md`** |
8282
| silence 静默 / 屏蔽 / inhibit 抑制 / drop rule 丢弃 / noise reduction 降噪 / maintenance silence 维护窗口静默 | **`reference/noise.md`** |
8383
| enrichment / 数据加工 / 富化 / label mapping 字段映射 / extraction 提取 / mapping schema 集成 schema | **`reference/enrichment.md`** |

skills/flashduty/reference/monit-datasource.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@ Prereq: `SKILL.md` + `reference/monit.md` read. Datasources are what every other
44

55
## Route here when
66

7-
"数据源 / 连接数据源 / SLS project / logstore" or "datasource / connect a datasource / SLS discovery" → this card.
7+
"数据源 / 连接数据源 / SLS project / logstore" or "datasource / connect a datasource / SLS discovery" → this card, **when the datasource is something Flashmonit queries** (Prometheus, Loki, VictoriaLogs, SQL engines, SLS).
8+
9+
**"Datasource" is two unrelated things in this product — check which one the user means.** This card is `POST /monit/datasource/*`: the Flashmonit config surface, i.e. the systems Flashmonit *queries*. On-call has its own, older use of the word: the top-level `datasource` group is `POST /datasource/*` and holds IM-integration plumbing (`fduty datasource im-war-room-enabled-list`, `fduty datasource im-person-try-link`), while the On-call **integrations** that *receive* alerts into a channel live in `reference/channel.md`. So 接入告警 / 集成 / 告警来源 → On-call, not here; "连一个 Prometheus / Loki / MySQL 上来查" → here.
810

911
**Mutating:** `datasource-create`, `datasource-update`, `datasource-delete` — confirm before running. **`datasource-delete` is irreversible**; confirm the target with `datasource-info` first.
1012

skills/flashduty/reference/monit.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Prereq: `SKILL.md` read. Flashmonit is five separate surfaces sharing one comman
44

55
## Route here when
66

7-
"监控规则 / 告警规则 / 数据源 / PromQL查询 / 日志查询 / 诊断 / 监控目标 / 主机工具" or "alert rule / datasource / metric query / log pattern / diagnose / monitored host / tools catalog" → **monit**. NOT `incident` (that domain = the alert graph after rules fire).
7+
"监控规则 / 告警规则 / 数据源 / PromQL查询 / 日志查询 / 诊断 / 监控目标 / 主机工具" or "alert rule / datasource / metric query / log pattern / diagnose / monitored host / tools catalog" → **monit**. NOT `incident` (that domain = the alert graph after rules fire), and **"数据源" here means a system Flashmonit queries** — On-call 集成 / 告警来源 is a different surface (`reference/channel.md`), and the top-level `datasource` group (`fduty datasource im-war-room-enabled-list`) is On-call IM plumbing, not this one.
88

99
## Which card
1010

0 commit comments

Comments
 (0)