Misthios/grafana-zabbix
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Make alias functions work with different frames

Browse Source
This commit is contained in:
Alexander Zobnin
2021-05-28 13:02:00 +03:00
parent 393932068d
commit 4bb7fdd1fc
1 changed files with 60 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
src/datasource-zabbix/dataProcessor.ts
View File

@@ -4,7 +4,7 @@ import _ from 'lodash';
import * as utils from './utils'; import * as utils from './utils';
import ts, { groupBy_perf as groupBy } from './timeseries'; import ts, { groupBy_perf as groupBy } from './timeseries';
import { getTemplateSrv } from '@grafana/runtime'; import { getTemplateSrv } from '@grafana/runtime';
import { DataFrame, Field } from '@grafana/data'; import { DataFrame, Field, FieldType, TIME_SERIES_VALUE_FIELD_NAME } from '@grafana/data';
const SUM = ts.SUM; const SUM = ts.SUM;
const COUNT = ts.COUNT; const COUNT = ts.COUNT;
@@ -74,15 +74,29 @@ function sortSeries(direction, timeseries: any[]) {
}], direction); }], direction);
} }
function setAlias(alias: string, field: Field) { function setAlias(alias: string, frame: DataFrame) {
if (field?.state?.scopedVars) { if (frame.fields?.length <= 2) {
alias = getTemplateSrv().replace(alias, field?.state?.scopedVars); const valueFileld = frame.fields.find(f => f.name === TIME_SERIES_VALUE_FIELD_NAME);
if (valueFileld?.state?.scopedVars) {
alias = getTemplateSrv().replace(alias, valueFileld?.state?.scopedVars);
}
frame.name = alias;
return frame;
} }
field.name = alias;
return field; for (let fieldIndex = 0; fieldIndex < frame.fields.length; fieldIndex++) {
const field = frame.fields[fieldIndex];
if (field.type !== FieldType.time) {
if (field?.state?.scopedVars) {
alias = getTemplateSrv().replace(alias, field?.state?.scopedVars);
}
field.name = alias;
}
}
return frame;
} }
function replaceAlias(regexp: string, newAlias: string, field: Field) { function replaceAlias(regexp: string, newAlias: string, frame: DataFrame) {
let pattern: string | RegExp; let pattern: string | RegExp;
if (utils.isRegex(regexp)) { if (utils.isRegex(regexp)) {
pattern = utils.buildRegex(regexp); pattern = utils.buildRegex(regexp);
@@ -90,21 +104,49 @@ function replaceAlias(regexp: string, newAlias: string, field: Field) {
pattern = regexp; pattern = regexp;
} }
let alias = field.name.replace(pattern, newAlias); if (frame.fields?.length <= 2) {
if (field?.state?.scopedVars) { let alias = frame.name.replace(pattern, newAlias);
alias = getTemplateSrv().replace(alias, field?.state?.scopedVars); const valueFileld = frame.fields.find(f => f.name === TIME_SERIES_VALUE_FIELD_NAME);
if (valueFileld?.state?.scopedVars) {
alias = getTemplateSrv().replace(alias, valueFileld?.state?.scopedVars);
}
frame.name = alias;
return frame;
} }
field.name = alias;
return field; for (const field of frame.fields) {
if (field.type !== FieldType.time) {
let alias = field.name.replace(pattern, newAlias);
if (field?.state?.scopedVars) {
alias = getTemplateSrv().replace(alias, field?.state?.scopedVars);
}
field.name = alias;
}
}
return frame;
} }
function setAliasByRegex(alias: string, field: Field) { function setAliasByRegex(alias: string, frame: DataFrame) {
try { if (frame.fields?.length <= 2) {
field.name = extractText(field.name, alias); try {
} catch (error) { frame.name = extractText(frame.name, alias);
console.error('Failed to apply RegExp:', error?.message || error); } catch (error) {
console.error('Failed to apply RegExp:', error?.message || error);
}
return frame;
} }
return field;
for (const field of frame.fields) {
if (field.type !== FieldType.time) {
try {
field.name = extractText(field.name, alias);
} catch (error) {
console.error('Failed to apply RegExp:', error?.message || error);
}
}
}
return frame;
} }
function extractText(str: string, pattern: string) { function extractText(str: string, pattern: string) {