Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64596 discussions

Check_MK Git: check_mk: fixed broken inventory function

by Andreas Boesl

Module: check_mk Branch: master Commit: 4cef91f45d67e71c13fbefa0e9332950d70f6d04 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4cef91f45d67e7… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Feb 5 13:03:11 2014 +0100 fixed broken inventory function --- modules/check_mk.py | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index 72b5abd..7e09c8a 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -2645,7 +2645,6 @@ def quote_nagios_string(s): # '----------------------------------------------------------------------' def do_inventory(hostnames, checknames, only_new): - # For clusters add their nodes to the list nodes = [] for h in hostnames: @@ -2663,18 +2662,17 @@ def do_inventory(hostnames, checknames, only_new): else: sys.stdout.write("Inventorizing all hosts.\n") - if inventory_checks: - checknames = inventory_checks.split(",") - # remove existing checks, if option -I is used twice if seen_I > 1: - if inventory_checks == None: - checknames = inventorable_checktypes("all") + if not checknames: + checks_to_remove = inventorable_checktypes("all") + else: + checks_to_remove = checknames if len(hostnames) > 0: # Entries in hostnames that are either prefixed with @ # or are no valid hostnames are considered to be tags. for host in hostnames: - remove_autochecks_of(host, checknames) + remove_autochecks_of(host, checks_to_remove) # If all nodes of a cluster are contained in the list, then # also remove the autochecks of that cluster. Beware: a host # can be part more multiple clusters @@ -2687,7 +2685,7 @@ def do_inventory(hostnames, checknames, only_new): if len(missing) == 0: if opt_verbose: sys.stdout.write("All nodes of %s specified, dropping checks of %s, too.\n" % (clust, node)) - remove_autochecks_of(clust, checknames) + remove_autochecks_of(clust, checks_to_remove) else: sys.stdout.write("Warning: %s is part of cluster %s, but you didn't specify %s as well.\nChecks on %s will be kept.\n" % @@ -2695,10 +2693,10 @@ def do_inventory(hostnames, checknames, only_new): else: for host in all_active_hosts() + all_active_clusters(): - remove_autochecks_of(host, checknames) + remove_autochecks_of(host, checks_to_remove) reread_autochecks() - if inventory_checks == None: + if checknames == None: do_snmp_scan(hostnames) checknames = inventorable_checktypes("tcp")

10 years, 8 months

Check_MK Git: check_mk: arcserve_backup: new check for status of backups in an Arcserve Backup Server

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: cb1a9e23ce5bd88c787d41835a2d0e9308187a1e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cb1a9e23ce5bd8… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Wed Feb 5 12:39:32 2014 +0100 arcserve_backup: new check for status of backups in an Arcserve Backup Server --- .werks/700 | 8 ++ ChangeLog | 1 + agents/plugins/arcserve_backup.ps1 | 169 +++++++++++++++++++++++++++ checkman/arcserve_backup | 31 +++++ checks/arcserve_backup | 170 ++++++++++++++++++++++++++++ pnp-templates/check_mk-arcserve_backup.php | 37 ++++++ web/plugins/perfometer/check_mk.py | 7 ++ 7 files changed, 423 insertions(+) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=cb1a9e23ce…

10 years, 8 months

Check_MK Git: check_mk: WATO "Notify Users" feature: Improved confirmation info

by Andreas Boesl

Module: check_mk Branch: master Commit: 307718aa6517aded89852b4632fb0386d31d9ab3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=307718aa6517ad… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Feb 4 18:23:09 2014 +0100 WATO "Notify Users" feature: Improved confirmation info The confirmation dialog now shows more clearly which notify plugin succeeded and those which had problems. --- .werks/275 | 9 +++++++++ ChangeLog | 3 ++- web/htdocs/notify.py | 37 +++++++++++++++++++++++++++---------- 3 files changed, 38 insertions(+), 11 deletions(-) diff --git a/.werks/275 b/.werks/275 new file mode 100644 index 0000000..87a4989 --- /dev/null +++ b/.werks/275 @@ -0,0 +1,9 @@ +Title: WATO "Notify Users" feature: Improved confirmation info +Level: 1 +Component: wato +Version: 1.2.5i1 +Date: 1391534286 +Class: feature + +The confirmation dialog now shows more clearly which notify +plugin succeeded and those which had problems. diff --git a/ChangeLog b/ChangeLog index c6e0d06..075a71c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -156,8 +156,8 @@ * 0577 FIX: fileinfo.groups: new date pattern is now available for inventory check as well * 0688 FIX: winperf_msx_queues: Support output of Exchange 2013... * 0578 FIX: zypper: check is always registered as soon as mk_zypper plugin detects zypper tool... - * 0579 FIX: veeam_client: fix for case when no StopTime section in agent output * 0689 FIX: postgres_sessions: fix empty agent section in case of 0 sessions... + * 0579 FIX: veeam_client: fix for case when no StopTime section in agent output Multisite: * 0371 Added log class filter to hostsvcevents view @@ -215,6 +215,7 @@ * 0677 Make title of tags and tag groups localizable... * 0685 Distributed WATO now disabled WATO on slave sites per default... * 0687 New summary pages with all settings of a host or service... + * 0275 WATO "Notify Users" feature: Improved confirmation info... * 0057 FIX: Fix exception in WATO host editor on custom tag without topic... * 0241 FIX: Improved sorting of WATO folders in dropdown menu... * 0019 FIX: Fixed wording in WATO rule for MSSQL check diff --git a/web/htdocs/notify.py b/web/htdocs/notify.py index ce85ab0..40d088f 100644 --- a/web/htdocs/notify.py +++ b/web/htdocs/notify.py @@ -201,26 +201,43 @@ def page_notify(): recipients = msg['dest'][1] num_recipients = len(recipients) - num_success = 0 - num_failed = 0 + + num_success = {} + for method in msg['methods']: + num_success[method] = 0 # Now loop all notitification methods to send the notifications + errors = {} for user_id in recipients: for method in msg['methods']: try: handler = notify_methods[method]['handler'] handler(user_id, msg) - num_success += 1 + num_success[method] = num_success[method] + 1 except MKInternalError, e: - num_failed += 1 - html.show_error(_('Failed to send %s notification to %s: %s') % (method, user_id, e)) + errors.setdefault(method, []).append( (user_id, e) ) - msg = _('The notification has been sent to %d of %d recipients.') % (num_success, num_recipients) - msg += ' <a href="%s">%s</a>' % (html.makeuri([]), _('Back to previous page')) - - msg += '<p>Sent notification to: %s</p>' % ', '.join(recipients) + message = _('The notification has been sent via<br>') + message += "<table>" + for method in msg['methods']: + message += "<tr><td>%s</td><td>to %d of %d recipients</td></tr>" %\ + (notify_methods[method]["title"], num_success[method], num_recipients) + message += "</table>" + + message += ' <a href="%s">%s</a>' % (html.makeuri([]), _('Back to previous page')) + message += '<p>Sent notification to: %s</p>' % ', '.join(recipients) + html.message(message) + + if errors: + error_message = "" + for key, values in errors.items(): + error_message += _("Failed to sent %s notifications to the following users") % key + error_message += "<table>" + for user, error in values: + error_message += "<tr><td>%s</td><td>%s</td></tr>" % (user, error ) + error_message += "</table><br>" + html.show_error(error_message) - html.message(msg) html.footer()

10 years, 8 months

Check_MK Git: check_mk: optimized titles of check manpages

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: e00707904c8ef2462ab2b4b3d12e21dc11efe7db URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e00707904c8ef2… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Tue Feb 4 17:31:11 2014 +0100 optimized titles of check manpages --- checkman/local | 2 +- checkman/mrpe | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/checkman/local b/checkman/local index 4c0c64d..72ba766 100644 --- a/checkman/local +++ b/checkman/local @@ -1,4 +1,4 @@ -title: Integrate custom checks via arbitrary scripts on the agent +title: local: Integrate custom checks via arbitrary scripts on the agent agents: linux, windows, aix, solaris, freebsd, netbsd, openbsd catalog: generic license: GPL diff --git a/checkman/mrpe b/checkman/mrpe index 49222d5..c5350af 100644 --- a/checkman/mrpe +++ b/checkman/mrpe @@ -1,4 +1,4 @@ -title: MK's Remote Plugin Executor +title: MRPE: MK's Remote Plugin Executor agents: linux, aix, solaris, hpux, macosx, netbsd, openbsd, freebsd catalog: generic license: GPL

10 years, 8 months

Check_MK Git: check_mk: fixed catalog entry for snmp_info

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: 7a96066376a9d8f6cef5fddb6d134c3005d65e8f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7a96066376a9d8… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Tue Feb 4 16:20:37 2014 +0100 fixed catalog entry for snmp_info --- checkman/snmp_info | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checkman/snmp_info b/checkman/snmp_info index 1a7e2e0..ff22244 100644 --- a/checkman/snmp_info +++ b/checkman/snmp_info @@ -1,6 +1,6 @@ title: Retrieve informational SNMP data about host agents: snmp -catalog: generic +catalog: os/misc license: GPL distribution: check_mk description:

10 years, 8 months

Check_MK Git: check_mk: FIX veeam_client: fix for case when no StopTime section in agent output

by Götz Golla

Module: check_mk Branch: master Commit: 07abf2dc0b8d4df539f059904221e3ce64f31a63 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=07abf2dc0b8d4d… Author: Götz Golla <gg(a)mathias-kettner.de> Date: Tue Feb 4 15:33:07 2014 +0100 FIX veeam_client: fix for case when no StopTime section in agent output --- .werks/579 | 9 +++++++++ ChangeLog | 3 ++- checks/veeam_client | 1 + 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/579 b/.werks/579 new file mode 100644 index 0000000..49501f2 --- /dev/null +++ b/.werks/579 @@ -0,0 +1,9 @@ +Title: veeam_client: fix for case when no StopTime section in agent output +Level: 1 +Component: checks +Class: fix +State: unknown +Version: 1.2.5i1 +Date: 1391524330 + + diff --git a/ChangeLog b/ChangeLog index dff5b97..740dedc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -153,8 +153,9 @@ * 0575 FIX: cmciii_lcp_airin, cmciii_lcp_airout, cmciii_lcp_waterin, cmciii_lcp_waterout: improved handling of warning state... * 0272 FIX: if checks: port type 56 (fibrechannel) is no longer inventorized per default... * 0577 FIX: fileinfo.groups: new date pattern is now available for inventory check as well - * 0578 FIX: zypper: check is always registered as soon as mk_zypper plugin detects zypper tool... * 0688 FIX: winperf_msx_queues: Support output of Exchange 2013... + * 0578 FIX: zypper: check is always registered as soon as mk_zypper plugin detects zypper tool... + * 0579 FIX: veeam_client: fix for case when no StopTime section in agent output Multisite: * 0371 Added log class filter to hostsvcevents view diff --git a/checks/veeam_client b/checks/veeam_client index 0eeef20..b3d02dd 100644 --- a/checks/veeam_client +++ b/checks/veeam_client @@ -50,6 +50,7 @@ def check_veeam_client(item, params, info): for line in info: if line[0] == "Status": result = line[1] + stopstate = 0 perfdata = [] infotxt = line[0] + ":" + line[1] + " " elif line[0] == "DurationDDHHMMSS" and result != "InProgress" and result != "Pending":

10 years, 8 months

Check_MK Git: check_mk: FIX Fix language jumping to German when saving user profiles

by Mathias Kettner

