Checkmk git commits May 2013

checkmk-commits@lists.checkmk.com

3 participants
111 discussions

Check_MK Git: check_mk: windows agent now outputs 32/ 64 bit architecture in <<<check_mk>>> section

by Andreas Boesl

Module: check_mk Branch: master Commit: 2edb7a36960662af027a79e8bc336f9ec5307152 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2edb7a36960662… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue May 28 11:34:12 2013 +0200 windows agent now outputs 32/64 bit architecture in <<<check_mk>>> section --- agents/windows/check_mk_agent.cc | 66 ++++++++++++++++++++++---------------- 1 file changed, 39 insertions(+), 27 deletions(-) diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index 930a5d0..a69b596 100755 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -45,11 +45,11 @@ #include <stdio.h> #include <stdint.h> +#include <winsock2.h> #include <windows.h> #include <winbase.h> #include <winreg.h> // performance counters from registry #include <tlhelp32.h> // list of processes -#include <winsock2.h> #include <stdarg.h> #include <time.h> #include <locale.h> @@ -108,6 +108,16 @@ #define DEFAULT_PLUGIN_TIMEOUT 30 #define DEFAULT_TOTAL_PLUGINS_TIMEOUT 60 +// Check compilation environment 32/64 bit +#if _WIN32 || _WIN64 + #if _WIN64 + #define ENVIRONMENT64 + #else + #define ENVIRONMENT32 + #endif +#endif + + // Needed for only_from struct ipspec { uint32_t address; @@ -1438,33 +1448,30 @@ void load_logwatch_offsets() } } - - - // debug output -void print_logwatch_config() -{ - printf("\nLOGWATCH CONFIG\n=================\nFILES\n"); - for (unsigned int i = 0; i < g_num_logwatch_textfiles ; i++) { - printf(" %s %u %x missing %d\n", g_logwatch_textfiles[i]->path, - (unsigned int)g_logwatch_textfiles[i]->offset, - (unsigned int) g_logwatch_textfiles[i]->patterns, - g_logwatch_textfiles[i]->missing); - } - printf("\n"); - - printf("GLOBS\n"); - for (unsigned int i = 0; i < g_num_logwatch_globlines ; i++) { - printf("Globline Container %x\n", (unsigned int)g_logwatch_globlines[i]->patterns); - for (int j = 0; j < g_logwatch_globlines[i]->num_tokens ; j++) - printf(" %s\n", g_logwatch_globlines[i]->token[j]->pattern); - printf("Pattern Container\n"); - for (int j = 0; j < g_logwatch_globlines[i]->patterns->num_patterns; j++) - printf(" %c %s\n", g_logwatch_globlines[i]->patterns->patterns[j]->state, - g_logwatch_globlines[i]->patterns->patterns[j]->glob_pattern); - } - printf("\n"); -} +//void print_logwatch_config() +//{ +// printf("\nLOGWATCH CONFIG\n=================\nFILES\n"); +// for (unsigned int i = 0; i < g_num_logwatch_textfiles ; i++) { +// printf(" %s %u %x missing %d\n", g_logwatch_textfiles[i]->path, +// (unsigned int)g_logwatch_textfiles[i]->offset, +// (unsigned int) g_logwatch_textfiles[i]->patterns, +// g_logwatch_textfiles[i]->missing); +// } +// printf("\n"); +// +// printf("GLOBS\n"); +// for (unsigned int i = 0; i < g_num_logwatch_globlines ; i++) { +// printf("Globline Container %x\n", (unsigned int)g_logwatch_globlines[i]->patterns); +// for (int j = 0; j < g_logwatch_globlines[i]->num_tokens ; j++) +// printf(" %s\n", g_logwatch_globlines[i]->token[j]->pattern); +// printf("Pattern Container\n"); +// for (int j = 0; j < g_logwatch_globlines[i]->patterns->num_patterns; j++) +// printf(" %c %s\n", g_logwatch_globlines[i]->patterns->patterns[j]->state, +// g_logwatch_globlines[i]->patterns->patterns[j]->glob_pattern); +// } +// printf("\n"); +//} // Add a new state pattern to the current pattern container void add_condition_pattern(char state, char *value) @@ -2300,6 +2307,11 @@ void section_check_mk(SOCKET &out) crash_log("<<<check_mk>>>"); output(out, "<<<check_mk>>>\n"); output(out, "Version: %s\n", CHECK_MK_VERSION); + #ifdef ENVIRONMENT32 + output(out, "Architecture: 32bit\n"); + #else + output(out, "Architecture: 64bit\n"); + #endif output(out, "AgentOS: windows\n"); output(out, "Hostname: %s\n", g_hostname); output(out, "WorkingDirectory: %s\n", g_current_directory);

