wip

grafana · Jul 30, 2024 · f2c04a9 · f2c04a9
1 parent 62a292d
commit f2c04a9
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/src/datasource/dataProcessor.ts b/src/datasource/dataProcessor.ts
@@ -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++) {

diff --git a/src/datasource/datasource.ts b/src/datasource/datasource.ts
@@ -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);