puppet_nagios.git
11 months agopuppet 4 compare undef empty string master
kwadronaut [Tue, 20 Nov 2018 16:04:58 +0000 (17:04 +0100)]
puppet 4 compare undef empty string

3 years agoMerge remote-tracking branch 'shared/master' into leap_master
varac [Tue, 17 May 2016 09:46:57 +0000 (11:46 +0200)]
Merge remote-tracking branch 'shared/master' into leap_master

3 years ago[style] Future parser: Remove space after resource
varac [Thu, 28 Apr 2016 11:57:03 +0000 (13:57 +0200)]
[style] Future parser: Remove space after resource

3 years agoMerge remote-tracking branch 'shared/master' into leap_master
varac [Mon, 21 Mar 2016 10:06:18 +0000 (11:06 +0100)]
Merge remote-tracking branch 'shared/master' into leap_master

3 years ago[bug] Install pnp4nagios after nagios
varac [Sat, 19 Mar 2016 21:13:13 +0000 (22:13 +0100)]
[bug] Install pnp4nagios after nagios

Apt installs recommended packages by default.
When pnp4nagios is installed before nagios is
installed, it will install icinga or nagios as
recommended package, and choses icinga for unknown
reasons (alphabetical ?).

So we ensure pnp4nagios* packages are installed after
nagios.

This resolves: https://leap.se/code/issues/7976

3 years agoMerge remote-tracking branch 'shared/master' into leap_master
varac [Fri, 18 Mar 2016 10:35:35 +0000 (11:35 +0100)]
Merge remote-tracking branch 'shared/master' into leap_master

3 years agoMerge branch 'improve_notification_mails' into 'master'
Micah [Thu, 17 Mar 2016 19:43:54 +0000 (19:43 +0000)]
Merge branch 'improve_notification_mails' into 'master'

Improve notification mails

The mail subject line is too long for some mail clients,
so i removed the $NOTIFICATIONTYPE$ variable from it,
because it is not needed to understand the problem/recovery.

This is an example of a mail send out using this change:

    Subject: WARNING - aardwolf: APT

    ***** Nagios *****

    Notification Type: PROBLEM

    Host:      aardwolf.unstable.bitmask.i (aardwolf)
    Address:   199.119.112.205

    Service:   APT
    State:     WARNING
    Duration:  0d 0h 13m 5s

    Date/Time: Fri Jan 15 10:04:55 UTC 2016

    Output:    WARN - APT WARNING: 20 packages available for upgrade (0 critical updates).

Before it looked like this:

    Subject: ** PROBLEM Service Alert: aardwolf/APT is WARNING **

    ***** Nagios *****

    Notification Type: PROBLEM

    Service: APT
    Host: aardwolf
    Address: 199.119.112.205
    State: WARNING

    Date/Time: Thu Mar 10 21:57:23 UTC 2016

    Additional Info:

    WARN - APT WARNING: 1 packages available for upgrade (0 critical updates).

See merge request !22

3 years agoMerge remote-tracking branch 'shared/master' into leap_master
varac [Thu, 17 Mar 2016 12:57:47 +0000 (13:57 +0100)]
Merge remote-tracking branch 'shared/master' into leap_master

3 years agoInstall pnp4nagios after pnp4nagios-web-config-nagios3
varac [Thu, 17 Mar 2016 12:50:04 +0000 (13:50 +0100)]
Install pnp4nagios after pnp4nagios-web-config-nagios3

Without a relationship, `pnp4nagios` will pull
`pnp4nagios-web-config-icinga` because the package
provider installs the recommends by default.
This package itself will pull in icinga as dependency then.
So we install `pnp4nagios-web-config-nagios3` before.

Patch was sent to the leap-discuss ml on March 17th.

3 years agoImprove notification mails
varac [Fri, 11 Mar 2016 07:24:38 +0000 (08:24 +0100)]
Improve notification mails

The mail subject line is too long for some mail clients,
so i removed the $NOTIFICATIONTYPE$ variable from it,
because it is not needed to understand the problem/recovery.

