Checkmk git commits December 2011

checkmk-commits@lists.checkmk.com

3 participants
336 discussions

Check_MK Git: check_mk: lnx_if: add further missing old config variable

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 7a05eb87703c732754278a246c7b723e45b2ee10 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7a05eb87703c73… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 14 16:30:33 2011 +0100 lnx_if: add further missing old config variable --- checks/if.include | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/checks/if.include b/checks/if.include index 17a6209..794f3c9 100644 --- a/checks/if.include +++ b/checks/if.include @@ -39,7 +39,9 @@ factory_settings["if_default_levels"] = { # Obsolete variable, but needed as contained in autochecks of # older checks. We need to keep this up for a few years... -if_default_error_levels = if_default_levels["errors"] +if_default_error_levels = factory_settings["if_default_levels"]["errors"] +if_default_traffic_levels = None +if_default_average = None if_disable_if64_hosts = [] # Binary host list for disabling if64 on some broken devices

12 years, 9 months

Check_MK Git: check_mk: Further fix of the fix to lnx_if

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: c088ed1cea1adf0494952a801283935753bda979 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c088ed1cea1adf… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 14 16:34:39 2011 +0100 Further fix of the fix to lnx_if --- checks/if.include | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/checks/if.include b/checks/if.include index 794f3c9..230530a 100644 --- a/checks/if.include +++ b/checks/if.include @@ -40,7 +40,7 @@ factory_settings["if_default_levels"] = { # Obsolete variable, but needed as contained in autochecks of # older checks. We need to keep this up for a few years... if_default_error_levels = factory_settings["if_default_levels"]["errors"] -if_default_traffic_levels = None +if_default_traffic_levels = None, None if_default_average = None if_disable_if64_hosts = [] # Binary host list for disabling if64 on some broken devices

12 years, 9 months

Check_MK Git: check_mk: heartbeat_crm: apply patches from Václav Ovsík

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 696d82677d2b74570091e0d8ba26f8d4f58915f7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=696d82677d2b74… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 14 16:47:46 2011 +0100 heartbeat_crm: apply patches from Václav Ovsík --- ChangeLog | 2 ++ agents/check_mk_agent.linux | 4 ++-- checks/heartbeat_crm | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index ceda8f6..2db796d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -84,6 +84,8 @@ * logwatch: allow to classify messages based on their count (see man page of logwatch for details) * fileinfo: new check for monitoring age and size of files + * heartbeat_crm: apply patches from Václav Ovsík, so that the check + should work on Debian now. 1.1.12p5: Multisite: diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index 9e0b9bc..bcdf02e 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -330,9 +330,9 @@ fi if which cl_status > /dev/null 2>&1; then # Different handling for heartbeat clusters with and without CRM # for the resource state - if [ -S /var/run/heartbeat/crm/cib_ro ]; then + if [ -S /var/run/heartbeat/crm/cib_ro -o -S /var/run/crm/cib_ro ]; then echo '<<<heartbeat_crm>>>' - crm_mon -1 -r | grep -v ^$ | sed 's/^\s/_/g' + crm_mon -1 -r | grep -v ^$ | sed '/^\sResource Group:/,$ s/^\s//; s/^\s/_/g' else echo '<<<heartbeat_rscstatus>>>' cl_status rscstatus diff --git a/checks/heartbeat_crm b/checks/heartbeat_crm index 2f7b8f4..0c5444b 100644 --- a/checks/heartbeat_crm +++ b/checks/heartbeat_crm @@ -64,7 +64,7 @@ def heartbeat_crm_parse_general(info, dc = '', numNodes = -1, numResources = -1) lastUpdated = ' '.join(line[2:]) elif dc == '' and ' '.join(line[0:2]) == 'Current DC:' and heartbeat_crm_naildown: dc = line[2] - elif numNodes == -1 and ' '.join(line[1:3]) == 'Nodes configured.': + elif numNodes == -1 and ' '.join(line[1:3])[:-1] == 'Nodes configured': numNodes = int(line[0]) elif numResources == -1 and ' '.join(line[1:3]) == 'Resources configured.': numResources = int(line[0])

12 years, 9 months

Check_MK Git: check_mk: Removed debug output from lnx_if

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 1be2dcd180c084077eac2cfbcc993d2df64a2a2d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1be2dcd180c084… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 14 16:25:35 2011 +0100 Removed debug output from lnx_if --- checks/lnx_if | 2 -- modules/check_mk_base.py | 1 + 2 files changed, 1 insertions(+), 2 deletions(-) diff --git a/checks/lnx_if b/checks/lnx_if index 642a376..b75b062 100644 --- a/checks/lnx_if +++ b/checks/lnx_if @@ -69,7 +69,6 @@ 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"] @@ -138,7 +137,6 @@ 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)) diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index 01d6cca..3d1feac 100755 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -729,6 +729,7 @@ def check_unimplemented(checkname, params, info): # Loops over all checks for a host, gets the data, calls the check # function that examines that data and sends the result to Nagios def do_all_checks_on_host(hostname, ipaddress): + import time ; time.sleep(5) global g_aggregated_service_results g_aggregated_service_results = {} global g_hostname

12 years, 9 months

Check_MK Git: check_mk: FIX: fix dashboard dashlet background on IE

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 2338045e8c8c845302434a65d1202c246f84d5d5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2338045e8c8c84… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 14 16:05:07 2011 +0100 FIX: fix dashboard dashlet background on IE --- ChangeLog | 1 + web/htdocs/dashboard.css | 2 +- web/htdocs/dashboard.py | 2 +- web/htdocs/views.css | 4 ++-- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index f27461b..ceda8f6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -90,6 +90,7 @@ * FIX: fix hitting enter in Quicksearch on IE 8 * FIX: event/log views: reverse sorting, so that newest entries are shown first + * FIX: fix dashboard dashlet background on IE Checks & Agents: * FIX: lnx_if: assume interfaces as up if ethtool is missing or diff --git a/web/htdocs/dashboard.css b/web/htdocs/dashboard.css index 488fe8e..d060b69 100644 --- a/web/htdocs/dashboard.css +++ b/web/htdocs/dashboard.css @@ -54,7 +54,7 @@ div.dashlet div.dashlet_inner.background { } div.dashlet iframe { - border-style: none; + border-style: none; } div.dashlet div.title { diff --git a/web/htdocs/dashboard.py b/web/htdocs/dashboard.py index 283fab9..44ceba8 100644 --- a/web/htdocs/dashboard.py +++ b/web/htdocs/dashboard.py @@ -193,7 +193,7 @@ def render_dashlet(nr, dashlet, wato_folder): if "content" in dashlet: # fixed content html.write(dashlet["content"]) elif "iframe" in dashlet: # fixed content containing iframe - html.write('<iframe width="100%%" height="100%%" src="%s"></iframe>' % + html.write('<iframe allowTransparency="true" frameborder="0" width="100%%" height="100%%" src="%s"></iframe>' % add_wato_folder_to_url(dashlet["iframe"], wato_folder)) html.write("</div></div>\n") diff --git a/web/htdocs/views.css b/web/htdocs/views.css index 4ab9cd8..56dc248 100644 --- a/web/htdocs/views.css +++ b/web/htdocs/views.css @@ -27,8 +27,8 @@ Boston, MA 02110-1301 USA. /* special background for embedded views */ body.main.dashlet { - background-image: none; - /* background-color: #709aa5; */ + background-image: none; + background: transparent; padding: 0px; }

12 years, 9 months

Check_MK Git: check_mk: Multisite: fix context button color

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 7f44b832a8fcb297b021dd39f489f8826a4d382e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7f44b832a8fcb2… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 14 15:03:24 2011 +0100 Multisite: fix context button color --- web/htdocs/htmllib.py | 2 +- web/htdocs/views.py | 3 ++- web/plugins/views/mobile.py | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 7d97a3a..08241cf 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -369,7 +369,7 @@ class html: self.write('<a href="%s"' % url) if bestof: self.write(' onmousedown="count_context_button(this); document.location=this.href; " ') - self.write('>%s</a></div>' % title) + self.write('>%s</a></div>\n' % title) def context_button_hover_code(self, what): self.write(r'''onmouseover='this.style.backgroundImage="url(\"images/contextlink%s_hi.png\")";' ''' % what) diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 95f23b8..b8abfbe 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -1648,7 +1648,8 @@ def show_context_links(thisview, active_filters): links = collect_context_links(thisview, active_filters) for view, linktitle, uri, icon, buttonid in links: - html.context_button(linktitle, uri, icon, buttonid, bestof=config.context_buttons_to_show) + if not view.get("mobile"): + html.context_button(linktitle, url=uri, icon=icon, id=buttonid, bestof=config.context_buttons_to_show) execute_hooks('buttons-end') html.end_context_buttons() diff --git a/web/plugins/views/mobile.py b/web/plugins/views/mobile.py index d651e38..85d33d8 100644 --- a/web/plugins/views/mobile.py +++ b/web/plugins/views/mobile.py @@ -594,7 +594,7 @@ multisite_builtin_views.update({ ('log_plugin_output', None), ], 'show_filters': ['logtime'], - 'sorters': [('log_time', False), ('log_lineno', False], + 'sorters': [('log_time', False), ('log_lineno', False)], 'title': _('Events of service')}), #All Notfications of a contact

12 years, 9 months

Check_MK Git: check_mk: Fix syntax error in views

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 71d75ec270416e5a83f22ba49dd825b28d15ce13 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=71d75ec270416e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 14 14:58:16 2011 +0100 Fix syntax error in views --- web/plugins/views/mobile.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/plugins/views/mobile.py b/web/plugins/views/mobile.py index 5a589fa..d651e38 100644 --- a/web/plugins/views/mobile.py +++ b/web/plugins/views/mobile.py @@ -489,7 +489,7 @@ multisite_builtin_views.update({ ('log_plugin_output', None)], 'public': True, 'show_filters': [], - 'sorters': [('log_time', False), ('log_lineno', False], + 'sorters': [('log_time', False), ('log_lineno', False)], 'title': 'Events', 'topic': _('Events')}),

12 years, 9 months

Check_MK Git: check_mk: MobileUI: New mobile views

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: a27aa93dac3fa80644163856a25e17945db9d0fc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a27aa93dac3fa8… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Wed Dec 14 14:39:53 2011 +0100 MobileUI: New mobile views --- web/htdocs/mobile.css | 5 + web/htdocs/mobile.py | 20 +-- web/plugins/views/mobile.py | 461 ++++++++++++++++++++++++++++------------- web/plugins/views/painters.py | 24 ++- 4 files changed, 347 insertions(+), 163 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=a27aa93dac…

12 years, 9 months

Check_MK Git: check_mk: Fixed ChangeLog

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: de1ef0db9ac6cb97be58d483bcdc6fb07591e933 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=de1ef0db9ac6cb… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 14 14:24:37 2011 +0100 Fixed ChangeLog --- ChangeLog | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8545395..ae88a2a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -34,6 +34,8 @@ 1.1.12p5: Multisite: * FIX: fix hitting enter in Quicksearch on IE 8 + * FIX: event/log views: reverse sorting, so that newest entries + are shown first Checks & Agents: * FIX: lnx_if: assume interfaces as up if ethtool is missing or

12 years, 9 months

Check_MK Git: check_mk: Fixed ChangeLog

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 61af65678dcad41d84cf94679a2c21ccbf39961b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=61af65678dcad4… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 14 14:33:11 2011 +0100 Fixed ChangeLog --- ChangeLog | 96 ++++++++++++++++++++++++++++++++---------------------------- 1 files changed, 51 insertions(+), 45 deletions(-) diff --git a/ChangeLog b/ChangeLog index ae88a2a..f27461b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,48 +1,4 @@ 1.1.13i1: - Core, Setup, etc.: - * New configuration variable static_checks[] (used by WATO) - * New configuration variable checkgroup_parameters (mainly for WATO) - * check_submission defaults now to "file" (was "pipe") - * Added pre-configured notification via cmk --notify - * Drop RRA-configuration files for PNP4Nagios completely - - Checks & Agents: - * if/if64: new ruleset if_disable_if64_hosts, that force if on - hosts the seem to support if64 - * Windows agent: new config variable "sections" in [global], that - allows to configure which sections are being output. - * Windows agent: in [logwatch] you can now configure which logfiles - to process and which levels of messages to send. - * Windows agent: new config variable "host" in all sections that - restricts the folling entries to certain hosts. - * Windows agent: finally implemented <<<mrpe>>. See check_mk.ini - for examples. - * Windows agent: do not execute *.txt and *.dir in <<<plugins>>> and - <<<local>>> - * Windows agent: make extensions to execute configurable (see - example check_mk.ini) - * Windows agent: agent now reuses TCP port even when taskkill'ed, so - a system reboot is (hopefully) not neccessary anymore - * Windows agent: section <<<df>>> now also outputs junctions (windows - mount points). No external plugin is needed. - * Windows agent: new section <<<fileinfo>>> for monitoring file sizes - (and later possible ages) - * logwatch: allow to classify messages based on their count (see - man page of logwatch for details) - * fileinfo: new check for monitoring age and size of files - -1.1.12p5: - Multisite: - * FIX: fix hitting enter in Quicksearch on IE 8 - * FIX: event/log views: reverse sorting, so that newest entries - are shown first - - 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 @@ -97,13 +53,63 @@ to set number of processes. Nagios will not fork() anymore for check exection. * New columns num_hosts and num_services in status table * New aggregation functions suminv and avginv (see Documentation) + Core, Setup, etc.: + * New configuration variable static_checks[] (used by WATO) + * New configuration variable checkgroup_parameters (mainly for WATO) + * check_submission defaults now to "file" (was "pipe") + * Added pre-configured notification via cmk --notify + * Drop RRA-configuration files for PNP4Nagios completely + + Checks & Agents: + * if/if64: new ruleset if_disable_if64_hosts, that force if on + hosts the seem to support if64 + * Windows agent: new config variable "sections" in [global], that + allows to configure which sections are being output. + * Windows agent: in [logwatch] you can now configure which logfiles + to process and which levels of messages to send. + * Windows agent: new config variable "host" in all sections that + restricts the folling entries to certain hosts. + * Windows agent: finally implemented <<<mrpe>>. See check_mk.ini + for examples. + * Windows agent: do not execute *.txt and *.dir in <<<plugins>>> and + <<<local>>> + * Windows agent: make extensions to execute configurable (see + example check_mk.ini) + * Windows agent: agent now reuses TCP port even when taskkill'ed, so + a system reboot is (hopefully) not neccessary anymore + * Windows agent: section <<<df>>> now also outputs junctions (windows + mount points). No external plugin is needed. + * Windows agent: new section <<<fileinfo>>> for monitoring file sizes + (and later possible ages) + * logwatch: allow to classify messages based on their count (see + man page of logwatch for details) + * fileinfo: new check for monitoring age and size of files + +1.1.12p5: + Multisite: + * FIX: fix hitting enter in Quicksearch on IE 8 + * FIX: event/log views: reverse sorting, so that newest entries + are shown first + + 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: * FIX: sidebar snapin Hostgroups and Servicegroups sometimes failed with non-existing "available_views". * FIX: Fix host related WATO context button links to point to the hosts site - * FIX: Fixed view editor redirection to new view after changing the view_name + * FIX: Fixed view editor redirection to new view after changing the view_name + * FIX: Made icon painter usable when displaying hostgroup rows + * Logwatch: Switched strings in logwatch to i18n strings + * Logwatch: Fixed styling of context button when acknowleding log messages + * Logwatch: Implemented overview page to show all problematic logfiles + + WATO: + * FIX: add missing icon_csv.png + * FIX: WATO did not write values of custom macros to extra_host_conf definitions 1.1.12p3: Core, Setup, etc.:

12 years, 9 months

← Newer
1
...
18
19
20
21
22
23
24
...
34
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits December 2011