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

Fix displaying metric names and alias functions, closes #1444

Browse Source
This commit is contained in:
Alexander Zobnin
2022-05-06 12:17:06 +03:00
parent 6d8689c660
commit 84419de6f5
2 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/datasource/response_handler.go
View File

@@ -103,8 +103,8 @@ func convertTimeSeriesToDataFrames(series []*timeseries.TimeSeriesData, valuemap
} }
func seriesToDataFrame(series *timeseries.TimeSeriesData, valuemaps []zabbix.ValueMap) *data.Frame { func seriesToDataFrame(series *timeseries.TimeSeriesData, valuemaps []zabbix.ValueMap) *data.Frame {
timeFileld := data.NewFieldFromFieldType(data.FieldTypeTime, 0) timeField := data.NewFieldFromFieldType(data.FieldTypeTime, 0)
timeFileld.Name = data.TimeSeriesTimeFieldName timeField.Name = data.TimeSeriesTimeFieldName
seriesName := series.Meta.Name seriesName := series.Meta.Name
valueField := data.NewFieldFromFieldType(data.FieldTypeNullableFloat64, 0) valueField := data.NewFieldFromFieldType(data.FieldTypeNullableFloat64, 0)
@@ -136,6 +136,7 @@ func seriesToDataFrame(series *timeseries.TimeSeriesData, valuemaps []zabbix.Val
} }
valueField.Config = &data.FieldConfig{ valueField.Config = &data.FieldConfig{
DisplayNameFromDS: seriesName,
Custom: map[string]interface{}{ Custom: map[string]interface{}{
"scopedVars": scopedVars, "scopedVars": scopedVars,
"units": item.Units, "units": item.Units,
@@ -147,10 +148,10 @@ func seriesToDataFrame(series *timeseries.TimeSeriesData, valuemaps []zabbix.Val
valueField.Config.Mappings = mappings valueField.Config.Mappings = mappings
} }
frame := data.NewFrame(seriesName, timeFileld, valueField) frame := data.NewFrame(seriesName, timeField, valueField)
for _, point := range series.TS { for _, point := range series.TS {
timeFileld.Append(point.Time) timeField.Append(point.Time)
valueField.Append(point.Value) valueField.Append(point.Value)
} }

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

@@ -9,6 +9,9 @@ function setAlias(alias: string, frame: DataFrame) {
if (valueField?.config?.custom?.scopedVars) { if (valueField?.config?.custom?.scopedVars) {
alias = getTemplateSrv().replace(alias, valueField?.config?.custom?.scopedVars); alias = getTemplateSrv().replace(alias, valueField?.config?.custom?.scopedVars);
} }
if (valueField) {
valueField.config.displayNameFromDS = alias;
}
frame.name = alias; frame.name = alias;
return frame; return frame;
} }
@@ -19,7 +22,7 @@ function setAlias(alias: string, frame: DataFrame) {
if (field?.config?.custom?.scopedVars) { if (field?.config?.custom?.scopedVars) {
alias = getTemplateSrv().replace(alias, field?.config?.custom?.scopedVars); alias = getTemplateSrv().replace(alias, field?.config?.custom?.scopedVars);
} }
field.name = alias; field.config.displayNameFromDS = alias;
} }
} }
return frame; return frame;
@@ -39,17 +42,20 @@ function replaceAlias(regexp: string, newAlias: string, frame: DataFrame) {
if (valueField?.state?.scopedVars) { if (valueField?.state?.scopedVars) {
alias = getTemplateSrv().replace(alias, valueField?.state?.scopedVars); alias = getTemplateSrv().replace(alias, valueField?.state?.scopedVars);
} }
if (valueField) {
valueField.config.displayNameFromDS = alias;
}
frame.name = alias; frame.name = alias;
return frame; return frame;
} }
for (const field of frame.fields) { for (const field of frame.fields) {
if (field.type !== FieldType.time) { if (field.type !== FieldType.time) {
let alias = field.name.replace(pattern, newAlias); let alias = field.config?.displayNameFromDS?.replace(pattern, newAlias);
if (field?.state?.scopedVars) { if (field?.state?.scopedVars && alias) {
alias = getTemplateSrv().replace(alias, field?.state?.scopedVars); alias = getTemplateSrv().replace(alias, field?.state?.scopedVars);
} }
field.name = alias; field.name = alias || field.name;
} }
} }
return frame; return frame;
@@ -57,7 +63,11 @@ function replaceAlias(regexp: string, newAlias: string, frame: DataFrame) {
function setAliasByRegex(alias: string, frame: DataFrame) { function setAliasByRegex(alias: string, frame: DataFrame) {
if (frame.fields?.length <= 2) { if (frame.fields?.length <= 2) {
const valueField = frame.fields.find(f => f.name === TIME_SERIES_VALUE_FIELD_NAME);
try { try {
if (valueField) {
valueField.config.displayNameFromDS = extractText(valueField.config?.displayNameFromDS, alias);
}
frame.name = extractText(frame.name, alias); frame.name = extractText(frame.name, alias);
} catch (error) { } catch (error) {
console.error('Failed to apply RegExp:', error?.message || error); console.error('Failed to apply RegExp:', error?.message || error);
@@ -68,7 +78,7 @@ function setAliasByRegex(alias: string, frame: DataFrame) {
for (const field of frame.fields) { for (const field of frame.fields) {
if (field.type !== FieldType.time) { if (field.type !== FieldType.time) {
try { try {
field.name = extractText(field.name, alias); field.config.displayNameFromDS = extractText(field.config?.displayNameFromDS, alias);
} catch (error) { } catch (error) {
console.error('Failed to apply RegExp:', error?.message || error); console.error('Failed to apply RegExp:', error?.message || error);
} }