Checkmk git commits May 2013

checkmk-commits@lists.checkmk.com

3 participants
111 discussions

Check_MK Git: check_mk: Livestatus: code cleanup, prepare for CMC

by Mathias Kettner

Module: check_mk Branch: master Commit: cefd4d2eb6caf765648adc2a865c037a960d9ba9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cefd4d2eb6caf7… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri May 31 18:56:11 2013 +0200 Livestatus: code cleanup, prepare for CMC --- livestatus/src/AttributelistColumn.cc | 2 + livestatus/src/Column.cc | 15 +- livestatus/src/Column.h | 3 + livestatus/src/ContactgroupsColumn.cc | 37 +-- livestatus/src/ContactgroupsColumn.h | 2 - livestatus/src/CustomVarsFilter.cc | 4 +- livestatus/src/DoublePointerColumn.h | 40 +++ livestatus/src/HostlistColumnFilter.cc | 2 +- livestatus/src/InputBuffer.cc | 1 + livestatus/src/LogCache.cc | 348 +++++++++++--------- livestatus/src/LogCache.h | 4 +- livestatus/src/LogEntry.cc | 566 ++++++++++++++++---------------- livestatus/src/LogEntry.h | 31 +- livestatus/src/Logfile.cc | 4 + livestatus/src/Logfile.h | 2 +- livestatus/src/OffsetStringColumn.h | 1 + livestatus/src/OutputBuffer.cc | 3 +- livestatus/src/PerfdataAggregator.cc | 2 + livestatus/src/Query.cc | 5 +- livestatus/src/Store.cc | 26 +- livestatus/src/Store.h | 2 +- livestatus/src/Table.cc | 2 + livestatus/src/TableCommands.h | 2 +- livestatus/src/TableContactgroups.h | 2 +- livestatus/src/TableContacts.h | 2 +- livestatus/src/TableHostgroups.h | 3 +- livestatus/src/TableHosts.cc | 1 + livestatus/src/TableLog.cc | 3 +- livestatus/src/TableServicegroups.h | 1 - livestatus/src/TableServices.h | 2 +- livestatus/src/TableStateHistory.cc | 17 +- livestatus/src/TableStatus.cc | 2 - livestatus/src/global_counters.h | 3 +- livestatus/src/logger.h | 14 + livestatus/src/module.c | 28 +- livestatus/src/nagios.h | 4 + livestatus/src/pnp4nagios.cc | 2 +- livestatus/src/pnp4nagios.h | 2 +- livestatus/src/strutil.c | 3 + livestatus/src/waittriggers.c | 7 + livestatus/src/waittriggers.h | 10 + 41 files changed, 676 insertions(+), 534 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=cefd4d2eb6…

11 years

Check_MK Git: check_mk: WATO: prepare for CMC

by Mathias Kettner

Module: check_mk Branch: master Commit: f762533507bc26d610dbe6c2b56b90dffa713635 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f762533507bc26… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri May 31 19:00:36 2013 +0200 WATO: prepare for CMC --- web/htdocs/bi.py | 3 ++ web/htdocs/js/wato.js | 19 ++++++----- web/htdocs/sidebar.py | 2 ++ web/htdocs/valuespec.py | 2 +- web/htdocs/wato.py | 68 ++++++++++++++++++++++++++++++---------- web/plugins/sidebar/shipped.py | 6 ++++ web/plugins/views/painters.py | 15 ++++----- 7 files changed, 81 insertions(+), 34 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=f762533507…

11 years

Check_MK Git: check_mk: Core: preparation for CMC, make code more generic

by Mathias Kettner

Module: check_mk Branch: master Commit: 26882bbae09ad9c5533b5642737943f88d3da905 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=26882bbae09ad9… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri May 31 18:58:56 2013 +0200 Core: preparation for CMC, make code more generic --- modules/.f12 | 3 +- modules/automation.py | 49 +++++++----- modules/check_mk.py | 142 ++++++++++++++++++++++++----------- modules/check_mk_base.py | 158 +++++++++++++++++++++++++++++++++++++-- modules/notify.py | 187 +++++++++++++++++++++++++++------------------- modules/prediction.py | 7 -- 6 files changed, 395 insertions(+), 151 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=26882bbae0…

11 years

Check_MK Git: check_mk: Column Perf-O-Meter is now sortable: it sorts after the *first* value

by Mathias Kettner

