Checkmk git commits April 2016

checkmk-commits@lists.checkmk.com

8 participants
356 discussions

by Sebastian Herbord

Module: check_mk Branch: master Commit: 857d9713839c441101528dc6505fd81a18c39c67 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=857d9713839c44… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Tue Apr 12 17:30:06 2016 +0200 fixed naming of a check man page --- checkman/{mssql_counters.page_activity => mssql_counters.pageactivity} | 0 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/checkman/mssql_counters.page_activity b/checkman/mssql_counters.pageactivity similarity index 100% rename from checkman/mssql_counters.page_activity rename to checkman/mssql_counters.pageactivity

8 years, 5 months

3121 mssql_counters.page_activity, mssql_counters.locks_per_batch: additional checks for mssql performance counters

by Sebastian Herbord

Module: check_mk Branch: master Commit: 6fd51ded1b47c0b92d5ae86a4c9b6f71b5266134 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6fd51ded1b47c0… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Tue Apr 12 17:29:20 2016 +0200 3121 mssql_counters.page_activity, mssql_counters.locks_per_batch: additional checks for mssql performance counters --- .werks/3121 | 9 +++ ChangeLog | 1 + checkman/mssql_counters.locks_per_batch | 15 ++++ checkman/mssql_counters.page_activity | 15 ++++ checks/mssql_counters | 125 +++++++++++++++++++++++++++++++ web/plugins/metrics/check_mk.py | 33 ++++++++ web/plugins/wato/check_parameters.py | 41 ++++++++++ 7 files changed, 239 insertions(+) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=6fd51ded1b…

8 years, 5 months

3120 mssql_datafiles, mssql_transactionlogs: new chech to also monitor the datafiles and added option to summarize datafiles and transactionlogs

by Sebastian Herbord

Module: check_mk Branch: master Commit: 0fedd509fd26342a1b553930d0c656795fafbadc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0fedd509fd2634… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Tue Apr 12 17:13:46 2016 +0200 3120 mssql_datafiles, mssql_transactionlogs: new chech to also monitor the datafiles and added option to summarize datafiles and transactionlogs --- .werks/3120 | 9 +++ ChangeLog | 1 + agents/windows/plugins/mssql.vbs | 49 +++++++----- checkman/mssql_datafiles | 21 +++++ checkman/mssql_transactionlogs | 3 +- checks/mssql.include | 145 ++++++++++++++++++++++++++++++++++ checks/mssql_datafiles | 45 +++++++++++ checks/mssql_transactionlogs | 70 ++-------------- web/plugins/wato/check_parameters.py | 29 +++++-- 9 files changed, 280 insertions(+), 92 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=0fedd509fd…

8 years, 5 months

3119 mssql: fixed counter calculation when caching plugin output

by Sebastian Herbord