This is an example of a mail send out using this change:

    Subject: WARNING - aardwolf: APT

    ***** Nagios *****

    Notification Type: PROBLEM

    Host:      aardwolf.unstable.bitmask.i (aardwolf)
    Address:   199.119.112.205

    Service:   APT
    State:     WARNING
    Duration:  0d 0h 13m 5s

    Date/Time: Fri Jan 15 10:04:55 UTC 2016

    Output:    WARN - APT WARNING: 20 packages available for upgrade (0 critical updates).

Before it looked like this:

    Subject: ** PROBLEM Service Alert: aardwolf/APT is WARNING **

    ***** Nagios *****

    Notification Type: PROBLEM

    Service: APT
    Host: aardwolf
    Address: 199.119.112.205
    State: WARNING

    Date/Time: Thu Mar 10 21:57:23 UTC 2016

    Additional Info:

    WARN - APT WARNING: 1 packages available for upgrade (0 critical updates).

3 years agoMerge remote-tracking branch 'shared/master' into leap_master
varac [Thu, 10 Mar 2016 19:23:29 +0000 (20:23 +0100)]
Merge remote-tracking branch 'shared/master' into leap_master

3 years agoMerge branch 'improve_resource_ordering' into 'master'
Micah [Thu, 10 Mar 2016 19:07:46 +0000 (19:07 +0000)]
Merge branch 'improve_resource_ordering' into 'master'

Improve resource ordering

See merge request !21

3 years agoNagios resources depend on nagios confdir
varac [Thu, 10 Mar 2016 16:24:37 +0000 (17:24 +0100)]
Nagios resources depend on nagios confdir

3 years agoAlways notify Service[nagios] from nagios resources
varac [Thu, 10 Mar 2016 16:23:35 +0000 (17:23 +0100)]
Always notify Service[nagios] from nagios resources

3 years agoImprove relationship of nagios resources
varac [Thu, 10 Mar 2016 16:19:52 +0000 (17:19 +0100)]
Improve relationship of nagios resources

3 years agoMerge remote-tracking branch 'shared/master' into leap_master
varac [Wed, 9 Mar 2016 16:25:18 +0000 (17:25 +0100)]
Merge remote-tracking branch 'shared/master' into leap_master

3 years agoAdded $storeconfigs parameter
varac [Sat, 26 Jan 2013 21:36:52 +0000 (22:36 +0100)]
Added $storeconfigs parameter

With this you can disable collection of exported resources.
On masterless setups, this module would otherwise complain.

3 years agoMerge remote-tracking branch 'shared/master' into leap_master
varac [Tue, 1 Mar 2016 10:59:10 +0000 (11:59 +0100)]
Merge remote-tracking branch 'shared/master' into leap_master

3 years agoMerge branch 'nrpe_params' into 'master'
LeLutin [Thu, 25 Feb 2016 06:59:19 +0000 (06:59 +0000)]
Merge branch 'nrpe_params' into 'master'

Nrpe params

The nagios::nrpe class is currently completely unusable with puppet 3.x+

This is because it's still relying on global variables. When one tries to setup an nrpe client with nagios::nrpe with puppet 3.x, the following error occurs:

~~~
==> jessiepuppet: Error: Failed to parse template nagios/nrpe/nrpe.cfg:
==> jessiepuppet:   Filepath: /usr/lib/ruby/vendor_ruby/puppet/parser/templatewrapper.rb
==> jessiepuppet:   Line: 81
==> jessiepuppet:   Detail: Could not find value for 'nagios_nrpe_pid_file' at /etc/puppet/modules/nagios/templates/nrpe/nrpe.cfg:19
==> jessiepuppet:  at /etc/puppet/modules/nagios/manifests/nrpe/base.pp:22 on node jessie.vagrantup.com
==> jessiepuppet: Error: Failed to parse template nagios/nrpe/nrpe.cfg:
==> jessiepuppet:   Filepath: /usr/lib/ruby/vendor_ruby/puppet/parser/templatewrapper.rb
==> jessiepuppet:   Line: 81
==> jessiepuppet:   Detail: Could not find value for 'nagios_nrpe_pid_file' at /etc/puppet/modules/nagios/templates/nrpe/nrpe.cfg:19
==> jessiepuppet:  at /etc/puppet/modules/nagios/manifests/nrpe/base.pp:22 on node jessie.vagrantup.com
~~~

This is because the values of variables defined within nagios::nrpe are not propagated into other classes anymore.

This series also changes a default behaviour for creating saner configurations by default: the dont_blame_nrpe option is changed to disable command arguments by default.

It also adds some documentation for the nagios::nrpe class since it had no explanation whatsoever of how it should be used in the README.

See merge request !18

3 years agostill a module name left with a dash in it.
Gabriel Filion [Thu, 25 Feb 2016 06:44:04 +0000 (01:44 -0500)]
still a module name left with a dash in it.

We missed this module reference. Starting with puppet 3.x, modules with
a dash in them are not recognized by puppet anymore, so only the file
from the "nagios" module is found.

3 years agoDocument how to use the nagios::nrpe class
Gabriel Filion [Sun, 31 Jan 2016 23:43:05 +0000 (18:43 -0500)]
Document how to use the nagios::nrpe class

3 years agodisable NRPE command arguments by default
Gabriel Filion [Sun, 31 Jan 2016 23:24:18 +0000 (18:24 -0500)]
disable NRPE command arguments by default

setting dont_blame_nrpe is useful for some, but it's generally dangerous
and should be disabled if it's not used.

In this sense, it's a better idea to disable this by default.

3 years agonrpe: parametrize dont_blame_nrpe
Gabriel Filion [Sun, 31 Jan 2016 23:21:46 +0000 (18:21 -0500)]
nrpe: parametrize dont_blame_nrpe

This value is used in order to enable or disable arguments to nrpe
commands. Since some ppl might need to enable it, we should parametrize
it.

3 years agoparametrize nagios::nrpe
Gabriel Filion [Sun, 31 Jan 2016 23:19:57 +0000 (18:19 -0500)]
parametrize nagios::nrpe

the current code for configuring NRPE is still relying on global
variables. This is not working at all with puppet 3.x and forward, so in
order to make this code functional, we need to parametrize values that
are used.

3 years agoMerge branch 'immerda_changes' into 'master'
Micah [Wed, 9 Dec 2015 19:32:51 +0000 (19:32 +0000)]
Merge branch 'immerda_changes' into 'master'

Merge in immerda changes - purging of resources and lots of nice additional checks

Sorry for the big amount of changes, but I think I merged everything nicely with what we have been working. Ok, so what do you get here:

* Purging of unmanaged resources, for that I had to move everything to the default paths of the puppet types, BUT now as soon as a node won't export anymore a resource it will get purged from nagios. No more cleaning up of decomissioned nodes, just remove them from puppet (puppet node clean oldnode.example.com) and they will also disappear from nagios.
* slight changes to the http checks.
** naming the checks consistently, so it's easier to change what they are looking for.
** Also accept 301 & 302 as a good value per default.
** make it possible to define accepted return codes per http & https
* add gpgkey checks, so you won't miss any expiring gpg keys anymore
* add imap login checks, so you can check whether ppl can actually login to your mailserver
* add horde login checks, so you can check whether login to horde still works
* linting wherever I touched something.

See merge request !15

3 years agoMerge remote-tracking branch 'shared/master'
mh [Wed, 9 Dec 2015 18:51:57 +0000 (19:51 +0100)]
Merge remote-tracking branch 'shared/master'

3 years agoLint nagios::nrpe::base
nadir [Sat, 27 Oct 2012 08:09:19 +0000 (10:09 +0200)]
Lint nagios::nrpe::base

3 years agoFix allowed_hosts typo in templates/nrpe/nrpe.cfg
nadir [Mon, 25 Oct 2010 13:01:24 +0000 (15:01 +0200)]
Fix allowed_hosts typo in templates/nrpe/nrpe.cfg

3 years agoRequire Package['nagios-nrpe-server'] for nrpe cmds
varac [Fri, 4 Oct 2013 12:17:46 +0000 (14:17 +0200)]
Require Package['nagios-nrpe-server'] for nrpe cmds

3 years agoMerge remote-tracking branch 'shared/master'
mh [Sat, 5 Dec 2015 14:30:30 +0000 (15:30 +0100)]
Merge remote-tracking branch 'shared/master'

3 years agoMerge branch 'pnp4nagios_jessie' into 'master'
Micah [Fri, 4 Dec 2015 21:09:30 +0000 (21:09 +0000)]
Merge branch 'pnp4nagios_jessie' into 'master'

[bug] Install pnp4nagios-web-config-nagios3 .deb

On jessie hosts, pnp4nagios-web defaults now to
pnp4nagios-web-config-icinga, so we install
pnp4nagios-web-config-nagios3 manually.

See merge request !16

3 years agolinting for future parser
mh [Sat, 28 Nov 2015 16:41:37 +0000 (17:41 +0100)]
linting for future parser

4 years ago[bug] Install pnp4nagios-web-config-nagios3 .deb
varac [Fri, 6 Nov 2015 00:40:04 +0000 (01:40 +0100)]
[bug] Install pnp4nagios-web-config-nagios3 .deb

On jessie hosts, pnp4nagios-web defaults now to
pnp4nagios-web-config-icinga, so we install
pnp4nagios-web-config-nagios3 manually.

4 years agoalso add pop3 login checks
mh [Sat, 31 Oct 2015 09:26:05 +0000 (10:26 +0100)]
also add pop3 login checks

4 years agoadd some metrics to the horde check
mh [Sat, 31 Oct 2015 09:14:18 +0000 (10:14 +0100)]
add some metrics to the horde check

4 years agoenable ssl login by default
mh [Mon, 26 Oct 2015 17:23:21 +0000 (18:23 +0100)]
enable ssl login by default

4 years agofix nagios_alias
mh [Mon, 26 Oct 2015 16:50:44 +0000 (17:50 +0100)]
fix nagios_alias

4 years agomake it possible to also pass down the host_name
mh [Mon, 26 Oct 2015 13:14:22 +0000 (14:14 +0100)]
make it possible to also pass down the host_name

4 years agoadd an imap_login check
mh [Sun, 25 Oct 2015 15:28:46 +0000 (16:28 +0100)]
add an imap_login check

4 years agolinting nagios::service::imap
mh [Sun, 25 Oct 2015 14:06:09 +0000 (15:06 +0100)]
linting nagios::service::imap

4 years agoit's sufficient to check it only once an hour
mh [Sun, 25 Oct 2015 13:57:27 +0000 (14:57 +0100)]
it's sufficient to check it only once an hour

4 years agonewer nagios versions use now check_interval
mh [Sun, 25 Oct 2015 13:52:49 +0000 (14:52 +0100)]
newer nagios versions use now check_interval

4 years agolinting
mh [Sun, 25 Oct 2015 13:51:53 +0000 (14:51 +0100)]
linting

4 years agoMerge remote-tracking branch 'shared/master'
mh [Sun, 25 Oct 2015 13:43:23 +0000 (14:43 +0100)]
Merge remote-tracking branch 'shared/master'

4 years agolinting
mh [Sun, 25 Oct 2015 12:56:24 +0000 (13:56 +0100)]
linting

4 years agofixing path
mh [Fri, 16 Oct 2015 14:10:56 +0000 (16:10 +0200)]
fixing path

4 years agofetch things over hkps and on every check
mh [Fri, 16 Oct 2015 13:38:20 +0000 (15:38 +0200)]
fetch things over hkps and on every check

4 years agoRevert "this is handled outside & centrally"
mh [Fri, 16 Oct 2015 13:17:48 +0000 (15:17 +0200)]
Revert "this is handled outside & centrally"

This reverts commit ffca95a6b0281ab49f4a626a1ee6a68257769388.

4 years agoinstall requirements
mh [Mon, 12 Oct 2015 22:57:06 +0000 (00:57 +0200)]
install requirements

4 years agothis is handled outside & centrally
mh [Mon, 12 Oct 2015 22:45:01 +0000 (00:45 +0200)]
this is handled outside & centrally

4 years agoalso deploy the plugin on a nagios host
mh [Mon, 12 Oct 2015 22:36:27 +0000 (00:36 +0200)]
also deploy the plugin on a nagios host

4 years agocorrect naming
mh [Mon, 12 Oct 2015 22:01:11 +0000 (00:01 +0200)]
correct naming

4 years agousername can be name
mh [Mon, 12 Oct 2015 22:00:08 +0000 (00:00 +0200)]
username can be name

4 years agomake it possible to define the keyserver to fetch from
mh [Mon, 12 Oct 2015 21:52:12 +0000 (23:52 +0200)]
make it possible to define the keyserver to fetch from

4 years agothe module is called gpg
mh [Mon, 12 Oct 2015 21:32:28 +0000 (23:32 +0200)]
the module is called gpg

4 years agoensure we run things with the right user/group
mh [Mon, 12 Oct 2015 21:29:30 +0000 (23:29 +0200)]
ensure we run things with the right user/group

4 years agointroduce horde_login checks
mh [Mon, 12 Oct 2015 21:26:10 +0000 (23:26 +0200)]
introduce horde_login checks

4 years agointroduce gpg checks
mh [Mon, 12 Oct 2015 21:23:44 +0000 (23:23 +0200)]
introduce gpg checks

4 years agoMerge branch 'UpdateApacheConf' into 'master'
Micah [Fri, 9 Oct 2015 18:53:44 +0000 (18:53 +0000)]
Merge branch 'UpdateApacheConf' into 'master'

update the apache2.conf file

updating to the debian 3.5.1.dfsg-2+b1 version of the file. mostly
whitespace changes, one 2.2 vs 2.4 change and a change for docs.

See merge request !14

4 years agoMerge branch 'check_http_sni_support' into 'master'
Micah [Fri, 9 Oct 2015 18:49:26 +0000 (18:49 +0000)]
Merge branch 'check_http_sni_support' into 'master'

Add --sni to check_http --ssl commands

Makes sure correct SSL certificate is selected on hosts which use SNI for SSL, and also avoids some sites returning a `HTTP CRITICAL - Error on receive` error. Does not seem to affect non-SNI hosts.

See merge request !13

4 years agoupdate the apache2.conf file
Matt Taggart [Thu, 8 Oct 2015 21:51:58 +0000 (14:51 -0700)]
update the apache2.conf file

updating to the debian 3.5.1.dfsg-2+b1 version of the file. mostly
whitespace changes, one 2.2 vs 2.4 change and a change for docs.

4 years agoAdd --sni to check_http --ssl commands
Jerome Charaoui [Wed, 7 Oct 2015 15:29:36 +0000 (11:29 -0400)]
Add --sni to check_http --ssl commands

4 years agoMerge remote-tracking branch 'shared/master' into leap_master
varac [Tue, 6 Oct 2015 12:32:42 +0000 (14:32 +0200)]
Merge remote-tracking branch 'shared/master' into leap_master

Conflicts:
manifests/apache.pp

4 years agoMerge branch 'fix_apache' into 'master'
Micah [Mon, 5 Oct 2015 23:16:03 +0000 (23:16 +0000)]
Merge branch 'fix_apache' into 'master'

Fix apache

the main class is currently unusable with apache, which is the default case.

we need to move management of files necessary for nagios+apache+debian into the "nagios" class to fix this.

This partly responds to #4

See merge request !12

4 years agolint init.pp
Gabriel Filion [Fri, 2 Oct 2015 22:37:04 +0000 (18:37 -0400)]
lint init.pp

one line is too long, break the code block into multiple lines to fix
this issue. it also creates more breathing space and makes the code
easier to read.

