From c134c8de3459e9b7d3f22c6de75a488fab49c1da Mon Sep 17 00:00:00 2001 From: Arne Teuke Date: Fri, 28 Jul 2017 13:49:05 +0100 Subject: [PATCH 1/5] outsourcing NRPE to cd_nrpe --- README.md | 10 +- manifests/client/target.pp | 201 +++++++++++------------ manifests/main/install.pp | 13 +- manifests/params.pp | 9 +- templates/nrpe/nrpe.cfg | 318 +++++++++++++++++++++++++++++++++++++ 5 files changed, 435 insertions(+), 116 deletions(-) create mode 100644 templates/nrpe/nrpe.cfg diff --git a/README.md b/README.md index 06320a7..c3a5914 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ |Repo Name| version | Build Status| |---|---|---|---| -|`cd_nagios`| 0.0.1.0 | [![Build Status](https://jenkins.confdroid.com/buildStatus/icon?job=cd_nagios)](https://jenkins.confdroid.com/job/cd_nagios/)| +|`cd_nagios`| 0.0.1.1 | [![Build Status](https://jenkins.confdroid.com/buildStatus/icon?job=cd_nagios)](https://jenkins.confdroid.com/job/cd_nagios/)| ### Synopsis Nagios is a powerful open source software solution for monitoring your IT environments. @@ -25,7 +25,8 @@ Nagios is a powerful open source software solution for monitoring your IT enviro * [SELINUX](#selinux) * [Certbot](#certbot) * [Httpd vHost Files](#httpd-vhost-files) -* [Manage additional resources] +* [Client Connections](#client-connections) +* [Manage additional resources](#manage-additional-resources) * [Known Problems](#known-problems) * [Support](#support) * [Tests](#tests) @@ -141,6 +142,11 @@ If you prefer to use https but use self-signed certs or your own CA, simply set ### httpd vHost files by Default, Nagios creates its own nagios.conf file, which is not a vhost file and relies on the main ssd.conf. However, as Nagios might be running on a regular web server with various other web instances (not recommended through for performance reasons), we will not want to manage ssl.conf directly, hence the module creates a vhost for the ssl host. +### Client Connections +In order to monitor clients, NAGIOS must be able to connect to them. There are multiple ways of doing so, the most common ones being NRPE and SSH. +So far this module works through the usage of NRPE, which by default is enabled. Class cd_nagios::client::nrpe configures nrpe.cfg and opens the required firewall port on clients (optional,default). + + ### Manage additional resources ### Known Problems diff --git a/manifests/client/target.pp b/manifests/client/target.pp index 96dee87..904c471 100644 --- a/manifests/client/target.pp +++ b/manifests/client/target.pp @@ -26,114 +26,117 @@ class cd_nagios::client::target ( ) inherits cd_nagios::params { if $::fqdn != $ng_nagios_server { + if $ng_include_nrpe == true { require cd_nagios::main::install + require cd_nrpe - @@nagios_host { $::fqdn: - ensure => $ng_ping_ensure, - alias => $::hostname, - address => $::fqdn, - use => 'linux-server', - target => $ng_target_host, - hostgroups => 'linux-servers', - contacts => 'ops', - max_check_attempts => $ng_max_check_attempts, - notification_period => '24x7', - owner => $ng_user, - group => $ng_user, - mode => '0640', - check_command => "check_ping!${ng_ping_warn}!${ng_ping_crit}", - notify => Service[$ng_user], - } + @@nagios_host { $::fqdn: + ensure => $ng_ping_ensure, + alias => $::hostname, + address => $::fqdn, + use => 'linux-server', + target => $ng_target_host, + hostgroups => 'linux-servers', + contacts => 'ops', + max_check_attempts => $ng_max_check_attempts, + notification_period => '24x7', + owner => $ng_user, + group => $ng_user, + mode => '0640', + check_command => "check_ping!${ng_ping_warn}!${ng_ping_crit}", + notify => Service[$ng_user], + } - @@nagios_service { "root_partition_${::hostname}": - ensure => $ng_disk_ensure, - check_command => "check_nrpe!check_disk!${ng_disk_warn}!${ng_disk_crit}!/", - use => 'generic-service', - host_name => $::fqdn, - contacts => 'ops', - notification_period => '24x7', - service_description => "${::hostname}_root_partition", - servicegroups => 'linux-services', - target => $ng_target_service, - owner => $ng_user, - group => $ng_user, - mode => '0640', - } + @@nagios_service { "root_partition_${::hostname}": + ensure => $ng_disk_ensure, + check_command => "check_nrpe!check_disk!${ng_disk_warn}!${ng_disk_crit}!/", + use => 'generic-service', + host_name => $::fqdn, + contacts => 'ops', + notification_period => '24x7', + service_description => "${::hostname}_root_partition", + servicegroups => 'linux-services', + target => $ng_target_service, + owner => $ng_user, + group => $ng_user, + mode => '0640', + } - @@nagios_service { "Swap_Usage_${::hostname}": - ensure => $ng_swap_ensure, - check_command => "check_nrpe!check_swap!${ng_swap_warn}!${ng_swap_crit}", - use => 'generic-service', - host_name => $::fqdn, - contacts => 'ops', - notification_period => '24x7', - service_description => "${::hostname}_swap_usage", - servicegroups => 'linux-services', - target => $ng_target_service, - owner => $ng_user, - group => $ng_user, - mode => '0640', - } + @@nagios_service { "Swap_Usage_${::hostname}": + ensure => $ng_swap_ensure, + check_command => "check_nrpe!check_swap!${ng_swap_warn}!${ng_swap_crit}", + use => 'generic-service', + host_name => $::fqdn, + contacts => 'ops', + notification_period => '24x7', + service_description => "${::hostname}_swap_usage", + servicegroups => 'linux-services', + target => $ng_target_service, + owner => $ng_user, + group => $ng_user, + mode => '0640', + } - @@nagios_service { "Local_Users_${::hostname}": - ensure => $ng_users_ensure, - check_command => "check_nrpe!check_users!${ng_users_warn}!${ng_users_crit}", - use => 'generic-service', - host_name => $::fqdn, - contacts => 'ops', - notification_period => '24x7', - service_description => "${::hostname}_local_users", - servicegroups => 'linux-services', - target => $ng_target_service, - owner => $ng_user, - group => $ng_user, - mode => '0640', - } + @@nagios_service { "Local_Users_${::hostname}": + ensure => $ng_users_ensure, + check_command => "check_nrpe!check_users!${ng_users_warn}!${ng_users_crit}", + use => 'generic-service', + host_name => $::fqdn, + contacts => 'ops', + notification_period => '24x7', + service_description => "${::hostname}_local_users", + servicegroups => 'linux-services', + target => $ng_target_service, + owner => $ng_user, + group => $ng_user, + mode => '0640', + } - @@nagios_service { "Total Processes_${::hostname}": - ensure => $ng_procs_tot_ens, - check_command => "check_nrpe!check_procs!${ng_procs_tot_warn}!${ng_procs_tot_crit}!${ng_procs_tot_param}", - use => 'generic-service', - host_name => $::fqdn, - contacts => 'ops', - notification_period => '24x7', - service_description => "${::hostname}_total_processes", - servicegroups => 'linux-services', - target => $ng_target_service, - owner => $ng_user, - group => $ng_user, - mode => '0640', - } + @@nagios_service { "Total Processes_${::hostname}": + ensure => $ng_procs_tot_ens, + check_command => "check_nrpe!check_procs!${ng_procs_tot_warn}!${ng_procs_tot_crit}!${ng_procs_tot_param}", + use => 'generic-service', + host_name => $::fqdn, + contacts => 'ops', + notification_period => '24x7', + service_description => "${::hostname}_total_processes", + servicegroups => 'linux-services', + target => $ng_target_service, + owner => $ng_user, + group => $ng_user, + mode => '0640', + } - @@nagios_service { "Zombie Processes_${::hostname}": - ensure => $ng_procs_z_ensure, - check_command => "check_nrpe!check_procs!${ng_procs_z_warn}!${ng_procs_z_crit}!${ng_procs_z_param}", - use => 'generic-service', - host_name => $::fqdn, - contacts => 'ops', - notification_period => '24x7', - service_description => "${::hostname}_zombie_processes", - servicegroups => 'linux-services', - target => $ng_target_service, - owner => $ng_user, - group => $ng_user, - mode => '0640', - } + @@nagios_service { "Zombie Processes_${::hostname}": + ensure => $ng_procs_z_ensure, + check_command => "check_nrpe!check_procs!${ng_procs_z_warn}!${ng_procs_z_crit}!${ng_procs_z_param}", + use => 'generic-service', + host_name => $::fqdn, + contacts => 'ops', + notification_period => '24x7', + service_description => "${::hostname}_zombie_processes", + servicegroups => 'linux-services', + target => $ng_target_service, + owner => $ng_user, + group => $ng_user, + mode => '0640', + } - @@nagios_service { "Current_Load_${::hostname}": - ensure => $ng_load_ensure, - check_command => "check_nrpe!check_load!${ng_load_warn}!${ng_load_crit}", - use => 'generic-service', - host_name => $::fqdn, - contacts => 'ops', - notification_period => '24x7', - service_description => "${::hostname}_current_load", - servicegroups => 'linux-services', - target => $ng_target_service, - owner => $ng_user, - group => $ng_user, - mode => '0640', + @@nagios_service { "Current_Load_${::hostname}": + ensure => $ng_load_ensure, + check_command => "check_nrpe!check_load!${ng_load_warn}!${ng_load_crit}", + use => 'generic-service', + host_name => $::fqdn, + contacts => 'ops', + notification_period => '24x7', + service_description => "${::hostname}_current_load", + servicegroups => 'linux-services', + target => $ng_target_service, + owner => $ng_user, + group => $ng_user, + mode => '0640', + } } } } diff --git a/manifests/main/install.pp b/manifests/main/install.pp index 5239862..390ff9f 100644 --- a/manifests/main/install.pp +++ b/manifests/main/install.pp @@ -41,15 +41,6 @@ class cd_nagios::main::install ( package {$reqpackages_client: ensure => $pkg_ensure, } - - # install NRPE if enabled - - if $ng_include_nrpe == true { - - package {$reqpackages_nrpe: - ensure => $pkg_ensure, - } - } } # if we are not the nagios server, install client packages @@ -62,9 +53,7 @@ class cd_nagios::main::install ( # if we want to use NRPE, install it if $ng_include_nrpe == true { - package {$reqpackages_nrpe: - ensure => $pkg_ensure, - } + require cd_nrpe } } } diff --git a/manifests/params.pp b/manifests/params.pp index deea859..c97a72f 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -642,6 +642,8 @@ # backoff_change - # of jobs to remove from jobs_limit when backing off # rampup_limit - Minimum rampup_change # rampup_change - # of jobs to add to jobs_limit when ramping up +# @param [string] ng_nrpe_port the port for NRPE. used by firewall and in +# configuration file. ############################################################################### class cd_nagios::params ( @@ -661,6 +663,7 @@ $ng_http_https_fw = true, $ng_fw_order = '50', $ng_http_port = '80', $ng_https_port = '443', +$ng_nrpe_port = '5666', # check command parameters ## ping @@ -907,9 +910,6 @@ $ng_loadctl_options = 'jobs_max=100;backoff_limit=10;rampup_change=5', 'nagios-plugins-nrpe', 'nagios-common'] } - $reqpackages_nrpe = $::operatingsystem ? { - /(?i-mx:centos|fedora|redhat)/ => ['nrpe'] - } # service $ng_service = 'nagios' @@ -992,6 +992,9 @@ $ng_cntctgrps_rule_erb = 'cd_nagios/nagios/contactgroups_cfg_rule.erb' $ng_target_command = "${ng_conf_d_dir}/nagios_commands_base.cfg" $ng_nagios_service_cmd = 'check_nagios!/var/log/nagios/status.dat!5!/usr/sbin/nagios' +# nrpe +$ng_nrpe_file = "${ng_main_dir}/nrpe.cfg" + # includes must be last include cd_nagios::main::config diff --git a/templates/nrpe/nrpe.cfg b/templates/nrpe/nrpe.cfg new file mode 100644 index 0000000..080d53f --- /dev/null +++ b/templates/nrpe/nrpe.cfg @@ -0,0 +1,318 @@ +############################################################################# +# Sample NRPE Config File +# Written by: Ethan Galstad (nagios@nagios.org) +# +# Last Modified: 2016-05-10 +# +# NOTES: +# This is a sample configuration file for the NRPE daemon. It needs to be +# located on the remote host that is running the NRPE daemon, not the host +# from which the check_nrpe client is being executed. +############################################################################# + + +# LOG FACILITY +# The syslog facility that should be used for logging purposes. + +log_facility=daemon + + + +# LOG FILE +# If a log file is specified in this option, nrpe will write to +# that file instead of using syslog. + +#log_file=/var/run/nrpe.log + + + +# DEBUGGING OPTION +# This option determines whether or not debugging messages are logged to the +# syslog facility. +# Values: 0=debugging off, 1=debugging on + +debug=0 + + + +# PID FILE +# The name of the file in which the NRPE daemon should write it's process ID +# number. The file is only written if the NRPE daemon is started by the root +# user and is running in standalone mode. + +pid_file=/var/run/nrpe/nrpe.pid + + + +# PORT NUMBER +# Port number we should wait for connections on. +# NOTE: This must be a non-privileged port (i.e. > 1024). +# NOTE: This option is ignored if NRPE is running under either inetd or xinetd + +server_port=5666 + + + +# SERVER ADDRESS +# Address that nrpe should bind to in case there are more than one interface +# and you do not want nrpe to bind on all interfaces. +# NOTE: This option is ignored if NRPE is running under either inetd or xinetd + +#server_address=127.0.0.1 + + + +# LISTEN QUEUE SIZE +# Listen queue size (backlog) for serving incoming connections. +# You may want to increase this value under high load. + +#listen_queue_size=5 + + + +# NRPE USER +# This determines the effective user that the NRPE daemon should run as. +# You can either supply a username or a UID. +# +# NOTE: This option is ignored if NRPE is running under either inetd or xinetd + +nrpe_user=nrpe + + + +# NRPE GROUP +# This determines the effective group that the NRPE daemon should run as. +# You can either supply a group name or a GID. +# +# NOTE: This option is ignored if NRPE is running under either inetd or xinetd + +nrpe_group=nrpe + + + +# ALLOWED HOST ADDRESSES +# This is an optional comma-delimited list of IP address or hostnames +# that are allowed to talk to the NRPE daemon. Network addresses with a bit mask +# (i.e. 192.168.1.0/24) are also supported. Hostname wildcards are not currently +# supported. +# +# Note: The daemon only does rudimentary checking of the client's IP +# address. I would highly recommend adding entries in your /etc/hosts.allow +# file to allow only the specified host to connect to the port +# you are running this daemon on. +# +# NOTE: This option is ignored if NRPE is running under either inetd or xinetd + +allowed_hosts=127.0.0.1,::1 + + + +# COMMAND ARGUMENT PROCESSING +# This option determines whether or not the NRPE daemon will allow clients +# to specify arguments to commands that are executed. This option only works +# if the daemon was configured with the --enable-command-args configure script +# option. +# +# *** ENABLING THIS OPTION IS A SECURITY RISK! *** +# Read the SECURITY file for information on some of the security implications +# of enabling this variable. +# +# Values: 0=do not allow arguments, 1=allow command arguments + +dont_blame_nrpe=0 + + + +# BASH COMMAND SUBSTITUTION +# This option determines whether or not the NRPE daemon will allow clients +# to specify arguments that contain bash command substitutions of the form +# $(...). This option only works if the daemon was configured with both +# the --enable-command-args and --enable-bash-command-substitution configure +# script options. +# +# *** ENABLING THIS OPTION IS A HIGH SECURITY RISK! *** +# Read the SECURITY file for information on some of the security implications +# of enabling this variable. +# +# Values: 0=do not allow bash command substitutions, +# 1=allow bash command substitutions + +allow_bash_command_substitution=0 + + + +# COMMAND PREFIX +# This option allows you to prefix all commands with a user-defined string. +# A space is automatically added between the specified prefix string and the +# command line from the command definition. +# +# *** THIS EXAMPLE MAY POSE A POTENTIAL SECURITY RISK, SO USE WITH CAUTION! *** +# Usage scenario: +# Execute restricted commmands using sudo. For this to work, you need to add +# the nagios user to your /etc/sudoers. An example entry for allowing +# execution of the plugins from might be: +# +# nagios ALL=(ALL) NOPASSWD: /usr/lib/nagios/plugins/ +# +# This lets the nagios user run all commands in that directory (and only them) +# without asking for a password. If you do this, make sure you don't give +# random users write access to that directory or its contents! + +# command_prefix=/usr/bin/sudo + + + +# COMMAND TIMEOUT +# This specifies the maximum number of seconds that the NRPE daemon will +# allow plugins to finish executing before killing them off. + +command_timeout=60 + + + +# CONNECTION TIMEOUT +# This specifies the maximum number of seconds that the NRPE daemon will +# wait for a connection to be established before exiting. This is sometimes +# seen where a network problem stops the SSL being established even though +# all network sessions are connected. This causes the nrpe daemons to +# accumulate, eating system resources. Do not set this too low. + +connection_timeout=300 + + + +# WEAK RANDOM SEED OPTION +# This directive allows you to use SSL even if your system does not have +# a /dev/random or /dev/urandom (on purpose or because the necessary patches +# were not applied). The random number generator will be seeded from a file +# which is either a file pointed to by the environment valiable $RANDFILE +# or $HOME/.rnd. If neither exists, the pseudo random number generator will +# be initialized and a warning will be issued. +# Values: 0=only seed from /dev/[u]random, 1=also seed from weak randomness + +#allow_weak_random_seed=1 + + + +# SSL/TLS OPTIONS +# These directives allow you to specify how to use SSL/TLS. + +# SSL VERSION +# This can be any of: SSLv2 (only use SSLv2), SSLv2+ (use any version), +# SSLv3 (only use SSLv3), SSLv3+ (use SSLv3 or above), TLSv1 (only use +# TLSv1), TLSv1+ (use TLSv1 or above), TLSv1.1 (only use TLSv1.1), +# TLSv1.1+ (use TLSv1.1 or above), TLSv1.2 (only use TLSv1.2), +# TLSv1.2+ (use TLSv1.2 or above) +# If an "or above" version is used, the best will be negotiated. So if both +# ends are able to do TLSv1.2 and use specify SSLv2, you will get TLSv1.2. +# If you are using openssl 1.1.0 or above, the SSLv2 options are not available. + +#ssl_version=SSLv2+ + +# SSL USE ADH +# This is for backward compatibility and is DEPRECATED. Set to 1 to enable +# ADH or 2 to require ADH. 1 is currently the default but will be changed +# in a later version. + +#ssl_use_adh=1 + +# SSL CIPHER LIST +# This lists which ciphers can be used. For backward compatibility, this +# defaults to 'ssl_cipher_list=ALL:!MD5:@STRENGTH' in this version but +# will be changed to something like the example below in a later version of NRPE. + +#ssl_cipher_list=ALL:!MD5:@STRENGTH +#ssl_cipher_list=ALL:!aNULL:!eNULL:!SSLv2:!LOW:!EXP:!RC4:!MD5:@STRENGTH + +# SSL Certificate and Private Key Files + +#ssl_cacert_file=/etc/ssl/servercerts/ca-cert.pem +#ssl_cert_file=/etc/ssl/servercerts/nagios-cert.pem +#ssl_privatekey_file=/etc/ssl/servercerts/nagios-key.pem + +# SSL USE CLIENT CERTS +# This options determines client certificate usage. +# Values: 0 = Don't ask for or require client certificates (default) +# 1 = Ask for client certificates +# 2 = Require client certificates + +#ssl_client_certs=0 + +# SSL LOGGING +# This option determines which SSL messages are send to syslog. OR values +# together to specify multiple options. + +# Values: 0x00 (0) = No additional logging (default) +# 0x01 (1) = Log startup SSL/TLS parameters +# 0x02 (2) = Log remote IP address +# 0x04 (4) = Log SSL/TLS version of connections +# 0x08 (8) = Log which cipher is being used for the connection +# 0x10 (16) = Log if client has a certificate +# 0x20 (32) = Log details of client's certificate if it has one +# -1 or 0xff or 0x2f = All of the above + +#ssl_logging=0x00 + + + +# NASTY METACHARACTERS +# This option allows you to override the list of characters that cannot +# be passed to the NRPE daemon. + +# nasty_metachars="|`&><'\\[]{};\r\n" + + +# INCLUDE CONFIG FILE +# This directive allows you to include definitions from an external config file. + +#include= + + + +# INCLUDE CONFIG DIRECTORY +# This directive allows you to include definitions from config files (with a +# .cfg extension) in one or more directories (with recursion). + +include_dir=/etc/nrpe.d/ + + + +# COMMAND DEFINITIONS +# Command definitions that this daemon will run. Definitions +# are in the following format: +# +# command[]= +# +# When the daemon receives a request to return the results of +# it will execute the command specified by the argument. +# +# Unlike Nagios, the command line cannot contain macros - it must be +# typed exactly as it should be executed. +# +# Note: Any plugins that are used in the command lines must reside +# on the machine that this daemon is running on! The examples below +# assume that you have plugins installed in a /usr/local/nagios/libexec +# directory. Also note that you will have to modify the definitions below +# to match the argument format the plugins expect. Remember, these are +# examples only! + + +# The following examples use hardcoded command arguments... + +command[check_users]=/usr/lib64/nagios/plugins/check_users -w 5 -c 10 +command[check_load]=/usr/lib64/nagios/plugins/check_load -r -w .15,.10,.05 -c .30,.25,.20 +command[check_hda1]=/usr/lib64/nagios/plugins/check_disk -w 20% -c 10% -p /dev/hda1 +command[check_zombie_procs]=/usr/lib64/nagios/plugins/check_procs -w 5 -c 10 -s Z +command[check_total_procs]=/usr/lib64/nagios/plugins/check_procs -w 150 -c 200 + + +# The following examples allow user-supplied arguments and can +# only be used if the NRPE daemon was compiled with support for +# command arguments *AND* the dont_blame_nrpe directive in this +# config file is set to '1'. This poses a potential security risk, so +# make sure you read the SECURITY file before doing this. + +#command[check_users]=/usr/lib64/nagios/plugins/check_users -w $ARG1$ -c $ARG2$ +#command[check_load]=/usr/lib64/nagios/plugins/check_load -w $ARG1$ -c $ARG2$ +#command[check_disk]=/usr/lib64/nagios/plugins/check_disk -w $ARG1$ -c $ARG2$ -p $ARG3$ +#command[check_procs]=/usr/lib64/nagios/plugins/check_procs -w $ARG1$ -c $ARG2$ -s $ARG3$ From 531fcfac5c02dd21cbaeaf6bb7164485e9e646dc Mon Sep 17 00:00:00 2001 From: Arne Teuke Date: Fri, 28 Jul 2017 13:50:23 +0100 Subject: [PATCH 2/5] edited README --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index c3a5914..35eb754 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ |Repo Name| version | Build Status| |---|---|---|---| -|`cd_nagios`| 0.0.1.1 | [![Build Status](https://jenkins.confdroid.com/buildStatus/icon?job=cd_nagios)](https://jenkins.confdroid.com/job/cd_nagios/)| +|`cd_nagios`| 0.0.1.2 | [![Build Status](https://jenkins.confdroid.com/buildStatus/icon?job=cd_nagios)](https://jenkins.confdroid.com/job/cd_nagios/)| ### Synopsis Nagios is a powerful open source software solution for monitoring your IT environments. @@ -92,9 +92,11 @@ All dependencies must be included in the catalogue. * [cd_firewall](https://gitlab.puppetsoft.com/12WW1160/cd_firewall) or [puppetlabs firewall](https://github.com/puppetlabs/puppetlabs-firewall) (optional) * [cd_selinux](https://gitlab.puppetsoft.com/12WW1160/cd_selinux) for selinux policy adjustments * [cd_certbot](https://gitlab.puppetsoft.com/12WW1160/cd_certbot) to auto-manage TLS certificates (optional) +* [cd_nrpe](https://gitlab.puppetsoft.com/12WW1160/cd_nrpe) to manage NRPE (optional) * [cd_stdlib](https://gitlab.puppetsoft.com/12WW1160/cd_stdlib) or [puppetlabs stdlib](https://github.com/puppetlabs/puppetlabs-stdlib) to facilitate concat * [cd-concat](https://gitlab.puppetsoft.com/12WW1160/cd_stdlib) or [puppetlabs concat](https://github.com/puppetlabs/puppetlabs-concat) to concatenate configuration files from different sources. + ### Deployment ##### native Puppet deployment From 3cac3f1a409abf6b87f83da51e49cc51435894c4 Mon Sep 17 00:00:00 2001 From: Arne Teuke Date: Fri, 28 Jul 2017 14:17:39 +0100 Subject: [PATCH 3/5] linked client to user --- manifests/client/target.pp | 2 +- templates/nrpe/nrpe.cfg | 318 ------------------------------------- 2 files changed, 1 insertion(+), 319 deletions(-) delete mode 100644 templates/nrpe/nrpe.cfg diff --git a/manifests/client/target.pp b/manifests/client/target.pp index 904c471..450af5e 100644 --- a/manifests/client/target.pp +++ b/manifests/client/target.pp @@ -28,7 +28,7 @@ class cd_nagios::client::target ( if $::fqdn != $ng_nagios_server { if $ng_include_nrpe == true { - require cd_nagios::main::install + require cd_nagios::main::user require cd_nrpe @@nagios_host { $::fqdn: diff --git a/templates/nrpe/nrpe.cfg b/templates/nrpe/nrpe.cfg deleted file mode 100644 index 080d53f..0000000 --- a/templates/nrpe/nrpe.cfg +++ /dev/null @@ -1,318 +0,0 @@ -############################################################################# -# Sample NRPE Config File -# Written by: Ethan Galstad (nagios@nagios.org) -# -# Last Modified: 2016-05-10 -# -# NOTES: -# This is a sample configuration file for the NRPE daemon. It needs to be -# located on the remote host that is running the NRPE daemon, not the host -# from which the check_nrpe client is being executed. -############################################################################# - - -# LOG FACILITY -# The syslog facility that should be used for logging purposes. - -log_facility=daemon - - - -# LOG FILE -# If a log file is specified in this option, nrpe will write to -# that file instead of using syslog. - -#log_file=/var/run/nrpe.log - - - -# DEBUGGING OPTION -# This option determines whether or not debugging messages are logged to the -# syslog facility. -# Values: 0=debugging off, 1=debugging on - -debug=0 - - - -# PID FILE -# The name of the file in which the NRPE daemon should write it's process ID -# number. The file is only written if the NRPE daemon is started by the root -# user and is running in standalone mode. - -pid_file=/var/run/nrpe/nrpe.pid - - - -# PORT NUMBER -# Port number we should wait for connections on. -# NOTE: This must be a non-privileged port (i.e. > 1024). -# NOTE: This option is ignored if NRPE is running under either inetd or xinetd - -server_port=5666 - - - -# SERVER ADDRESS -# Address that nrpe should bind to in case there are more than one interface -# and you do not want nrpe to bind on all interfaces. -# NOTE: This option is ignored if NRPE is running under either inetd or xinetd - -#server_address=127.0.0.1 - - - -# LISTEN QUEUE SIZE -# Listen queue size (backlog) for serving incoming connections. -# You may want to increase this value under high load. - -#listen_queue_size=5 - - - -# NRPE USER -# This determines the effective user that the NRPE daemon should run as. -# You can either supply a username or a UID. -# -# NOTE: This option is ignored if NRPE is running under either inetd or xinetd - -nrpe_user=nrpe - - - -# NRPE GROUP -# This determines the effective group that the NRPE daemon should run as. -# You can either supply a group name or a GID. -# -# NOTE: This option is ignored if NRPE is running under either inetd or xinetd - -nrpe_group=nrpe - - - -# ALLOWED HOST ADDRESSES -# This is an optional comma-delimited list of IP address or hostnames -# that are allowed to talk to the NRPE daemon. Network addresses with a bit mask -# (i.e. 192.168.1.0/24) are also supported. Hostname wildcards are not currently -# supported. -# -# Note: The daemon only does rudimentary checking of the client's IP -# address. I would highly recommend adding entries in your /etc/hosts.allow -# file to allow only the specified host to connect to the port -# you are running this daemon on. -# -# NOTE: This option is ignored if NRPE is running under either inetd or xinetd - -allowed_hosts=127.0.0.1,::1 - - - -# COMMAND ARGUMENT PROCESSING -# This option determines whether or not the NRPE daemon will allow clients -# to specify arguments to commands that are executed. This option only works -# if the daemon was configured with the --enable-command-args configure script -# option. -# -# *** ENABLING THIS OPTION IS A SECURITY RISK! *** -# Read the SECURITY file for information on some of the security implications -# of enabling this variable. -# -# Values: 0=do not allow arguments, 1=allow command arguments - -dont_blame_nrpe=0 - - - -# BASH COMMAND SUBSTITUTION -# This option determines whether or not the NRPE daemon will allow clients -# to specify arguments that contain bash command substitutions of the form -# $(...). This option only works if the daemon was configured with both -# the --enable-command-args and --enable-bash-command-substitution configure -# script options. -# -# *** ENABLING THIS OPTION IS A HIGH SECURITY RISK! *** -# Read the SECURITY file for information on some of the security implications -# of enabling this variable. -# -# Values: 0=do not allow bash command substitutions, -# 1=allow bash command substitutions - -allow_bash_command_substitution=0 - - - -# COMMAND PREFIX -# This option allows you to prefix all commands with a user-defined string. -# A space is automatically added between the specified prefix string and the -# command line from the command definition. -# -# *** THIS EXAMPLE MAY POSE A POTENTIAL SECURITY RISK, SO USE WITH CAUTION! *** -# Usage scenario: -# Execute restricted commmands using sudo. For this to work, you need to add -# the nagios user to your /etc/sudoers. An example entry for allowing -# execution of the plugins from might be: -# -# nagios ALL=(ALL) NOPASSWD: /usr/lib/nagios/plugins/ -# -# This lets the nagios user run all commands in that directory (and only them) -# without asking for a password. If you do this, make sure you don't give -# random users write access to that directory or its contents! - -# command_prefix=/usr/bin/sudo - - - -# COMMAND TIMEOUT -# This specifies the maximum number of seconds that the NRPE daemon will -# allow plugins to finish executing before killing them off. - -command_timeout=60 - - - -# CONNECTION TIMEOUT -# This specifies the maximum number of seconds that the NRPE daemon will -# wait for a connection to be established before exiting. This is sometimes -# seen where a network problem stops the SSL being established even though -# all network sessions are connected. This causes the nrpe daemons to -# accumulate, eating system resources. Do not set this too low. - -connection_timeout=300 - - - -# WEAK RANDOM SEED OPTION -# This directive allows you to use SSL even if your system does not have -# a /dev/random or /dev/urandom (on purpose or because the necessary patches -# were not applied). The random number generator will be seeded from a file -# which is either a file pointed to by the environment valiable $RANDFILE -# or $HOME/.rnd. If neither exists, the pseudo random number generator will -# be initialized and a warning will be issued. -# Values: 0=only seed from /dev/[u]random, 1=also seed from weak randomness - -#allow_weak_random_seed=1 - - - -# SSL/TLS OPTIONS -# These directives allow you to specify how to use SSL/TLS. - -# SSL VERSION -# This can be any of: SSLv2 (only use SSLv2), SSLv2+ (use any version), -# SSLv3 (only use SSLv3), SSLv3+ (use SSLv3 or above), TLSv1 (only use -# TLSv1), TLSv1+ (use TLSv1 or above), TLSv1.1 (only use TLSv1.1), -# TLSv1.1+ (use TLSv1.1 or above), TLSv1.2 (only use TLSv1.2), -# TLSv1.2+ (use TLSv1.2 or above) -# If an "or above" version is used, the best will be negotiated. So if both -# ends are able to do TLSv1.2 and use specify SSLv2, you will get TLSv1.2. -# If you are using openssl 1.1.0 or above, the SSLv2 options are not available. - -#ssl_version=SSLv2+ - -# SSL USE ADH -# This is for backward compatibility and is DEPRECATED. Set to 1 to enable -# ADH or 2 to require ADH. 1 is currently the default but will be changed -# in a later version. - -#ssl_use_adh=1 - -# SSL CIPHER LIST -# This lists which ciphers can be used. For backward compatibility, this -# defaults to 'ssl_cipher_list=ALL:!MD5:@STRENGTH' in this version but -# will be changed to something like the example below in a later version of NRPE. - -#ssl_cipher_list=ALL:!MD5:@STRENGTH -#ssl_cipher_list=ALL:!aNULL:!eNULL:!SSLv2:!LOW:!EXP:!RC4:!MD5:@STRENGTH - -# SSL Certificate and Private Key Files - -#ssl_cacert_file=/etc/ssl/servercerts/ca-cert.pem -#ssl_cert_file=/etc/ssl/servercerts/nagios-cert.pem -#ssl_privatekey_file=/etc/ssl/servercerts/nagios-key.pem - -# SSL USE CLIENT CERTS -# This options determines client certificate usage. -# Values: 0 = Don't ask for or require client certificates (default) -# 1 = Ask for client certificates -# 2 = Require client certificates - -#ssl_client_certs=0 - -# SSL LOGGING -# This option determines which SSL messages are send to syslog. OR values -# together to specify multiple options. - -# Values: 0x00 (0) = No additional logging (default) -# 0x01 (1) = Log startup SSL/TLS parameters -# 0x02 (2) = Log remote IP address -# 0x04 (4) = Log SSL/TLS version of connections -# 0x08 (8) = Log which cipher is being used for the connection -# 0x10 (16) = Log if client has a certificate -# 0x20 (32) = Log details of client's certificate if it has one -# -1 or 0xff or 0x2f = All of the above - -#ssl_logging=0x00 - - - -# NASTY METACHARACTERS -# This option allows you to override the list of characters that cannot -# be passed to the NRPE daemon. - -# nasty_metachars="|`&><'\\[]{};\r\n" - - -# INCLUDE CONFIG FILE -# This directive allows you to include definitions from an external config file. - -#include= - - - -# INCLUDE CONFIG DIRECTORY -# This directive allows you to include definitions from config files (with a -# .cfg extension) in one or more directories (with recursion). - -include_dir=/etc/nrpe.d/ - - - -# COMMAND DEFINITIONS -# Command definitions that this daemon will run. Definitions -# are in the following format: -# -# command[]= -# -# When the daemon receives a request to return the results of -# it will execute the command specified by the argument. -# -# Unlike Nagios, the command line cannot contain macros - it must be -# typed exactly as it should be executed. -# -# Note: Any plugins that are used in the command lines must reside -# on the machine that this daemon is running on! The examples below -# assume that you have plugins installed in a /usr/local/nagios/libexec -# directory. Also note that you will have to modify the definitions below -# to match the argument format the plugins expect. Remember, these are -# examples only! - - -# The following examples use hardcoded command arguments... - -command[check_users]=/usr/lib64/nagios/plugins/check_users -w 5 -c 10 -command[check_load]=/usr/lib64/nagios/plugins/check_load -r -w .15,.10,.05 -c .30,.25,.20 -command[check_hda1]=/usr/lib64/nagios/plugins/check_disk -w 20% -c 10% -p /dev/hda1 -command[check_zombie_procs]=/usr/lib64/nagios/plugins/check_procs -w 5 -c 10 -s Z -command[check_total_procs]=/usr/lib64/nagios/plugins/check_procs -w 150 -c 200 - - -# The following examples allow user-supplied arguments and can -# only be used if the NRPE daemon was compiled with support for -# command arguments *AND* the dont_blame_nrpe directive in this -# config file is set to '1'. This poses a potential security risk, so -# make sure you read the SECURITY file before doing this. - -#command[check_users]=/usr/lib64/nagios/plugins/check_users -w $ARG1$ -c $ARG2$ -#command[check_load]=/usr/lib64/nagios/plugins/check_load -w $ARG1$ -c $ARG2$ -#command[check_disk]=/usr/lib64/nagios/plugins/check_disk -w $ARG1$ -c $ARG2$ -p $ARG3$ -#command[check_procs]=/usr/lib64/nagios/plugins/check_procs -w $ARG1$ -c $ARG2$ -s $ARG3$ From 6d494590a708a5d458c0aba8bceb0e9cf99c531a Mon Sep 17 00:00:00 2001 From: Arne Teuke Date: Fri, 28 Jul 2017 14:18:27 +0100 Subject: [PATCH 4/5] linked client to user to have a consistent nagios uid/gid across estate --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 35eb754..c3c14fd 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ |Repo Name| version | Build Status| |---|---|---|---| -|`cd_nagios`| 0.0.1.2 | [![Build Status](https://jenkins.confdroid.com/buildStatus/icon?job=cd_nagios)](https://jenkins.confdroid.com/job/cd_nagios/)| +|`cd_nagios`| 0.0.1.3 | [![Build Status](https://jenkins.confdroid.com/buildStatus/icon?job=cd_nagios)](https://jenkins.confdroid.com/job/cd_nagios/)| ### Synopsis Nagios is a powerful open source software solution for monitoring your IT environments. From 08fd1fcb5ce6c7ea3358a6761c1dac75de109e71 Mon Sep 17 00:00:00 2001 From: Jenkins Server Date: Fri, 28 Jul 2017 15:24:01 +0200 Subject: [PATCH 5/5] recommit for updates in build 143 --- CHANGELOG.md | 375 ++++++++++-------- doc/_index.html | 2 +- doc/file.README.html | 20 +- doc/index.html | 20 +- doc/puppet_classes/cd_nagios.html | 2 +- .../cd_nagios_3A_3Acertbot_3A_3Acerts.html | 2 +- .../cd_nagios_3A_3Aclient_3A_3Atarget.html | 210 +++++----- ...cd_nagios_3A_3Afirewall_3A_3Aiptables.html | 2 +- .../cd_nagios_3A_3Amain_3A_3Aconfig.html | 2 +- .../cd_nagios_3A_3Amain_3A_3Adirs.html | 2 +- .../cd_nagios_3A_3Amain_3A_3Ainstall.html | 28 +- .../cd_nagios_3A_3Amain_3A_3Auser.html | 2 +- ...s_3A_3Aobjects_3A_3Aadd_contact_rules.html | 2 +- ...Aobjects_3A_3Aadd_contactgroups_rules.html | 2 +- ...3A_3Aobjects_3A_3Aadd_hostgroup_rules.html | 2 +- ...3Aobjects_3A_3Aadd_servicegroup_rules.html | 2 +- ...A_3Aobjects_3A_3Aadd_timeperiod_rules.html | 2 +- ...A_3Anagios_3A_3Aobjects_3A_3Acommands.html | 2 +- ..._3A_3Anagios_3A_3Aobjects_3A_3Aconfig.html | 2 +- ...agios_3A_3Aobjects_3A_3Acontactgroups.html | 2 +- ...A_3Anagios_3A_3Aobjects_3A_3Acontacts.html | 2 +- ...3Anagios_3A_3Aobjects_3A_3Ahostgroups.html | 2 +- ...agios_3A_3Aobjects_3A_3Aservicegroups.html | 2 +- ...gios_3A_3Aobjects_3A_3Atemplate_rules.html | 2 +- ...Anagios_3A_3Aobjects_3A_3Atimeperiods.html | 2 +- doc/puppet_classes/cd_nagios_3A_3Aparams.html | 37 +- .../cd_nagios_3A_3Aselinux_3A_3Aconfig.html | 2 +- ..._nagios_3A_3Aserver_3A_3Aaccess_rules.html | 2 +- .../cd_nagios_3A_3Aserver_3A_3Afiles.html | 2 +- .../cd_nagios_3A_3Aserver_3A_3Aservice.html | 2 +- ...Anagios_3A_3Aobjects_3A_3Aadd_contact.html | 2 +- ...s_3A_3Aobjects_3A_3Aadd_contactgroups.html | 2 +- ...gios_3A_3Aobjects_3A_3Aadd_hostgroups.html | 2 +- ...s_3A_3Aobjects_3A_3Aadd_servicegroups.html | 2 +- ...ios_3A_3Aobjects_3A_3Aadd_timeperiods.html | 2 +- ..._3Anagios_3A_3Aobjects_3A_3Atemplates.html | 2 +- .../cd_nagios_3A_3Aserver_3A_3Aaccess.html | 2 +- doc/top-level-namespace.html | 2 +- 38 files changed, 406 insertions(+), 348 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7e3d118..47edf3d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,30 +8,220 @@ Changelog of Git Changelog.

No issue

+ee6aecb2e2e8b68 Jenkins Server 2017-07-28 12:20:53 +

+

recommit for updates in build 140

+ +

0039bc732732717 Jenkins Server 2017-07-28 11:57:37

recommit for updates in build 138

-

-9b6550c92ae3965 Arne Teuke 2017-07-28 11:56:56 -

-

fixed ping check on service

-

355e7d2eb09d813 Jenkins Server 2017-07-28 11:39:00

recommit for updates in build 137

-

-7551e03486668a8 Arne Teuke 2017-07-28 11:38:15 -

-

edited parameter documentation

-

7296da22ecd57f8 Jenkins Server 2017-07-28 11:32:51

recommit for updates in build 136

+

+0cb2e563c835a16 Jenkins Server 2017-07-28 11:22:02 +

+

recommit for updates in build 134

+ +

+f913376d9cfd10a Jenkins Server 2017-07-27 15:34:56 +

+

recommit for updates in build 130

+ +

+d6da17fd103efa5 Jenkins Server 2017-07-27 15:30:56 +

+

recommit for updates in build 129

+ +

+a51c3d01180ce89 Jenkins Server 2017-07-27 15:23:15 +

+

recommit for updates in build 128

+ +

+7f92261f0997dfe Jenkins Server 2017-07-27 15:20:36 +

+

recommit for updates in build 127

+ +

+8a1d9f8292afcbe Jenkins Server 2017-07-27 15:01:48 +

+

recommit for updates in build 126

+ +

+15a189c8403c2c0 Jenkins Server 2017-07-27 14:55:31 +

+

recommit for updates in build 125

+ +

+d0a5bbadefcac07 Jenkins Server 2017-07-27 14:49:39 +

+

recommit for updates in build 124

+ +

+f8d19b46fdae2fb Jenkins Server 2017-07-27 14:44:56 +

+

recommit for updates in build 123

+ +

+137753dafe03b7a Jenkins Server 2017-07-27 14:29:05 +

+

recommit for updates in build 120

+ +

+cba65ddb7cb64cf Jenkins Server 2017-07-27 13:33:36 +

+

recommit for updates in build 117

+ +

+83782a592f1fe78 Jenkins Server 2017-07-27 13:22:48 +

+

recommit for updates in build 116

+ +

+dd4d061fe556bfb Jenkins Server 2017-07-27 12:47:24 +

+

recommit for updates in build 115

+ +

+5193e6a8d2dedc5 Jenkins Server 2017-07-27 12:33:19 +

+

recommit for updates in build 114

+ +

+f4321e6da976742 Jenkins Server 2017-07-27 11:58:59 +

+

recommit for updates in build 113

+ +

+cad8229c0821ad4 Jenkins Server 2017-07-27 11:44:51 +

+

recommit for updates in build 112

+ +

+d6267355c6ba26f Jenkins Server 2017-07-27 11:11:57 +

+

recommit for updates in build 111

+ +

+14a1e7412ff6792 Jenkins Server 2017-07-27 11:00:10 +

+

recommit for updates in build 110

+ +

+699586d7d8b5253 Jenkins Server 2017-07-27 10:56:34 +

+

recommit for updates in build 109

+ +

+2b24ed69186142a Jenkins Server 2017-07-27 10:41:48 +

+

recommit for updates in build 108

+ +

+0564cc970be1899 Jenkins Server 2017-07-26 14:27:43 +

+

recommit for updates in build 105

+ +

+af34a0587d9f48e Jenkins Server 2017-07-26 13:05:02 +

+

recommit for updates in build 104

+ +

+4dd15fea2853777 Jenkins Server 2017-07-26 12:48:06 +

+

recommit for updates in build 103

+ +

+19d33cb8a512c2f Jenkins Server 2017-07-26 12:40:46 +

+

recommit for updates in build 102

+ +

+5a33b87c5a01e94 Jenkins Server 2017-07-26 12:36:37 +

+

recommit for updates in build 101

+ +

+039523e1f69f07e Jenkins Server 2017-07-26 11:30:54 +

+

recommit for updates in build 99

+ +

+d395b5f60d08f61 Jenkins Server 2017-07-26 11:16:49 +

+

recommit for updates in build 97

+ +

+62feddee64c23f9 Jenkins Server 2017-07-25 18:04:08 +

+

recommit for updates in build 96

+ +

+a23722a67a2afb6 Jenkins Server 2017-07-25 17:56:39 +

+

recommit for updates in build 93

+ +

+445db500b3ab876 Jenkins Server 2017-07-25 16:15:39 +

+

recommit for updates in build 92

+ +

+a3517b81e663a07 Jenkins Server 2017-07-25 16:13:43 +

+

recommit for updates in build 91

+ +

+cc2d2cbf2968cce Jenkins Server 2017-07-25 15:57:28 +

+

recommit for updates in build 90

+ +

+b4b3de53a39ef00 Jenkins Server 2017-07-25 14:48:58 +

+

recommit for updates in build 84

+ +

+ +

v0.0.1.1

+

No issue

+ + +00c977abcfeba99 Arne Teuke 2017-07-28 12:20:15 +

+

removed incomplete class

+ +

+ +

v0.0.1.0

+

No issue

+ + +3e4f06a1fa27002 Arne Teuke 2017-07-28 12:16:40 +

+

linked client installations to target

+ +

+9b6550c92ae3965 Arne Teuke 2017-07-28 11:56:56 +

+

fixed ping check on service

+ +

+7551e03486668a8 Arne Teuke 2017-07-28 11:38:15 +

+

edited parameter documentation

+

04db67fdf99dced Arne Teuke 2017-07-28 11:32:10

@@ -42,11 +232,6 @@ Changelog of Git Changelog.

edited README and parameter documentation

-

-0cb2e563c835a16 Jenkins Server 2017-07-28 11:22:02 -

-

recommit for updates in build 134

-

fec775ad45a87d5 Arne Teuke 2017-07-28 11:21:20

@@ -67,81 +252,41 @@ Changelog of Git Changelog.

fixed typo

-

-f913376d9cfd10a Jenkins Server 2017-07-27 15:34:56 -

-

recommit for updates in build 130

-

6403b5f7a9c8357 Arne Teuke 2017-07-27 15:34:19

fixed typo

-

-d6da17fd103efa5 Jenkins Server 2017-07-27 15:30:56 -

-

recommit for updates in build 129

-

98c65c3b14a0d09 Arne Teuke 2017-07-27 15:30:20

fixed typo

-

-a51c3d01180ce89 Jenkins Server 2017-07-27 15:23:15 -

-

recommit for updates in build 128

-

fe1661007fe70d4 Arne Teuke 2017-07-27 15:22:39

fixed typo

-

-7f92261f0997dfe Jenkins Server 2017-07-27 15:20:36 -

-

recommit for updates in build 127

-

6f0c3a6903ae69a Arne Teuke 2017-07-27 15:19:59

removed special params

-

-8a1d9f8292afcbe Jenkins Server 2017-07-27 15:01:48 -

-

recommit for updates in build 126

-

c31d2d038ba8b97 Arne Teuke 2017-07-27 15:01:06

removed special params

-

-15a189c8403c2c0 Jenkins Server 2017-07-27 14:55:31 -

-

recommit for updates in build 125

-

eb8a92a4b4aabd9 Arne Teuke 2017-07-27 14:54:54

fixed typo

-

-d0a5bbadefcac07 Jenkins Server 2017-07-27 14:49:39 -

-

recommit for updates in build 124

-

82ca12e0363c956 Arne Teuke 2017-07-27 14:48:56

fixed typo

-

-f8d19b46fdae2fb Jenkins Server 2017-07-27 14:44:56 -

-

recommit for updates in build 123

-

34e172d7bd1fbb2 Arne Teuke 2017-07-27 14:44:07

@@ -162,11 +307,6 @@ Changelog of Git Changelog.

added parameter documentation

-

-137753dafe03b7a Jenkins Server 2017-07-27 14:29:05 -

-

recommit for updates in build 120

-

e76e4f857c4baf8 Arne Teuke 2017-07-27 14:28:21

@@ -187,101 +327,51 @@ Changelog of Git Changelog.

added timeperiods

-

-cba65ddb7cb64cf Jenkins Server 2017-07-27 13:33:36 -

-

recommit for updates in build 117

-

645cb4255af90d5 Arne Teuke 2017-07-27 13:33:00

added parameter documentation

-

-83782a592f1fe78 Jenkins Server 2017-07-27 13:22:48 -

-

recommit for updates in build 116

-

ab8b3878e7d76a3 Arne Teuke 2017-07-27 13:22:11

added servicegroup control

-

-dd4d061fe556bfb Jenkins Server 2017-07-27 12:47:24 -

-

recommit for updates in build 115

-

25a31ffc1bc0790 Arne Teuke 2017-07-27 12:46:46

edited README and fixed template

-

-5193e6a8d2dedc5 Jenkins Server 2017-07-27 12:33:19 -

-

recommit for updates in build 114

-

26e2220ec9da0b2 Arne Teuke 2017-07-27 12:32:48

added service description and add_hostgroup_rules

-

-f4321e6da976742 Jenkins Server 2017-07-27 11:58:59 -

-

recommit for updates in build 113

-

842d86a504f6198 Arne Teuke 2017-07-27 11:58:30

added _ to service name

-

-cad8229c0821ad4 Jenkins Server 2017-07-27 11:44:51 -

-

recommit for updates in build 112

-

7b27896ccb84382 Arne Teuke 2017-07-27 11:44:19

added and linked hostgroups

-

-d6267355c6ba26f Jenkins Server 2017-07-27 11:11:57 -

-

recommit for updates in build 111

-

3f12bbd92d567f6 Arne Teuke 2017-07-27 11:11:26

added and linked add_contactgroups_rules

-

-14a1e7412ff6792 Jenkins Server 2017-07-27 11:00:10 -

-

recommit for updates in build 110

-

a90da5d3ed18e7a Arne Teuke 2017-07-27 10:59:39

added and linked add_contactgroups_rules

-

-699586d7d8b5253 Jenkins Server 2017-07-27 10:56:34 -

-

recommit for updates in build 109

-

672f61d994a4360 Arne Teuke 2017-07-27 10:56:09

added and linked add_contactgroups_rules

-

-2b24ed69186142a Jenkins Server 2017-07-27 10:41:48 -

-

recommit for updates in build 108

-

e02276ecc70dbca Arne Teuke 2017-07-27 10:41:22

@@ -297,51 +387,26 @@ Changelog of Git Changelog.

added add_contactgroups

-

-0564cc970be1899 Jenkins Server 2017-07-26 14:27:43 -

-

recommit for updates in build 105

-

12f835aa4ff29bd Arne Teuke 2017-07-26 14:27:16

added and linked base contactgroups

-

-af34a0587d9f48e Jenkins Server 2017-07-26 13:05:02 -

-

recommit for updates in build 104

-

6094321d4f0cebb Arne Teuke 2017-07-26 13:04:39

sorted deprecated syntax

-

-4dd15fea2853777 Jenkins Server 2017-07-26 12:48:06 -

-

recommit for updates in build 103

-

6ee49a5e33f28cb Arne Teuke 2017-07-26 12:47:45

fixed typo

-

-19d33cb8a512c2f Jenkins Server 2017-07-26 12:40:46 -

-

recommit for updates in build 102

-

6955770373d63a1 Arne Teuke 2017-07-26 12:40:23

fixed typo

-

-5a33b87c5a01e94 Jenkins Server 2017-07-26 12:36:37 -

-

recommit for updates in build 101

-

8fafc260c8a85c2 Arne Teuke 2017-07-26 12:36:14

@@ -352,11 +417,6 @@ Changelog of Git Changelog.

finalizing contacts

-

-039523e1f69f07e Jenkins Server 2017-07-26 11:30:54 -

-

recommit for updates in build 99

-

a99920d7888b4ca Arne Teuke 2017-07-26 11:30:34

@@ -372,21 +432,11 @@ Changelog of Git Changelog.

added base contacts and additional contacts

-

-d395b5f60d08f61 Jenkins Server 2017-07-26 11:16:49 -

-

recommit for updates in build 97

-

85ade68820b8379 Arne Teuke 2017-07-26 11:16:25

added base contacts and additional contacts

-

-62feddee64c23f9 Jenkins Server 2017-07-25 18:04:08 -

-

recommit for updates in build 96

-

099828e47a377d2 Arne Teuke 2017-07-25 18:02:29

@@ -397,41 +447,21 @@ Changelog of Git Changelog.

testing templates

-

-a23722a67a2afb6 Jenkins Server 2017-07-25 17:56:39 -

-

recommit for updates in build 93

-

a04f079a6cbeec8 Arne Teuke 2017-07-25 17:56:18

testing templates

-

-445db500b3ab876 Jenkins Server 2017-07-25 16:15:39 -

-

recommit for updates in build 92

-

b4e4ceb9b07cde4 Arne Teuke 2017-07-25 16:15:21

added parameter documentation

-

-a3517b81e663a07 Jenkins Server 2017-07-25 16:13:43 -

-

recommit for updates in build 91

-

e03a5d94750b182 Arne Teuke 2017-07-25 16:13:25

added parameter documentation

-

-cc2d2cbf2968cce Jenkins Server 2017-07-25 15:57:28 -

-

recommit for updates in build 90

-

6a57847a121f632 Arne Teuke 2017-07-25 15:57:10

@@ -462,11 +492,6 @@ Changelog of Git Changelog.

linked commands.pp

-

-b4b3de53a39ef00 Jenkins Server 2017-07-25 14:48:58 -

-

recommit for updates in build 84

-

3327f6d8692753b Arne Teuke 2017-07-25 14:48:39

diff --git a/doc/_index.html b/doc/_index.html index 4cfa834..aed073a 100644 --- a/doc/_index.html +++ b/doc/_index.html @@ -281,7 +281,7 @@

diff --git a/doc/file.README.html b/doc/file.README.html index 0b23bc5..f7e3f85 100644 --- a/doc/file.README.html +++ b/doc/file.README.html @@ -61,7 +61,7 @@

|Repo Name| version | Build Status| |---|---|---|---| -|cd_nagios| 0.0.1.0 | cd_nagios| 0.0.1.3 | {Build Status/]|

@@ -114,7 +114,9 @@ Structure

  • Httpd vHost Files

  • -

    [Manage additional resources]

    +

    Client Connections

    +
  • +

    Manage additional resources

  • Known Problems

  • @@ -230,6 +232,9 @@ for selinux policy adjustments

    cd_certbot to auto-manage TLS certificates (optional)

  • +

    cd_nrpe to +manage NRPE (optional)

    +

  • cd_stdlib or puppetlabs stdlib to facilitate concat

    @@ -332,6 +337,15 @@ on a regular web server with various other web instances (not recommended through for performance reasons), we will not want to manage ssl.conf directly, hence the module creates a vhost for the ssl host.

    +

    Client Connections

    + +

    In order to monitor clients, NAGIOS must be able to connect to them. There +are multiple ways of doing so, the most common ones being NRPE and SSH. +So +far this module works through the usage of NRPE, which by default is +enabled. Class cd_nagios::client::nrpe configures nrpe.cfg and opens the +required firewall port on clients (optional,default).

    +

    Manage additional resources

    Known Problems

    @@ -393,7 +407,7 @@ environments.

    diff --git a/doc/index.html b/doc/index.html index d889d78..cded359 100644 --- a/doc/index.html +++ b/doc/index.html @@ -61,7 +61,7 @@

    |Repo Name| version | Build Status| |---|---|---|---| -|cd_nagios| 0.0.1.0 | cd_nagios| 0.0.1.3 | {Build Status/]|

    @@ -114,7 +114,9 @@ Structure

  • Httpd vHost Files

  • -

    [Manage additional resources]

    +

    Client Connections

    +
  • +

    Manage additional resources

  • Known Problems

  • @@ -230,6 +232,9 @@ for selinux policy adjustments

    cd_certbot to auto-manage TLS certificates (optional)

  • +

    cd_nrpe to +manage NRPE (optional)

    +

  • cd_stdlib or puppetlabs stdlib to facilitate concat

    @@ -332,6 +337,15 @@ on a regular web server with various other web instances (not recommended through for performance reasons), we will not want to manage ssl.conf directly, hence the module creates a vhost for the ssl host.

    +

    Client Connections

    + +

    In order to monitor clients, NAGIOS must be able to connect to them. There +are multiple ways of doing so, the most common ones being NRPE and SSH. +So +far this module works through the usage of NRPE, which by default is +enabled. Class cd_nagios::client::nrpe configures nrpe.cfg and opens the +required firewall port on clients (optional,default).

    +

    Manage additional resources

    Known Problems

    @@ -393,7 +407,7 @@ environments.

    diff --git a/doc/puppet_classes/cd_nagios.html b/doc/puppet_classes/cd_nagios.html index 4b1d240..1ee1aa3 100644 --- a/doc/puppet_classes/cd_nagios.html +++ b/doc/puppet_classes/cd_nagios.html @@ -139,7 +139,7 @@ class cd_nagios { diff --git a/doc/puppet_classes/cd_nagios_3A_3Acertbot_3A_3Acerts.html b/doc/puppet_classes/cd_nagios_3A_3Acertbot_3A_3Acerts.html index 03fa825..0a96e4f 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Acertbot_3A_3Acerts.html +++ b/doc/puppet_classes/cd_nagios_3A_3Acertbot_3A_3Acerts.html @@ -230,7 +230,7 @@ class cd_nagios::certbot::certs ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Aclient_3A_3Atarget.html b/doc/puppet_classes/cd_nagios_3A_3Aclient_3A_3Atarget.html index 7a018da..f6f0c73 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Aclient_3A_3Atarget.html +++ b/doc/puppet_classes/cd_nagios_3A_3Aclient_3A_3Atarget.html @@ -243,7 +243,10 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses/.

    136 137 138 -139 +139 +140 +141 +142 
    # File 'manifests/client/target.pp', line 23
@@ -254,114 +257,117 @@ class cd_nagios::client::target (
 ) inherits cd_nagios::params {
 
   if $::fqdn != $ng_nagios_server {
+    if $ng_include_nrpe == true {
 
-    require cd_nagios::main::install
+    require cd_nagios::main::user
+    require cd_nrpe
 
-    @@nagios_host { $::fqdn:
-        ensure              =>  $ng_ping_ensure,
-        alias               =>  $::hostname,
-        address             =>  $::fqdn,
-        use                 =>  'linux-server',
-        target              =>  $ng_target_host,
-        hostgroups          =>  'linux-servers',
-        contacts            =>  'ops',
-        max_check_attempts  =>  $ng_max_check_attempts,
-        notification_period =>  '24x7',
-        owner               =>  $ng_user,
-        group               =>  $ng_user,
-        mode                =>  '0640',
-        check_command       =>  "check_ping!${ng_ping_warn}!${ng_ping_crit}",
-        notify              =>  Service[$ng_user],
-    }
+      @@nagios_host { $::fqdn:
+          ensure              =>  $ng_ping_ensure,
+          alias               =>  $::hostname,
+          address             =>  $::fqdn,
+          use                 =>  'linux-server',
+          target              =>  $ng_target_host,
+          hostgroups          =>  'linux-servers',
+          contacts            =>  'ops',
+          max_check_attempts  =>  $ng_max_check_attempts,
+          notification_period =>  '24x7',
+          owner               =>  $ng_user,
+          group               =>  $ng_user,
+          mode                =>  '0640',
+          check_command       =>  "check_ping!${ng_ping_warn}!${ng_ping_crit}",
+          notify              =>  Service[$ng_user],
+      }
 
-    @@nagios_service { "root_partition_${::hostname}":
-        ensure              =>  $ng_disk_ensure,
-        check_command       =>  "check_nrpe!check_disk!${ng_disk_warn}!${ng_disk_crit}!/",
-        use                 =>  'generic-service',
-        host_name           =>  $::fqdn,
-        contacts            =>  'ops',
-        notification_period =>  '24x7',
-        service_description =>  "${::hostname}_root_partition",
-        servicegroups       =>  'linux-services',
-        target              =>  $ng_target_service,
-        owner               =>  $ng_user,
-        group               =>  $ng_user,
-        mode                =>  '0640',
-    }
+      @@nagios_service { "root_partition_${::hostname}":
+          ensure              =>  $ng_disk_ensure,
+          check_command       =>  "check_nrpe!check_disk!${ng_disk_warn}!${ng_disk_crit}!/",
+          use                 =>  'generic-service',
+          host_name           =>  $::fqdn,
+          contacts            =>  'ops',
+          notification_period =>  '24x7',
+          service_description =>  "${::hostname}_root_partition",
+          servicegroups       =>  'linux-services',
+          target              =>  $ng_target_service,
+          owner               =>  $ng_user,
+          group               =>  $ng_user,
+          mode                =>  '0640',
+      }
 
-    @@nagios_service { "Swap_Usage_${::hostname}":
-        ensure              =>  $ng_swap_ensure,
-        check_command       =>  "check_nrpe!check_swap!${ng_swap_warn}!${ng_swap_crit}",
-        use                 =>  'generic-service',
-        host_name           =>  $::fqdn,
-        contacts            =>  'ops',
-        notification_period =>  '24x7',
-        service_description =>  "${::hostname}_swap_usage",
-        servicegroups       =>  'linux-services',
-        target              =>  $ng_target_service,
-        owner               =>  $ng_user,
-        group               =>  $ng_user,
-        mode                =>  '0640',
-    }
+      @@nagios_service { "Swap_Usage_${::hostname}":
+          ensure              =>  $ng_swap_ensure,
+          check_command       =>  "check_nrpe!check_swap!${ng_swap_warn}!${ng_swap_crit}",
+          use                 =>  'generic-service',
+          host_name           =>  $::fqdn,
+          contacts            =>  'ops',
+          notification_period =>  '24x7',
+          service_description =>  "${::hostname}_swap_usage",
+          servicegroups       =>  'linux-services',
+          target              =>  $ng_target_service,
+          owner               =>  $ng_user,
+          group               =>  $ng_user,
+          mode                =>  '0640',
+      }
 
-    @@nagios_service { "Local_Users_${::hostname}":
-        ensure              =>  $ng_users_ensure,
-        check_command       =>  "check_nrpe!check_users!${ng_users_warn}!${ng_users_crit}",
-        use                 =>  'generic-service',
-        host_name           =>  $::fqdn,
-        contacts            =>  'ops',
-        notification_period =>  '24x7',
-        service_description =>  "${::hostname}_local_users",
-        servicegroups       =>  'linux-services',
-        target              =>  $ng_target_service,
-        owner               =>  $ng_user,
-        group               =>  $ng_user,
-        mode                =>  '0640',
-    }
+      @@nagios_service { "Local_Users_${::hostname}":
+          ensure              =>  $ng_users_ensure,
+          check_command       =>  "check_nrpe!check_users!${ng_users_warn}!${ng_users_crit}",
+          use                 =>  'generic-service',
+          host_name           =>  $::fqdn,
+          contacts            =>  'ops',
+          notification_period =>  '24x7',
+          service_description =>  "${::hostname}_local_users",
+          servicegroups       =>  'linux-services',
+          target              =>  $ng_target_service,
+          owner               =>  $ng_user,
+          group               =>  $ng_user,
+          mode                =>  '0640',
+      }
 
-    @@nagios_service { "Total Processes_${::hostname}":
-        ensure              =>  $ng_procs_tot_ens,
-        check_command       =>  "check_nrpe!check_procs!${ng_procs_tot_warn}!${ng_procs_tot_crit}!${ng_procs_tot_param}",
-        use                 =>  'generic-service',
-        host_name           =>  $::fqdn,
-        contacts            =>  'ops',
-        notification_period =>  '24x7',
-        service_description =>  "${::hostname}_total_processes",
-        servicegroups       =>  'linux-services',
-        target              =>  $ng_target_service,
-        owner               =>  $ng_user,
-        group               =>  $ng_user,
-        mode                =>  '0640',
-    }
+      @@nagios_service { "Total Processes_${::hostname}":
+          ensure              =>  $ng_procs_tot_ens,
+          check_command       =>  "check_nrpe!check_procs!${ng_procs_tot_warn}!${ng_procs_tot_crit}!${ng_procs_tot_param}",
+          use                 =>  'generic-service',
+          host_name           =>  $::fqdn,
+          contacts            =>  'ops',
+          notification_period =>  '24x7',
+          service_description =>  "${::hostname}_total_processes",
+          servicegroups       =>  'linux-services',
+          target              =>  $ng_target_service,
+          owner               =>  $ng_user,
+          group               =>  $ng_user,
+          mode                =>  '0640',
+      }
 
-    @@nagios_service { "Zombie Processes_${::hostname}":
-        ensure              =>  $ng_procs_z_ensure,
-        check_command       =>  "check_nrpe!check_procs!${ng_procs_z_warn}!${ng_procs_z_crit}!${ng_procs_z_param}",
-        use                 =>  'generic-service',
-        host_name           =>  $::fqdn,
-        contacts            =>  'ops',
-        notification_period =>  '24x7',
-        service_description =>  "${::hostname}_zombie_processes",
-        servicegroups       =>  'linux-services',
-        target              =>  $ng_target_service,
-        owner               =>  $ng_user,
-        group               =>  $ng_user,
-        mode                =>  '0640',
-    }
+      @@nagios_service { "Zombie Processes_${::hostname}":
+          ensure              =>  $ng_procs_z_ensure,
+          check_command       =>  "check_nrpe!check_procs!${ng_procs_z_warn}!${ng_procs_z_crit}!${ng_procs_z_param}",
+          use                 =>  'generic-service',
+          host_name           =>  $::fqdn,
+          contacts            =>  'ops',
+          notification_period =>  '24x7',
+          service_description =>  "${::hostname}_zombie_processes",
+          servicegroups       =>  'linux-services',
+          target              =>  $ng_target_service,
+          owner               =>  $ng_user,
+          group               =>  $ng_user,
+          mode                =>  '0640',
+      }
 
-    @@nagios_service { "Current_Load_${::hostname}":
-        ensure              =>  $ng_load_ensure,
-        check_command       =>  "check_nrpe!check_load!${ng_load_warn}!${ng_load_crit}",
-        use                 =>  'generic-service',
-        host_name           =>  $::fqdn,
-        contacts            =>  'ops',
-        notification_period =>  '24x7',
-        service_description =>  "${::hostname}_current_load",
-        servicegroups       =>  'linux-services',
-        target              =>  $ng_target_service,
-        owner               =>  $ng_user,
-        group               =>  $ng_user,
-        mode                =>  '0640',
+      @@nagios_service { "Current_Load_${::hostname}":
+          ensure              =>  $ng_load_ensure,
+          check_command       =>  "check_nrpe!check_load!${ng_load_warn}!${ng_load_crit}",
+          use                 =>  'generic-service',
+          host_name           =>  $::fqdn,
+          contacts            =>  'ops',
+          notification_period =>  '24x7',
+          service_description =>  "${::hostname}_current_load",
+          servicegroups       =>  'linux-services',
+          target              =>  $ng_target_service,
+          owner               =>  $ng_user,
+          group               =>  $ng_user,
+          mode                =>  '0640',
+      }
     }
   }
 }
    @@ -372,7 +378,7 @@ class cd_nagios::client::target ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html b/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html index c00d661..0baed40 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html +++ b/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html @@ -207,7 +207,7 @@ class cd_nagios::firewall::iptables ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html index aef71d0..3be915d 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html +++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html @@ -195,7 +195,7 @@ class cd_nagios::main::config ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html index 25de34f..650719b 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html +++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html @@ -468,7 +468,7 @@ class cd_nagios::main::dirs ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html index 5b1ddfa..2c319f5 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html +++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html @@ -165,18 +165,7 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses/.

    56 57 58 -59 -60 -61 -62 -63 -64 -65 -66 -67 -68 -69 -70 +59 
    # File 'manifests/main/install.pp', line 24
@@ -201,15 +190,6 @@ class cd_nagios::main::install (
     package {$reqpackages_client:
       ensure => $pkg_ensure,
     }
-
-    # install NRPE if enabled
-
-    if $ng_include_nrpe == true {
-
-      package {$reqpackages_nrpe:
-        ensure => $pkg_ensure,
-      }
-    }
   }
 
   # if we are not the nagios server, install client packages
@@ -222,9 +202,7 @@ class cd_nagios::main::install (
     # if we want to use NRPE, install it
 
     if $ng_include_nrpe == true {
-      package {$reqpackages_nrpe:
-        ensure => $pkg_ensure,
-      }
+      require cd_nrpe
     }
   }
 }
    @@ -235,7 +213,7 @@ class cd_nagios::main::install ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html index 4739dd5..34ce8b3 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html +++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html @@ -200,7 +200,7 @@ class cd_nagios::main::user ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_contact_rules.html b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_contact_rules.html index b312d2a..def0c53 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_contact_rules.html +++ b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_contact_rules.html @@ -217,7 +217,7 @@ class cd_nagios::nagios::objects::add_contact_rules ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_contactgroups_rules.html b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_contactgroups_rules.html index e69afa0..0eeee9b 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_contactgroups_rules.html +++ b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_contactgroups_rules.html @@ -215,7 +215,7 @@ class cd_nagios::nagios::objects::add_contactgroups_rules ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_hostgroup_rules.html b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_hostgroup_rules.html index 9f1b2ac..734d8b1 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_hostgroup_rules.html +++ b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_hostgroup_rules.html @@ -214,7 +214,7 @@ class cd_nagios::nagios::objects::add_hostgroup_rules ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_servicegroup_rules.html b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_servicegroup_rules.html index 894e824..52adff9 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_servicegroup_rules.html +++ b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_servicegroup_rules.html @@ -224,7 +224,7 @@ class cd_nagios::nagios::objects::add_servicegroup_rules ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_timeperiod_rules.html b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_timeperiod_rules.html index c54fec8..b56a9e6 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_timeperiod_rules.html +++ b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_timeperiod_rules.html @@ -222,7 +222,7 @@ class cd_nagios::nagios::objects::add_timeperiod_rules ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Acommands.html b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Acommands.html index 52a8175..5acf81b 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Acommands.html +++ b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Acommands.html @@ -597,7 +597,7 @@ class cd_nagios::nagios::objects::commands ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aconfig.html b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aconfig.html index 9ddb247..5a3bb3b 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aconfig.html +++ b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aconfig.html @@ -182,7 +182,7 @@ class cd_nagios::nagios::objects::config ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Acontactgroups.html b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Acontactgroups.html index 1ab970c..6c9aede 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Acontactgroups.html +++ b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Acontactgroups.html @@ -237,7 +237,7 @@ class cd_nagios::nagios::objects::contactgroups ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Acontacts.html b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Acontacts.html index 044e24f..b63df40 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Acontacts.html +++ b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Acontacts.html @@ -280,7 +280,7 @@ class cd_nagios::nagios::objects::contacts ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Ahostgroups.html b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Ahostgroups.html index 68d404d..680a184 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Ahostgroups.html +++ b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Ahostgroups.html @@ -551,7 +551,7 @@ class cd_nagios::nagios::objects::hostgroups ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aservicegroups.html b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aservicegroups.html index 2af6356..2deaa0d 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aservicegroups.html +++ b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aservicegroups.html @@ -235,7 +235,7 @@ class cd_nagios::nagios::objects::servicegroups ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Atemplate_rules.html b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Atemplate_rules.html index d73adbc..cf30f18 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Atemplate_rules.html +++ b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Atemplate_rules.html @@ -305,7 +305,7 @@ class cd_nagios::nagios::objects::template_rules ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Atimeperiods.html b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Atimeperiods.html index 7194857..e2f9e75 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Atimeperiods.html +++ b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Atimeperiods.html @@ -285,7 +285,7 @@ class cd_nagios::nagios::objects::timeperiods ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Aparams.html b/doc/puppet_classes/cd_nagios_3A_3Aparams.html index 2990c2e..2fa3f37 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Aparams.html +++ b/doc/puppet_classes/cd_nagios_3A_3Aparams.html @@ -4871,6 +4871,25 @@ rampup_limit - Minimum rampup_change rampup_change - # of jobs to add to jobs_limit when ramping up

    + + +
    • + +
  • + + ng_nrpe_port + + + (string) + + + (defaults to: '5666') + + + — +
    +

    the port for NRPE. used by firewall and in +configuration file.

    • @@ -4892,8 +4911,6 @@ up

     
 
-646
-647
 648
 649
 650
@@ -5245,10 +5262,13 @@ up
    
 996
 997
 998
-999
    +999 +1000 +1001 +1002 - 
    # File 'manifests/params.pp', line 646
+        
    # File 'manifests/params.pp', line 648
 
 class cd_nagios::params (
 
@@ -5268,6 +5288,7 @@ $ng_http_https_fw           = true,
 $ng_fw_order                = '50',
 $ng_http_port               = '80',
 $ng_https_port              = '443',
+$ng_nrpe_port               = '5666',
 
 # check command parameters
 ## ping
@@ -5514,9 +5535,6 @@ $ng_loadctl_options         = 'jobs_max=100;backoff_limit=10;rampup_change=5
                                         'nagios-plugins-nrpe',
                                         'nagios-common']
   }
-  $reqpackages_nrpe = $::operatingsystem ? {
-    /(?i-mx:centos|fedora|redhat)/ => ['nrpe']
-  }
 
 # service
 $ng_service                 = 'nagios'
@@ -5599,6 +5617,9 @@ $ng_cntctgrps_rule_erb      = 'cd_nagios/nagios/contactgroups_cfg_rule.erb&#
 $ng_target_command          = "${ng_conf_d_dir}/nagios_commands_base.cfg"
 $ng_nagios_service_cmd      = 'check_nagios!/var/log/nagios/status.dat!5!/usr/sbin/nagios'
 
+# nrpe
+$ng_nrpe_file               = "${ng_main_dir}/nrpe.cfg"
+
 # includes must be last
 
   include cd_nagios::main::config
@@ -5611,7 +5632,7 @@ $ng_nagios_service_cmd      = 'check_nagios!/var/log/nagios/status.dat!5!/us
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html b/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html
index 2c06d26..8c5995a 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html
@@ -249,7 +249,7 @@ class cd_nagios::selinux::config (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html
index ed9a998..54db28b 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html
@@ -195,7 +195,7 @@ class cd_nagios::server::access_rules (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html
index 36febc7..9b23360 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html
@@ -334,7 +334,7 @@ class cd_nagios::server::files (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html
index 13b51b9..0c79211 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html
@@ -304,7 +304,7 @@ class cd_nagios::server::service (
 
 
       
diff --git a/doc/puppet_defined_types/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_contact.html b/doc/puppet_defined_types/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_contact.html
index 50d6b95..a4b06c7 100644
--- a/doc/puppet_defined_types/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_contact.html
+++ b/doc/puppet_defined_types/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_contact.html
@@ -285,7 +285,7 @@ $ng_contacts_rule_erb   = $::cd_nagios::params::ng_contacts_rule_erb
 
 
       
diff --git a/doc/puppet_defined_types/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_contactgroups.html b/doc/puppet_defined_types/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_contactgroups.html
index 0d1d010..bd37764 100644
--- a/doc/puppet_defined_types/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_contactgroups.html
+++ b/doc/puppet_defined_types/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_contactgroups.html
@@ -237,7 +237,7 @@ $ng_cntctgrps_rule_erb    = $::cd_nagios::params::ng_cntctgrps_rule_erb
 
 
       
diff --git a/doc/puppet_defined_types/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_hostgroups.html b/doc/puppet_defined_types/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_hostgroups.html
index 822cf72..a74687d 100644
--- a/doc/puppet_defined_types/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_hostgroups.html
+++ b/doc/puppet_defined_types/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_hostgroups.html
@@ -245,7 +245,7 @@ $ng_tgt_hostgrp_rule_erb  = $::cd_nagios::params::ng_tgt_hostgrp_rule_erb
 
 
       
diff --git a/doc/puppet_defined_types/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_servicegroups.html b/doc/puppet_defined_types/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_servicegroups.html
index e99bdd0..688b836 100644
--- a/doc/puppet_defined_types/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_servicegroups.html
+++ b/doc/puppet_defined_types/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_servicegroups.html
@@ -245,7 +245,7 @@ $ng_tgt_svcgrp_rule_erb   = $::cd_nagios::params::ng_tgt_svcgrp_rule_erb
 
 
       
diff --git a/doc/puppet_defined_types/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_timeperiods.html b/doc/puppet_defined_types/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_timeperiods.html
index ed1ccd8..c76292f 100644
--- a/doc/puppet_defined_types/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_timeperiods.html
+++ b/doc/puppet_defined_types/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_timeperiods.html
@@ -370,7 +370,7 @@ $ng_tgt_timep_rule_erb    = $::cd_nagios::params::ng_tgt_timep_rule_erb
 
 
       
diff --git a/doc/puppet_defined_types/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Atemplates.html b/doc/puppet_defined_types/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Atemplates.html
index e3e05e4..1030676 100644
--- a/doc/puppet_defined_types/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Atemplates.html
+++ b/doc/puppet_defined_types/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Atemplates.html
@@ -906,7 +906,7 @@ $ng_templates_rule_erb  = $::cd_nagios::params::ng_templates_rule_erb
 
 
       
diff --git a/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html b/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html
index 876c0a1..21e5fb1 100644
--- a/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html
+++ b/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html
@@ -220,7 +220,7 @@ $ng_service       = $::cd_nagios::params::ng_service
 
 
       
diff --git a/doc/top-level-namespace.html b/doc/top-level-namespace.html
index cc98b72..9afa31e 100644
--- a/doc/top-level-namespace.html
+++ b/doc/top-level-namespace.html
@@ -90,7 +90,7 @@