Module: check_mk Branch: master Commit: 92c39da54421db9200abcb76813b96526e61e87a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=92c39da54421db… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Tue Apr 12 17:05:17 2016 +0200 3119 mssql: fixed counter calculation when caching plugin output --- .werks/3119 | 11 +++++++++++ ChangeLog | 1 + agents/windows/plugins/mssql.vbs | 7 ++++++- checks/mssql_counters | 25 +++++++++++++++++++++++-- checks/mssql_tablespaces | 2 +- 5 files changed, 42 insertions(+), 4 deletions(-) diff --git a/.werks/3119 b/.werks/3119 new file mode 100644 index 0000000..25a9fdc --- /dev/null +++ b/.werks/3119 @@ -0,0 +1,11 @@ +Title: mssql: fixed counter calculation when caching plugin output +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.9i1 +Date: 1460473140 +Class: feature + +Previously, the mssql plugin output could not be cached as counter calculations were based on the +time the output was interpreted and thus would produce incorrect results. +This has now been fixed by adding a timestamp from the mssql server to the agent output. diff --git a/ChangeLog b/ChangeLog index 9e6cce9..0994cf3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -50,6 +50,7 @@ * 3311 apc_netbotz_sensors, apc_netbotz_sensors.dewpoint, apc_netbotz_sensors.humidity, apc_netbotz_other_sensors: new checks for APC Netbotz devices which support the NETBOTZV2 MIB * 3115 logwatch: made check cluster-able... * 3312 check_ssh: service description can be set + * 3119 mssql: fixed counter calculation when caching plugin output... * 3073 FIX: windows agent: relative paths to mrpe scripts are now treated as relative to the agent installation directory... * 3061 FIX: mk_jolokia: Fixed debugging of the agent plugin * 3074 FIX: windows agent: fixed incorrect values for 32-bit performance counters diff --git a/agents/windows/plugins/mssql.vbs b/agents/windows/plugins/mssql.vbs index 49a2572..24df3ad 100644 --- a/agents/windows/plugins/mssql.vbs +++ b/agents/windows/plugins/mssql.vbs @@ -212,10 +212,15 @@ For Each instId In instIds.Keys CONN.Open ' Get counter data for the whole instance + addOutput( "<<<mssql_counters>>>" ) + RS.Open "SELECT GETUTCDATE() as utc_date", CONN + addOutput( "None utc_time None " & RS("utc_date") ) + RS.Close + RS.Open "SELECT counter_name, object_name, instance_name, cntr_value " & _ "FROM sys.dm_os_performance_counters " & _ "WHERE object_name NOT LIKE '%Deprecated%'", CONN - addOutput( "<<<mssql_counters>>>" ) + Dim objectName, counterName, instanceName, value Do While NOT RS.Eof objectName = Replace(Replace(Trim(RS("object_name")), " ", "_"), "$", "_") diff --git a/checks/mssql_counters b/checks/mssql_counters index c930837..66779c2 100644 --- a/checks/mssql_counters +++ b/checks/mssql_counters @@ -133,10 +133,28 @@ check_info['mssql_counters.cache_hits'] = { # | | # '----------------------------------------------------------------------' + +def mssql_time_from_counter(info): + for line in info: + if line[1] == "utc_time": + # mssql returns localized format. great! let's try ... + try: + # ... iso 8601 + return utc_mktime(time.strptime(" ".join(line[3:]).split(".")[0], + "%Y-%m-%d %H:%M:%S")) + except ValueError: + # ... german + return utc_mktime(time.strptime(" ".join(line[3:]), + "%d.%m.%Y %H:%M:%S")) + return None + def check_mssql_counters_transactions(item, params, info): output = [] perfdata = [] - now = time.time() + now = mssql_time_from_counter(info) + if now is None: + now = time.time() + for line in info: if mssql_counters_item(line, False) != item: continue @@ -170,7 +188,10 @@ def check_mssql_counters_locks(item, params, info): state = 0 output = [] perfdata = [] - now = time.time() + now = mssql_time_from_counter(info) + if now is None: + now = time.time() + for line in info: if mssql_counters_item(line, False) != item: continue diff --git a/checks/mssql_tablespaces b/checks/mssql_tablespaces index c9061f4..5118195 100644 --- a/checks/mssql_tablespaces +++ b/checks/mssql_tablespaces @@ -50,7 +50,7 @@ def inventory_mssql_tablespaces(info): inventory = [] for line in info: if len(line) > 1: - inventory.append((line[0] + ' ' + line[1], 'mssql_tablespace_default_levels')) + inventory.append((line[0] + ' ' + line[1], 'mssql_tablespace_default_levels')) return inventory def check_mssql_tablespaces(item, params, info):

8 years, 5 months

Fetched livestatus from downstream plus associated fixes.

by Sven Panne

