Checkmk git commits November 2015

checkmk-commits@lists.checkmk.com

8 participants
303 discussions

windows agent: fixed three cases of va_start not being matched by a va_end

by Sebastian Herbord

Module: check_mk Branch: master Commit: 4df94f128f51cf53c3b32e5dd0eebdb747144a12 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4df94f128f51cf… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Fri Nov 6 14:29:27 2015 +0100 windows agent: fixed three cases of va_start not being matched by a va_end --- agents/windows/build_version | 2 +- agents/windows/check_mk_agent-64.exe | Bin 5359530 -> 5361545 bytes agents/windows/check_mk_agent-64.unversioned.exe | Bin 5359530 -> 5361545 bytes agents/windows/check_mk_agent.cc | 9 ++++++--- agents/windows/check_mk_agent.exe | Bin 4220996 -> 4223010 bytes agents/windows/check_mk_agent.msi | Bin 9904128 -> 9908224 bytes agents/windows/check_mk_agent.unversioned.exe | Bin 4220996 -> 4223010 bytes agents/windows/install_agent-64.exe | Bin 1278363 -> 1278652 bytes agents/windows/install_agent.exe | Bin 1161435 -> 1161631 bytes 9 files changed, 7 insertions(+), 4 deletions(-) diff --git a/agents/windows/build_version b/agents/windows/build_version index 51e227a..bb33380 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -644 +646 diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe index 4370941..91db67c 100755 Binary files a/agents/windows/check_mk_agent-64.exe and b/agents/windows/check_mk_agent-64.exe differ diff --git a/agents/windows/check_mk_agent-64.unversioned.exe b/agents/windows/check_mk_agent-64.unversioned.exe index 7f45f08..00a3947 100755 Binary files a/agents/windows/check_mk_agent-64.unversioned.exe and b/agents/windows/check_mk_agent-64.unversioned.exe differ diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index 7b7b70e..b74f3b7 100644 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -268,6 +268,7 @@ void verbose(const char *format, ...) va_start(ap, format); printf("DEBUG: "); vprintf(format, ap); + va_end(ap); printf("\n"); fflush(stdout); } @@ -3247,15 +3248,16 @@ void crash_log(const char *format, ...) ellapsed_sec --; } - va_list ap; - va_start(ap, format); - DWORD dwBytesWritten = 0; snprintf(buffer, sizeof(buffer), "%ld.%06ld ", ellapsed_sec, ellapsed_usec); DWORD dwBytesToWrite = (DWORD)strlen(buffer); WriteFile(g_connectionlog_file, buffer, dwBytesToWrite, &dwBytesWritten, NULL); + va_list ap; + va_start(ap, format); vsnprintf(buffer, sizeof(buffer), format, ap); + va_end(ap); + dwBytesToWrite = (DWORD)strlen(buffer); WriteFile(g_connectionlog_file, buffer, dwBytesToWrite, &dwBytesWritten, NULL); @@ -3333,6 +3335,7 @@ void output(SOCKET &out, const char *format, ...) va_list ap; va_start(ap, format); int written_len = vsnprintf(outbuffer + len, sizeof(outbuffer) - len, format, ap); + va_end(ap); len += written_len; // We do not send out the data immediately diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index 76d62bf..e872661 100755 Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe differ diff --git a/agents/windows/check_mk_agent.msi b/agents/windows/check_mk_agent.msi index 7b5043c..6a2e31a 100755 Binary files a/agents/windows/check_mk_agent.msi and b/agents/windows/check_mk_agent.msi differ diff --git a/agents/windows/check_mk_agent.unversioned.exe b/agents/windows/check_mk_agent.unversioned.exe index b58cef8..2b9cce5 100755 Binary files a/agents/windows/check_mk_agent.unversioned.exe and b/agents/windows/check_mk_agent.unversioned.exe differ diff --git a/agents/windows/install_agent-64.exe b/agents/windows/install_agent-64.exe index b5e0211..444c69c 100755 Binary files a/agents/windows/install_agent-64.exe and b/agents/windows/install_agent-64.exe differ diff --git a/agents/windows/install_agent.exe b/agents/windows/install_agent.exe index 59cb8fa..c0ae7a4 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ

8 years, 8 months

Include what you use

by Sven Panne

Module: check_mk Branch: master Commit: a83eddf6f59383d4db086464b2c347401f42d7e5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a83eddf6f59383… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Nov 5 15:47:05 2015 +0100 Include what you use Heavy cleanup of our #include story: * #include only what is needed. * #include everything that is needed, making headers self-sufficient. * Use forward declarations instead of #includes when possible. * Use a canonical order of #includes (alpabetical within each category): * The accompanying header for an implementation file. * Standard C headers * Standard C++ headers * Our own headers This was done with heavy help from the IWYU tool, see http://include-what-you-use.org/ https://github.com/include-what-you-use/include-what-you-use for more background. --- livestatus/src/Aggregator.h | 2 +- livestatus/src/AndingFilter.cc | 4 +-- livestatus/src/AndingFilter.h | 10 +++--- livestatus/src/AttributelistColumn.cc | 13 ++++--- livestatus/src/AttributelistColumn.h | 13 +++---- livestatus/src/AttributelistFilter.cc | 3 +- livestatus/src/AttributelistFilter.h | 7 ++-- livestatus/src/BlobColumn.cc | 4 +-- livestatus/src/BlobColumn.h | 7 ++-- livestatus/src/ClientQueue.cc | 1 + livestatus/src/ClientQueue.h | 8 ++--- livestatus/src/Column.cc | 4 +-- livestatus/src/Column.h | 11 +++--- livestatus/src/ColumnsColumn.cc | 3 +- livestatus/src/ColumnsColumn.h | 9 +++-- livestatus/src/ContactgroupsColumn.h | 10 +++--- livestatus/src/ContactgroupsMemberColumn.cc | 5 +-- livestatus/src/ContactgroupsMemberColumn.h | 6 ++-- livestatus/src/ContactsColumn.cc | 8 ++--- livestatus/src/ContactsColumn.h | 8 +++-- livestatus/src/CountAggregator.cc | 3 +- livestatus/src/CountAggregator.h | 5 +-- livestatus/src/CustomTimeperiodColumn.cc | 3 +- livestatus/src/CustomTimeperiodColumn.h | 5 ++- livestatus/src/CustomVarsColumn.cc | 4 +-- livestatus/src/CustomVarsColumn.h | 12 +++---- livestatus/src/CustomVarsExplicitColumn.cc | 1 + livestatus/src/CustomVarsExplicitColumn.h | 3 +- livestatus/src/CustomVarsFilter.cc | 15 ++++---- livestatus/src/CustomVarsFilter.h | 10 +++--- livestatus/src/DoubleAggregator.cc | 6 ++-- livestatus/src/DoubleAggregator.h | 4 ++- livestatus/src/DoubleColumn.cc | 3 ++ livestatus/src/DoubleColumn.h | 8 +++-- livestatus/src/DoubleColumnFilter.cc | 4 +-- livestatus/src/DoubleColumnFilter.h | 8 ++--- livestatus/src/DownCommColumn.cc | 11 ++++-- livestatus/src/DownCommColumn.h | 10 +++--- livestatus/src/DowntimeOrComment.cc | 4 ++- livestatus/src/DowntimeOrComment.h | 11 ++---- livestatus/src/DynamicColumn.cc | 2 +- livestatus/src/DynamicColumn.h | 4 +-- livestatus/src/EmptyColumn.cc | 1 + livestatus/src/EmptyColumn.h | 6 ++-- livestatus/src/Filter.cc | 1 - livestatus/src/Filter.h | 11 +++--- livestatus/src/GlobalCountersColumn.cc | 5 ++- livestatus/src/GlobalCountersColumn.h | 10 +++--- livestatus/src/HostContactsColumn.cc | 5 ++- livestatus/src/HostContactsColumn.h | 7 ++-- livestatus/src/HostFileColumn.cc | 12 +++---- livestatus/src/HostFileColumn.h | 3 ++ livestatus/src/HostServiceState.cc | 3 +- livestatus/src/HostServiceState.h | 8 +++-- livestatus/src/HostSpecialDoubleColumn.cc | 2 +- livestatus/src/HostSpecialDoubleColumn.h | 5 +-- livestatus/src/HostSpecialIntColumn.cc | 3 +- livestatus/src/HostSpecialIntColumn.h | 9 +++-- livestatus/src/HostgroupsColumn.cc | 2 +- livestatus/src/HostgroupsColumn.h | 10 +++--- livestatus/src/HostlistColumn.cc | 4 +-- livestatus/src/HostlistColumn.h | 10 +++--- livestatus/src/HostlistColumnFilter.cc | 5 +-- livestatus/src/HostlistColumnFilter.h | 9 ++--- livestatus/src/HostlistStateColumn.cc | 6 ++-- livestatus/src/HostlistStateColumn.h | 9 ++--- livestatus/src/InputBuffer.cc | 12 +++---- livestatus/src/InputBuffer.h | 9 +++-- livestatus/src/IntAggregator.cc | 6 ++-- livestatus/src/IntAggregator.h | 5 ++- livestatus/src/IntColumn.cc | 3 ++ livestatus/src/IntColumn.h | 9 ++--- livestatus/src/IntColumnFilter.h | 9 +++-- livestatus/src/ListColumn.h | 6 ++-- livestatus/src/ListColumnFilter.cc | 6 ++-- livestatus/src/ListColumnFilter.h | 6 ++-- livestatus/src/LogCache.cc | 19 ++++------ livestatus/src/LogCache.h | 10 +++--- livestatus/src/LogEntry.cc | 8 ++--- livestatus/src/LogEntry.h | 8 +++-- livestatus/src/Logfile.cc | 12 ++++--- livestatus/src/Logfile.h | 18 +++++----- livestatus/src/Makefile.am | 2 +- livestatus/src/MetricsColumn.cc | 1 + livestatus/src/MetricsColumn.h | 4 +++ livestatus/src/NegatingFilter.h | 2 +- livestatus/src/NullColumn.cc | 1 + livestatus/src/NullColumn.h | 6 ++-- livestatus/src/OffsetDoubleColumn.cc | 3 +- livestatus/src/OffsetDoubleColumn.h | 8 ++--- livestatus/src/OffsetIntColumn.cc | 4 +-- livestatus/src/OffsetIntColumn.h | 10 +++--- livestatus/src/OffsetStringColumn.cc | 3 +- livestatus/src/OffsetStringColumn.h | 7 ++-- livestatus/src/OffsetStringHostMacroColumn.cc | 4 +-- livestatus/src/OffsetStringHostMacroColumn.h | 6 ++-- livestatus/src/OffsetStringMacroColumn.cc | 8 ++--- livestatus/src/OffsetStringMacroColumn.h | 8 +++-- livestatus/src/OffsetStringServiceMacroColumn.cc | 4 +-- livestatus/src/OffsetStringServiceMacroColumn.h | 6 ++-- livestatus/src/OffsetTimeColumn.cc | 3 +- livestatus/src/OffsetTimeColumn.h | 10 +++--- livestatus/src/OffsetTimeperiodColumn.cc | 8 ++--- livestatus/src/OffsetTimeperiodColumn.h | 12 +++---- livestatus/src/OringFilter.cc | 3 +- livestatus/src/OringFilter.h | 7 ++-- livestatus/src/OutputBuffer.cc | 12 ++++--- livestatus/src/OutputBuffer.h | 7 ++-- livestatus/src/PerfdataAggregator.cc | 16 +++++---- livestatus/src/PerfdataAggregator.h | 4 ++- livestatus/src/Query.cc | 37 +++++++++++--------- livestatus/src/Query.h | 22 ++++++------ livestatus/src/ServiceContactsColumn.cc | 4 +-- livestatus/src/ServiceContactsColumn.h | 7 ++-- livestatus/src/ServiceSpecialDoubleColumn.cc | 2 +- livestatus/src/ServiceSpecialDoubleColumn.h | 5 +-- livestatus/src/ServiceSpecialIntColumn.cc | 1 + livestatus/src/ServiceSpecialIntColumn.h | 7 ++-- livestatus/src/ServicegroupsColumn.cc | 2 +- livestatus/src/ServicegroupsColumn.h | 10 +++--- livestatus/src/ServicelistColumn.cc | 6 ++-- livestatus/src/ServicelistColumn.h | 10 +++--- livestatus/src/ServicelistColumnFilter.cc | 7 ++-- livestatus/src/ServicelistColumnFilter.h | 9 ++--- livestatus/src/ServicelistStateColumn.cc | 6 ++-- livestatus/src/ServicelistStateColumn.h | 9 ++--- livestatus/src/StatsColumn.cc | 8 +++-- livestatus/src/StatsColumn.h | 10 +++--- livestatus/src/StatusSpecialIntColumn.cc | 1 + livestatus/src/StatusSpecialIntColumn.h | 4 +++ livestatus/src/Store.cc | 17 +++++++-- livestatus/src/Store.h | 34 +++++++++--------- livestatus/src/StringColumn.cc | 5 ++- livestatus/src/StringColumn.h | 8 +++-- livestatus/src/StringColumnFilter.cc | 9 +++-- livestatus/src/StringColumnFilter.h | 8 ++--- livestatus/src/Table.cc | 9 +++-- livestatus/src/Table.h | 10 ++---- livestatus/src/TableColumns.cc | 5 ++- livestatus/src/TableColumns.h | 8 ++--- livestatus/src/TableCommands.cc | 12 +++---- livestatus/src/TableCommands.h | 9 +++-- livestatus/src/TableContactgroups.cc | 9 ++--- livestatus/src/TableContactgroups.h | 8 ++--- livestatus/src/TableContacts.cc | 13 ++++--- livestatus/src/TableContacts.h | 7 ++-- livestatus/src/TableDownComm.cc | 14 ++++---- livestatus/src/TableDownComm.h | 11 ++---- livestatus/src/TableHostgroups.cc | 9 ++--- livestatus/src/TableHostgroups.h | 10 +++--- livestatus/src/TableHosts.cc | 40 +++++++++++----------- livestatus/src/TableHosts.h | 10 +++--- livestatus/src/TableLog.cc | 27 +++++++-------- livestatus/src/TableLog.h | 9 +++-- livestatus/src/TableServicegroups.cc | 6 ++-- livestatus/src/TableServicegroups.h | 10 +++--- livestatus/src/TableServices.cc | 38 ++++++++++---------- livestatus/src/TableServices.h | 12 +++---- livestatus/src/TableStateHistory.cc | 40 +++++++++++++--------- livestatus/src/TableStateHistory.h | 20 ++++++----- livestatus/src/TableStatus.cc | 12 +++---- livestatus/src/TableStatus.h | 6 ++-- livestatus/src/TableTimeperiods.cc | 8 +++-- livestatus/src/TableTimeperiods.h | 5 ++- livestatus/src/TimeColumnFilter.cc | 1 + livestatus/src/TimeColumnFilter.h | 5 ++- livestatus/src/TimePointerColumn.cc | 3 +- livestatus/src/TimePointerColumn.h | 7 +++- livestatus/src/TimeperiodsCache.cc | 13 +++---- livestatus/src/TimeperiodsCache.h | 4 +++ livestatus/src/auth.cc | 2 +- livestatus/src/auth.h | 5 +-- livestatus/src/global_counters.h | 2 +- livestatus/src/logger.c | 7 ++-- livestatus/src/logger.h | 39 +++++++++------------ livestatus/src/mk_inventory.cc | 4 +-- livestatus/src/mk_inventory.h | 5 +-- livestatus/src/module.c | 36 +++++++++---------- livestatus/src/nagios.h | 11 +++++- livestatus/src/opids.cc | 1 - livestatus/src/opids.h | 4 +-- livestatus/src/pnp4nagios.cc | 4 +-- livestatus/src/pnp4nagios.h | 2 ++ livestatus/src/store_c.cc | 14 ++------ livestatus/src/store_c.h | 5 ++- livestatus/src/strutil.h | 2 +- livestatus/src/unixcat.c | 16 +++++---- livestatus/src/waittriggers.c | 2 +- livestatus/src/waittriggers.h | 7 ++-- 189 files changed, 816 insertions(+), 743 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=a83eddf6f5…

8 years, 8 months

gitbug

by Sebastian Herbord

Module: check_mk Branch: master Commit: 2b0c17960c8a58e041f53d1d1e9a5dde6a79b5b1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2b0c17960c8a58… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Fri Nov 6 13:54:03 2015 +0100 gitbug --- .bugs/2402 | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.bugs/2402 b/.bugs/2402 new file mode 100644 index 0000000..1195670 --- /dev/null +++ b/.bugs/2402 @@ -0,0 +1,9 @@ +Title: Fix spelling mistakes +Component: docu +State: open +Date: 2015-11-06 13:38:47 +Targetversion: future +Class: cleanup + +There are quite a few spelling mistakes in the code (varible names, comments, ...) +These can be found quickly with the tool codespell but fixing them could take a while

8 years, 8 months

Fix duplicate warning message for discovery errors

by Mathias Kettner

Module: check_mk Branch: master Commit: 6ae3dbd0673bf5c001f958eafb57d1262866d7f9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6ae3dbd0673bf5… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Nov 6 13:40:42 2015 +0100 Fix duplicate warning message for discovery errors --- modules/discovery.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/discovery.py b/modules/discovery.py index d40bfab..807527e 100644 --- a/modules/discovery.py +++ b/modules/discovery.py @@ -673,10 +673,10 @@ def snmp_scan(hostname, ipaddress, on_error = "ignore", for_inv=False): return value result = scan_function(oid_function) if result is not None and type(result) not in [ str, bool ]: - if on_error != "ignore": + if on_error == "warn": warning(" SNMP scan function of %s returns invalid type %s." % (check_type, type(result))) - if on_error == "raise": + elif on_error == "raise": raise MKGeneralException("SNMP Scan aborted.") elif result: found.append(check_type) @@ -686,9 +686,9 @@ def snmp_scan(hostname, ipaddress, on_error = "ignore", for_inv=False): # should be raised through this raise except: - if on_error != "ignore": + if on_error == "warn": warning(" Exception in SNMP scan function of %s" % check_type) - if on_error == "raise": + elif on_error == "raise": raise pass else: @@ -788,9 +788,9 @@ def discover_check_type(hostname, ipaddress, check_type, use_caches, on_error): result.append((item, paramstring)) except Exception, e: - if on_error != "ignore": + if on_error == "warn": warning(" Exception in discovery function of check type '%s': %s" % (check_type, e)) - if on_error == "raise": + elif on_error == "raise": raise return []

