[pkg-nagios-changes] [Git][nagios-team/pkg-nagvis][master] Add icinga2 option to configure its livestatus path. (closes: #788187)

[Bas Couwenberg]

Bas Couwenberg pushed to branch master at Debian Nagios Maintainer Group / pkg-nagvis


Commits:
d39b0f7c by Bas Couwenberg at 2020-01-21T20:05:40+01:00
Add icinga2 option to configure its livestatus path. (closes: #788187)

- - - - -


3 changed files:

- debian/changelog
- debian/nagvis.postinst
- debian/nagvis.templates


Changes:

=====================================
debian/changelog
=====================================
@@ -12,6 +12,8 @@ nagvis (1:1.9.17-1) unstable; urgency=medium
   [ Bas Couwenberg ]
   * Add Bug-* fields to upstream metadata.
   * Add gbp.conf to use pristine-tar & --source-only-changes by default.
+  * Add icinga2 option to configure its livestatus path.
+    (closes: #788187)
 
   [ Adam Cecile ]
   * New upstream release (Closes: #949387).


=====================================
debian/nagvis.postinst
=====================================
@@ -91,7 +91,7 @@ case "$1" in
         db_get nagvis/monitoring_system
         MONITORING="$RET"
         case "$MONITORING" in
-            "icinga"|"nagios"|"shinken")
+            "icinga2"|"icinga"|"nagios"|"shinken")
                 ## Creating Configuration file for Nagvis
                 nagvis_tmp=$(mktemp)
                 cat /usr/share/nagvis/defaults/nagvis.ini.php-sample | sed \
@@ -104,6 +104,10 @@ case "$1" in
                   -e "s#maps=\"\(.*\)\"#;maps=\"\1\"#" \
                   > "$nagvis_tmp"
                 case "$MONITORING" in
+                    "icinga2")
+                        sed -i "$nagvis_tmp" \
+                          -e "s#;socket=\"unix:/usr/local/nagios/var/rw/live\"#socket=\"unix:/var/run/icinga2/cmd/livestatus\"#"
+                    ;;
                     "icinga")
                         sed -i "$nagvis_tmp" \
                           -e "s#;htmlcgi=\"/nagios/cgi-bin\"#htmlcgi=\"/icinga/cgi-bin\"#" \


=====================================
debian/nagvis.templates
=====================================
@@ -11,7 +11,7 @@ Template: nagvis/monitoring_system
 Type: select
 Default: icinga
 #flag:translate:4
-__Choices: icinga, nagios, shinken, other
+__Choices: icinga2, 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.



View it on GitLab: https://salsa.debian.org/nagios-team/pkg-nagvis/commit/d39b0f7c619e253fa5ac22db7677d2d74c525270

-- 
View it on GitLab: https://salsa.debian.org/nagios-team/pkg-nagvis/commit/d39b0f7c619e253fa5ac22db7677d2d74c525270
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-nagios-changes/attachments/20200121/c7e7e08b/attachment-0001.html>