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

Fix scoped vars for alias functions

Browse Source
This commit is contained in:
Alexander Zobnin
2021-06-02 14:54:32 +03:00
parent e1557e3924
commit 4ec5616029
3 changed files with 29 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -77,8 +77,8 @@ function sortSeries(direction, timeseries: any[]) {
function setAlias(alias: string, frame: DataFrame) {
if (frame.fields?.length <= 2) {
const valueFileld = frame.fields.find(f => f.name === TIME_SERIES_VALUE_FIELD_NAME);
if (valueFileld?.state?.scopedVars) {
alias = getTemplateSrv().replace(alias, valueFileld?.state?.scopedVars);
if (valueFileld?.config?.custom?.scopedVars) {
alias = getTemplateSrv().replace(alias, valueFileld?.config?.custom?.scopedVars);
}
frame.name = alias;
return frame;
@@ -87,8 +87,8 @@ function setAlias(alias: string, frame: DataFrame) {
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);
if (field?.config?.custom?.scopedVars) {
alias = getTemplateSrv().replace(alias, field?.config?.custom?.scopedVars);
}
field.name = alias;
}