Merge branch 'main' of https://github.com/bisohns/saido

Author: silvareal

client/controller.go

@@ -103,8 +103,12 @@ func (hosts *HostsController) sendMetric(host config.Host, client *Client) {
 			log.Error(errorContent)
 			hosts.resetDriver(host)
 			message := &SendMessage{
-				Message: errorContent,
-				Error:   true,
+				Message: ErrorMessage{
+					Error: errorContent,
+					Host:  host.Address,
+					Name:  metric,
+				},
+				Error: true,
 			}
 			client.Send <- message
 		}

client/messages.go

@@ -5,6 +5,12 @@ type SendMessage struct {
 	Message interface{}
 }
 
+type ErrorMessage struct {
+	Host  string
+	Error string
+	Name  string
+}
+
 type Message struct {
 	Host     string
 	Name     string

inspector/disk.go

@@ -222,15 +222,15 @@ func NewDF(driver *driver.Driver, _ ...string) (Inspector, error) {
 			// always reported in posix standard of 1K-blocks
 			Command:         `df -a -k`,
 			RawByteSize:     `KB`,
-			DisplayByteSize: `GB`,
+			DisplayByteSize: `MB`,
 		}
 	} else {
 		df = &DFWin{
 			// Using format to account for weird spacing
 			// issues that arise on windows
 			Command:         `wmic logicaldisk list brief /format:csv`,
 			RawByteSize:     `B`,
-			DisplayByteSize: `GB`,
+			DisplayByteSize: `MB`,
 		}
 	}
 	df.SetDriver(driver)

inspector/docker_stats.go

@@ -126,7 +126,8 @@ func NewDockerStats(driver *driver.Driver, _ ...string) (Inspector, error) {
 		return nil, errors.New("Cannot use LoadAvgDarwin on drivers outside (linux, darwin, windows)")
 	}
 	dockerstats = &DockerStats{
-		Command: `docker stats --no-stream`,
+		Command:         `docker stats --no-stream`,
+		DisplayByteSize: `MB`,
 	}
 	dockerstats.SetDriver(driver)
 	return dockerstats, nil