Merge pull request #1389 from liangxin1300/20240415_drop_nagios

Dev: Drop nagios related code, the help text, and the man page

Author: liangxin1300

crmsh/config.py

@@ -270,7 +270,6 @@ def get(self, value):
         'pe_state_dir': opt_dir('%(varlib)s/pacemaker/pengine'),
         'heartbeat_dir': opt_dir('%(varlib)s/heartbeat'),
         'hb_delnode': opt_program('', ('%(datadir)s/heartbeat/hb_delnode',)),
-        'nagios_plugins': opt_dir('%(libdir)s/nagios/plugins'),
         'hawk_wizards': opt_dir('%(wwwdir)s/hawk/config/wizard'),
     },
     'color': {

crmsh/ra.py

@@ -51,7 +51,7 @@ def ra_classes():
     if can_use_crm_resource():
         l = crm_resource("--list-standards")
     else:
-        l = ["heartbeat", "lsb", "nagios", "ocf", "stonith", "systemd"]
+        l = ["heartbeat", "lsb", "ocf", "stonith", "systemd"]
     l.sort()
     return cache.store("ra_classes", l)
 
@@ -125,9 +125,6 @@ def systemd_types():
         l = os_types_list("/etc/init.d/*")
     elif ra_class == "stonith":
         l = stonith_types()
-    elif ra_class == "nagios":
-        l = [x.replace("check_", "")
-             for x in os_types_list("%s/check_*" % config.path.nagios_plugins)]
     elif ra_class == "systemd":
         l = systemd_types()
     l = list(set(l))
@@ -184,9 +181,6 @@ def ra_meta(ra_class, ra_type, ra_provider):
                 _rc, l = stdout2list("/usr/sbin/%s -o metadata" % ra_type)
             else:
                 _rc, l = stdout2list("stonith -m -t %s" % ra_type)
-        elif ra_class == "nagios":
-            _rc, l = stdout2list("%s/check_%s --metadata" %
-                                 (config.path.nagios_plugins, ra_type))
         return l
 
 

doc/crm.8.adoc

@@ -3065,11 +3065,6 @@ Grouped resources are started in the order they appear in the group,
 and stopped in the reverse order. If a resource in the group cannot
 run anywhere, resources following it in the group will not start.
 
-`group` can be passed the "container" meta attribute, to indicate that
-it is to be used to group VM resources monitored using Nagios. The
-resource referred to by the container attribute must be of type
-`ocf:heartbeat:Xen`, `ocf:heartbeat:VirtualDomain` or `ocf:heartbeat:lxc`.
-
 Usage:
 ...............
 group <name> <rsc> [<rsc>...]
@@ -3083,8 +3078,6 @@ Example:
 ...............
 group internal_www disk0 fs0 internal_ip apache \
   meta target_role=stopped
-
-group vm-and-services vm vm-sshd meta container="vm"
 ...............
 
 [[cmdhelp_configure_load,import the CIB from a file]]

doc/website-v1/configuration.adoc

@@ -73,7 +73,6 @@ crm_dtd_dir = /usr/share/pacemaker
 pe_state_dir = /var/lib/pacemaker/pengine
 heartbeat_dir = /var/lib/heartbeat
 hb_delnode = /usr/share/heartbeat/hb_delnode
-nagios_plugins = /usr/lib64/nagios/plugins
 
 [color]
 style = color

etc/crm.conf.in

@@ -51,7 +51,6 @@ ocf_root = @OCF_ROOT_DIR@
 ; pe_state_dir = <detected>
 ; heartbeat_dir = <detected>
 ; hb_delnode = /usr/share/heartbeat/hb_delnode
-; nagios_plugins = /usr/lib/nagios/plugins
 
 ; [color]
 ; style = color

test/unittests/test.conf

@@ -9,4 +9,3 @@ crm_dtd_dir = .
 pe_state_dir = .
 heartbeat_dir = .
 hb_delnode = ./hb_delnode
-nagios_plugins = .