Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

services setAlias experiments #1860

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/datasource/dataProcessor.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,9 @@ function setAlias(alias: string, frame: DataFrame) {
valueField.config.displayNameFromDS = alias;
}
frame.name = alias;
return frame;
if (valueField) {
return frame;
}
}

for (let fieldIndex = 0; fieldIndex < frame.fields.length; fieldIndex++) {
Expand Down
7 changes: 6 additions & 1 deletion src/datasource/datasource.ts
Original file line number Diff line number Diff line change
Expand Up @@ -511,7 +511,12 @@ export class ZabbixDatasource extends DataSourceApi<ZabbixMetricsQuery, ZabbixDS
const slaFilter = this.replaceTemplateVars(target.slaFilter, request.scopedVars);
const slas = await this.zabbix.getSLAs(slaFilter);
const result = await this.zabbix.getSLI(itservices, slas, timeRange, target, request);
return result;

const frame = result;
frame.refId = target.refId;
const resp = { data: [frame] };
this.applyFrontendFunctions(resp, request);
return resp.data;
}
const itservicesdp = await this.zabbix.getSLA(itservices, timeRange, target, request);
const backendRequest = responseHandler.itServiceResponseToTimeSeries(itservicesdp, target.slaInterval);
Expand Down
Loading