Checkmk git commits October 2013

checkmk-commits@lists.checkmk.com

6 participants
384 discussions

Check_MK Git: check_mk: logwatch.ec: No longer forwards 'I'

by Andreas Boesl

lines to event console Message-ID: <525fdaea.+tVfeto1Ptz5PYkV%ab(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.4 7/29/08 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: e4fe62b8c452714c114ea8f6a47369b0673de5a0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e4fe62b8c45271… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Oct 17 14:41:09 2013 +0200 logwatch.ec: No longer forwards 'I' lines to event console --- ChangeLog | 1 + checks/logwatch | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index dc72ce3..e4ae473 100644 --- a/ChangeLog +++ b/ChangeLog @@ -45,6 +45,7 @@ * FIX: esx_vsphere_hostsystem: fixed bug in handling of params * FIX: local: tolerate invalid output lines * FIX: hp_proliant: Correct handling of missing snmp data + * FIX: logwatch.ec: No longer forwards "I" lines to event console WATO: * You can now have site-specific global settings when using diff --git a/checks/logwatch b/checks/logwatch index c3d10e5..07c8091 100644 --- a/checks/logwatch +++ b/checks/logwatch @@ -451,8 +451,8 @@ def check_logwatch_ec(item, params, info): logs.setdefault(logfile, []) elif logfile and line: - # new regular line, skip context lines - if line[0] != '.': + # new regular line, skip context lines and ignore lines + if line[0] not in ['.', 'I']: logs[logfile].append(line) # 2. Maybe filter logfiles if some should be excluded

10 years, 11 months

Check_MK Git: check_mk: mkeventd: fixed error in Makefile

by Andreas Boesl

Module: check_mk Branch: master Commit: bfe855a4bde8ccbf32b63540ab679b1c2b27bd8c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bfe855a4bde8cc… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Oct 17 13:34:11 2013 +0200 mkeventd: fixed error in Makefile --- mkeventd/lib/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mkeventd/lib/Makefile b/mkeventd/lib/Makefile index 9e9c3c4..278d8f7 100644 --- a/mkeventd/lib/Makefile +++ b/mkeventd/lib/Makefile @@ -22,9 +22,9 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -all: check_mkevents +all: check_mkevents_c -check_mkevents: check_mkevents.cpp +check_mkevents_c: g++ -O2 -o check_mkevents_c check_mkevents.cpp clean:

10 years, 11 months

Check_MK Git: check_mk: It is now possible to enforce checkboxes in views upon view loading

by Lars Michelsen

Module: check_mk Branch: master Commit: 1839c3c145ec5c3b3ed21b258e9e23cee33036de URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1839c3c145ec5c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Oct 17 13:28:10 2013 +0200 It is now possible to enforce checkboxes in views upon view loading --- ChangeLog | 2 ++ web/htdocs/views.py | 10 ++++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3b0168d..fcaa1e4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -17,6 +17,8 @@ are omitted, since they do not really matter and make the results less useful when using CMC. * Added host aliases filter to some views (host/service search) + * It is now possible to enforce checkboxes in views upon view loading + (needs to be confgured per view via the view editor) * FIX: Fixed encoding problem in webservice column output * FIX: Fix output format python for several numeric columns * FIX: Fixed searching hosts by aliases/adresses diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 836f4b3..bd0c839 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -637,8 +637,11 @@ def page_edit_view(): html.write(" \n") html.checkbox("mobile", label=_('show this view in the Mobile GUI')) html.write(" \n") - html.checkbox("mustsearch", label=_('show data only on search') + " ") + html.checkbox("mustsearch", label=_('show data only on search')) + html.write(" \n") html.checkbox("hidebutton", label=_('do not show a context button to this view')) + html.write(" \n") + html.checkbox("force_checkboxes", label = _('always show the checkboxes')) forms.section(_("Automatic page reload")) html.write(_("Reload page every ")) @@ -880,6 +883,7 @@ def load_view_into_html_vars(view): html.set_var("hidden", view["hidden"] and "on" or "") html.set_var("mobile", view.get("mobile") and "on" or "") html.set_var("mustsearch", view["mustsearch"] and "on" or "") + html.set_var("force_checkboxes", view.get("force_checkboxes", False) and "on" or "") html.set_var("hidebutton", view.get("hidebutton", False) and "on" or "") html.set_var("user_sortable", view.get("user_sortable", True) and "on" or "") @@ -1010,6 +1014,7 @@ def create_view(vs): hidden = html.var("hidden", "") != "" mobile = html.var("mobile", "") != "" mustsearch = html.var("mustsearch", "") != "" + force_checkboxes = html.var("force_checkboxes", "") != "" hidebutton = html.var("hidebutton", "") != "" column_headers = html.var("column_headers") user_sortable = html.var("user_sortable") @@ -1093,6 +1098,7 @@ def create_view(vs): "hidden" : hidden, "mobile" : mobile, "mustsearch" : mustsearch, + "force_checkboxes" : force_checkboxes, "hidebutton" : hidebutton, "layout" : layoutname, "num_columns" : num_columns, @@ -1254,7 +1260,7 @@ def show_view(view, show_heading = False, show_buttons = True, num_columns = vo.get("num_columns", view.get("num_columns", 1)) browser_reload = vo.get("refresh", view.get("browser_reload", None)) - show_checkboxes = html.var('show_checkboxes', '0') == '1' + show_checkboxes = view.get("force_checkboxes", html.var('show_checkboxes', '0') == '1') # Get the datasource (i.e. the logical table) datasource = multisite_datasources[view["datasource"]]

10 years, 11 months

Check_MK Git: check_mk: FIX: hp_proliant: Correct handling of missing snmp data

by Lars Michelsen

Module: check_mk Branch: master Commit: 351bb6d0dc40ad52ba6fed76242bfe83889c770d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=351bb6d0dc40ad… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Oct 17 12:53:07 2013 +0200 FIX: hp_proliant: Correct handling of missing snmp data --- ChangeLog | 1 + checks/hp_proliant | 2 ++ 2 files changed, 3 insertions(+) diff --git a/ChangeLog b/ChangeLog index 2b4db02..3b0168d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -39,6 +39,7 @@ * FIX: esx_vsphere_counters: added missing ramdisk type upgradescratch * FIX: esx_vsphere_hostsystem: fixed bug in handling of params * FIX: local: tolerate invalid output lines + * FIX: hp_proliant: Correct handling of missing snmp data WATO: * You can now have site-specific global settings when using diff --git a/checks/hp_proliant b/checks/hp_proliant index 1d9a49a..417354c 100644 --- a/checks/hp_proliant +++ b/checks/hp_proliant @@ -37,6 +37,8 @@ def inventory_proliant_general(info): return [ (None, None) ] def check_proliant_general(item, no_params, info): + if not info: + return 3, "status not found in snmp data" snmp_state = hp_proliant_general_status_map[int(info[0][0])] status = hp_proliant_general_status2nagios_map[snmp_state] return (status, "General Status is %s (Firmware: %s, S/N: %s)" %

10 years, 11 months

Check_MK Git: check_mk: mkeventd. fixed typo in Makefile

by Andreas Boesl

Module: check_mk Branch: master Commit: cd99e4aebbaa15f7381381bd7933739753215810 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cd99e4aebbaa15… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Oct 17 13:18:59 2013 +0200 mkeventd. fixed typo in Makefile --- mkeventd/lib/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mkeventd/lib/Makefile b/mkeventd/lib/Makefile index 1361349..9e9c3c4 100644 --- a/mkeventd/lib/Makefile +++ b/mkeventd/lib/Makefile @@ -28,4 +28,4 @@ check_mkevents: check_mkevents.cpp g++ -O2 -o check_mkevents_c check_mkevents.cpp clean: - rm -f checkmk_events_c + rm -f check_mkevents_c

10 years, 11 months

Check_MK Git: check_mk: change check_tcp custom service description to TextUnicode

by Andreas Boesl

Module: check_mk Branch: master Commit: be27bfdc226b1a648ba488172b052468293b2e13 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=be27bfdc226b1a… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Oct 17 12:51:58 2013 +0200 change check_tcp custom service description to TextUnicode --- web/plugins/wato/active_checks.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/plugins/wato/active_checks.py b/web/plugins/wato/active_checks.py index 52d46d2..894d31f 100644 --- a/web/plugins/wato/active_checks.py +++ b/web/plugins/wato/active_checks.py @@ -240,7 +240,7 @@ register_rule(group, "will be done instead of using the IP address of the host " "as configured in your host properties."))), ( "svc_description", - TextAscii( + TextUnicode( title = _("Custom service description"), allow_empty = False, help = _("Here you can specify a custom service description. "

10 years, 11 months

Check_MK Git: check_mk: check_mkevents now available as C binary: check_mkevents_c

by Andreas Boesl

Module: check_mk Branch: master Commit: 53f1ba63f8839982460300a7486dda9cd95b6e21 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=53f1ba63f88399… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Oct 17 10:22:06 2013 +0200 check_mkevents now available as C binary: check_mkevents_c --- ChangeLog | 3 + mkeventd/bin/mkeventd | 24 +++- mkeventd/lib/.gitignore | 1 + mkeventd/lib/Makefile | 31 +++++ mkeventd/lib/check_mkevents.cpp | 239 +++++++++++++++++++++++++++++++++++++++ 5 files changed, 294 insertions(+), 4 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=53f1ba63f8…

10 years, 11 months

Check_MK Git: check_mk: Added host aliases filter to some views (host/ service search)

by Lars Michelsen

Module: check_mk Branch: master Commit: c75867eec64f2d41083f648165fe1e250a79b4ab URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c75867eec64f2d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Oct 15 14:05:46 2013 +0200 Added host aliases filter to some views (host/service search) --- ChangeLog | 1 + web/plugins/views/builtin.py | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 4f30137..cd5767d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -16,6 +16,7 @@ * Speed-O-Meter: now measure only service checks. Host checks are omitted, since they do not really matter and make the results less useful when using CMC. + * Added host aliases filter to some views (host/service search) * FIX: Fixed encoding problem in webservice column output * FIX: Fix output format python for several numeric columns * FIX: Fixed searching hosts by aliases/adresses diff --git a/web/plugins/views/builtin.py b/web/plugins/views/builtin.py index e1d844b..cf96191 100644 --- a/web/plugins/views/builtin.py +++ b/web/plugins/views/builtin.py @@ -58,7 +58,8 @@ multisite_builtin_views.update({ 'host_notifications_enabled', 'opthostgroup', 'host_check_command', - 'opthost_contactgroup'], + 'opthost_contactgroup', + 'hostalias'], 'sorters': [('site', False), ('site_host', False)], 'title': _('All hosts'), 'topic': _('Hosts')}, @@ -1035,6 +1036,7 @@ multisite_builtin_views.update({ 'host_notif_number', 'host_staleness', 'host_tags', + 'hostalias', ], 'sorters': [], 'title': _('Host search'), @@ -1114,6 +1116,7 @@ multisite_builtin_views.update({ 'svc_notif_number', 'service_staleness', 'host_tags', + 'hostalias', ], 'sorters': [('site', False), ('site_host', False),

10 years, 11 months

Check_MK Git: check_mk: FIX: Ignoring snmp check intervall in interactive mode of check_mk

by Lars Michelsen

Module: check_mk Branch: master Commit: 1751131db7b2eb587b2eac876fdd1920195316b1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1751131db7b2eb… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Oct 15 14:05:01 2013 +0200 FIX: Ignoring snmp check intervall in interactive mode of check_mk --- ChangeLog | 1 + modules/check_mk_base.py | 1 + 2 files changed, 2 insertions(+) diff --git a/ChangeLog b/ChangeLog index 4b76ec7..4f30137 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,6 +10,7 @@ * Automatically remove duplicate checks when monitoring with Agent+SNMP at the same time. TCP based ones have precedence. * inventory check of SNMP devices now does scan per default (configurable) + * FIX: Ignore snmp_check_interval cache in interactive situations (e.g. -nv) Multisite: * Speed-O-Meter: now measure only service checks. Host checks diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index a47207e..205109c 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -342,6 +342,7 @@ def get_realhost_info(hostname, ipaddress, check_type, max_cache_age, ignore_che cache_path = tcp_cache_dir + "/" + cache_relpath check_interval = check_interval_of(hostname, check_type) if not ignore_check_interval \ + and not opt_dont_submit \ and check_interval is not None and os.path.exists(cache_path) \ and cachefile_age(cache_path) < check_interval * 60: # cache file is newer than check_interval, skip this check

10 years, 11 months

Check_MK Git: check_mk: Updated bug

by Lars Michelsen

Module: check_mk Branch: master Commit: 98ce36fde9bda8bfbbb724a51e5acd2a722f48ad URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=98ce36fde9bda8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Oct 15 14:45:16 2013 +0200 Updated bug --- .bugs/1023 | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/.bugs/1023 b/.bugs/1023 index 2a5acd7..8b699bd 100644 --- a/.bugs/1023 +++ b/.bugs/1023 @@ -8,21 +8,21 @@ Class: bug We use the option s.UseSprintValue = 1 to make the netsnmp libraries translate some values for us. Problem arises when some mibs are installed which lead to translated values, e.g.: -OMD[ber]:~$ cmk --debug -nv bervm002.vm.bbf.local +OMD[ber]:~$ cmk --debug -nv wasweisichfuereinhost Check_mk version 2013.10.14 Connecting via TCP to 10.55.10.32:6556. CPU utilization OK - 0.3% used, 16 CPUs Check_MK Agent Version OK - windows / 1.2.1i4 Disk IO SUMMARY OK - 0.00B/sec read, 225.21kB/sec write, IOs: 56.36/sec, Read Queue: 0.00, Write Queue: 0.26 -bervm002.vm.bbf.local 10.55.10.32 ('.1.3.6.1.4.1.232', ['11.1.3.0', '11.2.14.1.1.5.0', '2.2.2.1.0']) -Executing BULKWALK of ".1.3.6.1.4.1.232.11.1.3" on bervm002.vm.bbf.local +wasweisichfuereinhost 10.55.10.32 ('.1.3.6.1.4.1.232', ['11.1.3.0', '11.2.14.1.1.5.0', '2.2.2.1.0']) +Executing BULKWALK of ".1.3.6.1.4.1.232.11.1.3" on wasweisichfuereinhost .1.3.6.1.4.1.232.11.1.3.0 => [unknown] 'INTEGER' -Executing BULKWALK of ".1.3.6.1.4.1.232.11.2.14.1.1.5" on bervm002.vm.bbf.local +Executing BULKWALK of ".1.3.6.1.4.1.232.11.2.14.1.1.5" on wasweisichfuereinhost .1.3.6.1.4.1.232.11.2.14.1.1.5.0 => [5.12] 'OCTETSTR' .1.3.6.1.4.1.232.11.2.14.1.1.5.1 => [2011.05.05] 'OCTETSTR' .1.3.6.1.4.1.232.11.2.14.1.1.5.2 => [2.07] 'OCTETSTR' .1.3.6.1.4.1.232.11.2.14.1.1.5.3 => [2.9] 'OCTETSTR' -Executing BULKWALK of ".1.3.6.1.4.1.232.2.2.2.1" on bervm002.vm.bbf.local +Executing BULKWALK of ".1.3.6.1.4.1.232.2.2.2.1" on wasweisichfuereinhost .1.3.6.1.4.1.232.2.2.2.1.0 => [CZ20258062] 'OCTETSTR' Traceback (most recent call last): File "/omd/sites/ber/share/check_mk/modules/check_mk.py", line 5701, in <module> @@ -38,34 +38,34 @@ ValueError: invalid literal for int() with base 10: 'unknown' and without: -OMD[ber]:~$ cmk --debug -nv bervm002.vm.bbf.local +OMD[ber]:~$ cmk --debug -nv wasweisichfuereinhost Check_mk version 2013.10.14 Connecting via TCP to 10.55.10.32:6556. CPU utilization OK - 100.0% used, 16 CPUs Check_MK Agent Version OK - windows / 1.2.1i4 Disk IO SUMMARY OK - 0.00B/sec read, 97.94kB/sec write, IOs: 24.58/sec, Read Queue: 0.00, Write Queue: 0.13 -bervm002.vm.bbf.local 10.55.10.32 ('.1.3.6.1.4.1.232', ['11.1.3.0', '11.2.14.1.1.5.0', '2.2.2.1.0']) -Executing BULKWALK of ".1.3.6.1.4.1.232.11.1.3" on bervm002.vm.bbf.local +wasweisichfuereinhost 10.55.10.32 ('.1.3.6.1.4.1.232', ['11.1.3.0', '11.2.14.1.1.5.0', '2.2.2.1.0']) +Executing BULKWALK of ".1.3.6.1.4.1.232.11.1.3" on wasweisichfuereinhost .1.3.6.1.4.1.232.11.1.3.0 => [1] 'INTEGER' -Executing BULKWALK of ".1.3.6.1.4.1.232.11.2.14.1.1.5" on bervm002.vm.bbf.local +Executing BULKWALK of ".1.3.6.1.4.1.232.11.2.14.1.1.5" on wasweisichfuereinhost .1.3.6.1.4.1.232.11.2.14.1.1.5.0 => [5.12] 'OCTETSTR' .1.3.6.1.4.1.232.11.2.14.1.1.5.1 => [2011.05.05] 'OCTETSTR' .1.3.6.1.4.1.232.11.2.14.1.1.5.2 => [2.07] 'OCTETSTR' .1.3.6.1.4.1.232.11.2.14.1.1.5.3 => [2.9] 'OCTETSTR' -Executing BULKWALK of ".1.3.6.1.4.1.232.2.2.2.1" on bervm002.vm.bbf.local +Executing BULKWALK of ".1.3.6.1.4.1.232.2.2.2.1" on wasweisichfuereinhost .1.3.6.1.4.1.232.2.2.2.1.0 => [CZ20258062] 'OCTETSTR' General Status OK - General Status is Unknown (Firmware: 5.12, S/N: CZ20258062) -bervm002.vm.bbf.local 10.55.10.32 ('.1.3.6.1.4.1.232.1.2.2.1.1', ['1', '2', '3', '6']) -Executing BULKWALK of ".1.3.6.1.4.1.232.1.2.2.1.1.1" on bervm002.vm.bbf.local +wasweisichfuereinhost 10.55.10.32 ('.1.3.6.1.4.1.232.1.2.2.1.1', ['1', '2', '3', '6']) +Executing BULKWALK of ".1.3.6.1.4.1.232.1.2.2.1.1.1" on wasweisichfuereinhost .1.3.6.1.4.1.232.1.2.2.1.1.1.0 => [0] 'INTEGER' .1.3.6.1.4.1.232.1.2.2.1.1.1.1 => [1] 'INTEGER' -Executing BULKWALK of ".1.3.6.1.4.1.232.1.2.2.1.1.2" on bervm002.vm.bbf.local +Executing BULKWALK of ".1.3.6.1.4.1.232.1.2.2.1.1.2" on wasweisichfuereinhost .1.3.6.1.4.1.232.1.2.2.1.1.2.0 => [0] 'INTEGER' .1.3.6.1.4.1.232.1.2.2.1.1.2.1 => [0] 'INTEGER' -Executing BULKWALK of ".1.3.6.1.4.1.232.1.2.2.1.1.3" on bervm002.vm.bbf.local +Executing BULKWALK of ".1.3.6.1.4.1.232.1.2.2.1.1.3" on wasweisichfuereinhost .1.3.6.1.4.1.232.1.2.2.1.1.3.0 => [Intel Xeon] 'OCTETSTR' .1.3.6.1.4.1.232.1.2.2.1.1.3.1 => [Intel Xeon] 'OCTETSTR' -Executing BULKWALK of ".1.3.6.1.4.1.232.1.2.2.1.1.6" on bervm002.vm.bbf.local +Executing BULKWALK of ".1.3.6.1.4.1.232.1.2.2.1.1.6" on wasweisichfuereinhost .1.3.6.1.4.1.232.1.2.2.1.1.6.0 => [2] 'INTEGER' .1.3.6.1.4.1.232.1.2.2.1.1.6.1 => [2] 'INTEGER' HW CPU 0 OK - CPU0 "Intel Xeon" in slot 0 is in state "ok" @@ -73,3 +73,4 @@ HW CPU 1 OK - CPU1 "Intel Xeon" in slot 0 is in state "ok" Can we switch of the Sprintf option to have the raw values? Which ones need to be translated on our own? +

10 years, 11 months

← Newer
1
...
16
17
18
19
20
21
22
...
39
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits October 2013