add host name to multiple text metrics

src/datasource-zabbix/datasource.js

@@ -68,8 +68,6 @@ class ZabbixAPIDatasource {
       (timeTo - timeFrom >= useTrendsRange)
     );
 
-    console.log(useTrends);
-
     // Get alerts for current panel
     if (this.alertingEnabled) {
       this.alertQuery(options).then(alert => {
@@ -245,21 +243,9 @@ class ZabbixAPIDatasource {
       .then(items => {
         if (items.length) {
           return this.zabbix.getHistory(items, timeFrom, timeTo)
-            .then(history => {
-              return responseHandler.convertHistory(history, items, false, (point) => {
-                let value = point.value;
-
-                // Regex-based extractor
-                if (target.textFilter) {
-                  value = extractText(point.value, target.textFilter, target.useCaptureGroups);
-                }
-
-                return [
-                  value,
-                  point.clock * 1000 + Math.round(point.ns / 1000000)
-                ];
-              });
-            });
+          .then(history => {
+            return responseHandler.handleText(history, items, target);
+          });
         } else {
           return Promise.resolve([]);
         }
@@ -558,19 +544,6 @@ function replaceTemplateVars(templateSrv, target, scopedVars) {
   return replacedTarget;
 }
 
-function extractText(str, pattern, useCaptureGroups) {
-  let extractPattern = new RegExp(pattern);
-  let extractedValue = extractPattern.exec(str);
-  if (extractedValue) {
-    if (useCaptureGroups) {
-      extractedValue = extractedValue[1];
-    } else {
-      extractedValue = extractedValue[0];
-    }
-  }
-  return extractedValue;
-}
-
 // Apply function one by one:
 // sequence([a(), b(), c()]) = c(b(a()));
 function sequence(funcsArray) {

src/datasource-zabbix/responseHandler.js

@@ -47,6 +47,38 @@ function handleTrends(history, items, valueType, addHostName = true) {
   return convertHistory(history, items, addHostName, convertPointCallback);
 }
 
+function handleText(history, items, target, addHostName = true) {
+  let convertTextCallback = _.partial(convertText, target);
+  return convertHistory(history, items, addHostName, convertTextCallback);
+}
+
+function convertText(target, point) {
+  let value = point.value;
+
+  // Regex-based extractor
+  if (target.textFilter) {
+    value = extractText(point.value, target.textFilter, target.useCaptureGroups);
+  }
+
+  return [
+    value,
+    point.clock * 1000 + Math.round(point.ns / 1000000)
+  ];
+}
+
+function extractText(str, pattern, useCaptureGroups) {
+  let extractPattern = new RegExp(pattern);
+  let extractedValue = extractPattern.exec(str);
+  if (extractedValue) {
+    if (useCaptureGroups) {
+      extractedValue = extractedValue[1];
+    } else {
+      extractedValue = extractedValue[0];
+    }
+  }
+  return extractedValue;
+}
+
 function handleSLAResponse(itservice, slaProperty, slaObject) {
   var targetSLA = slaObject[itservice.serviceid].sla[0];
   if (slaProperty.property === 'status') {
@@ -108,6 +140,7 @@ export default {
   handleHistory: handleHistory,
   convertHistory: convertHistory,
   handleTrends: handleTrends,
+  handleText: handleText,
   handleSLAResponse: handleSLAResponse
 };