4 years agofiles managed for apache on debian break usage through main class
Gabriel Filion [Fri, 2 Oct 2015 22:26:45 +0000 (18:26 -0400)]
files managed for apache on debian break usage through main class

Currently the nagios::apache class manages some files for debian. This
means that when using the main class for setting up nagios with apache
(which is the default!) lacks those files and the setup doesn't work.

Split out management of those files into another class to avoid making
the code in the main class too encumbered and make the main class
include that (instead of nagios::apache). nagios::apache will include
the main class anyway.

Adjust README file so that all cases of http management are done through
the "nagios" class.

4 years agoMerge branch 'non_ascii_char' into 'master'
Matt Taggart [Fri, 2 Oct 2015 21:07:01 +0000 (21:07 +0000)]
Merge branch 'non_ascii_char' into 'master'

remove non-ascii char in comment

puppet 3.x refuses to run when there are non-ASCII chars in comments
(wth!). so replace that char with an ASCII representation of it.

See merge request !11

4 years agoremove non-ascii char in comment
Gabriel Filion [Fri, 2 Oct 2015 20:13:53 +0000 (16:13 -0400)]
remove non-ascii char in comment

puppet 3.x refuses to run when there are non-ASCII chars in comments
(wth!). so replace that char with an ASCII representation of it.

4 years agoImprove readability of nagios notification mail subjects (#6847)
varac [Tue, 11 Aug 2015 08:47:58 +0000 (10:47 +0200)]
Improve readability of nagios notification mail subjects (#6847)

The mail subject line is too long for some mail clients, so i removed
the $NOTIFICATIONTYPE$ variable from it, because it is not needed to
understand the problem/recovery.

4 years agoadded class definition to nagios::defaults::commands
varac [Tue, 11 Aug 2015 08:26:41 +0000 (10:26 +0200)]
added class definition to nagios::defaults::commands

4 years agoMerge remote-tracking branch 'shared/master' into leap_master
varac [Tue, 11 Aug 2015 08:23:09 +0000 (10:23 +0200)]
Merge remote-tracking branch 'shared/master' into leap_master

Conflicts:
README
manifests/base.pp
manifests/defaults/commands.pp
manifests/nrpe.pp
manifests/service.pp
manifests/target.pp
templates/nrpe/nrpe_command.erb

4 years agocleanup things a bit and make it possible to set a different fqdn
mh [Sun, 7 Jun 2015 09:43:49 +0000 (11:43 +0200)]
cleanup things a bit and make it possible to set a different fqdn

4 years agoMerge branch 'fix_ordering' into 'master'
Micah [Thu, 7 May 2015 15:25:00 +0000 (15:25 +0000)]
Merge branch 'fix_ordering' into 'master'

require package before config files

In the current state of the module, almost 100% of the time nagios
doesn't install correctly since ordering of the resources is not
enforced.

This is a major issue since the module is currently not usable in its current state because of the problem it creates.

See merge request !5

4 years agorequire package before config files
Gabriel Filion [Sun, 19 Apr 2015 19:43:47 +0000 (15:43 -0400)]
require package before config files

In the current state of the module, almost 100% of the time nagios
doesn't install correctly since ordering of the resources is not
enforced.

4 years agoMerge branch 'no_alias_for_host' into 'master'
Micah [Thu, 7 May 2015 15:09:55 +0000 (15:09 +0000)]
Merge branch 'no_alias_for_host' into 'master'

stop defining an alias by default for hosts

Since the "alias" attribute is special for puppet in that it needs to be
a string that's unique throughout all of the resources on a given host's
catalogue, we shouldn't always define an alias unless users really want
them.

This alias might (and did for some ppl) create a conflict when using a
class that is named the same as $::hostname.

We've just hit hit limitation on a Koumbit node. The alias attribute is legitimate in terms of nagios host attributes, but the name of the attribute clashes with the special-purpose attribute for puppet. So one might argue that the native puppet types are flawed, and they would be correct! but getting those types fixed would be a pain in the ass since they haven't been maintained for quite some time.

See merge request !10

4 years agoMerge branch 'nrpe_command_template' into 'master'
Micah [Thu, 7 May 2015 15:08:31 +0000 (15:08 +0000)]
Merge branch 'nrpe_command_template' into 'master'

added templates/nrpe/nrpe_command.erb

commit:7fb80fbe uses nagios::nrpe::command { "check_load": ...}, but the
template for it is missing.

amended by LeLutin: use @ prefix on variables in template

This is a followup of: https://labs.riseup.net/code/issues/4100

See merge request !8

4 years agoMerge branch 'plugin_path' into 'master'
Micah [Thu, 7 May 2015 15:07:38 +0000 (15:07 +0000)]
Merge branch 'plugin_path' into 'master'

Plugin path

Avoid using lib64 in the path for x86_64 architecture when using debian. this path is not available anymore starting with debian wheezy.
Then lint the file to make it easier to read / maintain.

This is a followup of https://labs.riseup.net/code/issues/4237

See merge request !7

4 years agoMerge branch 'ordering_in_example' into 'master'
Micah [Thu, 7 May 2015 14:54:49 +0000 (14:54 +0000)]
Merge branch 'ordering_in_example' into 'master'

Ordering in example

The usage example in the readme has a couple of small and bigger problems. This branch makes the example more accurate.

See merge request !6

4 years agoMerge branch 'manage_resource.cfg' into 'master'
Micah [Thu, 7 May 2015 14:54:05 +0000 (14:54 +0000)]
Merge branch 'manage_resource.cfg' into 'master'

Only use the private directory on CentOS

Debian and ubuntu have their resource.cfg file placed in /etc/nagios3/
and when it's absent it can cause issues with the package (because the
package is badly done).

This is a followup to issue https://labs.riseup.net/code/issues/4240

See merge request !4

4 years agostop defining an alias by default for hosts
Gabriel Filion [Thu, 23 Apr 2015 20:06:27 +0000 (16:06 -0400)]
stop defining an alias by default for hosts

Since the "alias" attribute is special for puppet in that it needs to be
a string that's unique throughout all of the resources on a given host's
catalogue, we shouldn't always define an alias unless users really want
them.

This alias might (and did for some ppl) create a conflict when using a
class that is named the same as $::hostname.

4 years agoMerge branch 'unquote_booleans' into 'master'
varac [Sun, 19 Apr 2015 22:17:08 +0000 (22:17 +0000)]
Merge branch 'unquote_booleans' into 'master'

Unquote booleans

Some variables and if blocks use quoted booleans when we should be using the native boolean type.

Also, when working on this, I saw an issue with a mistyped variable in nagios::service so I fixed it.

This is a followup of: https://labs.riseup.net/code/issues/4093

See merge request !9

4 years agonagios::service typo in variable
Gabriel Filion [Sun, 19 Apr 2015 21:07:41 +0000 (17:07 -0400)]
nagios::service typo in variable

This invalidates the point of that if block since it will probably never
be true that some undefined (read mis-typed) variable is set to
'absent'.

4 years agounquoted boolean variables
nadir [Thu, 8 Nov 2012 13:42:27 +0000 (14:42 +0100)]
unquoted boolean variables

4 years agoadded templates/nrpe/nrpe_command.erb
nadir [Sat, 27 Oct 2012 08:10:24 +0000 (10:10 +0200)]
added templates/nrpe/nrpe_command.erb

commit:7fb80fbe uses nagios::nrpe::command { "check_load": ...}, but the
template for it is missing.

amended by LeLutin: use @ prefix on variables in template

4 years agolint plugin.pp
Gabriel Filion [Sun, 19 Apr 2015 20:08:38 +0000 (16:08 -0400)]
lint plugin.pp

This should make it easier to read the code.

4 years agoFixing plugin path for debian
Silvio Rhatto [Fri, 25 Jan 2013 20:37:45 +0000 (18:37 -0200)]
Fixing plugin path for debian

4 years agowrong example with nagios::defaults
Gabriel Filion [Sun, 19 Apr 2015 19:54:46 +0000 (15:54 -0400)]
wrong example with nagios::defaults

The example doesn't set any ordering on the classes and this leads to
errors at first install since all of the configuration files that the
nagios::defaults class installs need the nagios package to be installed
first in order for the config dirs to exist.

4 years agofix alignment and lint usage example
Gabriel Filion [Sun, 19 Apr 2015 19:52:56 +0000 (15:52 -0400)]
fix alignment and lint usage example

Example uses weird spacing in the beginning of the lines.

Also the example usage of nagios::command is broken: it lacks the
closing curly brace.

4 years agoOnly use the private directory on CentOS
Gabriel Filion [Sun, 19 Apr 2015 19:18:46 +0000 (15:18 -0400)]
Only use the private directory on CentOS

Debian and ubuntu have their resource.cfg file placed in /etc/nagios3/
and when it's absent it can cause issues with the package (because the
package is badly done).

