Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64653 discussions

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, 3 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, 3 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, 3 months

Check_MK Git: check_mk: windows agent: now also available as msi installer

by Andreas Boesl

Module: check_mk Branch: master Commit: ae877c5a469a4a25e205a95ddf15da6bd580049d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ae877c5a469a4a… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Jul 11 12:48:45 2014 +0200 windows agent: now also available as msi installer The new msi install check_mk_agent.msi packages contains the 32 and 64 bit version of the check_mk_agent.exe. Upon install the msi package will determine the os architecture and install the matching agent accordingly. The installed 32/64 Bit Agent is always named check_mk_agent.exe. Note: The msi installer always installs into the 32 bit program files folder. This is by design. --- .werks/1082 | 12 ++ ChangeLog | 1 + Makefile | 2 + agents/windows/Makefile | 6 +- agents/windows/check_mk_agent-64.exe | Bin 207360 -> 207360 bytes agents/windows/check_mk_agent-64.unversioned.exe | Bin 207360 -> 207360 bytes agents/windows/check_mk_agent.exe | Bin 176640 -> 176640 bytes agents/windows/check_mk_agent.unversioned.exe | Bin 176640 -> 176640 bytes agents/windows/install_agent-64.exe | Bin 159344 -> 159343 bytes agents/windows/install_agent.exe | Bin 156401 -> 156400 bytes agents/windows/msibuild/Makefile | 47 ++++++++ agents/windows/msibuild/msi_container.msi | Bin 0 -> 612864 bytes agents/windows/msibuild/msibuild | 1 + agents/windows/msibuild/msiinfo | 1 + agents/windows/msibuild/msitools-0.93.tar.xz | Bin 0 -> 613856 bytes .../windows/msibuild/patches/msibuild_argc_fix.dif | 11 ++ agents/windows/msibuild/update_msi_file.py | 118 ++++++++++++++++++++ 17 files changed, 197 insertions(+), 2 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=ae877c5a46…

10 years, 3 months

Check_MK Git: check_mk: Reserved 50 Werk IDS

by Andreas Boesl

Module: check_mk Branch: master Commit: 834b08dd5ed462d66b2f25ad7a1e63525a3b14a7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=834b08dd5ed462… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Jul 11 12:40:05 2014 +0200 Reserved 50 Werk IDS --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 6d5177e..4880c9f 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -1082 +1132

10 years, 3 months

Check_MK Git: check_mk: if: Fix header of PNP template, again

by Mathias Kettner

Module: check_mk Branch: master Commit: eca7c06f014154f72bd72df9ef4ae900a58bbb4f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=eca7c06f014154… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jul 11 10:31:43 2014 +0200 if: Fix header of PNP template, again --- pnp-templates/check_mk-if.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pnp-templates/check_mk-if.php b/pnp-templates/check_mk-if.php index 3f5280d..71a869d 100644 --- a/pnp-templates/check_mk-if.php +++ b/pnp-templates/check_mk-if.php @@ -90,10 +90,10 @@ $range = min(10, $bandwidth); $bandwidthInfo = ""; if ($bandwidth > 0){ - $bandwidthInfo = " at " . sprintf("%.1f", $bandwidth) . "${bwuom}${unit}/s $range"; + $bandwidthInfo = " at " . sprintf("%.1f", $bandwidth) . " ${bwuom}${unit}/s"; } $ds_name[1] = 'Used bandwidth'; -$opt[1] = "--vertical-label \"$vertical_label_name\" -l -$range -u $range -X0 -b 1024 --title \"Used bandwidth $hostname / $servicedesc $bandwidthInfo\" "; +$opt[1] = "--vertical-label \"$vertical_label_name\" -l -$range -u $range -X0 -b 1024 --title \"Used bandwidth $hostname / $servicedesc$bandwidthInfo\" "; $def[1] = "HRULE:0#c0c0c0 "; if ($bandwidth)

10 years, 3 months

Check_MK Git: check_mk: if: Fix header of PNP template

by Mathias Kettner

Module: check_mk Branch: master Commit: 28b89e726696847ebd6aeb0ce54a6609878099fd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=28b89e72669684… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jul 11 10:30:02 2014 +0200 if: Fix header of PNP template --- pnp-templates/check_mk-if.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pnp-templates/check_mk-if.php b/pnp-templates/check_mk-if.php index bbf4043..3f5280d 100644 --- a/pnp-templates/check_mk-if.php +++ b/pnp-templates/check_mk-if.php @@ -90,7 +90,7 @@ $range = min(10, $bandwidth); $bandwidthInfo = ""; if ($bandwidth > 0){ - $bandwidthInfo = " at $bandwidth ${bwuom}${unit}/s $range"; + $bandwidthInfo = " at " . sprintf("%.1f", $bandwidth) . "${bwuom}${unit}/s $range"; } $ds_name[1] = 'Used bandwidth'; $opt[1] = "--vertical-label \"$vertical_label_name\" -l -$range -u $range -X0 -b 1024 --title \"Used bandwidth $hostname / $servicedesc $bandwidthInfo\" ";

