summaryrefslogtreecommitdiff
path: root/manifests/defaults
AgeCommit message (Collapse)Author
2013-02-27delete commented nagios_host and -service template definitionsvarac
2013-02-14Merge branch 'add_pnp4nagios' of ssh://code.leap.se/puppet_nagios into ↵Micah Anderson
add_pnp4nagios Conflicts: README.pnp4nagios manifests/defaults/pnp4nagios.pp manifests/pnp4nagios.pp manifests/pnp4nagios/popup.pp
2013-02-14lintian of pnp4nagios commitsMicah Anderson
2013-02-14basic pnp4nagios grapher integrationvarac
2013-01-02Merge remote-tracking branch 'riseup/master' into HEADmh
Conflicts: manifests/apache.pp manifests/base.pp manifests/defaults/templates.pp manifests/defaults/vars.pp manifests/init.pp manifests/irc_bot.pp manifests/nsca/client.pp manifests/nsca/server.pp manifests/service.pp manifests/service/mysql.pp templates/irc_bot/nsa.cfg.erb
2012-09-19basic pnp4nagios grapher integrationvarac
2012-06-272.7 underscore rename: site-nagiosMicah Anderson
2012-06-05new style for 2.7mh
2012-05-05Merge pull request #4 from efroese/http-checkduritong
Add the port arg to check_http_url_regex. Default 80.
2012-05-01Remove unnecessary jabber dependency.Erik Froese
2012-05-01Add the port arg to check_http_url_regex. Default 80.Erik Froese
2012-04-18Fully qualify facter variables to suppress warningsChristian G. Warden
merge conflict due to immerda's branch not being up-to-date on the bot
2012-02-02Merge remote-tracking branch 'github/master'mh
2012-02-01Fully qualify facter variables to suppress warningsChristian G. Warden
2011-12-08Merge branch 'master' into riseupMicah Anderson
2011-12-08Revert "Fix nagios check_smtp duplicate definition"Micah Anderson
This reverts commit fb75fcec220f9e2943d2e7af292ff884fd237f6d. Reverted due to LeLutin's comments in #3310 and the fix implemented in #3298 in preparation of merging those
2011-09-15Host alerts not parsing variables due to excessive escaping (#3456)Silvio Rhatto
2011-04-12add check_git command to debian/ubuntu as wellMicah Anderson
2011-04-12Fix nagios check_smtp duplicate definitionMicah Anderson
On Debian, the nagios-plugins packages install /etc/nagios-plugins/config/mail.cfg which contains the check_smtp/check_imap commands, and these commands cannot be duplicated. The addition of these commands in this module in c9c4f5bb895e98e31d84c751a7fcbdae9bf57008 and 1c4de48baf4ffcf5f39894a101a3c59479959b47 now cause Debian nagios servers to fail to start with this message: Warning: Duplicate definition found for command 'check_smtp' (config file '/etc/starting on line 9) The versions of these check commands that were added in the above commits are actually more full-featured than the ones that Debian ships, most notably because they allow for the port to be passed as an option. In most cases their names are the same, although the imap and pop ssl commands are different. This leads to a somewhat unfortunate situation where the module defines duplicated commands, which are better, but in some cases are differently named than the ones shipped in the package. Ideally, those names would converge, and the debian package commands would add the port options by default, and we'd case out debian/ubuntu to not ship these in this module. However, due to the added benefit of the options provided in the commands shipped in this module, along with the benefits that come with the module being able to automatically configure these, I've elected to simply remove the debian package file (which is a config file, so it will be honored by the packaging system).
2011-04-11Merge commit 'f2df62c9d17d481a3d616a4f2de9496638fadc0a'Micah Anderson
Conflicts: manifests/defaults/commands.pp
2011-04-06try to fix nagios::plugin problemmh
We have a serious problem with the concept that we had up to now if you start adding more than one nagios server. This is an attempt to fix it, with certain drawbacks, such as that you have to list all the nagios plugins in the nagios modules. This will be subject of further discussion.
2011-03-06add dnsbl check commandmh
2011-03-06add and deploy check_dnsbl scriptmh
2011-02-07we need also to escape the $mh
2011-02-07escape new line as we have now double bracketsmh
2011-02-07fix mail cmd on centosmh
2010-12-25fix the --warning --critical by appending it as optional ending arguments in ↵Micah Anderson
the command specifier
2010-12-12add imap and pop3 commandsmh
2010-12-12fix typomh
2010-12-12include the commands at the right placemh
2010-10-23define commands at the right placemh
2010-10-23add some more http(s) testsmh
2010-10-21fix typo in commandsmh
2010-10-21add check_dns2mh
check_dns had some problems with down nameservers. This one properly checks the right nameserver.
2010-10-20add check_git commandmh
2010-10-20rename check_ssh port cmd, add ssh_port_host cmdmh
2010-10-18. add the check_mysql_health pluginMicah Anderson
. add an additional nagios::defaults::plugins class that is included in the nagios::defaults, this can be used to install other nagios plugins that aren't distributed in the nagios-plugins package . use the nagios::defaults::plugins to setup the check_mysql_health plugin . add a check_mysql_health command to defaults/commands.pp in the section for commands for services defined by other modules . change the nagios::service::mysql to use the more advanced check_mysql_health plugin, instead of the basic check_mysql plugin
2010-08-07remove unnecessary fileserver variable (#2460)mh
2010-07-01fix variable lookup and allow outside settingmh
2010-07-01use proper check cmd namemh
2010-07-01Merge remote branch 'riseup/master'mh
2010-06-28some whitespacemh
2010-06-28whitespace issuemh
2010-06-28whitespace cleanupmh
2010-02-20remove check_ssh_port duplicate command definitionMicah Anderson
2010-02-20remove another duplicated check_command definitionMicah Anderson
2010-02-20fix another syntax error from the previous commitMicah Anderson
2010-02-20add back the accidentally removed nagios_command pieceMicah Anderson
2010-02-20the debian package nagios-plugins and nagios-plugins-basic defines aMicah Anderson
number of the check_commands that were being defined by this module, this caused duplicate definition issues, so to solve this we don't define the subset of commands on debian/ubuntu systems that are handled by the package, but let other operatingsystems define them (as they were before)
2010-02-20remove the classification of the $nagios_cfgdir variable. this is theMicah Anderson
only location where specific classification is done, and this anomaly prohibits you from setting the variable in site.pp