Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64570 discussions

Check_MK Git: check_mk: Reserved 10 Werk IDS

by Andreas Boesl

Module: check_mk Branch: master Commit: 683d4b540f49010855022134fe8dd70c63d99539 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=683d4b540f4901… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Jan 14 11:57:28 2014 +0100 Reserved 10 Werk IDS --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 3749383..066ce60 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -555 +565

10 years, 8 months

Check_MK Git: check_mk: re-introduced first_free

by Andreas Boesl

Module: check_mk Branch: master Commit: 8ddc03c93f0cc1bf871f2c509cf177cc246cb689 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8ddc03c93f0cc1… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Jan 14 11:56:27 2014 +0100 re-introduced first_free --- .werks/first_free | 1 + 1 file changed, 1 insertion(+) diff --git a/.werks/first_free b/.werks/first_free new file mode 100644 index 0000000..3749383 --- /dev/null +++ b/.werks/first_free @@ -0,0 +1 @@ +555

10 years, 8 months

Check_MK Git: check_mk: Removed lots of trailing spaces

by Mathias Kettner

Module: check_mk Branch: master Commit: cf368ad461badb5ddb64ce2c7dcef1804e61e5ce URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cf368ad461badb… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jan 14 11:38:48 2014 +0100 Removed lots of trailing spaces --- checkman/cmciii.psm_current | 2 +- checkman/cmciii.psm_plugs | 2 +- checkman/hitachi_hnas_cifs | 2 +- checkman/hitachi_hnas_span | 4 +- checkman/job | 2 +- checks/cmciii | 2 +- checks/hitachi_hnas_span | 6 +- checks/mem | 2 +- pnp-templates/check-mk.php | 24 +-- pnp-templates/check_mk-apache_status.php | 214 ++++++++++---------- pnp-templates/check_mk-cisco_qos.php | 2 +- pnp-templates/check_mk-cpu.loads.php | 16 +- pnp-templates/check_mk-dell_powerconnect_cpu.php | 2 +- pnp-templates/check_mk-dell_powerconnect_temp.php | 2 +- pnp-templates/check_mk-df.php | 6 +- pnp-templates/check_mk-diskstat.php | 10 +- pnp-templates/check_mk-emcvnx_hba.php | 2 +- .../check_mk-esx_vsphere_hostsystem.cpu_usage.php | 4 +- .../check_mk-esx_vsphere_hostsystem.mem_usage.php | 2 +- pnp-templates/check_mk-h3c_lanswitch_cpu.php | 2 +- pnp-templates/check_mk-hitachi_hnas_span.php | 8 +- pnp-templates/check_mk-if.php | 8 +- pnp-templates/check_mk-ipmi_sensors.php | 4 +- pnp-templates/check_mk-job.php | 10 +- pnp-templates/check_mk-jolokia_metrics.mem.php | 2 +- pnp-templates/check_mk-jolokia_metrics.threads.php | 6 +- pnp-templates/check_mk-kernel.util.php | 28 +-- pnp-templates/check_mk-local.php | 10 +- pnp-templates/check_mk-mem.used.php | 48 ++--- pnp-templates/check_mk-mem.win.php | 24 +-- pnp-templates/check_mk-netapp_fcpio.php | 6 +- pnp-templates/check_mk-netctr.combined.php | 4 +- pnp-templates/check_mk-ntp.php | 14 +- pnp-templates/check_mk-ntp.time.php | 14 +- pnp-templates/check_mk-ps.perf.php | 4 +- pnp-templates/check_mk-systemtime.php | 12 +- pnp-templates/check_mk-veeam_client.php | 12 +- pnp-templates/check_mk-vms_df.php | 10 +- pnp-templates/check_mk_active-disk_smb.php | 6 +- pnp-templates/check_mk_active-http.php | 18 +- pnp-templates/check_mk_active-tcp.php | 12 +- web/htdocs/userdb.py | 2 +- web/plugins/wato/check_parameters.py | 2 +- 43 files changed, 286 insertions(+), 286 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=cf368ad461…

10 years, 8 months

Check_MK Git: check_mk: make healspaces also works in PNP-templates now