11 years, 4 months

Check_MK Git: check_mk: Updated bug entries #0922

by Lars Michelsen

Module: check_mk Branch: master Commit: 9493eaf7092e66e154f11883ef5fba56d9df005b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9493eaf7092e66… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue May 28 09:27:59 2013 +0200 Updated bug entries #0922 --- .bugs/922 | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.bugs/922 b/.bugs/922 new file mode 100644 index 0000000..d9defcd --- /dev/null +++ b/.bugs/922 @@ -0,0 +1,8 @@ +Title: switch "mkevent" from pipe to socket communication +Component: ec +State: open +Date: 2013-05-28 09:21:05 +Targetversion: 1.2.3 +Class: cleanup + +The program uses the pipe for communication. It would be much better to use the socket.

11 years, 4 months

Check_MK Git: check_mk: Merge branch 'master' of mathias-kettner.de: check_mk

by Lars Michelsen

Module: check_mk Branch: master Commit: c2afcb304f05abfbd8771c2c0f51baa2dd7eba3d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c2afcb304f05ab… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue May 28 09:28:06 2013 +0200 Merge branch 'master' of mathias-kettner.de:check_mk ---

11 years, 4 months

Check_MK Git: check_mk: Renamed "Delete Event" to "Archive Event" to clearify the meaning

by Lars Michelsen

Module: check_mk Branch: master Commit: a277cd90592afa0204d84af39300ce73994b1481 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a277cd90592afa… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue May 28 09:27:43 2013 +0200 Renamed "Delete Event" to "Archive Event" to clearify the meaning --- ChangeLog | 1 + mkeventd/web/plugins/views/mkeventd.py | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4002b88..41aa0c1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -165,6 +165,7 @@ Event Console: * FIX: fix icon in events check if host specification is by IP address + * Renamed "Delete Event" to "Archive Event" to clearify the meaning 1.2.2p1: Core: diff --git a/mkeventd/web/plugins/views/mkeventd.py b/mkeventd/web/plugins/views/mkeventd.py index f0f4da6..9681c1d 100644 --- a/mkeventd/web/plugins/views/mkeventd.py +++ b/mkeventd/web/plugins/views/mkeventd.py @@ -712,8 +712,8 @@ if mkeventd_enabled: # Delete events config.declare_permission("mkeventd.delete", - _("Delete an event"), - _("Finally delete an event without any further action"), + _("Archive an event"), + _("Finally archive an event without any further action"), [ "user", "admin" ]) @@ -727,9 +727,9 @@ if mkeventd_enabled: multisite_commands.append({ "tables" : [ "event" ], "permission" : "mkeventd.delete", - "title" : _("Delete Event"), + "title" : _("Archive Event"), "render" : lambda: \ - html.button("_delete_event", _("Delete Event")), + html.button("_delete_event", _("Archive Event")), "action" : command_mkeventd_delete, "executor" : command_executor_mkeventd, })

11 years, 4 months

Check_MK Git: check_mk: viprinet_router: Now able to set required target state via rule

by Andreas Boesl

