[omd-commits] OMD Git: omd: Ups, revert PNP revert...

git version control git at mathias-kettner.de
Mon Jul 2 23:03:32 CEST 2012


Module:   omd
Branch:   master
Commit:   cf14255938766bc6d77afffff33cd396f4c0fce9
URL:      http://omdistro.org/projects/omd/repository/revisions/cf14255938766bc6d77afffff33cd396f4c0fce9

Author:   Matthias Flacke <matthias.flacke at gmx.de>
Date:     Mon Jul  2 22:54:46 2012 +0200
Commiter: Matthias Flacke <matthias.flacke at gmx.de>
Date:     Mon Jul  2 22:54:46 2012 +0200

Ups, revert PNP revert...

Sorry Joerg, this accidently remained in my local repo!

---

 Changelog                                          |    1 +
 packages/check_mk/MULTISITE_COOKIE_AUTH.hook       |    7 ++-
 packages/pnp4nagios/Makefile                       |   10 ++--
 packages/pnp4nagios/pnp4nagios-0.6.17.tar.gz       |  Bin 3006336 -> 0 bytes
 packages/pnp4nagios/pnp4nagios-0.6.18.tar.gz       |  Bin 0 -> 3021602 bytes
 .../pnp4nagios/check_commands/check_jmx4perl.cfg   |   46 ++++++++++++++++++++
 packages/pnp4nagios/skel/etc/pnp4nagios/config.php |   30 +++++++++++++
 7 files changed, 86 insertions(+), 8 deletions(-)

diff --git a/Changelog b/Changelog
index 6bd0a35..142a5e8 100644
--- a/Changelog
+++ b/Changelog
@@ -11,6 +11,7 @@ This file documents the revision history for the Open Monitoring Distribution
           - Mod-Gearman: Updated to version 1.3.4
           - Thruk: Update to 1.34
           - Nagios Plugins: Update to 1.4.16
+          - PNP4Nagios: Update to 0.6.18
           - Icinga: Update to 1.7.1
           - Check_MK: Added 1.2.0p1 release
           - Support Ubuntu 12.04 (Precise)
diff --git a/packages/check_mk/MULTISITE_COOKIE_AUTH.hook b/packages/check_mk/MULTISITE_COOKIE_AUTH.hook
index da14647..c757688 100755
--- a/packages/check_mk/MULTISITE_COOKIE_AUTH.hook
+++ b/packages/check_mk/MULTISITE_COOKIE_AUTH.hook
@@ -44,9 +44,10 @@ EOF
 // Using the multisite cookie based authentication when no
 // REMOTE_USER available.
 //
-\$conf['auth_multisite_enabled']  = TRUE;
-\$conf['auth_multisite_htpasswd'] = '/omd/sites/$OMD_SITE/etc/htpasswd';
-\$conf['auth_multisite_secret']   = '/omd/sites/$OMD_SITE/etc/auth.secret';
+\$conf['auth_multisite_enabled']    = TRUE;
+\$conf['auth_multisite_htpasswd']   = '/omd/sites/$OMD_SITE/etc/htpasswd';
+\$conf['auth_multisite_secret']     = '/omd/sites/$OMD_SITE/etc/auth.secret';
+\$conf['auth_multisite_login_url']  = '/$OMD_SITE/check_mk/login.py';
 ?>
 EOF
        else
diff --git a/packages/pnp4nagios/Makefile b/packages/pnp4nagios/Makefile
index ab35d53..4cf01d9 100644
--- a/packages/pnp4nagios/Makefile
+++ b/packages/pnp4nagios/Makefile
@@ -3,7 +3,7 @@ include ../../Makefile.omd
 .PHONY: skel
 
 NAME = pnp4nagios
-VERSION = 0.6.17
+VERSION = 0.6.18
 DIR = $(NAME)-$(VERSION)
 
 # Configure options for PNP4Nagios. Since we want to compile
@@ -27,10 +27,10 @@ CONFIGUREOPTS = \
 
 build:
 	tar xzf $(DIR).tar.gz
