Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64707 discussions

Check_MK Git: check_mk: #1685 enterasys_*: Now supporting device C2G124-48 (Rev 05.02.18.0002)

by Lars Michelsen

Module: check_mk Branch: master Commit: f61e730072c4703438e5264e33ab39902b345e39 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f61e730072c470… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 5 11:56:12 2014 +0100 #1685 enterasys_*: Now supporting device C2G124-48 (Rev 05.02.18.0002) --- .werks/1685 | 9 +++++++++ ChangeLog | 1 + checks/enterasys_cpu_util | 3 ++- checks/enterasys_fans | 3 ++- checks/enterasys_powersupply | 3 ++- checks/enterasys_temp | 3 ++- 6 files changed, 18 insertions(+), 4 deletions(-) diff --git a/.werks/1685 b/.werks/1685 new file mode 100644 index 0000000..5483ca3 --- /dev/null +++ b/.werks/1685 @@ -0,0 +1,9 @@ +Title: enterasys_*: Now supporting device C2G124-48 (Rev 05.02.18.0002) +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.5i7 +Date: 1417776942 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 72c5ca9..3a9e4ac 100644 --- a/ChangeLog +++ b/ChangeLog @@ -58,6 +58,7 @@ * 1599 check_mk_agent.aix: Simple run_cached Feature for plugins... * 1699 Windows agent: new option "file" for writing output into a file... * 1684 cisco_vpn_tunnel: Now supporting VPN 3000 Conncentrator devices + * 1685 enterasys_*: Now supporting device C2G124-48 (Rev 05.02.18.0002) * 1478 FIX: kernel.util, statgrab_cpu: fix computation of utilization... * 1480 FIX: brocade_vdx_status: disable check on some devices that do not support it... * 1485 FIX: dell_om_disks, dell_om_esmlog, dell_om_mem, dell_om_processors, dell_om_sensors: detect more devices... diff --git a/checks/enterasys_cpu_util b/checks/enterasys_cpu_util index e541e2e..f0d9967 100644 --- a/checks/enterasys_cpu_util +++ b/checks/enterasys_cpu_util @@ -43,7 +43,8 @@ check_info["enterasys_cpu_util"] = { "inventory_function" : inventory_enterasys_cpu_util, "service_description" : "CPU util %s", "snmp_info" : ( ".1.3.6.1.4.1.5624.1.2.49.1.1.1.1", [ OID_END, 3 ]), #util in last 1min - "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.5624.2.1"), + "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.5624.2.1") \ + or oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.5624.2.2"), "has_perfdata" : True, "group" : "cpu_utilization_multiitem", "includes" : [ "cpu_util.include" ], diff --git a/checks/enterasys_fans b/checks/enterasys_fans index 55cbae3..4dc8c6f 100644 --- a/checks/enterasys_fans +++ b/checks/enterasys_fans @@ -49,6 +49,7 @@ check_info["enterasys_fans"] = { "inventory_function" : inventory_enterasys_fans, "service_description" : "FAN %s", "snmp_info" : ( ".1.3.6.1.4.1.52.4.3.1.3.1.1", [ OID_END, 2 ]), - "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.5624.2.1"), + "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.5624.2.1") \ + or oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.5624.2.2"), } diff --git a/checks/enterasys_powersupply b/checks/enterasys_powersupply index 90d7712..732723e 100644 --- a/checks/enterasys_powersupply +++ b/checks/enterasys_powersupply @@ -64,6 +64,7 @@ check_info["enterasys_powersupply"] = { "inventory_function" : inventory_enterasys_powersupply, "service_description" : "PSU %s", "snmp_info" : ( ".1.3.6.1.4.1.52.4.3.1.2.1.1", [ OID_END, 2, 3, 4 ]), - "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.5624.2.1"), + "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.5624.2.1") \ + or oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.5624.2.2"), } diff --git a/checks/enterasys_temp b/checks/enterasys_temp index 02186d0..17b2a1d 100644 --- a/checks/enterasys_temp +++ b/checks/enterasys_temp @@ -48,7 +48,8 @@ check_info["enterasys_temp"] = { "service_description" : "Temperature", "has_perfdata" : True, "snmp_info" : ( ".1.3.6.1.4.1.52.4.1.1.8.1", [ 1 ]), # chEnvAmbientTemp - "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.5624.2.1"), + "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.5624.2.1") \ + or oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.5624.2.2"), "group" : "hw_single_temperature", "includes" : [ "temperature.include" ], }

