Fixes

Author: anushree-n

collector/generic_collector.go

@@ -16,7 +16,7 @@ package collector
 
 import (
 	"encoding/json"
-	"errors"
+	"fmt"
 	"io/ioutil"
 	"net/http"
 	"regexp"
@@ -95,15 +95,15 @@ func (collector *GenericCollector) Collect() (time.Time, []v2.Metric, error) {
 
 		matchString := regex.FindStringSubmatch(string(pageContent))
 		if matchString != nil {
-			if strings.Contains(matchString[1], ".") {
+			if metricConfig.Units == "float" {
 				regVal, err := strconv.ParseFloat(strings.TrimSpace(matchString[1]), 64)
 				if err != nil {
 					errorSlice = append(errorSlice, err)
 				}
 				metrics[ind].FloatPoints = []v2.FloatPoint{
 					{Value: regVal, Timestamp: currentTime},
 				}
-			} else {
+			} else if metricConfig.Units == "integer" || metricConfig.Units == "int" {
 				regVal, err := strconv.ParseInt(strings.TrimSpace(matchString[1]), 10, 64)
 				if err != nil {
 					errorSlice = append(errorSlice, err)
@@ -112,9 +112,11 @@ func (collector *GenericCollector) Collect() (time.Time, []v2.Metric, error) {
 					{Value: regVal, Timestamp: currentTime},
 				}
 
+			} else {
+				errorSlice = append(errorSlice, fmt.Errorf("Unexpected value of 'units' for metric '%v' in config ", metricConfig.Name))
 			}
 		} else {
-			errorSlice = append(errorSlice, errors.New("No match found for metric regexp: "+metricConfig.Regex))
+			errorSlice = append(errorSlice, fmt.Errorf("No match found for regexp: %v for metric '%v' in config", metricConfig.Regex, metricConfig.Name))
 		}
 
 		metrics[ind].Name = metricConfig.Name