Faidon has uploaded a new change for review.
https://gerrit.wikimedia.org/r/70606
Change subject: Remove obsolete nrpe stanzas
......................................................................
Remove obsolete nrpe stanzas
I spent hours trying to clean up this across the fleet. It should be
applied everywhere but erzurumi, mc15, mw1173, virt1, virt3, virt4 but I
hope this will get reinstalled when put back into production.
Change-Id: Ib887b7b05474bd1390bbcfc9822ceaae3a44c818
---
D files/icinga/nagios-nrpe-server-init
D files/icinga/nrpe.cfg
M manifests/nrpe.pp
3 files changed, 0 insertions(+), 338 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/06/70606/1
diff --git a/files/icinga/nagios-nrpe-server-init
b/files/icinga/nagios-nrpe-server-init
deleted file mode 100755
index c0e62c2..0000000
--- a/files/icinga/nagios-nrpe-server-init
+++ /dev/null
@@ -1,84 +0,0 @@
-#! /bin/sh
-#
-
-### BEGIN INIT INFO
-# Provides: nagios-nrpe-server
-# Required-Start: $local_fs $remote_fs $syslog $named $network $time
-# Required-Stop: $local_fs $remote_fs $syslog $named $network
-# Should-Start:
-# Should-Stop:
-# Default-Start: 2 3 4 5
-# Default-Stop: 0 1 6
-# Short-Description: Start/Stop the Nagios remote plugin execution daemon
-### END INIT INFO
-
-
-PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
-DAEMON=/usr/sbin/nrpe
-NAME=nagios-nrpe
-DESC=nagios-nrpe
-CONFIG=/etc/nagios/nrpe.cfg
-PIDDIR=/var/run/nagios
-
-test -x $DAEMON || exit 0
-
-if ! [ -x "/lib/lsb/init-functions" ]; then
- . /lib/lsb/init-functions
-else
- echo "E: /lib/lsb/init-functions not found, lsb-base (>= 3.0-6) needed"
- exit 1
-fi
-
-# Include nagios-nrpe defaults if available
-if [ -f /etc/default/nagios-nrpe-server ] ; then
- . /etc/default/nagios-nrpe-server
-fi
-# we also used to include this file, so if it's there
-# we include it as well
-if [ -f /etc/default/nagios-nrpe ]; then
- . /etc/default/nagios-nrpe
-fi
-if [ "$NICENESS" ]; then NICENESS="-n $NICENESS"; fi
-
-#since /var/run can be wiped completly we create our run directory here
-if [ ! -d "$PIDDIR" ]; then
- mkdir "$PIDDIR"
- chown nagios "$PIDDIR"
-fi
-
-set -e
-
-case "$1" in
- start)
- if [ "$INETD" = 1 ]; then
- exit 1
- fi
- log_daemon_msg "Starting $DESC" "$NAME"
- start_daemon -p $PIDDIR/nrpe.pid $NICENESS $DAEMON -c $CONFIG -d
$DAEMON_OPTS
- log_end_msg $?
- ;;
- stop)
- log_daemon_msg "Stopping $DESC" "$NAME"
- start-stop-daemon --stop --quiet --oknodo --pidfile $PIDDIR/nrpe.pid
--retry 15
- log_end_msg $?
- ;;
- reload|force-reload)
- log_daemon_msg "Reloading $DESC configuration files" "$NAME"
- start-stop-daemon --stop --signal HUP --quiet --pidfile $PIDDIR/nrpe.pid
- log_end_msg $?
- ;;
- status)
- status_of_proc -p $PIDDIR/nrpe.pid "$DAEMON" "$NAME" && exit 0 || exit $?
- ;;
- restart)
- $0 stop
- sleep 1
- $0 start
- ;;
- *)
- log_failure_msg "Usage: $N {start|stop|restart|reload|force-reload}"
- exit 1
- ;;
-esac
-
-exit 0
diff --git a/files/icinga/nrpe.cfg b/files/icinga/nrpe.cfg
deleted file mode 100644
index 40c9e10..0000000
--- a/files/icinga/nrpe.cfg
+++ /dev/null
@@ -1,226 +0,0 @@
-#############################################################################
-# Sample NRPE Config File
-# Written by: Ethan Galstad ([email protected])
-#
-# Last Modified: 11-23-2007
-#
-# 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
-
-
-
-# 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/nagios/nrpe.pid
-
-
-
-# PORT NUMBER
-# Port number we should wait for connections on.
-# NOTE: This must be a non-priviledged 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
-
-
-
-# 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=nagios
-
-
-
-# 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=nagios
-
-
-
-# ALLOWED HOST ADDRESSES
-# This is an optional comma-delimited list of IP address or hostnames
-# that are allowed to talk to the NRPE daemon.
-#
-# 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
-
-
-
-# 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
-
-
-
-# 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 alllowing
-# 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
-
-
-
-# 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
-
-
-
-# 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
-
-
-
-# WEEK 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
-
-
-
-# INCLUDE CONFIG FILE
-# This directive allows you to include definitions from an external config
file.
-
-#include=<somefile.cfg>
-
-
-
-# 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=<somedirectory>
-#include_dir=<someotherdirectory>
-
-
-
-# COMMAND DEFINITIONS
-# Command definitions that this daemon will run. Definitions
-# are in the following format:
-#
-# command[<command_name>]=<command_line>
-#
-# When the daemon receives a request to return the results of <command_name>
-# it will execute the command specified by the <command_line> 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/lib/nagios/plugins/check_users -w 5 -c 10
-command[check_load]=/usr/lib/nagios/plugins/check_load -w 15,10,5 -c 30,25,20
-command[check_hda1]=/usr/lib/nagios/plugins/check_disk -w 20% -c 10% -p
/dev/hda1
-command[check_zombie_procs]=/usr/lib/nagios/plugins/check_procs -w 5 -c 10 -s Z
-command[check_total_procs]=/usr/lib/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/lib/nagios/plugins/check_users -w $ARG1$ -c $ARG2$
-#command[check_load]=/usr/lib/nagios/plugins/check_load -w $ARG1$ -c $ARG2$
-#command[check_disk]=/usr/lib/nagios/plugins/check_disk -w $ARG1$ -c $ARG2$ -p
$ARG3$
-#command[check_procs]=/usr/lib/nagios/plugins/check_procs -w $ARG1$ -c $ARG2$
-s $ARG3$
-
-#
-# local configuration:
-# if you'd prefer, you can instead place directives here
-include=/etc/nagios/nrpe_local.cfg
-
-#
-# you can place your config snipplets into nrpe.d/
-# only snipplets ending in .cfg will get included
-include_dir=/etc/nagios/nrpe.d/
-
diff --git a/manifests/nrpe.pp b/manifests/nrpe.pp
index 86d6c0e..81b1b1d 100644
--- a/manifests/nrpe.pp
+++ b/manifests/nrpe.pp
@@ -93,34 +93,6 @@
mode => 0555,
source => "puppet:///files/icinga/check_dpkg",
}
-
- # TBD: remove all that, completely unneeded
- package { [ "icinga-nrpe-server" ]:
- ensure => absent;
- }
-
- file {
- "/etc/icinga/":
- owner => root,
- group => root,
- mode => 0755,
- ensure => directory;
- "/etc/icinga/nrpe.d":
- owner => root,
- group => root,
- mode => 0755,
- ensure => directory;
- "/etc/init.d/nagios-nrpe-server":
- owner => root,
- group => root,
- mode => 0755,
- source =>
"puppet:///files/icinga/nagios-nrpe-server-init";
- "/etc/nagios/nrpe.cfg":
- owner => root,
- group => root,
- mode => 0644,
- source => "puppet:///files/icinga/nrpe.cfg";
- }
}
class nrpe::service {
--
To view, visit https://gerrit.wikimedia.org/r/70606
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib887b7b05474bd1390bbcfc9822ceaae3a44c818
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
