All notification plugins are now installed in `/usr/lib64/nagios/plug…

…ins/notifications/` by default, because otherwise installing the notification and monitoring plugins package at the same time fails (fix #726)
Linuxfabrik · May 29, 2024 · ce59ff1 · ce59ff1
1 parent 86fdd7a
commit ce59ff1
Show file tree

Hide file tree

Showing 9 changed files with 23 additions and 19 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -22,13 +22,17 @@ Monitoring Plugins:
 
 * disk-io: Nearly rewritten from scratch, old parameters have been replaced by new, better ones. Perfdata "throughput" has been renamed to "bandwidth". Filter disks which are really mounted, translate dm-* device names, wildcard support for ignore disks ([#709](https://github.com/Linuxfabrik/monitoring-plugins/issues/709), [#708](https://github.com/Linuxfabrik/monitoring-plugins/issues/708), [#676](https://github.com/Linuxfabrik/monitoring-plugins/issues/676))
 * file-size: Note that the plugin now requires a size qualifier when specifying parameters, e.g. ``--warning=10K`` for 10 KiB (instead of ``--warning=10000`` as in previous versions).
-* journald-query: Pattern-matching is now always case-sensitive (fix #745)
+* journald-query: Pattern-matching is now always case-sensitive ([#745](https://github.com/Linuxfabrik/monitoring-plugins/issues/745))
 * librenms-alerts: Rewritten from scratch to fetch from LibreNMS MySQL/MariaDB database (therefore the check comes with new parameters)
 * librenms-health: Rewritten from scratch to fetch from LibreNMS MySQL/MariaDB database (therefore the check comes with new parameters)
 * php-fpm: Remove parameters `--*-max-children` because php-fpm `max children reached` is either 0 or 1
 * snmp: Improve Performance Data Handling ([#481](https://github.com/Linuxfabrik/monitoring-plugins/issues/481)) - update your CSV definition files and add two more columns according to the check's README
 * uptime: Use the plugin to warn about recent reboots ([#722](https://github.com/Linuxfabrik/monitoring-plugins/issues/722)). Note that the plugin now requires a time qualifier when specifying parameters, e.g. ``--warning=180D`` for 180 days (instead of ``--warning=180`` as in previous versions).
 
+Notification Plugins:
+
+* All notification plugins are now installed in `/usr/lib64/nagios/plugins/notifications/` by default, because otherwise installing the notification and monitoring plugins package at the same time fails ([#726](https://github.com/Linuxfabrik/monitoring-plugins/issues/726))
+
 
 ### Added
 
@@ -48,7 +52,7 @@ Monitoring Plugins:
 Icinga Director:
 
 * all-the-rest.json: Rename "Starface Java Status" to "Starface Java Memory Usage"
-* all-the-rest: Ignore session-c*.scope in systemd-units-failed by default
+* all-the-rest.json: Ignore session-c*.scope in systemd-units-failed by default
 
 Monitoring Plugins:
 
@@ -693,10 +697,10 @@ Monitoring Plugins:
 * all-the-rest.json: add service set for acme.sh ([#447](https://github.com/Linuxfabrik/monitoring-plugins/issues/447))
 * all-the-rest.json: Delete SysMain from Windows Service Set ([#446](https://github.com/Linuxfabrik/monitoring-plugins/issues/446))
 * all-the-rest.json: fixed guids
-* all-the-rest: added acme.sh tag
-* all-the-rest: added duplicati service set
-* all-the-rest: adjusted loolwsd to coolwsd
-* all-the-rest: removed getent from the basic service sets
+* all-the-rest.json: added acme.sh tag
+* all-the-rest.json: added duplicati service set
+* all-the-rest.json: adjusted loolwsd to coolwsd
+* all-the-rest.json: removed getent from the basic service sets
 * apache-httpd-status: Traceback on Ubuntu Xenial (16.04) ([#436](https://github.com/Linuxfabrik/monitoring-plugins/issues/436))
 * basket-join: allowed missing Datafield key
 * basket-join: error on duplicate entries in json

diff --git a/assets/icingaweb2-module-director/all-the-rest.json b/assets/icingaweb2-module-director/all-the-rest.json
@@ -698,7 +698,7 @@
                     "value": "$telegram_chat_id$"
                 }
             },
-            "command": "/usr/lib64/nagios/plugins/notify-host",
+            "command": "/usr/lib64/nagios/plugins/notifications/notify-host",
             "disabled": false,
             "fields": [
                 {
@@ -784,7 +784,7 @@
                     "value": "$icinga.short_date_time$"
                 }
             },
-            "command": "/usr/lib64/nagios/plugins/notify-host-mail",
+            "command": "/usr/lib64/nagios/plugins/notifications/notify-host-mail",
             "disabled": false,
             "fields": [
                 {
@@ -865,7 +865,7 @@
                     "value": "$sms_url$"
                 }
             },
-            "command": "/usr/lib64/nagios/plugins/notify-host-sms",
+            "command": "/usr/lib64/nagios/plugins/notifications/notify-host-sms",
             "disabled": false,
             "fields": [
                 {
@@ -948,7 +948,7 @@
                     "value": "$telegram_chat_id$"
                 }
             },
-            "command": "/usr/lib64/nagios/plugins/notify-service",
+            "command": "/usr/lib64/nagios/plugins/notifications/notify-service",
             "disabled": false,
             "fields": [
                 {
@@ -1040,7 +1040,7 @@
                     "value": "$icinga.short_date_time$"
                 }
             },
-            "command": "/usr/lib64/nagios/plugins/notify-service-mail",
+            "command": "/usr/lib64/nagios/plugins/notifications/notify-service-mail",
             "disabled": false,
             "fields": [
                 {

diff --git a/notification-plugins/notify-host-mail/icingaweb2-module-director/notify-host-mail.json b/notification-plugins/notify-host-mail/icingaweb2-module-director/notify-host-mail.json
@@ -63,7 +63,7 @@
                     "set_if": "$notify_host_mail_short$"
                 }
             },
-            "command": "/usr/lib64/nagios/plugins/notify-host-mail",
+            "command": "/usr/lib64/nagios/plugins/notifications/notify-host-mail",
             "disabled": false,
             "fields": [
                 {

diff --git a/...-host-rocketchat-telegram/icingaweb2-module-director/notify-host-rocketchat-telegram.json b/...-host-rocketchat-telegram/icingaweb2-module-director/notify-host-rocketchat-telegram.json
@@ -40,7 +40,7 @@
                     "value": "$notify_host_rocketchat_telegram_telegram_chat_id$"
                 }
             },
-            "command": "/usr/lib64/nagios/plugins/notify-host-rocketchat-telegram",
+            "command": "/usr/lib64/nagios/plugins/notifications/notify-host-rocketchat-telegram",
             "disabled": false,
             "fields": [
                 {

diff --git a/notification-plugins/notify-host-zoom/icingaweb2-module-director/notify-host-zoom.json b/notification-plugins/notify-host-zoom/icingaweb2-module-director/notify-host-zoom.json
@@ -33,7 +33,7 @@
                     "value": "$notify_host_zoom_url$"
                 }
             },
-            "command": "/usr/lib64/nagios/plugins/notify-host-zoom",
+            "command": "/usr/lib64/nagios/plugins/notifications/notify-host-zoom",
             "disabled": false,
             "fields": [
                 {

diff --git a/notification-plugins/notify-service-mail/icingaweb2-module-director/notify-service-mail.json b/notification-plugins/notify-service-mail/icingaweb2-module-director/notify-service-mail.json
@@ -69,7 +69,7 @@
                     "value": "$notify_service_mail_servicename$"
                 }
             },
-            "command": "/usr/lib64/nagios/plugins/notify-service-mail",
+            "command": "/usr/lib64/nagios/plugins/notifications/notify-service-mail",
             "disabled": false,
             "fields": [
                 {

diff --git a/...ce-rocketchat-telegram/icingaweb2-module-director/notify-service-rocketchat-telegram.json b/...ce-rocketchat-telegram/icingaweb2-module-director/notify-service-rocketchat-telegram.json
@@ -43,7 +43,7 @@
                     "value": "$notify_service_rocketchat_telegram_telegram_chat_id$"
                 }
             },
-            "command": "/usr/lib64/nagios/plugins/notify-service-rocketchat-telegram",
+            "command": "/usr/lib64/nagios/plugins/notifications/notify-service-rocketchat-telegram",
             "disabled": false,
             "fields": [
                 {

diff --git a/notification-plugins/notify-service-zoom/icingaweb2-module-director/notify-service-zoom.json b/notification-plugins/notify-service-zoom/icingaweb2-module-director/notify-service-zoom.json
@@ -39,7 +39,7 @@
                     "value": "$notify_service_zoom_url$"
                 }
             },
-            "command": "/usr/lib64/nagios/plugins/notify-service-zoom",
+            "command": "/usr/lib64/nagios/plugins/notifications/notify-service-zoom",
             "disabled": false,
             "fields": [
                 {

diff --git a/tools/check2basket b/tools/check2basket
@@ -24,7 +24,7 @@ except ImportError:
     colorama = False
 
 __author__ = 'Linuxfabrik GmbH, Zurich/Switzerland'
-__version__ = '2024031501'
+__version__ = '2024052901'
 
 DESCRIPTION = 'A tool to generate Icinga Director baskets from a check plugin.'
 
@@ -825,7 +825,7 @@ def generate_basket(plugin_file, config=None, old_data=None):
         print('Generating "notification-plugin" variant.')
         command_object_name = 'cmd-notification-{}'.format(check_name)
         notification_object_name = 'tpl-notification-{}'.format(check_name)
-        command = '/usr/lib64/nagios/plugins/{}'.format(check_name)
+        command = '/usr/lib64/nagios/plugins/notifications/{}'.format(check_name)
         varname_suffix = ''
 
         data = get_command_template(