-	#for p in patches/*.dif ; do \
-	#	echo "applying $$p..." ; \
-	#	( cd $(DIR) ; patch -p1 -b ) < $$p ; \
-        #done
+#	for p in patches/*.dif ; do \
+#		echo "applying $$p..." ; \
+#		( cd $(DIR) ; patch -p1 -b ) < $$p ; \
+#       done
 
 	cd $(DIR) ; ./configure $(CONFIGUREOPTS)
 	$(MAKE) -C $(DIR) all
diff --git a/packages/pnp4nagios/pnp4nagios-0.6.17.tar.gz b/packages/pnp4nagios/pnp4nagios-0.6.17.tar.gz
deleted file mode 100644
index e6c2d85..0000000
Binary files a/packages/pnp4nagios/pnp4nagios-0.6.17.tar.gz and /dev/null differ
diff --git a/packages/pnp4nagios/pnp4nagios-0.6.18.tar.gz b/packages/pnp4nagios/pnp4nagios-0.6.18.tar.gz
new file mode 100644
index 0000000..4d39c7e
Binary files /dev/null and b/packages/pnp4nagios/pnp4nagios-0.6.18.tar.gz differ
diff --git a/packages/pnp4nagios/skel/etc/pnp4nagios/check_commands/check_jmx4perl.cfg b/packages/pnp4nagios/skel/etc/pnp4nagios/check_commands/check_jmx4perl.cfg
new file mode 100644
index 0000000..ed038db
--- /dev/null
+++ b/packages/pnp4nagios/skel/etc/pnp4nagios/check_commands/check_jmx4perl.cfg
@@ -0,0 +1,46 @@
+#
+# Adapt the Template if check_command should not be the PNP Template
+#
+# check_command check_jmx4perl!memory
+# ________0__________|             |
+# ________1________________________| 
+#
+# Use ARG0,ARG1 
+CUSTOM_TEMPLATE = 0,1
+#
+# Change the RRD Datatype based on the check_command Name.
+# Defaults to GAUGE.
+# 
+# Adjust the whole RRD Database 
+# DATATYPE = COUNTER
+#
+# Adjust every single DS by using a List of Datatypes.
+# DATATYPE = GAUGE,GAUGE,COUNTER,COUNTER
+
+# Use the MIN value for newly created RRD Databases. 
+# This value defaults to 0
+# USE_MIN_ON_CREATE = 1
+#
+# Use the MAX value for newly created RRD Databases.
+# This value defaults to 0
+# USE_MAX_ON_CREATE = 1
+
+# Use a single RRD Database per Service 
+# This Option is only used while creating new RRD Databases
+#
+# RRD_STORAGE_TYPE = SINGLE
+#
+# Use multiple RRD Databases per Service
+# One RRD Database per Datasource.
+# RRD_STORAGE_TYPE = MULTIPLE
+#
+# RRD_STORAGE_TYPE = SINGLE
+
+# RRD Heartbeat in seconds
+# This Option is only used while creating new RRD Databases
+# Existing RRDs can be changed by "rrdtool tune"
+# More on http://oss.oetiker.ch/rrdtool/doc/rrdtune.en.html
+#
+# This value defaults to 8640
+# RRD_HEARTBEAT = 305
+
diff --git a/packages/pnp4nagios/skel/etc/pnp4nagios/config.php b/packages/pnp4nagios/skel/etc/pnp4nagios/config.php
index 1fc8ca5..818edce 100644
--- a/packages/pnp4nagios/skel/etc/pnp4nagios/config.php
+++ b/packages/pnp4nagios/skel/etc/pnp4nagios/config.php
@@ -227,4 +227,34 @@ $conf['special_template_dir'] = '###ROOT###/etc/pnp4nagios/templates.special';
 # This regex is evaluated against the USER_AGENT String
 #
 $conf['mobile_devices'] = 'iPhone|iPod|iPad|android';
