From e71e7080e403c6bcacb7305b5764d305e314e03d Mon Sep 17 00:00:00 2001 From: Antoine Beaupre Date: Fri, 9 Apr 2010 17:21:08 -0400 Subject: proper apache bootstrap --- manifests/apache.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/apache.pp b/manifests/apache.pp index 36994f8..c00b1d9 100644 --- a/manifests/apache.pp +++ b/manifests/apache.pp @@ -1,4 +1,4 @@ -class nagios::apache { +class nagios::apache inherits ::apache { $nagios_httpd = 'apache' include nagios } -- cgit v1.2.3 From 66bc7386a62fbd7bcb9404daf8656fc59a55f25f Mon Sep 17 00:00:00 2001 From: Antoine Beaupre Date: Fri, 9 Apr 2010 17:56:37 -0400 Subject: add my mountpoints fact to nagios for the df plugin --- lib/facter/mountpoints.rb | 50 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 lib/facter/mountpoints.rb diff --git a/lib/facter/mountpoints.rb b/lib/facter/mountpoints.rb new file mode 100644 index 0000000..c51e6e6 --- /dev/null +++ b/lib/facter/mountpoints.rb @@ -0,0 +1,50 @@ +begin + + mountpoints = [] + # we show devices, but we avoid outputing duplicate devices + devices = [] + Facter.add("mountpoints") do + ignorefs = ["NFS", "nfs", "nfs4", "nfsd", "afs", "binfmt_misc", "proc", "smbfs", + "autofs", "iso9660", "ncpfs", "coda", "devpts", "ftpfs", "devfs", + "mfs", "shfs", "sysfs", "cifs", "lustre_lite", "tmpfs", "usbfs", "udf", + "fusectl", "fuse.snapshotfs", "rpc_pipefs"] + begin + require 'filesystem' + rescue Exception => e + confine :kernel => :linux + ENV["PATH"]="/bin:/sbin:/usr/bin:/usr/sbin" + fs_source = nil + if FileTest.exists?("/etc/mtab") + fs_source = "/etc/mtab" + elsif FileTest.exists?("/proc/mounts") + fs_source = "/proc/mounts" + end + + mounts = File.read(fs_source).split("\n") + mounts.each do |mount| + mount = mount.split(" ") + if ((not ignorefs.include?(mount[2])) && (mount[3] !~ /bind/) && (not devices.include?(mount[0])) && (not mountpoints.include?(mount[1]))) + mountpoints.push(mount[1]) + end + devices.push(mount[0]) if not devices.include?(mount[0]) + end + else + FileSystem.mounts.each do |m| + if ((not ignorefs.include?(m.fstype)) && (m.options !~ /bind/) && !devices.include?(mount[0])) + mountpoints.push(m.mount) + end + devices.push(m.mount) if not devices.include?(m.mount) + end + end + setcode do + mountpoints.join(",") + end + end + Facter.add("devices") do + setcode do + devices.join(",") + end + end + +rescue Exception => e +end -- cgit v1.2.3 From f05deb4bad829ec5cdb0a77841aa95a5f07f55a1 Mon Sep 17 00:00:00 2001 From: Antoine Beaupre Date: Fri, 9 Apr 2010 17:56:59 -0400 Subject: add amd64 resources, fix the other to be a symlink since it's the same --- files/configs/Debian/private/resource.cfg.amd64 | 1 + files/configs/Debian/private/resource.cfg.x86_64 | 32 +----------------------- 2 files changed, 2 insertions(+), 31 deletions(-) create mode 120000 files/configs/Debian/private/resource.cfg.amd64 mode change 100644 => 120000 files/configs/Debian/private/resource.cfg.x86_64 diff --git a/files/configs/Debian/private/resource.cfg.amd64 b/files/configs/Debian/private/resource.cfg.amd64 new file mode 120000 index 0000000..4d5f0a3 --- /dev/null +++ b/files/configs/Debian/private/resource.cfg.amd64 @@ -0,0 +1 @@ +resource.cfg.i386 \ No newline at end of file diff --git a/files/configs/Debian/private/resource.cfg.x86_64 b/files/configs/Debian/private/resource.cfg.x86_64 deleted file mode 100644 index 3ed732b..0000000 --- a/files/configs/Debian/private/resource.cfg.x86_64 +++ /dev/null @@ -1,31 +0,0 @@ -########################################################################### -# -# RESOURCE.CFG - Resource File for Nagios -# -# You can define $USERx$ macros in this file, which can in turn be used -# in command definitions in your host config file(s). $USERx$ macros are -# useful for storing sensitive information such as usernames, passwords, -# etc. They are also handy for specifying the path to plugins and -# event handlers - if you decide to move the plugins or event handlers to -# a different directory in the future, you can just update one or two -# $USERx$ macros, instead of modifying a lot of command definitions. -# -# The CGIs will not attempt to read the contents of resource files, so -# you can set restrictive permissions (600 or 660) on them. -# -# Nagios supports up to 32 $USERx$ macros ($USER1$ through $USER32$) -# -# Resource files may also be used to store configuration directives for -# external data sources like MySQL... -# -########################################################################### - -# Sets $USER1$ to be the path to the plugins -$USER1$=/usr/lib/nagios/plugins - -# Sets $USER2$ to be the path to event handlers -#$USER2$=/usr/lib/nagios/plugins/eventhandlers - -# Store some usernames and passwords (hidden from the CGIs) -#$USER3$=someuser -#$USER4$=somepassword diff --git a/files/configs/Debian/private/resource.cfg.x86_64 b/files/configs/Debian/private/resource.cfg.x86_64 new file mode 120000 index 0000000..4d5f0a3 --- /dev/null +++ b/files/configs/Debian/private/resource.cfg.x86_64 @@ -0,0 +1 @@ +resource.cfg.i386 \ No newline at end of file -- cgit v1.2.3 From 61aab91919b2e6d9cb5d7afe3befe40de67ac132 Mon Sep 17 00:00:00 2001 From: Antoine Beaupre Date: Fri, 9 Apr 2010 17:57:28 -0400 Subject: include the commands.cfg file in Debian since we need the notify-(host|service)-by-email commands --- files/configs/Debian/nagios.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/files/configs/Debian/nagios.cfg b/files/configs/Debian/nagios.cfg index 377da6b..8eae393 100644 --- a/files/configs/Debian/nagios.cfg +++ b/files/configs/Debian/nagios.cfg @@ -20,6 +20,7 @@ log_file=/var/log/nagios3/nagios.log # host groups, contacts, contact groups, services, etc. # You can split your object definitions across several config files # if you wish (as shown below), or keep them all in a single config file. +cfg_file=/etc/nagios3/commands.cfg # Puppet-managed configuration files cfg_dir=/etc/nagios3/conf.d -- cgit v1.2.3 From 41571b20b23d7313c192e233ec9b76a89af05354 Mon Sep 17 00:00:00 2001 From: Antoine Beaupre Date: Fri, 9 Apr 2010 17:57:57 -0400 Subject: add a default empty htpasswd so the catalog compiles right --- files/htpasswd.users | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 files/htpasswd.users diff --git a/files/htpasswd.users b/files/htpasswd.users new file mode 100644 index 0000000..e69de29 -- cgit v1.2.3