Checkmk git commits July 2014

checkmk-commits@lists.checkmk.com

7 participants
221 discussions

Check_MK Git: check_mk: Reserved 20 Werk IDS

by Lars Michelsen

Module: check_mk Branch: master Commit: d123f0547a50e1e7a702fcf33ea21cfca3550eb0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d123f0547a50e1… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jul 4 15:24:54 2014 +0200 Reserved 20 Werk IDS --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index bcbb007..e255a85 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -1052 +1072

10 years, 2 months

Check_MK Git: check_mk: FIX: of the fix of fc_port

by Goetz Golla

Module: check_mk Branch: master Commit: c85c56d2988c1bc9422d34e1e9aa199e829e3183 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c85c56d2988c1b… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Fri Jul 4 15:12:40 2014 +0200 FIX: of the fix of fc_port --- checks/fc_port | 2 +- web/plugins/perfometer/check_mk.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/checks/fc_port b/checks/fc_port index 7d14c79..beda840 100644 --- a/checks/fc_port +++ b/checks/fc_port @@ -150,7 +150,7 @@ def check_fc_port(item, params, info): speedmsg = "assuming %g GBit/s" % gbit else: gbit = wirespeed * 8.0 / ( 1000.0 * 1000.0 * 1000.0 ) # in GBit/sec - speedmsg = "%.1f GBit/s" % gb + speedmsg = "%.1f GBit/s" % gbit output.append(speedmsg) # Now check rates of various counters diff --git a/web/plugins/perfometer/check_mk.py b/web/plugins/perfometer/check_mk.py index cf8ff84..5e35c6a 100644 --- a/web/plugins/perfometer/check_mk.py +++ b/web/plugins/perfometer/check_mk.py @@ -459,7 +459,7 @@ perfometers["check_mk-esx_vsphere_counters.if"] = perfometer_check_mk_if perfometers["check_mk-hitachi_hnas_fc_if"] = perfometer_check_mk_if def perfometer_check_mk_fc_port(row, check_command, perf_data): - unit = "Byte/s" + unit = "B" return perfometer_bandwidth( in_traffic = savefloat(perf_data[0][1]), out_traffic = savefloat(perf_data[5][1]),

10 years, 2 months

Check_MK Git: check_mk: fc_port check displays maximum bandwith of port in GBit/sec, but throughput in GByte/sec

by Goetz Golla

