summaryrefslogtreecommitdiff
path: root/manifests
AgeCommit message (Collapse)Author
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-07-14Merge remote-tracking branch 'remotes/lelutin/bot_fixes'Micah Anderson
Conflicts: manifests/irc_bot.pp Had to merge in the use_notices change that we had in our branch
2011-07-14Branching the definition for smtp, imap and pop3 commandsSilvio Rhatto
2011-07-14IRC-bot: split up manifests by OSGabriel Filion
This gives us the possibility of using the nagios::irc_bot::disable class without having any config variable set. When using nagios::irc_bot, we still get yelled at when we didn't define the appropriate variables. While we're moving the code around, change the group applied on the different files from 'root' to '0' for better portability.
2011-07-14IRC-bot: rename nagios::irc_bot::disabled to nagios::irc_bot::disableGabriel Filion
All classes serving the same purpose as this one are called 'disable', so let's follow this standard.
2011-07-14IRC-bot: use 'enable' for DebianGabriel Filion
Since the service "disable" bug was fixed in the debian service provider [1] in the puppet 2.6.2-5 package in squeeze, let's switch from the manual calls to the "enable" feature. [1]: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=573551 Also add a requirement between service[nagios-nsa] and file[/etc/init.d/nagios-nsa]. This was ensured in Debian with the exec that we're now replacing but didn't find its way through the centosification.
2011-07-14IRC bot: add a 'disabled' classGabriel Filion
For when you need to ensure that the bot doesn't start on a server.
2011-07-14Add a dependency between the IRC bot config and serviceGabriel Filion
When we modify the config file, we'd like for the service to restart in order for it to use the new configuration.
2011-07-14Change IRC notifications to #/#maxGabriel Filion
To give a little more info/meaning on what the number $SERVICEATTEMPT$ is, change the current notification from "... n.$SERVICEATTEMPT$" to "... $SERVICEATTEMPT$/$MAXSERVICEATTEMPTS$".
2011-07-13Minor style changeSilvio Rhatto
2011-07-13Do not define check_imap on debianSilvio Rhatto
2011-07-13Do not define check_ssmtp on debianSilvio Rhatto
2011-07-13Debian doesn't need explicit check_smtp definition (2)Silvio Rhatto
This plugin is already defined at nagios-plugins, so removing it for the same reason as e7f85f647e6f641bd85fbdfdb26982350f782370. This commit has more readable implementation than the previous.
2011-07-13Debian doesn't need explicit check_smtp definitionSilvio Rhatto
This plugin is already defined at nagios-plugins, so removing it for the same reason as e7f85f647e6f641bd85fbdfdb26982350f782370.
2011-07-13Ensure commands.cfg existsSilvio Rhatto
The file commands.cfg was introduced at 61aab91919b2e6d9cb5d7afe3befe40de67ac132. This change make sure the file exists so nagios doesn't stop running.
2011-04-28add configuration variable to irc bot to enable IRC notice type messages ↵Micah Anderson
which can be turned on by the puppet variable $nagios_nsa_usenotices
2011-04-28fix formatting to be standardMicah Anderson
2011-04-19add the potential for the --name to be set for arbitrary sql commandsMicah Anderson
2011-04-19fix check_health_mode parameterMicah Anderson
2011-04-12add check_git command to debian/ubuntu as wellMicah Anderson
2011-04-12fix typo in imap/pop servicesMicah Anderson
2011-04-12add imap and pop service definitionsMicah 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-03-06add dnsbl check commandmh
2011-03-06add and deploy check_dnsbl scriptmh
2011-03-02merge with saravamh
2011-02-19allow setting of the template to be usedmh
2011-02-19rearrange some variable settingmh
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
2011-02-07fix namingmh
2011-02-07fix pid/socket location for centos, open firewall if we want to connect to ↵mh
an irc server
2011-02-06centosify irc_botmh
2011-02-06Merge remote branch 'leluitn/apache_conf_fix'mh
2011-02-06Merge remote branch 'leluitn/service_contactgroup'mh
2011-02-06merge lelutinmh
2011-02-06merge lelutinmh
2011-02-06and we need also to remove the overwritemh
2011-02-06Nagios_hostgroupescalation does also not anymore existmh
2011-02-06remove nagios_plugin - rerrange collectionmh
* the type nagios_type have been removed and puppet fails to collect unknown types. This has already been removed once, but reintroduced with 4e35b0bce0f2dd00d52e0de7488ab322867dd012 -> reremove it again * To better compare existing types and what we have in the module, I arranged the collection alphabetically to ease comparision.
2011-01-18nagios::service : Pass on contact_groupsGabriel Filion
The contact_groups argument to nagios::service is currently not passed on to the exported nagios_service resource. Pass this value on so that services can notify the right people. Signed-off-by: Gabriel Filion <lelutin@gmail.com>
2011-01-14Add missing Nagios resource types to base.ppGabriel Filion
Some Nagios resource types are currently not being managed. This has the result that exported resources for those types are not collected by nagios servers, and also that configuration files for those resources are put in their default path which is wrong for some OSes and with possibly wrong permissions. Add the missing resources to base.pp Signed-off-by: Gabriel Filion <lelutin@gmail.com>
2010-12-25it might be that having ! when there are no arguments will cause nagios to ↵Micah Anderson
be unhappy, so lets only put them in when we have arguments to pass
2010-12-25fix the --warning --critical by appending it as optional ending arguments in ↵Micah Anderson
the command specifier
2010-12-25fix check_mysql_health real_check_host variableMicah Anderson
2010-12-25add in the missing --warning and --critical options to check_mysql_healthMicah Anderson