Checkmk git commits August 2013

checkmk-commits@lists.checkmk.com

6 participants
167 discussions

Check_MK Git: check_mk: Updated bug entries #1042

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: 26053ad92a01a8b199715949fd011e5acf78b6a9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=26053ad92a01a8… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Fri Aug 30 15:52:45 2013 +0200 Updated bug entries #1042 --- .bugs/1042 | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.bugs/1042 b/.bugs/1042 new file mode 100644 index 0000000..33a0e20 --- /dev/null +++ b/.bugs/1042 @@ -0,0 +1,11 @@ +Title: Package should have dependency to apache2-prefork +Component: multisite +State: open +Date: 2013-08-30 15:48:55 +Targetversion: 1.2.3 +Class: bug + +Problems in Multisite GUI if apache is running with mpm +prefork works +so the package should depend on apache2-mpm +but at least the deb for ubuntu 13.04 64bit does not, maybe others too

11 years

Check_MK Git: check_mk: Convention is to begin all OIDs with a leading dot -> fixed

by Lars Michelsen

Module: check_mk Branch: master Commit: afc31136a65fe07fb2edcb25f25b7042e14d6b52 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=afc31136a65fe0… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Aug 29 10:45:25 2013 +0200 Convention is to begin all OIDs with a leading dot -> fixed --- checks/if64 | 2 +- checks/if_lancom | 2 +- checks/wut_webio_io | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/checks/if64 b/checks/if64 index a5e6310..d45d098 100644 --- a/checks/if64 +++ b/checks/if64 @@ -69,7 +69,7 @@ check_info["if64"] = { "2.2.1.6", # ifPhysAddress 19 ]), 'snmp_scan_function': \ - lambda oid: "LANCOM" not in oid("1.3.6.1.2.1.1.1.0") and \ + lambda oid: "LANCOM" not in oid(".1.3.6.1.2.1.1.1.0") and \ ".4.1.11863." not in oid(".1.3.6.1.2.1.1.2.0") and \ (not if64_disabled(g_hostname)) and \ oid(".1.3.6.1.2.1.31.1.1.1.6.*") != None, diff --git a/checks/if_lancom b/checks/if_lancom index 7579084..d0cb680 100644 --- a/checks/if_lancom +++ b/checks/if_lancom @@ -94,7 +94,7 @@ check_info["if_lancom"] = { ], # check if number of network interfaces (IF-MIB::ifNumber.0) is at least 2 'snmp_scan_function': \ - lambda oid: "LANCOM" in oid("1.3.6.1.2.1.1.1.0") and \ + lambda oid: "LANCOM" in oid(".1.3.6.1.2.1.1.1.0") and \ (not if64_disabled(g_hostname)) and \ oid(".1.3.6.1.2.1.31.1.1.1.6.*") != None, 'group': 'if', diff --git a/checks/wut_webio_io b/checks/wut_webio_io index e93866b..05499ef 100644 --- a/checks/wut_webio_io +++ b/checks/wut_webio_io @@ -106,6 +106,6 @@ check_info['wut_webio_io.inputs'] = { ]), # first check we have a vendor mib from W&T, then check for the model in their MIB. "snmp_scan_function" : lambda oid: \ - ".1.3.6.1.4.1.5040" in oid("1.3.6.1.2.1.1.2.0") and + ".1.3.6.1.4.1.5040" in oid(".1.3.6.1.2.1.1.2.0") and oid(".1.3.6.1.4.1.5040.1.2.4.3.3.5.0").lower().startswith("web-io"), }

11 years

Check_MK Git: check_mk: Fixed snmp scan function of brocade checks not to return a tuple

by Lars Michelsen

Module: check_mk Branch: master Commit: b52e46ba04ae60a41d66f6b8bca0182ee68345f5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b52e46ba04ae60… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Aug 30 14:07:49 2013 +0200 Fixed snmp scan function of brocade checks not to return a tuple --- checks/brocade | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/checks/brocade b/checks/brocade index c75c69f..a6d8b08 100644 --- a/checks/brocade +++ b/checks/brocade @@ -44,7 +44,8 @@ def brocade_sensor_convert(info, what): def brocade_scan(oid): return oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.1588.2.1.1") or \ - oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.24.1.1588.2.1.1"), + oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.24.1.1588.2.1.1") + brocade_info = ('.1.3.6.1.4.1.1588.2.1.1.1.1.22.1', [ 4, 5 ])

11 years

Check_MK Git: check_mk: Updated bug entries #1041

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: e1cc873ed32b0f74cb86b99af05e0c00c308991f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e1cc873ed32b0f… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Fri Aug 30 12:40:33 2013 +0200 Updated bug entries #1041 --- .bugs/1041 | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.bugs/1041 b/.bugs/1041 new file mode 100644 index 0000000..3e42e18 --- /dev/null +++ b/.bugs/1041 @@ -0,0 +1,12 @@ +Title: cmc problem with parents +Component: core +State: open +Date: 2013-08-30 12:37:32 +Targetversion: 1.2.3 +Class: bug + +when running site with cmc, parents of a host are not shown in multisite gui in host status page +even if there are configured some +maybe parent hosts are ignored completely?? + +if running the same site with nagios core, the parents are displayed on host status page

11 years

Check_MK Git: check_mk: Updated bug entries #1040

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: 51291687777a95d68b3a352efb48afa1d975937d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=51291687777a95… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Fri Aug 30 11:03:43 2013 +0200 Updated bug entries #1040 --- .bugs/1040 | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/.bugs/1040 b/.bugs/1040 new file mode 100644 index 0000000..ff22227 --- /dev/null +++ b/.bugs/1040 @@ -0,0 +1,14 @@ +Title: job directory should be created with mode 1777 +Component: core +State: open +Date: 2013-08-30 10:58:02 +Targetversion: 1.2.3i2 +Class: nastiness + +/var/lib/check_mk_agent/job directory is created root.root 755 now +this way only cronjobs running under root can use mk-job + +directory should be created with mode 1777 so cronjobs running under unprivileged +users can write their files into this directory too +this should be no security problem, because the t bit makes sure, every user can only +delete his own files

11 years

Check_MK Git: check_mk: Fixed styling of staleness

by Mathias Kettner

Module: check_mk Branch: master Commit: 69a3042d25feddaaad80081048b83073e47db7e8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=69a3042d25fedd… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Aug 29 14:09:42 2013 +0200 Fixed styling of staleness --- web/htdocs/images/icon_stale.png | Bin 2588 -> 4526 bytes web/htdocs/status.css | 42 ++++++++++++-------------------------- web/htdocs/views.py | 13 ++++++------ web/plugins/icons/builtin.py | 1 + web/plugins/views/painters.py | 17 ++++++++------- web/plugins/views/perfometer.py | 8 ++++++-- 6 files changed, 37 insertions(+), 44 deletions(-) diff --git a/web/htdocs/images/icon_stale.png b/web/htdocs/images/icon_stale.png index 75238fa..f083b05 100644 Binary files a/web/htdocs/images/icon_stale.png and b/web/htdocs/images/icon_stale.png differ diff --git a/web/htdocs/status.css b/web/htdocs/status.css index 83233f2..6fe4b2b 100644 --- a/web/htdocs/status.css +++ b/web/htdocs/status.css @@ -43,15 +43,24 @@ td.state { width: 32px; } +td.svcstate.stale { + background-image: url("images/white_60percent.png"); + background-repeat: repeat; +} + +table.data tr.data td.stale, +table.data td.perfometer.stale div.title { + color: #888; + text-shadow: 0.8px 0.8px 0.8px #fff; +} + + + /* OK/UP */ .state0, .hstate0, .state0 a, .hstate0 a { background-color: #0b3; color: #fff; } -.state0.stale, .hstate0.stale, .state0.stale a, .hstate0.stale a { - background-color: #9FDDB0; color: #fff; -} - .hstate { white-space: nowrap; } @@ -60,46 +69,26 @@ td.state { background-color: #ff0; color: #000; } -.state1.stale, .state1.stale a, tr.groupheader td.state1.stale { - background-color: #FFFFCE; color: #BCBCBC; -} - /* CRIT/DOWN */ .state2, .hstate1, .state2 a, .hstate2 a { background-color: #f00; color: #fff; } -.state2.stale, .hstate1.stale, .state2.stale a, .hstate2.stale a { - background-color: #FFBFBF; color: #fff; -} - /* UNKNOWN / UNREACH */ .state3, .hstate2, .state3 a, .hstate2 a { background-color: #f80; color: #fff; } -.state3.stale, .hstate2.stale, .state3.stale a, .hstate2.stale a { - background-color: #FFE1BF; color: #fff; -} - /* PENDING */ .statep, .hstatep, .statep a, .hstatep a { background-color: #888; color: #fff; } -.statep.stale, .hstatep.stale, .statep.stale a, .hstatep.stale a { - background-color: #D6D6D6; color: #fff; -} - /* in DOWNTIME */ .stated, .hstated, .stated a, .hstated a { background-color: #0af; color: #fff; } -.stated.stale, .hstated.stale, .stated.stale a, .hstated.stale a { - background-color: #CCEEFF; color: #fff; -} - /* inline state markers in check output */ b.stmark { margin-left: 4px; @@ -241,7 +230,6 @@ td.statex { /* zero count */ /* Row coloring in case of the different states */ tr.odd0 { background-color: #eee; } -tr.odd0 td.stale { background-color: #f4f4f4; } tr.even0 { background-color: #ddd; } td.odd0 { background-color: #eee; } @@ -331,10 +319,6 @@ table.data td.center { text-align: center; } -table.data tr .stale, table.data tr .stale a, table.data tr .stale td.age { - color: #b7b7b7; -} - td.narrow { width: 10px; } diff --git a/web/htdocs/views.py b/web/htdocs/views.py index afa9c64..262411a 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -2416,18 +2416,19 @@ def row_id(view, row): def paint(p, row, tdattrs=""): tdclass, content = prepare_paint(p, row) - if is_stale(row): - if not tdclass: - tdclass = 'stale' - else: - tdclass += ' stale' - if tdclass: html.write("<td %s class=\"%s\">%s</td>\n" % (tdattrs, tdclass, content)) else: html.write("<td %s>%s</td>" % (tdattrs, content)) return content != "" +def paint_stalified(row, text): + if is_stale(row): + return "stale", text + else: + return "", text + + def substract_sorters(base, remove): for s in remove: if s in base: diff --git a/web/plugins/icons/builtin.py b/web/plugins/icons/builtin.py index 2617f97..a86cb94 100644 --- a/web/plugins/icons/builtin.py +++ b/web/plugins/icons/builtin.py @@ -447,6 +447,7 @@ def paint_is_stale(what, row, tags, custom_vars): title = _("This host is stale") else: title = _("This service is stale") + title += _(", no data has been received within the last %.1f check periods") % config.staleness_threshold return '<img class=icon title="%s" src="images/icon_stale.png">' % title multisite_icons.append({ diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index 1427ab0..da9e242 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -274,13 +274,15 @@ multisite_painters["sitealias"] = { # |____/ \___|_| \_/ |_|\___\___||___/ # -def paint_service_state_short(row ): +def paint_service_state_short(row): if row["service_has_been_checked"] == 1: - state = row["service_state"] + state = str(row["service_state"]) name = nagios_short_state_names[row["service_state"]] else: state = "p" name = "PEND" + if is_stale(row): + state += " stale" return "state svcstate state%s" % state, name def paint_host_state_short(row): @@ -291,6 +293,8 @@ def paint_host_state_short(row): else: state = "p" name = "PEND" + if is_stale(row): + state += " stale" return "state hstate hstate%s" % state, name multisite_painters["service_nagios_link"] = { @@ -317,25 +321,24 @@ multisite_painters["site_icon"] = { "sorter" : 'site', } - multisite_painters["svc_plugin_output"] = { "title" : _("Output of check plugin"), "short" : _("Status detail"), "columns" : ["service_plugin_output"], - "paint" : lambda row: ("", format_plugin_output(row["service_plugin_output"], row)), + "paint" : lambda row: paint_stalified(row, format_plugin_output(row["service_plugin_output"], row)), "sorter" : 'svcoutput', } multisite_painters["svc_long_plugin_output"] = { "title" : _("Long output of check plugin (multiline)"), "short" : _("Status detail"), "columns" : ["service_long_plugin_output"], - "paint" : lambda row: (None, row["service_long_plugin_output"].replace('\\n', '<br>')), + "paint" : lambda row: paint_stalified(row, row["service_long_plugin_output"].replace('\\n', '<br>')), } multisite_painters["svc_perf_data"] = { "title" : _("Service performance data"), "short" : _("Perfdata"), "columns" : ["service_perf_data"], - "paint" : lambda row: (None, row["service_perf_data"]) + "paint" : lambda row: paint_stalified(row, row["service_perf_data"]) } def get_perfdata_nth_value(row, n, remove_unit = False): @@ -357,7 +360,7 @@ def get_perfdata_nth_value(row, n, remove_unit = False): return str(e) def paint_perfdata_nth_value(row, n): - return "", get_perfdata_nth_value(row, n) + return paint_stalified(row, get_perfdata_nth_value(row, n)) multisite_painters["svc_perf_val01"] = { "title" : _("Service performance data - value number 1"), diff --git a/web/plugins/views/perfometer.py b/web/plugins/views/perfometer.py index 4e17c58..997f123 100644 --- a/web/plugins/views/perfometer.py +++ b/web/plugins/views/perfometer.py @@ -167,6 +167,10 @@ def paint_perfometer(row): if not perf_data: return "", "" + if is_stale(row): + stale_css = " stale" + else: + stale_css = "" try: title, h = perf_painter(row, check_command, perf_data) content = '<div class=content>%s</div>' % h @@ -176,9 +180,9 @@ def paint_perfometer(row): # pnpgraph_present: -1 means unknown (path not configured), 0: no, 1: yes if 'X' in html.display_options and \ row["service_pnpgraph_present"] != 0: - return "perfometer", ('<a href="%s">%s</a>' % (pnp_url(row, "service"), content)) + return "perfometer" + stale_css, ('<a href="%s">%s</a>' % (pnp_url(row, "service"), content)) else: - return "perfometer", content + return "perfometer" + stale_css, content except Exception, e:

11 years

Check_MK Git: check_mk: cmk --snmptranslate: add missing \n

by Mathias Kettner

Module: check_mk Branch: master Commit: 8ad0af42a2cf601e6b7566849b19bae8df190539 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8ad0af42a2cf60… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Aug 29 10:57:18 2013 +0200 cmk --snmptranslate: add missing \n --- modules/check_mk.py | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/check_mk.py b/modules/check_mk.py index 60634c7..c651d4d 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -3913,6 +3913,7 @@ def do_snmptranslate(walk): sys.stderr.flush() process_lines = walk_lines[i:i+entries_per_cycle] translated_lines.extend(translate(process_lines)) + sys.stderr.write("\n") # Output formatted longest_translation = 40

11 years

Check_MK Git: check_mk: cmk --snmpwalk: put diagnostic output into stderr

by Mathias Kettner

Module: check_mk Branch: master Commit: 71b4b78d4fb5939d4db730afb191cd88f479bb96 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=71b4b78d4fb593… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Aug 29 10:55:41 2013 +0200 cmk --snmpwalk: put diagnostic output into stderr --- modules/check_mk.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index 705c2fc..60634c7 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -3907,10 +3907,10 @@ def do_snmptranslate(walk): translated_lines = [] walk_lines = file(path_walk).readlines() - print("Processing %d lines (%d per dot)" % (len(walk_lines), entries_per_cycle)) + sys.stderr.write("Processing %d lines (%d per dot)\n" % (len(walk_lines), entries_per_cycle)) for i in range(0, len(walk_lines), entries_per_cycle): - sys.stdout.write(".") - sys.stdout.flush() + sys.stderr.write(".") + sys.stderr.flush() process_lines = walk_lines[i:i+entries_per_cycle] translated_lines.extend(translate(process_lines))

11 years

Check_MK Git: check_mk: Updated bug entries #0949

by Mathias Kettner

Module: check_mk Branch: master Commit: eab3a51522319f9e798114d289442e05d9260eed URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=eab3a51522319f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Aug 29 10:52:34 2013 +0200 Updated bug entries #0949 --- .bugs/949 | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.bugs/949 b/.bugs/949 new file mode 100644 index 0000000..ef050db --- /dev/null +++ b/.bugs/949 @@ -0,0 +1,11 @@ +Title: Add directory local/share/check_mk/mibs +Component: core +State: open +Date: 2013-08-29 10:51:27 +Targetversion: future +Class: nastiness + +The option --snmptranslate allows to install SNMP MIBs in that +directory. In non-OMD-Situtations another directory is being +used. Setup/OMD should make sure that those directories always +exist.

11 years

Check_MK Git: check_mk: clean ups in bugs

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: c2521883060bfc61d9dd894acd9207db22839dc3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c2521883060bfc… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Wed Aug 28 17:44:23 2013 +0200 clean ups in bugs --- .bugs/1029 | 8 -------- .bugs/1030 | 3 --- .bugs/1031 | 18 ------------------ .bugs/1034 | 8 -------- .bugs/1035 | 14 -------------- .bugs/1036 | 8 -------- .bugs/1038 | 3 --- .bugs/959 | 36 ------------------------------------ .bugs/961 | 14 -------------- .bugs/962 | 22 ---------------------- .bugs/963 | 3 --- .bugs/964 | 18 ------------------ .bugs/967 | 3 --- .bugs/968 | 17 ----------------- .bugs/970 | 3 --- .bugs/973 | 3 --- .bugs/974 | 12 ------------ 17 files changed, 193 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=c252188306…

11 years

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits August 2013