@intentius/chant-lexicon-grafana 0.106.3 → 0.107.1

package/dist/composites/red-dashboard.d.ts

@@ -12,7 +12,7 @@
  * its internal spans don't inflate its rate or dilute its error ratio.
  */
 import { type CompositeInstance } from "@intentius/chant/composite";
-import { type PrometheusNaming, type SpanMetricsNames } from "@intentius/chant-lexicon-otel/metric-names";
+import { type PrometheusNaming, type SpanMetricsKind, type SpanMetricsNames } from "@intentius/chant-lexicon-otel/metric-names";
 import type { OTelComponent } from "@intentius/chant-lexicon-otel/define";
 import type { SpanMetricsConnectorConfig } from "@intentius/chant-lexicon-otel/components/connectors";
 import type { PrometheusExporterConfig } from "@intentius/chant-lexicon-otel/components/exporters";
@@ -37,7 +37,7 @@ export interface RedDashboardProps extends DashboardOptions {
     spanKinds?: SpanKind[];
 }
 /** The `span_kind` label values the spanmetrics connector writes. */
-export type SpanKind = "SPAN_KIND_UNSPECIFIED" | "SPAN_KIND_INTERNAL" | "SPAN_KIND_SERVER" | "SPAN_KIND_CLIENT" | "SPAN_KIND_PRODUCER" | "SPAN_KIND_CONSUMER";
+export type SpanKind = SpanMetricsKind;
 /** The kinds `RedDashboard` counts unless told otherwise: the spans that serve a request or consume a message. */
 export declare const RED_DEFAULT_SPAN_KINDS: readonly SpanKind[];
 export type RedDashboardMembers = {
@@ -48,7 +48,9 @@ export type RedDashboardInstance = CompositeInstance<RedDashboardMembers> & RedD
 /**
  * The PromQL the RED dashboard runs, from the connector's names. Exposed for
  * tests and for panels of your own. `spanKinds` defaults to server and
- * consumer spans; `[]` counts every kind.
+ * consumer spans; `[]` counts every kind. The expressions come from the otel
+ * lexicon's `spanMetricsRedQueries()`, which the prometheus lexicon's
+ * `RedAlerts` reads too.
  */
 export declare function redQueries(names: SpanMetricsNames, quantiles?: number[], serviceFilter?: string, spanKinds?: readonly SpanKind[]): {
     rate: string;

package/dist/composites/red-dashboard.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"red-dashboard.d.ts","sourceRoot":"","sources":["../../src/composites/red-dashboard.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAEH,OAAO,EAAa,KAAK,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAC/E,OAAO,EAAoB,KAAK,gBAAgB,EAAE,KAAK,gBAAgB,EAAE,MAAM,4CAA4C,CAAC;AAC5H,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sCAAsC,CAAC;AAC1E,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,qDAAqD,CAAC;AACtG,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,oDAAoD,CAAC;AACnG,OAAO,EAAa,KAAK,eAAe,EAAE,MAAM,cAAc,CAAC;AAK/D,OAAO,EAUL,KAAK,gBAAgB,EAEtB,MAAM,UAAU,CAAC;AAElB,MAAM,WAAW,iBAAkB,SAAQ,gBAAgB;IACzD;;;OAGG;IACH,WAAW,EAAE,aAAa,CAAC,WAAW,EAAE,aAAa,EAAE,0BAA0B,CAAC,GAAG,gBAAgB,CAAC;IACtG,mHAAmH;IACnH,QAAQ,CAAC,EAAE,aAAa,CAAC,UAAU,EAAE,YAAY,EAAE,wBAAwB,CAAC,GAAG,gBAAgB,CAAC;IAChG,qEAAqE;IACrE,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;IACrB;;;;;OAKG;IACH,SAAS,CAAC,EAAE,QAAQ,EAAE,CAAC;CACxB;AAED,qEAAqE;AACrE,MAAM,MAAM,QAAQ,GAChB,uBAAuB,GACvB,oBAAoB,GACpB,kBAAkB,GAClB,kBAAkB,GAClB,oBAAoB,GACpB,oBAAoB,CAAC;AAWzB,kHAAkH;AAClH,eAAO,MAAM,sBAAsB,EAAE,SAAS,QAAQ,EAA8D,CAAC;AAErH,MAAM,MAAM,mBAAmB,GAAG;IAAE,SAAS,EAAE,eAAe,CAAA;CAAE,CAAC;AAEjE,uEAAuE;AACvE,MAAM,MAAM,oBAAoB,GAAG,iBAAiB,CAAC,mBAAmB,CAAC,GAAG,mBAAmB,CAAC;AA2BhG;;;;GAIG;AACH,wBAAgB,UAAU,CACxB,KAAK,EAAE,gBAAgB,EACvB,SAAS,GAAE,MAAM,EAAsB,EACvC,aAAa,SAAa,EAC1B,SAAS,CAAC,EAAE,SAAS,QAAQ,EAAE;IAY7B,IAAI;IACJ,UAAU;IACV,QAAQ;;;;IACR,QAAQ;EAEX;AAUD;;;;;;;;;;;;;GAaG;AACH,eAAO,MAAM,YAAY,wFAuEP,CAAC"}
+{"version":3,"file":"red-dashboard.d.ts","sourceRoot":"","sources":["../../src/composites/red-dashboard.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAEH,OAAO,EAAa,KAAK,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAC/E,OAAO,EAIL,KAAK,gBAAgB,EACrB,KAAK,eAAe,EACpB,KAAK,gBAAgB,EACtB,MAAM,4CAA4C,CAAC;AACpD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sCAAsC,CAAC;AAC1E,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,qDAAqD,CAAC;AACtG,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,oDAAoD,CAAC;AACnG,OAAO,EAAa,KAAK,eAAe,EAAE,MAAM,cAAc,CAAC;AAK/D,OAAO,EAAmF,KAAK,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAElI,MAAM,WAAW,iBAAkB,SAAQ,gBAAgB;IACzD;;;OAGG;IACH,WAAW,EAAE,aAAa,CAAC,WAAW,EAAE,aAAa,EAAE,0BAA0B,CAAC,GAAG,gBAAgB,CAAC;IACtG,mHAAmH;IACnH,QAAQ,CAAC,EAAE,aAAa,CAAC,UAAU,EAAE,YAAY,EAAE,wBAAwB,CAAC,GAAG,gBAAgB,CAAC;IAChG,qEAAqE;IACrE,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;IACrB;;;;;OAKG;IACH,SAAS,CAAC,EAAE,QAAQ,EAAE,CAAC;CACxB;AAED,qEAAqE;AACrE,MAAM,MAAM,QAAQ,GAAG,eAAe,CAAC;AAEvC,kHAAkH;AAClH,eAAO,MAAM,sBAAsB,EAAE,SAAS,QAAQ,EAA8B,CAAC;AAErF,MAAM,MAAM,mBAAmB,GAAG;IAAE,SAAS,EAAE,eAAe,CAAA;CAAE,CAAC;AAEjE,uEAAuE;AACvE,MAAM,MAAM,oBAAoB,GAAG,iBAAiB,CAAC,mBAAmB,CAAC,GAAG,mBAAmB,CAAC;AAYhG;;;;;;GAMG;AACH,wBAAgB,UAAU,CACxB,KAAK,EAAE,gBAAgB,EACvB,SAAS,GAAE,MAAM,EAAsB,EACvC,aAAa,SAAa,EAC1B,SAAS,CAAC,EAAE,SAAS,QAAQ,EAAE;IAI7B,IAAI;IACJ,UAAU;IACV,QAAQ;;;;IACR,QAAQ;EAEX;AAUD;;;;;;;;;;;;;GAaG;AACH,eAAO,MAAM,YAAY,wFAuEP,CAAC"}

package/dist/composites/shared.d.ts

@@ -2,6 +2,7 @@
  * What the dashboard composites share: the dashboard-level props they all
  * take, a PromQL selector builder, and the field configs they reuse.
  */
+import { type PromMatcher } from "@intentius/chant-lexicon-otel/metric-names";
 import type { DatasourceInput } from "../query.js";
 import type { DashboardLinkInput } from "../dashboard.js";
 import type { FolderEntity } from "../folder.js";
@@ -27,7 +28,7 @@ export interface DashboardOptions {
     links?: DashboardLinkInput[];
 }
 /** A label matcher: `[label, op, value]`. */
-export type Matcher = [label: string, op: "=" | "!=" | "=~" | "!~", value: string];
+export type Matcher = PromMatcher;
 /** `metric{a="x", b=~"y"}`; just `metric` with no matchers. */
 export declare function selector(metric: string, matchers: Matcher[]): string;
 /** `sum by (labels) (rate(sel[range]))`, or `sum (...)` with no labels. */

package/dist/composites/shared.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"shared.d.ts","sourceRoot":"","sources":["../../src/composites/shared.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAChD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AACvD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAC9C,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAEhE,+FAA+F;AAC/F,MAAM,WAAW,gBAAgB;IAC/B,yIAAyI;IACzI,UAAU,EAAE,eAAe,CAAC,YAAY,CAAC,CAAC;IAC1C,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,8EAA8E;IAC9E,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAChB,qFAAqF;IACrF,MAAM,CAAC,EAAE,MAAM,GAAG,YAAY,CAAC;IAC/B,0BAA0B;IAC1B,IAAI,CAAC,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,EAAE,EAAE,MAAM,CAAA;KAAE,CAAC;IACpC,yCAAyC;IACzC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,kBAAkB,EAAE,CAAC;CAC9B;AAED,6CAA6C;AAC7C,MAAM,MAAM,OAAO,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,GAAG,GAAG,IAAI,GAAG,IAAI,GAAG,IAAI,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;AAEnF,+DAA+D;AAC/D,wBAAgB,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,GAAG,MAAM,CAGpE;AAED,2EAA2E;AAC3E,wBAAgB,OAAO,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,KAAK,SAAqB,GAAG,MAAM,CAErF;AAED;;;;;GAKG;AACH,wBAAgB,UAAU,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,GAAG,MAAM,CAGjF;AAED,0EAA0E;AAC1E,wBAAgB,QAAQ,CAAC,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,GAAG,MAAM,CAE3E;AAED,+EAA+E;AAC/E,wBAAgB,GAAG,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAErC;AAED,yCAAyC;AACzC,wBAAgB,YAAY,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAE9C;AAED,wDAAwD;AACxD,wBAAgB,MAAM,CAAC,GAAG,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,CAElD;AAED,wEAAwE;AACxE,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,CAE7D;AAED,0EAA0E;AAC1E,wBAAgB,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,GAAG,gBAAgB,CAEzF;AAED,0FAA0F;AAC1F,wBAAgB,cAAc,CAAC,CAAC,EAAE,gBAAgB,EAAE,QAAQ,EAAE;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,EAAE,CAAA;CAAE;;;;;;cA9DhH,MAAM;YAAM,MAAM;;;kBAsEjB,iBAAiB;;;EAIlC;AAED,uDAAuD;AACvD,wBAAgB,iBAAiB,CAAC,SAAS,EAAE,MAAM,EAAE,EAAE,EAAE,OAAO,GAAG,IAAI,CAMtE"}
+{"version":3,"file":"shared.d.ts","sourceRoot":"","sources":["../../src/composites/shared.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAML,KAAK,WAAW,EACjB,MAAM,4CAA4C,CAAC;AACpD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAChD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AACvD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAC9C,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAEhE,+FAA+F;AAC/F,MAAM,WAAW,gBAAgB;IAC/B,yIAAyI;IACzI,UAAU,EAAE,eAAe,CAAC,YAAY,CAAC,CAAC;IAC1C,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,8EAA8E;IAC9E,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAChB,qFAAqF;IACrF,MAAM,CAAC,EAAE,MAAM,GAAG,YAAY,CAAC;IAC/B,0BAA0B;IAC1B,IAAI,CAAC,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,EAAE,EAAE,MAAM,CAAA;KAAE,CAAC;IACpC,yCAAyC;IACzC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,kBAAkB,EAAE,CAAC;CAC9B;AAED,6CAA6C;AAC7C,MAAM,MAAM,OAAO,GAAG,WAAW,CAAC;AAOlC,+DAA+D;AAC/D,wBAAgB,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,GAAG,MAAM,CAEpE;AAED,2EAA2E;AAC3E,wBAAgB,OAAO,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,KAAK,SAAqB,GAAG,MAAM,CAErF;AAED;;;;;GAKG;AACH,wBAAgB,UAAU,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,GAAG,MAAM,CAEjF;AAED,0EAA0E;AAC1E,wBAAgB,QAAQ,CAAC,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,GAAG,MAAM,CAE3E;AAED,+EAA+E;AAC/E,wBAAgB,GAAG,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAErC;AAED,yCAAyC;AACzC,wBAAgB,YAAY,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAE9C;AAED,wDAAwD;AACxD,wBAAgB,MAAM,CAAC,GAAG,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,CAElD;AAED,wEAAwE;AACxE,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,CAE7D;AAED,0EAA0E;AAC1E,wBAAgB,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,GAAG,gBAAgB,CAEzF;AAED,0FAA0F;AAC1F,wBAAgB,cAAc,CAAC,CAAC,EAAE,gBAAgB,EAAE,QAAQ,EAAE;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,EAAE,CAAA;CAAE;;;;;;cAjEhH,MAAM;YAAM,MAAM;;;kBAyEjB,iBAAiB;;;EAIlC;AAED,uDAAuD;AACvD,wBAAgB,iBAAiB,CAAC,SAAS,EAAE,MAAM,EAAE,EAAE,EAAE,OAAO,GAAG,IAAI,CAMtE"}

package/dist/integrity.json

@@ -1,7 +1,7 @@
 {
   "algorithm": "sha256",
   "artifacts": {
-    "manifest.json": "f95101f26cc36262685fe99c9eccc904ffca12e4e4e798d9fb0e35023060f041",
+    "manifest.json": "1308761c9dfaae99344d7c4f9e730e3b3e4b9ab0cf3b70434a198042a9a6c55c",
     "meta.json": "330a1598c3b35ae62267e886a3416a494b0ebe9f1d2e2379253787d0a0bcb32e",
     "types/index.d.ts": "ad385264290f2486f7a54be205684de8415a25b74eee5b809ca625ae19fb08da",
     "rules/grafana-ast.ts": "51f4fac423f7a5c6d6f577074e95b4a70d4ab0a05883a86e04970a50c63d92e8",
@@ -31,5 +31,5 @@
     "skills/chant-grafana-alerting.md": "d9648dc14c848851bdccbe069dac54ad06115066f9466c90c4137d07dde6d4ad",
     "skills/chant-grafana-operations.md": "4e665f80292ab32bde6d77940cc3f3923678c58e6db0b80613489050d2cb665b"
   },
-  "composite": "d3f04256f6713df0d65a9e5470148e3e3c70a5a5bb7f28e766dafef40f8ccfa4"
+  "composite": "3cd566cebfaf02692a4bbac19eb97a0e7f346f885e8367193c28b237958e6a8f"
 }

package/dist/manifest.json

@@ -1,6 +1,6 @@
 {
   "name": "grafana",
-  "version": "0.106.3",
+  "version": "0.107.1",
   "chantVersion": ">=0.1.0",
   "namespace": "Grafana",
   "intrinsics": [],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@intentius/chant-lexicon-grafana",
-  "version": "0.106.3",
+  "version": "0.107.1",
   "description": "Grafana lexicon for chant — typed dashboards, panels, queries and datasources, serialized to dashboard JSON and Grafana provisioning files",
   "license": "Apache-2.0",
   "homepage": "https://intentius.io/chant",
@@ -83,7 +83,7 @@
     "zod": "^4.3.6"
   },
   "peerDependencies": {
-    "@intentius/chant": "^0.106.3",
+    "@intentius/chant": "^0.107.1",
     "typescript": "^5.9.3",
     "zod": "^4.3.6"
   }

package/src/composites/red-dashboard.ts

@@ -13,7 +13,14 @@
  */
 
 import { Composite, type CompositeInstance } from "@intentius/chant/composite";
-import { spanMetricsNames, type PrometheusNaming, type SpanMetricsNames } from "@intentius/chant-lexicon-otel/metric-names";
+import {
+  RED_DEFAULT_SPAN_KINDS as SHARED_DEFAULT_SPAN_KINDS,
+  spanMetricsNames,
+  spanMetricsRedQueries,
+  type PrometheusNaming,
+  type SpanMetricsKind,
+  type SpanMetricsNames,
+} from "@intentius/chant-lexicon-otel/metric-names";
 import type { OTelComponent } from "@intentius/chant-lexicon-otel/define";
 import type { SpanMetricsConnectorConfig } from "@intentius/chant-lexicon-otel/components/connectors";
 import type { PrometheusExporterConfig } from "@intentius/chant-lexicon-otel/components/exporters";
@@ -22,19 +29,7 @@ import { Row, TimeSeriesPanel } from "../panels";
 import { PromQuery } from "../query";
 import { QueryVariable } from "../variables";
 import { slugUid } from "../util";
-import {
-  dashboardProps,
-  durationUnit,
-  errorRatio,
-  legend,
-  quantile,
-  quantileName,
-  requireDatasource,
-  selector,
-  sumRate,
-  type DashboardOptions,
-  type Matcher,
-} from "./shared";
+import { dashboardProps, durationUnit, legend, quantileName, requireDatasource, selector, type DashboardOptions } from "./shared";
 
 export interface RedDashboardProps extends DashboardOptions {
   /**
@@ -56,25 +51,10 @@ export interface RedDashboardProps extends DashboardOptions {
 }
 
 /** The `span_kind` label values the spanmetrics connector writes. */
-export type SpanKind =
-  | "SPAN_KIND_UNSPECIFIED"
-  | "SPAN_KIND_INTERNAL"
-  | "SPAN_KIND_SERVER"
-  | "SPAN_KIND_CLIENT"
-  | "SPAN_KIND_PRODUCER"
-  | "SPAN_KIND_CONSUMER";
-
-const SPAN_KINDS: readonly SpanKind[] = [
-  "SPAN_KIND_UNSPECIFIED",
-  "SPAN_KIND_INTERNAL",
-  "SPAN_KIND_SERVER",
-  "SPAN_KIND_CLIENT",
-  "SPAN_KIND_PRODUCER",
-  "SPAN_KIND_CONSUMER",
-];
+export type SpanKind = SpanMetricsKind;
 
 /** The kinds `RedDashboard` counts unless told otherwise: the spans that serve a request or consume a message. */
-export const RED_DEFAULT_SPAN_KINDS: readonly SpanKind[] = Object.freeze(["SPAN_KIND_SERVER", "SPAN_KIND_CONSUMER"]);
+export const RED_DEFAULT_SPAN_KINDS: readonly SpanKind[] = SHARED_DEFAULT_SPAN_KINDS;
 
 export type RedDashboardMembers = { dashboard: DashboardEntity };
 
@@ -91,25 +71,12 @@ function isNames(x: unknown): x is SpanMetricsNames {
   return typeof x === "object" && x !== null && "calls" in x && "labels" in x && "errorStatus" in x;
 }
 
-/**
- * The span-kind matcher for `kinds`, or none: none for `[]`, and none for
- * the default kinds when the connector excludes `span.kind`.
- */
-function spanKindMatchers(names: SpanMetricsNames, kinds: readonly SpanKind[] | undefined): Matcher[] {
-  const label = names.labels.spanKind;
-  if (kinds === undefined) return label ? [[label, "=~", RED_DEFAULT_SPAN_KINDS.join("|")]] : [];
-  for (const k of kinds) {
-    if (!SPAN_KINDS.includes(k)) throw new Error(`RedDashboard: unknown span kind ${JSON.stringify(k)}; use one of ${SPAN_KINDS.join(", ")}`);
-  }
-  if (kinds.length === 0) return [];
-  if (!label) throw new Error("RedDashboard: the connector excludes span.kind, so the metrics can't be filtered by spanKinds");
-  return [[label, "=~", [...new Set(kinds)].join("|")]];
-}
-
 /**
  * The PromQL the RED dashboard runs, from the connector's names. Exposed for
  * tests and for panels of your own. `spanKinds` defaults to server and
- * consumer spans; `[]` counts every kind.
+ * consumer spans; `[]` counts every kind. The expressions come from the otel
+ * lexicon's `spanMetricsRedQueries()`, which the prometheus lexicon's
+ * `RedAlerts` reads too.
  */
 export function redQueries(
   names: SpanMetricsNames,
@@ -117,20 +84,12 @@ export function redQueries(
   serviceFilter = "$service",
   spanKinds?: readonly SpanKind[],
 ) {
-  const svc = names.labels.service;
-  const status = names.labels.statusCode;
-  if (!svc) throw new Error("RedDashboard: the connector excludes service.name, so there is no service to break the metrics down by");
-  if (!status) throw new Error("RedDashboard: the connector excludes status.code, so errors can't be told from successes");
-  const kind = spanKindMatchers(names, spanKinds);
-  const scope: Matcher[] = [[svc, "=~", serviceFilter], ...kind];
-  const calls = selector(names.calls.prometheus, scope);
-  const errors = selector(names.calls.prometheus, [...scope, [status, "=", names.errorStatus]]);
-  const buckets = names.duration ? selector(`${names.duration.prometheus}_bucket`, scope) : undefined;
+  const q = spanMetricsRedQueries(names, { range: "$__rate_interval", quantiles, serviceMatch: serviceFilter, spanKinds, owner: "RedDashboard" });
   return {
-    rate: sumRate(calls, [svc]),
-    errorRatio: errorRatio(errors, calls, [svc]),
-    duration: buckets ? quantiles.map((q) => ({ quantile: q, expr: quantile(q, buckets, [svc]) })) : [],
-    services: `label_values(${selector(names.calls.prometheus, kind)}, ${svc})`,
+    rate: q.rate,
+    errorRatio: q.errorRatio,
+    duration: q.duration,
+    services: `label_values(${selector(names.calls.prometheus, q.kindMatchers)}, ${q.service})`,
   };
 }
 

package/src/composites/shared.ts

@@ -3,6 +3,14 @@
  * take, a PromQL selector builder, and the field configs they reuse.
  */
 
+import {
+  promErrorRatio,
+  promNumber,
+  promQuantile,
+  promSelector,
+  promSumRate,
+  type PromMatcher,
+} from "@intentius/chant-lexicon-otel/metric-names";
 import type { DatasourceInput } from "../query";
 import type { DashboardLinkInput } from "../dashboard";
 import type { FolderEntity } from "../folder";
@@ -27,17 +35,21 @@ export interface DashboardOptions {
 }
 
 /** A label matcher: `[label, op, value]`. */
-export type Matcher = [label: string, op: "=" | "!=" | "=~" | "!~", value: string];
+export type Matcher = PromMatcher;
+
+// The PromQL builders live in the otel lexicon's metric-names, next to the
+// names they read, so the prometheus lexicon's RedAlerts builds the same
+// expressions without importing grafana. Here they default the range to
+// Grafana's `$__rate_interval`.
 
 /** `metric{a="x", b=~"y"}`; just `metric` with no matchers. */
 export function selector(metric: string, matchers: Matcher[]): string {
-  if (matchers.length === 0) return metric;
-  return `${metric}{${matchers.map(([l, op, v]) => `${l}${op}${JSON.stringify(v)}`).join(", ")}}`;
+  return promSelector(metric, matchers);
 }
 
 /** `sum by (labels) (rate(sel[range]))`, or `sum (...)` with no labels. */
 export function sumRate(sel: string, by: string[], range = "$__rate_interval"): string {
-  return `sum${by.length ? ` by (${by.join(", ")})` : ""} (rate(${sel}[${range}]))`;
+  return promSumRate(sel, by, range);
 }
 
 /**
@@ -47,18 +59,17 @@ export function sumRate(sel: string, by: string[], range = "$__rate_interval"):
  * "No data" for a service that has had no errors.
  */
 export function errorRatio(errorSel: string, allSel: string, by: string[]): string {
-  const all = sumRate(allSel, by);
-  return `(\n${sumRate(errorSel, by)}\nor\n${all} * 0\n)\n/\n${all}`;
+  return promErrorRatio(errorSel, allSel, by, "$__rate_interval");
 }
 
 /** `histogram_quantile(q, sum by (le, labels) (rate(bucket[range])))`. */
 export function quantile(q: number, bucketSel: string, by: string[]): string {
-  return `histogram_quantile(${num(q)}, ${sumRate(bucketSel, ["le", ...by])})`;
+  return promQuantile(q, bucketSel, by, "$__rate_interval");
 }
 
 /** A number as PromQL and Grafana thresholds write it, without float noise. */
 export function num(n: number): string {
-  return String(Number(n.toPrecision(10)));
+  return promNumber(n);
 }
 
 /** `p95` for 0.95, `p99.9` for 0.999. */