+
+#
+# additional colour schemes
+# values taken from www.colorbrewer2.org
+# for details on usage refer to the documentation of the helper functions 
+#
+$scheme['Reds']     = array ('#FEE0D2','#FCBBA1','#FC9272','#FB6A4A','#EF3B2C','#CB181D','#A50F15','#67000D');
+$scheme['Greens']   = array ('#E5F5E0','#C7E9C0','#A1D99B','#74C476','#41AB5D','#23AB45','#006D2C','#00441B');
+$scheme['Blues']    = array ('#DEEBF7','#C6DBEF','#9ECAE1','#6BAED6','#4292C6','#2171B5','#08519C','#08306B');
+$scheme['Oranges']  = array ('#FEE6CE','#FDD0A2','#FDAE6B','#FD8D3C','#F16913','#D94801','#A63603','#7F2704');
+$scheme['Purples']  = array ('#EFEDF5','#DADAEB','#BDBDDC','#9E9AC8','#807DBA','#6A51A3','#54278F','#3F007A');
+$scheme['RdPu']     = array ('#FDE0DD','#FCC5C0','#FA9FB5','#F768A1','#DD3497','#AE017E','#7A0177','#49006A');
+$scheme['Dark2']    = array ('#1B9E77','#D95F02','#7570B3','#E7298A','#66A61E','#E6ab02','#a6761d','#666666');
+$scheme['BrBG']     = array ('#543005','#8C510A','#BF812D','#DFC27D','#F6E8C3','#C7EAE5','#80CDC1','#35978F','#01665E','#003C30');
+$scheme['PiYG']     = array ('#8E0152','#C51B7D','#DE77AE','#F1B6DA','#FDE0EF','#E6F5D0','#B8E186','#7FBC41','#4D9221','#276419');
+$scheme['PRGn']     = array ('#40004B','#762A83','#9970AB','#C2A5CF','#E7D4E8','#D9F0D3','#A6DBA0','#5AAE61','#1B7837','#00441B');
+$scheme['PuOr']     = array ('#7F3B08','#B35806','#E08214','#FDB863','#FEE0B6','#D8DAEB','#B2ABD2','#8073AC','#542788','#2D004B');
+$scheme['RdBu']     = array ('#67001F','#B2182B','#D6604D','#F4A582','#FDDBC7','#D1E5F0','#92C5DE','#4393C3','#2166AC','#053061');
+$scheme['RdGy']     = array ('#67001F','#B2182B','#D6604D','#F4A582','#FDDBC7','#E0E0E0','#BABABA','#878787','#4D4D4D','#1A1A1A');
+$scheme['RdYlBu']   = array ('#A50026','#D73027','#F46D43','#FDAE61','#FEE090','#E0F3F8','#ABD9E9','#74ADD1','#4575B4','#313695');
+$scheme['RdYlGn']   = array ('#A50026','#D73027','#F46D43','#FDAE61','#FEE08B','#D9EF8B','#A6D96A','#66BD63','#1A9850','#006837');
+$scheme['Spectral'] = array ('#9E0142','#D53E4F','#F46D43','#FDAE61','#FEE08B','#E6F598','#ABDDA4','#66C2A5','#3288BD','#5E4FA2');
+$scheme['Paired']   = array ('#A6CEE3','#1F78B4','#B2DF8A','#33A02C','#FB9A99','#E31A1C','#FDBF6F','#FF7F00','#CAB2D6','#6A3D9A');
+$scheme['mixed1']   = array ('#8C510A','#2166ac','#BF812D','#4393c3','#DFC27D','#92c5de','#F6E8C3','#d1e5f0',
+                             '#fddbc7','#C7EAE5','#f4a582','#80CDC1','#d6604d','#35978F','#b2182b','#01665E');
+$scheme['mixed2']   = array ('#b2182b','#2166ac','#d6604d','#4393c3','#f4a582','#92c5de','#fddbc7','#d1e5f0',
+                             '#F6E8C3','#C7EAE5','#DFC27D','#80CDC1','#BF812D','#35978F','#8C510A','#01665E');
+$scheme['mixed3']   = array ('#67001F','#80CDC1','#B2182B','#35978F','#D6604D','#01665E','#F4A582','#003C30',
+                             '#FDDBC7','#92C5DE','#D1E5F0','#2166AC','#4393C3','#8C510A','#053061','#BF812D');
+
 ?>



More information about the omd-commits mailing list