[debian-lan-devel] [SCM] Debian-LAN development and packaging branch, master, updated. 0.8-9-g52dded8
Andreas B. Mundt
andi at debian.org
Sun Mar 24 18:10:32 UTC 2013
The following commit has been merged in the master branch:
commit 52dded8339310c9606330fe1caf0a082ad704e23
Author: Andreas B. Mundt <andi at debian.org>
Date: Sun Mar 24 13:02:43 2013 +0100
Add icinga check for Kerberos keytab on clients. Cosmetics.
Check if '/etc/krb5.keytab' exists on the clients. Alphabetical
ordering of services in 'services_icinga.cfg'. Polish for packaging.
diff --git a/debian/README.Debian b/debian/README.Debian
index e2dc12d..db01f98 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -43,9 +43,9 @@ is then created by fai-cd:
Converting a minimal Debian Installation
----------------------------------------
-Install a minimal Debian on the server. Choose 'mainserver' as
-hostname. Prepare appropriate partitions, examples are available in
-/usr/share/debian-lan-config/fai/config/disk_config/.
+Install a minimal Debian (only the core system) on the server. Choose
+'mainserver' as hostname. Prepare appropriate partitions, examples
+are available in /usr/share/debian-lan-config/fai/config/disk_config/.
Then convert the installation with the following commands:
diff --git a/debian/control b/debian/control
index 2e7a8c3..a7e8db0 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: admin
Priority: extra
Maintainer: Andreas B. Mundt <andi at debian.org>
Build-Depends: debhelper (>= 8.0.0)
-Standards-Version: 3.9.3
+Standards-Version: 3.9.4
Homepage: http://wiki.debian.org/DebianLAN
Vcs-Git: git://git.debian.org/collab-maint/debian-lan.git
Vcs-Browser: http://git.debian.org/?p=collab-maint/debian-lan.git;a=summary
diff --git a/fai/config/files/etc/icinga/objects/services_icinga.cfg/LOG_SERVER b/fai/config/files/etc/icinga/objects/services_icinga.cfg/LOG_SERVER
index 11262f5..4a8836b 100644
--- a/fai/config/files/etc/icinga/objects/services_icinga.cfg/LOG_SERVER
+++ b/fai/config/files/etc/icinga/objects/services_icinga.cfg/LOG_SERVER
@@ -1,50 +1,29 @@
#### servers ####
-define service {
- hostgroup_name http-servers
- service_description HTTP
- check_command check_http
- use generic-service
-}
-
-define service {
- hostgroup_name ssh-servers
- service_description SSH
- check_command check_ssh
- use generic-service
-}
-
define service{
- hostgroup_name imap-servers
- service_description IMAP
- check_command check_imap
- use generic-service
-}
-
-define service{
- hostgroup_name smtp-servers
- service_description SMTP
- check_command check_smtp
+ host mainserver
+ service_description APT
+ check_command check_apt
use generic-service
}
define service{
- hostgroup_name ldap-servers
- service_description LDAP
- check_command debian-lan_check_ldap!dc=intern
+ hostgroup_name cups-servers
+ service_description CUPS
+ check_command check_cups
use generic-service
}
define service{
- hostgroup_name nfs-servers
- service_description NFS
- check_command debian-lan_check_nfs
+ host mainserver
+ service_description Current Load
+ check_command check_load!5.0!4.0!3.0!10.0!6.0!4.0
use generic-service
}
define service{
- hostgroup_name cups-servers
- service_description CUPS
- check_command check_cups
+ host mainserver
+ service_description Current Users
+ check_command check_users!20!50
use generic-service
}
@@ -69,62 +48,84 @@ define service{
use generic-service
}
+define service {
+ hostgroup_name http-servers
+ service_description HTTP
+ check_command check_http
+ use generic-service
+}
+
define service{
- host mainserver
- service_description Current Users
- check_command check_users!20!50
+ hostgroup_name imap-servers
+ service_description IMAP
+ check_command check_imap
use generic-service
}
define service{
- host mainserver
- service_description Total Procs
- check_command check_procs!250!400
+ hostgroup_name ldap-servers
+ service_description LDAP
+ check_command debian-lan_check_ldap!dc=intern
use generic-service
}
define service{
- host mainserver
- service_description Zombie Procs
- check_command check_procs_zombie!5!10
+ hostgroup_name nfs-servers
+ service_description NFS
+ check_command debian-lan_check_nfs
use generic-service
}
define service{
host mainserver
- service_description Current Load
- check_command check_load!5.0!4.0!3.0!10.0!6.0!4.0
+ service_description NTP Server
+ check_command check_ntp_ntpq
+ use generic-service
+}
+
+define service{
+ hostgroup_name smtp-servers
+ service_description SMTP
+ check_command check_smtp
+ use generic-service
+}
+
+define service {
+ hostgroup_name ssh-servers
+ service_description SSH
+ check_command check_ssh
use generic-service
}
define service{
host mainserver
- service_description Swap
- check_command debian-lan_check_swap
+ service_description Squid
+ check_command check_squid!3128!'http://www.intern'
use generic-service
}
define service{
host mainserver
- service_description APT
- check_command check_apt
+ service_description Swap
+ check_command debian-lan_check_swap
use generic-service
}
define service{
host mainserver
- service_description NTP Server
- check_command check_ntp_ntpq
+ service_description Total Procs
+ check_command check_procs!250!400
use generic-service
}
define service{
host mainserver
- service_description Squid
- check_command check_squid!3128!'http://www.intern'
+ service_description Zombie Procs
+ check_command check_procs_zombie!5!10
use generic-service
}
+
#### gateway
define service{
host gateway
@@ -140,39 +141,40 @@ define service{
use generic-service
}
+
#### nrpe (remote) machines
define service{
hostgroup_name workstation
- service_description Disk Space
- check_command check_nrpe_1arg!debian-lan_check_all_disks
+ service_description APT
+ check_command check_nrpe_1arg!check_apt
use generic-service
}
define service{
hostgroup_name workstation,diskless
- service_description Current Users
- check_command check_nrpe_1arg!debian-lan_check_users
+ service_description Current Load
+ check_command check_nrpe_1arg!debian-lan_check_load
use generic-service
}
define service{
hostgroup_name workstation,diskless
- service_description Total Procs
- check_command check_nrpe_1arg!debian-lan_check_procs
+ service_description Current Users
+ check_command check_nrpe_1arg!debian-lan_check_users
use generic-service
}
define service{
- hostgroup_name workstation,diskless
- service_description Zombie Procs
- check_command check_nrpe_1arg!debian-lan_check_procs_zombie
+ hostgroup_name workstation
+ service_description Disk Space
+ check_command check_nrpe_1arg!debian-lan_check_all_disks
use generic-service
}
define service{
- hostgroup_name workstation,diskless
- service_description Current Load
- check_command check_nrpe_1arg!debian-lan_check_load
+ hostgroup_name workstation
+ service_description Kerberos Key
+ check_command check_nrpe_1arg!debian-lan_check_file_age
use generic-service
}
@@ -184,15 +186,22 @@ define service{
}
define service{
- hostgroup_name workstation
- service_description APT
- check_command check_nrpe_1arg!check_apt
+ hostgroup_name workstation,diskless
+ service_description Time
+ check_command check_nrpe_1arg!debian-lan_check_ntp_time
use generic-service
}
define service{
hostgroup_name workstation,diskless
- service_description Time
- check_command check_nrpe_1arg!debian-lan_check_ntp_time
+ service_description Total Procs
+ check_command check_nrpe_1arg!debian-lan_check_procs
+ use generic-service
+}
+
+define service{
+ hostgroup_name workstation,diskless
+ service_description Zombie Procs
+ check_command check_nrpe_1arg!debian-lan_check_procs_zombie
use generic-service
}
diff --git a/fai/config/files/etc/nagios/nrpe.d/debian-lan.cfg/LOG_CLIENT b/fai/config/files/etc/nagios/nrpe.d/debian-lan.cfg/LOG_CLIENT
index 403a633..249e9df 100644
--- a/fai/config/files/etc/nagios/nrpe.d/debian-lan.cfg/LOG_CLIENT
+++ b/fai/config/files/etc/nagios/nrpe.d/debian-lan.cfg/LOG_CLIENT
@@ -9,4 +9,4 @@ command[debian-lan_check_all_disks]=/usr/lib/nagios/plugins/check_disk -w '20%'
command[debian-lan_check_swap]=/usr/lib/nagios/plugins/check_swap -w '50%' -c '30%'
command[debian-lan_check_load]=/usr/lib/nagios/plugins/check_load --warning='5.0,4.0,3.0' --critical='10.0,6.0,4.0'
command[debian-lan_check_users]=/usr/lib/nagios/plugins/check_users -w '5' -c '10'
-
+command[debian-lan_check_file_age]=/usr/lib/nagios/plugins/check_file_age -w 0 -c 0 -W 500 -f /etc/krb5.keytab
--
Debian-LAN development and packaging
More information about the debian-lan-devel
mailing list