4 years agoadding Debian specific nrpe template (fixes stop/restart of nrpe-server)
kwadronaut [Fri, 25 Jan 2013 14:18:11 +0000 (15:18 +0100)]
adding Debian specific nrpe template (fixes stop/restart of nrpe-server)

4 years agoCommands notify-host-by-email and notify-service-by-email are already defined by...
Silvio Rhatto [Fri, 25 Jan 2013 23:36:49 +0000 (21:36 -0200)]
Commands notify-host-by-email and notify-service-by-email are already defined by the nagios package

amended by LeLutin: added missing : after default keyword and fixed
style a bit.

4 years agoMerge branch 'master' into 'master'
Jerome Charaoui [Fri, 17 Apr 2015 15:28:27 +0000 (15:28 +0000)]
Merge branch 'master' into 'master'

Remove unused 'mountpoints' fact. Closes #1

See merge request !3

4 years agoRemove unused 'mountpoints' fact. Closes #1
Jerome Charaoui [Fri, 17 Apr 2015 15:25:05 +0000 (11:25 -0400)]
Remove unused 'mountpoints' fact. Closes #1

4 years agoAdd GPLv3 license
Micah Anderson [Fri, 17 Apr 2015 15:25:04 +0000 (11:25 -0400)]
Add GPLv3 license

4 years agoMerge branch 'improve_notifications' into 'master'
Micah [Tue, 14 Apr 2015 15:20:47 +0000 (15:20 +0000)]
Merge branch 'improve_notifications' into 'master'

Improve notifications

see https://leap.se/code/issues/6847

See merge request !2

4 years agoImprove notification: added details, make mail subject easier to read
varac [Sat, 11 Apr 2015 21:29:12 +0000 (23:29 +0200)]
Improve notification: added details, make mail subject easier to read

4 years agoMerge remote-tracking branch 'leap/master' into varac_master
varac [Fri, 10 Apr 2015 14:04:12 +0000 (16:04 +0200)]
Merge remote-tracking branch 'leap/master' into varac_master

4 years agoMerge remote-tracking branch 'shared/master' into leap_master
varac [Wed, 8 Apr 2015 15:55:51 +0000 (17:55 +0200)]
Merge remote-tracking branch 'shared/master' into leap_master

Conflicts:
manifests/defaults/commands.pp

4 years agoMerge branch 'bug/pnp4nagios_missing_index' into 'master'
varac [Wed, 8 Apr 2015 15:50:22 +0000 (15:50 +0000)]
Merge branch 'bug/pnp4nagios_missing_index' into 'master'

Add missing DirectoryIndex index.php to the pnp4nagios apache config snippet

Without this you get a 404, and have to explicitly specify index.php to load it

See merge request !2

4 years agoAdd missing DirectoryIndex index.php to the pnp4nagios apache config snippet
Micah Anderson [Tue, 7 Apr 2015 20:22:33 +0000 (16:22 -0400)]
Add missing DirectoryIndex index.php to the pnp4nagios apache config snippet