Checkmk git commits October 2015

checkmk-commits@lists.checkmk.com

9 participants
299 discussions

by Lars Michelsen

Module: check_mk Branch: master Commit: a518ea3296945296df459e86958ba89d9be7ea1c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a518ea32969452… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Oct 28 15:34:18 2015 +0100 Updated bug entries #2318 --- .bugs/2318 | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.bugs/2318 b/.bugs/2318 new file mode 100644 index 0000000..61757e9 --- /dev/null +++ b/.bugs/2318 @@ -0,0 +1,11 @@ +Title: network interface groups are broken +Component: checks +State: open +Date: 2015-10-28 15:32:21 +Targetversion: 1.2.6 +Class: bug + +Seems that the interface grouping feature is not working since the +interface check has been made cluster aware. + +An exception "ValueError: need more than 19 values to unpack" is raised for interface group checks.

8 years, 8 months

added additional agent output

by Simon Betz

Module: check_mk Branch: master Commit: 00c60691c0d9423b995d35db68c44bca6391ec2d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=00c60691c0d942… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Oct 28 17:37:30 2015 +0100 added additional agent output --- inventory/solaris_prtdiag | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/inventory/solaris_prtdiag b/inventory/solaris_prtdiag index d4aadb6..4742124 100644 --- a/inventory/solaris_prtdiag +++ b/inventory/solaris_prtdiag @@ -105,6 +105,11 @@ def inv_solaris_prtdiag(info): # 'System Configuration: Sun Microsystems sun4u SPARC Enterprise M4000 Server' # 'System Configuration: Supermicro H8DG6/H8DGi' # 'System Configuration: Oracle Corporation SUN FIRE X4170 M2 SERVER' + # 'System Configuration: Sun Microsystems Sun Fire X4540' + # 'System Configuration: VMware, Inc. VMware Virtual Platform' + # 'System Configuration: HP ProLiant DL380 G5' + # 'System Configuration: SUN MICROSYSTEMS SUN FIRE X4270 SERVER' + # 'System Configuration: Sun Microsystems SUN FIRE X4450' node = inv_tree("hardware.system.") system_info = line[0].split(':', 1)[1].rstrip('\'') @@ -120,7 +125,6 @@ def inv_solaris_prtdiag(info): node["product"] = system_info_list[1] product_list = node["product"].split() - if product_list[-1].startswith('T'): node["family"] = "T-series" elif product_list[-2].startswith('M'):

8 years, 8 months

Add column headers to view sitehosts (showing one host group)

by Mathias Kettner

