Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64161 discussions

Check_MK Git: check_mk: Updated bug entries #0402

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 749203d18bad35715f04af6f553b9c0dbb6331e4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=749203d18bad35… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 14 11:45:31 2011 +0100 Updated bug entries #0402 --- .bugs/402 | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.bugs/402 b/.bugs/402 index 386e62b..a582609 100644 --- a/.bugs/402 +++ b/.bugs/402 @@ -1,11 +1,14 @@ Title: IE8: Hitting enter in Quicksearch does not work Component: multisite +State: done +Class: bug Benefit: 1 -State: open Cost: 1 Date: 2011-10-27 18:52:58 Targetversion: 1.1.12 -Class: bug When hitting Enter in Quicksearch when no host matches, a service search should be done. In Firefox this works, in IE8 not. + +2011-12-14 11:45:29: changed state open -> done +Fixed. Was a javascript error due to an undefined value.

12 years, 9 months

Check_MK Git: check_mk: FIX: lnx_if: assume interfaces as up if ethtool is missing

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 295ec57af52f7fc700dc7ea1846f9f3ad7082808 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=295ec57af52f7f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 14 10:52:06 2011 +0100 FIX: lnx_if: assume interfaces as up if ethtool is missing --- ChangeLog | 7 +++++++ checks/lnx_if | 28 ++++++++++++++++++---------- 2 files changed, 25 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 82b7b5a..ff8c06a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -31,6 +31,13 @@ man page of logwatch for details) * fileinfo: new check for monitoring age and size of files +1.1.12p5: + Checks & Agents: + * FIX: lnx_if: assume interfaces as up if ethtool is missing or + not working but interface has been used since last reboot. This + fixes the problem where interface are not found by inventory. + +1.1.12p4: Multisite: * New nifty sidebar snapin "Speed-O-Meter" * Implemented new cookie based login mechanism including a fancy login GUI diff --git a/checks/lnx_if b/checks/lnx_if index 58bc201..642a376 100644 --- a/checks/lnx_if +++ b/checks/lnx_if @@ -69,6 +69,7 @@ def if_lnx_convert_to_if64(info): if_table = [] for nic, attr in nic_info.items(): + import pprint ; pprint.pprint(attr) counters = attr.get("counters", [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0]) ifIndex = attr["index"] @@ -97,16 +98,6 @@ def if_lnx_convert_to_if64(info): else: ifSpeed = '' - # Link state from ethtool. If ethtool has no information about - # this NIC, we set the state to unknown. - ld = attr.get("Link detected") - if ld == "yes": - ifOperStatus = 1 - elif ld == "no": - ifOperStatus = 2 - else: - ifOperStatus = 4 # unknown - # Performance counters ifInOctets = counters[0] inucast = counters[1] + counters[7] @@ -122,6 +113,22 @@ def if_lnx_convert_to_if64(info): ifOutErrors = counters[10] ifOutQLen = counters[12] + # Link state from ethtool. If ethtool has no information about + # this NIC, we set the state to unknown. + ld = attr.get("Link detected") + if ld == "yes": + ifOperStatus = 1 + elif ld == "no": + ifOperStatus = 2 + else: + # No information from ethtool. We consider interfaces up + # if they have been used at least some time since the + # system boot. + if ifInOctets > 0: + ifOperStatus = 1 # assume up + else: + ifOperStatus = 4 # unknown (NIC has never been used) + if_table.append(map(str, [ ifIndex, ifDescr, ifType, ifSpeed, ifOperStatus, ifInOctets, inucast, inmcast, inbcast, ifInDiscards, @@ -131,6 +138,7 @@ def if_lnx_convert_to_if64(info): return if_table def inventory_lnx_if(info): + import pprint ; pprint.pprint(info) if linux_nic_check == "legacy": return [] return inventory_if_common(if_lnx_convert_to_if64(info))

12 years, 9 months