Module: check_mk Branch: master Commit: 0e33e7ab5ede1ae6fd3fed250e9fae2d9d31062c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0e33e7ab5ede1a… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Apr 12 17:04:01 2016 +0200 Fetched livestatus from downstream plus associated fixes. --- livestatus/src/CommandsHolder.h | 44 ++++++++++++ livestatus/src/CommandsHolderNagios.cc | 44 ++++++++++++ livestatus/src/CommandsHolderNagios.h | 39 +++++++++++ livestatus/src/LogCache.cc | 9 ++- livestatus/src/LogCache.h | 5 +- livestatus/src/LogEntry.cc | 11 +-- livestatus/src/LogEntry.h | 11 ++- livestatus/src/Logfile.cc | 10 +-- livestatus/src/Logfile.h | 5 +- livestatus/src/Makefile.am | 117 ++++++++++++++++++++++++++------ livestatus/src/OffsetSStringColumn.cc | 36 ++++++++++ livestatus/src/OffsetSStringColumn.h | 43 ++++++++++++ livestatus/src/Store.cc | 3 +- livestatus/src/Store.h | 2 + livestatus/src/TableCommands.cc | 33 +++++---- livestatus/src/TableCommands.h | 12 ++-- 16 files changed, 362 insertions(+), 62 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=0e33e7ab5e…

8 years, 5 months

check_smtp: Cleaned up address family handling to be equal to check_http

by Lars Michelsen

Module: check_mk Branch: master Commit: 9da94a5b9fc85b4ee5516cb856489d2f13edc673 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9da94a5b9fc85b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 12 16:26:15 2016 +0200 check_smtp: Cleaned up address family handling to be equal to check_http --- checks/check_smtp | 23 ++-- web/plugins/wato/active_checks.py | 245 +++++++++++++++++++------------------ 2 files changed, 138 insertions(+), 130 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=9da94a5b9f…

8 years, 5 months

improved documentation and cleanup in wmi.include

by Sebastian Herbord

