add host name to multiple text metrics

dist/test/datasource-zabbix/datasource.js

@@ -113,8 +113,6 @@ var ZabbixAPIDatasource = function () {
       var useTrendsRange = Math.ceil(utils.parseInterval(this.trendsRange) / 1000);
       var useTrends = this.trends && (timeFrom <= useTrendsFrom || timeTo - timeFrom >= useTrendsRange);
 
-      console.log(useTrends);
-
       // Get alerts for current panel
       if (this.alertingEnabled) {
         this.alertQuery(options).then(function (alert) {
@@ -300,16 +298,7 @@ var ZabbixAPIDatasource = function () {
       return this.zabbix.getItemsFromTarget(target, options).then(function (items) {
         if (items.length) {
           return _this3.zabbix.getHistory(items, timeFrom, timeTo).then(function (history) {
-            return _responseHandler2.default.convertHistory(history, items, false, function (point) {
-              var 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)];
-            });
+            return _responseHandler2.default.handleText(history, items, target);
           });
         } else {
           return Promise.resolve([]);
@@ -623,19 +612,6 @@ function replaceTemplateVars(templateSrv, target, scopedVars) {
   return replacedTarget;
 }
 
-function extractText(str, pattern, useCaptureGroups) {
-  var extractPattern = new RegExp(pattern);
-  var 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) {

dist/test/datasource-zabbix/responseHandler.js

@@ -62,6 +62,37 @@ function handleTrends(history, items, valueType) {
   return convertHistory(history, items, addHostName, convertPointCallback);
 }
 
+function handleText(history, items, target) {
+  var addHostName = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : true;
+
+  var convertTextCallback = _lodash2.default.partial(convertText, target);
+  return convertHistory(history, items, addHostName, convertTextCallback);
+}
+
+function convertText(target, point) {
+  var 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) {
+  var extractPattern = new RegExp(pattern);
+  var 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') {
@@ -112,6 +143,7 @@ exports.default = {
   handleHistory: handleHistory,
   convertHistory: convertHistory,
   handleTrends: handleTrends,
+  handleText: handleText,
   handleSLAResponse: handleSLAResponse
 };