10 years, 3 months

Check_MK Git: check_mk: FIX if, if64: Fixed PNP template in order to correctly scale Y axis

by Mathias Kettner

Module: check_mk Branch: master Commit: 91622e3f87bc11ba66cd584b5096c3eccd5d8ec0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=91622e3f87bc11… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jul 11 10:24:14 2014 +0200 FIX if, if64: Fixed PNP template in order to correctly scale Y axis --- .werks/1075 | 8 ++++ ChangeLog | 1 + pnp-templates/check_mk-if.php | 95 +++++++++++++++++++++-------------------- 3 files changed, 58 insertions(+), 46 deletions(-) diff --git a/.werks/1075 b/.werks/1075 new file mode 100644 index 0000000..eb0af23 --- /dev/null +++ b/.werks/1075 @@ -0,0 +1,8 @@ +Title: if, if64: Fixed PNP template in order to correctly scale Y axis +Level: 1 +Component: checks +Version: 1.2.5i5 +Date: 1405067034 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 19ba4a8..aa60a23 100644 --- a/ChangeLog +++ b/ChangeLog @@ -41,6 +41,7 @@ * 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... * 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 Multisite: * 1013 Sort host names naturally, e.g. foobar11 comes after foobar2... diff --git a/pnp-templates/check_mk-if.php b/pnp-templates/check_mk-if.php index c48245a..bbf4043 100644 --- a/pnp-templates/check_mk-if.php +++ b/pnp-templates/check_mk-if.php @@ -40,74 +40,77 @@ setlocale(LC_ALL, 'C'); # Graph 1: used bandwidth -# Determine if Bit or Byte. -# Change multiplier and labels -$unit = "B"; -$unit_multiplier = 1; -$vertical_label_name = "MByte/sec"; -if (strcmp($MIN[11], "0.0") == 0) { +# Determine if Bit or Byte. Bit is signalled via a min value of 0.0 +# in the 11th performance value. +if (!strcmp($MIN[11], "0.0")) { $unit = "Bit"; $unit_multiplier = 8; - $vertical_label_name = "MBit/sec"; + $base = 1000; // Megabit is 1000 * 1000 } +else { + $unit = "B"; + $unit_multiplier = 1; + $base = 1024; // Megabyte is 1024 * 1024 +} + +# Convert bytes to bits if neccessary $bandwidth = $MAX[1] * $unit_multiplier; $warn = $WARN[1] * $unit_multiplier; $crit = $CRIT[1] * $unit_multiplier; -# Horizontal lines -$mega = 1024.0 * 1024.0; -$mBandwidthH = $bandwidth / $mega; -$mWarnH = $warn / $mega; -$mCritH = $crit / $mega; - -# Break down bandwidth, warn and crit +# Now choose a conveniant scale, based on the known bandwith of +# the interface, and break down bandwidth, warn and crit by that +# scale. $bwuom = ' '; -$base = 1000; -if($bandwidth > $base * $base * $base) { - $warn /= $base * $base * $base; - $crit /= $base * $base * $base; - $bandwidth /= $base * $base * $base; - $bwuom = 'G'; -} elseif ($bandwidth > $base * $base) { - $warn /= $base * $base; - $crit /= $base * $base; - $bandwidth /= $base * $base; - $bwuom = 'M'; -} elseif ($bandwidth > $base) { - $warn /= $base; - $crit /= $base; - $bandwidth /= $base; - $bwuom = 'k'; +if ($bandwidth > $base * $base * $base) { + $scale = $base * $base * $base; + $bwuom = 'G'; +} +elseif ($bandwidth > $base * $base) { + $scale = $base * $base; + $bwuom = 'M'; +} +elseif ($bandwidth > $base) { + $scale = $base; + $bwuom = 'k'; +} +else { + $scale = 1; + $bwuom = ' '; } -if ($mBandwidthH < 10) - $range = $mBandwidthH; -else - $range = 10.0; +$warn /= $scale; +$crit /= $scale; +$bandwidth /= $scale; + +$vertical_label_name = $bwuom . $unit . "/sec"; + +$range = min(10, $bandwidth); + $bandwidthInfo = ""; if ($bandwidth > 0){ - $bandwidthInfo = " at bandwidth ${bwuom}${unit}/s"; + $bandwidthInfo = " at $bandwidth ${bwuom}${unit}/s $range"; } $ds_name[1] = 'Used bandwidth'; $opt[1] = "--vertical-label \"$vertical_label_name\" -l -$range -u $range -X0 -b 1024 --title \"Used bandwidth $hostname / $servicedesc $bandwidthInfo\" "; $def[1] = "HRULE:0#c0c0c0 "; - if ($mBandwidthH) - $def[1] .= "HRULE:$mBandwidthH#808080:\"Port speed\: " . sprintf("%.1f", $bandwidth) . " ".$bwuom."$unit/s\\n\" ". - "HRULE:-$mBandwidthH#808080: "; - if ($warn) - $def[1] .= "HRULE:$mWarnH#ffff00:\"Warning\: " . sprintf("%6.1f", $warn) . " ".$bwuom."$unit/s\\n\" ". - "HRULE:-$mWarnH#ffff00: "; - if ($crit) - $def[1] .= "HRULE:$mCritH#ff0000:\"Critical\: " . sprintf("%6.1f", $crit) . " ".$bwuom."$unit/s\\n\" ". - "HRULE:-$mCritH#ff0000: "; +if ($bandwidth) + $def[1] .= "HRULE:$bandwidth#808080:\"Port speed\: " . sprintf("%10.1f", $bandwidth) . " ".$bwuom."$unit/s\\n\" ". + "HRULE:-$bandwidth#808080: "; +if ($warn) + $def[1] .= "HRULE:$warn#ffff00:\"Warning\: " . sprintf("%13.1f", $warn) . " ".$bwuom."$unit/s\\n\" ". + "HRULE:-$warn#ffff00: "; +if ($crit) + $def[1] .= "HRULE:$crit#ff0000:\"Critical\: " . sprintf("%13.1f", $crit) . " ".$bwuom."$unit/s\\n\" ". + "HRULE:-$crit#ff0000: "; $def[1] .= "". # incoming "DEF:inbytes=$RRDFILE[1]:$DS[1]:MAX ". "CDEF:intraffic=inbytes,$unit_multiplier,* ". - "CDEF:inmb=intraffic,1048576,/ ". + "CDEF:inmb=intraffic,$scale,/ ". "AREA:inmb#00e060:\"in \" ". "GPRINT:intraffic:LAST:\"%7.1lf %s$unit/s last\" ". "GPRINT:intraffic:AVERAGE:\"%7.1lf %s$unit/s avg\" ". @@ -121,7 +124,7 @@ $def[1] = "DEF:outbytes=$RRDFILE[6]:$DS[6]:MAX ". "CDEF:outtraffic=outbytes,$unit_multiplier,* ". "CDEF:minusouttraffic=outtraffic,-1,* ". - "CDEF:outmb=outtraffic,1048576,/ ". + "CDEF:outmb=outtraffic,$scale,/ ". "CDEF:minusoutmb=0,outmb,- ". "AREA:minusoutmb#0080e0:\"out \" ". "GPRINT:outtraffic:LAST:\"%7.1lf %s$unit/s last\" ".