8 years, 8 months

#2740 local: better warning output in case of invalid agent output

by Mathias Kettner

Module: check_mk Branch: master Commit: 7847721608f75bfa7f4ca5d3a4ff6178e38d30c3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7847721608f75b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Nov 6 13:40:23 2015 +0100 #2740 local: better warning output in case of invalid agent output --- .werks/2740 | 9 +++++++++ ChangeLog | 1 + checks/local | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.werks/2740 b/.werks/2740 new file mode 100644 index 0000000..0e53a8f --- /dev/null +++ b/.werks/2740 @@ -0,0 +1,9 @@ +Title: local: better warning output in case of invalid agent output +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i4 +Date: 1446813608 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index fdf601d..d09590c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -22,6 +22,7 @@ * 2720 nullmailer_mailq: New check for monitoring the outgoing mail queue of Nullmailer... * 2707 winperf_processor: can now be configured to warn if a single cpu core exceeds a utilization threshold for a while... * 2708 sap, sap_state: new sap_state service reports connection problems to sap hosts... + * 2740 local: better warning output in case of invalid agent output * 2660 FIX: fixed windows agent using the wrong working directory... * 2664 FIX: ps: Speedup in situation with many matching processes... * 2661 FIX: windows agent: fixed incomplete process list... diff --git a/checks/local b/checks/local index 28a7cf5..434dd39 100644 --- a/checks/local +++ b/checks/local @@ -92,7 +92,7 @@ def inventory_local(info): if len(line) >= 4 or len(line) == 3 and line[0] == 'P': inventory.append( (line[1], None) ) else: - raise MKGeneralException("Invalid local check output: %s" % " ".join(line)) + raise MKGeneralException("Invalid line in agent section <<<local>>>: %s" % " ".join(line)) return inventory

8 years, 8 months

#2729 FIX Hosts/Hostproblems snapin: Fixed wrong livestatus query when filtering lists

by Lars Michelsen

Module: check_mk Branch: master Commit: fc691eac94bc8caad16740c96ba6495dfc24b0aa URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fc691eac94bc8c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Nov 6 13:39:02 2015 +0100 #2729 FIX Hosts/Hostproblems snapin: Fixed wrong livestatus query when filtering lists --- .werks/2729 | 10 ++++++++++ ChangeLog | 1 + web/plugins/sidebar/shipped.py | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/2729 b/.werks/2729 new file mode 100644 index 0000000..05dcd91 --- /dev/null +++ b/.werks/2729 @@ -0,0 +1,10 @@ +Title: Hosts/Hostproblems snapin: Fixed wrong livestatus query when filtering lists +Level: 1 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i4 +Date: 1446813511 + + diff --git a/ChangeLog b/ChangeLog index 121da3d..fdf601d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -68,6 +68,7 @@ * 2670 FIX: Fix problem that no site is configured when user has deleted only site... * 2717 FIX: Fixed broken webserver level authentication integration (e.g. basic, kerberos)... * 2722 FIX: Fixed some icon links from views opening in dashlet frames instead of the whole page... + * 2729 FIX: Hosts/Hostproblems snapin: Fixed wrong livestatus query when filtering lists WATO: * 2442 WATO remove host: improved cleanup of obsolete host files... diff --git a/web/plugins/sidebar/shipped.py b/web/plugins/sidebar/shipped.py index 1d8bd5b..9580b08 100644 --- a/web/plugins/sidebar/shipped.py +++ b/web/plugins/sidebar/shipped.py @@ -237,7 +237,7 @@ sidebar_snapins["servicegroups"] = { def render_hosts(mode): html.live.set_prepend_site(True) - query = "GET hosts\nColumns: name state worst_service_state\nLimit: 100" + query = "GET hosts\nColumns: name state worst_service_state\nLimit: 100\n" view = "host" if mode == "summary":