Module: check_mk Branch: master Commit: 57b1029fba8e7eeeb96073fa6226c4e72683e54a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=57b1029fba8e7e… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Tue Apr 12 14:57:14 2016 +0200 improved documentation and cleanup in wmi.include --- checks/wmi.include | 72 +++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 66 insertions(+), 6 deletions(-) diff --git a/checks/wmi.include b/checks/wmi.include index a49efd5..f34c234 100644 --- a/checks/wmi.include +++ b/checks/wmi.include @@ -25,11 +25,33 @@ # Boston, MA 02110-1301 USA. -# number of samples to calculate moving average on -AVG_SAMPLE_COUNT = 5 - +# This set of functions are used for checks that handle "generic" windows +# performance counters as reported via wmi +# They should also work with performance counters reported through other means +# (i.e. pdh) as long as the data transmitted as a csv table. + +# Sample data: +# <<<dotnet_clrmemory:sep(44)>>> +# AllocatedBytesPersec,Caption,Description,FinalizationSurvivors,Frequency_Object,... +# 26812621794240,,,32398,0,... +# 2252985000,,,0,0,... + + +# .--Parse---------------------------------------------------------------. +# | ____ | +# | | _ \ __ _ _ __ ___ ___ | +# | | |_) / _` | '__/ __|/ _ \ | +# | | __/ (_| | | \__ \ __/ | +# | |_| \__,_|_| |___/\___| | +# | | +# '----------------------------------------------------------------------' def parse_wmi_table(info, key="Name"): + # represents a 2-dimensional table. columns are fixed after + # initialization, rows can be appended. fields can be accessed + # by x/y index or using names. + # the column name is defined by the header parameter in the constructor, + # the row name is determined by the key_field class Table: def __init__(self, headers, key_field): self.__headers = {} @@ -80,22 +102,29 @@ def parse_wmi_table(info, key="Name"): try: info_iter = iter(info) res = None + # read input line by line. rows with [] start the table name. + # Each table has to start with a header line line = info_iter.next() while line is not None: current = None if len(line) == 1 and line[0].startswith("["): + # multi-table input if res is None: res = {} tablename = regex("\[(.*)\]").search(line[0]).group(1) line = info_iter.next() if tablename in res: + # known table, append to it current = res[tablename] else: + # table is new, treat as header line current = Table(line, key) res[tablename] = current else: + # single-table input current = res = Table(line, key) + # read table content line = info_iter.next() while line is not None and not line[0].startswith("["): current.add_row(line) @@ -108,6 +137,30 @@ def parse_wmi_table(info, key="Name"): return res +#. +# .--Filters-------------------------------------------------------------. +# | _____ _ _ _ | +# | | ___(_) | |_ ___ _ __ ___ | +# | | |_ | | | __/ _ \ '__/ __| | +# | | _| | | | || __/ | \__ \ | +# | |_| |_|_|\__\___|_| |___/ | +# | | +# '----------------------------------------------------------------------' + +def wmi_filter_global_only(table, row): + return table.get(row, "Name") == "_Global_" + + +#. +# .--Inventory-----------------------------------------------------------. +# | ___ _ | +# | |_ _|_ ____ _____ _ __ | |_ ___ _ __ _ _ | +# | | || '_ \ \ / / _ \ '_ \| __/ _ \| '__| | | | | +# | | || | | \ V / __/ | | | || (_) | | | |_| | | +# | |___|_| |_|\_/ \___|_| |_|\__\___/|_| \__, | | +# | |___/ | +# '----------------------------------------------------------------------' + def inventory_wmi_table(table, **kwargs): if isinstance(table, dict): # TODO if there are multiple tables we can currently only use @@ -124,9 +177,15 @@ def inventory_wmi_table(table, **kwargs): for row in table.row_labels()] -def wmi_filter_global_only(table, row): - return table.get(row, "Name") == "_Global_" - +#. +# .--Check---------------------------------------------------------------. +# | ____ _ _ | +# | / ___| |__ ___ ___| | __ | +# | | | | '_ \ / _ \/ __| |/ / | +# | | |___| | | | __/ (__| < | +# | \____|_| |_|\___|\___|_|\_\ | +# | | +# '----------------------------------------------------------------------' # determine time at which a sample was taken def get_wmi_time(table, row): @@ -246,4 +305,5 @@ def wmi_yield_raw_fraction(table, row, column, label, perfvar, levels=None): ) +#.

8 years, 5 months

mkeventd icon: Fixed broken url in case of distributed Event Console configuration

by Lars Michelsen

Module: check_mk Branch: master Commit: f801fe9dc744d88f47f78dd148c854efe59acb0c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f801fe9dc744d8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Apr 11 16:24:23 2016 +0200 mkeventd icon: Fixed broken url in case of distributed Event Console configuration --- web/plugins/icons/mkeventd.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/plugins/icons/mkeventd.py b/web/plugins/icons/mkeventd.py index a03b0e2..656da9c 100644 --- a/web/plugins/icons/mkeventd.py +++ b/web/plugins/icons/mkeventd.py @@ -73,9 +73,9 @@ def paint_mkeventd(what, row, tags, custom_vars): # Another possible architecture is to have an event console in each site in # a distributed environment. For the later case the base url need to be # constructed here - site = html.site_status[row['site']]["site"] url_prefix = '' if getattr(config, 'mkeventd_distributed', False): + site = config.site(row["site"]) url_prefix = site['url_prefix'] + 'check_mk/' url_vars = [

8 years, 5 months

Pagetypes sublcassing cleanup - finished now

by Lars Michelsen

Module: check_mk Branch: master Commit: 6ac710216d5d59d9bdb2cedab7b832edcbedafa6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6ac710216d5d59… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Apr 11 16:07:03 2016 +0200 Pagetypes sublcassing cleanup - finished now --- web/htdocs/pagetypes.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/web/htdocs/pagetypes.py b/web/htdocs/pagetypes.py index 0f9d9a8..a3f170a 100644 --- a/web/htdocs/pagetypes.py +++ b/web/htdocs/pagetypes.py @@ -166,13 +166,19 @@ class Base(object): def name(self): return self._["name"] + def title(self): return self._["title"] + def description(self): return self._.get("description", "") + def is_hidden(self): + return False + + def render_title(self): return _u(self.title())

8 years, 5 months

windows agent: removed logging while waiting for service to stop

by Sebastian Herbord

Module: check_mk Branch: master Commit: 2fc9fb77fe74ecb0224487169ba6bf125a02eabe URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2fc9fb77fe74ec… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Mon Apr 11 16:38:53 2016 +0200 windows agent: removed logging while waiting for service to stop ... as this can apparently cause a dialog to pop up for logged in administrators --- agents/windows/build_version | 2 +- agents/windows/check_mk_agent-64.exe | Bin 940544 -> 940544 bytes agents/windows/check_mk_agent-64.unversioned.exe | Bin 940544 -> 940544 bytes agents/windows/check_mk_agent.cc | 2 -- agents/windows/check_mk_agent.exe | Bin 868352 -> 868352 bytes agents/windows/check_mk_agent.msi | Bin 2070528 -> 2070528 bytes agents/windows/check_mk_agent.unversioned.exe | Bin 868352 -> 868352 bytes agents/windows/install_agent-64.exe | Bin 431814 -> 431690 bytes agents/windows/install_agent.exe | Bin 422666 -> 422564 bytes 9 files changed, 1 insertion(+), 3 deletions(-) diff --git a/agents/windows/build_version b/agents/windows/build_version index 6afcd4b..00e37d6 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -1594 +1596 diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe index d72398a..419dbc9 100755 Binary files a/agents/windows/check_mk_agent-64.exe and b/agents/windows/check_mk_agent-64.exe differ diff --git a/agents/windows/check_mk_agent-64.unversioned.exe b/agents/windows/check_mk_agent-64.unversioned.exe index 3bca929..00e7acd 100755 Binary files a/agents/windows/check_mk_agent-64.unversioned.exe and b/agents/windows/check_mk_agent-64.unversioned.exe differ diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index 5e18b11..3c465d3 100644 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -2718,7 +2718,6 @@ void UninstallService() { while (in_set(serviceStatus.dwCurrentState, {SERVICE_RUNNING, SERVICE_STOP_PENDING})) { if (serviceStatus.dwCurrentState == SERVICE_STOP_PENDING) { - printf(SERVICE_NAME " waiting for service to finish\n"); // wait for the wait-hint but no less than 1 second and // no more than 10 DWORD waitTime = serviceStatus.dwWaitHint / 10; @@ -2733,7 +2732,6 @@ void UninstallService() { &serviceStatus) == 0) { break; } - printf(SERVICE_NAME " stopped\n"); } } diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index af2a2e4..f88d5c0 100755 Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe differ diff --git a/agents/windows/check_mk_agent.msi b/agents/windows/check_mk_agent.msi index 38001c9..f988a2d 100755 Binary files a/agents/windows/check_mk_agent.msi and b/agents/windows/check_mk_agent.msi differ diff --git a/agents/windows/check_mk_agent.unversioned.exe b/agents/windows/check_mk_agent.unversioned.exe index d2a34a9..e1195ac 100755 Binary files a/agents/windows/check_mk_agent.unversioned.exe and b/agents/windows/check_mk_agent.unversioned.exe differ diff --git a/agents/windows/install_agent-64.exe b/agents/windows/install_agent-64.exe index 51cc6bb..8f39b24 100755 Binary files a/agents/windows/install_agent-64.exe and b/agents/windows/install_agent-64.exe differ diff --git a/agents/windows/install_agent.exe b/agents/windows/install_agent.exe index 0698ef7..43882bc 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ

8 years, 5 months

← Newer
1
...
21
22
23
24
25
26
27
...
36
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits April 2016