Module: check_mk Branch: master Commit: 1e34bb4e5fc5477aad19d2eb4e28f863008fe2aa URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1e34bb4e5fc547… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Fri Jul 4 15:04:56 2014 +0200 fc_port check displays maximum bandwith of port in GBit/sec, but throughput in GByte/sec --- checks/fc_port | 21 +++++++++++++++------ web/plugins/perfometer/check_mk.py | 12 +++++++++++- web/plugins/wato/check_parameters.py | 2 +- 3 files changed, 27 insertions(+), 8 deletions(-) diff --git a/checks/fc_port b/checks/fc_port index 11129c0..7d14c79 100644 --- a/checks/fc_port +++ b/checks/fc_port @@ -144,13 +144,13 @@ def check_fc_port(item, params, info): wirespeed = savefloat(portinfo[0][4]) * 1000.0 # speed in Bytes/sec, 0 if unknown if wirespeed == 0: - # let user specify assumed speed via check parameter, default is 2.0 GByte/sec - gb = params.get("assumed_speed", 2.0) - wirespeed = gb * 1000.0 * 1000.0 * 1000.0 # in Bytes/sec - speedmsg = "assuming %g GB/s" % gb + # let user specify assumed speed via check parameter, default is 16.0 GBit/sec + gbit = params.get("assumed_speed", 16.0) + wirespeed = gb * 1000.0 * 1000.0 * 1000.0 / 8.0 # in Bytes/sec + speedmsg = "assuming %g GBit/s" % gbit else: - gb = wirespeed / ( 1000.0 * 1000.0 * 1000.0 ) # in GByte/sec - speedmsg = "%.1f GB/s" % gb + gbit = wirespeed * 8.0 / ( 1000.0 * 1000.0 * 1000.0 ) # in GBit/sec + speedmsg = "%.1f GBit/s" % gb output.append(speedmsg) # Now check rates of various counters @@ -297,6 +297,15 @@ def check_fc_port(item, params, info): return (summarystate, ', '.join(output), perfdata) +check_config_variables.append("fc_port_admstates") +check_config_variables.append("fc_port_opstates") +check_config_variables.append("fc_port_phystates") +check_config_variables.append("fc_port_no_inventory_types") +check_config_variables.append("fc_port_no_inventory_admstates") +check_config_variables.append("fc_port_no_inventory_opstates") +check_config_variables.append("fc_port_no_inventory_phystates") +check_config_variables.append("fc_port_inventory_use_portname") + check_info["fc_port"] = { 'check_function' : check_fc_port, 'inventory_function' : inventory_fc_port, diff --git a/web/plugins/perfometer/check_mk.py b/web/plugins/perfometer/check_mk.py index ce4958c..cf8ff84 100644 --- a/web/plugins/perfometer/check_mk.py +++ b/web/plugins/perfometer/check_mk.py @@ -457,7 +457,17 @@ perfometers["check_mk-hpux_if"] = perfometer_check_mk_if perfometers["check_mk-mcdata_fcport"] = perfometer_check_mk_if perfometers["check_mk-esx_vsphere_counters.if"] = perfometer_check_mk_if perfometers["check_mk-hitachi_hnas_fc_if"] = perfometer_check_mk_if -perfometers["check_mk-fc_port"] = perfometer_check_mk_if + +def perfometer_check_mk_fc_port(row, check_command, perf_data): + unit = "Byte/s" + return perfometer_bandwidth( + in_traffic = savefloat(perf_data[0][1]), + out_traffic = savefloat(perf_data[5][1]), + in_bw = savefloat(perf_data[0][6]), + out_bw = savefloat(perf_data[5][6]), + unit = unit + ) +perfometers["check_mk-fc_port"] = perfometer_check_mk_fc_port def perfometer_check_mk_brocade_fcport(row, check_command, perf_data): diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 7651d21..a07012f 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -5253,7 +5253,7 @@ register_check_parameters( title = _("Assumed link speed"), help = _("If the automatic detection of the link speed does " "not work you can set the link speed here."), - unit = _("GByte/s") + unit = _("GBit/s") ) ), ("rxcrcs",

10 years, 2 months

Check_MK Git: check_mk: FIX veeam_jobs: agent now supports output lines longer than 80 chars

by Goetz Golla

Module: check_mk Branch: master Commit: 450afce44272ac80ec9f82cf2cbfb89b7e59d42d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=450afce44272ac… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Fri Jul 4 14:54:42 2014 +0200 FIX veeam_jobs: agent now supports output lines longer than 80 chars --- .werks/626 | 8 ++++++++ ChangeLog | 1 + agents/windows/plugins/veeam_backup_status.ps1_ | 4 +++- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/626 b/.werks/626 new file mode 100644 index 0000000..a6a0f7f --- /dev/null +++ b/.werks/626 @@ -0,0 +1,8 @@ +Title: veeam_jobs: agent now supports output lines longer than 80 chars +Level: 1 +Component: checks +Version: 1.2.5i5 +Date: 1404478421 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index cafddd8..48cb0d8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -29,6 +29,7 @@ * 0948 FIX: mk_inventory.ps1: increased caching time to 14400, fixed incorrect default cachefile path * 0827 FIX: lnx_thermal: Not checking active trip points (e.g. cooling device triggers) anymore * 1043 FIX: printer_supply: fix value error in default parameters... + * 0626 FIX: veeam_jobs: agent now supports output lines longer than 80 chars Multisite: * 1013 Sort host names naturally, e.g. foobar11 comes after foobar2... diff --git a/agents/windows/plugins/veeam_backup_status.ps1_ b/agents/windows/plugins/veeam_backup_status.ps1_ index 0a4d754..9d73a79 100644 --- a/agents/windows/plugins/veeam_backup_status.ps1_ +++ b/agents/windows/plugins/veeam_backup_status.ps1_ @@ -115,7 +115,9 @@ foreach ($myJob in $myBackupJobs) } # Final output -"$myJobsText" + "$myTaskText" +write-host $myJobsText +write-host $myTaskText +# "$myJobsText" + "$myTaskText" # END OF TRY

