lib/scout/command.rb in scout-5.9.8.pre vs lib/scout/command.rb in scout-5.9.8
- old
+ new
@@ -95,18 +95,10 @@
opts.on( "-e", "--environment ENVIRONMENT", String, "Environment for this server. Environments are defined through scoutapp.com's web UI" ) do |environment|
options[:environment] = environment
end
- opts.on( "--nagios [NRPE CONFIG PATH]", "Run Nagios plugins defined in the specified NRPE config file. If no path is provided, plugins are loaded from '/etc/nagios/nrpe.cfg'." ) do |nrpe_config_file_path|
- options[:nrpe_config_file_path] = nrpe_config_file_path || '/etc/nagios/nrpe.cfg'
- end
-
- opts.on( "--munin [MUNIN PLUGIN PATH]", "Load Munin plugins from the specified path. If no path is provided, plugins are loaded from '/etc/munin/plugins'." ) do |munin_plugin_path|
- options[:munin_plugin_path] = munin_plugin_path || '/etc/munin/plugins'
- end
-
opts.separator " "
opts.separator "Common Options:"
opts.separator "--------------------------------------------------------------------------"
opts.on( "-h", "--help",
"Show this message." ) do
@@ -190,11 +182,9 @@
@server_name = options[:server_name]
@http_proxy = options[:http_proxy] || ""
@https_proxy = options[:https_proxy] || ""
@hostname = options[:hostname] || Socket.gethostname
@environment = options[:environment] || ""
- @munin_plugin_path = options[:munin_plugin_path]
- @nrpe_config_file_path = options[:nrpe_config_file_path]
@options = options
@args = args
# create config dir if necessary
@config_dir = File.dirname(history)