8 years, 8 months

#2728 FIX Removed debug notification script (was not executable)

by Lars Michelsen

Module: check_mk Branch: master Commit: d4860bb48246f703948e74094eab949034f38732 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d4860bb48246f7… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Nov 6 13:31:46 2015 +0100 #2728 FIX Removed debug notification script (was not executable) The script was only meant for debug/demonstration purposes. This script was not usable from the GUI except one made it executable. These days you can use the HTML notifications to get a list of all notifiction variables, if you need them e.g. for debugging. --- .werks/2728 | 14 ++++++++++++++ ChangeLog | 3 +++ notifications/debug | 21 --------------------- 3 files changed, 17 insertions(+), 21 deletions(-) diff --git a/.werks/2728 b/.werks/2728 new file mode 100644 index 0000000..80a4610 --- /dev/null +++ b/.werks/2728 @@ -0,0 +1,14 @@ +Title: Removed debug notification script (was not executable) +Level: 1 +Component: notifications +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i4 +Date: 1446813017 + +The script was only meant for debug/demonstration purposes. This +script was not usable from the GUI except one made it executable. + +These days you can use the HTML notifications to get a list of +all notifiction variables, if you need them e.g. for debugging. diff --git a/ChangeLog b/ChangeLog index c5d365d..121da3d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -79,6 +79,9 @@ * 2721 FIX: Fixed user profile sync in distributed environments after profile change * 2723 FIX: Hiding "discard changes button" after successful activation of changes + Notifications: + * 2728 FIX: Removed debug notification script (was not executable)... + Event Console: * 2733 Visibility of Event Console events more flexible now... * 2719 FIX: Events Check: Links to EC were broken when using regular expressions as application... diff --git a/notifications/debug b/notifications/debug deleted file mode 100644 index d68a3bb..0000000 --- a/notifications/debug +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/bash -# Debug Notifications - -# This notification script is just an example and shows how the -# script is being called: - -# Check_MK will call this without an command line arguments. -# All information is passed in environment variables that begin -# with NOTIFY_. - -# This debug script will fetch those variables and simply -# write them to the standard output. If you have enabled -# notification logging by setting notification_logging=1 -# or notification_logging=2 in main.mk (or via WATO in the -# global settings: Notification -> Debug notifications, then -# you will see this output in the notitifcation log file. -# Under OMD this file is in ~/var/log/notify.log. - -# Please refer to the official documentation for more details. - -env | grep NOTIFY_ | sort

