Checkmk git commits July 2016

checkmk-commits@lists.checkmk.com

10 participants
213 discussions

by Sven Panne

Module: check_mk Branch: master Commit: 06977371a9c34d53a561848ede18c1c2fdef6887 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=06977371a9c34d… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Jul 7 13:57:35 2016 +0200 Fetched Livestatus from upstream. --- livestatus/src/{tables.h => ChronoUtils.h} | 74 +++++++++++++--------------- livestatus/src/HostlistColumn.cc | 6 +-- livestatus/src/HostlistStateColumn.cc | 6 +-- livestatus/src/LogCache.h | 1 - livestatus/src/ServicelistColumn.cc | 5 +- livestatus/src/ServicelistStateColumn.cc | 6 +-- livestatus/src/Store.cc | 26 ---------- livestatus/src/TableHostgroups.cc | 4 +- livestatus/src/TableServicegroups.cc | 4 +- livestatus/src/auth.cc | 33 ++++++------- 10 files changed, 61 insertions(+), 104 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=06977371a9…

8 years, 2 months

Reserved 10 Werk IDS

by Marcel Schulte

Module: check_mk Branch: master Commit: ba4f3da75e4cdc1a7e5ac5b6d5f5422e1f2a7d6a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ba4f3da75e4cdc… Author: Marcel Schulte <ms(a)mathias-kettner.de> Date: Thu Jul 7 13:02:32 2016 +0200 Reserved 10 Werk IDS --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 0ee948f..981aad2 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -3696 +3706

8 years, 2 months

3665 FIX hitachi_hnas_*: Fixed service discovery on some devices ( e.g. HM800)

by Lars Michelsen

Module: check_mk Branch: master Commit: 92ae3ff5371e71ee3b6640b15834a7b9b4f5350a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=92ae3ff5371e71… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jul 7 11:18:04 2016 +0200 3665 FIX hitachi_hnas_*: Fixed service discovery on some devices (e.g. HM800) --- .werks/3665 | 10 ++++++++++ ChangeLog | 1 + checks/hitachi_hnas.include | 36 ++++++++++++++++++++++++++++++++++++ checks/hitachi_hnas_bossock | 3 ++- checks/hitachi_hnas_cifs | 3 ++- checks/hitachi_hnas_cpu | 3 ++- checks/hitachi_hnas_drives | 3 ++- checks/hitachi_hnas_fan | 3 ++- checks/hitachi_hnas_fc_if | 4 ++-- checks/hitachi_hnas_fpga | 3 ++- checks/hitachi_hnas_pnode | 3 ++- checks/hitachi_hnas_psu | 3 ++- checks/hitachi_hnas_quorumdevice | 3 ++- checks/hitachi_hnas_span | 3 ++- checks/hitachi_hnas_temp | 4 ++-- checks/hitachi_hnas_vnode | 3 ++- checks/hitachi_hnas_volume | 3 ++- 17 files changed, 75 insertions(+), 16 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=92ae3ff537…

8 years, 2 months

Fetched Livestatus from upstream.

by Sven Panne

Module: check_mk Branch: master Commit: d7eadc595c9120fd6bb6aa0fd6f8ae7506016fee URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d7eadc595c9120… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Jul 7 11:04:53 2016 +0200 Fetched Livestatus from upstream. --- livestatus/src/InputBuffer.cc | 11 +++++------ livestatus/src/OutputBuffer.cc | 11 +++++------ livestatus/src/TableDownComm.cc | 2 +- livestatus/src/TableHosts.cc | 2 +- livestatus/src/TableHostsByGroup.cc | 6 +++--- livestatus/src/TableLog.cc | 6 +++--- livestatus/src/TableServices.cc | 2 +- livestatus/src/TableServicesByGroup.cc | 8 ++++---- livestatus/src/TableServicesByHostGroup.cc | 2 +- livestatus/src/TableStateHistory.cc | 7 ++----- livestatus/src/auth.cc | 24 +++++++++++------------- livestatus/src/auth.h | 6 +----- 12 files changed, 38 insertions(+), 49 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=d7eadc595c…

8 years, 2 months

3664 FIX Fixed not working hardware/ system serial and model painters and filters

by Lars Michelsen

Module: check_mk Branch: master Commit: 1a96f46cce84416d30ddcee5381c7c6161996587 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1a96f46cce8441… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jul 7 09:55:17 2016 +0200 3664 FIX Fixed not working hardware/system serial and model painters and filters If you already configured them in your views and they were not working, you will have to remove them from your view and re-add them. --- .werks/3664 | 11 +++++++++++ ChangeLog | 1 + web/plugins/views/inventory.py | 5 +++++ 3 files changed, 17 insertions(+) diff --git a/.werks/3664 b/.werks/3664 new file mode 100644 index 0000000..2834b00 --- /dev/null +++ b/.werks/3664 @@ -0,0 +1,11 @@ +Title: Fixed not working hardware/system serial and model painters and filters +Level: 1 +Component: inv +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i1 +Date: 1467877979 + +If you already configured them in your views and they were not working, you will have +to remove them from your view and re-add them. diff --git a/ChangeLog b/ChangeLog index 71cb0f9..7c37f3c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -560,6 +560,7 @@ * 3526 FIX: Inventory scripts are no longer called when no data is available for their section... * 3455 FIX: Fixed broken switch port filtering/sorting view * 3663 FIX: Added missing system manufacturer filter/painter + * 3664 FIX: Fixed not working hardware/system serial and model painters and filters... 1.2.8b1: diff --git a/web/plugins/views/inventory.py b/web/plugins/views/inventory.py index 4e4f109..1d821a0 100644 --- a/web/plugins/views/inventory.py +++ b/web/plugins/views/inventory.py @@ -581,6 +581,11 @@ inventory_displayhints.update({ ".hardware.system.product" : { "title" : _("Product") }, ".hardware.system.serial" : { "title" : _("Serial Number") }, ".hardware.system.model" : { "title" : _("Model Name") }, + + # Legacy ones. Kept to not break existing views - DON'T use these values for new plugins + ".hardware.system.serial_number" : { "title" : _("Serial Number - LEGACY, don't use") }, + ".hardware.system.model_name" : { "title" : _("Model Name - LEGACY, don't use") }, + ".hardware.system.manufacturer" : { "title" : _("Manufacturer") }, ".hardware.components." : { "title" : _("Physical Components") },

8 years, 2 months

3663 FIX Added missing system manufacturer filter/painter

by Lars Michelsen

Module: check_mk Branch: master Commit: 8e456af35cd5c7e719ae453563ca485e5bd04963 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8e456af35cd5c7… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jul 7 09:45:10 2016 +0200 3663 FIX Added missing system manufacturer filter/painter --- .werks/3663 | 10 ++++++++++ ChangeLog | 1 + web/plugins/views/inventory.py | 1 + 3 files changed, 12 insertions(+) diff --git a/.werks/3663 b/.werks/3663 new file mode 100644 index 0000000..f0e4610 --- /dev/null +++ b/.werks/3663 @@ -0,0 +1,10 @@ +Title: Added missing system manufacturer filter/painter +Level: 1 +Component: inv +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i1 +Date: 1467877417 + + diff --git a/ChangeLog b/ChangeLog index 82d13ee..71cb0f9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -559,6 +559,7 @@ * 3025 FIX: solaris_pkginfo: the last element of the reported software package list was always missing * 3526 FIX: Inventory scripts are no longer called when no data is available for their section... * 3455 FIX: Fixed broken switch port filtering/sorting view + * 3663 FIX: Added missing system manufacturer filter/painter 1.2.8b1: diff --git a/web/plugins/views/inventory.py b/web/plugins/views/inventory.py index 0cfcfc8..4e4f109 100644 --- a/web/plugins/views/inventory.py +++ b/web/plugins/views/inventory.py @@ -581,6 +581,7 @@ inventory_displayhints.update({ ".hardware.system.product" : { "title" : _("Product") }, ".hardware.system.serial" : { "title" : _("Serial Number") }, ".hardware.system.model" : { "title" : _("Model Name") }, + ".hardware.system.manufacturer" : { "title" : _("Manufacturer") }, ".hardware.components." : { "title" : _("Physical Components") }, ".hardware.components.backplanes:" : { "title" : _("Backplanes"), "render" : render_inv_dicttable,

8 years, 2 months

3555 FIX esx_vsphere_sensors: fixed incorrect default parameter during service discovery

by Andreas Boesl

Module: check_mk Branch: master Commit: f726a6c7dbded904be7d6107ee7ffa1093c4495a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f726a6c7dbded9… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Jul 6 16:23:07 2016 +0200 3555 FIX esx_vsphere_sensors: fixed incorrect default parameter during service discovery This fixes an display only bug in the WATO service discovery page. --- .werks/3555 | 10 ++++++++++ ChangeLog | 1 + checks/esx_vsphere_sensors | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/3555 b/.werks/3555 new file mode 100644 index 0000000..086dcc5 --- /dev/null +++ b/.werks/3555 @@ -0,0 +1,10 @@ +Title: esx_vsphere_sensors: fixed incorrect default parameter during service discovery +Level: 1 +Component: checks +Compatible: compat +Version: 1.4.0i1 +Date: 1467814944 +Class: fix + +This fixes an display only bug in the WATO service discovery page. + diff --git a/ChangeLog b/ChangeLog index c37e37c..82d13ee 100644 --- a/ChangeLog +++ b/ChangeLog @@ -299,6 +299,7 @@ * 3552 FIX: SNMPv3: Fixed login with security level noAuthNoPriv... * 3694 FIX: fortigate_sessions_base: Added missing WATO rule * 3153 FIX: windows agent: fixed two problems that could cause missing wmi results... + * 3555 FIX: esx_vsphere_sensors: fixed incorrect default parameter during service discovery... Multisite: * 3187 notification view: new filter for log command via regex diff --git a/checks/esx_vsphere_sensors b/checks/esx_vsphere_sensors index 51e3b76..45a5be8 100644 --- a/checks/esx_vsphere_sensors +++ b/checks/esx_vsphere_sensors @@ -36,7 +36,7 @@ # Power Supply 2 Power Supply 2 0: Power Supply AC lost - Assert;;0;power;0;;red;Red;Sensor is operating under critical conditions def inventory_esx_vsphere_sensors(info): - return [(None, None)] + return [(None, [])] def check_esx_vsphere_sensors(_no_item, params, info): state = 0

8 years, 2 months

Fixed implementation of "see unrelated" permission checking in GUI

by Lars Michelsen

Module: check_mk Branch: master Commit: 84e7c1998e0895e90a7bfce11114c9395eb14d88 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=84e7c1998e0895… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jul 6 12:45:16 2016 +0200 Fixed implementation of "see unrelated" permission checking in GUI --- web/htdocs/views.py | 21 ++++++++++++++++++--- web/plugins/views/mkeventd.py | 21 +++++++++++++++++++-- 2 files changed, 37 insertions(+), 5 deletions(-) diff --git a/web/htdocs/views.py b/web/htdocs/views.py index ad955ee..c5d70ca 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -1126,9 +1126,15 @@ def show_view(view, show_heading = False, show_buttons = True, # tablename may be a function instead of a livestatus tablename # In that case that function is used to compute the result. + # It may also be a tuple. In this case the first element is a function and the second element + # is a list of argument to hand over to the function together with all other arguments that + # are passed to query_data(). if type(tablename) == type(lambda x:None): rows = tablename(columns, query, only_sites, limit, all_active_filters) + elif type(tablename) == tuple: + func, args = tablename + rows = func(datasource, columns, add_columns, query, only_sites, limit, *args) else: rows = query_data(datasource, columns, add_columns, query, only_sites, limit) @@ -1664,8 +1670,10 @@ def ajax_count_button(): # add_headers: additional livestatus headers to add # only_sites: list of sites the query is limited to # limit: maximum number of data rows to query -def query_data(datasource, columns, add_columns, add_headers, only_sites = [], limit = None): - tablename = datasource["table"] +def query_data(datasource, columns, add_columns, add_headers, only_sites = [], limit = None, tablename=None): + if tablename == None: + tablename = datasource["table"] + add_headers += datasource.get("add_headers", "") merge_column = datasource.get("merge_by") if merge_column: @@ -1691,9 +1699,16 @@ def query_data(datasource, columns, add_columns, add_headers, only_sites = [], l # Remove columns which are implicitely added by the datasource columns = [ c for c in columns if c not in add_columns ] query = "GET %s\n" % tablename - return do_query_data(query, columns, add_columns, merge_column, + rows = do_query_data(query, columns, add_columns, merge_column, add_headers, only_sites, limit, auth_domain) + # Datasource may have optional post processing function to filter out rows + post_process_func = datasource.get("post_process") + if post_process_func: + return post_process_func(rows) + else: + return rows + def do_query_data(query, columns, add_columns, merge_column, add_headers, only_sites, limit, auth_domain): diff --git a/web/plugins/views/mkeventd.py b/web/plugins/views/mkeventd.py index c54f9b9..ffc2944 100644 --- a/web/plugins/views/mkeventd.py +++ b/web/plugins/views/mkeventd.py @@ -42,6 +42,23 @@ except: # | | # '----------------------------------------------------------------------' + +def query_ec_table(datasource, columns, add_columns, query, only_sites, limit, tablename): + if "event_contact_groups" not in columns: + columns.append("event_contact_groups") + if "host_contact_groups" not in columns: + columns.append("host_contact_groups") + + rows = query_data(datasource, columns, add_columns, query, only_sites, limit, + tablename=tablename) + + if config.may("mkeventd.seeunrelated"): + return rows # user is allowed to see all events returned by the core + + return [ r for r in rows if r["event_contact_groups"] != [] or r["host_name"] != "" ] + + + # Declare datasource only if the event console is activated. We do # not want to irritate users that do not know anything about the EC. if mkeventd_enabled: @@ -60,7 +77,7 @@ if mkeventd_enabled: multisite_datasources["mkeventd_events"] = { "title" : _("Event Console: Current Events"), - "table" : "eventconsoleevents", + "table" : (query_ec_table, ["eventconsoleevents"]), "auth_domain" : "ec", "infos" : [ "event", "host" ], "keys" : [], @@ -70,7 +87,7 @@ if mkeventd_enabled: multisite_datasources["mkeventd_history"] = { "title" : _("Event Console: Event History"), - "table" : "eventconsolehistory", + "table" : (query_ec_table, ["eventconsolehistory"]), "auth_domain" : "ec", "infos" : [ "history", "event", "host" ], "keys" : [],

8 years, 2 months

Added gb

by Konstantin Büttner

Module: check_mk Branch: master Commit: 5d2b3a40a3fe0b12857e8c52e1c2985d375769b1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5d2b3a40a3fe0b… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed Jul 6 11:49:50 2016 +0200 Added gb --- .bugs/2253 | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.bugs/2253 b/.bugs/2253 new file mode 100644 index 0000000..b8a4cc2 --- /dev/null +++ b/.bugs/2253 @@ -0,0 +1,10 @@ +Title: MKP: Ausführbarkeit bleibt nicht erhalten +Component: checks +State: open +Date: 2016-07-06 11:47:48 +Targetversion: future +Class: nastiness + +Verpackt man Nagios-Checks (die ausführbar sein müssen) in MKPs, +sind diese nach Installation des MKPs nicht mehr ausführbar und +funktionieren dementsprechend nicht.

8 years, 2 months

Updated bug entries #2498

by Mathias Kettner

Module: check_mk Branch: master Commit: f523be54e9a5ff4f9cc2ff19ab9eb62edd84c12e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f523be54e9a5ff… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jul 6 11:44:37 2016 +0200 Updated bug entries #2498 --- .bugs/2498 | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/.bugs/2498 b/.bugs/2498 new file mode 100644 index 0000000..4f60f1f --- /dev/null +++ b/.bugs/2498 @@ -0,0 +1,13 @@ +Title: WATO-Snapshots should warn if data in local/ is too much +Component: wato +State: open +Date: 2016-07-06 11:43:10 +Targetversion: 1.2.8 +Class: bug + +We had the case that a user pu approx 4GB of tmp data below local/. +During "Activate Changes" WATO creates a snapshot of this. This +took very long and lead to a Apache timeout (proxy error...). + +We need to validate the data in local/ somehow. Maybe make size +limit? Or positively check all directories?

8 years, 2 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits July 2016