summaryrefslogtreecommitdiff
path: root/manifests
AgeCommit message (Collapse)Author
2013-01-23Merge 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-03merge artifact left in one manifestGabriel Filion
Signed-off-by: Gabriel Filion <lelutin@gmail.com>
2013-01-02Merge remote-tracking branch 'shared/master'mh
Conflicts: README manifests/service.pp
2013-01-02this file is only needed on debianmh
2013-01-02trocla should be optionalmh
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-11-24fix typomh
2012-11-23make check_domain configurablemh
2012-11-23export also the nagios host, so we can still use it remotemh
2012-11-23add new wrapper for dns hostsmh
2012-11-21add dns checkmh
2012-11-14we should then set a defaultmh
2012-11-14make it possible to not pass check_command if service should be absentmh
2012-09-25forgot $varac
2012-09-25fix proper deployment of pnp4nagios-templates.cfgvarac
2012-09-25Merge branch 'merge_immerda'Micah Anderson
Conflicts: manifests/apache.pp this conflict was just a indentation difference.
2012-09-19Merge 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-18no ::nagios_packagename variable anymorevarac
2012-09-18require pnp4nagios package for config filevarac
2012-09-17use a graph style icon for action.gifvarac
2012-09-17typos againvarac
2012-09-17typovarac
2012-09-17fixed conf file permissions, notify servicesvarac
2012-09-17resolve nagios_cfgdir variablevarac
2012-09-17depend on pnp4nagios instead of npcdvarac
2012-09-17configure pnp4nagios npcdvarac
2012-09-17typovarac
2012-09-17package pnp4nagios available now, fix permissions for config filesvarac
2012-09-17corrected path to pnp4nagios apache.confvarac
2012-09-17possibility to deploy a custom pnp4nagios apache confignadir
2012-09-17basic pnp4nagios grapher integrationvarac
2012-09-10apache.conf: fixing file sourcevarac
2012-09-10exec calls: path to binary is neededvarac
2012-06-272.7 underscore rename: site-nagiosMicah Anderson
2012-06-14take hiera out of the paramsmh
2012-06-08refactor things for >2.7mh
2012-06-05new style for 2.7mh
2012-05-15put the class the right placemh
2012-05-05Merge remote-tracking branch 'github/master'mh
2012-05-05Merge pull request #4 from efroese/http-checkduritong
Add the port arg to check_http_url_regex. Default 80.
2012-05-01Move the jabber plugin to its own class.Erik Froese
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-18put single quotes around the password to guard against exclamation points in ↵Micah Anderson
passwords
2012-04-18use trocla for that passwordmh
2012-04-18fully qualify fqdn and hostname facter variablesChristian G. Warden
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-04-18it is not anymore necessary to add an empty source to purge directoriesmh
2012-04-10Fix NRPE for FreeBSDGabriel Filion
Plugins are found under another directory. The pid file must be changed to /var/spool/nagios/nrpe2.pid, since this place is writable by the daemon, and the rc script expects the pid file to be found there. Use a pattern instead of the rc script status command.
2012-04-10fix nrpe package name in freebsdAntoine Beaupre