Skip to content

Commit

Permalink
remove monit integration
Browse files Browse the repository at this point in the history
Not setup to test integration and it's unknown if this functionality is working.  Support should be re-added with integration tests.
  • Loading branch information
Joshua Hoblitt committed Sep 14, 2013
1 parent 834f73f commit cede61e
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 24 deletions.
5 changes: 0 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,6 @@ with this controller so haven't written the necessary code to use FreeBSD's
standard mfiutil(8) utility instead. The `shell_config` module is required to
edit a Debian-specific configuration file; other OS families do not require it.

The module automatically configures a virtual `monit::monitor` resource (tag =>
default) to keep track of `smartd`. Note that `smartd` can take a very long
time to (re)start, so if you have a large number of disk devices (e.g., 200 on
a big ZFS file server) you will need to adjust `monit`'s startup delay.

Currently, drives behind an LSI MegaRAID controller will be automatically
probed and added to the `smartd` configuration file, if the `MegaCli` utility
is installed. There is no way to turn this behavior off. This is arguably a
Expand Down
18 changes: 0 additions & 18 deletions manifests/init.pp
Original file line number Diff line number Diff line change
Expand Up @@ -90,14 +90,6 @@
#
# defaults to: 'daily'
#
# [*enable_monit*]
# Boolean.
#
# Enable integration with the monitor module:
# http://tig.csail.mit.edu/git-public/monit.git/
#
# defaults to: false
#
# === Authors
#
# MIT Computer Science & Artificial Intelligence Laboratory
Expand All @@ -119,14 +111,12 @@
$device_opts = $smartd::params::device_opts,
$mail_to = $smartd::params::mail_to,
$warning_schedule = $smartd::params::warning_schedule,
$enable_monit = $smartd::params::enable_monit,
) inherits smartd::params {
validate_re($ensure, '^present$|^latest$|^absent$|^purged$')
validate_re($service_ensure, '^running$|^stopped$')

# Validate our booleans
validate_bool($devicescan)
validate_bool($enable_monit)

# Validate our hashs
validate_hash($device_opts)
Expand Down Expand Up @@ -189,12 +179,4 @@
}
}

# Let monit monitor smartd, if configured.
if $enable_monit {
@monit::monitor {$service_name:
ensure => $file_ensure,
pidfile => "/var/run/${service_name}.pid",
tag => 'default',
}
}
}
1 change: 0 additions & 1 deletion manifests/params.pp
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
$device_opts = {}
$mail_to = 'root'
$warning_schedule = 'daily' # other choices: once, diminishing
$enable_monit = false

case $::osfamily {
'FreeBSD': {
Expand Down

0 comments on commit cede61e

Please sign in to comment.