Module: check_mk Branch: master Commit: 224294ea7f68a20e2a0e908a5a1ca296998ca88b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=224294ea7f68a2… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon May 27 17:29:45 2013 +0200 viprinet_router: Now able to set required target state via rule --- ChangeLog | 1 + checkman/viprinet_router | 8 ++++---- checks/viprinet_router | 19 ++++++++++++++++--- web/plugins/wato/check_parameters.py | 24 ++++++++++++++++++++++++ 4 files changed, 45 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1aeb326..3526f35 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,7 @@ Checks & Agents: * lnx_if: Fixed crash on missing "Address" field + * viprinet_router: Now able to set required target state via rule 1.2.3i1: Core: diff --git a/checkman/viprinet_router b/checkman/viprinet_router index 8b72ba1..da10bc1 100644 --- a/checkman/viprinet_router +++ b/checkman/viprinet_router @@ -23,7 +23,7 @@ inventory: [parameters] parameters(dict): a dictionary with the optional key - {"mode"} - specifies the required router mode. The mode can be set to - {node} / {hub} / {hub_hotspare} / {hub_hotspare_replacing} - and {inventory} (same mode as detected on inventory). - If the actual mode differs from this mode a warning is raised + {"expect_mode"} - specifies the required router mode. The mode can be set to + "0", "1", "2", "3" (mentioned above) or "inv" which means + the same mode as detected during inventory. + If the actual mode differs from this mode an error is raised diff --git a/checks/viprinet_router b/checks/viprinet_router index ca287b6..39084f4 100644 --- a/checks/viprinet_router +++ b/checks/viprinet_router @@ -24,14 +24,26 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -def check_viprinet_router(_no_item, _no_params, info): +def check_viprinet_router(_no_item, params, info): router_mode_map = { "0" : "Node", "1" : "Hub", "2" : "Hub running as HotSpare", "3" : "Hotspare-Hub replacing another router" } - mode = router_mode_map.get(info[0][0][0]) + current_mode = info[0][0][0] + mode = router_mode_map.get(current_mode) + + expect_mode = params.get("expect_mode") + if expect_mode: + # Requires mode found on inventory + if expect_mode == "inv": + expect_mode = params.get("mode_inv") + if expect_mode in router_mode_map: + if expect_mode != current_mode: + return (2, "Mode '%s' differs from expected mode '%s'" % + ( mode, router_mode_map.get(expect_mode) )) + if mode: return (0, mode) else: @@ -39,9 +51,10 @@ def check_viprinet_router(_no_item, _no_params, info): check_info["viprinet_router"] = { 'check_function' : check_viprinet_router, - 'inventory_function' : lambda info: len(info) > 0 and [(None, None)] or [], + 'inventory_function' : lambda info: len(info) > 0 and [(None, {"mode_inv": info[0][0][0]})] or [], 'service_description' : "Router Mode", 'has_perfdata' : False, + 'group' : "viprinet_router", 'snmp_info' : (".1.3.6.1.4.1.35424.1.1", [5]), 'snmp_scan_function' : lambda oid: oid(".1.3.6.1.2.1.1.2.0") in [".1.3.6.1.4.1.35424"], } diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index fb7c8a3..d2cab37 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -1008,6 +1008,30 @@ register_check_parameters( register_check_parameters( subgroup_networking, + "viprinet_router", + _("Viprinet router"), + Dictionary( + elements = [ + ( "expect_mode", + DropdownChoice( + title = _("Set expected router mode"), + choices = [ + ( "inv", _("Mode found during inventory") ), + ( "0" , _("Node") ), + ( "1" , _("Hub") ), + ( "2" , _("Hub running as HotSpare") ), + ( "3" , _("Hotspare-Hub replacing another router") ), + ] + ) + ), + ] + ), + None, + None +) + +register_check_parameters( + subgroup_networking, "tcp_conn_stats_win", ("TCP connection stats (Windows)"), Dictionary(

11 years, 4 months

Check_MK Git: check_mk: lnx_if: Fixed crash on missing 'Address' field

by Andreas Boesl

Module: check_mk Branch: master Commit: ecc5280b3f1d97133a9ec35b0113b75121cb4ece URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ecc5280b3f1d97… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon May 27 16:32:29 2013 +0200 lnx_if: Fixed crash on missing 'Address' field --- ChangeLog | 4 +++- checks/lnx_if | 8 ++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4002b88..1aeb326 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,9 @@ 1.2.3i2: Core: * New option -B for just generating the configuration - + + Checks & Agents: + * lnx_if: Fixed crash on missing "Address" field 1.2.3i1: Core: diff --git a/checks/lnx_if b/checks/lnx_if index 516407a..2ccb3d7 100644 --- a/checks/lnx_if +++ b/checks/lnx_if @@ -130,10 +130,10 @@ def if_lnx_convert_to_if64(info): else: ifOperStatus = 4 # unknown (NIC has never been used) - # There is no mac adress data available for the moment - def hextobin(x): - return chr(int(x, 16)) - ifPhysAddress = "".join([chr(int(x, 16)) for x in attr.get("Address", "").split(":")]) + if attr.get("Address"): + ifPhysAddress = "".join([chr(int(x, 16)) for x in attr.get("Address", "").split(":")]) + else: + ifPhysAddress = '' if_table.append(map(str, [ ifIndex, ifDescr, ifType, ifSpeed, ifOperStatus,

11 years, 4 months

Check_MK Git: check_mk: Updated bug entries #0921

by Lars Michelsen

Module: check_mk Branch: master Commit: 9236bbf4f1b303e1353590a040e720a8ca3044c7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9236bbf4f1b303… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon May 27 16:19:01 2013 +0200 Updated bug entries #0921 --- .bugs/921 | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.bugs/921 b/.bugs/921 new file mode 100644 index 0000000..bbcce8b --- /dev/null +++ b/.bugs/921 @@ -0,0 +1,8 @@ +Title: Fix typo in rules apc_symentra to apc_symmetra +Component: checks +State: open +Date: 2013-05-27 16:16:05 +Targetversion: 1.2.3 +Class: nastiness + +The variable is named wrong. Change this and all texts in the WATO definitions.

11 years, 4 months

Check_MK Git: check_mk: FIX: ad_replication plugin: Fixed typo ( Thanks to Dennis Honke)

by Lars Michelsen

Module: check_mk Branch: master Commit: 27a9bea331472f27e1d4dd1728e6ec2337021fa3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=27a9bea331472f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon May 27 11:00:01 2013 +0200 FIX: ad_replication plugin: Fixed typo (Thanks to Dennis Honke) --- ChangeLog | 1 + agents/windows/plugins/ad_replication.bat | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 53f1c63..4002b88 100644 --- a/ChangeLog +++ b/ChangeLog @@ -152,6 +152,7 @@ * FIX: ipmi_sensors: handle two cases for DELL correctly (thanks to Sebastian Talmon) * FIX: check_dns: enable performance data * FIX: free_ipmi: fix name of sensor cache file if hostname contains domain part + * FIX: ad_replication plugin: Fixed typo (Thanks to Dennis Honke) Multisite: * List of views: Output the alias of a datasource instead of internal name diff --git a/agents/windows/plugins/ad_replication.bat b/agents/windows/plugins/ad_replication.bat index bdaa64a..c4ce3c4 100644 --- a/agents/windows/plugins/ad_replication.bat +++ b/agents/windows/plugins/ad_replication.bat @@ -15,5 +15,5 @@ REM * REM *** echo ^<^<^<ad_replication^>^>^> -dsquery server | find /I "CN=%COMPTERNAME%," > nul +dsquery server | find /I "CN=%COMPUTERNAME%," > nul if ERRORLEVEL 0 repadmin /showrepl /csv

11 years, 4 months

Check_MK Git: check_mk: Switch view pending services to table layout

by Mathias Kettner

Module: check_mk Branch: master Commit: 71105778bd000c018c2067e76df30ae54f14ae69 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=71105778bd000c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat May 25 15:20:56 2013 +0200 Switch view pending services to table layout --- 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 80b0daa..c9bac8d 100644 --- a/web/plugins/views/builtin.py +++ b/web/plugins/views/builtin.py @@ -933,7 +933,7 @@ multisite_builtin_views.update({ ('stp', 'on')], 'hidden': False, 'hide_filters': [], - 'layout': 'boxed', + 'layout': 'table', 'linktitle': _('Pending Services'), 'mustsearch': False, 'name': 'pendingsvc',

11 years, 4 months

Check_MK Git: check_mk: Fix exception when restoring after invalid config

by Mathias Kettner

Module: check_mk Branch: master Commit: bb31b3243b47f0eec60ed6ab9a4b5f20fc0480e5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bb31b3243b47f0… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat May 25 13:55:59 2013 +0200 Fix exception when restoring after invalid config --- modules/check_mk.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index e7ef9ee..bd107ce 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -4188,7 +4188,8 @@ def do_restart(only_reload = False): do_create_config() except Exception, e: sys.stderr.write("Error creating configuration: %s\n" % e) - os.rename(backup_path, nagios_objects_file) + if backup_path: + os.rename(backup_path, nagios_objects_file) if opt_debug: raise sys.exit(1)

11 years, 4 months

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits May 2013