Merge ed726d4 into 1f685cf

sodafoundation · May 28, 2019 · fe8d6f8 · fe8d6f8
2 parents 1f685cf + ed726d4
commit fe8d6f8
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/contrib/drivers/lvm/metrics_cli.go b/contrib/drivers/lvm/metrics_cli.go
@@ -24,6 +24,8 @@ import (
 const (
 	sarNotEnabledOut = "Please check if data collecting is enabled"
 	cmdNotFound      = "No such file or directory"
+	sarNotFound      = "Command 'sar' not found"
+	iostatNotFound   = "Command 'iostat' not found"
 )
 
 type MetricCli struct {
@@ -46,7 +48,7 @@ func (c *MetricCli) execute(cmd ...string) (string, error) {
 
 func isSarEnabled(out string) bool {
 
-	if strings.Contains(string(out), sarNotEnabledOut) || strings.Contains(string(out), cmdNotFound) {
+	if strings.Contains(string(out), sarNotEnabledOut) || strings.Contains(string(out), cmdNotFound) || strings.Contains(string(out), sarNotFound) {
 
 		return false
 	}
@@ -122,9 +124,9 @@ func (cli *MetricCli) CollectMetrics(metricList []string) ( /*returnMAp*/ map[st
 	} else {
 		cmd := []string{"env", "LC_ALL=C", "iostat", "-N"}
 		out, err := cli.execute(cmd...)
-		if strings.Contains(string(out), cmdNotFound) {
+		if strings.Contains(string(out), cmdNotFound) || strings.Contains(string(out), iostatNotFound) {
 			log.Errorf("iostat is not available: cmd.Run() failed with %s\n", err)
-			err = nil
+			return nil, nil, err
 		} else if err != nil {
 			log.Errorf("cmd.Run() failed with %s\n", err)
 			return nil, nil, err