10 years, 2 months

Check_MK Git: check_mk: ChangeLog

by Goetz Golla

Module: check_mk Branch: master Commit: eca370afbf09341553ef1106e60c5a15eb48416b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=eca370afbf0934… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Fri Jul 4 14:52:57 2014 +0200 ChangeLog --- ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 0b06b4f..cafddd8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -59,7 +59,7 @@ * 0988 FIX: livedump: Fix exception in case no contact groups are defined for a service HW/SW-Inventory: - * 0625 inventory now read the kernel version and architecture for linux and windows + * 0625 hw/sw inventory now reads the kernel version and architecture for linux and windows * 0167 FIX: mk_inventory.linux: Changed field separator from pipe to tab... * 1005 FIX: Fix exception when using pretty-print output format * 0946 FIX: hw/sw inventory: fixed display bug for byte fields with the value 0...

10 years, 2 months

Check_MK Git: check_mk: werk subject corrected

by Goetz Golla

Module: check_mk Branch: master Commit: 83bf1bcf0b242122ec9251b636853db4cdb19948 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=83bf1bcf0b2421… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Fri Jul 4 14:49:57 2014 +0200 werk subject corrected --- .werks/625 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/625 b/.werks/625 index 3e70ba1..429c3b1 100644 --- a/.werks/625 +++ b/.werks/625 @@ -1,4 +1,4 @@ -Title: inventory now read the kernel version and architecture for linux and windows +Title: hw/sw inventory now reads the kernel version and architecture for linux and windows Level: 1 Component: inv Version: 1.2.5i5

10 years, 2 months

Check_MK Git: check_mk: inventory now read the kernel version and architecture for linux and windows

by Goetz Golla

Module: check_mk Branch: master Commit: a061673df67d85d1031daf312cecc93b459aaa4f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a061673df67d85… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Fri Jul 4 12:42:24 2014 +0200 inventory now read the kernel version and architecture for linux and windows --- .werks/625 | 8 ++++++++ ChangeLog | 1 + agents/plugins/mk_inventory.linux | 14 +++++++++++--- inventory/lnx_uname | 9 ++++----- inventory/win_os | 2 +- web/plugins/views/inventory.py | 2 +- 6 files changed, 26 insertions(+), 10 deletions(-) diff --git a/.werks/625 b/.werks/625 new file mode 100644 index 0000000..3e70ba1 --- /dev/null +++ b/.werks/625 @@ -0,0 +1,8 @@ +Title: inventory now read the kernel version and architecture for linux and windows +Level: 1 +Component: inv +Version: 1.2.5i5 +Date: 1404470499 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 0d6e465..d447ed0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -52,6 +52,7 @@ * 0988 FIX: livedump: Fix exception in case no contact groups are defined for a service HW/SW-Inventory: + * 0625 inventory now read the kernel version and architecture for linux and windows * 0167 FIX: mk_inventory.linux: Changed field separator from pipe to tab... * 1005 FIX: Fix exception when using pretty-print output format * 0946 FIX: hw/sw inventory: fixed display bug for byte fields with the value 0... diff --git a/agents/plugins/mk_inventory.linux b/agents/plugins/mk_inventory.linux index 2f2ece1..75a1e8d 100755 --- a/agents/plugins/mk_inventory.linux +++ b/agents/plugins/mk_inventory.linux @@ -31,17 +31,25 @@ then echo -n "$f|" ; tr \\n \| < $f | sed 's/|$//' ; echo fi done - + # CPU Information. We need just the first one if [ -e /proc/cpuinfo ] ; then echo "<<<lnx_cpuinfo:sep(58):persist($UNTIL)>>>" - sed 's/[[:space:]]*:[[:space:]]*/:/' < /proc/cpuinfo | grep -v '^flags' + sed 's/[[:space:]]*:[[:space:]]*/:/' < /proc/cpuinfo fi - + # Information about main board, memory, etc. if type dmidecode >/dev/null ; then echo "<<<dmidecode:sep(58):persist($UNTIL)>>>" dmidecode -q | sed 's/\t/:/g' fi + + # Information about kernel architecture + if type uname >/dev/null ; then + echo "<<<lnx_uname:persist($UNTIL)>>>" + uname -m + uname -r + fi + fi diff --git a/inventory/lnx_uname b/inventory/lnx_uname index 314156a..73b8492 100644 --- a/inventory/lnx_uname +++ b/inventory/lnx_uname @@ -30,11 +30,10 @@ def inv_lnx_uname(info): node = inv_tree("software.os.") - line = info[0] - if len(line) >= 6: - node["kernel"] = line[1:6] - if len(line) >= 13: - node["arch"] = line[-2] + if len(info) >= 1: + node["arch"] = info[0][0] + if len(info) >= 2: + node["kernel_version"] = info[1][0] inv_info['lnx_uname'] = { "inv_function" : inv_lnx_uname, diff --git a/inventory/win_os b/inventory/win_os index 98f7eb6..37c4439 100644 --- a/inventory/win_os +++ b/inventory/win_os @@ -33,7 +33,7 @@ def inv_win_os(info): line = info[0] if len(line) == 6: node["name"] = line[1] - node["kernel"] = line[2] + node["kernel_version"] = line[2] if line[3] == "64-Bit": node["arch"] = "x86_64" else: diff --git a/web/plugins/views/inventory.py b/web/plugins/views/inventory.py index 9d51510..95027fa 100644 --- a/web/plugins/views/inventory.py +++ b/web/plugins/views/inventory.py @@ -577,7 +577,7 @@ inventory_displayhints.update({ ".software." : { "title" : _("Software"), "icon" : "software" }, ".software.os." : { "title" : _("Operating System") }, ".software.os.name" : { "title" : _("Name"), "short" : _("Operating System") }, - ".software.os.kernel" : { "title" : _("Kernel Version"), "short" : _("Kernel") }, + ".software.os.kernel_version" : { "title" : _("Kernel Version"), "short" : _("Kernel") }, ".software.os.arch" : { "title" : _("Kernel Architecture"), "short" : _("Architecture") }, ".software.os.service_pack" : { "title" : _("Service Pack"), "short" : _("Service Pack") }, ".software.packages:" : { "title" : _("Packages"), "icon" : "packages", "render": render_inv_dicttable,

10 years, 2 months

Check_MK Git: check_mk: FIX Mails sent with mail/ asciimail plugin now really set the from address

by Lars Michelsen

Module: check_mk Branch: master Commit: 4dc07ca6e436fe3ce4b34fa2a4cf01cd98098ff1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4dc07ca6e436fe… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jul 4 10:04:09 2014 +0200 FIX Mails sent with mail/asciimail plugin now really set the from address --- .werks/828 | 8 ++++++++ ChangeLog | 1 + notifications/asciimail | 9 ++++++--- notifications/mail | 9 ++++++--- 4 files changed, 21 insertions(+), 6 deletions(-) diff --git a/.werks/828 b/.werks/828 new file mode 100644 index 0000000..3d4f443 --- /dev/null +++ b/.werks/828 @@ -0,0 +1,8 @@ +Title: Mails sent with mail/asciimail plugin now really set the from address +Level: 1 +Component: notifications +Version: 1.2.5i5 +Date: 1404461025 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 9228911..26f3ed1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -47,6 +47,7 @@ Notifications: * 1042 Rule based notifications: allow matching on host groups... + * 0828 FIX: Mails sent with mail/asciimail plugin now really set the from address Reporting & Availability: * 0991 FIX: Availability: optionally show time stamps as UNIX epoch time... diff --git a/notifications/asciimail b/notifications/asciimail index 16a0526..80ac250 100755 --- a/notifications/asciimail +++ b/notifications/asciimail @@ -83,8 +83,11 @@ def build_mail(target, subject, from_address, reply_to, content_txt): return m -def send_mail(m, target): - p = subprocess.Popen(["/usr/sbin/sendmail", "-i", target ], stdin = subprocess.PIPE) +def send_mail(m, target, from_address): + cmd = ["/usr/sbin/sendmail", "-i", target ] + if from_address: + cmd += ['-f', from_address] + p = subprocess.Popen(cmd, stdin = subprocess.PIPE) p.communicate(m.as_string()) def construct_content(context): @@ -232,6 +235,6 @@ def main(): from_address = context.get("PARAMETER_FROM") reply_to = context.get("PARAMETER_REPLY_TO") m = build_mail(mailto, subject, from_address, reply_to, content_txt) - send_mail(m, mailto) + send_mail(m, mailto, from_address) main() diff --git a/notifications/mail b/notifications/mail index 2509d63..8663e4b 100755 --- a/notifications/mail +++ b/notifications/mail @@ -302,8 +302,11 @@ def multipart_mail(target, subject, from_address, reply_to, content_txt, content return m -def send_mail(m, target): - p = subprocess.Popen(["/usr/sbin/sendmail", "-i", target ], stdin = subprocess.PIPE) +def send_mail(m, target, from_address): + cmd = ["/usr/sbin/sendmail", "-i", target ] + if from_address: + cmd += ['-f', from_address] + p = subprocess.Popen(cmd, stdin = subprocess.PIPE) p.communicate(m.as_string()) return True @@ -592,6 +595,6 @@ def main(): from_address = context.get("PARAMETER_FROM") reply_to = context.get("PARAMETER_REPLY_TO") m = multipart_mail(mailto, subject, from_address, reply_to, content_txt, content_html, attachments) - send_mail(m, mailto) + send_mail(m, mailto, from_address) main()

10 years, 2 months

Check_MK Git: check_mk: Updated bug entries #2132

by Lars Michelsen

Module: check_mk Branch: master Commit: 7d81d4e10e775bb42c50d321ead720ce96d4e23b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7d81d4e10e775b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jul 4 09:32:25 2014 +0200 Updated bug entries #2132 --- .bugs/2132 | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.bugs/2132 b/.bugs/2132 new file mode 100644 index 0000000..407ab21 --- /dev/null +++ b/.bugs/2132 @@ -0,0 +1,11 @@ +Title: WATO context button on quicksearch result page broken +Component: multisite +State: open +Date: 2014-07-04 09:30:24 +Targetversion: 1.2.5i1 +Class: bug + +When searching for a host substring, for example "node", results in a page listing +all services of the hosts node1 and node2. When clicking on the context button +WATO, it displays a red error message that the host "node" (the substring) is not +managed by WATO.

10 years, 2 months

Check_MK Git: check_mk: HTML mail: substitute $SUJECT$ in hidden HTML title

by Mathias Kettner

Module: check_mk Branch: master Commit: fd8d258a6694274d7a4171ed9eb2aeaf1c7986e8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fd8d258a669427… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jul 4 09:11:30 2014 +0200 HTML mail: substitute $SUJECT$ in hidden HTML title --- notifications/mail | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/notifications/mail b/notifications/mail index fa30836..2509d63 100755 --- a/notifications/mail +++ b/notifications/mail @@ -500,7 +500,9 @@ def construct_content(context): '<tr class="even0"><td colspan=2 class=graphs>%s</td></tr>' % graph_code ) - content_html = tmpl_head_html + content_html + tmpl_foot_html + content_html = substitute_context(tmpl_head_html, context) + \ + content_html + \ + substitute_context(tmpl_foot_html, context) return content_txt, content_html, attachments

10 years, 2 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits July 2014