Merge pull request #28 from obourdon/fix_4_issue_27

Fix for issue #27: smart plugin returns error if nothing is collected

smart/plugin.go

@@ -190,7 +190,9 @@ func (sc *SmartCollector) CollectMetrics(mts []plugin.MetricType) ([]plugin.Metr
 	for _, mt := range mts {
 		ns := mt.Namespace()
 		if !validateName(ns.Strings()) {
-			errs = append(errs, fmt.Sprintf("%s is not valid metric", ns.String()))
+			eStr := fmt.Sprintf("%s is not valid metric", ns.String())
+			sc.logger.Error(eStr)
+			errs = append(errs, eStr)
 			continue
 		}
 		disk, attribute_path := parseName(ns.Strings())
@@ -203,7 +205,9 @@ func (sc *SmartCollector) CollectMetrics(mts []plugin.MetricType) ([]plugin.Metr
 			for _, dev := range devices {
 				collected, result, err := sc.DiskMetrics(ns, t, dev, attribute_path, buffered_results, errs)
 				if err != nil {
-					sc.logger.Error(fmt.Sprintf("Error collecting SMART %s data on %s disk: %#+v", attribute_path, dev, err))
+					eStr := fmt.Sprintf("Error collecting SMART %s data on %s disk: %#+v", attribute_path, dev, err)
+					sc.logger.Error(eStr)
+					errs = append(errs, eStr)
 				} else {
 					if collected {
 						results = append(results, result)
@@ -213,10 +217,11 @@ func (sc *SmartCollector) CollectMetrics(mts []plugin.MetricType) ([]plugin.Metr
 			}
 		} else {
 			// Single disk requested
-
 			collected, result, err := sc.DiskMetrics(ns, t, disk, attribute_path, buffered_results, errs)
 			if err != nil {
-				sc.logger.Error(fmt.Sprintf("Error collecting SMART %s data on %s disk: %#+v", attribute_path, disk, err))
+				eStr := fmt.Sprintf("Error collecting SMART %s data on %s disk: %#+v", attribute_path, disk, err)
+				sc.logger.Error(eStr)
+				errs = append(errs, eStr)
 			} else {
 				if collected {
 					results = append(results, result)
@@ -226,14 +231,12 @@ func (sc *SmartCollector) CollectMetrics(mts []plugin.MetricType) ([]plugin.Metr
 		}
 	}
 	errsStr := strings.Join(errs, "; ")
-	if something_collected {
-		if len(errs) > 0 {
-			sc.logger.Error(fmt.Sprintf("Data collected but error(s) occured: %v", errsStr))
+	if len(errs) > 0 {
+		if !something_collected {
+			return nil, errors.New(errsStr)
 		}
-		return results, nil
-	} else {
-		return nil, errors.New(errsStr)
 	}
+	return results, nil
 }
 
 // GetMetricTypes returns the metric types exposed by smart

smart/plugin_test.go

@@ -279,7 +279,7 @@ func TestCollectMetrics(t *testing.T) {
 
 			ReadSmartData = func(device string,
 				sysutilProvider SysutilProvider) (*SmartValues, error) {
-				return &SmartValues{}, nil
+				return nil, errors.New("x not valid disk")
 			}
 
 			_, err := sc.CollectMetrics([]plugin.MetricType{
@@ -293,6 +293,11 @@ func TestCollectMetrics(t *testing.T) {
 
 				So(err, ShouldNotBeNil)
 
+				Convey("Error is about invalid metric", func() {
+
+					So(err.Error(), ShouldContainSubstring, "not valid disk")
+
+				})
 			})
 
 		})