8 years, 8 months

gitbug

by Sebastian Herbord

Module: check_mk Branch: master Commit: f352bd965d7d96f9e8669cb1a063c039e0dfae39 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f352bd965d7d96… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Fri Nov 6 13:30:08 2015 +0100 gitbug --- .bugs/2401 | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.bugs/2401 b/.bugs/2401 new file mode 100644 index 0000000..b002295 --- /dev/null +++ b/.bugs/2401 @@ -0,0 +1,8 @@ +Title: Manpage for check_mk binary +Component: docu +State: open +Date: 2015-11-06 13:27:20 +Targetversion: future +Class: todo + +There should be a manpage for the check_mk binary, preferrably generated from the usage output so that only one document has to be kept up-to-date

8 years, 8 months

netextreme_psu_in: Set default levels like recomended by the manufactorer

by Bastian Kuhn

Module: check_mk Branch: master Commit: 60ce3a4a46a16d28b85a3155e579109a9ad54db4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=60ce3a4a46a16d… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Fri Nov 6 13:24:29 2015 +0100 netextreme_psu_in: Set default levels like recomended by the manufactorer --- checks/netextreme_psu_in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/netextreme_psu_in b/checks/netextreme_psu_in index 06001ac..21b733b 100644 --- a/checks/netextreme_psu_in +++ b/checks/netextreme_psu_in @@ -35,7 +35,7 @@ # Just an assumption factory_settings["netextreme_psu_in_default_levels"] = { - "power" : (110, 120), + "power" : (1100, 1200), # This levels a recomended by the manufactorer "voltage" : (2, 1), }

8 years, 8 months

Conflicts:

by Lars Michelsen

Module: check_mk Branch: master Commit: 7e7405d55827a0f85c18b20e6e1f346784ebbe4b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7e7405d55827a0… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Nov 6 13:21:10 2015 +0100 Conflicts: checks/ibm_imm_health --- .werks/2727 | 10 ++++++++++ ChangeLog | 1 + checks/ibm_imm_health | 8 ++++---- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/.werks/2727 b/.werks/2727 new file mode 100644 index 0000000..c1c61e3 --- /dev/null +++ b/.werks/2727 @@ -0,0 +1,10 @@ +Title: ibm_imm_health: Fixed unhandled exception when SNMP info is missing +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i4 +Date: 1446812404 + + diff --git a/ChangeLog b/ChangeLog index 81c1705..c5d365d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -51,6 +51,7 @@ * 2738 FIX: Check_MK Caching agent on Linux: introduce timeout for lock... * 2725 FIX: Dynamic levels: Enforce config of levels for filesystems larger than 0 bytes... * 2726 FIX: veeam_backup_status: Fixed missing agent section error in case of aborted tasks + * 2727 FIX: ibm_imm_health: Fixed unhandled exception when SNMP info is missing Multisite: * 2684 Added icons for downloading agent data / walks of hosts... diff --git a/checks/ibm_imm_health b/checks/ibm_imm_health index 35e5c93..df7a9c0 100644 --- a/checks/ibm_imm_health +++ b/checks/ibm_imm_health @@ -29,7 +29,7 @@ def inventory_ibm_imm_health(info): return [(None, None)] def check_ibm_imm_health(_no_item, _no_params, info): - if not info: + if not info or not info[0]: return 3, 'Health info not found in SNMP data' num_alerts = (len(info) - 1) / 3 @@ -44,11 +44,11 @@ def check_ibm_imm_health(_no_item, _no_params, info): state = info[0][0] if state == '255': return (0, "no problem found") - elif state in ['0']: + elif state == '0': return (2, infotext + " - manual log clearing needed to recover state" ) - elif state in ['2']: + elif state == '2': return (2, infotext) - elif state == ['4']: + elif state == '4': return (1, infotext) else: return (3, infotext)

8 years, 8 months

← Newer
1
...
21
22
23
24
25
26
27
...
31
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits November 2015