Check_MK Git: check_mk: MobileUI: Changes

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: a84b8d25413ae5bd1bc57c68790509b89e6e9545 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a84b8d25413ae5… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Wed Dec 14 10:10:01 2011 +0100 MobileUI: Changes --- web/htdocs/mobile.py | 7 ++- web/htdocs/views.py | 2 +- web/plugins/views/mobile.py | 109 ++++++++++++++++++++++--------------------- 3 files changed, 61 insertions(+), 57 deletions(-) diff --git a/web/htdocs/mobile.py b/web/htdocs/mobile.py index c3ee1f5..178aad2 100755 --- a/web/htdocs/mobile.py +++ b/web/htdocs/mobile.py @@ -254,13 +254,14 @@ def render_view(view, rows, datasource, group_painters, painters, html.write(_("Error showing view: %s" % e)) html.write("</div>") html.javascript(""" - $('.pnpgraph').children('div').css('max-width', '100px'); + $('.pnpgraph').children('div').css('max-width', '100%'); $('.pnpgraph').children('div').css('overflow', 'scroll'); """) jqm_page_navfooter(navbar, 'data', page_id) # Page: Context buttons - if context_links: + #if context_links: + elif page == "context": jqm_page_header(_("Context"), left_button=home, id="context") show_context_links(context_links) jqm_page_navfooter(navbar, 'context', page_id) @@ -341,6 +342,6 @@ def do_commands(view, what, rows): def show_context_links(context_links): items = [] for view, title, uri, icon, buttonid in context_links: - items.append((uri, title)) + items.append(('Context', uri, title)) jqm_page_index(_("Related Views"), items) diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 0da8881..95f23b8 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -1263,7 +1263,7 @@ def show_view(view, show_heading = False, show_buttons = True, # TODO: Use livestatus Stats: instead of fetching rows! if only_count: for varname, value in view["hard_filtervars"]: - html.del_var(varname, value) + html.del_var(varname) return len(rows) # Set browser reload diff --git a/web/plugins/views/mobile.py b/web/plugins/views/mobile.py index 25d967b..b343a80 100644 --- a/web/plugins/views/mobile.py +++ b/web/plugins/views/mobile.py @@ -59,67 +59,70 @@ def mobile_view(d): multisite_builtin_views.update({ #Service search - 'mobil_searchsvc': mobile_view({'browser_reload': 60, + 'mobile_searchsvc': mobile_view({'browser_reload': 60, 'datasource': 'services', 'description': 'Almost all available filters, used for searching services and maybe doing actions', - 'group_painters': [('sitealias', 'sitehosts'), - ('host', 'host')], + 'group_painters': [ + ('sitealias', 'sitehosts'), + ('host', 'host')], 'hard_filters': [], - 'hard_filtervars': [('is_service_in_notification_period', - '-1'), - ('optservicegroup', ''), - ('is_service_notifications_enabled', - '-1'), - ('is_host_in_notification_period', '-1'), - ('is_in_downtime', '-1'), - ('is_service_scheduled_downtime_depth', - '-1'), - ('is_service_acknowledged', '-1'), - ('host', ''), - ('is_service_active_checks_enabled', - '-1'), - ('is_summary_host', '-1'), - ('service', ''), - ('check_command', ''), - ('st0', 'on'), - ('st1', 'on'), - ('st2', 'on'), - ('st3', 'on'), - ('stp', 'on'), - ('opthostgroup', ''), - ('service_output', ''), - ('is_service_is_flapping', '-1')], + 'hard_filtervars': [ + ('is_service_in_notification_period', '-1'), + ('optservicegroup', ''), + ('is_service_notifications_enabled', '-1'), + ('is_host_in_notification_period', '-1'), + ('is_in_downtime', '-1'), + ('is_service_scheduled_downtime_depth', '-1'), + ('is_service_acknowledged', '-1'), + ('host', ''), + ('is_service_active_checks_enabled', '-1'), + ('is_summary_host', '-1'), + ('service', ''), + ('check_command', ''), + ('st0', 'on'), + ('st1', 'on'), + ('st2', 'on'), + ('st3', 'on'), + ('stp', 'on'), + ('opthostgroup', ''), + ('service_output', ''), + ('is_service_is_flapping', '-1') + ], 'hidden': False, 'hide_filters': [], - 'layout': 'table', + 'layout': 'mobilelist', 'mustsearch': True, 'name': 'mobile_searchsvc', - 'num_columns': 1, + 'num_columns': 2, 'owner': '', - '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': ['service_in_notification_period', - 'service_notifications_enabled', - 'host_in_notification_period', - 'in_downtime', - 'service_scheduled_downtime_depth', - 'service_acknowledged', - 'hostregex', - 'serviceregex', - 'hoststate', - 'svcstate', - 'svchardstate', - 'opthostgroup', - 'output'], - 'sorters': [('site', False), - ('site_host', False), - ('svcdescr', False)], + 'painters': [ + ('service_state', None, ''), + ('host', 'mobile_hoststatus', ''), + ('service_description', 'mobile_service', ''), + ('svc_plugin_output', '' ), + ('svc_state_age', None, ''), + ], + 'play_sounds': False, + 'public': True, + 'show_filters': [ + 'service_in_notification_period', + 'service_notifications_enabled', + 'host_in_notification_period', + 'in_downtime', + 'service_scheduled_downtime_depth', + 'service_acknowledged', + 'hostregex', + 'serviceregex', + 'hoststate', + 'svcstate', + 'svchardstate', + 'opthostgroup', + 'output' + ], + 'sorters': [ + ('site', False), + ('site_host', False), + ('svcdescr', False)], 'title': _('Search'), 'topic': _('Services') }),

12 years, 9 months

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

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: d040e066ad314f03bbcfca6a8286e02b561aabc4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d040e066ad314f… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Wed Dec 14 10:10:06 2011 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 9 months

Check_MK Git: check_mk: Updated bug entries #0001, #0484

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 8903b43329c08af25f2d31951764904183c31950 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8903b43329c08a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 14 10:06:34 2011 +0100 Updated bug entries #0001, #0484 --- .bugs/1 | 6 ++++-- .bugs/484 | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.bugs/1 b/.bugs/1 index 7b1dec1..fa78af4 100644 --- a/.bugs/1 +++ b/.bugs/1 @@ -1,10 +1,12 @@ Title: Describe StatsGroupBy Component: docu +State: done +Class: todo Benefit: 1 -State: open Cost: 1 Date: 2010-12-21 10:45:58 -Class: todo Targetversion: 1.2.0 multiple columns are allowed now. Columns: used. + +2011-12-14 10:06:11: changed state open -> done diff --git a/.bugs/484 b/.bugs/484 index 2952867..62bfb83 100644 --- a/.bugs/484 +++ b/.bugs/484 @@ -1,10 +1,12 @@ Title: StatsGroupBy -> Columns Component: docu +State: done +Class: bug Benefit: 1 -State: open Cost: 1 Date: 2011-12-08 11:24:40 Targetversion: 1.1.12 -Class: bug Update the documentation., + +2011-12-14 10:06:19: changed state open -> done

12 years, 9 months

Check_MK Git: check_mk: Windows: fix timestamp computation

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 2eaced2866a4590fb1792d4e5b8edd868f463026 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2eaced2866a459… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 14 09:47:02 2011 +0100 Windows: fix timestamp computation --- agents/windows/check_mk.ini | 2 -- agents/windows/check_mk_agent.cc | 11 +++++++---- agents/windows/check_mk_agent.exe | Bin 102912 -> 102912 bytes 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/agents/windows/check_mk.ini b/agents/windows/check_mk.ini index 5b82eb1..0f94b3d 100644 --- a/agents/windows/check_mk.ini +++ b/agents/windows/check_mk.ini @@ -14,7 +14,6 @@ # Just output certain sections (e.g. for upper hosts) # sections = check_mk plugins df - sections = fileinfo [winperf] @@ -44,4 +43,3 @@ [fileinfo] # path = C:\Programs\Foo\*.log # path = M:\Bar Test\*.* - path = M:\*.* diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index 2cc1083..508c9d5 100755 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -288,11 +288,14 @@ double current_time() return file_time(&filetime); } +#define WINDOWS_TICK 10000000 +#define SEC_TO_UNIX_EPOCH 11644473600LL double file_time(const FILETIME *filetime) { - unsigned long long ft = (unsigned long long)(filetime->dwLowDateTime) - + (((unsigned long long)filetime->dwHighDateTime) << 32); - return ft / 10000000.0; + _ULARGE_INTEGER uli; + uli.LowPart = filetime->dwLowDateTime; + uli.HighPart = filetime->dwHighDateTime; + return double(uli.QuadPart / (double)WINDOWS_TICK - SEC_TO_UNIX_EPOCH); } char *lstrip(char *s) @@ -339,7 +342,7 @@ void char_replace(char what, char into, char *in) void section_systemtime(SOCKET &out) { output(out, "<<<systemtime>>>\n"); - output(out, "%ld\n", time(0)); + output(out, "%.0f\n", current_time()); } // .----------------------------------------------------------------------. diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index b912cbd..1a87076 100755 Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe differ

12 years, 9 months

Check_MK Git: check_mk: Try to fix view count again

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: cd118e089b582dacd12aacad4daaa1a543870073 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cd118e089b582d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 14 09:29:11 2011 +0100 Try to fix view count again --- web/htdocs/views.py | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/web/htdocs/views.py b/web/htdocs/views.py index e259d3a..0da8881 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -1262,6 +1262,8 @@ def show_view(view, show_heading = False, show_buttons = True, # TODO: Use livestatus Stats: instead of fetching rows! if only_count: + for varname, value in view["hard_filtervars"]: + html.del_var(varname, value) return len(rows) # Set browser reload

12 years, 9 months

Check_MK Git: check_mk: Fixed typo

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 3c07bea6eaff20877cebf2875ee7919457da1bb5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3c07bea6eaff20… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Wed Dec 14 09:28:15 2011 +0100 Fixed typo --- web/htdocs/views.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 8b51e27..e259d3a 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -1186,7 +1186,7 @@ def show_view(view, show_heading = False, show_buttons = True, sorter_list = html.has_var('sort') and parse_url_sorters(html.var('sort')) or view["sorters"] sorters = [ (multisite_sorters[s[0]],) + s[1:] for s in sorter_list ] else: - sorter_list = [] + sorters = [] # Prepare gropuing information group_painters = [ (multisite_painters[e[0]],) + e[1:] for e in view["group_painters"] ]

12 years, 9 months

Check_MK Git: check_mk: Merge

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 8d319d069021f51c346bdb3827b06066cfe73aa5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8d319d069021f5… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Wed Dec 14 09:19:34 2011 +0100 Merge ---

12 years, 9 months

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

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 259b73295ed0c522d36ee08874a03ce909984c15 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=259b73295ed0c5… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Tue Dec 13 15:56:39 2011 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 9 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits