Checkmk git commits April 2013

checkmk-commits@lists.checkmk.com

3 participants
237 discussions

Check_MK Git: check_mk: Fixed typo in man page

by Mathias Kettner

Module: check_mk Branch: master Commit: 66b963357b145694ce67ce411347cd9377322f08 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=66b963357b1456… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Apr 7 12:55:50 2013 +0200 Fixed typo in man page --- checkman/hp_eml_sum | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/checkman/hp_eml_sum b/checkman/hp_eml_sum index b37ae31..978d5b1 100644 --- a/checkman/hp_eml_sum +++ b/checkman/hp_eml_sum @@ -9,4 +9,4 @@ description: work with other models. It uses information provided by the SEMI-MIB. inventory: - The check supports automatic inventory. Each system gets one summary checks. + The check supports automatic inventory. Each system gets one summary check.

11 years, 2 months

Check_MK Git: check_mk: FIX: lnx_bonding: handle also 802.3ad type bonds

by Mathias Kettner

Module: check_mk Branch: master Commit: 3db263c7caa51daa25d81f36d9d128f66a6c8102 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3db263c7caa51d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Apr 6 19:02:13 2013 +0200 FIX: lnx_bonding: handle also 802.3ad type bonds --- ChangeLog | 2 +- checks/bonding.include | 4 ++-- checks/lnx_bonding | 13 ++++++++++--- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index fd94a8b..89f4b42 100644 --- a/ChangeLog +++ b/ChangeLog @@ -95,7 +95,7 @@ Checks & Agents: * FIX: blade_bx_load: remove invalid WATO group - + * FIX: lnx_bonding: handle also 802.3ad type bonds Notifications: * FIX: Removing GRAPH_CODE in html mails when not available diff --git a/checks/bonding.include b/checks/bonding.include index 44fd402..9a1048b 100644 --- a/checks/bonding.include +++ b/checks/bonding.include @@ -59,8 +59,8 @@ def check_bonding(item, params, parsed): primary = status.get("primary", params.get("primary")) if primary: infos.append("primary: " + primary) - active = status["active"] - if active: + if "active" in status: + active = status["active"] infos.append("active: " + active) expect = params.get("expect_active", "ignore") diff --git a/checks/lnx_bonding b/checks/lnx_bonding index 5dd260b..e0b2dce 100644 --- a/checks/lnx_bonding +++ b/checks/lnx_bonding @@ -76,6 +76,11 @@ def parse_lnx_bonding(info): if line[0].strip() == "Down Delay (ms)": break + # Here could come an additional part: + # "802.3ad info". We detect the end of + # this part by finding th efirst "Slave Interface" + eth = None + # Parse interfaces interfaces = {} bonds[bond]["interfaces"] = interfaces @@ -88,7 +93,7 @@ def parse_lnx_bonding(info): elif line[0].strip() == "Slave Interface": eth = line[1].strip() interfaces[eth] = {} - elif line: + elif line and eth: interfaces[eth][line[0].strip()] = ":".join(line[1:]).strip() except StopIteration: @@ -106,11 +111,13 @@ def parse_lnx_bonding(info): } converted[bond] = { "status" : status["main"]["MII Status"], - "primary" : status["main"].get("Primary Slave").split()[0], - "active" : status["main"].get("Currently Active Slave"), "mode" : status["main"]["Bonding Mode"].split('(')[0].strip(), "interfaces" : interfaces, } + if "Currently Active Slave" in status["main"]: + converted[bond]["active"] = status["main"]["Currently Active Slave"] + if "Primary Slave" in status["main"]: + converted[bond]["primary"] = status["main"]["Primary Slave"].split()[0] return converted

11 years, 2 months

Check_MK Git: check_mk: winperf_processor: introduce averaging, support predictive levels

by Mathias Kettner

Module: check_mk Branch: master Commit: eec0ef69eb15860309f08c541da49d6b6c19ef10 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=eec0ef69eb1586… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Apr 5 16:28:29 2013 +0200 winperf_processor: introduce averaging, support predictive levels --- ChangeLog | 1 + checks/cpu_util.include | 76 +++++++++++++++++++++ checks/kernel | 4 +- checks/winperf_processor | 27 ++----- pnp-templates/check_mk-winperf_processor.util.php | 65 +++++++++++++++++- web/plugins/wato/check_parameters.py | 34 +++++++++- 6 files changed, 184 insertions(+), 23 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=eec0ef69eb…

11 years, 2 months

Check_MK Git: check_mk: add -static option to linker

by Andreas Boesl

Module: check_mk Branch: master Commit: bd3b4106578151899bfd1f17d57c8ffb7f3a14be URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bd3b4106578151… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Apr 5 14:31:01 2013 +0200 add -static option to linker --- agents/windows/Makefile | 2 +- agents/windows/check_mk_agent.exe | Bin 111104 -> 111104 bytes agents/windows/crash.exe | Bin 20024 -> 20024 bytes agents/windows/install_agent.exe | Bin 131002 -> 131043 bytes agents/windows/nowin.exe | Bin 22511 -> 22511 bytes 5 files changed, 1 insertions(+), 1 deletions(-) diff --git a/agents/windows/Makefile b/agents/windows/Makefile index 2b48f59..43e60e7 100755 --- a/agents/windows/Makefile +++ b/agents/windows/Makefile @@ -37,7 +37,7 @@ install_agent.exe: check_mk_agent.exe crash.exe nowin.exe chmod +x install_agent.exe check_mk_agent.exe: check_mk_agent.cc Makefile - $(CXX) -s -O2 -Wall -Werror -o $@ $< -lwsock32 + $(CXX) -s -O2 -Wall -Werror -o $@ $< -static -lwsock32 crash.exe: crash.cc Makefile $(CXX) -o $@ $< diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index e209d4d..dcbe753 100755 Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe differ diff --git a/agents/windows/crash.exe b/agents/windows/crash.exe index 50080b7..91b2320 100755 Binary files a/agents/windows/crash.exe and b/agents/windows/crash.exe differ diff --git a/agents/windows/install_agent.exe b/agents/windows/install_agent.exe index e4adf64..8af2f9c 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ diff --git a/agents/windows/nowin.exe b/agents/windows/nowin.exe index 798b142..0b6e2cd 100755 Binary files a/agents/windows/nowin.exe and b/agents/windows/nowin.exe differ

11 years, 2 months

Check_MK Git: check_mk: check_mk.ini: new option 'port' - specifies agent port

by Andreas Boesl

Module: check_mk Branch: master Commit: 1d1d45f8e71d55ff958f433be0b7bb29dcca80cd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1d1d45f8e71d55… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Apr 5 13:04:23 2013 +0200 check_mk.ini: new option 'port' - specifies agent port --- ChangeLog | 1 + agents/windows/check_mk.example.ini | 3 +++ agents/windows/check_mk_agent.cc | 13 +++++++++---- agents/windows/check_mk_agent.exe | Bin 111104 -> 111104 bytes agents/windows/install_agent.exe | Bin 130964 -> 131002 bytes 5 files changed, 13 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 75cbff4..ff883ad 100644 --- a/ChangeLog +++ b/ChangeLog @@ -61,6 +61,7 @@ snapshotted during inventory. * smart.temp: add WATO configuration * if64_tplink: special new check for TP Link switches with broken SNMP output + * windows_agent: check_mk.ini: new option "port" - specifies agent port Notifications: * notify.py: unique spoolfiles name no longer created with uuid diff --git a/agents/windows/check_mk.example.ini b/agents/windows/check_mk.example.ini index 2929fc6..84eb9bf 100644 --- a/agents/windows/check_mk.example.ini +++ b/agents/windows/check_mk.example.ini @@ -2,6 +2,9 @@ # Restrict access to certain IP addresses # only_from = 127.0.0.1 192.168.56.0/24 + # Change port where the agent is listening ( default 6556 ) + # port = 6556 + # Do only execute programs and scripts with # the following suffixes (in local and plugins). # Per default all extensions except txt and dir diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index d558c0f..019fd26 100755 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -158,6 +158,7 @@ bool do_tcp = false; bool should_terminate = false; bool force_tcp_output = false; // if true, send socket data immediately char g_hostname[256]; +int g_port = CHECK_MK_AGENT_PORT; // sections enabled (configurable in check_mk.ini) unsigned long enabled_sections = 0xffffffff; @@ -2636,6 +2637,10 @@ if (!strcmp(var, "only_from")) { parse_only_from(value); return true; } + else if (!strcmp(var, "port")) { + g_port = atoi(value); + return true; + } else if (!strcmp(var, "execute")) { parse_execute(value); return true; @@ -3013,14 +3018,14 @@ void listen_tcp_loop() SOCKADDR_IN addr; memset(&addr, 0, sizeof(SOCKADDR_IN)); addr.sin_family = AF_INET; - addr.sin_port = htons(CHECK_MK_AGENT_PORT); + addr.sin_port = htons(g_port); addr.sin_addr.s_addr = ADDR_ANY; int optval = 1; setsockopt(s, SOL_SOCKET, SO_REUSEADDR, (const char*)&optval, sizeof(optval)); if (SOCKET_ERROR == bind(s, (SOCKADDR *)&addr, sizeof(SOCKADDR_IN))) { - fprintf(stderr, "Cannot bind socket to port %d\n", CHECK_MK_AGENT_PORT); + fprintf(stderr, "Cannot bind socket to port %d\n", g_port); exit(1); } @@ -3149,7 +3154,7 @@ void usage() "check_mk_agent remove -- remove Windows NT service\n" "check_mk_agent adhoc -- open TCP port %d and answer request until killed\n" "check_mk_agent test -- test output of plugin, do not open TCP port\n" - "check_mk_agent debug -- similar to test, but with lots of debug output\n", CHECK_MK_AGENT_PORT); + "check_mk_agent debug -- similar to test, but with lots of debug output\n", g_port); exit(1); } @@ -3174,7 +3179,7 @@ void do_test() void do_adhoc() { do_tcp = true; - printf("Listening for TCP connections on port %d\n", CHECK_MK_AGENT_PORT); + printf("Listening for TCP connections on port %d\n", g_port); printf("Close window or press Ctrl-C to exit\n"); fflush(stdout); diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index 3f21a99..e209d4d 100755 Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe differ diff --git a/agents/windows/install_agent.exe b/agents/windows/install_agent.exe index bf76f55..e4adf64 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ

11 years, 2 months

Check_MK Git: check_mk: Fixed json formating in snapin refresh code

by Lars Michelsen

Module: check_mk Branch: master Commit: 63a69ee591aec6da5f26b6f62aeedd87b1b5adf6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=63a69ee591aec6… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Apr 5 13:00:14 2013 +0200 Fixed json formating in snapin refresh code --- web/htdocs/sidebar.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/htdocs/sidebar.py b/web/htdocs/sidebar.py index ea46437..2f84e65 100644 --- a/web/htdocs/sidebar.py +++ b/web/htdocs/sidebar.py @@ -312,7 +312,7 @@ def ajax_snapin(): snapin_code.append(html.drain()) html.unplug() - html.write('[%s]' % ','.join([ "'%s'" % s for s in snapin_code])) + html.write('[%s]' % ','.join([ '"%s"' % s.replace('"', '\\"').replace('\n', '') for s in snapin_code])) except Exception, e: html.flush() html.unplug()

11 years, 2 months

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

by Lars Michelsen

Module: check_mk Branch: master Commit: f0e4325af91c4e7886458d76916b9e315a5f4b51 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f0e4325af91c4e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Apr 5 12:51:41 2013 +0200 Merge branch 'master' of mathias-kettner.de:check_mk ---

11 years, 2 months

Check_MK Git: check_mk: snapins: Reverted yesterdays encoding "fix"; switched output to manual json formating

by Lars Michelsen

Module: check_mk Branch: master Commit: af54e0156de4130ce45d509488526384b2fcf580 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=af54e0156de413… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Apr 5 12:51:27 2013 +0200 snapins: Reverted yesterdays encoding "fix"; switched output to manual json formating --- web/htdocs/sidebar.py | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/web/htdocs/sidebar.py b/web/htdocs/sidebar.py index 85932ea..ea46437 100644 --- a/web/htdocs/sidebar.py +++ b/web/htdocs/sidebar.py @@ -309,13 +309,14 @@ def ajax_snapin(): snapin["render"]() except Exception, e: snapin_exception(e) - snapin_code.append(html.drain().encode('utf-8')) + snapin_code.append(html.drain()) html.unplug() - html.write(repr(snapin_code)) - except: + html.write('[%s]' % ','.join([ "'%s'" % s for s in snapin_code])) + except Exception, e: html.flush() html.unplug() + html.log('Exception during snapin refresh: %s' % e) raise def move_snapin():

11 years, 2 months

Check_MK Git: check_mk: FIX: blade_bx_load: remove invalid WATO group

by Mathias Kettner

Module: check_mk Branch: master Commit: b1f7154e7db56ca8ebedae8d1abaa3aa14190365 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b1f7154e7db56c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Apr 5 12:35:37 2013 +0200 FIX: blade_bx_load: remove invalid WATO group --- ChangeLog | 4 ++++ checks/blade_bx_load | 10 +++------- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 05684bf..75cbff4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -91,6 +91,10 @@ * Added $HOSTURL$ and $SERVICEURL$ to notification macros which contain an URL to the host/service details views with /check_mk/... as base. + Checks & Agents: + * FIX: blade_bx_load: remove invalid WATO group + + Notifications: * FIX: Removing GRAPH_CODE in html mails when not available * Using plugin argument 1 for path to pnp4nagios index php to render graphs diff --git a/checks/blade_bx_load b/checks/blade_bx_load index a8cc02a..4189af7 100644 --- a/checks/blade_bx_load +++ b/checks/blade_bx_load @@ -31,12 +31,9 @@ def inventory_blade_bx_load(info): return [ (None, "blade_bx_cpuload_default_levels")] def check_blade_bx_load(item, params, info): - try: - load = [] - for i in [ 0, 1, 2 ]: - load.append(float(info[i][2])) - except: - return (3, "Unknown - invalid or incomplete output from plugin %s - %s - %s " % (float(info[0][2]), float(info[1][2]), float(info[2][2]) ) ) + load = [] + for i in [ 0, 1, 2 ]: + load.append(float(info[i][2])) warn, crit = params @@ -56,5 +53,4 @@ check_info['blade_bx_load'] = { "has_perfdata" : True, "snmp_info" : (".1.3.6.1.4.1.2021.10.1", [ 1, 2, 6 ]), "snmp_scan_function" : lambda oid: "BX600" in oid(".1.3.6.1.2.1.1.1.0"), - "group" : "cpu_utilization", }

11 years, 2 months

Check_MK Git: check_mk: FIX: Fix several cases where WATO rule analyser did not hilite all matching rules

by Mathias Kettner

Module: check_mk Branch: master Commit: a528c7952aa9da4d7eed69ad35c90ff52a06ab29 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a528c7952aa9da… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Apr 5 12:22:36 2013 +0200 FIX: Fix several cases where WATO rule analyser did not hilite all matching rules --- ChangeLog | 1 + web/plugins/wato/check_parameters.py | 12 ++++++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index a5f9027..05684bf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -100,6 +100,7 @@ * FIX: Fixed umlaut handling in reloaded snapins WATO: + * FIX: Fix several cases where WATO rule analyser did not hilite all matching rules * Added tcp port parameter to SSL certificate check (Thanks to Marcel Schulte) 1.2.2b7: diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 7a7a9a4..ed7436b 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -134,7 +134,7 @@ register_rule(group + '/' + subgroup_applications, itemname = 'Logfile', itemhelp = _("Put the item names of the logfiles here. For example \"System$\" " "to select the service \"LOG System\"."), - match = 'list', + match = 'all', ) register_rule(group + '/' + subgroup_inventory, @@ -168,7 +168,7 @@ register_rule(group + '/' + subgroup_inventory, 'You can configure specific window services to be monitored by the windows check by ' 'selecting them by name, current state during the inventory or start mode.'), ), - match = 'list', + match = 'all', ) #dublicate: check_mk_configuration.py @@ -386,7 +386,7 @@ register_rule(group + '/' + subgroup_inventory, ], optional_keys = [], ), - match = 'list', + match = 'all', ) register_rule(group + '/' + subgroup_inventory, @@ -741,7 +741,7 @@ register_rule(group + '/' + subgroup_storage, ), add_label = _("Add pattern"), ), - match = 'list', + match = 'all', ) register_rule(group + '/' + subgroup_storage, varname = "fileinfo_groups", @@ -773,7 +773,7 @@ register_rule(group + '/' + subgroup_storage, ), add_label = _("Add pattern"), ), - match = 'list', + match = 'all', ) register_check_parameters( @@ -2208,7 +2208,7 @@ register_rule(group + '/' + subgroup_networking, ], required_keys = ["name", "iftype", "single"]), add_label = _("Add pattern")), - match = 'list', + match = 'all', ) register_check_parameters(

11 years, 2 months

← Newer
1
...
15
16
17
18
19
20
21
...
24
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits April 2013