[omd-commits] OMD Git: omd: Updated nagvis to 1.7.1

git version control git at mathias-kettner.de
Fri Sep 21 13:24:35 CEST 2012


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

Author:   Lars Michelsen <lm at mathias-kettner.de>
Date:     Fri Sep 21 13:00:57 2012 +0200
Commiter: Lars Michelsen <lm at mathias-kettner.de>
Date:     Fri Sep 21 13:00:57 2012 +0200

Updated nagvis to 1.7.1

---

 Changelog                                          |    1 +
 packages/nagvis/Makefile                           |    6 +++---
 .../{nagvis-1.6.5.tar.gz => nagvis-1.7.1.tar.gz}   |  Bin 3402074 -> 3488146 bytes
 packages/nagvis/skel.permissions                   |   18 +++++++++++-------
 packages/nagvis/skel/etc/nagvis/conf.d/omd.ini.php |    2 +-
 5 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/Changelog b/Changelog
index 8db333e..a479c22 100644
--- a/Changelog
+++ b/Changelog
@@ -13,6 +13,7 @@ This file documents the revision history for the Open Monitoring Distribution
           - Thruk: Update to 1.46
           - Nagios Plugins: Update to 1.4.16
           - PNP4Nagios: Update to 0.6.19
+          - NagVis: Update to 1.7.1
           - Icinga: Update to 1.7.2
           - Check_MK: Added 1.2.0p2 release
           - Support Ubuntu 12.04 (Precise)
diff --git a/packages/nagvis/Makefile b/packages/nagvis/Makefile
index 1fdd2db..3f18bed 100644
--- a/packages/nagvis/Makefile
+++ b/packages/nagvis/Makefile
@@ -1,7 +1,7 @@
 include ../../Makefile.omd
 
 NAME = nagvis
-VERSION = 1.6.5
+VERSION = 1.7.1
 DIR = $(NAME)-$(VERSION)
 
 .PHONY: skel
@@ -39,11 +39,11 @@ install:
 	
 	# Move demo config files
 	mkdir -p $(DESTDIR)$(OMD_ROOT)/skel/etc/nagvis/conf.d
-	mkdir -p $(DESTDIR)$(OMD_ROOT)/skel/etc/nagvis/automaps
 	mkdir -p $(DESTDIR)$(OMD_ROOT)/skel/etc/nagvis/maps
+	mkdir -p $(DESTDIR)$(OMD_ROOT)/skel/etc/nagvis/geomap
 	mv $(DESTDIR)$(OMD_ROOT)/share/nagvis/etc/conf.d/*.ini.php $(DESTDIR)$(OMD_ROOT)/skel/etc/nagvis/conf.d
-	mv $(DESTDIR)$(OMD_ROOT)/share/nagvis/etc/automaps/*.cfg $(DESTDIR)$(OMD_ROOT)/skel/etc/nagvis/automaps
 	mv $(DESTDIR)$(OMD_ROOT)/share/nagvis/etc/maps/*.cfg $(DESTDIR)$(OMD_ROOT)/skel/etc/nagvis/maps
+	mv $(DESTDIR)$(OMD_ROOT)/share/nagvis/etc/geomap/demo-*.csv $(DESTDIR)$(OMD_ROOT)/skel/etc/nagvis/geomap
 	
 	# Delete files/directories we do not want to pack
 	rm -rf $(DESTDIR)$(OMD_ROOT)/share/nagvis/var
diff --git a/packages/nagvis/nagvis-1.6.5.tar.gz b/packages/nagvis/nagvis-1.7.1.tar.gz
similarity index 55%
rename from packages/nagvis/nagvis-1.6.5.tar.gz
rename to packages/nagvis/nagvis-1.7.1.tar.gz
index 6faae94..5e1ff7e 100644
Binary files a/packages/nagvis/nagvis-1.6.5.tar.gz and b/packages/nagvis/nagvis-1.7.1.tar.gz differ
diff --git a/packages/nagvis/skel.permissions b/packages/nagvis/skel.permissions
index b338e3d..828a9ad 100644
--- a/packages/nagvis/skel.permissions
+++ b/packages/nagvis/skel.permissions
@@ -1,14 +1,19 @@
 etc/nagvis                                              775 
 etc/nagvis/maps                                         775 
-etc/nagvis/maps/demo2.cfg                               664 
-etc/nagvis/maps/demo.cfg                                664 
-etc/nagvis/maps/demo-map.cfg                            664 
-etc/nagvis/maps/demo-server.cfg                         664 
-etc/nagvis/automaps                                     775 
-etc/nagvis/automaps/__automap.cfg                       664 
+etc/nagvis/maps/demo-overview.cfg                       664
+etc/nagvis/maps/demo-muc-srv1.cfg                       664
+etc/nagvis/maps/demo-load.cfg                           664
+etc/nagvis/maps/demo-ham-racks.cfg                      664
+etc/nagvis/maps/demo-germany.cfg                        664
+etc/nagvis/maps/demo-geomap.cfg                         664
+etc/nagvis/maps/demo-automap.cfg                        664
+etc/nagvis/maps/demo-automap2.cfg                       664
+etc/nagvis/geomap                                       775
+etc/nagvis/geomap/demo-locations.csv                    664
 etc/nagvis/nagvis.ini.php                               664 
 etc/nagvis/conf.d                                       775
 etc/nagvis/conf.d/omd.ini.php                           664 
+etc/nagvis/conf.d/demo.ini.php                          664 
 local/share/nagvis/htdocs/userfiles/images/maps         775 
 local/share/nagvis/htdocs/userfiles/images/shapes       775 
 tmp/nagvis                                              775 
@@ -16,4 +21,3 @@ tmp/nagvis/share                                        775
 tmp/nagvis/tmpl/compile                                 775 
 tmp/nagvis/tmpl/cache                                   775
 var/nagvis/profiles                                     775
-
diff --git a/packages/nagvis/skel/etc/nagvis/conf.d/omd.ini.php b/packages/nagvis/skel/etc/nagvis/conf.d/omd.ini.php
index 858b306..80558bb 100644
--- a/packages/nagvis/skel/etc/nagvis/conf.d/omd.ini.php
+++ b/packages/nagvis/skel/etc/nagvis/conf.d/omd.ini.php
@@ -15,7 +15,7 @@ base="###ROOT###/share/nagvis/"
 local_base="###ROOT###/local/share/nagvis/"
 cfg="###ROOT###/etc/nagvis/"
 mapcfg="###ROOT###/etc/nagvis/maps/"
-automapcfg="###ROOT###/etc/nagvis/automaps/"
+geomap="###ROOT###/etc/nagvis/geomap/"
 var="###ROOT###/tmp/nagvis/"
 sharedvar="###ROOT###/tmp/nagvis/share/"
 profiles="###ROOT###/var/nagvis/profiles/"



More information about the omd-commits mailing list