by Mathias Kettner

Module: check_mk Branch: master Commit: 9e5e4a9d9a70b3f34e419fbfe49f67925da4d5df URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9e5e4a9d9a70b3… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jan 14 11:38:42 2014 +0100 make healspaces also works in PNP-templates now --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 4ac633a..0ac77e1 100644 --- a/Makefile +++ b/Makefile @@ -228,7 +228,7 @@ mrproper: SOURCE_FILES = checkman/* modules/* checks/* notifications/* $$(find -name Makefile) \ livestatus/src/*{cc,c,h} web/htdocs/*.{py,css} web/htdocs/js/*.js web/plugins/*/*.py \ - doc/helpers/* scripts/setup.sh scripts/autodetect.py $(find -type f pnp-templates/*.php) \ + doc/helpers/* scripts/setup.sh scripts/autodetect.py $$(find pnp-templates -type f -name "*.php") \ mkeventd/bin/mkeventd mkeventd/web/htdocs/*.py mkeventd/web/plugins/*/*.py mkeventd/src/*.c \ mkeventd/checks/*

10 years, 8 months

Check_MK Git: check_mk: Reserved 100 Werk IDS

by Götz Golla

Module: check_mk Branch: master Commit: bb2836ac3e63b6772b45811b4289682943fee000 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bb2836ac3e63b6… Author: Götz Golla <gg(a)mathias-kettner.de> Date: Tue Jan 14 11:35:02 2014 +0100 Reserved 100 Werk IDS --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 4930863..3749383 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -455 +555

10 years, 8 months

Check_MK Git: check_mk: Fixed missing var in TimeRange valuespec

by Lars Michelsen

Module: check_mk Branch: master Commit: 32a487b795d08c385f963b0838b4f84a95a10598 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=32a487b795d08c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jan 14 11:08:58 2014 +0100 Fixed missing var in TimeRange valuespec --- web/htdocs/valuespec.py | 6 ++++++ web/plugins/views/availability.py | 8 +------- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index adc1758..4e90759 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -1769,6 +1769,12 @@ class TimeofdayRange(ValueSpec): raise MKUserError(varprefix + "_until", _("The <i>from</i> time must not be greater then the <i>until</i> time.")) ValueSpec.custom_validate(self, value, varprefix) +month_names = [ + _("January"), _("February"), _("March"), _("April"), + _("May"), _("June"), _("July"), _("August"), + _("September"), _("October"), _("November"), _("December") +] + class Timerange(CascadingDropdown): def __init__(self, **kwargs): self._title = _('Time range') diff --git a/web/plugins/views/availability.py b/web/plugins/views/availability.py index b0ca81c..8afd0d2 100644 --- a/web/plugins/views/availability.py +++ b/web/plugins/views/availability.py @@ -481,12 +481,6 @@ def render_availability_options(): return avoptions -month_names = [ - _("January"), _("February"), _("March"), _("April"), - _("May"), _("June"), _("July"), _("August"), - _("September"), _("October"), _("November"), _("December") -] - def get_availability_data(datasource, filterheaders, range, only_sites, limit, single_object, include_output, avoptions): has_service = "service" in datasource["infos"] av_filter = "Filter: time >= %d\nFilter: time <= %d\n" % range @@ -901,7 +895,7 @@ def find_next_choord(broken, scale): broken[1] = 1 broken[0] += 1 epoch = time.mktime(broken) - title = "%s %d" % (month_names[broken[1]-1], broken[0]) + title = "%s %d" % (valuespec.month_names[broken[1]-1], broken[0]) dst = broken[8] if old_dst == 1 and dst == 0:

10 years, 8 months

Check_MK Git: check_mk: mem.win: Allow time-averaging of values before applying levels

by Mathias Kettner

Module: check_mk Branch: master Commit: b71a121883f920eae77f3dab7a56dd6c4e391632 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b71a121883f920… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jan 14 10:49:39 2014 +0100 mem.win: Allow time-averaging of values before applying levels You now can set an averaging time horizon in minutes. If you do that the levels for memory and page file usage will be applied to their average over time. That make the check less reactive to small peaks in the memory usage. --- .werks/445 | 11 ++++++++ ChangeLog | 1 + checkman/mem.win | 4 +++ checks/mem | 35 +++++++++++++++++------- pnp-templates/check_mk-mem.win.php | 49 ++++++++++++++++++++++++---------- web/plugins/wato/check_parameters.py | 1 + 6 files changed, 78 insertions(+), 23 deletions(-) diff --git a/.werks/445 b/.werks/445 new file mode 100644 index 0000000..13ce0ab --- /dev/null +++ b/.werks/445 @@ -0,0 +1,11 @@ +Title: mem.win: Allow time-averaging of values before applying levels +Level: 1 +Component: checks +Version: 1.2.5i1 +Date: 1389692900 +Class: feature + +You now can set an averaging time horizon in minutes. If you do that +the levels for memory and page file usage will be applied to their +average over time. That make the check less reactive to small peaks +in the memory usage. diff --git a/ChangeLog b/ChangeLog index 66ec11d..537241b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -40,6 +40,7 @@ * 0079 f5_bigip_conns: new check to monitor number of current connections * 0324 hitachi_hnas_cifs: new check for the number of users using a CIFS share * 0455 hitachi_hnas_span: new check for Spans (Storage Pools) in Hitachi HNAS storage systems + * 0445 mem.win: Allow time-averaging of values before applying levels... * 0103 FIX: services: Fixed bug with service inventory defined in main.mk... * 0299 FIX: borcade_mlx_fan: Prettified output, handling "other" state now * 0300 FIX: cisco_fru_power: Trying not to inventorize not plugged in FRUs... diff --git a/checkman/mem.win b/checkman/mem.win index d9fc6a4..296e52c 100644 --- a/checkman/mem.win +++ b/checkman/mem.win @@ -21,6 +21,7 @@ examples: memory_win_default_levels = { "memory" : (80.0, 90.0), # alert at 80%/90% usage "pagefile" : (2048, 1024), # alert, if less then 2/1 GB free + "average" : 60, # apply levels on 60-min average } # Disable memory levels for all hosts with the tag "test" @@ -44,6 +45,9 @@ parameters (dict): This check uses a dictionary as parameter. The following {"pagefile"} Warning and critical levels for page file usage. The same rules apply as for {memory}. + {"average"} This optional parameters sets a value in minutes for averaging. + In that case all warn/crit levels are applied to the averaged values. + [configuration] memory_win_default_levels (dict): Levels used by diff --git a/checks/mem b/checks/mem index e97e3d9..8c5736a 100644 --- a/checks/mem +++ b/checks/mem @@ -93,6 +93,8 @@ def check_mem_windows(item, params, info): infotxts = [] MB = 1024.0 * 1024 worststate = 0 + now = time.time() + for title, what, paramname in [ ( "Memory", "Mem", "memory" ), ( "Page file", "Page", "pagefile" )]: @@ -103,8 +105,30 @@ def check_mem_windows(item, params, info): free_mb = free_kb / 1024.0 perc = 100.0 * used_kb / total_kb - # Now check the levels + infotxts.append("%s usage: %.1f%% (%.1f/%.1f GB)" % + (title, perc, used_kb / MB, total_kb / MB)) + warn, crit = params[paramname] + + # In perfdata show warn/crit as absolute values + if type(warn) == float: + warn_kb = total_kb * warn / 100 / 1024 + if type(crit) == float: + crit_kb = total_kb * crit / 100 / 1024 + perfdata.append((paramname, used_kb / 1024.0, warn_kb, crit_kb, 0, total_kb / 1024.0)) + + # Do averaging, if configured, just for matching the levels + if "average" in params: + average_min = params["average"] + timedif, used_kb = get_average("mem.win.%s" % paramname, + now, used_kb, average_min, initialize_zero = False) + used_mb = used_kb / 1024.0 + free_mb = (total_kb / 1024.0) - used_mb + perc = 100.0 * used_kb / total_kb + infotxts[-1] += ", %d min average: %.1f%% (%.1f GB)" % (average_min, perc, used_kb / MB) + perfdata.append((paramname + "_avg", used_kb / 1024.0)) + + # Now check the levels if (type(crit) == int and free_mb <= crit) or \ (type(crit) == float and perc >= crit): worststate = 2 @@ -116,15 +140,8 @@ def check_mem_windows(item, params, info): else: state_code = "" - # Convert levels to absolute values (for perfdata) - if type(warn) == float: - warn = total_kb * warn / 100 / 1024 - if type(crit) == float: - crit = total_kb * crit / 100 / 1024 + infotxts[-1] += state_code - infotxts.append("%s usage: %.1f%% (%.1f/%.1f GB)%s" % - (title, perc, used_kb / MB, total_kb / MB, state_code)) - perfdata.append((paramname, used_kb / 1024.0, warn, crit, 0, total_kb / 1024.0)) return (worststate, ", ".join(infotxts), perfdata) diff --git a/pnp-templates/check_mk-mem.win.php b/pnp-templates/check_mk-mem.win.php index 46181f6..a7d3342 100644 --- a/pnp-templates/check_mk-mem.win.php +++ b/pnp-templates/check_mk-mem.win.php @@ -23,9 +23,19 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -$maxmem = $MAX[1] / 1024.0; +// Make data sources available via names +$RRD = array(); +foreach ($NAME as $i => $n) { + $RRD[$n] = "$RRDFILE[$i]:$DS[$i]:MAX"; + $WARN[$n] = $WARN[$i]; + $CRIT[$n] = $CRIT[$i]; + $MIN[$n] = $MIN[$i]; + $MAX[$n] = $MAX[$i]; +} + +$maxmem = $MAX["memory"] / 1024.0; $maxmemprint = sprintf("%5.2f", $maxmem); -$maxpage = $MAX[2] / 1024.0; +$maxpage = $MAX["pagefile"] / 1024.0; $maxpageprint = sprintf("%5.2f", $maxpage); $opt[1] = " --vertical-label 'Gigabytes' -X0 " @@ -34,29 +44,40 @@ $opt[1] = " --vertical-label 'Gigabytes' -X0 " . " --title \"Memory and page file usage $hostname\" "; -$def[1] = "DEF:mem=$RRDFILE[1]:$DS[1]:MAX " +$def[1] = "DEF:mem=$RRD[memory] " . "CDEF:memgb=mem,1024,/ " - . "DEF:page=$RRDFILE[2]:$DS[2]:MAX " + . "DEF:page=$RRD[pagefile] " . "CDEF:pagegb=page,1024,/ " . "CDEF:mpagegb=pagegb,-1,* " - - . "AREA:$maxmem#a0f8c0:\"$maxmemprint GB RAM \" " - . "AREA:memgb#20d060 " + + . "AREA:$maxmem#b0ffe0:\"$maxmemprint GB RAM \" " + . "AREA:memgb#40f090 " . "GPRINT:memgb:LAST:\"%5.2lf GB last\" " . "GPRINT:memgb:AVERAGE:\"%5.2lf GB avg\" " . "GPRINT:memgb:MAX:\"%5.2lf GB max\" " - . "HRULE:".($WARN[1]/1024)."#FFFF00:\"Warn\" " - . "HRULE:".($CRIT[1]/1024)."#FF0000:\"Crit\\n\" " + . "HRULE:".($WARN["memory"]/1024)."#FFFF00:\"Warn\" " + . "HRULE:".($CRIT["memory"]/1024)."#FF0000:\"Crit\\n\" " - . "AREA:\"-$maxpage\"#a0d0e8:\"$maxpageprint GB page file\" " - . "AREA:mpagegb#3040d0 " + . "AREA:\"-$maxpage\"#b0e0f0:\"$maxpageprint GB page file\" " + . "AREA:mpagegb#90b0ff " . "GPRINT:pagegb:LAST:\"%5.2lf GB last\" " . "GPRINT:pagegb:AVERAGE:\"%5.2lf GB avg\" " . "GPRINT:pagegb:MAX:\"%5.2lf GB max\" " - . "HRULE:".(-$WARN[2]/1024)."#FFFF00:\"Warn\" " - . "HRULE:".(-$CRIT[2]/1024)."#FF0000:\"Crit\\n\" " - + . "HRULE:".(-$WARN["pagefile"]/1024)."#FFFF00:\"Warn\" " + . "HRULE:".(-$CRIT["pagefile"]/1024)."#FF0000:\"Crit\\n\" " + ; +# If averaging is enabled then we get two further metrics +if (isset($RRD["memory_avg"])) { + $def[1] .= "" + . "DEF:memavg=$RRD[memory_avg] " + . "CDEF:memavggb=memavg,1024,/ " + . "LINE:memavggb#006000:\"Memory Average \" " + . "DEF:pageavg=$RRD[pagefile_avg] " + . "CDEF:pageavggb=pageavg,1024,/ " + . "CDEF:mpageavggb=pageavggb,-1,* " + . "LINE:mpageavggb#000060:\"Pagefile Average\\n\" " ; +} ?> diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 2d95917..408fbf1 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -1147,6 +1147,7 @@ register_check_parameters( "default, averaging is turned off. "), unit = _("minutes"), minvalue = 1, + default_value = 60, ) ),

10 years, 8 months

Check_MK Git: check_mk: FIX: set a few default values for WATO

by Mathias Kettner

Module: check_mk Branch: master Commit: b5f17df532502d16038571dd27154707b4225685 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b5f17df532502d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jan 14 10:13:23 2014 +0100 FIX: set a few default values for WATO --- web/plugins/wato/check_parameters.py | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index e655090..2d95917 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -641,6 +641,7 @@ register_check_parameters( "default, averaging is turned off. "), unit = _("minutes"), minvalue = 1, + default_value = 60, ) ), ("phystate", @@ -1104,9 +1105,9 @@ register_check_parameters( Tuple( title = _("Usage Levels in Percent"), elements = [ - Percentage(title = _("Warning if above") ), - Percentage(title = _("Critical if above") ), - ] + Percentage(title = _("Warning if above")), + Percentage(title = _("Critical if above")), + ], ), Tuple( title = _("Absolute Usage Levels"), @@ -1115,7 +1116,8 @@ register_check_parameters( Filesize(title = _("Critical if above")), ] ) - ])), + ], + default_value = (80.0, 90.0))), ( "pagefile", Alternative( title = _("Pagefile Levels"), @@ -1134,7 +1136,9 @@ register_check_parameters( Filesize(title = _("Critical if above")), ] ) - ])), + ], + default_value = (50.0, 70.0)) + ), ("average", Integer ( title = _("Averaging"),

10 years, 8 months

Check_MK Git: check_mk: Fix werk 117: availability button must not be shown in dashboard

by Mathias Kettner

Module: check_mk Branch: master Commit: cd00173169c8fe3bdb16a387ab0db9b39b3d92ba URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cd00173169c8fe… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jan 14 09:45:32 2014 +0100 Fix werk 117: availability button must not be shown in dashboard --- web/htdocs/views.py | 2 +- web/plugins/wato/check_parameters.py | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 6f5f12b..f36b808 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -1851,7 +1851,7 @@ def show_context_links(thisview, active_filters, show_filters, display_options, (thisview["owner"], thisview["name"], backurl) html.context_button(_("Edit View"), url, "edit", id="edit", bestof=config.context_buttons_to_show) - if show_availability: + if 'E' in display_options and show_availability: html.context_button(_("Availability"), html.makeuri([("mode", "availability")]), "availability") if 'B' in display_options: diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 06307eb..e655090 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -1135,6 +1135,17 @@ register_check_parameters( ] ) ])), + ("average", + Integer ( + title = _("Averaging"), + help = _("If this parameter is set, all measured values will be averaged " + "over the specified time interval before levels are being applied. Per " + "default, averaging is turned off. "), + unit = _("minutes"), + minvalue = 1, + ) + ), + ]), None, "dict"

10 years, 8 months

Check_MK Git: check_mk: Reserved 10 Werk IDS

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: 3855aa87b88dd5ca8a07b7ddaa59db78c4df23b7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3855aa87b88dd5… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Mon Jan 13 19:45:45 2014 +0100 Reserved 10 Werk IDS --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 4930863..073c57b 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -455 +465

10 years, 8 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits