@cloudcare/guance-front-tools 1.0.20 → 1.0.21

package/lib/esm/scripts/convert-grafana-dashboard-core.js

@@ -44,9 +44,11 @@ const PROMQL_RESERVED_WORDS = new Set([
 ]);
 const UNIT_MAP = {
     percent: ['percent', 'percent'],
+    percentunit: ['percent', 'percent_decimal'],
     bytes: ['digital', 'B'],
     decbytes: ['digital', 'B'],
     bits: ['digital', 'b'],
+    decbits: ['digital', 'b'],
     deckbytes: ['digital', 'KB'],
     decgbytes: ['digital', 'GB'],
     ms: ['time', 'ms'],
@@ -54,10 +56,16 @@ const UNIT_MAP = {
     m: ['time', 'min'],
     h: ['time', 'h'],
     d: ['time', 'd'],
-    short: ['custom', 'short'],
+    short: ['number', 'short_scale'],
     none: ['custom', 'none'],
-    reqps: ['custom', 'reqps'],
-    ops: ['custom', 'ops'],
+    reqps: ['throughput', 'reqps'],
+    ops: ['throughput', 'ops'],
+    iops: ['throughput', 'iops'],
+    bps: ['bandWidth', 'bps'],
+    Bps: ['traffic', 'B/S'],
+    hertz: ['frequency', 'Hz'],
+    rotrpm: ['frequency', 'rpm'],
+    celsius: ['temperature', 'C'],
 };
 const COMPARE_OPTIONS = {
     hourCompare: { label: '小时同比', value: 'hourCompare' },
@@ -68,14 +76,14 @@ const COMPARE_OPTIONS = {
 };
 export function convertDashboard(grafanaDashboard, options = {}) {
     var _a, _b;
-    const variableNames = new Set((((_a = grafanaDashboard.templating) === null || _a === void 0 ? void 0 : _a.list) || []).map((item) => item === null || item === void 0 ? void 0 : item.name).filter(Boolean));
+    const variableContext = buildVariableContext((((_a = grafanaDashboard.templating) === null || _a === void 0 ? void 0 : _a.list) || []), options);
     const state = {
         groups: [],
         groupUnfoldStatus: {},
         charts: [],
     };
     const sortedPanels = sortPanels(grafanaDashboard.panels || []);
-    collectPanels(sortedPanels, state, null, variableNames, options);
+    collectPanels(sortedPanels, state, null, variableContext.variableNames, options);
     return pruneEmpty({
         title: grafanaDashboard.title || '',
         description: grafanaDashboard.description || undefined,
@@ -85,13 +93,41 @@ export function convertDashboard(grafanaDashboard, options = {}) {
             groupUnfoldStatus: state.groupUnfoldStatus,
         },
         main: {
-            vars: convertVariables(((_b = grafanaDashboard.templating) === null || _b === void 0 ? void 0 : _b.list) || [], variableNames),
+            vars: convertVariables(variableContext.variables, variableContext.variableNames, options),
             charts: state.charts,
             groups: state.groups,
             type: 'template',
         },
     });
 }
+function buildVariableContext(variables, options = {}) {
+    const keptVariables = [];
+    const variableNames = new Set();
+    for (const variable of Array.isArray(variables) ? variables : []) {
+        if (shouldSkipVariable(variable, options)) {
+            continue;
+        }
+        keptVariables.push(variable);
+        if (variable === null || variable === void 0 ? void 0 : variable.name) {
+            variableNames.add(variable.name);
+        }
+    }
+    return {
+        variables: keptVariables,
+        variableNames,
+    };
+}
+function shouldSkipVariable(variable, options = {}) {
+    const variableType = String(variable === null || variable === void 0 ? void 0 : variable.type).toLowerCase();
+    const variableName = normalizeVariableIdentifier(variable === null || variable === void 0 ? void 0 : variable.name);
+    if (variableType === 'datasource' || variableName === 'ds_prometheus') {
+        return true;
+    }
+    if (options.keepJobVariable === true) {
+        return false;
+    }
+    return variableName === 'job';
+}
 function collectPanels(panels, state, inheritedGroup = null, variableNames = new Set(), options = {}) {
     let activeRow = inheritedGroup;
     let openRowPanel = null;
@@ -135,13 +171,14 @@ function sortPanels(panels) {
         return (left.id || 0) - (right.id || 0);
     });
 }
-function convertVariables(variables, variableNames) {
+function convertVariables(variables, variableNames, options = {}) {
     return variables
-        .map((variable, index) => convertVariable(variable, index, variableNames))
+        .map((variable, index) => convertVariable(variable, index, variableNames, options))
         .filter(Boolean);
 }
-function convertVariable(variable, index, variableNames) {
+function convertVariable(variable, index, variableNames, options = {}) {
     const variableType = String(variable.type || '');
+    const queryString = sanitizeVariableQuery(extractVariableQuery(variable), options);
     const current = variable.current || {};
     const currentText = stringifyCurrent(current.text);
     const currentValue = stringifyCurrent(current.value);
@@ -193,8 +230,7 @@ function convertVariable(variable, index, variableNames) {
         });
     }
     if (variableType === 'query') {
-        const queryString = extractVariableQuery(variable);
-        const queryKind = inferVariableQueryType(variable, queryString);
+        const queryKind = inferVariableQueryType(variable);
         return pruneEmpty({
             ...base,
             datasource: queryKind === 'FIELD' ? 'object' : 'dataflux',
@@ -227,7 +263,7 @@ function convertPanel(panel, groupName, rowPanel, variableNames, options) {
         return null;
     }
     const queries = buildQueries(panel, chartType, variableNames, options);
-    const settings = buildSettings(panel, chartType, queries, variableNames);
+    const settings = buildSettings(panel, chartType, queries, variableNames, options);
     const links = extractPanelLinks(panel, variableNames);
     const group = groupName !== null && groupName !== void 0 ? groupName : null;
     const position = buildPosition(panel, rowPanel);
@@ -274,13 +310,14 @@ function buildQueries(panel, chartType, variableNames, options = {}) {
     const targets = Array.isArray(panel.targets) ? panel.targets : [];
     for (let index = 0; index < targets.length; index++) {
         const target = targets[index];
-        const queryText = extractTargetQuery(target);
+        const targetAlias = normalizeQueryAlias(target.legendFormat || target.alias || '');
+        const queryText = sanitizeTargetQuery(extractTargetQuery(target), options);
         if (!queryText)
             continue;
         const qtype = inferQueryLanguage(target, queryText);
         const normalizedQueryText = normalizeTargetQuery(queryText, qtype, options);
         queries.push(pruneEmpty({
-            name: target.legendFormat || target.alias || '',
+            name: targetAlias || undefined,
             type: chartType,
             qtype,
             datasource: 'dataflux',
@@ -290,7 +327,6 @@ function buildQueries(panel, chartType, variableNames, options = {}) {
                 code: normalizeQueryCode(target.refId, index),
                 type: qtype,
                 promqlCode: qtype === 'promql' ? index + 1 : undefined,
-                alias: target.legendFormat || target.alias || '',
                 field: target.field || undefined,
             },
             extend: pruneEmpty({
@@ -310,14 +346,15 @@ function buildQueries(panel, chartType, variableNames, options = {}) {
     }
     return queries;
 }
-function buildSettings(panel, chartType, queries, variableNames) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x;
+function buildSettings(panel, chartType, queries, variableNames, converterOptions = {}) {
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y;
     const defaults = ((_a = panel.fieldConfig) === null || _a === void 0 ? void 0 : _a.defaults) || {};
     const custom = defaults.custom || {};
     const options = panel.options || {};
     const legend = options.legend || panel.legend || {};
     const transformationInfo = parseTransformations(panel.transformations || []);
-    const aliases = buildAliases(queries);
+    const aliasInfo = buildAliases(queries, panel.fieldConfig, variableNames);
+    const aliases = aliasInfo.items;
     const tableColumns = buildTableColumns(panel.fieldConfig, transformationInfo.organize, variableNames);
     const fieldOverrides = buildFieldOverrides(panel.fieldConfig, variableNames);
     const legacyGauge = panel.gauge || {};
@@ -352,6 +389,12 @@ function buildSettings(panel, chartType, queries, variableNames) {
     const valColorMappings = buildValColorMappings(panel.fieldConfig, transformationInfo.organize);
     const effectiveUnitType = customUnits.length ? 'custom' : unit ? 'global' : undefined;
     const slimit = inferSeriesLimit(queries, options, chartType);
+    const levelFontColor = normalizeColor(firstDefined((_q = defaults.color) === null || _q === void 0 ? void 0 : _q.fixedColor, ''));
+    const levels = buildLevels(defaults.thresholds, chartType, {
+        min,
+        max,
+        fontColor: levelFontColor,
+    });
     const settings = {
         showTitle: true,
         titleDesc: panel.description || '',
@@ -364,7 +407,7 @@ function buildSettings(panel, chartType, queries, variableNames) {
         precision: typeof precision === 'number' ? String(precision) : '2',
         timeInterval: normalizeTimeInterval(firstDefined(panel.interval, (_k = (_j = panel.targets) === null || _j === void 0 ? void 0 : _j.find((item) => item.interval)) === null || _k === void 0 ? void 0 : _k.interval, 'auto')),
         fixedTime: panel.timeFrom || '',
-        maxPointCount: (_l = panel.maxDataPoints) !== null && _l !== void 0 ? _l : null,
+        maxPointCount: (_l = panel.maxDataPoints) !== null && _l !== void 0 ? _l : undefined,
         showLegend: legend.showLegend,
         legendPostion: mapLegendPlacement(legend.placement),
         legendValues,
@@ -382,7 +425,7 @@ function buildSettings(panel, chartType, queries, variableNames) {
         units: customUnits.length ? customUnits : undefined,
         colors: customColors.length ? customColors : undefined,
         colorMappings: colorMappings.length ? colorMappings : undefined,
-        levels: buildLevels(defaults.thresholds),
+        levels,
         slimit,
         mappings: mappingItems,
         alias: aliases,
@@ -408,12 +451,12 @@ function buildSettings(panel, chartType, queries, variableNames) {
         scientificNotation: unit === 'short' ? true : undefined,
         mainMeasurementQueryCode: ((_p = (_o = queries[0]) === null || _o === void 0 ? void 0 : _o.query) === null || _p === void 0 ? void 0 : _p.code) || undefined,
         mainMeasurementLimit: chartType === 'pie' ? extractReduceLimit(options) : undefined,
-        color: ((_q = defaults.color) === null || _q === void 0 ? void 0 : _q.fixedColor) || undefined,
-        fontColor: options.colorMode === 'value' ? (_r = defaults.color) === null || _r === void 0 ? void 0 : _r.fixedColor : undefined,
-        bgColor: options.colorMode === 'background' ? (_s = defaults.color) === null || _s === void 0 ? void 0 : _s.fixedColor : undefined,
+        color: ((_r = defaults.color) === null || _r === void 0 ? void 0 : _r.fixedColor) || undefined,
+        fontColor: options.colorMode === 'value' ? (_s = defaults.color) === null || _s === void 0 ? void 0 : _s.fixedColor : undefined,
+        bgColor: options.colorMode === 'background' ? (_t = defaults.color) === null || _t === void 0 ? void 0 : _t.fixedColor : undefined,
         sequenceChartType: chartType === 'singlestat' && graphMode ? inferSequenceChartType(panel, graphMode) : undefined,
         showLineAxis: chartType === 'singlestat' ? graphMode !== 'none' : undefined,
-        repeatChartVariable: typeof panel.repeat === 'string' && panel.repeat ? panel.repeat : undefined,
+        repeatChartVariable: typeof panel.repeat === 'string' && panel.repeat && variableNames.has(panel.repeat) ? panel.repeat : undefined,
         repeatChartRowLimit: typeof panel.maxPerRow === 'number' ? panel.maxPerRow : undefined,
         compares: compareInfo.compares,
         compareType: compareInfo.compareType,
@@ -444,13 +487,13 @@ function buildSettings(panel, chartType, queries, variableNames) {
             drawStyle: custom.drawStyle || undefined,
             lineStyle: custom.lineStyle || undefined,
             spanNulls: custom.spanNulls,
-            stackingGroup: ((_t = custom.stacking) === null || _t === void 0 ? void 0 : _t.group) || undefined,
+            stackingGroup: ((_u = custom.stacking) === null || _u === void 0 ? void 0 : _u.group) || undefined,
             graphMode,
             colorMode: options.colorMode || undefined,
-            fieldColorMode: ((_u = defaults.color) === null || _u === void 0 ? void 0 : _u.mode) || undefined,
-            fixedColor: ((_v = defaults.color) === null || _v === void 0 ? void 0 : _v.fixedColor) || undefined,
-            thresholdsMode: ((_w = defaults.thresholds) === null || _w === void 0 ? void 0 : _w.mode) || undefined,
-            thresholdsStyleMode: ((_x = custom.thresholdsStyle) === null || _x === void 0 ? void 0 : _x.mode) || undefined,
+            fieldColorMode: ((_v = defaults.color) === null || _v === void 0 ? void 0 : _v.mode) || undefined,
+            fixedColor: ((_w = defaults.color) === null || _w === void 0 ? void 0 : _w.fixedColor) || undefined,
+            thresholdsMode: ((_x = defaults.thresholds) === null || _x === void 0 ? void 0 : _x.mode) || undefined,
+            thresholdsStyleMode: ((_y = custom.thresholdsStyle) === null || _y === void 0 ? void 0 : _y.mode) || undefined,
             textMode: options.textMode || legacyTextMode,
             reduceCalcs: Array.isArray(reduceOptions.calcs) ? reduceOptions.calcs : undefined,
             reduceFields: reduceOptions.fields || undefined,
@@ -488,26 +531,99 @@ function buildSettings(panel, chartType, queries, variableNames) {
             : undefined,
         text: textInfo || undefined,
         tableColumns: chartType === 'table' && tableColumns.length ? tableColumns : undefined,
-        fieldOverrides: fieldOverrides.length ? fieldOverrides : undefined,
-        transformations: transformationInfo.normalized.length ? transformationInfo.normalized : undefined,
-        fieldFilterPattern: transformationInfo.fieldFilterPattern || undefined,
-        valueFilters: transformationInfo.valueFilters.length ? transformationInfo.valueFilters : undefined,
+        fieldOverrides: converterOptions.keepGrafanaMeta && fieldOverrides.length ? fieldOverrides : undefined,
+        transformations: converterOptions.keepGrafanaMeta && transformationInfo.normalized.length ? transformationInfo.normalized : undefined,
+        fieldFilterPattern: converterOptions.keepGrafanaMeta ? transformationInfo.fieldFilterPattern || undefined : undefined,
+        valueFilters: converterOptions.keepGrafanaMeta && transformationInfo.valueFilters.length ? transformationInfo.valueFilters : undefined,
         layout: pruneEmpty({
             repeatDirection: panel.repeatDirection || undefined,
         }),
+        aliasReview: converterOptions.keepGrafanaMeta ? aliasInfo.review : undefined,
     });
     return pruneEmpty(settings);
 }
-function buildLevels(thresholds) {
+function buildLevels(thresholds, chartType, options = {}) {
+    if (chartType === 'gauge') {
+        return buildGaugeLevels(thresholds, options.max);
+    }
+    if (chartType === 'singlestat') {
+        return buildSinglestatLevels(thresholds, options.fontColor);
+    }
+    return buildGenericLevels(thresholds);
+}
+function buildGenericLevels(thresholds) {
     const steps = Array.isArray(thresholds === null || thresholds === void 0 ? void 0 : thresholds.steps) ? thresholds.steps : [];
     return steps
-        .filter((step) => typeof step.value === 'number' || typeof step.color === 'string')
+        .filter((step) => typeof normalizeLevelNumber(step.value) === 'number' || typeof step.color === 'string')
         .map((step, index) => ({
         title: `Level ${index + 1}`,
-        value: typeof step.value === 'number' ? step.value : 0,
+        value: normalizeLevelNumber(step.value) !== undefined ? normalizeLevelNumber(step.value) : 0,
         bgColor: normalizeColor(step.color),
     }));
 }
+function buildGaugeLevels(thresholds, max) {
+    const steps = Array.isArray(thresholds === null || thresholds === void 0 ? void 0 : thresholds.steps) ? thresholds.steps : [];
+    const levels = [];
+    for (let index = 0; index < steps.length; index++) {
+        const current = steps[index];
+        const next = steps[index + 1];
+        const nextValue = normalizeLevelNumber(next === null || next === void 0 ? void 0 : next.value);
+        const fallbackMax = normalizeLevelNumber(max);
+        const currentValue = normalizeLevelNumber(current === null || current === void 0 ? void 0 : current.value);
+        const upperBound = nextValue !== undefined ? nextValue : fallbackMax !== undefined ? fallbackMax : currentValue;
+        if (upperBound === undefined)
+            continue;
+        levels.push(pruneEmpty({
+            value: [upperBound],
+            lineColor: normalizeColor(current === null || current === void 0 ? void 0 : current.color),
+            operation: '<=',
+        }));
+    }
+    return levels;
+}
+function buildSinglestatLevels(thresholds, fontColor) {
+    const steps = Array.isArray(thresholds === null || thresholds === void 0 ? void 0 : thresholds.steps) ? thresholds.steps : [];
+    const levels = [];
+    for (let index = 0; index < steps.length; index++) {
+        const current = steps[index];
+        const next = steps[index + 1];
+        const currentValue = normalizeLevelNumber(current === null || current === void 0 ? void 0 : current.value);
+        const nextValue = normalizeLevelNumber(next === null || next === void 0 ? void 0 : next.value);
+        const color = normalizeColor(current === null || current === void 0 ? void 0 : current.color);
+        if (currentValue === undefined && nextValue === undefined)
+            continue;
+        if (currentValue === undefined && nextValue !== undefined) {
+            levels.push({
+                value: [nextValue],
+                bgColor: color,
+                fontColor: fontColor || color,
+                operation: '<',
+            });
+            continue;
+        }
+        if (currentValue !== undefined && nextValue !== undefined) {
+            levels.push({
+                value: [currentValue, nextValue],
+                bgColor: color,
+                fontColor: fontColor || color,
+                operation: 'between',
+            });
+            continue;
+        }
+        levels.push({
+            value: [currentValue],
+            bgColor: color,
+            fontColor: fontColor || color,
+            operation: '>=',
+        });
+    }
+    return levels;
+}
+function normalizeLevelNumber(value) {
+    if (typeof value !== 'number' || !Number.isFinite(value))
+        return undefined;
+    return Math.round(value);
+}
 function buildMappings(mappings) {
     var _a;
     if (!Array.isArray(mappings))
@@ -625,14 +741,119 @@ function buildTableColumns(fieldConfig, organize, variableNames = new Set()) {
     }
     return finalizeTableColumns([...columns.values()]);
 }
-function buildAliases(queries) {
-    return queries
-        .filter((query) => { var _a; return (_a = query.query) === null || _a === void 0 ? void 0 : _a.alias; })
-        .map((query) => ({
-        alias: query.query.alias,
-        key: query.query.code || query.name || '',
-        name: query.query.code || query.name || '',
-    }));
+function buildAliases(queries, fieldConfig, variableNames = new Set()) {
+    const aliases = [];
+    const seen = new Set();
+    const review = [];
+    const queryAliasTargets = buildQueryAliasTargets(queries);
+    for (const queryAliasTarget of queryAliasTargets) {
+        if (!queryAliasTarget.alias)
+            continue;
+        const aliasItem = pruneEmpty({
+            alias: queryAliasTarget.alias,
+            key: queryAliasTarget.key,
+            name: queryAliasTarget.name,
+            queryCode: queryAliasTarget.queryCode,
+        });
+        pushAliasItem(aliases, seen, aliasItem);
+        pushAliasReviewItem(review, aliasItem.alias, aliasItem.key);
+    }
+    const overrides = Array.isArray(fieldConfig === null || fieldConfig === void 0 ? void 0 : fieldConfig.overrides) ? fieldConfig.overrides : [];
+    for (const override of overrides) {
+        const matcherId = String((override === null || override === void 0 ? void 0 : override.matcher) && override.matcher.id || '');
+        const matcherOptions = String((override === null || override === void 0 ? void 0 : override.matcher) && override.matcher.options || '').trim();
+        if (matcherId !== 'byName' || !matcherOptions)
+            continue;
+        for (const property of Array.isArray(override === null || override === void 0 ? void 0 : override.properties) ? override.properties : []) {
+            if (!['displayName', 'displayNameFromDS'].includes(property === null || property === void 0 ? void 0 : property.id))
+                continue;
+            if (typeof property.value !== 'string' || !property.value.trim())
+                continue;
+            const aliasItem = {
+                alias: replaceVariables(property.value, variableNames),
+                key: matcherOptions,
+                name: matcherOptions,
+            };
+            pushAliasItem(aliases, seen, aliasItem);
+            pushAliasReviewItem(review, aliasItem.alias, aliasItem.key);
+        }
+    }
+    return {
+        items: aliases,
+        review: review.length ? review : undefined,
+    };
+}
+function pushAliasItem(aliases, seen, aliasItem) {
+    const normalized = pruneEmpty(aliasItem);
+    if (!(normalized === null || normalized === void 0 ? void 0 : normalized.alias) || !(normalized === null || normalized === void 0 ? void 0 : normalized.key) || !(normalized === null || normalized === void 0 ? void 0 : normalized.name))
+        return;
+    const key = JSON.stringify(normalized);
+    if (seen.has(key))
+        return;
+    seen.add(key);
+    aliases.push(normalized);
+}
+function buildQueryAliasTargets(queries) {
+    const targets = [];
+    for (let index = 0; index < (Array.isArray(queries) ? queries : []).length; index++) {
+        const query = queries[index];
+        const alias = normalizeQueryAlias((query === null || query === void 0 ? void 0 : query.name) || '');
+        if (!alias)
+            continue;
+        const queryInfo = (query === null || query === void 0 ? void 0 : query.query) || {};
+        const qtype = typeof (query === null || query === void 0 ? void 0 : query.qtype) === 'string' ? query.qtype : 'query';
+        const queryCode = typeof queryInfo.code === 'string' ? queryInfo.code : '';
+        const key = buildAliasSeriesKey(qtype, queryInfo, index);
+        targets.push({
+            alias,
+            key,
+            name: key,
+            queryCode: queryCode || undefined,
+        });
+    }
+    return targets;
+}
+function buildAliasSeriesKey(qtype, queryInfo, index) {
+    const normalizedType = typeof qtype === 'string' && qtype.trim() ? qtype.trim() : 'query';
+    if (normalizedType === 'promql') {
+        const promqlCode = Number.isInteger(queryInfo === null || queryInfo === void 0 ? void 0 : queryInfo.promqlCode) ? queryInfo.promqlCode : index + 1;
+        return `promql_${promqlCode}`;
+    }
+    return `${normalizedType}_${index + 1}`;
+}
+function normalizeQueryAlias(value) {
+    const alias = String(value || '').trim();
+    if (!alias || alias === '__auto')
+        return '';
+    return alias;
+}
+function pushAliasReviewItem(review, alias, key) {
+    const normalizedAlias = String(alias || '').trim();
+    const normalizedKey = String(key || '').trim();
+    if (!normalizedAlias || !normalizedKey)
+        return;
+    const classification = classifyAliasTemplate(normalizedAlias);
+    if (classification === 'safe_fixed')
+        return;
+    const item = {
+        alias: normalizedAlias,
+        key: normalizedKey,
+        classification,
+    };
+    const serialized = JSON.stringify(item);
+    if (review.some((current) => JSON.stringify(current) === serialized))
+        return;
+    review.push(item);
+}
+function classifyAliasTemplate(alias) {
+    if (!alias.includes('{{'))
+        return 'safe_fixed';
+    const tokens = [...alias.matchAll(/\{\{\s*([^}]+?)\s*\}\}/g)].map((match) => match[1].trim());
+    if (tokens.length === 0)
+        return 'safe_fixed';
+    if (tokens.every((token) => token === 'host' || token === 'tags'))
+        return 'safe_guance';
+    return 'compat_grafana_template';
 }
 function buildCustomUnits(fieldConfig) {
     var _a;
@@ -1077,7 +1298,7 @@ function inferQueryLanguage(target, queryText) {
         return 'dql';
     return 'promql';
 }
-function inferVariableQueryType(variable, queryString) {
+function inferVariableQueryType(variable) {
     var _a;
     const datasourceType = getDatasourceType(variable.datasource);
     const explicitQtype = String(((_a = variable.query) === null || _a === void 0 ? void 0 : _a.qtype) || '').toLowerCase();
@@ -1086,15 +1307,7 @@ function inferVariableQueryType(variable, queryString) {
     if (explicitQtype === 'promql')
         return 'PROMQL_QUERY';
     if (explicitQtype === 'dql')
-        return 'QUERY';
-    if (isDqlLikeDatasource(datasourceType) && /^\s*(with|select)\b/i.test(queryString))
-        return 'QUERY';
-    if (/field_values\(/i.test(queryString) || /label_values\(/i.test(queryString))
-        return 'QUERY';
-    if (/^[A-Z]::/.test(queryString) || /L\('/.test(queryString))
-        return 'QUERY';
-    if (/^\s*(with|select)\b/i.test(queryString))
-        return 'QUERY';
+        return 'PROMQL_QUERY';
     return 'PROMQL_QUERY';
 }
 function extractVariableQuery(variable) {
@@ -1115,6 +1328,150 @@ function extractTargetQuery(target) {
     }
     return '';
 }
+function sanitizeVariableQuery(queryText, options = {}) {
+    return sanitizeQueryText(queryText, options);
+}
+function sanitizeTargetQuery(queryText, options = {}) {
+    return sanitizeQueryText(queryText, options);
+}
+function sanitizeQueryText(queryText, options = {}) {
+    if (typeof queryText !== 'string' || !queryText.trim()) {
+        return queryText;
+    }
+    if (options.keepJobVariable === true) {
+        return queryText;
+    }
+    if (looksLikeDqlQuery(queryText)) {
+        return sanitizeDqlJobFilters(queryText).trim();
+    }
+    return sanitizePromqlJobFilters(queryText).trim();
+}
+function looksLikeDqlQuery(queryText) {
+    return /^\s*(with|select)\b/i.test(queryText) || /^[A-Z]::/.test(queryText) || /[A-Z]\('/.test(queryText);
+}
+function sanitizePromqlJobFilters(queryText) {
+    let result = queryText.replace(/\{([^{}]*)\}/g, (match, content) => sanitizePromqlSelector(content));
+    result = result.replace(/([A-Za-z_:][A-Za-z0-9_:]*)\{\}/g, '$1');
+    return result;
+}
+function sanitizePromqlSelector(content) {
+    const parts = splitTopLevel(content, ',');
+    const filtered = parts.filter((part) => !isJobPromqlMatcher(part));
+    return `{${filtered.join(',')}}`;
+}
+function isJobPromqlMatcher(segment) {
+    const match = String(segment).match(/^\s*([A-Za-z_][A-Za-z0-9_]*)\s*(=~|!~|=|!=)/);
+    if (!match) {
+        return false;
+    }
+    return normalizeVariableIdentifier(match[1]) === 'job';
+}
+function sanitizeDqlJobFilters(queryText) {
+    return queryText.replace(/\{([^{}]*)\}/g, (match, content) => {
+        const filtered = splitTopLevelLogical(content).filter((clause) => !isJobDqlClause(clause));
+        if (filtered.length === 0) {
+            return '';
+        }
+        return `{ ${filtered.join(' AND ')} }`;
+    });
+}
+function isJobDqlClause(segment) {
+    const match = String(segment).match(/^\s*`?([A-Za-z_][A-Za-z0-9_]*)`?\s*(=~|!~|=|!=|>=|<=|>|<|\bIN\b|\bNOT IN\b|\blike\b)/i);
+    if (!match) {
+        return false;
+    }
+    return normalizeVariableIdentifier(match[1]) === 'job';
+}
+function splitTopLevel(input, separator) {
+    const segments = [];
+    let current = '';
+    let quote = '';
+    let depth = 0;
+    for (let index = 0; index < input.length; index++) {
+        const char = input[index];
+        const previous = index > 0 ? input[index - 1] : '';
+        if (quote) {
+            current += char;
+            if (char === quote && previous !== '\\') {
+                quote = '';
+            }
+            continue;
+        }
+        if (char === '"' || char === '\'' || char === '`') {
+            quote = char;
+            current += char;
+            continue;
+        }
+        if (char === '(' || char === '[') {
+            depth++;
+            current += char;
+            continue;
+        }
+        if ((char === ')' || char === ']') && depth > 0) {
+            depth--;
+            current += char;
+            continue;
+        }
+        if (char === separator && depth === 0) {
+            if (current.trim()) {
+                segments.push(current.trim());
+            }
+            current = '';
+            continue;
+        }
+        current += char;
+    }
+    if (current.trim()) {
+        segments.push(current.trim());
+    }
+    return segments;
+}
+function splitTopLevelLogical(input) {
+    const segments = [];
+    let current = '';
+    let quote = '';
+    let depth = 0;
+    for (let index = 0; index < input.length; index++) {
+        const char = input[index];
+        const previous = index > 0 ? input[index - 1] : '';
+        if (quote) {
+            current += char;
+            if (char === quote && previous !== '\\') {
+                quote = '';
+            }
+            continue;
+        }
+        if (char === '"' || char === '\'' || char === '`') {
+            quote = char;
+            current += char;
+            continue;
+        }
+        if (char === '(' || char === '[') {
+            depth++;
+            current += char;
+            continue;
+        }
+        if ((char === ')' || char === ']') && depth > 0) {
+            depth--;
+            current += char;
+            continue;
+        }
+        if (depth === 0 && input.slice(index).match(/^(AND|OR)\b/i) && /\s/.test(previous || ' ')) {
+            const operatorMatch = input.slice(index).match(/^(AND|OR)\b/i);
+            if (operatorMatch && current.trim()) {
+                segments.push(current.trim());
+                current = '';
+                index += operatorMatch[0].length - 1;
+                continue;
+            }
+        }
+        current += char;
+    }
+    if (current.trim()) {
+        segments.push(current.trim());
+    }
+    return segments;
+}
 function extractWorkspaceInfo(targets) {
     const workspaceUUIDs = [];
     const workspaceNames = [];
@@ -1515,10 +1872,11 @@ function normalizeConnectNulls(value) {
 function mapUnit(unit) {
     if (!unit)
         return [];
-    const mapped = UNIT_MAP[String(unit).toLowerCase()];
+    const rawUnit = String(unit);
+    const mapped = UNIT_MAP[rawUnit] || UNIT_MAP[rawUnit.toLowerCase()];
     if (mapped)
         return mapped;
-    return ['custom', String(unit)];
+    return ['custom', rawUnit];
 }
 function buildLegacyValueMappings(valueMaps) {
     if (!Array.isArray(valueMaps))
@@ -1592,6 +1950,9 @@ function normalizeTemplateVariable(expression) {
         return '';
     return beforeFormat;
 }
+function normalizeVariableIdentifier(value) {
+    return String(value || '').trim().toLowerCase();
+}
 function normalizeQueryCode(refId, index) {
     if (typeof refId === 'string' && refId.trim())
         return refId.trim();