Checkmk git commits March 2011

checkmk-commits@lists.checkmk.com

3 participants
205 discussions

Check_MK Git: check_mk: bi aggregations: Fixed IE8 rendering problem

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: b6c12242cdd7dfaecd862371436e2b8d09f7c1a4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b6c12242cdd7df… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Mar 11 11:45:17 2011 +0100 bi aggregations: Fixed IE8 rendering problem --- web/htdocs/check_mk.css | 25 ++++++++++--------------- web/plugins/views/bi.py | 4 ++-- 2 files changed, 12 insertions(+), 17 deletions(-) diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index e5c7351..dfd8329 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -1793,13 +1793,6 @@ div.wato { */ -.aggrtree ul.title { - padding-left: 0px; - margin-top: 2px; - margin-bottom: 0px; - padding-top: 0px; -} - .aggrtree ul.subtree { margin-left: 34px; padding-bottom: 3px; @@ -1820,23 +1813,28 @@ tr.even0 .aggrtree ul.subtree { border-color: #aaa; } .aggrtree ul.subtree li { + margin: 0; + padding: 0; margin-top: 2px; - padding-top: 1px; + /*padding-top: 1px;*/ padding-bottom: 1px; } .aggrtree span.state { margin-right: 3px; width: 34px; - padding: 0px 0px; + padding: 0; text-align: center; -moz-border-radius: 3px; border-style: solid; border-width: 1px; border-color: #eee #888 #999 #ccc; - float: none; font-weight: bold; - display: inline-block; + + display:-moz-inline-stack; + display:inline-block; + zoom:1; + *display:inline; } .aggrtree img.assumption { @@ -1863,10 +1861,7 @@ tr.even0 .aggrtree ul.subtree { height: 15px; margin-right: 2px; margin-left: 0px; - vertical-align: middle; - position: relative; - top: -1px; - left: -1px; + vertical-align:middle; } table.services td.aggrtree { diff --git a/web/plugins/views/bi.py b/web/plugins/views/bi.py index 0a8ab02..98c5e43 100644 --- a/web/plugins/views/bi.py +++ b/web/plugins/views/bi.py @@ -246,7 +246,7 @@ def paint_aggr_tree_foldable(row): if nodes == None: return aggr_render_leaf(tree, show_host) else: - h = '<ul class=title>' + h = '<span class=title>' path_id = "/".join(path) is_open = treestate.get(path_id) @@ -269,7 +269,7 @@ def paint_aggr_tree_foldable(row): continue h += '<li>' + render_subtree(node, path + [node[2]], show_host) + '</li>\n' - return h + '</ul></ul>\n' + return h + '</ul></span>\n' tree = row["aggr_treestate"] if only_problems:

13 years, 3 months

Check_MK Git: check_mk: cisco_locif: The check has been removed. Please switch to if/if64

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 8ea7c9c70c0d136e80e993ffd6594801e4aa6b38 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8ea7c9c70c0d13… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Mar 10 12:55:25 2011 +0100 cisco_locif: The check has been removed. Please switch to if/if64 --- ChangeLog | 3 ++- checks/cisco_locif | 28 +++------------------------- 2 files changed, 5 insertions(+), 26 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4d59b44..08162ee 100644 --- a/ChangeLog +++ b/ChangeLog @@ -8,7 +8,8 @@ Checks & Agents: * printer_supply: Changed order of tests. When a printer reports -3 this is used before the check if maxlevel is -2. - * cisco_locif: Added snmp scan function + * cisco_locif: The check has been removed. Please switch to if/if64 + 1.1.10: Core, Setup, etc.: diff --git a/checks/cisco_locif b/checks/cisco_locif index 82bc517..df08937 100644 --- a/checks/cisco_locif +++ b/checks/cisco_locif @@ -26,31 +26,10 @@ def inventory_cisco_locif(checkname, info): - # line[0] => cdpInterfaceName, like "GigabitEthernet1/17" - # line[1] => locIfLineProt, 1 or 0 - # line[4] => locIfDescr - inventory = [] - for line in info: - item = line[0] != '' and line[0] or line[5] - descr = line[4] != '' and line[4] or line[5] - if line[1] == '1': - inventory.append((item, descr, '""')) - return inventory + pass def check_cisco_locif(item, params, info): - for line in info: - this_item = line[0] != '' and line[0] or line[5] - if this_item == item: - input_rate = int(line[2]) - output_rate = int(line[3]) - perfdata = [ ("input_rate", input_rate), - ("output_rate", output_rate) ] - if line[1] == '1': - return(0, "OK - %s" % line[4], perfdata) - else: - return(2, "CRIT - %s has no link" % line[4], perfdata) - - return (3, 'UNKNOWN - Port %s ("%s") not found in SNMP data' % (item, line[4])) + return (3, 'UNKNOWN - The cisco_locif check has been removed. Please switch to either if or if64 checks') check_info['cisco_locif'] = (check_cisco_locif, "Port %s", 1, inventory_cisco_locif) snmp_info['cisco_locif'] = ( ".1.3.6.1.4.1.9", @@ -61,5 +40,4 @@ snmp_info['cisco_locif'] = ( ".1.3.6.1.4.1.9", "2.2.1.1.28", # OLD-CISCO-INTERFACES-MIB::locIfDescr OID_END ] ) -snmp_scan_functions['cisco_fan'] = \ - lambda oid: "cisco" in oid(".1.3.6.1.2.1.1.1.0").lower() +snmp_scan_functions['cisco_fan'] = False

13 years, 3 months

Check_MK Git: check_mk: Merge branch 'master' of ssh://git.mathias-kettner. de/var/www/80/git.mathias-kettner.de/check_mk

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: d303d773ba90790619e3f00aaa321a7286cae70b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d303d773ba9079… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Mar 11 11:48:09 2011 +0100 Merge branch 'master' of ssh://git.mathias-kettner.de/var/www/80/git.mathias-kettner.de/check_mk Conflicts: ChangeLog web/.f12 ---

13 years, 3 months

Check_MK Git: check_mk: Updated .f12 files

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: bf71d13915871d8b6d637da85dec17cf3f75cd0e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bf71d13915871d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Mar 11 11:46:53 2011 +0100 Updated .f12 files --- livestatus/.f12 | 10 ++++++++++ web/.f12 | 4 ++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/livestatus/.f12 b/livestatus/.f12 index b97463d..c869c87 100755 --- a/livestatus/.f12 +++ b/livestatus/.f12 @@ -1,3 +1,13 @@ #!/bin/sh set -e +if [ ! -f configure ]; then + aclocal && autoheader && automake -a && autoconf +fi + +if [ ! -f Makefile ]; then + ./configure +fi + make -j 8 + +sudo cp src/livestatus.o /omd/versions/default/lib/mk-livestatus/livestatus.o diff --git a/web/.f12 b/web/.f12 index db917a1..a74b705 100644 --- a/web/.f12 +++ b/web/.f12 @@ -1,2 +1,2 @@ -sudo cp -prv * ~bi/local/share/check_mk/web/ -sudo su - -c 'omd restart bi apache' +sudo cp -prv * /omd/versions/default/share/check_mk/web/ +sudo su - -c 'omd restart muc apache'

13 years, 3 months

Check_MK Git: check_mk: Updated snmp scan function of h3c_lanswitch_* checks

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 609ef254b882b73740ab65199a96cedd6bba1700 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=609ef254b882b7… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Mar 10 11:53:34 2011 +0100 Updated snmp scan function of h3c_lanswitch_* checks --- checks/h3c_lanswitch_cpu | 2 +- checks/h3c_lanswitch_sensors | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/checks/h3c_lanswitch_cpu b/checks/h3c_lanswitch_cpu index 82df496..173a393 100644 --- a/checks/h3c_lanswitch_cpu +++ b/checks/h3c_lanswitch_cpu @@ -95,4 +95,4 @@ snmp_info["h3c_lanswitch_cpu"] = \ # just a rough match that will handle most devices. snmp_scan_functions["h3c_lanswitch_cpu"] = \ - lambda oid: oid(".1.3.6.1.2.1.1.1.0").lower().startswith('3com s') + lambda oid: '3com s' in oid(".1.3.6.1.2.1.1.1.0").lower() diff --git a/checks/h3c_lanswitch_sensors b/checks/h3c_lanswitch_sensors index 64c18b8..23bb453 100644 --- a/checks/h3c_lanswitch_sensors +++ b/checks/h3c_lanswitch_sensors @@ -69,4 +69,4 @@ snmp_info["h3c_lanswitch_sensors"] = \ snmp_scan_functions["h3c_lanswitch_sensors"] = \ - lambda oid: "3com switch 5500" in oid (".1.3.6.1.2.1.1.1.0").lower() + lambda oid: '3com s' in oid(".1.3.6.1.2.1.1.1.0").lower()

13 years, 3 months

Check_MK Git: check_mk: Added snmp scan function to cisco_locif check

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 49ebd96467d0b771b2998921f76b97b82d215bed URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=49ebd96467d0b7… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Mar 10 08:54:38 2011 +0100 Added snmp scan function to cisco_locif check --- ChangeLog | 1 + checks/cisco_locif | 3 +++ 2 files changed, 4 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index b385c79..4d59b44 100644 --- a/ChangeLog +++ b/ChangeLog @@ -8,6 +8,7 @@ Checks & Agents: * printer_supply: Changed order of tests. When a printer reports -3 this is used before the check if maxlevel is -2. + * cisco_locif: Added snmp scan function 1.1.10: Core, Setup, etc.: diff --git a/checks/cisco_locif b/checks/cisco_locif index d59aace..82bc517 100644 --- a/checks/cisco_locif +++ b/checks/cisco_locif @@ -60,3 +60,6 @@ snmp_info['cisco_locif'] = ( ".1.3.6.1.4.1.9", "2.2.1.1.8", # OLD-CISCO-INTERFACES-MIB::locIfOutBitsSec "2.2.1.1.28", # OLD-CISCO-INTERFACES-MIB::locIfDescr OID_END ] ) + +snmp_scan_functions['cisco_fan'] = \ + lambda oid: "cisco" in oid(".1.3.6.1.2.1.1.1.0").lower()

13 years, 3 months

Check_MK Git: check_mk: New config option check_submission

by mk＠mathias-kettner.de

Module: check_mk Branch: master Commit: 3231b35c76e1636da959d50ccb4c1b917fa74b91 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3231b35c76e163… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Mar 10 17:42:01 2011 +0100 New config option check_submission --- .bugs/39 | 11 ++++-- ChangeLog | 3 ++ modules/check_mk.py | 8 +++- modules/check_mk_base.py | 80 ++++++++++++++++++++++++++++++++++++---------- scripts/autodetect.py | 6 +++- scripts/setup.sh | 7 +++- 6 files changed, 91 insertions(+), 24 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=3231b35c76…

13 years, 3 months

Check_MK Git: check_mk: FIX: setup.sh: fix optical output of summary

by mk＠mathias-kettner.de

Module: check_mk Branch: master Commit: 975b8dd0705611ca7d14cec7d34ceec3137a7f15 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=975b8dd0705611… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Mar 10 17:33:09 2011 +0100 FIX: setup.sh: fix optical output of summary --- scripts/setup.sh | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/setup.sh b/scripts/setup.sh index c1600f5..fb93c21 100755 --- a/scripts/setup.sh +++ b/scripts/setup.sh @@ -285,19 +285,19 @@ files here (currently only the logwatch extension needs a configuration file)" ask_title "Integration with Nagios" -ask_dir -d nagiosuser nagios $(id -un) $OMD_SITE "Name of Nagios user" \ +ask_dir -d nagiosuser nagios $(id -un) "$OMD_SITE" "Name of Nagios user" \ "The working directory for check_mk contains several subdirectories that need to be writable by the Nagios user (which is running check_mk in check mode). Please specify the user that should own those directories" -ask_dir -d wwwuser www-data www-data $OMD_SITE "User of Apache process" \ +ask_dir -d wwwuser www-data www-data "$OMD_SITE" "User of Apache process" \ "Check_MK WATO (Web Administration Tool) needs a sudo configuration, such that Apache can run certain commands as $(id -un). If you specify the correct user of the apache process here, then we can create a valid sudo configuration for you later:" -ask_dir -d wwwgroup nagios $(id -un) $OMD_SITE "Common group of Nagios+Apache" \ +ask_dir -d wwwgroup nagios $(id -un) "$OMD_SITE" "Common group of Nagios+Apache" \ "Check_mk creates files and directories while running as $nagiosuser. Some of those need to be writable by the user that is running the webserver. Therefore a group is needed in which both Nagios and the webserver are

13 years, 3 months

Check_MK Git: check_mk: Updated bug entries

by mk＠mathias-kettner.de

Module: check_mk Branch: master Commit: 8f451955eba518a3bcd8c3900c40522c4dd43ba6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8f451955eba518… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Mar 10 13:47:05 2011 +0100 Updated bug entries --- .bugs/171 | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.bugs/171 b/.bugs/171 index 5f32b36..7f62105 100644 --- a/.bugs/171 +++ b/.bugs/171 @@ -1,10 +1,11 @@ Title: SNMP scan should be able to use snmpgetnext Component: core +State: done +Class: feature +Date: 2011-03-02 10:27:12 Benefit: 2 -State: open Cost: 3 -Date: 2011-03-02 10:27:12 -Class: feature +Fun: 0 In some cases the scan-function does not work well because the OID it asks is unclear. Here might be a solution: @@ -22,3 +23,7 @@ OID it asks is unclear. Here might be a solution: > Das duerfte das patchen in grenzen halten und sonst hoffentlich nichts > kaputt machen. + +2011-03-10 13:47:01: changed state open -> done +Is now done with oid(".1.3.6.1.4.1.9.9.13.1.3.1.3.*"). Also +works with stored walks.

13 years, 3 months

Check_MK Git: check_mk: snmp scanning handles now cases with dynamic indices

by mk＠mathias-kettner.de

Module: check_mk Branch: master Commit: a2af39acd90529faf92412e2ee2df49d0f071824 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a2af39acd90529… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Mar 10 13:46:21 2011 +0100 snmp scanning handles now cases with dynamic indices --- ChangeLog | 11 ++++++++++- checks/cisco_temp | 2 +- checks/cisco_temp_perf | 2 +- checks/if | 3 ++- checks/if64 | 2 +- modules/check_mk.py | 25 +++++++++++++++++++------ modules/snmp.py | 12 +++++++++++- 7 files changed, 45 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5f3498b..25a86fc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,8 @@ 1.1.11i1: + Core, Setup, etc.: + * SNMP scan functions can now call oid(".1.3.6.1.4.1.9.9.13.1.3.1.3.*") + That will return the *first* OID beginning with .1.3.6.1.4.1.9.9.13.1.3.1.3 + Multisite: * Added snmp_uptime and uptime perfometers @@ -10,7 +14,12 @@ Checks & Agents: * printer_supply: Changed order of tests. When a printer reports -3 this - is used before the check if maxlevel is -2. + is used before the check if maxlevel is -2. + * if/if64: scan function now also detects devices where the first port + has not the index 1 + * cisco_temp/cisco_temp_perf: scan function handles sensors not beginning + with index 1 + 1.1.10: Core, Setup, etc.: diff --git a/checks/cisco_temp b/checks/cisco_temp index 6b88e2c..5232e4e 100644 --- a/checks/cisco_temp +++ b/checks/cisco_temp @@ -85,4 +85,4 @@ snmp_info["cisco_temp"] = \ snmp_scan_functions["cisco_temp"] = \ lambda oid: "cisco" in oid(".1.3.6.1.2.1.1.1.0").lower() and \ - not oid(".1.3.6.1.4.1.9.9.13.1.3.1.3.1") + not oid(".1.3.6.1.4.1.9.9.13.1.3.1.3.*") diff --git a/checks/cisco_temp_perf b/checks/cisco_temp_perf index 6111589..aa042ae 100644 --- a/checks/cisco_temp_perf +++ b/checks/cisco_temp_perf @@ -85,4 +85,4 @@ check_info['cisco_temp_perf'] = (check_cisco_temp_perf, "%s", 1, inventory_cisc snmp_info['cisco_temp_perf'] = ( ".1.3.6.1.4.1.9.9.13.1.3.1", [ 2, 3, 4, 6 ] ) # CISCO-SMI snmp_scan_functions['cisco_temp_perf'] = \ lambda oid: "cisco" in oid(".1.3.6.1.2.1.1.1.0").lower() and \ - oid(".1.3.6.1.4.1.9.9.13.1.3.1.3.1") != None + oid(".1.3.6.1.4.1.9.9.13.1.3.1.3.*") != None diff --git a/checks/if b/checks/if index 3a35a55..1e9ffc3 100644 --- a/checks/if +++ b/checks/if @@ -61,4 +61,5 @@ snmp_info['if'] = \ # check if number of network interfaces (IF-MIB::ifNumber.0) is at least 2 snmp_scan_functions['if'] = \ - lambda oid: saveint(oid(".1.3.6.1.2.1.2.1.0")) >= 2 and not oid('.1.3.6.1.2.1.31.1.1.1.6.1') # use if64 if possible + lambda oid: saveint(oid(".1.3.6.1.2.1.2.1.0")) >= 2 and \ + not oid('.1.3.6.1.2.1.31.1.1.1.6.*') # use if64 if possible diff --git a/checks/if64 b/checks/if64 index 6797c24..6fa29a2 100644 --- a/checks/if64 +++ b/checks/if64 @@ -58,4 +58,4 @@ snmp_info['if64'] = \ # check if number of network interfaces (IF-MIB::ifNumber.0) is at least 2 snmp_scan_functions['if64'] = \ - lambda oid: not not oid(".1.3.6.1.2.1.31.1.1.1.6.1") + lambda oid: oid(".1.3.6.1.2.1.31.1.1.1.6.*") != None diff --git a/modules/check_mk.py b/modules/check_mk.py index bd5f730..b5d1ee8 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -514,9 +514,6 @@ def aggregated_service_name(hostname, servicedesc): # Returns command lines for snmpwalk and snmpget including # options for authentication. This handles communities and # authentication for SNMP V3. Also bulkwalk hosts -def snmp_get_command(hostname): - return snmp_base_command('get', hostname) - def snmp_walk_command(hostname): return snmp_base_command('walk', hostname) @@ -537,6 +534,8 @@ def snmp_base_command(what, hostname): credentials = snmp_credentials_of(hostname) if what == 'get': command = 'snmpget' + elif what == 'getnext': + command = 'snmpgetnext' else: command = 'snmpbulkwalk' @@ -599,6 +598,10 @@ def is_usewalk_host(hostname): return in_binary_hostlist(hostname, usewalk_hosts) def get_single_oid(hostname, ipaddress, oid): + # New in Check_MK 1.1.11: oid can end with ".*". In that case + # we do a snmpgetnext and try to find an OID with the prefix + # in question. The *cache* is working including the X, however. + global g_single_oid_hostname global g_single_oid_cache @@ -616,8 +619,15 @@ def get_single_oid(hostname, ipaddress, oid): else: return None - command = snmp_get_command(hostname) + \ - " -On -OQ -Oe -Ot %s %s 2>/dev/null" % (ipaddress, oid) + if oid.endswith(".*"): + oid_prefix = oid[:-2] + commandtype = "getnext" + else: + oid_prefix = oid + commandtype = "get" + + command = snmp_base_command(commandtype, hostname) + \ + " -On -OQ -Oe -Ot %s %s 2>/dev/null" % (ipaddress, oid_prefix) try: if opt_debug: sys.stdout.write("Running '%s'\n" % command) @@ -632,6 +642,10 @@ def get_single_oid(hostname, ipaddress, oid): or value.startswith('No Such Object available') or value.startswith('No Such Instance currently exists'): value = None + # In case of .*, check if prefix is the one we are looking for + if commandtype == "getnext" and not item.startswith(oid_prefix + "."): + value = None + # Strip quotes if value.startswith('"') and value.endswith('"'): value = value[1:-1] @@ -2079,7 +2093,6 @@ no_inventory_possible = None # snmp hosts output.write("def is_snmp_host(hostname):\n return %r\n\n" % is_snmp_host(hostname)) output.write("def is_tcp_host(hostname):\n return %r\n\n" % is_tcp_host(hostname)) - output.write("def snmp_get_command(hostname):\n return %r\n\n" % snmp_get_command(hostname)) output.write("def snmp_walk_command(hostname):\n return %r\n\n" % snmp_walk_command(hostname)) output.write("def is_usewalk_host(hostname):\n return %r\n\n" % is_usewalk_host(hostname)) diff --git a/modules/snmp.py b/modules/snmp.py index 7ff3e74..f6bc49a 100644 --- a/modules/snmp.py +++ b/modules/snmp.py @@ -340,6 +340,14 @@ def check_snmp_fixed(item, targetvalue, info): def get_stored_snmpwalk(hostname, oid): if oid.startswith("."): oid = oid[1:] + + if oid.endswith(".*"): + oid_prefix = oid[:-2] + dot_star = True + else: + oid_prefix = oid + dot_star = False + path = snmpwalks_dir + "/" + hostname if opt_debug: sys.stderr.write("Getting %s from %s\n" % (oid, path)) @@ -351,10 +359,12 @@ def get_stored_snmpwalk(hostname, oid): o = parts[0] if o.startswith('.'): o = o[1:] - if o == oid or o.startswith(oid + "."): + if o == oid or o.startswith(oid_prefix + "."): if len(parts) > 1: value = parts[1] else: value = "" rowinfo.append((o, strip_snmp_value(value))) # return pair of OID and value + if dot_star: + return rowinfo # only return first (used by get_single_oid) return rowinfo

13 years, 3 months

← Newer
1
...
7
8
9
10
11
12
13
...
21
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits March 2011