| Age | Commit message (Collapse) | Author | |
|---|---|---|---|
| 2013-01-24 | indentation, use_nrpe works | varac | |
| 2013-01-24 | Revert "naming PID and SOCKFILE absent broke things" | varac | |
| This reverts commit 02d2ca2df868262728c67c13d5dbf484c001d380. | |||
| 2013-01-24 | Merge branch 'master' of ssh://code.leap.se/puppet_nagios | varac | |
| 2013-01-24 | use_nrpe: boolean, defaults to false | varac | |
| 2013-01-24 | naming PID and SOCKFILE absent broke things | kwadronaut | |
| 2013-01-24 | unquoted boolean variable | varac | |
| 2013-01-23 | remove extra % | Micah Anderson | |
| 2013-01-23 | remove unnecessary additional %, this keeps coming back through merge conflicts | Micah Anderson | |
| 2013-01-23 | Merge remote-tracking branch 'shared/master' | Micah Anderson | |
| Conflicts: README manifests/irc_bot.pp manifests/irc_bot/base.pp templates/irc_bot/nsa.cfg.erb | |||
| 2013-01-23 | lint irc_bot/base.pp | Micah Anderson | |
| 2013-01-23 | be sure to notify the service after the configuration file has changed | Micah Anderson | |
| 2013-01-23 | switch to using 'group => 0' instead of 'group => root' | Micah Anderson | |
| 2013-01-23 | minor template formatting fix that seemed to have gone missing in a conflict ↵ | Micah Anderson | |
| merge | |||
| 2013-01-03 | merge artifact left in one manifest | Gabriel Filion | |
| Signed-off-by: Gabriel Filion <lelutin@gmail.com> | |||
| 2013-01-02 | Merge remote-tracking branch 'shared/master' | mh | |
| Conflicts: README manifests/service.pp | |||
| 2013-01-02 | this file is only needed on debian | mh | |
| 2013-01-02 | trocla should be optional | mh | |
| 2013-01-02 | Merge remote-tracking branch 'riseup/master' into HEAD | mh | |
| 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-11-24 | fix typo | mh | |
| 2012-11-23 | make check_domain configurable | mh | |
| 2012-11-23 | export also the nagios host, so we can still use it remote | mh | |
| 2012-11-23 | add new wrapper for dns hosts | mh | |
| 2012-11-22 | added templates/nrpe/nrpe_command.erb | nadir | |
| 2012-11-22 | Merge branch 'master' of git://labs.riseup.net/shared-nagios | varac | |
| Conflicts: templates/irc_bot/nsa.cfg.erb | |||
| 2012-11-21 | add dns check | mh | |
| 2012-11-14 | we should then set a default | mh | |
| 2012-11-14 | make it possible to not pass check_command if service should be absent | mh | |
| 2012-09-26 | forgot $ | varac | |
| 2012-09-26 | fix proper deployment of pnp4nagios-templates.cfg | varac | |
| 2012-09-25 | fix variable names that weren't properly pulled in on merge | Micah Anderson | |
| 2012-09-25 | remove unnecessary % that came from immerda's branch, with it the following ↵ | Micah Anderson | |
| errors are caused: Operator or semicolon missing before %Nsa at /etc/nagios_nsa.cfg line 1. Ambiguous use of % resolved as operator % at /etc/nagios_nsa.cfg line 1. ERROR: Failure compiling '/etc/nagios_nsa.cfg' - syntax error at /etc/nagios_nsa.cfg line 1, near "%%Nsa " | |||
| 2012-09-25 | forgot $ | varac | |
| 2012-09-25 | fix proper deployment of pnp4nagios-templates.cfg | varac | |
| 2012-09-25 | Merge branch 'merge_immerda' | Micah Anderson | |
| Conflicts: manifests/apache.pp this conflict was just a indentation difference. | |||
| 2012-09-20 | Merge remote-tracking branch 'riseup/irc_bot_enhancements' | Gabriel Filion | |
| 2012-09-19 | Merge branch 'immerda' | Leap devs | |
| Conflicts: manifests/apache.pp manifests/irc_bot.pp manifests/service/mysql.pp templates/irc_bot/nsa.cfg.erb Conflict resolutions: apache.pp: just cosmetics mysql.pp: The shared modules provides more variables to fine tune the mysql health check so we went for this version. The irc bot conflicts were a result of immerda's branch not being up-to-date with the shared branch. The shared branch had factored out the irc_bot.pp into a directory, and added a few additional variables. Immerda changed the variables from having the prefix $nagios_ to not having it and did not have that refactor. The variable renames were good ones for the 2.7 refactoring work, and future hiera integration, so we want those. So to resolve this, we took the shared version of the refactor, and then took the immerda version of the variable renames. This requires an UPGRADE NOTICE in the README as people may have been using the previous variable names. | |||
| 2012-09-19 | updated readme | varac | |
| 2012-09-19 | no ::nagios_packagename variable anymore | varac | |
| 2012-09-19 | require pnp4nagios package for config file | varac | |
| 2012-09-19 | use a graph style icon for action.gif | varac | |
| 2012-09-19 | typos again | varac | |
| 2012-09-19 | typo | varac | |
| 2012-09-19 | fixed conf file permissions, notify services | varac | |
| 2012-09-19 | resolve nagios_cfgdir variable | varac | |
| 2012-09-19 | depend on pnp4nagios instead of npcd | varac | |
| 2012-09-19 | configure pnp4nagios npcd | varac | |
| 2012-09-19 | typo | varac | |
| 2012-09-19 | package pnp4nagios available now, fix permissions for config files | varac | |
| 2012-09-19 | corrected path to pnp4nagios apache.conf | varac | |
| 2012-09-19 | README.pnp4nagios | varac | |
 |
index : puppet_nagios.git | |
| [puppet_nagios] | git repository hosting |
| summaryrefslogtreecommitdiff |