Checkmk git commits February 2017

checkmk-commits@lists.checkmk.com

10 participants
452 discussions

by Sven Panne

Module: check_mk Branch: master Commit: d5378fbd415e398ed1971ca0fcce18f5c16b4d49 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d5378fbd415e39… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Feb 2 09:42:49 2017 +0100 Fixed compile_commands.json target Change-Id: I827d9b925297f471d8947e3b08c0ff275a786e4d --- Makefile | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 5fd9423..9fd4e5e 100644 --- a/Makefile +++ b/Makefile @@ -22,6 +22,12 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. +ifneq (,$(wildcard enterprise)) +ENTERPRISE := yes +else +ENTERPRISE := no +endif + SHELL := /bin/bash VERSION := 1.4.0i4 NAME := check_mk @@ -330,9 +336,12 @@ GTAGS: config.h $(MAKE) -C livestatus GTAGS compile_commands.json: config.h $(FILES_TO_FORMAT) - @echo "making $@: $? is newer" $(MAKE) -C livestatus clean $(BEAR) $(MAKE) -C livestatus -j8 +ifeq ($(ENTERPRISE),yes) + $(MAKE) -C enterprise/core clean + $(BEAR) --append $(MAKE) -C enterprise/core -j8 +endif tidy: compile_commands.json @scripts/compiled_sources | xargs $(CLANG_TIDY) --extra-arg=-D__clang_analyzer__

7 years, 7 months

Merge duplicate ContacsColumn.h

by Sven Panne

Module: check_mk Branch: master Commit: 624d56bc6f240e182b48c549cf80f18f9ac70ef6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=624d56bc6f240e… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Feb 2 12:53:03 2017 +0100 Merge duplicate ContacsColumn.h Change-Id: I014ee3af0c45fbcd91fa2f38fb67411759835caf --- livestatus/src/ContactsColumn.h | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/livestatus/src/ContactsColumn.h b/livestatus/src/ContactsColumn.h index e25f4cc..4db5929 100644 --- a/livestatus/src/ContactsColumn.h +++ b/livestatus/src/ContactsColumn.h @@ -29,9 +29,14 @@ #include <memory> #include <string> #include "ListColumn.h" -#include "nagios.h" class RowRenderer; +#ifdef CMC +#include "cmc.h" +#else +#include "nagios.h" +#endif + class ContactsColumn : public ListColumn { public: ContactsColumn(const std::string &name, const std::string &description, @@ -39,7 +44,11 @@ public: int extra_extra_offset) : ListColumn(name, description, indirect_offset, extra_offset, extra_extra_offset) {} +#ifdef CMC + std::unique_ptr<Contains> makeContains(const std::string &name) override; +#else virtual std::unique_ptr<Contains> containsContact(contact *ctc) = 0; +#endif bool isEmpty(void *data) override; void output(void *row, RowRenderer &r, contact *auth_user) override; };

7 years, 7 months

Merge duplicate ContactGroupsMemberColumn.h

by Sven Panne

Module: check_mk Branch: master Commit: 493811d0b45ee943bd8800d88278a3b5dccb3026 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=493811d0b45ee9… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Feb 2 12:39:50 2017 +0100 Merge duplicate ContactGroupsMemberColumn.h Change-Id: I2b251920af9bbb2bba08106206e66059bc41e35e --- livestatus/src/ContactGroupsMemberColumn.h | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/livestatus/src/ContactGroupsMemberColumn.h b/livestatus/src/ContactGroupsMemberColumn.h index bc9d0f4..6a4a7c5 100644 --- a/livestatus/src/ContactGroupsMemberColumn.h +++ b/livestatus/src/ContactGroupsMemberColumn.h @@ -29,18 +29,28 @@ #include <memory> #include <string> #include "ContactsColumn.h" + +#ifdef CMC +class RowRenderer; +#else #include "nagios.h" +#endif class ContactGroupsMemberColumn : public ContactsColumn { public: - ContactGroupsMemberColumn(const std::string& name, - const std::string& description, + ContactGroupsMemberColumn(const std::string &name, + const std::string &description, int indirect_offset, int extra_offset, int extra_extra_offset) : ContactsColumn(name, description, indirect_offset, extra_offset, extra_extra_offset) {} - std::unique_ptr<Contains> makeContains(const std::string& name) override; - std::unique_ptr<Contains> containsContact(contact* ctc) override; + std::unique_ptr<Contains> makeContains(const std::string &name) override; +#ifdef CMC + void output(void *row, RowRenderer &r, contact *auth_user) override; + bool isEmpty(void *data) override; +#else + std::unique_ptr<Contains> containsContact(contact *ctc) override; +#endif }; #endif // ContactGroupsMemberColumn_h

7 years, 7 months

Fixed error handling in test makefile

by Lars Michelsen

Module: check_mk Branch: master Commit: 4f318040527fcf6bd2b08324a1cbf993abfc3599 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4f318040527fcf… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Feb 2 11:54:41 2017 +0100 Fixed error handling in test makefile Change-Id: Ia75e672308c9f0e496886514c379d69d90ae89ae --- tests/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Makefile b/tests/Makefile index 4b528a2..78fe27b 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -1,4 +1,4 @@ -SHELL=/bin/bash +SHELL=/bin/bash -e help: @echo "test - Run integration and git tests"

7 years, 7 months

Testreview 3

by Lars Michelsen

Module: check_mk Branch: master Commit: a582b88da693339006f07659cce9636510a91919 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a582b88da69333… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Feb 2 11:21:46 2017 +0100 Testreview 3 Change-Id: I53d59a57d9110f707feed02ade1ee2e175324596 --- ChangeLog | 1 - 1 file changed, 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 9af7101..ec44cd0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -151,7 +151,6 @@ * 4188 snmp_extended_info: Now capable to inventorize cisco backplane chassis... * 4258 FIX: snmp_extended_info: fixed undefined variable - 1.4.0i3: Core & Setup: * 3978 FIX: mkbackup: Fixed backup to some CIFS shares ([Errno 13] Permission denied) '...')...

7 years, 7 months

Testcommit

by Lars Michelsen

Module: check_mk Branch: master Commit: 801e2582a42be3124db781053d91083234723cfa URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=801e2582a42be3… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Feb 2 11:21:13 2017 +0100 Testcommit Change-Id: I604862b5ce40b63814196de05fdf966c8aca19fe --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index ec44cd0..9af7101 100644 --- a/ChangeLog +++ b/ChangeLog @@ -151,6 +151,7 @@ * 4188 snmp_extended_info: Now capable to inventorize cisco backplane chassis... * 4258 FIX: snmp_extended_info: fixed undefined variable + 1.4.0i3: Core & Setup: * 3978 FIX: mkbackup: Fixed backup to some CIFS shares ([Errno 13] Permission denied) '...')...

7 years, 7 months

4316 FIX Views: Fixed editing of "hide from sidebar" and " show context button" options

by Lars Michelsen

Module: check_mk Branch: master Commit: 598e5178f48ca900fa632b815ea948d4678fe698 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=598e5178f48ca9… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Feb 2 10:58:17 2017 +0100 4316 FIX Views: Fixed editing of "hide from sidebar" and "show context button" options Change-Id: Ia822644dc7c6dd46317cab160c38cbb3d7354395 --- .werks/4316 | 9 +++++++++ ChangeLog | 2 ++ web/htdocs/visuals.py | 4 ++-- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/.werks/4316 b/.werks/4316 new file mode 100644 index 0000000..af1bb02 --- /dev/null +++ b/.werks/4316 @@ -0,0 +1,9 @@ +Title: Views: Fixed editing of "hide from sidebar" and "show context button" options +Level: 1 +Component: multisite +Compatible: compat +Version: 1.4.0i4 +Date: 1486029473 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 8f5e1be..9af7101 100644 --- a/ChangeLog +++ b/ChangeLog @@ -105,6 +105,7 @@ * 4285 FIX: Availability: Timeline tables can now not be sorted and searched anymore * 4015 FIX: Multisite events page: Fixed slow page generation caused by the event delete icon... * 4315 FIX: Logwatch problematic logfiles list was showing too many logfiles + * 4316 FIX: Views: Fixed editing of "hide from sidebar" and "show context button" options WATO: * 4142 New extended search dialog for rulesets and rules... @@ -150,6 +151,7 @@ * 4188 snmp_extended_info: Now capable to inventorize cisco backplane chassis... * 4258 FIX: snmp_extended_info: fixed undefined variable + 1.4.0i3: Core & Setup: * 3978 FIX: mkbackup: Fixed backup to some CIFS shares ([Errno 13] Permission denied) '...')... diff --git a/web/htdocs/visuals.py b/web/htdocs/visuals.py index 04c6617..c202d99 100644 --- a/web/htdocs/visuals.py +++ b/web/htdocs/visuals.py @@ -653,11 +653,11 @@ def page_edit_visual(what, all_visuals, custom_field_handler = None, # appear as boolean-keys directly in the visual dict, but encapsulated # in a list choice in the value spec. visibility_elements = [ - ('hidden', FixedValue(None, + ('hidden', FixedValue(True, title = _('Hide this %s from the sidebar') % visual_type["title"], totext = "", )), - ('hidebutton', FixedValue(None, + ('hidebutton', FixedValue(True, title = _('Do not show a context button to this %s') % visual_type["title"], totext = "", )),

7 years, 7 months

Testcommit

by Lars Michelsen

Module: check_mk Branch: master Commit: 4523480d0b9fc118e25e1e51155397aac6842d30 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4523480d0b9fc1… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Feb 2 11:13:16 2017 +0100 Testcommit Change-Id: Icf0fd9a5af99baf7f5dd2c3df2807483f6f6fc6c --- ChangeLog | 1 - 1 file changed, 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 9af7101..ec44cd0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -151,7 +151,6 @@ * 4188 snmp_extended_info: Now capable to inventorize cisco backplane chassis... * 4258 FIX: snmp_extended_info: fixed undefined variable - 1.4.0i3: Core & Setup: * 3978 FIX: mkbackup: Fixed backup to some CIFS shares ([Errno 13] Permission denied) '...')...

7 years, 7 months

4334 mssql_instance: now the connection status is configurable

by Simon Betz

Module: check_mk Branch: master Commit: ad9822ecf81bb9aca7ff5c566ce124a82d4816d1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ad9822ecf81bb9… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Feb 2 10:41:10 2017 +0100 4334 mssql_instance: now the connection status is configurable Change-Id: I673b08df7f4b0bff4ef869756538069dedc50662 --- .werks/4334 | 9 +++++++++ ChangeLog | 1 + checks/mssql_instance | 12 +++++++++--- web/plugins/wato/check_parameters.py | 17 +++++++++++++++++ 4 files changed, 36 insertions(+), 3 deletions(-) diff --git a/.werks/4334 b/.werks/4334 new file mode 100644 index 0000000..0056886 --- /dev/null +++ b/.werks/4334 @@ -0,0 +1,9 @@ +Title: mssql_instance: now the connection status is configurable +Level: 1 +Component: checks +Compatible: compat +Version: 1.4.0i4 +Date: 1486028435 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index cbfff19..8f5e1be 100644 --- a/ChangeLog +++ b/ChangeLog @@ -22,6 +22,7 @@ * 4296 mssql_databases: new check which monitors the auto close and shrink state of MSSQL databases... * 4215 hp_webmgmt_status: Now also displays device model and serial number * 4332 check_http: Add support for TLSv1.1 and TLSv1.2 as configuration option... + * 4334 mssql_instance: now the connection status is configurable * 4171 FIX: perle_psmu: fixed value error... * 4172 FIX: smart.temp: fixed discovery and check function... * 4173 FIX: if.include: ignore some more keys in 'Network interfaces and switch ports' rule which are only used for interface grouping diff --git a/checks/mssql_instance b/checks/mssql_instance index c2ba8f6..3d0bef9 100644 --- a/checks/mssql_instance +++ b/checks/mssql_instance @@ -70,16 +70,21 @@ def parse_mssql_instance(info): def inventory_mssql_instance(parsed): for instance_id, instance in parsed.items(): - yield instance_id, None + yield instance_id, {} -def check_mssql_instance(item, _unused, parsed): +def check_mssql_instance(item, params, parsed): instance = parsed.get(item) if not instance: return + state = 2 + if params is not None and \ + params.get("map_connection_state") is not None: + state = params["map_connection_state"] + if instance["state"] == "0": - yield 2, "Failed to connect to database (%s)" % instance["error_msg"] + yield state, "Failed to connect to database (%s)" % instance["error_msg"] yield 0, "Server is running version %s, %s" % (instance["version"], instance["edition"]) @@ -92,4 +97,5 @@ check_info["mssql_instance"] = { 'check_function' : check_mssql_instance, 'inventory_function' : inventory_mssql_instance, 'service_description' : 'MSSQL %s Instance', + 'group' : 'mssql_instance', } diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 8b620d8..b7633ca 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -2260,6 +2260,23 @@ register_check_parameters( register_check_parameters( subgroup_applications, + "mssql_instance", + _("MSSQL Instance"), + Dictionary( + elements = [ + ("map_connection_state", MonitoringState( + title = _("Connection status"), + default_value = 2)) + ], + ), + TextAscii( + title = _("Instance identifier"), + ), + "dict", +) + +register_check_parameters( + subgroup_applications, "mssql_databases", _("MSSQL Databases properties"), Dictionary(

7 years, 7 months

4294 statgrab_disk: works now as other diskstat check plugins

by Simon Betz

Module: check_mk Branch: master Commit: 58c5af1b7acfdbaae139fa45530a28fe6756931b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=58c5af1b7acfdb… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Jan 30 11:43:43 2017 +0100 4294 statgrab_disk: works now as other diskstat check plugins Change-Id: I91fa78aa1e7abc9d6b3c65359cb6620dd748b349 --- .werks/4294 | 17 +++++++++++++ ChangeLog | 2 ++ checks/statgrab_disk | 69 +++++++++++++++++++++++++++++++++++++--------------- 3 files changed, 68 insertions(+), 20 deletions(-) diff --git a/.werks/4294 b/.werks/4294 new file mode 100644 index 0000000..100e2ff --- /dev/null +++ b/.werks/4294 @@ -0,0 +1,17 @@ +Title: statgrab_disk: Works now in the same way as other diskstat check plugins +Level: 1 +Component: checks +Compatible: incomp +Version: 1.4.0i4 +Date: 1485251642 +Class: feature + +Reconstructed statgrab_disk check plugin: {{read}} and {{write}} values +will be handled in one service as in other diskstat check plugins. +Moreover the check has a discovery rule within which you can specify whether +a summary service or services for each disk are generated. Default is +summary mode. + +In order to make the new check plugin work you have to perform a +re-discovery on the affected hosts. + diff --git a/ChangeLog b/ChangeLog index f927788..cbfff19 100644 --- a/ChangeLog +++ b/ChangeLog @@ -17,6 +17,8 @@ * 4257 logwatch.groups: now allows regular expressions within include and exclude patterns each beginning with a tilde * 4013 Ruckus Spot / ruckus_spot_locations: new check to monitor the number of unqiue MACs addresses... * 4293 wut_webtherm: now detects devices which support WebGraphThermoBaro-MIB + * 4294 statgrab_disk: Works now in the same way as other diskstat check plugins... + NOTE: Please refer to the migration notes! * 4296 mssql_databases: new check which monitors the auto close and shrink state of MSSQL databases... * 4215 hp_webmgmt_status: Now also displays device model and serial number * 4332 check_http: Add support for TLSv1.1 and TLSv1.2 as configuration option... diff --git a/checks/statgrab_disk b/checks/statgrab_disk index d60a290..881401c 100644 --- a/checks/statgrab_disk +++ b/checks/statgrab_disk @@ -24,31 +24,60 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -def inventory_statgrab_disk(info): + +# <<<statgrab_disk>>> +# 1/md0.disk_name 1/md0 +# 1/md0.read_bytes 611352576 +# 1/md0.systime 1471423620 +# 1/md0.write_bytes 39462400 +# 1/md1.disk_name 1/md1 +# 1/md1.read_bytes 611352576 +# 1/md1.systime 1471423620 +# 1/md1.write_bytes 39462400 +# 1/md2.disk_name 1/md2 +# 1/md2.read_bytes 611351552 + + +def parse_statgrab_disk(info): + parsed = {} for line in info: - if line[0].endswith('read_bytes') or line[0].endswith('write_bytes'): - return [ ('read', None), ('write', None) ] - return [] + disk_name = line[0].split(".")[0] + parsed.setdefault(disk_name, {}) + + if line[0].endswith('read_bytes'): + parsed[disk_name]["read_bytes"] = int(line[1]) + + elif line[0].endswith('write_bytes'): + parsed[disk_name]["write_bytes"] = int(line[1]) + + elif line[0].endswith("systime"): + parsed[disk_name]["systime"] = int(line[1]) + + return parsed + + +def inventory_statgrab_disk(parsed): + return inventory_diskstat_generic([[None, item] for item in parsed]) -def check_statgrab_disk(item, _no_params, info): - # item is 'read' or 'write' - if item != 'read' and item != "write": - return (3, "invalid item %s" % (item,)) - this_val = 0 - for var, value in info: - if var.endswith("." + item + "_bytes"): - this_val += int(value) +def check_statgrab_disk(item, params, parsed): + now = time.time() + disks = {} + for disk_name, attrs in parsed.items(): + disks[disk_name] = { + "read_throughput" : get_rate("statgrab_disk.read.%s" % item, now, attrs["read_bytes"]), + "write_throughput" : get_rate("statgrab_disk.write.%s" % item, now, attrs["write_bytes"]), + } - this_time = int(time.time()) - bytes_per_sec = get_rate("diskstat." + item, this_time, this_val) - perfdata = [ (item, bytes_per_sec) ] - return 0, "%s/s" % get_bytes_human_readable(bytes_per_sec), perfdata + return check_diskstat_dict(item, params, disks) check_info["statgrab_disk"] = { - 'check_function': check_statgrab_disk, - 'inventory_function': inventory_statgrab_disk, - 'service_description': 'Disk IO %s', - 'has_perfdata': True, + 'parse_function' : parse_statgrab_disk, + 'inventory_function' : inventory_statgrab_disk, + 'check_function' : check_statgrab_disk, + 'service_description' : 'Disk IO %s', + 'has_perfdata' : True, + 'group' : 'diskstat', + 'includes' : [ "diskstat.include" ], }

7 years, 7 months

← Newer
1
...
38
39
40
41
42
43
44
45
46
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2017