Checkmk git commits October 2016

checkmk-commits@lists.checkmk.com

10 participants
276 discussions

by Lars Michelsen

Module: check_mk Branch: master Commit: e5c97e6625a722d5e40456fd4ba75f82ab8219c0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e5c97e6625a722… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Oct 14 08:46:30 2016 +0200 replaced opt_debug in inventory plugin --- inventory/export_software_csv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inventory/export_software_csv b/inventory/export_software_csv index a80f04e..fdc59b7 100644 --- a/inventory/export_software_csv +++ b/inventory/export_software_csv @@ -49,7 +49,7 @@ def inv_export_software_csv(hostname, params, tree): try: os.makedirs(dirname) except Exception, e: - if opt_debug: + if cmk.debug.enabled(): raise raise MKGeneralException("Cannot create missing directory %s: %s" % ( dirname, e))

7 years, 11 months

Moved debug mode state management to lib

by Lars Michelsen

Module: check_mk Branch: master Commit: b8405b35e1807de6965e410fa2806f4cbce7853b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b8405b35e1807d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Oct 13 20:52:48 2016 +0200 Moved debug mode state management to lib --- lib/debug.py | 45 ++++++++++++++++++++++++++++++++++++++++++ lib/man_pages.py | 11 +++++------ modules/agent_simulator.py | 2 +- modules/automation.py | 26 ++++++++++++------------ modules/check_mk.py | 49 ++++++++++++++++++++++++---------------------- modules/check_mk_base.py | 20 +++++++++---------- modules/compresslog.py | 2 +- modules/discovery.py | 28 +++++++++++++------------- modules/events.py | 10 +++++----- modules/inventory.py | 8 ++++---- modules/nagios.py | 8 ++++++-- modules/notify.py | 12 ++++++------ modules/packaging.py | 4 ++-- modules/prediction.py | 2 +- modules/snmp.py | 2 +- tests/lib/test_debug.py | 20 +++++++++++++++++++ 16 files changed, 160 insertions(+), 89 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=b8405b35e1…

7 years, 11 months

reverted pylintrc

by Lars Michelsen

Module: check_mk Branch: master Commit: e8dbde9701d0584f3350b774c10c788050f4585f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e8dbde9701d058… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Oct 13 10:46:00 2016 +0200 reverted pylintrc --- tests/pylint/pylintrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/pylint/pylintrc b/tests/pylint/pylintrc index ed6841b..ac5fefd 100644 --- a/tests/pylint/pylintrc +++ b/tests/pylint/pylintrc @@ -21,7 +21,7 @@ disable=C0111,C0326 disable=unsubscriptable-object,unsupported-membership-test,unpacking-non-sequence,assignment-from-none # W0612: Unused variable # TODO: enable this and prepare code for it! -enable=W0612 +#enable=W0612 [TYPECHECK] # rrdtool

7 years, 11 months

Cleaned up unused vars in misc python files

by Lars Michelsen

Module: check_mk Branch: master Commit: 8826f8cd86f2cc0d43cf54363bc4db78799ee067 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8826f8cd86f2cc… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Oct 13 10:45:39 2016 +0200 Cleaned up unused vars in misc python files --- agents/plugins/mk_inotify | 6 +++--- agents/plugins/mk_logwatch | 2 +- agents/plugins/mk_mongodb | 7 +++---- agents/plugins/mk_sap | 2 +- agents/plugins/mk_tinkerforge | 3 +-- bin/mkeventd | 2 +- doc/treasures/active_checks/check_mail | 2 +- doc/treasures/active_checks/check_mail_loop | 10 +++++----- doc/treasures/active_checks/check_mailboxes | 6 +++--- notifications/asciimail | 2 -- notifications/mail | 1 - notifications/pushover | 2 -- tests/pylint/pylintrc | 2 +- 13 files changed, 20 insertions(+), 27 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=8826f8cd86…

7 years, 11 months

Fixed wrong version in werk

by Lars Michelsen

Module: check_mk Branch: master Commit: 7d6b6e29cad78b1b068477bd9f1ded62c57220bb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7d6b6e29cad78b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Oct 13 14:22:25 2016 +0200 Fixed wrong version in werk --- .werks/3752 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/3752 b/.werks/3752 index 015dd13..32ac42f 100644 --- a/.werks/3752 +++ b/.werks/3752 @@ -2,7 +2,7 @@ Title: Fixed loosing site configuration when editing hosts in WATO slave sites Level: 2 Component: wato Compatible: compat -Version: 1.2.8p9 +Version: 1.4.0i1 Date: 1470213362 Class: fix

7 years, 11 months

pylint: Not yet ready for unused var check

by Lars Michelsen

Module: check_mk Branch: master Commit: e414d2f229a94da1f49bb87e35d93ff93c46ade8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e414d2f229a94d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Oct 13 09:03:11 2016 +0200 pylint: Not yet ready for unused var check --- tests/pylint/pylintrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/pylint/pylintrc b/tests/pylint/pylintrc index ed6841b..ac5fefd 100644 --- a/tests/pylint/pylintrc +++ b/tests/pylint/pylintrc @@ -21,7 +21,7 @@ disable=C0111,C0326 disable=unsubscriptable-object,unsupported-membership-test,unpacking-non-sequence,assignment-from-none # W0612: Unused variable # TODO: enable this and prepare code for it! -enable=W0612 +#enable=W0612 [TYPECHECK] # rrdtool

7 years, 11 months

Cleaned up several unused variables

by Lars Michelsen

Module: check_mk Branch: master Commit: 5ef48149ee5acbaafa3ae3f33c7513c25adfb8e3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5ef48149ee5acb… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Oct 12 16:38:47 2016 +0200 Cleaned up several unused variables --- bin/mkbackup | 10 ++++------ bin/mkeventd | 37 ++++++++++++++++++------------------- lib/man_pages.py | 2 +- lib/store.py | 2 +- lib/tty.py | 3 +-- tests/pylint/pylintrc | 2 +- 6 files changed, 26 insertions(+), 30 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=5ef48149ee…

7 years, 11 months

adapted scan function

by Simon Betz

Module: check_mk Branch: master Commit: d4ed190db1167671d95ea8220b78f5d3cc770d77 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d4ed190db11676… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Oct 12 16:54:14 2016 +0200 adapted scan function --- checks/infoblox.include | 5 ++++- checks/infoblox_grid_status | 2 +- checks/infoblox_node_services | 4 ++-- checks/infoblox_replication_status | 24 ++++++++++++------------ 4 files changed, 19 insertions(+), 16 deletions(-) diff --git a/checks/infoblox.include b/checks/infoblox.include index 4d7c9af..380a0df 100644 --- a/checks/infoblox.include +++ b/checks/infoblox.include @@ -26,7 +26,8 @@ def scan_infoblox(oid): - return "infoblox" in oid(".1.3.6.1.2.1.1.1.0").lower() + return "infoblox" in oid(".1.3.6.1.2.1.1.1.0").lower() or \ + oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.7779.1") # .--services------------------------------------------------------------. @@ -98,6 +99,8 @@ def parse_infoblox_services(info): "55" : "discovery-capacity", "56" : "threat-protection", "57" : "cloud-api", + "58" : "threat-analytics", + "59" : "taxii", } parsed = {} diff --git a/checks/infoblox_grid_status b/checks/infoblox_grid_status index 9081a85..17c2034 100644 --- a/checks/infoblox_grid_status +++ b/checks/infoblox_grid_status @@ -25,7 +25,7 @@ # Boston, MA 02110-1301 USA. -# .1.3.6.1.4.1.7779.3.1.1.2.1.15.0 11.112.133.11 --> IB-PLATFORMONE-MIB::ibGridMasterVIP.0 +# .1.3.6.1.4.1.7779.3.1.1.2.1.15.0 X.X.X.X --> IB-PLATFORMONE-MIB::ibGridMasterVIP.0 # .1.3.6.1.4.1.7779.3.1.1.2.1.16.0 ONLINE --> IB-PLATFORMONE-MIB::ibGridReplicationState.0 diff --git a/checks/infoblox_node_services b/checks/infoblox_node_services index 6cd7925..f48077e 100644 --- a/checks/infoblox_node_services +++ b/checks/infoblox_node_services @@ -41,10 +41,10 @@ # .1.3.6.1.4.1.7779.3.1.1.2.1.10.1.2.15 5 --> IB-PLATFORMONE-MIB::ibNodeServiceStatus.lcd # .1.3.6.1.4.1.7779.3.1.1.2.1.10.1.3.9 Running --> IB-PLATFORMONE-MIB::ibNodeServiceDesc.node-status # .1.3.6.1.4.1.7779.3.1.1.2.1.10.1.3.10 15% - Primary drive usage is OK. --> IB-PLATFORMONE-MIB::ibNodeServiceDesc.disk-usage -# .1.3.6.1.4.1.7779.3.1.1.2.1.10.1.3.11 11.112.133.11 --> IB-PLATFORMONE-MIB::ibNodeServiceDesc.enet-lan +# .1.3.6.1.4.1.7779.3.1.1.2.1.10.1.3.11 X.X.X.X --> IB-PLATFORMONE-MIB::ibNodeServiceDesc.enet-lan # .1.3.6.1.4.1.7779.3.1.1.2.1.10.1.3.12 --> IB-PLATFORMONE-MIB::ibNodeServiceDesc.enet-lan2 # .1.3.6.1.4.1.7779.3.1.1.2.1.10.1.3.13 --> IB-PLATFORMONE-MIB::ibNodeServiceDesc.enet-ha -# .1.3.6.1.4.1.7779.3.1.1.2.1.10.1.3.14 11.112.133.203 --> IB-PLATFORMONE-MIB::ibNodeServiceDesc.enet-mgmt +# .1.3.6.1.4.1.7779.3.1.1.2.1.10.1.3.14 X.X.X.X --> IB-PLATFORMONE-MIB::ibNodeServiceDesc.enet-mgmt # .1.3.6.1.4.1.7779.3.1.1.2.1.10.1.3.15 --> IB-PLATFORMONE-MIB::ibNodeServiceDesc.lcd diff --git a/checks/infoblox_replication_status b/checks/infoblox_replication_status index 0bab76e..1136794 100644 --- a/checks/infoblox_replication_status +++ b/checks/infoblox_replication_status @@ -25,18 +25,18 @@ # Boston, MA 02110-1301 USA. -# .1.3.6.1.4.1.7779.3.1.1.2.1.2.1.1.13.49.49.46.49.49.50.46.49.51.51.46.49.52 11.112.133.14 --> IB-PLATFORMONE-MIB::ibNodeIPAddress."11.112.133.14" -# .1.3.6.1.4.1.7779.3.1.1.2.1.2.1.1.13.49.49.46.49.49.50.46.49.51.51.46.49.55 11.112.133.17 --> IB-PLATFORMONE-MIB::ibNodeIPAddress."11.112.133.17" -# .1.3.6.1.4.1.7779.3.1.1.2.1.2.1.2.13.49.49.46.49.49.50.46.49.51.51.46.49.52 Online --> IB-PLATFORMONE-MIB::ibNodeReplicationStatus."11.112.133.14" -# .1.3.6.1.4.1.7779.3.1.1.2.1.2.1.2.13.49.49.46.49.49.50.46.49.51.51.46.49.55 Online --> IB-PLATFORMONE-MIB::ibNodeReplicationStatus."11.112.133.17" -# .1.3.6.1.4.1.7779.3.1.1.2.1.2.1.3.13.49.49.46.49.49.50.46.49.51.51.46.49.52 0 --> IB-PLATFORMONE-MIB::ibNodeQueueFromMaster."11.112.133.14" -# .1.3.6.1.4.1.7779.3.1.1.2.1.2.1.3.13.49.49.46.49.49.50.46.49.51.51.46.49.55 0 --> IB-PLATFORMONE-MIB::ibNodeQueueFromMaster."11.112.133.17" -# .1.3.6.1.4.1.7779.3.1.1.2.1.2.1.4.13.49.49.46.49.49.50.46.49.51.51.46.49.52 2016/04/13 14:15:51 --> IB-PLATFORMONE-MIB::ibNodeLastRepTimeFromMaster."11.112.133.14" -# .1.3.6.1.4.1.7779.3.1.1.2.1.2.1.4.13.49.49.46.49.49.50.46.49.51.51.46.49.55 2016/04/13 14:15:51 --> IB-PLATFORMONE-MIB::ibNodeLastRepTimeFromMaster."11.112.133.17" -# .1.3.6.1.4.1.7779.3.1.1.2.1.2.1.5.13.49.49.46.49.49.50.46.49.51.51.46.49.52 0 --> IB-PLATFORMONE-MIB::ibNodeQueueToMaster."11.112.133.14" -# .1.3.6.1.4.1.7779.3.1.1.2.1.2.1.5.13.49.49.46.49.49.50.46.49.51.51.46.49.55 0 --> IB-PLATFORMONE-MIB::ibNodeQueueToMaster."11.112.133.17" -# .1.3.6.1.4.1.7779.3.1.1.2.1.2.1.6.13.49.49.46.49.49.50.46.49.51.51.46.49.52 2016/04/13 14:12:59 --> IB-PLATFORMONE-MIB::ibNodeLastRepTimeToMaster."11.112.133.14" -# .1.3.6.1.4.1.7779.3.1.1.2.1.2.1.6.13.49.49.46.49.49.50.46.49.51.51.46.49.55 2016/04/13 14:15:51 --> IB-PLATFORMONE-MIB::ibNodeLastRepTimeToMaster."11.112.133.17" +# .1.3.6.1.4.1.7779.3.1.1.2.1.2.1.1.X.X.X.X.X X.X.X.X --> IB-PLATFORMONE-MIB::ibNodeIPAddress."11.112.133.14" +# .1.3.6.1.4.1.7779.3.1.1.2.1.2.1.1.X.X.X.X.X X.X.X.X --> IB-PLATFORMONE-MIB::ibNodeIPAddress."11.112.133.17" +# .1.3.6.1.4.1.7779.3.1.1.2.1.2.1.2.X.X.X.X.X Online --> IB-PLATFORMONE-MIB::ibNodeReplicationStatus."11.112.133.14" +# .1.3.6.1.4.1.7779.3.1.1.2.1.2.1.2.X.X.X.X.X Online --> IB-PLATFORMONE-MIB::ibNodeReplicationStatus."11.112.133.17" +# .1.3.6.1.4.1.7779.3.1.1.2.1.2.1.3.X.X.X.X.X 0 --> IB-PLATFORMONE-MIB::ibNodeQueueFromMaster."11.112.133.14" +# .1.3.6.1.4.1.7779.3.1.1.2.1.2.1.3.X.X.X.X.X 0 --> IB-PLATFORMONE-MIB::ibNodeQueueFromMaster."11.112.133.17" +# .1.3.6.1.4.1.7779.3.1.1.2.1.2.1.4.X.X.X.X.X 2016/04/13 14:15:51 --> IB-PLATFORMONE-MIB::ibNodeLastRepTimeFromMaster."11.112.133.14" +# .1.3.6.1.4.1.7779.3.1.1.2.1.2.1.4.X.X.X.X.X 2016/04/13 14:15:51 --> IB-PLATFORMONE-MIB::ibNodeLastRepTimeFromMaster."11.112.133.17" +# .1.3.6.1.4.1.7779.3.1.1.2.1.2.1.5.X.X.X.X.X 0 --> IB-PLATFORMONE-MIB::ibNodeQueueToMaster."11.112.133.14" +# .1.3.6.1.4.1.7779.3.1.1.2.1.2.1.5.X.X.X.X.X 0 --> IB-PLATFORMONE-MIB::ibNodeQueueToMaster."11.112.133.17" +# .1.3.6.1.4.1.7779.3.1.1.2.1.2.1.6.X.X.X.X.X 2016/04/13 14:12:59 --> IB-PLATFORMONE-MIB::ibNodeLastRepTimeToMaster."11.112.133.14" +# .1.3.6.1.4.1.7779.3.1.1.2.1.2.1.6.X.X.X.X.X 2016/04/13 14:15:51 --> IB-PLATFORMONE-MIB::ibNodeLastRepTimeToMaster."11.112.133.17"

7 years, 11 months

service details of fileinfo more readable

by Simon Betz

Module: check_mk Branch: master Commit: 0b1655303b5ce8f6512672976628448472dc5acd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0b1655303b5ce8… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Oct 12 16:05:41 2016 +0200 service details of fileinfo more readable --- checks/fileinfo | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/checks/fileinfo b/checks/fileinfo index 3ae61ee..4dbe305 100644 --- a/checks/fileinfo +++ b/checks/fileinfo @@ -152,8 +152,8 @@ def check_fileinfo(item, params, info): age = reftime - int(line[2]) check_definition = [ - ("size", size, get_filesize_human_readable), - ("age", age, get_age_human_readable) ] + ("Size", "size", size, get_filesize_human_readable), + ("Age", "age", age, get_age_human_readable) ] if check_definition == False: return in_timerange and state_missing or 0, "File not found" + (outof_range_txt or "") @@ -255,18 +255,18 @@ def check_fileinfo_groups(item, params, info): # Start Checking check_definition = [ - ("age_oldest", age_oldest, get_age_human_readable), - ("age_newest", age_newest, get_age_human_readable), - ("count", count_all, saveint), - ("size", size_all, get_filesize_human_readable), + ("Oldest age", "age_oldest", age_oldest, get_age_human_readable), + ("Newest age", "age_newest", age_newest, get_age_human_readable), + ("Count", "count", count_all, saveint), + ("Size", "size", size_all, get_filesize_human_readable), ] if size_smallest is not None: - check_definition.append(("size_smallest", size_smallest, get_filesize_human_readable)) + check_definition.append(("Smallest size", "size_smallest", size_smallest, get_filesize_human_readable)) if size_largest != 0: - check_definition.append(("size_largest", size_largest, get_filesize_human_readable)) + check_definition.append(("Largest size", "size_largest", size_largest, get_filesize_human_readable)) if date_inclusion: - check_definition.append(("date pattern", date_inclusion, str )) + check_definition.append(("Date pattern", "date pattern", date_inclusion, str )) return fileinfo_check_function(check_definition, params, outof_range_txt) @@ -274,8 +274,8 @@ def fileinfo_check_function(check_definition, params, outof_range_txt): state = 0 infos = [] perfdata = [] - for what, val, verbfunc in check_definition: - infos.append("%s is %s" % (what, verbfunc(val))) + for what_title, what, val, verbfunc in check_definition: + infos.append("%s: %s" % (what_title, verbfunc(val))) if type(val) in [long, int]: # because strings go into infos but not into perfdata warn, crit = "", "" for how, comp, cfunc in [ @@ -292,6 +292,7 @@ def fileinfo_check_function(check_definition, params, outof_range_txt): state = max(state, 1) infos[-1] += " (%s %s)(!)" % (comp, verbfunc(warn)) perfdata.append((what, val, warn, crit)) + infotext = ", ".join(infos) if outof_range_txt: state = 0

7 years, 11 months

3902 FIX Graph search view: Changing painter options made page empty

by Lars Michelsen

Module: check_mk Branch: master Commit: c0cc46ccca1f9d6077fb5632a2b39d3b9ff7506e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c0cc46ccca1f9d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Oct 12 15:54:19 2016 +0200 3902 FIX Graph search view: Changing painter options made page empty --- .werks/3902 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/views.py | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/3902 b/.werks/3902 new file mode 100644 index 0000000..2d3d12a --- /dev/null +++ b/.werks/3902 @@ -0,0 +1,10 @@ +Title: Graph search view: Changing painter options made page empty +Level: 1 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i2 +Date: 1476280404 + + diff --git a/ChangeLog b/ChangeLog index 60a3fb2..77fd5cb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -24,6 +24,7 @@ Multisite: * 3897 FIX: Fixed possible exception in raw edition when rendering graphs * 3898 FIX: Unmonitored services: Fixed possible bug in case discovery service produces unexpected output + * 3902 FIX: Graph search view: Changing painter options made page empty WATO: * 3915 User access times: New icon when never logged in; New column "last seen" diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 45467f5..8c30636 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -1653,7 +1653,7 @@ def show_view(view, show_heading = False, show_buttons = True, need_inventory_data = is_inventory_data_needed(group_cells, cells, sorters) # Fetch data. Some views show data only after pressing [Search] - if (only_count or (not view.get("mustsearch")) or html.var("filled_in") in ["filter", 'actions', 'confirm']): + if (only_count or (not view.get("mustsearch")) or html.var("filled_in") in ["filter", 'actions', 'confirm', 'painteroptions']): # names for additional columns (through Stats: headers) add_columns = datasource.get("add_columns", [])

7 years, 11 months

← Newer
1
...
16
17
18
19
20
21
22
...
28
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits October 2016