Module: check_mk Branch: master Commit: 976248e54847b562751eb4732611e4e1ff92f858 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=976248e54847b5… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Oct 28 17:02:36 2015 +0100 Add column headers to view sitehosts (showing one host group) --- web/plugins/views/builtin.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/plugins/views/builtin.py b/web/plugins/views/builtin.py index 6197e4c..8e357e9 100644 --- a/web/plugins/views/builtin.py +++ b/web/plugins/views/builtin.py @@ -1376,7 +1376,7 @@ multisite_builtin_views.update({ 'title': _('Service Group'), 'topic': _('Other')}, 'sitehosts': {'browser_reload': 30, - 'column_headers': 'off', + 'column_headers': 'pergroup', 'datasource': 'hosts', 'description': _('Link view showing all hosts of one site'), 'group_painters': [('site_icon', None), ('sitealias', 'sitesvcs')],

8 years, 8 months

#1297 FIX emcvnx_hba: Prevent old emc versions from inventory

by Bastian Kuhn

Module: check_mk Branch: master Commit: a95ae6be4c205f8dd904d84e37304d43331d1aa6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a95ae6be4c205f… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Wed Oct 28 16:46:04 2015 +0100 #1297 FIX emcvnx_hba: Prevent old emc versions from inventory Old Versions of EMC don't have any information about Read and Write blocks, so that check crashed. --- .werks/1297 | 11 +++++++++++ ChangeLog | 1 + checks/emcvnx_hba | 11 +++++++---- 3 files changed, 19 insertions(+), 4 deletions(-) diff --git a/.werks/1297 b/.werks/1297 new file mode 100644 index 0000000..1d0cb61 --- /dev/null +++ b/.werks/1297 @@ -0,0 +1,11 @@ +Title: emcvnx_hba: Prevent old emc versions from inventory +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i4 +Date: 1446047081 + +Old Versions of EMC don't have any information about Read and Write blocks, so that check crashed. + diff --git a/ChangeLog b/ChangeLog index 942347d..12497f6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -26,6 +26,7 @@ * 2669 FIX: mcdata_fcport: fix computation of in and out traffic... * 2692 FIX: check_http: Fixed broken check when using Nagios (introduced with 1.2.7i3) * 2706 FIX: winperf_if: fixed rare crashes of windows_if.ps1 plugin... + * 1297 FIX: emcvnx_hba: Prevent old emc versions from inventory... Multisite: * 2684 Added icons for downloading agent data / walks of hosts... diff --git a/checks/emcvnx_hba b/checks/emcvnx_hba index 86aaf7d..a0acde7 100644 --- a/checks/emcvnx_hba +++ b/checks/emcvnx_hba @@ -94,14 +94,16 @@ def parse_emcvnx_hba(info): return parsed -def inventory_emcvnx_hba(info): - return [ (hba, None) for hba in parse_emcvnx_hba(info).keys() ] +def inventory_emcvnx_hba(parsed): + for hba, values in parsed.items(): + # Old Versions of EMC don't have any Information + if values: + yield hba, None -def check_emcvnx_hba(item, _no_params, info): +def check_emcvnx_hba(item, _no_params, parsed): now = time.time() perfdata = [] - parsed = parse_emcvnx_hba(info) if item not in parsed: return 3, "HBA %s not found in agent output" % item @@ -121,6 +123,7 @@ def check_emcvnx_hba(item, _no_params, info): check_info['emcvnx_hba'] = { + "parse_function" : parse_emcvnx_hba, "inventory_function" : inventory_emcvnx_hba, "check_function" : check_emcvnx_hba, "service_description" : "HBA %s",

8 years, 8 months

Avoid white text in disocvery output - fix for terminals with white background

by Mathias Kettner

Module: check_mk Branch: master Commit: 54228d893c1ad7d08361951c50aa0bbfec625b2e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=54228d893c1ad7… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Oct 28 16:18:52 2015 +0100 Avoid white text in disocvery output - fix for terminals with white background --- modules/discovery.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/discovery.py b/modules/discovery.py index cf5c766..bd6d374 100644 --- a/modules/discovery.py +++ b/modules/discovery.py @@ -64,7 +64,7 @@ def do_discovery(hostnames, check_types, only_new): # Now loop through all hosts for hostname in hostnames: try: - verbose(tty_white + tty_bold + hostname + tty_normal + ":\n") + verbose(tty_bold + hostname + tty_normal + ":\n") if opt_debug: on_error = "raise" else:

8 years, 8 months

Better warning in case of query limit

by Mathias Kettner

Module: check_mk Branch: master Commit: 15f1ea85ded7bc50a3ddc8e5882dc2600e0f5925 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=15f1ea85ded7bc… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Oct 28 16:16:17 2015 +0100 Better warning in case of query limit --- web/htdocs/html_mod_python.py | 1 + 1 file changed, 1 insertion(+) diff --git a/web/htdocs/html_mod_python.py b/web/htdocs/html_mod_python.py index ccbf5e2..1cd3406 100644 --- a/web/htdocs/html_mod_python.py +++ b/web/htdocs/html_mod_python.py @@ -246,6 +246,7 @@ class html_mod_python(htmllib.html): elif self.var("limit") == "hard" and config.may("general.ignore_hard_limit"): text += '<a href="%s">%s</a>' % \ (self.makeuri([("limit", "none")]), _('Repeat query without limit.')) + text += " " + _("<b>Note:</b> the shown results are incomplete do not reflect the sort order.") self.show_warning(text) del rows[limit:] return False

8 years, 8 months

Remove debugging information from notify log

by Mathias Kettner

Module: check_mk Branch: master Commit: ecd4cf9899d2161d28afd868fc45712fa563cbec URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ecd4cf9899d216… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Oct 28 15:30:56 2015 +0100 Remove debugging information from notify log --- modules/notify.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/notify.py b/modules/notify.py index b5c6a86..5be18a5 100644 --- a/modules/notify.py +++ b/modules/notify.py @@ -236,8 +236,8 @@ def notify_notify(raw_context, analyse=False): notify_log("Analysing notification (%s) context with %s variables" % ( find_host_service_in_context(raw_context), len(raw_context))) else: - notify_log("Got raw notification (%s) context with %s variables (%r)" % ( - find_host_service_in_context(raw_context), len(raw_context), raw_context)) + notify_log("Got raw notification (%s) context with %s variables" % ( + find_host_service_in_context(raw_context), len(raw_context))) # Add some further variable for the conveniance of the plugins

8 years, 8 months

Some cleanup in the manpage catalog

by Sebastian Herbord

Module: check_mk Branch: master Commit: df52723d472f781d193d66f7b0908cfe48faed89 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=df52723d472f78… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Wed Oct 28 13:44:41 2015 +0100 Some cleanup in the manpage catalog --- checkman/kaspersky_av_client | 2 +- checkman/mcafee_av_client | 2 +- checkman/oracle_diva_csm | 2 +- checkman/oracle_diva_csm.actor | 2 +- checkman/oracle_diva_csm.archive | 2 +- checkman/oracle_diva_csm.drive | 2 +- checkman/oracle_diva_csm.objects | 2 +- checkman/oracle_diva_csm.tapes | 2 +- modules/catalog.py | 3 +++ 9 files changed, 11 insertions(+), 8 deletions(-) diff --git a/checkman/kaspersky_av_client b/checkman/kaspersky_av_client index 5db6a17..be56b63 100644 --- a/checkman/kaspersky_av_client +++ b/checkman/kaspersky_av_client @@ -1,6 +1,6 @@ title: Kaspersky Anti-Virus: Signature and Fullscan agents: windows -catalog: app/ +catalog: app/kaspersky license: GPL distribution: check_mk description: diff --git a/checkman/mcafee_av_client b/checkman/mcafee_av_client index 808c185..69a4bb3 100644 --- a/checkman/mcafee_av_client +++ b/checkman/mcafee_av_client @@ -1,6 +1,6 @@ title: McAfee Anti-Virus Signature Date agents: windows -catalog: app/kaspersky +catalog: app/mcafee license: GPL distribution: check_mk description: diff --git a/checkman/oracle_diva_csm b/checkman/oracle_diva_csm index ec01c96..97932cc 100644 --- a/checkman/oracle_diva_csm +++ b/checkman/oracle_diva_csm @@ -1,6 +1,6 @@ title: DIVA Content Storage Management: Library Status agents: snmp -catalog: hw/storagehw/oracle +catalog: hw/storagehw/oraclehw license: GPL distribution: check_mk description: diff --git a/checkman/oracle_diva_csm.actor b/checkman/oracle_diva_csm.actor index d115c4c..bdbd915 100644 --- a/checkman/oracle_diva_csm.actor +++ b/checkman/oracle_diva_csm.actor @@ -1,6 +1,6 @@ title: DIVA Content Storage Management: Actor Status agents: snmp -catalog: hw/storagehw/oracle +catalog: hw/storagehw/oraclehw license: GPL distribution: check_mk description: diff --git a/checkman/oracle_diva_csm.archive b/checkman/oracle_diva_csm.archive index f9b1e8c..946c650 100644 --- a/checkman/oracle_diva_csm.archive +++ b/checkman/oracle_diva_csm.archive @@ -1,6 +1,6 @@ title: DIVA Content Storage Management: Archive Status agents: snmp -catalog: hw/storagehw/oracle +catalog: hw/storagehw/oraclehw license: GPL distribution: check_mk description: diff --git a/checkman/oracle_diva_csm.drive b/checkman/oracle_diva_csm.drive index 083936a..4c4d083 100644 --- a/checkman/oracle_diva_csm.drive +++ b/checkman/oracle_diva_csm.drive @@ -1,6 +1,6 @@ title: DIVA Content Storage Management: Drive Status agents: snmp -catalog: hw/storagehw/oracle +catalog: hw/storagehw/oraclehw license: GPL distribution: check_mk description: diff --git a/checkman/oracle_diva_csm.objects b/checkman/oracle_diva_csm.objects index 7b63e43..a2285aa 100644 --- a/checkman/oracle_diva_csm.objects +++ b/checkman/oracle_diva_csm.objects @@ -1,6 +1,6 @@ title: DIVA Content Storage Management: Objects agents: snmp -catalog: hw/storagehw/oracle +catalog: hw/storagehw/oraclehw license: GPL distribution: check_mk description: diff --git a/checkman/oracle_diva_csm.tapes b/checkman/oracle_diva_csm.tapes index 199a0e0..6e4cedb 100644 --- a/checkman/oracle_diva_csm.tapes +++ b/checkman/oracle_diva_csm.tapes @@ -1,6 +1,6 @@ title: DIVA Content Storage Management: Blank Tapes agents: snmp -catalog: hw/storagehw/oracle +catalog: hw/storagehw/oraclehw license: GPL distribution: check_mk description: diff --git a/modules/catalog.py b/modules/catalog.py index 6900d46..f613a02 100644 --- a/modules/catalog.py +++ b/modules/catalog.py @@ -96,6 +96,7 @@ manpage_catalog_titles = { "emc" : "EMC", "qlogic" : "QLogic", "quantum" : "Quantum", + "oraclehw" : "ORACLE", "phone" : "Telephony", "app" : "Applications", @@ -125,6 +126,8 @@ manpage_catalog_titles = { "tsm" : "IBM Tivoli Storage Manager (TSM)", "unitrends" : "Unitrends", "sansymphony" : "Datacore SANsymphony", + "kaspersky" : "Kaspersky Lab", + "mcafee" : "McAfee", "os" : "Operating Systems", "aix" : "AIX",

8 years, 8 months

systemtime: fixed unnecessary imprecision of check

by Sebastian Herbord

Module: check_mk Branch: master Commit: 787c60bf2b48207702e3b4bda9fd2a476302ea61 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=787c60bf2b4820… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Wed Oct 28 13:22:20 2015 +0100 systemtime: fixed unnecessary imprecision of check the check compared a second-precision timestamp from the agent with a high-precision timestamp from the local system. This caused unnecessary noise in the graphs and implied to the user higher precision than what was actually provided. --- checks/systemtime | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/checks/systemtime b/checks/systemtime index 6593604..b59b8d9 100644 --- a/checks/systemtime +++ b/checks/systemtime @@ -35,10 +35,10 @@ def check_systemtime(item, params, info): return (3, "no information sent by agent") systemtime = int(info[0][0]) - ourtime = time.time() + ourtime = int(time.time()) offset = systemtime - ourtime warn, crit = params - infotext = "Offset is %+.1f sec (warn/crit at %d/%d sec)" % (offset, warn, crit) + infotext = "Offset is %d sec (warn/crit at %d/%d sec)" % (offset, warn, crit) perfdata = [ ("offset", offset, warn, crit, 0) ] if abs(offset) >= crit:

8 years, 8 months

Untabify.

by Sven Panne

Module: check_mk Branch: master Commit: 3870110543ad481ab2d7825b91ad11d24d25345c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3870110543ad48… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Oct 28 11:48:18 2015 +0100 Untabify. --- livestatus/src/Store.cc | 4 +--- livestatus/src/TableStateHistory.cc | 18 +++++++++--------- livestatus/src/store_c.cc | 6 ++---- livestatus/src/unixcat.c | 3 +-- 4 files changed, 13 insertions(+), 18 deletions(-) diff --git a/livestatus/src/Store.cc b/livestatus/src/Store.cc index 57449cb..fba20b2 100644 --- a/livestatus/src/Store.cc +++ b/livestatus/src/Store.cc @@ -142,7 +142,7 @@ bool Store::answerRequest(InputBuffer *input, OutputBuffer *output) output->setDoKeepalive(true); } else if (!strncmp(line, "LOGROTATE", 9)) { - logger(LG_INFO, "Forcing logfile rotation"); + logger(LG_INFO, "Forcing logfile rotation"); rotate_log_file(time(0)); schedule_new_event(EVENT_LOG_ROTATION,TRUE,get_next_log_rotation_time(),FALSE,0,(void *)get_next_log_rotation_time,TRUE,NULL,NULL,0); } @@ -195,5 +195,3 @@ void Store::answerGetRequest(InputBuffer *input, OutputBuffer *output, const cha logger(LG_INFO, "Time to process request: %lu us. Size of answer: %d bytes", ustime, output->size()); } } - - diff --git a/livestatus/src/TableStateHistory.cc b/livestatus/src/TableStateHistory.cc index e4efdbd..5b48052 100644 --- a/livestatus/src/TableStateHistory.cc +++ b/livestatus/src/TableStateHistory.cc @@ -368,13 +368,13 @@ void TableStateHistory::answerQuery(Query *query) key = 0; bool is_service = false; switch (entry->_type) { - case NONE: - case CORE_STARTING: - case CORE_STOPPING: - case LOG_VERSION: - case ACKNOWLEDGE_ALERT_HOST: - case ACKNOWLEDGE_ALERT_SERVICE: - break; + case NONE: + case CORE_STARTING: + case CORE_STOPPING: + case LOG_VERSION: + case ACKNOWLEDGE_ALERT_HOST: + case ACKNOWLEDGE_ALERT_SERVICE: + break; case ALERT_SERVICE: case STATE_SERVICE: case STATE_SERVICE_INITIAL: @@ -382,7 +382,7 @@ void TableStateHistory::answerQuery(Query *query) case FLAPPING_SERVICE: key = entry->_service; is_service = true; - // fall-through + // fall-through case ALERT_HOST: case STATE_HOST: case STATE_HOST_INITIAL: @@ -704,7 +704,7 @@ int TableStateHistory::updateHostServiceState(Query *query, const LogEntry *entr case LOG_INITIAL_STATES: case ACKNOWLEDGE_ALERT_HOST: case ACKNOWLEDGE_ALERT_SERVICE: - break; + break; case STATE_HOST: case STATE_HOST_INITIAL: case ALERT_HOST: diff --git a/livestatus/src/store_c.cc b/livestatus/src/store_c.cc index af245ba..781790a 100644 --- a/livestatus/src/store_c.cc +++ b/livestatus/src/store_c.cc @@ -48,7 +48,7 @@ TimeperiodsCache *g_timeperiods_cache = 0; void store_init() { - g_store = new Store(); + g_store = new Store(); g_client_queue = new ClientQueue(); g_timeperiods_cache = new TimeperiodsCache(); } @@ -136,7 +136,5 @@ void update_timeperiods_cache(time_t now) } void log_timeperiods_cache(){ - g_timeperiods_cache->logCurrentTimeperiods(); + g_timeperiods_cache->logCurrentTimeperiods(); } - - diff --git a/livestatus/src/unixcat.c b/livestatus/src/unixcat.c index 15e5e2d..ad637c8 100644 --- a/livestatus/src/unixcat.c +++ b/livestatus/src/unixcat.c @@ -112,7 +112,7 @@ void *copy_thread(void *info) r -= w; else if (w == 0 && r > 0) { fprintf(stderr, "Error: Cannot write %" PRIdMAX " bytes to %d: %s\n", - (intmax_t)w, to, strerror(errno)); + (intmax_t)w, to, strerror(errno)); break; } } @@ -166,4 +166,3 @@ int main(int argc, char **argv) close(sock); return 0; } -

8 years, 8 months

← Newer
1
2
3
4
5
6
7
8
9
...
30
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits October 2015