9 years, 10 months

Check_MK Git: check_mk: #1703 FIX ups_test: Fix computation of time since last self test

by Mathias Kettner

Module: check_mk Branch: master Commit: f3c8aaa68bdf43480870137cb3b76e647aa9a55f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f3c8aaa68bdf43… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Dec 5 11:43:56 2014 +0100 #1703 FIX ups_test: Fix computation of time since last self test Instead of the time since the last self test of the battery, the check used the time the last test has lasted. So this check did not trigger an alarm every - just for the summary state of the last test. Thanks for the bug report to Cyril Pawelko! --- .werks/1703 | 13 ++++++++++ ChangeLog | 1 + checks/snmp_uptime | 12 +-------- checks/ups_test | 65 +++++++++++++++++++++++-------------------------- checks/uptime.include | 11 +++++++++ 5 files changed, 56 insertions(+), 46 deletions(-) diff --git a/.werks/1703 b/.werks/1703 new file mode 100644 index 0000000..08f05ef --- /dev/null +++ b/.werks/1703 @@ -0,0 +1,13 @@ +Title: ups_test: Fix computation of time since last self test +Level: 2 +Component: checks +Compatible: compat +Version: 1.2.5i7 +Date: 1417776132 +Class: fix + +Instead of the time since the last self test of the battery, the check used +the time the last test has lasted. So this check did not trigger +an alarm every - just for the summary state of the last test. + +Thanks for the bug report to Cyril Pawelko! diff --git a/ChangeLog b/ChangeLog index 60ba542..05e9e70 100644 --- a/ChangeLog +++ b/ChangeLog @@ -117,6 +117,7 @@ * 1682 FIX: cmciii_lcp_waterflow: Check can now deal with devices with a different setup * 1701 FIX: Correctly show absolute level for CPU load in case of warn/crit... * 1702 FIX: Fix check_notify_count: notification had been counted twice... + * 1703 FIX: ups_test: Fix computation of time since last self test... Multisite: * 1508 Allow input of plugin output and perfdata when faking check results... diff --git a/checks/snmp_uptime b/checks/snmp_uptime index 8cc9ddb..f2dde6b 100644 --- a/checks/snmp_uptime +++ b/checks/snmp_uptime @@ -29,18 +29,8 @@ def inventory_snmp_uptime(info): if len(info) > 0 and len(info[0]) >= 1: return [ (None, {}) ] - def check_snmp_uptime(checktype, params, info): - ticks = info[0][0] - try: - if len(ticks) < 3: - uptime = 0 - else: - uptime = int(ticks[:-2]) - except: - days, h, m, s = ticks.split(":") - uptime = (int(days) * 86400 ) + (int(h) * 3600) + (int(m) * 60) + int(float(s)) - + uptime = parse_snmp_uptime(info[0][0]) return check_uptime_seconds(params, uptime) diff --git a/checks/ups_test b/checks/ups_test index ccbdc59..0324b58 100644 --- a/checks/ups_test +++ b/checks/ups_test @@ -76,58 +76,53 @@ # value of upsTestResultsSummary is noTestsInitiated(6), # upsTestStartTime has the value 0." -# OID: 1.3.6.1.2.1.33.1.7.6 -# Description: -# upsTestElapsedTime OBJECT-TYPE -# SYNTAX TimeInterval -# MAX-ACCESS read-only -# STATUS current -# DESCRIPTION -# "The amount of time, in TimeTicks, since the test in -# progress was initiated, or, if no test is in progress, -# the previous test took to complete. If the value of -# TestResultsSummary is noTestsInitiated(6), -# upsTestElapsedTime has the value 0." - -ups_test_default = ( 0, 0 ) +ups_test_default = (0, 0) def inventory_ups_test(info): - if info: + if info[1]: return [ (None, "ups_test_default") ] def check_ups_test(_no_item, params, info): warn, crit = params - line = info[0] - ResultsSummary, StartTime, ElapsedTime = map(saveint, line[:-1]) - message = line[3] + uptime_info, bat_info = info + ResultsSummary, StartTime, upsTestResultsDetail = bat_info[0] + uptime = parse_snmp_uptime(uptime_info[0][0]) + start_time = parse_snmp_uptime(StartTime) # State of test state = 0 - if ResultsSummary in [ 3, 4 ]: + print ResultsSummary + if ResultsSummary in [ '3', '4' ]: state = 2 - elif ResultsSummary in [ 2, 6 ]: + elif ResultsSummary in [ '2' ]: state = 1 - if message or state: - yield state, message + if upsTestResultsDetail or state: + yield state, upsTestResultsDetail - # Elapsed time - ElapsedTime = ElapsedTime/100 + # Elapsed time since last start of test + elapsed = uptime - start_time state = 0 - if crit and ElapsedTime >= crit * 86400: + if crit and elapsed >= crit * 86400: state = 2 - elif warn and ElapsedTime >= warn * 86400: + elif warn and elapsed >= warn * 86400: state = 1 - yield state, "time elapsed since test: %s" % get_age_human_readable(ElapsedTime) + if start_time: + yield state, "time elapsed since start of last test: %s" % get_age_human_readable(elapsed) + else: + yield state, "no battery test since start of device (%s ago)" % get_age_human_readable(uptime) check_info['ups_test'] = { - "inventory_function" : inventory_ups_test, - "check_function" : check_ups_test, - "service_description" : "Self Test", - "has_perfdata" : False, - "group" : "ups_test", - "snmp_info" : ( ".1.3.6.1.2.1.33.1.7", [ 3, 5, 6, 4 ] ), - "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") in [ ".1.3.6.1.4.1.534.1", ".1.3.6.1.4.1.818.1.100.1.2" ] - + "inventory_function" : inventory_ups_test, + "check_function" : check_ups_test, + "service_description" : "Self Test", + "has_perfdata" : False, + "group" : "ups_test", + "snmp_info" : [ + ('.1.3.6.1.2.1.1', ['3.0']), # sysUptime + ( ".1.3.6.1.2.1.33.1.7", [ 3, 5, 4 ] ), + ], + "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") in [ ".1.3.6.1.4.1.534.1", ".1.3.6.1.4.1.818.1.100.1.2" ], + "includes" : [ 'uptime.include' ], } diff --git a/checks/uptime.include b/checks/uptime.include index 099cb3f..fda4b81 100644 --- a/checks/uptime.include +++ b/checks/uptime.include @@ -25,6 +25,17 @@ # Boston, MA 02110-1301 USA. + +def parse_snmp_uptime(ticks): + try: + if len(ticks) < 3: + return 0 + else: + return int(ticks[:-2]) + except: + days, h, m, s = ticks.split(":") + return (int(days) * 86400 ) + (int(h) * 3600) + (int(m) * 60) + int(float(s)) + # Example for params: # { # "min" : ( 7200, 3600 ), # Minimum required uptime (warn, crit)

9 years, 10 months

Check_MK Git: check_mk: #1702 FIX Fix check_notify_count:

by Mathias Kettner

notification had been counted twice Message-ID: <54817e82.QqxRJnfhZaMvDeRw%mk(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.5 6/20/10 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: 9ae3e0fe1300cfbdf01a1778810ed08bf774c2fd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9ae3e0fe1300cf… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Dec 5 10:44:17 2014 +0100 #1702 FIX Fix check_notify_count: notification had been counted twice The active check for counting the notifications of users have been fixed. The dummy contact <tt>check-mk-notify</tt> is now being handled separately. We make a distinction between raw notifications - notifications created by the monitoring - and user notification - those being sent out to users. Note: in the rule based notifications one raw notification can create several user notifications. Other raw notifcations might create no user notification at all. --- .werks/1702 | 17 +++++++++ ChangeLog | 1 + doc/treasures/active_checks/check_notify_count | 46 +++++++++++++----------- web/plugins/wato/active_checks.py | 2 +- 4 files changed, 45 insertions(+), 21 deletions(-) diff --git a/.werks/1702 b/.werks/1702 new file mode 100644 index 0000000..b244068 --- /dev/null +++ b/.werks/1702 @@ -0,0 +1,17 @@ +Title: Fix check_notify_count: notification had been counted twice +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.5i7 +Date: 1417772551 +Class: fix + +The active check for counting the notifications of users have been fixed. +The dummy contact <tt>check-mk-notify</tt> is now being handled separately. +We make a distinction between raw notifications - notifications created +by the monitoring - and user notification - those being sent out +to users. + +Note: in the rule based notifications one raw notification can create several +user notifications. Other raw notifcations might create no user notification +at all. diff --git a/ChangeLog b/ChangeLog index 78f7ee5..60ba542 100644 --- a/ChangeLog +++ b/ChangeLog @@ -116,6 +116,7 @@ * 1681 FIX: cmciii_lcp_fans: Skipping non FAN units now; cleaned up check * 1682 FIX: cmciii_lcp_waterflow: Check can now deal with devices with a different setup * 1701 FIX: Correctly show absolute level for CPU load in case of warn/crit... + * 1702 FIX: Fix check_notify_count: notification had been counted twice... Multisite: * 1508 Allow input of plugin output and perfdata when faking check results... diff --git a/doc/treasures/active_checks/check_notify_count b/doc/treasures/active_checks/check_notify_count index 423b2a0..d1ae52b 100755 --- a/doc/treasures/active_checks/check_notify_count +++ b/doc/treasures/active_checks/check_notify_count @@ -41,16 +41,16 @@ USAGE: check_notify_count check_notify_count -h OPTIONS: - -h, --help Show this help message and exit - -l PATH Path to livestatus socket (Autodetected in OMD) - -r MINUTES Timerange in the past to observe, given in minutes. - Default is set to 60 minutes. - -w NUM Minumum number of notifications per contact in - timerange to raise a WARNING state. - Disabled by default. - -c NUM Minumum number of notifications per contact in - timerange to raise a CRITICAL state. - Disabled by default. + -h, --help Show this help message and exit + -l PATH Path to livestatus socket (Autodetected in OMD) + -r MINUTES Timerange in the past to observe, given in minutes. + Default is set to 60 minutes. + -w NUM Minumum number of notifications per contact in + timerange to raise a WARNING state. + Disabled by default. + -c NUM Minumum number of notifications per contact in + timerange to raise a CRITICAL state. + Disabled by default. """) @@ -104,19 +104,25 @@ total_num = 0 perfdata = [] state = 0 details = [] + +num_users = 0 +raw_notifications = 0 for contact_name, num in c.query_table(query): - total_num += num + if contact_name == "check-mk-notify": + raw_notifications += num + else: + total_num += num + + if crit != None and num > crit: + state = max(state, 2) + details.append('%s got %d (> %d)(!!)' % (contact_name, num, crit)) - if crit != None and num > crit: - state = max(state, 2) - details.append('%s got %d (>%d) (!!)' % (contact_name, num, crit)) - elif warn != None and num > warn: - state = max(state, 1) - details.append('%s got %d (>%d) (!)' % (contact_name, num, warn)) + elif warn != None and num > warn: + state = max(state, 1) + details.append('%s got %d (> %d)(!)' % (contact_name, num, warn)) perfdata.append('%s_num=%d' % (contact_name, num)) detail_txt = details and ' (%s)' % ', '.join(details) or '' -sys.stdout.write('%d notifications within last %d minutes%s | %s\n' % - (total_num, timerange, detail_txt, ' '.join(perfdata))) -sys.exit(0) +sys.stdout.write('%d raw notifications, %d user notifications within last %d minutes%s | %s\n' % + (raw_notifications, total_num, timerange, detail_txt, ' '.join(perfdata))) diff --git a/web/plugins/wato/active_checks.py b/web/plugins/wato/active_checks.py index 8def316..cea3cc4 100644 --- a/web/plugins/wato/active_checks.py +++ b/web/plugins/wato/active_checks.py @@ -1387,7 +1387,7 @@ register_rule(group, "log file of your monitoring core."), elements = [ TextUnicode( - title = _("Name"), + title = _("Service Description"), help = _("The name that will be used in the service description"), allow_empty = False ),

9 years, 10 months

Check_MK Git: check_mk: #1701 FIX Correctly show absolute level for CPU load in case of warn/crit

by Mathias Kettner

Module: check_mk Branch: master Commit: e1e73713a3b3bc0c75fab1b2ab3831509c6e3bb5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e1e73713a3b3bc… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Dec 5 10:27:25 2014 +0100 #1701 FIX Correctly show absolute level for CPU load in case of warn/crit In the check parameters of the CPU load check the levels are given in load per Core. The check plugin output displayed this as level, but this was confusing. Now the absolute level is being displayed instead. --- .werks/1701 | 11 +++++++++++ ChangeLog | 1 + modules/check_mk_base.py | 8 ++++---- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/.werks/1701 b/.werks/1701 new file mode 100644 index 0000000..0e77722 --- /dev/null +++ b/.werks/1701 @@ -0,0 +1,11 @@ +Title: Correctly show absolute level for CPU load in case of warn/crit +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.5i7 +Date: 1417771579 +Class: fix + +In the check parameters of the CPU load check the levels are given in +load per Core. The check plugin output displayed this as level, but +this was confusing. Now the absolute level is being displayed instead. diff --git a/ChangeLog b/ChangeLog index 428995a..78f7ee5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -115,6 +115,7 @@ * 1679 FIX: ups_bat_temp: Now skipping sensors which are reported to have 0 upsBatteryTemperature * 1681 FIX: cmciii_lcp_fans: Skipping non FAN units now; cleaned up check * 1682 FIX: cmciii_lcp_waterflow: Check can now deal with devices with a different setup + * 1701 FIX: Correctly show absolute level for CPU load in case of warn/crit... Multisite: * 1508 Allow input of plugin output and perfdata when faking check results... diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index c4cec73..00008af 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -1725,18 +1725,18 @@ def check_levels(value, dsname, params, unit="", factor=1.0, scale=1.0, statemar # Critical cases if crit_upper != None and value >= crit_upper: state = 2 - infotexts.append("critical level at %.2f%s" % (crit_upper / factor / scale, unit)) + infotexts.append("critical level at %.2f%s" % (crit_upper / scale, unit)) elif crit_lower != None and value <= crit_lower: state = 2 - infotexts.append("too low: critical level at %.2f%s" % (crit_lower / factor / scale, unit)) + infotexts.append("too low: critical level at %.2f%s" % (crit_lower / scale, unit)) # Warning cases elif warn_upper != None and value >= warn_upper: state = 1 - infotexts.append("warning level at %.2f%s" % (warn_upper / factor / scale, unit)) + infotexts.append("warning level at %.2f%s" % (warn_upper / scale, unit)) elif warn_lower != None and value <= warn_lower: state = 1 - infotexts.append("too low: warning level at %.2f%s" % (warn_lower / factor / scale, unit)) + infotexts.append("too low: warning level at %.2f%s" % (warn_lower / scale, unit)) # OK else:

9 years, 10 months

Check_MK Git: check_mk: #1700 Enable icon for link to host/

by Mathias Kettner

service parameters per default now Message-ID: <54817980.eNmkKY27iSOWracc%mk(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.5 6/20/10 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: f230ee1cd5cd07b2ac171929e351f876954eb6d4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f230ee1cd5cd07… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Dec 5 10:22:28 2014 +0100 #1700 Enable icon for link to host/service parameters per default now Also let it point to the general configuration page of that host/service, not to its check parameters. Now also active checks and hosts have this icon. --- .werks/1700 | 10 ++++++++++ ChangeLog | 1 + web/plugins/config/builtin.py | 2 +- web/plugins/icons/builtin.py | 23 ++++++++++++----------- web/plugins/wato/check_mk_configuration.py | 2 +- 5 files changed, 25 insertions(+), 13 deletions(-) diff --git a/.werks/1700 b/.werks/1700 new file mode 100644 index 0000000..8bc0a01 --- /dev/null +++ b/.werks/1700 @@ -0,0 +1,10 @@ +Title: Enable icon for link to host/service parameters per default now +Level: 2 +Component: multisite +Compatible: compat +Version: 1.2.5i7 +Date: 1417771306 +Class: feature + +Also let it point to the general configuration page of that host/service, not +to its check parameters. Now also active checks and hosts have this icon. diff --git a/ChangeLog b/ChangeLog index 1ca3481..303736f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -127,6 +127,7 @@ * 1558 Better visualize manually changed notification enable/disable * 1621 Sorting Check_MK* services always on top of services lists * 1636 Crash checks now have an icon for viewing and sending a crash dump... + * 1700 Enable icon for link to host/service parameters per default now... * 1164 FIX: Fixed links from servicegroup overviews to single servicegroups * 1166 FIX: Also prevting stylesheet update issues during version updates (just like for JS files) * 1481 FIX: Fix broken layout of Host-, Service- and Contactgroup filters diff --git a/web/plugins/config/builtin.py b/web/plugins/config/builtin.py index 255f37d..11f4b2a 100644 --- a/web/plugins/config/builtin.py +++ b/web/plugins/config/builtin.py @@ -192,7 +192,7 @@ auth_by_http_header = False table_row_limit = 100 # Add an icon pointing to the WATO rule to each service -multisite_draw_ruleicon = False +multisite_draw_ruleicon = True # Default downtime configuration adhoc_downtime = {} diff --git a/web/plugins/icons/builtin.py b/web/plugins/icons/builtin.py index 97fc581..86eafcb 100644 --- a/web/plugins/icons/builtin.py +++ b/web/plugins/icons/builtin.py @@ -118,18 +118,19 @@ multisite_icons.append({ def paint_rule_editor(what, row, tags, custom_vars): - if config.may("wato.rulesets") and config.multisite_draw_ruleicon: + if config.wato_enabled and config.may("wato.rulesets") and config.multisite_draw_ruleicon: + urlvars = [("mode", "object_parameters"), + ("host", row["host_name"])] + if what == 'service': - check_command = row["service_check_command"] - if check_command.startswith("check_mk-") or \ - check_command.startswith("check_mk_active-"): - url = html.makeuri_contextless( [("mode", "edit_ruleset"), - ("check_command", row["service_check_command"]), - ("service_description", row["service_description"]), - ("host", row["host_name"])], "wato.py") - title = _("Edit check parameters for this service") - return '<a href="%s"><img title="%s" class=icon src="images/icon_rulesets.png"></a>' % \ - (url, title) + urlvars.append(("service", row["service_description"])) + title = _("View and edit parameters for this service") + else: + title = _("View and edit parameters for this host") + + url = html.makeuri_contextless(urlvars, "wato.py") + return '<a href="%s"><img title="%s" class=icon src="images/icon_rulesets.png"></a>' % \ + (url, title) multisite_icons.append({ 'service_columns': [ 'description', 'check_command', "host_name" ], diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index 03df040..626e839 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -240,7 +240,7 @@ register_configvar(group, help = _("When enabled a rule editor icon is displayed for each " "service in the multisite views. It is only displayed if the user " "does have the permission to edit rules."), - default_value = False), + default_value = True), domain = "multisite")

9 years, 10 months

Check_MK Git: check_mk: Fixed debug statements

by Lars Michelsen

Module: check_mk Branch: master Commit: 84e04f13e645d41ba5c10ea8cf724cd99d9ef027 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=84e04f13e645d4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 5 09:58:22 2014 +0100 Fixed debug statements --- checks/cmciii_lcp_fans | 2 -- 1 file changed, 2 deletions(-) diff --git a/checks/cmciii_lcp_fans b/checks/cmciii_lcp_fans index ee884b5..fddc64d 100644 --- a/checks/cmciii_lcp_fans +++ b/checks/cmciii_lcp_fans @@ -42,10 +42,8 @@ def check_cmciii_lcp_fans(item, params, info): lowlevel = int(re.sub(" .*$", "", info[0][0])) # global low warning parts = [ info[0][x+1:x+4] for x in range(0, len(info[0]), 4) ] - print parts for i, (name, value, status) in enumerate(parts): if item == i: - print value rpm, unit = value.split(" ", 1) rpm = int(rpm)

9 years, 10 months

Check_MK Git: check_mk: #1682 FIX cmciii_lcp_waterflow: Check can now deal with devices with a different setup

by Lars Michelsen

Module: check_mk Branch: master Commit: f37c8064a9874686a85dc04c4fb47677ce0cc78d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f37c8064a98746… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 5 09:41:20 2014 +0100 #1682 FIX cmciii_lcp_waterflow: Check can now deal with devices with a different setup --- .werks/1682 | 9 +++++++++ ChangeLog | 1 + checks/cmciii_lcp_fans | 4 +++- checks/cmciii_lcp_waterflow | 28 +++++++++++++++++----------- 4 files changed, 30 insertions(+), 12 deletions(-) diff --git a/.werks/1682 b/.werks/1682 new file mode 100644 index 0000000..bd516f7 --- /dev/null +++ b/.werks/1682 @@ -0,0 +1,9 @@ +Title: cmciii_lcp_waterflow: Check can now deal with devices with a different setup +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.5i7 +Date: 1417768851 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 1ca3481..730a68d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -114,6 +114,7 @@ * 1677 FIX: f5_bigip_interfaces: Cleaned up check a bit * 1679 FIX: ups_bat_temp: Now skipping sensors which are reported to have 0 upsBatteryTemperature * 1681 FIX: cmciii_lcp_fans: Skipping non FAN units now; cleaned up check + * 1682 FIX: cmciii_lcp_waterflow: Check can now deal with devices with a different setup Multisite: * 1508 Allow input of plugin output and perfdata when faking check results... diff --git a/checks/cmciii_lcp_fans b/checks/cmciii_lcp_fans index 136db3a..ee884b5 100644 --- a/checks/cmciii_lcp_fans +++ b/checks/cmciii_lcp_fans @@ -32,7 +32,7 @@ def inventory_cmciii_lcp_fans(info): # water cooling. Filter them out. parts = [ info[0][x+1:x+4] for x in range(0, len(info[0]), 4) ] for i, (name, value, status) in enumerate(parts): - if status != "off" and 'Water' not in name: + if status != "off" and 'FAN' in name: # FIXME: Why not use the unique name? Maybe recode inventory.append((i+1 , None)) return inventory @@ -42,8 +42,10 @@ def check_cmciii_lcp_fans(item, params, info): lowlevel = int(re.sub(" .*$", "", info[0][0])) # global low warning parts = [ info[0][x+1:x+4] for x in range(0, len(info[0]), 4) ] + print parts for i, (name, value, status) in enumerate(parts): if item == i: + print value rpm, unit = value.split(" ", 1) rpm = int(rpm) diff --git a/checks/cmciii_lcp_waterflow b/checks/cmciii_lcp_waterflow index 25daa31..36cab53 100644 --- a/checks/cmciii_lcp_waterflow +++ b/checks/cmciii_lcp_waterflow @@ -30,28 +30,34 @@ def inventory_cmciii_lcp_waterflow(info): def check_cmciii_lcp_waterflow(item, params, info): if info[0]: - name = info[0][0] - status = info[0][4] - flow = float(info[0][1].split(" ")[0]) - unit = info[0][1].split(" ")[1] - minflow= float(info[0][3].split(" ")[0]) - maxflow = float(info[0][2].split(" ")[0]) + # We have a list of values where no item has a fixed index. We + # try to detect the starting index for the needed values now. + try: + index = info[0].index('Waterflow') + name, flow, maxflow, minflow, status = info[0][index:index+5] + except ValueError: + return 3, 'Waterflow information not found' + + unit = flow.split(" ", 1)[1] + flow = float(flow.split(" ", 1)[0]) + minflow = float(minflow.split(" ", 1)[0]) + maxflow = float(maxflow.split(" ", 1)[0]) sym = "" - if status.lower() != "ok": + state = 0 + if status != "OK": state = 2 + sym = "(!!)" elif flow < minflow or flow > maxflow: state = 1 sym = "(!)" - else: - state = 0 info_text = "%s Status: %s Flow: %.1f%s, MinFlow: %.1f, MaxFLow: %.1f" \ % (name, status, flow, sym, minflow, maxflow) perfdata = [ ("flow", str(flow)+unit , str(minflow)+":"+str(maxflow), 0, 0 ) ] - return (state, info_text, perfdata) + return state, info_text, perfdata return (3, "no SNMP data found") @@ -61,5 +67,5 @@ check_info['cmciii_lcp_waterflow'] = { "has_perfdata" : True, "service_description" : "LCP Fanunit WATER FLOW", "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.1.0").startswith("Rittal LCP"), - "snmp_info" : ( '.1.3.6.1.4.1.2606.7.4.2.2.1.10.2', range(82, 87)), + "snmp_info" : ( '.1.3.6.1.4.1.2606.7.4.2.2.1.10.2', range(74, 87)), }

9 years, 10 months

Check_MK Git: check_mk: Fixed shortly introduced bug when creating service rules

by Lars Michelsen

Module: check_mk Branch: master Commit: 572454ad448e6b7aff20cdfa2e57d6d957b68c11 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=572454ad448e6b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 5 09:56:33 2014 +0100 Fixed shortly introduced bug when creating service rules --- web/htdocs/wato.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index b6742cd..fd5e4e3 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -14670,7 +14670,9 @@ def mode_edit_rule(phase, new = False): host = html.var("host") item = html.has_var("item") and mk_eval(html.var("item")) or NO_ITEM try: - rule = create_rule(rulespec, host, escape_regex_chars(item)) + if item != NO_ITEM: + item = escape_regex_chars(item) + rule = create_rule(rulespec, host, item) except Exception, e: if phase != "action": html.message(_("Cannot create rule: %s") % e)

9 years, 10 months

Check_MK Git: check_mk: Try to fix check_sql for Python 2.6 installations

by Mathias Kettner

Module: check_mk Branch: master Commit: dd4fdc1dc3770feb19f31dc1fae72521091e026b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dd4fdc1dc3770f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Dec 5 09:46:42 2014 +0100 Try to fix check_sql for Python 2.6 installations --- doc/treasures/active_checks/check_sql | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/treasures/active_checks/check_sql b/doc/treasures/active_checks/check_sql index 846085e..51b7aa3 100755 --- a/doc/treasures/active_checks/check_sql +++ b/doc/treasures/active_checks/check_sql @@ -171,6 +171,7 @@ try: database=opt_name, user=opt_user, password=opt_password ) elif opt_dbms == "oracle": + sys.path.append('/usr/lib/python2.6/site-packages') sys.path.append('/usr/lib/python2.7/site-packages') import cx_Oracle db = cx_Oracle

9 years, 10 months

Check_MK Git: check_mk: recompiled windows agent

by Andreas Boesl

Module: check_mk Branch: master Commit: 99157727cabf8d44663b61427b516b6a4bebace5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=99157727cabf8d… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Dec 5 09:42:26 2014 +0100 recompiled windows agent --- agents/windows/build_version | 2 +- agents/windows/check_mk_agent-64.exe | Bin 209920 -> 209920 bytes agents/windows/check_mk_agent-64.unversioned.exe | Bin 209920 -> 209920 bytes agents/windows/check_mk_agent.cc | 1 - agents/windows/check_mk_agent.exe | Bin 178688 -> 178688 bytes agents/windows/check_mk_agent.unversioned.exe | Bin 178688 -> 178688 bytes agents/windows/install_agent-64.exe | Bin 160530 -> 160521 bytes agents/windows/install_agent.exe | Bin 157471 -> 157440 bytes 8 files changed, 1 insertion(+), 2 deletions(-) diff --git a/agents/windows/build_version b/agents/windows/build_version index 257e563..b16e5f7 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -102 +104 diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe index 09c02af..e81bc5d 100755 Binary files a/agents/windows/check_mk_agent-64.exe and b/agents/windows/check_mk_agent-64.exe differ diff --git a/agents/windows/check_mk_agent-64.unversioned.exe b/agents/windows/check_mk_agent-64.unversioned.exe index 518d6c5..8392ab5 100755 Binary files a/agents/windows/check_mk_agent-64.unversioned.exe and b/agents/windows/check_mk_agent-64.unversioned.exe differ diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index 0abd14c..cc73328 100755 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -4428,7 +4428,6 @@ void do_test() SOCKET dummy; open_crash_log(); crash_log("Started in test mode."); - output(dummy, "Enabld: %08x\n", enabled_sections); output_data(dummy); close_crash_log(); } diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index 1c98882..ba7960a 100755 Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe differ diff --git a/agents/windows/check_mk_agent.unversioned.exe b/agents/windows/check_mk_agent.unversioned.exe index 8641d58..f31adbb 100755 Binary files a/agents/windows/check_mk_agent.unversioned.exe and b/agents/windows/check_mk_agent.unversioned.exe differ diff --git a/agents/windows/install_agent-64.exe b/agents/windows/install_agent-64.exe index 3d7ffdc..26d6bd5 100755 Binary files a/agents/windows/install_agent-64.exe and b/agents/windows/install_agent-64.exe differ diff --git a/agents/windows/install_agent.exe b/agents/windows/install_agent.exe index 6fbe61d..247575e 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ

9 years, 10 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits