Checkmk git commits July 2014

checkmk-commits@lists.checkmk.com

7 participants
221 discussions

Check_MK Git: check_mk: Minor formating: Fixed styling of WATO hosts table when checkboxes are enabled

by Lars Michelsen

Module: check_mk Branch: master Commit: db5b4bfb78f04e5f6b6ffcc05d083fb8b1066e94 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=db5b4bfb78f04e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jul 15 08:55:37 2014 +0200 Minor formating: Fixed styling of WATO hosts table when checkboxes are enabled --- web/htdocs/wato.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 84854b5..6abf023 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -1386,6 +1386,8 @@ def show_hosts(folder): colspan += 1 if config.may("wato.edit_hosts") and config.may("wato.move_hosts"): colspan += 1 + if show_checkboxes: + colspan += 1 # Add the bulk action buttons also to the top of the table when this # list shows more than 10 rows

10 years, 2 months

Check_MK Git: check_mk: mail notifications: Now really fixed the mail sender

by Lars Michelsen

Module: check_mk Branch: master Commit: cddadff15a048141e930f563443763f228fedc9c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cddadff15a0481… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jul 15 08:43:01 2014 +0200 mail notifications: Now really fixed the mail sender --- notifications/asciimail | 3 ++- notifications/mail | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/notifications/asciimail b/notifications/asciimail index 80ac250..c8cb112 100755 --- a/notifications/asciimail +++ b/notifications/asciimail @@ -84,9 +84,10 @@ def build_mail(target, subject, from_address, reply_to, content_txt): return m def send_mail(m, target, from_address): - cmd = ["/usr/sbin/sendmail", "-i", target ] + cmd = ["/usr/sbin/sendmail"] if from_address: cmd += ['-f', from_address] + cmd += [ "-i", target] p = subprocess.Popen(cmd, stdin = subprocess.PIPE) p.communicate(m.as_string()) diff --git a/notifications/mail b/notifications/mail index 8663e4b..ee136cf 100755 --- a/notifications/mail +++ b/notifications/mail @@ -303,9 +303,10 @@ def multipart_mail(target, subject, from_address, reply_to, content_txt, content return m def send_mail(m, target, from_address): - cmd = ["/usr/sbin/sendmail", "-i", target ] + cmd = ["/usr/sbin/sendmail"] if from_address: cmd += ['-f', from_address] + cmd += [ "-i", target] p = subprocess.Popen(cmd, stdin = subprocess.PIPE) p.communicate(m.as_string()) return True

10 years, 2 months

Check_MK Git: check_mk: FIX mysql_slave: Fixed detecting CRIT states when IO/SQL slaves are not running

by Lars Michelsen

Module: check_mk Branch: master Commit: 1eb297ba3be6dd4422c3486db4305d0e883899ba URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1eb297ba3be6dd… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 14 11:07:14 2014 +0200 FIX mysql_slave: Fixed detecting CRIT states when IO/SQL slaves are not running --- .werks/1055 | 8 ++++++++ ChangeLog | 1 + checks/mysql_slave | 4 +++- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/1055 b/.werks/1055 new file mode 100644 index 0000000..4a41a3e --- /dev/null +++ b/.werks/1055 @@ -0,0 +1,8 @@ +Title: mysql_slave: Fixed detecting CRIT states when IO/SQL slaves are not running +Level: 1 +Component: checks +Version: 1.2.5i5 +Date: 1405328815 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 37de5fc..e7dc726 100644 --- a/ChangeLog +++ b/ChangeLog @@ -46,6 +46,7 @@ * 1075 FIX: if, if64: Fixed PNP template in order to correctly scale Y axis * 0631 FIX: fc_port: several fixes for the perfometer to display the right values... * 0632 FIX: brocade_fcport: fix perfometer output of out bandwidth when averaging is switched on + * 1055 FIX: mysql_slave: Fixed detecting CRIT states when IO/SQL slaves are not running Multisite: * 1013 Sort host names naturally, e.g. foobar11 comes after foobar2... diff --git a/checks/mysql_slave b/checks/mysql_slave index 657cfa2..33cc4d4 100644 --- a/checks/mysql_slave +++ b/checks/mysql_slave @@ -59,6 +59,7 @@ def check_mysql_slave(_unused, params, info): output.append('Slave-IO: running') else: output.append('Slave-IO: not running(!!)') + state = 2 if data['Slave_SQL_Running']: output.append('Slave-SQL: running') @@ -70,12 +71,13 @@ def check_mysql_slave(_unused, params, info): state = 2 out += '(!!)' elif warn != None and data['Seconds_Behind_Master'] > warn: - state = 1 + state = max(state, 1) out += '(!)' output.append(out) perfdata.append(('seconds_behind_master', data['Seconds_Behind_Master'], warn, crit)) else: output.append('Slave-SQL: not running(!!)') + state = 2 return state, ', '.join(output), perfdata

10 years, 2 months

Check_MK Git: check_mk: FIX diskstat: fixed performance data of old legacy disk IO read/write data

by Goetz Golla

Module: check_mk Branch: master Commit: ab2b8c9363d15bf525a1ae0a3e18f5704be02fd6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ab2b8c9363d15b… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Fri Jul 11 15:56:32 2014 +0200 FIX diskstat: fixed performance data of old legacy disk IO read/write data When diskstat is configured to have seperate checks for read and write IO, counter values instead of rates were taken as performance data. This is fixed now. --- .werks/633 | 10 ++++++++++ ChangeLog | 1 + checks/diskstat.include | 3 ++- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.werks/633 b/.werks/633 new file mode 100644 index 0000000..4430053 --- /dev/null +++ b/.werks/633 @@ -0,0 +1,10 @@ +Title: diskstat: fixed performance data of old legacy disk IO read/write data +Level: 1 +Component: core +Version: 1.2.5i5 +Date: 1405086851 +Class: fix + +When diskstat is configured to have seperate checks for read and write IO, +counter values instead of rates were taken as performance data. This +is fixed now. diff --git a/ChangeLog b/ChangeLog index 4b4f3d8..37de5fc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,7 @@ * 0174 FIX: Fixed appending of --keepalive-fd parameters to checkhelpers... * 1053 FIX: Fixed events check always being reporting OK state... * 1045 FIX: Gracefully restart check_mk helpers in case of memory leak... + * 0633 FIX: diskstat: fixed performance data of old legacy disk IO read/write data... Checks & Agents: * 0168 f5_bigip_pool: Added Wato configuration... diff --git a/checks/diskstat.include b/checks/diskstat.include index 0afe294..08b909e 100644 --- a/checks/diskstat.include +++ b/checks/diskstat.include @@ -238,5 +238,6 @@ def check_diskstat_old(item, params, this_time, info): timedif, per_sec = get_counter("diskstat." + item, this_time, this_val) mb_per_s = per_sec / 2048.0 # Diskstat output is in sectors a 512 Byte - perfdata = [ (item, "%dc" % this_val ) ] + kb_per_s = per_sec / 2.0 + perfdata = [ (item, "%f" % kb_per_s ) ] return (0, "%.1fMB/s (in last %d secs)" % (mb_per_s, timedif), perfdata)

10 years, 2 months

Check_MK Git: check_mk: minor fix in inventory function for cases when no data was found

by Goetz Golla

Module: check_mk Branch: master Commit: acd9d79de5c252225dc361004853098e1456b5dc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=acd9d79de5c252… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Fri Jul 11 14:30:56 2014 +0200 minor fix in inventory function for cases when no data was found --- checks/netapp_cluster | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/checks/netapp_cluster b/checks/netapp_cluster index 58fe351..66f5a52 100644 --- a/checks/netapp_cluster +++ b/checks/netapp_cluster @@ -46,15 +46,14 @@ def inventory_netapp_cluster(info): - inventory = [] - - # only inventorizes clusters that dont have takeover disabled. - cfSettings, cfState, cfCannotTakeoverCause, cfPartnerStatus, cfPartnerName, cfInterconnectStatus = info[0] - if int(cfSettings) not in [1, 3]: - # Include the cluster partner name in inventory (value added data) - inventory.append ((cfPartnerName, None)) - return inventory + if info: + cfSettings, cfState, cfCannotTakeoverCause, cfPartnerStatus, cfPartnerName, cfInterconnectStatus = info[0] + # only inventorizes clusters that dont have takeover disabled. + if int(cfSettings) not in [1, 3]: + # Include the cluster partner name in inventory (value added data) + inventory.append ((cfPartnerName, None)) + return inventory def check_netapp_cluster(item, _no_params, info):

10 years, 2 months

Check_MK Git: check_mk: FIX brocade_fcport: fix perfometer output of out bandwidth when averaging is switched on

by Goetz Golla

Module: check_mk Branch: master Commit: 0a28118444d5a79e8fa52ea585c47ad9f8d00b31 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0a28118444d5a7… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Fri Jul 11 13:54:36 2014 +0200 FIX brocade_fcport: fix perfometer output of out bandwidth when averaging is switched on --- .werks/632 | 8 ++++++++ ChangeLog | 4 ++-- checks/brocade_fcport | 6 +++++- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/.werks/632 b/.werks/632 new file mode 100644 index 0000000..03ce64e --- /dev/null +++ b/.werks/632 @@ -0,0 +1,8 @@ +Title: brocade_fcport: fix perfometer output of out bandwidth when averaging is switched on +Level: 1 +Component: checks +Version: 1.2.5i5 +Date: 1405079618 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 6efc856..4b4f3d8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -41,10 +41,10 @@ * 1072 FIX: printer_supply: fix colors of Perf-O-Meter on HP OfficeJet... * 0950 FIX: check_mkevents: now able to resolve the hostname of the remote hosts... * 0177 FIX: esx_vsphere_hostsystem.multipath: Fixed return state in case of paths in standby... - * 0631 FIX: fc_port: several fixes for the perfometer to display the right values... * 1054 FIX: mysql_slave: Only monitor the age of the slave when it is running * 1075 FIX: if, if64: Fixed PNP template in order to correctly scale Y axis ->>>>>>> bcba05372bed424e874f785cfd1c9c3be896a516 + * 0631 FIX: fc_port: several fixes for the perfometer to display the right values... + * 0632 FIX: brocade_fcport: fix perfometer output of out bandwidth when averaging is switched on Multisite: * 1013 Sort host names naturally, e.g. foobar11 comes after foobar2... diff --git a/checks/brocade_fcport b/checks/brocade_fcport index 55178cd..b8e9d04 100644 --- a/checks/brocade_fcport +++ b/checks/brocade_fcport @@ -109,6 +109,7 @@ def check_brocade_fcport(item, params, info): summarystate = 0 output = [] perfdata = [] + perfaverages = [] # Lookup port speed in ISL table for ISL ports (older switches do not provide this # information in the normal table) @@ -166,7 +167,7 @@ def check_brocade_fcport(item, params, info): if average: timedif, value = get_average("brocade_fcport.%s.%s.avg" % (what, item), this_time, value, average) output.append("Avg(%dmin): %s/s" % (average, get_bytes_human_readable(value))) - perfdata.append( ("%s_avg" % what.lower(), value, warn_bytes, crit_bytes, 0, wirespeed)) + perfaverages.append( ("%s_avg" % what.lower(), value, warn_bytes, crit_bytes, 0, wirespeed)) # handle levels for in/out if crit_bytes != None and value >= crit_bytes: @@ -176,6 +177,9 @@ def check_brocade_fcport(item, params, info): summarystate = max(1, summarystate) output.append(" >= %s/s(!!)" % (get_bytes_human_readable(warn_bytes))) + # put perfdata of averages after perfdata for in and out in order not to confuse the perfometer + perfdata.extend(perfaverages) + # R X F R A M E S & T X F R A M E S # Put number of frames into performance data (honor averaging) timedif, rxframes_rate = get_counter("brocade_fcport.rxframes.%s" % index, this_time, rxframes)

10 years, 2 months

Check_MK Git: check_mk: Disabled build of windows msi agent

by Andreas Boesl

Module: check_mk Branch: master Commit: c23c1f5cd1f8a28077f877dab5f0b925ee24a7ce URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c23c1f5cd1f8a2… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Jul 11 13:44:57 2014 +0200 Disabled build of windows msi agent --- Makefile | 1 - agents/windows/Makefile | 3 ++- agents/windows/install_agent-64.exe | Bin 159343 -> 159342 bytes agents/windows/msibuild/Makefile | 4 ++++ 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index bc280b2..87b5435 100644 --- a/Makefile +++ b/Makefile @@ -179,7 +179,6 @@ setversion: echo 'check-mk_$(NEW_VERSION)-1_all.deb net optional' > debian/files ; \ cd agents/windows ; rm check_mk_agent.exe check_mk_agent-64.exe ; make ; cd ../.. ; \ cp agents/windows/install_agent.exe check-mk-agent-$(NEW_VERSION).exe - cp agents/windows/check_mk_agent.msi check-mk-agent-$(NEW_VERSION).msi headers: doc/helpers/headrify diff --git a/agents/windows/Makefile b/agents/windows/Makefile index 7d8ad84..b51a8c7 100755 --- a/agents/windows/Makefile +++ b/agents/windows/Makefile @@ -36,7 +36,7 @@ else CXX = mingw32-g++ endif -all: install_agent.exe install_agent-64.exe msi_installer +all: install_agent.exe install_agent-64.exe .PHONY: inc_build_version @@ -115,6 +115,7 @@ nowin.exe: nowin.cc clean: rm -f *.o *~ svn-*.tmp *.rc *.res + cd msibuild ; make clean mrproper: clean rm -f *.exe diff --git a/agents/windows/install_agent-64.exe b/agents/windows/install_agent-64.exe index e92a003..b4fa522 100755 Binary files a/agents/windows/install_agent-64.exe and b/agents/windows/install_agent-64.exe differ diff --git a/agents/windows/msibuild/Makefile b/agents/windows/msibuild/Makefile index 04ca65c..4322a1a 100755 --- a/agents/windows/msibuild/Makefile +++ b/agents/windows/msibuild/Makefile @@ -30,6 +30,10 @@ CHECK_MK_VERSION = TESTVERSION all: exchange_msi_files +clean: + rm -rf $(MSITOOLS) + rm check_mk_agent.msi + rm -rf work sources msibuild: tar -Jxf $(MSITOOLS_FILE) set -e ; for p in patches/*.dif ; do \

10 years, 2 months

Check_MK Git: check_mk: Git bug

by Goetz Golla

Module: check_mk Branch: master Commit: 9b51b0f780287f4927bcf20ea8c5f5c1d57c6a4e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9b51b0f780287f… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Fri Jul 11 13:41:43 2014 +0200 Git bug --- .bugs/1004 | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.bugs/1004 b/.bugs/1004 new file mode 100644 index 0000000..d0fd33c --- /dev/null +++ b/.bugs/1004 @@ -0,0 +1,8 @@ +Title: Changes in WATO Quickaccess werden durch Icons überdeckt +Component: multisite +State: open +Date: 2014-07-11 13:00:39 +Targetversion: future +Class: bug + +Changes in WATO Quickaccess werden durch Icons überdeckt

10 years, 2 months

Check_MK Git: check_mk: FIX fc_port: several fixes for the perfometer to display the right values

by Goetz Golla

Module: check_mk Branch: master Commit: 318c8416ee9f9b932fc9e7bc15897d2b11518247 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=318c8416ee9f9b… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Fri Jul 11 13:36:02 2014 +0200 FIX fc_port: several fixes for the perfometer to display the right values The perfometer for this check did not display the out traffic, did not use the maximum bandwith to display throuput in percent, and did not work when averaging was switched on. These problems have been fixed in this werk. --- .werks/631 | 10 ++++++++++ ChangeLog | 1 + checks/fc_port | 8 ++++++-- web/plugins/perfometer/check_mk.py | 6 +++--- 4 files changed, 20 insertions(+), 5 deletions(-) diff --git a/.werks/631 b/.werks/631 new file mode 100644 index 0000000..b352f48 --- /dev/null +++ b/.werks/631 @@ -0,0 +1,10 @@ +Title: fc_port: several fixes for the perfometer to display the right values +Level: 1 +Component: checks +Version: 1.2.5i5 +Date: 1405078401 +Class: fix + +The perfometer for this check did not display the out traffic, did not use the +maximum bandwith to display throuput in percent, and did not work when +averaging was switched on. These problems have been fixed in this werk. diff --git a/ChangeLog b/ChangeLog index 10c6a99..82a6979 100644 --- a/ChangeLog +++ b/ChangeLog @@ -38,6 +38,7 @@ * 1072 FIX: printer_supply: fix colors of Perf-O-Meter on HP OfficeJet... * 0950 FIX: check_mkevents: now able to resolve the hostname of the remote hosts... * 0177 FIX: esx_vsphere_hostsystem.multipath: Fixed return state in case of paths in standby... + * 0631 FIX: fc_port: several fixes for the perfometer to display the right values... Multisite: * 1013 Sort host names naturally, e.g. foobar11 comes after foobar2... diff --git a/checks/fc_port b/checks/fc_port index beda840..a251ee8 100644 --- a/checks/fc_port +++ b/checks/fc_port @@ -141,6 +141,7 @@ def check_fc_port(item, params, info): summarystate = 0 output = [] perfdata = [] + perfaverages = [] wirespeed = savefloat(portinfo[0][4]) * 1000.0 # speed in Bytes/sec, 0 if unknown if wirespeed == 0: @@ -187,7 +188,7 @@ def check_fc_port(item, params, info): if average: timedif, value = get_average("fc_port.%s.%s.avg" % (what, item), this_time, value, average) output.append("Avg(%dmin): %s/s" % (average, get_bytes_human_readable(value))) - perfdata.append( ("%s_avg" % what.lower(), value, warn_bytes, crit_bytes, 0, wirespeed)) + perfaverages.append( ("%s_avg" % what.lower(), value, warn_bytes, crit_bytes, 0, wirespeed)) # handle levels for in/out if crit_bytes != None and value >= crit_bytes: @@ -197,6 +198,9 @@ def check_fc_port(item, params, info): summarystate = max(1, summarystate) output.append(" >= %s/s(!!)" % (get_bytes_human_readable(warn_bytes))) + # put perfdata of averages after perfdata for in and out in order not to confuse the perfometer + perfdata.extend(perfaverages) + # R X O B J E C T S & T X O B J E C T S # Put number of objects into performance data (honor averaging) timedif, rxobjects_rate = get_counter("fc_port.rxobjects.%s" \ @@ -313,7 +317,7 @@ check_info["fc_port"] = { 'has_perfdata' : True, 'group' : 'fc_port', 'default_levels_variable': 'fc_port_default_levels', - 'snmp_scan_function' : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.1588.2.1.1"), + 'snmp_scan_function' : lambda oid: oid(".1.3.6.1.2.1.1.1.0") == "Fibre Channel Switch.", 'snmp_info' : ( ".1.3.6.1.3.94", [ "1.10.1.2", # connUnitPortIndex # 0 "1.10.1.3", # connUnitPortType # 1 diff --git a/web/plugins/perfometer/check_mk.py b/web/plugins/perfometer/check_mk.py index d2e85c5..beaecce 100644 --- a/web/plugins/perfometer/check_mk.py +++ b/web/plugins/perfometer/check_mk.py @@ -459,12 +459,12 @@ 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 = "B" + unit = "B" return perfometer_bandwidth( in_traffic = savefloat(perf_data[0][1]), - out_traffic = savefloat(perf_data[5][1]), + out_traffic = savefloat(perf_data[1][1]), in_bw = savefloat(perf_data[0][6]), - out_bw = savefloat(perf_data[5][6]), + out_bw = savefloat(perf_data[1][6]), unit = unit ) perfometers["check_mk-fc_port"] = perfometer_check_mk_fc_port

10 years, 2 months

Check_MK Git: check_mk: Multisite: plugin loading does not catch all AttributeError exceptions anymore

by Lars Michelsen

Module: check_mk Branch: master Commit: 1a8daeadc3f34738cdb2064bba924b1e51614f39 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1a8daeadc3f347… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jul 10 20:19:16 2014 +0200 Multisite: plugin loading does not catch all AttributeError exceptions anymore --- web/htdocs/index.py | 5 ++--- web/htdocs/notify.py | 3 --- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/web/htdocs/index.py b/web/htdocs/index.py index 3c97a02..19dc482 100644 --- a/web/htdocs/index.py +++ b/web/htdocs/index.py @@ -63,11 +63,10 @@ def load_all_plugins(): for module in [ hooks, userdb, views, sidebar, dashboard, wato, bi, mobile, notify ]: try: module.load_plugins # just check if this function exists - module.load_plugins() except AttributeError: pass - except Exception: - raise + else: + module.load_plugins() # Load reporting plugins (only available in subscription version) try: diff --git a/web/htdocs/notify.py b/web/htdocs/notify.py index 40d088f..276c3f9 100644 --- a/web/htdocs/notify.py +++ b/web/htdocs/notify.py @@ -71,9 +71,6 @@ def load_plugins(): if loaded_with_language == current_language: return - global g_message_path - g_message_path = config.user_confdir + '/messages.mk' - global notify_methods notify_methods = { 'gui_popup': {

10 years, 2 months

← Newer
1
...
10
11
12
13
14
15
16
...
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