Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64139 discussions

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 8b75bda35aceeda1c2a63702eb588676a23f26ab URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8b75bda35aceed… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Sat Aug 13 00:08:11 2011 +0200 close bug --- .bugs/312 | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.bugs/312 b/.bugs/312 index e9dd89a..961f4b0 100644 --- a/.bugs/312 +++ b/.bugs/312 @@ -1,10 +1,14 @@ Title: FreeBSD ifcounters broken Component: checks +State: done +Class: bug +Date: 2011-07-21 10:52:51 Benefit: 3 -State: open Cost: 1 -Date: 2011-07-21 10:52:51 -Class: bug +Fun: 0 The interface counters are outputting one field twice Reported by Scott & Mark McCorke + +2011-08-13 00:07:42: changed state open -> done +changed and seems to work!

13 years, 1 month

Check_MK Git: check_mk: FIX: BI - fixed wrong variable in running_on aggregation function

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: f3f229ac911104c7851fa04a8fb4bfe61c87bc2e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f3f229ac911104… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Aug 10 19:29:01 2011 +0200 FIX: BI - fixed wrong variable in running_on aggregation function --- ChangeLog | 1 + web/htdocs/bi.py | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index f0b37c3..5b145a1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -52,6 +52,7 @@ * FIX: ipmi: Skipping items with invalid data (0.000 val, "unspecified" unit) in summary mode * FIX: ipmi: Improved output formating in summary mode + * FIX: BI - fixed wrong variable in running_on aggregation function * Introduced basic infrastructure for multilanguage support in Multisite * Make 'Views' snapin foldable * Replace old main view by dashboard. diff --git a/web/htdocs/bi.py b/web/htdocs/bi.py index b676e4d..18c5807 100644 --- a/web/htdocs/bi.py +++ b/web/htdocs/bi.py @@ -854,7 +854,7 @@ def aggr_running_on(nodes, regex): # if not found, then do normal aggregation with 'worst' if not mo or len(mo.groups()) == 0: - state = aggregation_functions['worst'](nodes[1:]) + state = config.aggregation_functions['worst'](nodes[1:]) state["output"] += ", running nowhere" return state

13 years, 1 month

Check_MK Git: check_mk: WATO: Host attributes can now be hidden from forms using "show_in_form"

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: ae228be58c15a1468bead7709f21703e92105a2c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ae228be58c15a1… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Aug 12 16:02:43 2011 +0200 WATO: Host attributes can now be hidden from forms using "show_in_form" --- web/htdocs/wato.py | 16 +++++++++++++--- web/plugins/wato/builtin_attributes.py | 2 +- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index a7f77b6..28fd26f 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -2441,6 +2441,11 @@ class Attribute: def show_in_table(self): return self._show_in_table + # Wether or not to show this attribute in the edit form. + # This value is set by declare_host_attribute + def show_in_form(self): + return self._show_in_form + # Wether or not to make this attribute configurable in # files and folders (as defaule value for the hosts) def show_in_folder(self): @@ -2729,11 +2734,12 @@ host_attributes = [] host_attribute = {} # Declare attributes with this method -def declare_host_attribute(a, show_in_table = True, show_in_folder = True, topic = None): +def declare_host_attribute(a, show_in_table = True, show_in_folder = True, topic = None, show_in_form = True): host_attributes.append((a, topic)) host_attribute[a.name()] = a - a._show_in_table = show_in_table + a._show_in_table = show_in_table a._show_in_folder = show_in_folder + a._show_in_form = show_in_form # Read attributes from HTML variables def collect_attributes(do_validate = True): @@ -2766,7 +2772,7 @@ def configure_attributes(hosts, for_what, parent, myself=None, without_attribute # appearance. If only one topic exists, do not show topics topics = [] for attr, topic in host_attributes: - if topic not in topics: + if topic not in topics and attr.show_in_form(): topics.append(topic) for topic in topics: @@ -2788,6 +2794,10 @@ def configure_attributes(hosts, for_what, parent, myself=None, without_attribute if attrname in without_attributes: continue # e.g. needed to skip ipaddress in CSV-Import + # Skip hidden attributes + if not attr.show_in_form(): + continue + # In folder/file not all attributes are shown if for_what == "folder" and not attr.show_in_folder(): continue diff --git a/web/plugins/wato/builtin_attributes.py b/web/plugins/wato/builtin_attributes.py index c128bce..5235b11 100644 --- a/web/plugins/wato/builtin_attributes.py +++ b/web/plugins/wato/builtin_attributes.py @@ -38,4 +38,4 @@ declare_host_attribute(IPAddressAttribute("ipaddress", _("IP Address"), declare_host_attribute(EnumAttribute("dirty", _("Dirty"), _("Modified since last "Active Changes"?"), "No", [ ('no', _('No')), ('yes', _('Yes'))]), - show_in_table = False, show_in_folder = False) + show_in_table = False, show_in_folder = False, show_in_form = False)