Module: check_mk Branch: master Commit: 78dae107f01766c3243e3eb482b58b9a92e4f980 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=78dae107f01766… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri May 31 14:42:55 2013 +0200 Column Perf-O-Meter is now sortable: it sorts after the *first* value --- ChangeLog | 3 +++ web/plugins/views/perfometer.py | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index fa16093..c6f7623 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,9 @@ * User accounts can now be locked after a specified amount of auth failures (lock_on_logon_failures can be set to a number of tries) * FIX: better error message in case of exception in SNMP handling + * Column Perf-O-Meter is now sortable: it sorts after the *first* + performance value. This might not always be the one you like, but + its far better than nothing. Checks & Agents: * lnx_if: Fixed crash on missing "Address" field diff --git a/web/plugins/views/perfometer.py b/web/plugins/views/perfometer.py index 9744671..4e17c58 100644 --- a/web/plugins/views/perfometer.py +++ b/web/plugins/views/perfometer.py @@ -191,7 +191,8 @@ multisite_painters["perfometer"] = { "short" : _("Perf-O-Meter"), "columns" : [ "service_perf_data", "service_state", "service_check_command", "service_pnpgraph_present", "service_plugin_output" ], - "paint" : paint_perfometer + "paint" : paint_perfometer, + "sorter" : "svc_perf_val01", } load_web_plugins("perfometer", globals())

11 years

Check_MK Git: check_mk: View "service globally": make sortable by user

by Mathias Kettner