Module: check_mk Branch: master Commit: b79eee3701c9b119ce845a0bf00659ddded3cfa9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b79eee3701c9b1… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Feb 4 15:16:45 2014 +0100 FIX Fix language jumping to German when saving user profiles --- .werks/690 | 9 +++++++++ ChangeLog | 1 + web/htdocs/wato.py | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.werks/690 b/.werks/690 new file mode 100644 index 0000000..5bd5a60 --- /dev/null +++ b/.werks/690 @@ -0,0 +1,9 @@ +Title: Fix language jumping to German when saving user profiles +Level: 2 +Component: wato +Class: fix +State: unknown +Version: 1.2.5i1 +Date: 1391523357 + + diff --git a/ChangeLog b/ChangeLog index 803b5ec..52f3e89 100644 --- a/ChangeLog +++ b/ChangeLog @@ -252,6 +252,7 @@ * 0269 FIX: brocade_fcport: fixed problem on displaying check_parameters in WATO... * 0271 FIX: Fixed sorting in duallist element (two lists with interchangable elements)... * 0131 FIX: Error rates for network interfaces can now be set smaller then 0.1 when using Wato.... + * 0690 FIX: Fix language jumping to German when saving user profiles Notifications: * 0362 sms: now searching PATH for sendsms and smssend commands... diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index f1edb20..acf36c8 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -13126,7 +13126,7 @@ def HostnameTranslation(**kwargs): def select_language(user_language): languages = [ l for l in get_languages() if not config.hide_language(l[0]) ] - inactive = user_language != '' + inactive = not not user_language if languages: forms.section(_("Language"),

10 years, 8 months

Check_MK Git: check_mk: Added local check for monitoring write access to NFS/GlusterFS

by Mathias Kettner

Module: check_mk Branch: master Commit: a4a0b91ac264fe6ce70822572cd649c40568b6df URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a4a0b91ac264fe… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Feb 4 14:46:50 2014 +0100 Added local check for monitoring write access to NFS/GlusterFS --- doc/treasures/{ => localchecks}/check_bi_local.py | 0 doc/treasures/localchecks/check_mount_rw | 105 +++++++++++++++++++++ 2 files changed, 105 insertions(+) diff --git a/doc/treasures/check_bi_local.py b/doc/treasures/localchecks/check_bi_local.py similarity index 100% rename from doc/treasures/check_bi_local.py rename to doc/treasures/localchecks/check_bi_local.py diff --git a/doc/treasures/localchecks/check_mount_rw b/doc/treasures/localchecks/check_mount_rw new file mode 100755 index 0000000..2135d9c --- /dev/null +++ b/doc/treasures/localchecks/check_mount_rw @@ -0,0 +1,105 @@ +#!/bin/bash + +#The MIT License (MIT) +#Henry Huang (http://blog.unicsolution.com) +#Most updated file: https://github.com/bbhenry/check_mk_local/edit/master/check_mount_rw + +PROGNAME=`basename $0` +PROGPATH=`echo $0 | sed -e 's,[\\/][^\\/][^\\/]*$,,'` +REVISION="1.0" +FQDNNAME=`hostname -f` +TESTFILE="test-rw-$FQDNNAME" +RAND=$RANDOM + +print_usage() { + echo "Usage: $PROGNAME" +} + +print_help() { + print_revision $PROGNAME $REVISION + echo "" + print_usage + echo "" + echo "This plugin will write temporary file to all detected nfs and glusterfs directories and read them to verify the network mount points are working without fail" + echo "" + exit 0 +} + +check_mount_rw() { + MOUNTPOINTS=(`grep -E 'glusterfs|nfs' /proc/mounts | awk '{ gsub("fuse.glusterfs","glusterfs",$3); print $2":"toupper($3) }'`) + + for a in "${MOUNTPOINTS[@]}" + do + DIRECTORY=`echo $a | cut -f1 -d:` + CONNECTIONTYPE=`echo $a | cut -f2 -d:` + + timeout 1s ls $DIRECTORY/$TESTFILE + RET_V=$? + if [[ $RET_V -eq 124 || $RET_V -eq 137 ]]; then + echo "2 Mount_${CONNECTIONTYPE}_RW_:$DIRECTORY - Accessing mount point $DIRECTORY timed out" + continue + elif [[ $RET_V -eq 0 ]]; then + echo "2 Mount_${CONNECTIONTYPE}_RW_:$DIRECTORY - Test file $DIRECTORY/$TESTFILE already exist" + rm -f $DIRECTORY/$TESTFILE + continue + fi + + timeout 1s echo $RAND > $DIRECTORY/$TESTFILE + RET_W=$? + if [[ $RET_W -eq 124 || $RET_W -eq 137 ]]; then + echo "2 Mount_${CONNECTIONTYPE}_RW_:$DIRECTORY - Writing test file to $DIRECTORY/$TESTFILE timed out" + continue + elif [[ $RET_W -ne 0 ]]; then + echo "3 Mount_${CONNECTIONTYPE}_RW_:$DIRECTORY - Unknown write error $RET_W has occured while writing test file to $DIRECTORY" + continue + fi + + TESTREAD=`timeout 1s cat $DIRECTORY/$TESTFILE` + RET_R=$? + if [[ $RET_R -eq 124 || $RET_R -eq 137 ]]; then + echo "2 Mount_${CONNECTIONTYPE}_RW_:$DIRECTORY - Reading test from $DIRECTORY/$TESTFILE timed out" + continue + elif [[ $RET_R -ne 0 ]]; then + echo "3 Mount_${CONNECTIONTYPE}_RW_:$DIRECTORY - Unknown read error $RET_R has occured while reading test file from $DIRECTORY/$TESTFILE" + continue + fi + + if [[ $TESTREAD -eq $RAND ]]; then + timeout 1s rm -f $DIRECTORY/$TESTFILE + RET_RM=$? + if [[ $RET_RM -eq 124 || $RET_RM -eq 137 ]]; then + echo "2 Mount_${CONNECTIONTYPE}_RW_:$DIRECTORY - Removing the test file from $DIRECTORY/$TESTFILE timed out" + continue + elif [[ $RET_RM -ne 0 ]]; then + echo "2 Mount_${CONNECTIONTYPE}_RW_:$DIRECTORY - Failed to remove the test file from $DIRECTORY/$TESTFILE" + continue + else + echo "0 Mount_${CONNECTIONTYPE}_RW_:$DIRECTORY - Write and read test to the $DIRECTORY mount point was successful" + continue + fi + else + echo "2 Mount_${CONNECTIONTYPE}_RW_:$DIRECTORY - Content in the test file from $DIRECTORY/$TESTFILE does not match the source input" + continue + fi + done +} + +while getopts "hv" opt; do + case "$opt" in + h) + print_help + exit 0 + ;; + v) + echo "$PROGNAME version: $REVISION" + exit 0 + ;; + \?) + print_help + exit 0 + ;; + esac +done + +check_mount_rw +exit 0

10 years, 8 months

Check_MK Git: check_mk: check_dns: allow to specify multiple expected answers

by Mathias Kettner

Module: check_mk Branch: master Commit: d8aeca6898566d4a3d161e2288f51b23f766b021 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d8aeca6898566d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Feb 4 14:42:07 2014 +0100 check_dns: allow to specify multiple expected answers --- .werks/697 | 8 ++++++++ ChangeLog | 1 + checks/check_dns | 7 ++++++- web/plugins/wato/active_checks.py | 20 +++++++++++++------- 4 files changed, 28 insertions(+), 8 deletions(-) diff --git a/.werks/697 b/.werks/697 new file mode 100644 index 0000000..7a48eaf --- /dev/null +++ b/.werks/697 @@ -0,0 +1,8 @@ +Title: check_dns: allow to specify multiple expected answers +Level: 1 +Component: checks +Version: 1.2.5i1 +Date: 1391521300 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 6345c5f..803b5ec 100644 --- a/ChangeLog +++ b/ChangeLog @@ -80,6 +80,7 @@ * 0698 emc_isilon.nodehealth: new check for EMC Isilon Storage systems: NodeHealth * 0699 emc_isilon_iops: New check for Disk Operations per Second (IOPS) in EMC Isilon Storage * 0132 New checks fjdarye101_disks fjdarye101_rluns: Fujitsu Storage Systems with 2013 Firmware + * 0697 check_dns: allow to specify multiple expected answers * 0103 FIX: services: Fixed bug with service inventory defined in main.mk... * 0299 FIX: borcade_mlx_fan: Prettified output, handling "other" state now * 0300 FIX: cisco_fru_power: Trying not to inventorize not plugged in FRUs... diff --git a/checks/check_dns b/checks/check_dns index f655577..4ac542c 100644 --- a/checks/check_dns +++ b/checks/check_dns @@ -34,7 +34,12 @@ def check_dns_arguments(params): args += " -s '$HOSTADDRESS$'" if "expected_address" in settings: - args += ' -a %s' % quote_shell_string(settings["expected_address"]) + # Convert from old (str) to new (list of strings) + exp = settings["expected_address"] + if type(exp) in ( str, unicode ): + exp = [ exp ] + for entry in exp: + args += ' -a %s' % quote_shell_string(entry) if settings.get("expected_authority"): args += ' -A' diff --git a/web/plugins/wato/active_checks.py b/web/plugins/wato/active_checks.py index 9f61da3..0cc357c 100644 --- a/web/plugins/wato/active_checks.py +++ b/web/plugins/wato/active_checks.py @@ -168,8 +168,10 @@ register_rule(group, help = _("Check the resolution of a hostname into an IP address by a DNS server. " "This check uses <tt>check_dns</tt> from the standard Nagios plugins."), elements = [ - TextAscii(title = _("Hostname"), allow_empty = False, - help = _('The name or address you want to query')), + TextAscii( + title = _("Queried Hostname or IP address"), + allow_empty = False, + help = _('The name or IPv4 address you want to query')), Dictionary( title = _("Optional parameters"), elements = [ @@ -179,11 +181,15 @@ register_rule(group, allow_empty = False, help = _("Optional DNS server you want to use for the lookup"))), ( "expected_address", - TextAscii( - title = _("Expected Address"), - allow_empty = False, - help = _("Optional IP-Address you expect the DNS server to return. The host " - "must end with a dot (.) " )), + Transform( + ListOfStrings( + title = _("Expected answer (IP address or hostname)"), + help = _("List all allowed expected answers here. If query for an " + "IP address then the answer will be host names, that end " + "with a dot."), + ), + forth = lambda old: type(old) in (str, unicode) and [old] or old, + ), ), ( "expected_authority", FixedValue(

10 years, 8 months

Check_MK Git: check_mk: Internal code cleanup for inventory function

by Mathias Kettner

Module: check_mk Branch: master Commit: 113435629904a491a02ef0c4a26f418a41fadb67 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=113435629904a4… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Feb 4 14:18:07 2014 +0100 Internal code cleanup for inventory function --- modules/check_mk.py | 144 ++++++++++++++++++++++++++------------------------- 1 file changed, 73 insertions(+), 71 deletions(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index 2d64184..6ea87b1 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -2633,6 +2633,70 @@ def quote_nagios_string(s): # | Automatic service detection | # '----------------------------------------------------------------------' +def do_inventory(hostnames, checknames, only_new): + + # For clusters add their nodes to the list + nodes = [] + for h in hostnames: + nodes = nodes_of(h) + if nodes: + hostnames += nodes + + # Then remove clusters and make list unique + hostnames = list(set([ h for h in hostnames if not is_cluster(h) ])) + hostnames.sort() + + if opt_verbose: + if len(hostnames) > 0: + sys.stdout.write("Inventorizing %s.\n" % ", ".join(hostnames)) + else: + sys.stdout.write("Inventorizing all hosts.\n") + + if inventory_checks: + checknames = inventory_checks.split(",") + + # remove existing checks, if option -I is used twice + if seen_I > 1: + if inventory_checks == None: + checknames = inventorable_checktypes("all") + if len(hostnames) > 0: + # Entries in hostnames that are either prefixed with @ + # or are no valid hostnames are considered to be tags. + for host in hostnames: + remove_autochecks_of(host, checknames) + # If all nodes of a cluster are contained in the list, then + # also remove the autochecks of that cluster. Beware: a host + # can be part more multiple clusters + for clust in clusters_of(host): + missing = [] # collect nodes missing on the command line + for node in nodes_of(clust): + if node not in hostnames: + missing.append(node) + + if len(missing) == 0: + if opt_verbose: + sys.stdout.write("All nodes of %s specified, dropping checks of %s, too.\n" % (clust, node)) + remove_autochecks_of(clust, checknames) + + else: + sys.stdout.write("Warning: %s is part of cluster %s, but you didn't specify %s as well.\nChecks on %s will be kept.\n" % + (host, clust, ",".join(missing), clust)) + + else: + for host in all_active_hosts() + all_active_clusters(): + remove_autochecks_of(host, checknames) + reread_autochecks() + + if inventory_checks == None: + do_snmp_scan(hostnames) + checknames = inventorable_checktypes("tcp") + + for checkname in checknames: + make_inventory(checkname, hostnames, False) + + do_cleanup_autochecks() + + def inventorable_checktypes(what): # snmp, tcp, all checknames = [ k for k in check_info.keys() @@ -5689,7 +5753,7 @@ if __name__ == "__main__": done = False seen_I = 0 - inventory_checks = None + check_types = None # Scan modifying options first (makes use independent of option order) for o,a in opts: if o in [ '-v', '--verbose' ]: @@ -5725,7 +5789,7 @@ if __name__ == "__main__": elif o == '-I': seen_I += 1 elif o == "--checks": - inventory_checks = a + check_types = a.split(",") elif o == "--cmc-file": opt_cmc_relfilename = a @@ -5859,70 +5923,11 @@ if __name__ == "__main__": raise sys.exit(3) + # handle -I / -II if not done and seen_I > 0: - hostnames = parse_hostname_list(args) - # For clusters add their nodes to the list - nodes = [] - for h in hostnames: - nodes = nodes_of(h) - if nodes: - hostnames += nodes - - # Then remove clusters and make list unique - hostnames = list(set([ h for h in hostnames if not is_cluster(h) ])) - hostnames.sort() - - if opt_verbose: - if len(hostnames) > 0: - sys.stdout.write("Inventorizing %s.\n" % ", ".join(hostnames)) - else: - sys.stdout.write("Inventorizing all hosts.\n") - - if inventory_checks: - checknames = inventory_checks.split(",") - - # remove existing checks, if option -I is used twice - if seen_I > 1: - if inventory_checks == None: - checknames = inventorable_checktypes("all") - if len(hostnames) > 0: - # Entries in hostnames that are either prefixed with @ - # or are no valid hostnames are considered to be tags. - for host in hostnames: - remove_autochecks_of(host, checknames) - # If all nodes of a cluster are contained in the list, then - # also remove the autochecks of that cluster. Beware: a host - # can be part more multiple clusters - for clust in clusters_of(host): - missing = [] # collect nodes missing on the command line - for node in nodes_of(clust): - if node not in hostnames: - missing.append(node) - - if len(missing) == 0: - if opt_verbose: - sys.stdout.write("All nodes of %s specified, dropping checks of %s, too.\n" % (clust, node)) - remove_autochecks_of(clust, checknames) - - else: - sys.stdout.write("Warning: %s is part of cluster %s, but you didn't specify %s as well.\nChecks on %s will be kept.\n" % - (host, clust, ",".join(missing), clust)) - - else: - for host in all_active_hosts() + all_active_clusters(): - remove_autochecks_of(host, checknames) - reread_autochecks() - - if inventory_checks == None: - do_snmp_scan(hostnames) - checknames = inventorable_checktypes("tcp") - - for checkname in checknames: - make_inventory(checkname, hostnames, False) - - do_cleanup_autochecks() - + do_inventory(hostnames, check_types, seen_I == 1) + done = True if done: output_profile() @@ -5930,10 +5935,13 @@ if __name__ == "__main__": elif (len(args) == 0 and not opt_keepalive) or len(args) > 2: usage() sys.exit(1) + + # handle --keepalive elif opt_keepalive: do_check_keepalive() - else: + # handle adhoc-check + else: hostname = args[0] if len(args) == 2: ipaddress = args[1] @@ -5947,11 +5955,5 @@ if __name__ == "__main__": print "Cannot resolve hostname '%s'." % hostname sys.exit(2) - # honor --checks= also when checking (makes testing easier) - if inventory_checks: - check_types = inventory_checks.split(",") - else: - check_types = None - do_check(hostname, ipaddress, check_types)

10 years, 8 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits