Your message dated Fri, 27 Dec 2013 17:19:06 +0000
with message-id <[email protected]>
and subject line Bug#733139: fixed in nagvis 1:1.7.10+dfsg1-2
has caused the Debian Bug report #733139,
regarding Add shinken support
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)
--
733139: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=733139
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Package: nagvis
Version: 1:1.7.10+dfsg1-1
Severity: wishlist
Hello,
The attached patches allows quick configuration of nagvis with shinken.
Regards
--
Mathieu
From b29cbf2e0a0f192c2c98b761f448429001510754 Mon Sep 17 00:00:00 2001
From: Mathieu Parent <[email protected]>
Date: Thu, 26 Dec 2013 10:43:48 +0100
Subject: [PATCH 1/2] Refactor monitoring configuration
---
debian/nagvis.postinst | 60 ++++++++++++++++++++------------------------------
1 file changed, 24 insertions(+), 36 deletions(-)
diff --git a/debian/nagvis.postinst b/debian/nagvis.postinst
index fac9f84..4a2cfe6 100644
--- a/debian/nagvis.postinst
+++ b/debian/nagvis.postinst
@@ -90,8 +90,8 @@ case "$1" in
. /usr/share/debconf/confmodule
db_get nagvis/monitoring_system
MONITORING="$RET"
- case "$MONITORING" in
- "icinga")
+ case "$MONITORING" in
+ "icinga"|"nagios")
## Creating Configuration file for Nagvis
nagvis_tmp=$(mktemp)
cat /usr/share/nagvis/defaults/nagvis.ini.php-sample | sed \
@@ -99,12 +99,22 @@ case "$1" in
-e "s#;file_mode=\"660\"#file_mode=\"660\"#g" \
-e "s#;base=\"/usr/local/nagvis/\"#base=\"/usr/share/nagvis/\"#" \
-e "s#;htmlbase=\"/nagvis\"#htmlbase=\"/nagvis\"#" \
- -e "s#;htmlcgi=\"/nagios/cgi-bin\"#htmlcgi=\"/icinga/cgi-bin\"#" \
- -e "s#;socket=\"unix:/usr/local/nagios/var/rw/live\"#socket=\"unix:/var/lib/icinga/rw/live\"#" \
-e "s#\[rotation_demo\]#;\[rotation_demo\]#" \
-e "s#interval=15#;interval=15#" \
-e "s#maps=\"\(.*\)\"#;maps=\"\1\"#" \
> "$nagvis_tmp"
+ case "$MONITORING" in
+ "icinga")
+ sed -i "$nagvis_tmp" \
+ -e "s#;htmlcgi=\"/nagios/cgi-bin\"#htmlcgi=\"/icinga/cgi-bin\"#" \
+ -e "s#;socket=\"unix:/usr/local/nagios/var/rw/live\"#socket=\"unix:/var/lib/icinga/rw/live\"#"
+ ;;
+ "nagios")
+ sed -i "$nagvis_tmp" \
+ -e "s#;htmlcgi=\"/nagios/cgi-bin\"#htmlcgi=\"/nagios/cgi-bin\"#" \
+ -e "s#;socket=\"unix:/usr/local/nagios/var/rw/live\"#socket=\"unix:/var/lib/nagios3/rw/live\"#"
+ ;;
+ esac
chgrp www-data "$nagvis_tmp"
chmod g+rw "$nagvis_tmp"
ucf --debconf-ok "$nagvis_tmp" /etc/nagvis/nagvis.ini.php
@@ -114,40 +124,18 @@ case "$1" in
apache_tmp=$(mktemp)
sed -e "s#@NAGVIS_PATH@#/usr/share/nagvis/share/#g" \
-e "s#@NAGVIS_WEB@#/nagvis#g" \
- -e "s#@NAGIOS_PATH@/etc#/etc/icinga#g" \
- < /usr/share/nagvis/defaults/apache2-nagvis.conf-sample \
- > "$apache_tmp"
- chmod go+r "$apache_tmp"
- ucf --debconf-ok "$apache_tmp" /etc/nagvis/apache2.conf
- ucfr nagvis /etc/nagvis/apache2.conf
- rm -f "$apache_tmp"
- ;;
- "nagios")
- ## Creating Configuration file for Nagvis
- nagvis_tmp=$(mktemp)
- cat /usr/share/nagvis/defaults/nagvis.ini.php-sample | sed \
- -e "s#;file_group=\"\"#file_group=\"www-data\"#g" \
- -e "s#;file_mode=\"660\"#file_mode=\"660\"#g" \
- -e "s#;base=\"/usr/local/nagvis/\"#base=\"/usr/share/nagvis/\"#" \
- -e "s#;htmlbase=\"/nagvis\"#htmlbase=\"/nagvis\"#" \
- -e "s#;htmlcgi=\"/nagios/cgi-bin\"#htmlcgi=\"/nagios/cgi-bin\"#" \
- -e "s#;socket=\"unix:/usr/local/nagios/var/rw/live\"#socket=\"unix:/var/lib/nagios3/rw/live\"#" \
- -e "s#\[rotation_demo\]#;\[rotation_demo\]#" \
- -e "s#interval=15#;interval=15#" \
- -e "s#maps=\"\(.*\)\"#;maps=\"\1\"#" \
- > "$nagvis_tmp"
- chgrp www-data "$nagvis_tmp"
- chmod g+rw "$nagvis_tmp"
- ucf --debconf-ok "$nagvis_tmp" /etc/nagvis/nagvis.ini.php
- ucfr nagvis /etc/nagvis/nagvis.ini.php
- rm -f "$nagvis_tmp"
- ## Creating Configuration snipplet for Apache
- apache_tmp=$(mktemp)
- sed -e "s#@NAGVIS_PATH@#/usr/share/nagvis/share/#g" \
- -e "s#@NAGVIS_WEB@#/nagvis#g" \
- -e "s#@NAGIOS_PATH@/etc#/etc/nagios3#g" \
< /usr/share/nagvis/defaults/apache2-nagvis.conf-sample \
> "$apache_tmp"
+ case "$MONITORING" in
+ "icinga")
+ sed -i "$apache_tmp" \
+ -e "s#@NAGIOS_PATH@/etc#/etc/icinga#g"
+ ;;
+ "nagios")
+ sed -i "$apache_tmp" \
+ -e "s#@NAGIOS_PATH@/etc#/etc/nagios3#g"
+ ;;
+ esac
chmod go+r "$apache_tmp"
ucf --debconf-ok "$apache_tmp" /etc/nagvis/apache2.conf
ucfr nagvis /etc/nagvis/apache2.conf
--
1.8.5.1
From f2baad4efefd797acfbdc1b5b5c8653151b572ef Mon Sep 17 00:00:00 2001
From: Mathieu Parent <[email protected]>
Date: Thu, 26 Dec 2013 10:45:08 +0100
Subject: [PATCH 2/2] Shinken support
---
debian/nagvis.postinst | 13 +++++++++++--
debian/nagvis.templates | 4 ++--
2 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/debian/nagvis.postinst b/debian/nagvis.postinst
index 4a2cfe6..4220b70 100644
--- a/debian/nagvis.postinst
+++ b/debian/nagvis.postinst
@@ -91,7 +91,7 @@ case "$1" in
db_get nagvis/monitoring_system
MONITORING="$RET"
case "$MONITORING" in
- "icinga"|"nagios")
+ "icinga"|"nagios"|"shinken")
## Creating Configuration file for Nagvis
nagvis_tmp=$(mktemp)
cat /usr/share/nagvis/defaults/nagvis.ini.php-sample | sed \
@@ -114,6 +114,11 @@ case "$1" in
-e "s#;htmlcgi=\"/nagios/cgi-bin\"#htmlcgi=\"/nagios/cgi-bin\"#" \
-e "s#;socket=\"unix:/usr/local/nagios/var/rw/live\"#socket=\"unix:/var/lib/nagios3/rw/live\"#"
;;
+ "shinken")
+ sed -i "$nagvis_tmp" \
+ -e "s#;htmlcgi=\"/nagios/cgi-bin\"#htmlcgi=\"/nagios/cgi-bin\"#" \
+ -e "s#;socket=\"unix:/usr/local/nagios/var/rw/live\"#socket=\"tcp:localhost:50000\"#"
+ ;;
esac
chgrp www-data "$nagvis_tmp"
chmod g+rw "$nagvis_tmp"
@@ -135,6 +140,10 @@ case "$1" in
sed -i "$apache_tmp" \
-e "s#@NAGIOS_PATH@/etc#/etc/nagios3#g"
;;
+ "shinken")
+ sed -i "$apache_tmp" \
+ -e "s#@NAGIOS_PATH@/etc#/etc/shinken#g"
+ ;;
esac
chmod go+r "$apache_tmp"
ucf --debconf-ok "$apache_tmp" /etc/nagvis/apache2.conf
@@ -147,7 +156,7 @@ case "$1" in
esac
# enable apache when file exists and we are on autoconfigure
- if [ -f /etc/nagvis/apache2.conf ] && ( [ "$MONITORING" = "nagios" ] || [ "$MONITORING" = "icinga" ] ); then
+ if [ -f /etc/nagvis/apache2.conf ] && ( [ "$MONITORING" = "nagios" ] || [ "$MONITORING" = "icinga" ] || [ "$MONITORING" = "shinken" ] ); then
echo "enabling Apache2 config..."
COMMON_STATE=$(dpkg-query -f '${Status}' -W 'apache2.2-common' 2>/dev/null | awk '{print $3}' || true)
diff --git a/debian/nagvis.templates b/debian/nagvis.templates
index 1b84b0e..3ab0fe2 100644
--- a/debian/nagvis.templates
+++ b/debian/nagvis.templates
@@ -10,8 +10,8 @@
Template: nagvis/monitoring_system
Type: select
Default: icinga
-#flag:translate:3
-__Choices: icinga, nagios, other
+#flag:translate:4
+__Choices: icinga, nagios, shinken, other
_Description: Monitoring suite used with NagVis:
The NagVis package supports Icinga as well as
Nagios, using the check-mk-live broker backend.
--
1.8.5.1
--- End Message ---
--- Begin Message ---
Source: nagvis
Source-Version: 1:1.7.10+dfsg1-2
We believe that the bug you reported is fixed in the latest version of
nagvis, which is due to be installed in the Debian FTP archive.
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to [email protected],
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Markus Frosch <[email protected]> (supplier of updated nagvis package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing [email protected])
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Format: 1.8
Date: Fri, 27 Dec 2013 18:09:08 +0100
Source: nagvis
Binary: nagvis nagvis-demos
Architecture: source all
Version: 1:1.7.10+dfsg1-2
Distribution: unstable
Urgency: low
Maintainer: Debian Nagios Maintainer Group
<[email protected]>
Changed-By: Markus Frosch <[email protected]>
Description:
nagvis - visualization addon for Nagios or Icinga
nagvis-demos - visualization addon for Nagios or Icinga - demo maps
Closes: 733139
Changes:
nagvis (1:1.7.10+dfsg1-2) unstable; urgency=low
.
[ Mathieu Parent ]
* [fca29f3] Refactor monitoring configuration
* [3253395] Shinken support (Closes: #733139)
.
[ Markus Frosch ]
* [12156c3] Fix Debian watch file for +dfsg1 versions
* [91b09f2] Added patch headers to existing patches
* [4ee9a4c] Added privary-breach patch for cleaning up
possible privacy breaches
* [12156c3] Fix Debian watch file for +dfsg1 versions
Checksums-Sha1:
216de5372005bf58ef2535d1cf16f66e773b92da 1747 nagvis_1.7.10+dfsg1-2.dsc
ce758ea1e5ec6f26db58f619ce67d1c0a76ec927 22345
nagvis_1.7.10+dfsg1-2.debian.tar.gz
2f3e1d4df756ca6487546c713e5963bec5f2e1d2 874322 nagvis_1.7.10+dfsg1-2_all.deb
a29b144e9ef977a29687183af44676eff7a0534f 266166
nagvis-demos_1.7.10+dfsg1-2_all.deb
Checksums-Sha256:
ab34e2015b0c9d5fc5a647eb16d87aede0901b78e5ee54aceb185a7b1cbe20c9 1747
nagvis_1.7.10+dfsg1-2.dsc
04353e116262a519d85bbffad79b3c5f37cb398cb5e5b20cc4e535d64d074ecc 22345
nagvis_1.7.10+dfsg1-2.debian.tar.gz
2b3d876543808578ddeab96bedd72e2fe3537ad81582fa667f97970b9b5b0972 874322
nagvis_1.7.10+dfsg1-2_all.deb
2af96d1f3b137e8779ab2c033eb08ce59659719919a09ca435a86543a9db3993 266166
nagvis-demos_1.7.10+dfsg1-2_all.deb
Files:
f06ddb6666213bcceb1a9c3537a69023 1747 net extra nagvis_1.7.10+dfsg1-2.dsc
bf5cd8f93495d0da008de9e7c1e1b9f3 22345 net extra
nagvis_1.7.10+dfsg1-2.debian.tar.gz
15d53572be7884bf794b2bcb02484dd0 874322 net extra nagvis_1.7.10+dfsg1-2_all.deb
1ba8952965531bf9ed52aa0144bd01a4 266166 net extra
nagvis-demos_1.7.10+dfsg1-2_all.deb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.15 (GNU/Linux)
iQEcBAEBAgAGBQJSvbVIAAoJEGKVX2ubH1iD7R8H/2T0X/BVAbysU2zRaHcB10HR
PG9TXleSuDTKw7Oe4lEpSo78ask3LpBHRWUwh3MuCX3N7ARcfTSRrs3DD0TAZav1
2aG4bvqrGyCtg7wQD5B90MqUHtOahF8bLRIOG3J1OKEoe21zLse85zF6CsBmtPk8
LcyRBdOK6KVkmRG+UDiEkJZg/7AlbyauCdwyA9+IqzOgeMBJqY8zM/iMbF8fVrLl
hP3xGB+TM9yKp0kizrTiHPDHqbIgP3gmFdmjetuBu0rvnUHwC8IosfJ6KsSdr2X1
d4yHknK1ABBrfmGkiYWG15OVSyRew37SirU7PdecbkzX0SNetyOYLMiefHWKHBk=
=CzmX
-----END PGP SIGNATURE-----
--- End Message ---