Module: check_mk Branch: master Commit: d210fb1b338edda2a658a8b0eb53ee598ccb7f42 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d210fb1b338edd… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri May 31 14:38:06 2013 +0200 View "service globally": make sortable by user --- web/plugins/views/builtin.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/web/plugins/views/builtin.py b/web/plugins/views/builtin.py index c9bac8d..f79b098 100644 --- a/web/plugins/views/builtin.py +++ b/web/plugins/views/builtin.py @@ -1123,10 +1123,10 @@ multisite_builtin_views.update({ 'linktitle': _('Details'), 'title': _('Service')}, 'servicedesc': {'browser_reload': 30, - 'column_headers': 'off', + 'column_headers': 'pergroup', 'datasource': 'services', 'description': 'All Services with\r\na certain description\r\n', - 'group_painters': [('service_description', 'servicedesc')], + 'group_painters': [], 'hard_filters': [], 'hard_filtervars': [('host', ''), ('st0', 'on'), @@ -1151,6 +1151,7 @@ multisite_builtin_views.update({ 'show_filters': ['hostregex', 'svcstate', 'opthostgroup'], 'sorters': [('site', False), ('site_host', False)], + 'user_sortable' : 'on', 'linktitle': _('Service globally'), 'title': _('All Services with this description:')}, 'servicedescpnp': {'browser_reload': 90,

11 years

Check_MK Git: check_mk: agent_vsphere: Fix missing sensors section when querying vcenter

by Mathias Kettner

Module: check_mk Branch: master Commit: 3dcc2a8b9e5e1d9b42e30aeaf11fbe987e247cf1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3dcc2a8b9e5e1d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri May 31 14:16:00 2013 +0200 agent_vsphere: Fix missing sensors section when querying vcenter --- ChangeLog | 2 ++ agents/special/agent_vsphere | 12 ++++++------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1b539b9..fa16093 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,6 +11,8 @@ * lnx_if: Fixed crash on missing "Address" field * viprinet_router: Now able to set required target state via rule * windows_agent: Now available as 64 bit version + * agent_vsphere: fix problem where sensors were missing when + you queried multiple host systems via vCenter Notifications: * Flexible Notification can now filter service levels diff --git a/agents/special/agent_vsphere b/agents/special/agent_vsphere index 24f4e29..22644d5 100755 --- a/agents/special/agent_vsphere +++ b/agents/special/agent_vsphere @@ -520,12 +520,12 @@ def output_mors(what, properties, direct=False): obj_type = MORTypes.VirtualMachine count = 0 - sections = [] mors = host._retrieve_properties_traversal(property_names=properties.keys(), obj_type=obj_type) if not mors: return for mor in mors: + sections = [] count += 1 # Parse result into a dictionary. Key is the property name, # value is the value (some custom Python classes) @@ -564,12 +564,12 @@ def output_mors(what, properties, direct=False): obj_name = opt_hostname object_collection.append([what, obj_name, running_on, power_state]) + # pprint.pprint(sections) + for section_name, section_lines in sections: + print '<<<%s>>>' % section_name + for line in section_lines: + print line - # pprint.pprint(sections) - for section_name, section_lines in sections: - print '<<<%s>>>' % section_name - for line in section_lines: - print line def output_datastores(): property_names = [

11 years

Check_MK Git: check_mk: Fixed exception when logging in as unknown user

by Mathias Kettner

Module: check_mk Branch: master Commit: 6224e8a5f4d502446163c8ab86ed0854fed696ca URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6224e8a5f4d502… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu May 30 09:56:30 2013 +0200 Fixed exception when logging in as unknown user --- ChangeLog | 1 + web/htdocs/userdb.py | 17 +++++++++-------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9a6dc55..147c735 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,6 +11,7 @@ * lnx_if: Fixed crash on missing "Address" field * viprinet_router: Now able to set required target state via rule * windows_agent: Now available as 64 bit version + Notifications: * Flexible Notification can now filter service levels diff --git a/web/htdocs/userdb.py b/web/htdocs/userdb.py index 2c4f043..5063b53 100644 --- a/web/htdocs/userdb.py +++ b/web/htdocs/userdb.py @@ -126,16 +126,17 @@ def on_succeeded_login(username): def on_failed_login(username): users = load_users() - if "num_failed" in users[username]: - users[username]["num_failed"] += 1 - else: - users[username]["num_failed"] = 1 + if username in users: + if "num_failed" in users[username]: + users[username]["num_failed"] += 1 + else: + users[username]["num_failed"] = 1 - if config.lock_on_logon_failures: - if users[username]["num_failed"] >= config.lock_on_logon_failures: - users[username]["locked"] = True + if config.lock_on_logon_failures: + if users[username]["num_failed"] >= config.lock_on_logon_failures: + users[username]["locked"] = True - save_users(users) + save_users(users) root_dir = defaults.check_mk_configdir + "/wato/" multisite_dir = defaults.default_config_dir + "/multisite.d/wato/"

11 years

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

by Andreas Boesl

Module: check_mk Branch: master Commit: cd27cbc78f96fb7987e11599162e676465b5d55f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cd27cbc78f96fb… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed May 29 08:56:15 2013 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years

Check_MK Git: check_mk: disable 64 bit version until correct 64 bit compiler is found

by Andreas Boesl

Module: check_mk Branch: master Commit: 93ce81010bfc1a8feb1554e6782baddb0d069d1b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=93ce81010bfc1a… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed May 29 08:56:48 2013 +0200 disable 64 bit version until correct 64 bit compiler is found --- agents/windows/Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/agents/windows/Makefile b/agents/windows/Makefile index 768566b..bc4984f 100755 --- a/agents/windows/Makefile +++ b/agents/windows/Makefile @@ -29,7 +29,10 @@ else CXX = mingw32-g++ endif -all: install_agent.exe install_agent-64.exe +all: install_agent.exe + +test.exe: test.cc + $(CXX) -s -O2 -o $@ $< -static -lwsock32 install_agent.exe: check_mk_agent.exe crash.exe nowin.exe if ! which makensis; then \

11 years

Check_MK Git: check_mk: Revert "correct packaging of installer/

by Andreas Boesl

check_mk_agent-64.exe" Message-ID: <51a5a6c0.m8cleIjbSqtmm3s2%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: 9e1f26cc3360d801820b34f69f9e492d0f07f96d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9e1f26cc3360d8… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed May 29 08:55:52 2013 +0200 Revert "correct packaging of installer/check_mk_agent-64.exe" Temporarily remove 64 bit version This reverts commit 9b296792c420ddbe50a03ed086cbb6d63c25dc48. --- Makefile | 2 -- 1 file changed, 2 deletions(-) diff --git a/Makefile b/Makefile index da40d9b..a5a53ca 100644 --- a/Makefile +++ b/Makefile @@ -151,7 +151,6 @@ setversion: sed -i 's/say "Version: .*"/say "Version: $(NEW_VERSION)"/' agents/check_mk_agent.openvms sed -i 's/#define CHECK_MK_VERSION .*/#define CHECK_MK_VERSION "'$(NEW_VERSION)'"/' agents/windows/check_mk_agent.cc ; \ sed -i 's/!define CHECK_MK_VERSION .*/!define CHECK_MK_VERSION "'$(NEW_VERSION)'"/' agents/windows/installer.nsi ; \ - sed -i 's/!define CHECK_MK_VERSION .*/!define CHECK_MK_VERSION "'$(NEW_VERSION)'"/' agents/windows/installer-64.nsi ; \ sed -i 's/^AC_INIT.*/AC_INIT([MK Livestatus], ['"$(NEW_VERSION)"'], [mk(a)mathias-kettner.de])/' livestatus/configure.ac ; \ sed -i 's/^VERSION=".*/VERSION="$(NEW_VERSION)"/' mkeventd/bin/mkeventd ; \ sed -i 's/^VERSION=".*/VERSION="$(NEW_VERSION)"/' doc/treasures/mknotifyd ; \ @@ -159,7 +158,6 @@ setversion: echo 'check-mk_$(NEW_VERSION)-1_all.deb net optional' > debian/files ; \ cd agents/windows ; rm *.exe ; make ; cd ../.. ; \ cp agents/windows/install_agent.exe check-mk-agent-$(NEW_VERSION).exe - cp agents/windows/install_agent-64.exe check-mk-agent-64-$(NEW_VERSION).exe headers: doc/helpers/headrify

11 years

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits May 2013