[bugfix] fix error message when esxcli graphics fails

tesibelda · Jun 17, 2023 · f85c427 · f85c427
1 parent 1b50232
commit f85c427
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 18 deletions.
diff --git a/internal/vccollector/graphics.go b/internal/vccollector/graphics.go
@@ -52,29 +52,17 @@ func (c *VcCollector) CollectHostGraphics(
 			}
 			startTime = time.Now()
 			if x, err = esxcli.NewExecutor(c.client.Client, host); err != nil {
-				acc.AddError(
-					fmt.Errorf(
-						"could not get esxcli executor for host %s: %w",
-						host.Name(),
-						err,
-					),
-				)
+				hostExecutorNewAddError(acc, host.Name(), err)
 				continue
 			}
 			res, err = x.Run([]string{"graphics", "device", "stats", "list"})
 			hostSt.setMeanResponseTime(time.Since(startTime), c.maxResponseDuration)
 			if err != nil {
+				hostExecutorRunAddError(acc, "graphics device", host.Name(), err)
+				hostSt.setNotResponding(true)
 				if exit, err := govplus.IsHardQueryError(err); exit {
 					return err
 				}
-				acc.AddError(
-					fmt.Errorf(
-						"could not run esxcli storage executor against host %s: %w",
-						host.Name(),
-						err,
-					),
-				)
-				hostSt.setNotResponding(true)
 				continue
 			}
 			t = time.Now()

diff --git a/internal/vccollector/host.go b/internal/vccollector/host.go
@@ -161,7 +161,7 @@ func (c *VcCollector) CollectHostHBA(
 			res, err = x.Run([]string{"storage", "core", "adapter", "list"})
 			hostSt.setMeanResponseTime(time.Since(startTime), c.maxResponseDuration)
 			if err != nil {
-				hostExecutorRunAddError(acc, "storage", host.Name(), err)
+				hostExecutorRunAddError(acc, "storage core", host.Name(), err)
 				hostSt.setNotResponding(true)
 				if exit, err := govplus.IsHardQueryError(err); exit {
 					return err
@@ -233,7 +233,7 @@ func (c *VcCollector) CollectHostNIC(
 			res, err = x.Run([]string{"network", "nic", "list"})
 			hostSt.setMeanResponseTime(time.Since(startTime), c.maxResponseDuration)
 			if err != nil {
-				hostExecutorRunAddError(acc, "nic", host.Name(), err)
+				hostExecutorRunAddError(acc, "network nic", host.Name(), err)
 				hostSt.setNotResponding(true)
 				if exit, err := govplus.IsHardQueryError(err); exit {
 					return err
@@ -309,7 +309,7 @@ func (c *VcCollector) CollectHostFw(
 			res, err = x.Run([]string{"network", "firewall", "get"})
 			hostSt.setMeanResponseTime(time.Since(startTime), c.maxResponseDuration)
 			if err != nil {
-				hostExecutorRunAddError(acc, "firewall", host.Name(), err)
+				hostExecutorRunAddError(acc, "network firewall", host.Name(), err)
 				hostSt.setNotResponding(true)
 				if exit, err := govplus.IsHardQueryError(err); exit {
 					return err