10 years, 3 months

Check_MK Git: check_mk: treasures: added tools for creating an initial windows msi installer package

by Andreas Boesl

Module: check_mk Branch: master Commit: 1093f573013f134b14bc6d0de4713e9feb4a1484 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1093f573013f13… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Jul 11 10:13:37 2014 +0200 treasures: added tools for creating an initial windows msi installer package --- doc/treasures/windows_msi/README | 35 + doc/treasures/windows_msi/build_msi.bat | 5 + doc/treasures/windows_msi/check_mk_agent.wixobj | 1 + doc/treasures/windows_msi/check_mk_agent.wixpdb | Bin 0 -> 350958 bytes doc/treasures/windows_msi/check_mk_agent.wxs | 137 ++++ doc/treasures/windows_msi/cmk_InstallDirDlg.wixobj | 1 + doc/treasures/windows_msi/cmk_InstallDirDlg.wxs | 33 + .../windows_msi/cmk_WixUI_InstallDir.wixobj | 1 + doc/treasures/windows_msi/cmk_WixUI_InstallDir.wxs | 86 ++ doc/treasures/windows_msi/sources/GPL-V2.rtf | 342 ++++++++ .../windows_msi/sources/check_mk.example.ini | 92 +++ .../windows_msi/sources/check_mk_agent-64.exe | Bin 0 -> 204800 bytes .../windows_msi/sources/check_mk_agent.exe | Bin 0 -> 175104 bytes doc/treasures/windows_msi/sources/gpl_v2.rtf | 848 ++++++++++++++++++++ 14 files changed, 1581 insertions(+) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=1093f57301…

10 years, 3 months

Check_MK Git: check_mk: win_exefiles: removed debug output

by Mathias Kettner

Module: check_mk Branch: master Commit: f8c18005b1c6c30bc466cbe3a9f5231498399d83 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f8c18005b1c6c3… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jul 10 16:44:22 2014 +0200 win_exefiles: removed debug output --- inventory/win_exefiles | 1 - 1 file changed, 1 deletion(-) diff --git a/inventory/win_exefiles b/inventory/win_exefiles index 508576f..a04d61c 100644 --- a/inventory/win_exefiles +++ b/inventory/win_exefiles @@ -42,7 +42,6 @@ def inv_win_exefiles(info): "install_date" : write_time, "size" : int(size), } - print entry paclist.append(entry)

10 years, 3 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits