Allow to switch software RAID monitoring using config option 'softwar…

…e_raid_monitoring'
cloudradar-monitoring · Jan 10, 2020 · 3bec3ef · 3bec3ef
1 parent a7c09ab
commit 3bec3ef
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 5 deletions.
diff --git a/config.go b/config.go
@@ -106,6 +106,8 @@ type Config struct {
 
 	TemperatureMonitoring bool `toml:"temperature_monitoring" comment:"default true"`
 
+	SoftwareRAIDMonitoring bool `toml:"software_raid_monitoring" comment:"Software raid monitoring\nAuto-detect software raids by reading /proc/mdstat and monitor them\ndefault true"`
+
 	SMARTMonitoring bool            `toml:"smart_monitoring" comment:"Enable S.M.A.R.T monitoring of hard disks\ndefault false"`
 	SMARTCtl        string          `toml:"smartctl" comment:"Path to a smartctl binary (smartctl.exe on windows, path must be escaped) version >= 7\nSee https://docs.cloudradar.io/configuring-hosts/installing-agents/troubleshoot-s.m.a.r.t-monitoring\nsmartctl = \"C:\\\\Program Files\\\\smartmontools\\\\bin\\\\smartctl.exe\"\nsmartctl = \"/usr/local/bin/smartctl\""`
 	Logs            LogsFilesConfig `toml:"logs,omitempty"`
@@ -203,8 +205,9 @@ func NewConfig() *Config {
 			ReportProcesses:                5,
 			TrailingProcessAnalysisMinutes: 5,
 		},
-		SMARTMonitoring:       false,
-		TemperatureMonitoring: true,
+		SMARTMonitoring:        false,
+		TemperatureMonitoring:  true,
+		SoftwareRAIDMonitoring: true,
 		Logs: LogsFilesConfig{
 			HubFile: "",
 		},

diff --git a/example.config.toml b/example.config.toml
@@ -61,6 +61,11 @@ hardware_inventory = true
 discover_autostarting_services_only = true
 temperature_monitoring = true # default true
 
+# Software raid monitoring
+# Auto-detect software raids by reading /proc/mdstat and monitor them
+# default true
+software_raid_monitoring = true
+
 # default
 [cpu_utilisation_analysis]
   threshold = 10.0 # target value to start the analysis

diff --git a/modules.go b/modules.go
@@ -22,7 +22,7 @@ func (ca *Cagent) initModules() {
 			return storcli.CreateModule(ca.Config.StorCLI.BinaryPath)
 		},
 		func() monitoring.Module {
-			return raid.CreateModule()
+			return raid.CreateModule(ca.Config.SoftwareRAIDMonitoring)
 		},
 	}
 

diff --git a/pkg/monitoring/raid/raid.go b/pkg/monitoring/raid/raid.go
@@ -24,11 +24,13 @@ var log = logrus.WithField("package", "raid")
 
 type RAID struct {
 	mdstatFilePath string
+	enabled        bool
 }
 
-func CreateModule() monitoring.Module {
+func CreateModule(enabled bool) monitoring.Module {
 	return &RAID{
 		mdstatFilePath: common.HostProc("mdstat"),
+		enabled:        enabled,
 	}
 }
 
@@ -37,7 +39,7 @@ func (r *RAID) GetDescription() string {
 }
 
 func (r *RAID) IsEnabled() bool {
-	return runtime.GOOS == "linux"
+	return r.enabled && runtime.GOOS == "linux"
 }
 
 func (r *RAID) readAndParseMdstat() raidArrays {