13 years, 1 month

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

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 7fd522d8be3264fae8fedcf32f5f481c157cd076 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7fd522d8be3264… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Aug 12 18:33:52 2011 +0200 Merge branch 'master' of ssh://git.mathias-kettner.de/var/www/80/git.mathias-kettner.de/check_mk ---

13 years, 1 month

Check_MK Git: check_mk: Windows agent: handle quotes in directory name

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 86ea4afaa39dcacbf65d85948f70a13104b773dc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=86ea4afaa39dca… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Aug 12 11:54:32 2011 +0200 Windows agent: handle quotes in directory name In 64 Bit systems there is reported to be quotes in the registry entry of the services directory. These quotes are now removed. Unfortunately I could not test this myself. The normal case is still working. --- ChangeLog | 1 + agents/windows/check_mk_agent.cc | 8 +++++++- agents/windows/check_mk_agent.exe | Bin 96768 -> 96768 bytes 3 files changed, 8 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 73886d4..c858576 100644 --- a/ChangeLog +++ b/ChangeLog @@ -20,6 +20,7 @@ * FIX: lnx_if/if/if64: ignore percentual traffic levels on NICs without speed information. * FIX: cisco_temp_perf: add critical level to performance data + * FIX: windows agent: hopefully fix case with quotes in directory name * brocade_port: check for Brocade FC ports has been rewritten with lots of new features. * AIX agent now simulates <<<netctr>>> output (by Jörg Linge) diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index 67689cc..ecef22c 100755 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -1139,8 +1139,14 @@ void get_agent_dir(char *buffer, int size) while (end > buffer && *end != '\\') end--; *end = 0; // replace \ with string end => get directory of executable + + // Handle case where name is quoted with double quotes. + // This is reported to happen on some 64 Bit systems when spaces + // are in the directory name. + if (*buffer == '"') { + memmove(buffer, buffer + 1, strlen(buffer)); + } } - size = dsize; RegCloseKey(key); } else { diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index bce338b..fff041c 100755 Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe differ

13 years, 1 month

Check_MK Git: check_mk: Multisite: add column for host contacts

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 38fbdd92fb48c1e3da4a1d66a757e8f68fc52fdb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=38fbdd92fb48c1… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Aug 12 11:36:52 2011 +0200 Multisite: add column for host contacts --- ChangeLog | 1 + web/plugins/views/painters.py | 7 +++++++ 2 files changed, 8 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2395c3a..dba202b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -71,6 +71,7 @@ will be in var/check_mk/web) * WATO: Added new hook "active-changes" which calls the registered hosts with a dict of "dirty" hosts + * Added column painter for host contacts WATO: * Configration files can now be administered via the WEB UI diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index ff227ae..9b976a0 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -1160,6 +1160,13 @@ multisite_painters["host_group_memberlist"] = { "paint" : paint_host_group_memberlist } +multisite_painters["host_contacts"] = { + "title" : _("Host contacts"), + "short" : _("Contacts"), + "columns" : ["host_contacts"], + "paint" : lambda row: (None, ", ".join(row["host_contacts"])) +} + multisite_painters["host_custom_notes"] = { "title" : _("Custom host notes"), "short" : _("Notes"),

13 years, 1 month

Check_MK Git: check_mk: Multisite: add contacts information to detail views

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 66d4efcdd1e668fe837d608749d867a36c9b4819 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=66d4efcdd1e668… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Aug 12 11:39:57 2011 +0200 Multisite: add contacts information to detail views --- ChangeLog | 1 + web/plugins/views/builtin.py | 8 +++++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index dba202b..73886d4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -72,6 +72,7 @@ * WATO: Added new hook "active-changes" which calls the registered hosts with a dict of "dirty" hosts * Added column painter for host contacts + * Detail views of host/service now show contacts WATO: * Configration files can now be administered via the WEB UI diff --git a/web/plugins/views/builtin.py b/web/plugins/views/builtin.py index 686503f..bee3110 100644 --- a/web/plugins/views/builtin.py +++ b/web/plugins/views/builtin.py @@ -833,12 +833,13 @@ multisite_builtin_views.update({ 'painters': [('sitealias', None), ('host', 'host'), ('alias', None), + ('host_icons', None), + ('host_state', None), ('host_address', None), ('host_group_memberlist', None), ('host_parents', None), ('host_childs', None), - ('host_icons', None), - ('host_state', None), + ('host_contacts', None), ('host_plugin_output', None), ('host_perf_data', None), ('host_attempt', None), @@ -1029,9 +1030,10 @@ multisite_builtin_views.update({ 'painters': [('sitealias', None), ('host', 'hoststatus'), ('service_description', 'servicedesc'), - ('svc_group_memberlist', None), ('service_icons', None), ('service_state', None), + ('svc_group_memberlist', None), + ('svc_contacts', None), ('svc_plugin_output', None), ('svc_long_plugin_output', None), ('svc_perf_data', None),

13 years, 1 month

Check_MK Git: check_mk: Windows services: make inventory_services flexible

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 1bf9a137819b65e1be455fd301f84613b1d216d7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1bf9a137819b65… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Aug 12 11:18:47 2011 +0200 Windows services: make inventory_services flexible --- ChangeLog | 2 + checkman/services | 115 ++++++++++++++++++++++++++++++++++++++++----------- checks/services | 81 +++++++++++++++++++++++++++++------ modules/check_mk.py | 2 +- 4 files changed, 160 insertions(+), 40 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=1bf9a13781…

13 years, 1 month

Check_MK Git: check_mk: Windows: agent now also sends start type

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 62ab8e9cd73ca893f774c24f16f426374b08546a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=62ab8e9cd73ca8… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Aug 11 18:29:15 2011 +0200 Windows: agent now also sends start type Check has been adapted to parse new and old style output --- ChangeLog | 1 + agents/windows/check_mk_agent.cc | 44 +++++++++++++++++++++++++++++++- agents/windows/check_mk_agent.exe | Bin 96768 -> 96768 bytes agents/windows/crash.exe | Bin 20024 -> 20024 bytes checks/services | 50 +++++++++++++++++++++++++------------ 5 files changed, 77 insertions(+), 18 deletions(-) diff --git a/ChangeLog b/ChangeLog index ee3123d..54e08ff 100644 --- a/ChangeLog +++ b/ChangeLog @@ -48,6 +48,7 @@ * New checks netapp_cluster, netapp_vfiler for checking NetAPP filer running as cluster or running vfilers. * megaraid_pdisks: Better handling of MegaCli output (Thanks to Bastian Kuhn) + * Windows: agent now also sends start type (auto/demand/disabled/boot/system) Multisite: * FIX: make non-Ascii characters in services names work again diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index 9b77d34..67689cc 100755 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -308,6 +308,44 @@ void section_ps(SOCKET &out) } +// Determine the start type of a service. Unbelievable how much +// code is needed for that... +const char *service_start_type(SC_HANDLE scm, LPCTSTR service_name) +{ + // Query the start type of the service + const char *start_type = "invalid1"; + SC_HANDLE schService; + LPQUERY_SERVICE_CONFIG lpsc; + schService = OpenService(scm, service_name, SERVICE_QUERY_CONFIG); + if (schService) { + start_type = "invalid2"; + DWORD dwBytesNeeded, cbBufSize; + if (!QueryServiceConfig(schService, NULL, 0, &dwBytesNeeded)) { + start_type = "invalid3"; + DWORD dwError = GetLastError(); + if (dwError == ERROR_INSUFFICIENT_BUFFER) { + start_type = "invalid4"; + cbBufSize = dwBytesNeeded; + lpsc = (LPQUERY_SERVICE_CONFIG) LocalAlloc(LMEM_FIXED, cbBufSize); + if (QueryServiceConfig(schService, lpsc, cbBufSize, &dwBytesNeeded)) { + switch (lpsc->dwStartType) { + case SERVICE_AUTO_START: start_type = "auto"; break; + case SERVICE_BOOT_START: start_type = "boot"; break; + case SERVICE_DEMAND_START: start_type = "demand"; break; + case SERVICE_DISABLED: start_type = "disabled"; break; + case SERVICE_SYSTEM_START: start_type = "system"; break; + default: start_type = "other"; + } + } + LocalFree(lpsc); + } + } + CloseServiceHandle(schService); + } + return start_type; +} + + void section_services(SOCKET &out) { output(out, "<<<services>>>\n"); @@ -338,6 +376,8 @@ void section_services(SOCKET &out) case SERVICE_STOP_PENDING: state_name = "stopping"; break; case SERVICE_STOPPED: state_name = "stopped"; break; } + + const char *start_type = service_start_type(scm, service->lpServiceName); // The service name usually does not contain spaces. But // in some cases it does. We replace them with _ in order @@ -348,8 +388,8 @@ void section_services(SOCKET &out) *w = '_'; } - output(out, "%-18s %-8s %s\n", - service->lpServiceName, state_name, + output(out, "%s %s/%s %s\n", + service->lpServiceName, state_name, start_type, service->lpDisplayName); service ++; } diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index e30b479..bce338b 100755 Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe differ diff --git a/agents/windows/crash.exe b/agents/windows/crash.exe index 085c008..7cef11e 100755 Binary files a/agents/windows/crash.exe and b/agents/windows/crash.exe differ diff --git a/checks/services b/checks/services index 6a12685..f88824f 100644 --- a/checks/services +++ b/checks/services @@ -25,7 +25,22 @@ # Boston, MA 02110-1301 USA. -# List all services to auto-detect here: +# Output of old agent (< 1.1.10i2): +# AeLookupSvc running Application Experience Lookup Service +# Alerter stopped Alerter +# ALG stopped Application Layer Gateway Service +# AppMgmt stopped Application Management +# appmgr running Remote Server Manager + +# Output of new agent (>= 1.1.10i2): +# Alerter stopped/disabled Warndienst +# ALG running/demand Gatewaydienst auf Anwendungsebene +# Apple_Mobile_Device running/auto Apple Mobile Device +# AppMgmt stopped/demand Anwendungsverwaltung +# AudioSrv running/auto Windows Audio +# BITS running/demand Intelligenter Hintergrund<FC>bertragungsdienst +# Bonjour_Service running/auto Dienst "Bonjour" + inventory_services = [] def check_windows_services(item, params, info): @@ -37,33 +52,36 @@ def check_windows_services(item, params, info): for line in info: name = line[0] if name == item: - state = line[1] + # newer agents also send start type as part of state, + # e.g. running/auto + if '/' in line[1]: + state, start_type = line[1].split('/') + else: + state = line[1] + start_type = "unknown" + displayname = " ".join(line[2:]) if state == 'running': - return (0, "OK - running: %s" % displayname) + return (0, "OK - running (start type is %s): %s" % (start_type, displayname)) worststate = state + worst_start_type = start_type if worststate: - return (2, "CRITICAL - %s: %s" % (worststate, displayname)) + return (2, "CRITICAL - %s (start type is %s): %s" % (worststate, worst_start_type, displayname)) else: return (3, "UNKNOWN - service not found") -# AeLookupSvc running Application Experience Lookup Service -# Alerter stopped Alerter -# ALG stopped Application Layer Gateway Service -# AppMgmt stopped Application Management -# appmgr running Remote Server Manager -# aspnet_state stopped ASP.NET State Service -# AudioSrv running Windows Audio -# BITS stopped Background Intelligent Transfer Service -# Browser running Computer Browser -# cimlistener running IBM Director CIM Listener + def inventory_windows_services(checkname, info): inventory = [] for line in info: name = line[0] - state = line[1] + if '/' in line[1]: + state, start_type = line[1].split('/') + else: + state = line[1] + start_type = "unknown" if state == 'running' and name in inventory_services: - inventory.append((name, '""', None)) + inventory.append((name, None)) return inventory

13 years, 1 month

Check_MK Git: check_mk: canon_pages: make compatible with new SNMP handling

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: cb528d8df09dcb9f53e2bff56fbb78f8a3acc729 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cb528d8df09dcb… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Aug 11 16:30:16 2011 +0200 canon_pages: make compatible with new SNMP handling --- checks/canon_pages | 53 +++++++++++++++++++++------------------------------ 1 files changed, 22 insertions(+), 31 deletions(-) diff --git a/checks/canon_pages b/checks/canon_pages index a472f21..f5d8fe9 100644 --- a/checks/canon_pages +++ b/checks/canon_pages @@ -24,48 +24,39 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -# Author: Lars Michelsen <lm(a)mathias-kettner.de>, 2011-03-16 - -# [[['301', '28495']], [['112', '24']], [['113', '14880']], [['122', '146']], [['123', '15870']], [['501', '3761']], [['101', '30920']]] +# [['301', '28495']], [['112', '24']], [['113', '14880']], [['122', '146']], [['123', '15870']], [['501', '3761']], [['101', '30920']] canon_pages_map = { - '101': 'total', - '112': 'b/w A3', - '113': 'b/w A4', - '122': 'color A3', - '123': 'color A4', - '301': 'print total', - '501': 'scan', + 'total' : '101', + 'b/w A3' : '112', + 'b/w A4' : '113', + 'color A3' : '122', + 'color A4' : '123', + 'print total' : '301', + 'scan' : '501', } def inventory_canon_pages(checkname, info): inventory = [] - for data in info: - if data: - inventory.append((canon_pages_map.get(data[0][0], - 'unknown-%s' % data[0][0]), None)) + for endoid, value in info: + for name, eo in canon_pages_map.items(): + if eo == endoid: + inventory.append((name, None)) return inventory -def check_canon_pages(item, params, info): - for data in info: - if not data or not data[0]: - continue - index, value = data[0] - if canon_pages_map.get(index, 'unknown-'+index) == item: - return (0, 'OK - Current count: %s' % value, [('count', value)]) +def check_canon_pages(item, _no_params, info): + if item not in canon_pages_map: + return (3, "UNKNOWN - unknown counter type %s" % item) + for endoid, value in info: + if endoid == canon_pages_map[item]: + return (0, 'OK - Current count: %s' % value, [('count', int(value))]) + + return (3, 'UNKNOWN - Item not found in SNMP data') - return (3, 'UNKNOWN - Item not found in SNMP') check_info['canon_pages'] = (check_canon_pages, "Pages %s", 1, inventory_canon_pages) -snmp_info['canon_pages'] = [ - ( ".1.3.6.1.4.1.1602.1.11.1.3.1.4", [ OID_END, 101 ]), # count total - ( ".1.3.6.1.4.1.1602.1.11.1.3.1.4", [ OID_END, 112 ]), # count b/w A3 - ( ".1.3.6.1.4.1.1602.1.11.1.3.1.4", [ OID_END, 113 ]), # count b/w A4 - ( ".1.3.6.1.4.1.1602.1.11.1.3.1.4", [ OID_END, 122 ]), # count color A3 - ( ".1.3.6.1.4.1.1602.1.11.1.3.1.4", [ OID_END, 123 ]), # count color A4 - ( ".1.3.6.1.4.1.1602.1.11.1.3.1.4", [ OID_END, 301 ]), # print total - ( ".1.3.6.1.4.1.1602.1.11.1.3.1.4", [ OID_END, 501 ]), # scan -] +snmp_info['canon_pages'] = \ + ( ".1.3.6.1.4.1.1602.1.11.1.3.1.4", [ OID_END, "" ]) snmp_scan_functions['canon_pages'] = lambda oid: oid(".1.3.6.1.4.1.1602.1.1.1.1.0") != None

13 years, 1 month

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits