Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64477 discussions

Check_MK Git: check_mk: Changed "unchecked services" view to use the staleness of services

by Lars Michelsen

Module: check_mk Branch: master Commit: 8b945077f29927178db5029c2c833c8154a47752 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8b945077f29927… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Aug 26 12:12:16 2013 +0200 Changed "unchecked services" view to use the staleness of services --- web/plugins/views/builtin.py | 40 ++++++++++++++++++---------------------- 1 file changed, 18 insertions(+), 22 deletions(-) diff --git a/web/plugins/views/builtin.py b/web/plugins/views/builtin.py index 3652a18..46c9084 100644 --- a/web/plugins/views/builtin.py +++ b/web/plugins/views/builtin.py @@ -1621,37 +1621,33 @@ multisite_builtin_views.update({ 'uncheckedsvc': {'browser_reload': 30, 'column_headers': 'pergroup', 'datasource': 'services', - 'description': _('Services that have not been checked within the last 24 hours (pending services excluded).'), - 'group_painters': [('host', 'host')], - 'hard_filters': ['summary_host'], - 'hard_filtervars': [('svc_last_check_until_range', '3600'), - ('svc_last_check_until', '24'), - ('is_summary_host', '0'), - ('st0', 'on'), - ('st1', 'on'), - ('st2', 'on'), - ('st3', 'on'), - ('stp', '')], + 'description': _('Services that have not been checked for too long according to their configured check intervals.'), + 'group_painters': [('host', 'host', '')], + 'hard_filters': ['service_staleness', 'summary_host'], + 'hard_filtervars': [('is_service_staleness', '1'), + ('is_summary_host', '0')], 'hidden': False, 'hide_filters': [], + 'hidebutton': False, + 'icon': None, 'layout': 'table', - 'linktitle': _('Unchecked services'), + 'mobile': False, 'mustsearch': False, 'name': 'uncheckedsvc', 'num_columns': 1, - 'owner': '', - 'painters': [('service_state', None), - ('service_description', 'service'), - ('svc_plugin_output', None), - ('service_icons', None), - ('svc_state_age', None), - ('svc_check_age', None)], + 'owner': 'omdadmin', + 'painters': [('service_state', None, ''), + ('service_description', 'service', ''), + ('svc_plugin_output', None, ''), + ('service_icons', None, ''), + ('svc_state_age', None, ''), + ('svc_check_age', None, '')], 'play_sounds': False, 'public': True, - 'show_filters': ['svc_last_check', 'svcstate'], + 'show_filters': [], 'sorters': [('site_host', False), ('svcdescr', False)], - 'title': _('Unchecked services'), - 'topic': _('Problems')}, + 'title': u'Stale services', + 'user_sortable': 'on'}, 'events': {'browser_reload': 0, 'column_headers': 'pergroup', 'datasource': 'log_events',

11 years, 1 month

Check_MK Git: check_mk: Fixed problems ins view CSV export

by Lars Michelsen

Module: check_mk Branch: master Commit: 78bedeaf1bfd4421bcef59c7c9802eb61ce5a652 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=78bedeaf1bfd44… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Aug 26 12:04:47 2013 +0200 Fixed problems ins view CSV export --- web/htdocs/views.py | 11 +++++++---- web/plugins/views/webservice.py | 16 +++++++--------- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 62f1a70..ac1711d 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -2341,6 +2341,12 @@ def execute_hooks(hook): else: pass +def paint_painter(painter, row): + if "args" in painter: + return painter["paint"](row, *painter["args"]) + else: + return painter["paint"](row) + def prepare_paint(p, row): painter = p[0] linkview = p[1] @@ -2351,10 +2357,7 @@ def prepare_paint(p, row): if not row: return "", "" # no join information available for that column - if "args" in painter: - tdclass, content = painter["paint"](row, *painter["args"]) - else: - tdclass, content = painter["paint"](row) + tdclass, content = paint_painter(painter, row) content = html.utf8_to_entities(content) diff --git a/web/plugins/views/webservice.py b/web/plugins/views/webservice.py index 16a9e47..a4e9561 100644 --- a/web/plugins/views/webservice.py +++ b/web/plugins/views/webservice.py @@ -92,7 +92,7 @@ def render_json(rows, view, group_painters, painters, num_columns, show_checkbox first = False else: html.write(",") - tdclass, content = p[0]["paint"](row) + tdclass, content = paint_painter(p[0], row) content = str(content).replace("<br>","\n") stripped = html.strip_tags(content) utf8 = stripped.encode("utf-8") @@ -123,7 +123,7 @@ def render_csv(rows, view, group_painters, painters, num_columns, show_checkboxe filename = '%s-%s.csv' % (view['name'], time.strftime('%Y-%m-%d_%H-%M-%S', time.localtime(time.time()))) html.req.headers_out['Content-Disposition'] = 'Attachment; filename=%s' % filename - csv_separator = html.var("csv_separator", ",") + csv_separator = html.var("csv_separator", ";") first = True for p in painters: if first: @@ -131,9 +131,8 @@ def render_csv(rows, view, group_painters, painters, num_columns, show_checkboxe else: html.write(csv_separator) content = p[0]["name"] - stripped = html.strip_tags(content) - stripped = stripped.replace(csv_separator, "\%s" % csv_separator) - html.write(stripped.encode("utf-8")) + stripped = html.strip_tags(content).replace('\n', '').replace('"', '""') + html.write('"%s"' % stripped.encode("utf-8")) for row in rows: html.write("\n") @@ -143,10 +142,9 @@ def render_csv(rows, view, group_painters, painters, num_columns, show_checkboxe first = False else: html.write(csv_separator) - tdclass, content = p[0]["paint"](row) - stripped = html.strip_tags(content) - stripped = stripped.replace(csv_separator, "\%s" % csv_separator) - html.write(stripped.encode("utf-8")) + tdclass, content = paint_painter(p[0], row) + stripped = html.strip_tags(content).replace('\n', '').replace('"', '""') + html.write('"%s"' % stripped.encode("utf-8")) multisite_layouts["csv_export"] = { "title" : _("CSV data export"),

11 years, 1 month

Check_MK Git: check_mk: New config option: staleness_threshold to configure the former hardcoded value of 1.5

by Lars Michelsen

Module: check_mk Branch: master Commit: ab94d29f7f808a0c764449142101bc59c2f70f9c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ab94d29f7f808a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Aug 26 12:19:14 2013 +0200 New config option: staleness_threshold to configure the former hardcoded value of 1.5 --- ChangeLog | 1 + web/htdocs/views.py | 2 +- web/plugins/config/builtin.py | 4 ++++ web/plugins/views/filters.py | 8 ++++---- web/plugins/wato/check_mk_configuration.py | 14 ++++++++++++++ 5 files changed, 24 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3c1d954..9094a95 100644 --- a/ChangeLog +++ b/ChangeLog @@ -121,6 +121,7 @@ * Improved filtering of the foldertree snapin by user permissions (when a user is only permitted on one child folder, the upper folder is removed from the hierarchy) + * "Unchecked Services" view now uses the staleness of services for filtering * FIX: better error message in case of exception in SNMP handling * FIX: Inventory screen: Now shows custom checks * FIX: Fixed locking problem of multisite pages related to user loading/saving diff --git a/web/htdocs/views.py b/web/htdocs/views.py index ac1711d..b323e9b 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -2600,7 +2600,7 @@ def get_host_tags(row): return "" def is_stale(row): - return row.get('service_staleness', row.get('host_staleness', 0)) >= 1.5 + return row.get('service_staleness', row.get('host_staleness', 0)) >= config.staleness_threshold def cmp_insensitive_string(v1, v2): c = cmp(v1.lower(), v2.lower()) diff --git a/web/plugins/config/builtin.py b/web/plugins/config/builtin.py index 8e55c24..78e1612 100644 --- a/web/plugins/config/builtin.py +++ b/web/plugins/config/builtin.py @@ -195,6 +195,10 @@ adhoc_downtime = {} # Display dashboard date pagetitle_date_format = None +# Value of the host_staleness/service_staleness field to make hosts/services +# appear in a stale state +staleness_threshold = 1.5 + # _ _ ____ ____ # | | | |___ ___ _ __| _ \| __ ) # | | | / __|/ _ \ '__| | | | _ \ diff --git a/web/plugins/views/filters.py b/web/plugins/views/filters.py index 19caaa4..af545dd 100644 --- a/web/plugins/views/filters.py +++ b/web/plugins/views/filters.py @@ -362,11 +362,11 @@ declare_filter(232, FilterNagiosExpression("service", "in_downtime", "Filter: service_scheduled_downtime_depth = 0\nFilter: host_scheduled_downtime_depth = 0\nAnd: 2\n")) declare_filter(232, FilterNagiosExpression("host", "host_staleness", _("Host is stale"), - "Filter: host_staleness >= 1.5\n", - "Filter: host_staleness < 1.5\n")) + "Filter: host_staleness >= %0.2f\n" % config.staleness_threshold, + "Filter: host_staleness < %0.2f\n" % config.staleness_threshold)) declare_filter(232, FilterNagiosExpression("service", "service_staleness", _("Service is stale"), - "Filter: service_staleness >= 1.5\n", - "Filter: service_staleness < 1.5\n")) + "Filter: service_staleness >= %0.2f\n" % config.staleness_threshold, + "Filter: service_staleness < %0.2f\n" % config.staleness_threshold)) class FilterSite(Filter): def __init__(self, name, enforce): diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index 54b7cf6..1201edc 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -332,6 +332,20 @@ register_configvar(group, ), domain = "multisite") +register_configvar(group, + "staleness_threshold", + Float( + title = _('Staleness value to mark hosts / services stale'), + help = _('The staleness value of a host / service is calculated by measuring the ' + 'configured check intervals a check result is old. A value of 1.5 means the ' + 'current check result has been gathered one and a half check intervals of an object. ' + 'This would mean 90 seconds in case of a check which is checked each 60 seconds.'), + minvalue = 1, + default_value = 1.5, + ), + domain = "multisite", +) + # .--WATO----------------------------------------------------------------. # | __ ___ _____ ___ |

11 years, 1 month

Check_MK Git: check_mk: Using stale filters in search views

by Lars Michelsen

Module: check_mk Branch: master Commit: 49c69424b4ca3160f35c9cbb703f4cf759ec16a7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=49c69424b4ca31… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Aug 26 12:15:12 2013 +0200 Using stale filters in search views --- web/plugins/views/builtin.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/web/plugins/views/builtin.py b/web/plugins/views/builtin.py index 46c9084..c475cf4 100644 --- a/web/plugins/views/builtin.py +++ b/web/plugins/views/builtin.py @@ -1033,6 +1033,7 @@ multisite_builtin_views.update({ 'host_check_command', 'host_address', 'host_notif_number', + 'host_staleness', ], 'sorters': [], 'title': _('Host search'), @@ -1110,6 +1111,7 @@ multisite_builtin_views.update({ 'siteopt', 'aggr_service_used', 'svc_notif_number', + 'service_staleness', ], 'sorters': [('site', False), ('site_host', False),

11 years, 1 month

Check_MK Git: check_mk: Changed styling of stale datasets

by Lars Michelsen

Module: check_mk Branch: master Commit: 639ab79c763b6c4012b61d03fc329318d9130acc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=639ab79c763b6c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Aug 26 12:54:02 2013 +0200 Changed styling of stale datasets --- web/htdocs/status.css | 25 +++++++++---------------- web/htdocs/views.py | 7 +++++++ 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/web/htdocs/status.css b/web/htdocs/status.css index 11d53b9..83233f2 100644 --- a/web/htdocs/status.css +++ b/web/htdocs/status.css @@ -48,7 +48,7 @@ td.state { background-color: #0b3; color: #fff; } -tr.stale .state0, tr.stale .hstate0, tr.stale .state0 a, tr.stale .hstate0 a { +.state0.stale, .hstate0.stale, .state0.stale a, .hstate0.stale a { background-color: #9FDDB0; color: #fff; } @@ -60,8 +60,8 @@ tr.stale .state0, tr.stale .hstate0, tr.stale .state0 a, tr.stale .hstate0 a { background-color: #ff0; color: #000; } -tr.stale .state1, tr.stale .state1 a, tr.groupheader.stale td.state1 { - background-color: #FFFFCE; color: #000; +.state1.stale, .state1.stale a, tr.groupheader td.state1.stale { + background-color: #FFFFCE; color: #BCBCBC; } /* CRIT/DOWN */ @@ -69,7 +69,7 @@ tr.stale .state1, tr.stale .state1 a, tr.groupheader.stale td.state1 { background-color: #f00; color: #fff; } -tr.stale .state2, tr.stale .hstate1, tr.stale .state2 a, tr.stale .hstate2 a { +.state2.stale, .hstate1.stale, .state2.stale a, .hstate2.stale a { background-color: #FFBFBF; color: #fff; } @@ -78,7 +78,7 @@ tr.stale .state2, tr.stale .hstate1, tr.stale .state2 a, tr.stale .hstate2 a { background-color: #f80; color: #fff; } -tr.stale .state3, tr.stale .hstate2, tr.stale .state3 a, tr.stale .hstate2 a { +.state3.stale, .hstate2.stale, .state3.stale a, .hstate2.stale a { background-color: #FFE1BF; color: #fff; } @@ -87,7 +87,7 @@ tr.stale .state3, tr.stale .hstate2, tr.stale .state3 a, tr.stale .hstate2 a { background-color: #888; color: #fff; } -tr.stale .statep, tr.stale .hstatep, tr.stale .statep a, tr.stale .hstatep a { +.statep.stale, .hstatep.stale, .statep.stale a, .hstatep.stale a { background-color: #D6D6D6; color: #fff; } @@ -96,7 +96,7 @@ tr.stale .statep, tr.stale .hstatep, tr.stale .statep a, tr.stale .hstatep a { background-color: #0af; color: #fff; } -tr.stale .stated, tr.stale .hstated, tr.stale .stated a, tr.stale .hstated a { +.stated.stale, .hstated.stale, .stated.stale a, .hstated.stale a { background-color: #CCEEFF; color: #fff; } @@ -241,27 +241,20 @@ td.statex { /* zero count */ /* Row coloring in case of the different states */ tr.odd0 { background-color: #eee; } -tr.odd0.stale { background-color: #f4f4f4; } +tr.odd0 td.stale { background-color: #f4f4f4; } tr.even0 { background-color: #ddd; } -tr.even0.stale { background-color: #eee; } td.odd0 { background-color: #eee; } td.even0 { background-color: #ddd; } tr.odd1 { background-color: #ffc; } -tr.odd1.stale { background-color: #ffffe5; } tr.even1 { background-color: #ffa; } -tr.even1.stale { background-color: #ffc; } tr.odd2 { background-color: #fcc; } -tr.odd2.stale { background-color: #ffe2e2; } tr.even2 { background-color: #faa; } -tr.even2.stale { background-color: #fcc; } tr.odd3 { background-color: #ffe0a0; } -tr.odd3.stale { background-color: #ffedc9; } tr.even3 { background-color: #ffefaf; } -tr.even3.stale { background-color: #fff0d3; } /* Row headers in single dataset layout */ @@ -338,7 +331,7 @@ table.data td.center { text-align: center; } -table.data tr.stale, table.data tr.stale a, table.data tr.stale td.age { +table.data tr .stale, table.data tr .stale a, table.data tr .stale td.age { color: #b7b7b7; } diff --git a/web/htdocs/views.py b/web/htdocs/views.py index b323e9b..7b361ea 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -2408,6 +2408,13 @@ 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:

11 years, 1 month

Check_MK Git: check_mk: Updated bug entries #1028

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: f175611726edff6f06093b1ef6755455bb855871 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f175611726edff… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Mon Aug 26 11:45:46 2013 +0200 Updated bug entries #1028 --- .bugs/1028 | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/.bugs/1028 b/.bugs/1028 index 079e5d0..5f87339 100644 --- a/.bugs/1028 +++ b/.bugs/1028 @@ -1,9 +1,9 @@ Title: flexible Notification / plain Text Email: Problem with Umlaut in Hostalias Component: core -Class: bug -State: closed +State: open Date: 2013-08-26 11:07:27 Targetversion: 1.2.3 +Class: bug came in via feedback@ // original mail still avaliable in feedback/gitbug folder @@ -75,3 +75,10 @@ www.geobasis-bb.de 2013-08-26 11:38:00: changed state open -> closed laut eMail Rueckmeldung von Karsten bereits gefixt durch Bastian + +2013-08-26 11:45:07: changed state closed -> open +Nachtrag von Karsten: +Aber nur bei uns gefixt.... +Ich bitte kontaktiere Basti, es war eine Einstellung der locale Variable auf unseren Debian Squeeze. + +Da muss bestimmt in OMD etwas gefixt werden....

11 years, 1 month

Check_MK Git: check_mk: Updated bug entries #1028

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: b31b2e8eb0e8ff48cdbe6fb34ca0ec5ba872db9d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b31b2e8eb0e8ff… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Mon Aug 26 11:38:05 2013 +0200 Updated bug entries #1028 --- .bugs/1028 | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.bugs/1028 b/.bugs/1028 index 7243849..079e5d0 100644 --- a/.bugs/1028 +++ b/.bugs/1028 @@ -1,9 +1,9 @@ Title: flexible Notification / plain Text Email: Problem with Umlaut in Hostalias Component: core -State: open +Class: bug +State: closed Date: 2013-08-26 11:07:27 Targetversion: 1.2.3 -Class: bug came in via feedback@ // original mail still avaliable in feedback/gitbug folder @@ -72,3 +72,6 @@ Fax.: (03 35) 55 82 - 509 www.geobasis-bb.de + +2013-08-26 11:38:00: changed state open -> closed +laut eMail Rueckmeldung von Karsten bereits gefixt durch Bastian

11 years, 1 month

Check_MK Git: check_mk: two new tests using the emerson power mib implemented

by Götz Golla

Module: check_mk Branch: master Commit: cd6ec2f3aa2857ed3735a60eaa7a7621d412793a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cd6ec2f3aa2857… Author: Götz Golla <gg(a)mathias-kettner.de> Date: Mon Aug 26 11:23:24 2013 +0200 two new tests using the emerson power mib implemented new ruleset to register hosts which do not publish the system description OID --- checks/emerson_stat | 89 ++++++++++++++++++++++++++++ checks/emerson_temp | 68 +++++++++++++++++++++ modules/check_mk.py | 12 ++-- web/plugins/wato/builtin_attributes.py | 2 +- web/plugins/wato/check_mk_configuration.py | 8 +++ 5 files changed, 173 insertions(+), 6 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=cd6ec2f3aa…

11 years, 1 month

Check_MK Git: check_mk: Updated bug entries #0976, #1027, #1028, #0974, #0975

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: 54bb1eefb1ec354894752e3211e8bcb5edf12658 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=54bb1eefb1ec35… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Mon Aug 26 11:20:45 2013 +0200 Updated bug entries #0976, #1027, #1028, #0974, #0975 --- .bugs/1027 | 53 +++++++++++++++++++++++ .bugs/1028 | 74 +++++++++++++++++++++++++++++++ .bugs/974 | 41 ++++++++++++++++++ .bugs/975 | 115 +++++++++++++++++++++++++++++++++++++++++++++++++ .bugs/976 | 141 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 424 insertions(+) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=54bb1eefb1…

11 years, 1 month

Check_MK Git: check_mk: Fixed winperf parameter handling

by Bastian Kuhn

Module: check_mk Branch: master Commit: 8b6052c92b159d59cdb6bb38e0373d0868e9af75 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8b6052c92b159d… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Mon Aug 26 10:33:30 2013 +0200 Fixed winperf parameter handling --- checks/winperf | 4 ---- 1 file changed, 4 deletions(-) diff --git a/checks/winperf b/checks/winperf index db11ebe..79d4a4d 100644 --- a/checks/winperf +++ b/checks/winperf @@ -46,10 +46,6 @@ def check_win_cpuusage(item, params, info): else: warn, crit = params['levels'] - if params == None: - params = winperf_cpu_default_levels - warn, crit = params - for line in info: if line[0] == '238:6': this_time = int(float(line[1]))

11 years, 1 month

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits