Merge branch 'main' of github.com:bisohns/saido into FEAT/web-dashboard

client/controller.go

@@ -76,6 +76,9 @@ func (hosts *HostsController) sendMetric(host config.Host, client *Client) {
 	for metric, custom := range hosts.Info.Metrics {
 		driver := hosts.getDriver(host.Address)
 		initializedMetric, err := inspector.Init(metric, driver, custom)
+		if err != nil {
+			log.Error(err)
+		}
 		data, err := initializedMetric.Execute()
 		if err == nil {
 			var unmarsh interface{}

config/config.go

@@ -5,6 +5,7 @@ import (
 	"io/ioutil"
 
 	"github.com/bisohns/saido/driver"
+	"github.com/bisohns/saido/inspector"
 	"github.com/mitchellh/mapstructure"
 	log "github.com/sirupsen/logrus"
 
@@ -102,7 +103,12 @@ func GetDashboardInfoConfig(config *Config) *DashboardInfo {
 
 	dashboardInfo.Hosts = parseConfig("root", "", config.Hosts, &Connection{})
 	for metric, customCommand := range config.Metrics {
-		metrics[fmt.Sprintf("%v", metric)] = fmt.Sprintf("%v", customCommand)
+		metric := fmt.Sprintf("%v", metric)
+		if inspector.Valid(metric) {
+			metrics[metric] = fmt.Sprintf("%v", customCommand)
+		} else {
+			log.Fatalf("Found invalid metric %v", metric)
+		}
 	}
 	dashboardInfo.Metrics = metrics
 	for _, host := range dashboardInfo.Hosts {

driver/local.go

@@ -41,6 +41,7 @@ func (d *Local) RunCommand(command string) (string, error) {
 	if d.Info.IsLinux || d.Info.IsDarwin {
 		cmd = exec.Command("bash", "-c", command)
 	} else {
+		command = strings.ReplaceAll(command, "\\", "")
 		cmd = exec.Command("cmd", "/C", command)
 	}
 	cmd.Env = os.Environ()

inspector/custom.go

@@ -67,7 +67,7 @@ func NewCustom(driver *driver.Driver, custom ...string) (Inspector, error) {
 		return nil, errors.New("Must specify command for custom")
 	}
 	customInspector = &Custom{
-		Command: fmt.Sprintf(`%s`, custom[0]),
+		Command: custom[0],
 	}
 	customInspector.SetDriver(driver)
 	return customInspector, nil

inspector/inspector.go

@@ -30,6 +30,16 @@ var inspectorMap = map[string]NewInspector{
 	`responsetime`: NewResponseTime,
 }
 
+// Valid : checks if inspector is a valid inspector
+func Valid(name string) bool {
+	for key, _ := range inspectorMap {
+		if name == key {
+			return true
+		}
+	}
+	return false
+}
+
 // Init : initializes the specified inspector using name and driver
 func Init(name string, driver *driver.Driver, custom ...string) (Inspector, error) {
 	val, ok := inspectorMap[name]