Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64160 discussions

Check_MK Git: check_mk: systemtime: added RRA config

by mk＠mathias-kettner.de

Module: check_mk Branch: master Commit: 44b6c925327265eddba0b7a420082cda0e4af31b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=44b6c925327265… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Feb 25 19:30:50 2011 +0100 systemtime: added RRA config --- pnp-rraconf/check_mk-systemtime.rra.cfg | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/pnp-rraconf/check_mk-systemtime.rra.cfg b/pnp-rraconf/check_mk-systemtime.rra.cfg new file mode 120000 index 0000000..74019b8 --- /dev/null +++ b/pnp-rraconf/check_mk-systemtime.rra.cfg @@ -0,0 +1 @@ +avg-max-min.rra.cfg \ No newline at end of file

13 years, 6 months

Check_MK Git: check_mk: Merge branch 'master' of ssh://git.mathias-kettner. de/var/www/80/git.mathias-kettner.de/check_mk

by mk＠mathias-kettner.de

Module: check_mk Branch: master Commit: 4da52e5719d4e350bce6243e32e83d09c6f8bb91 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4da52e5719d4e3… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Feb 25 19:31:02 2011 +0100 Merge branch 'master' of ssh://git.mathias-kettner.de/var/www/80/git.mathias-kettner.de/check_mk ---

13 years, 6 months

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

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 979e15f96c96241a95e11ae4db1049774ccd3953 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=979e15f96c9624… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Feb 25 19:30:04 2011 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

13 years, 6 months

Check_MK Git: check_mk: Windows agent: new section systemtime

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: a75ecbdfb753097e8c2e1ff3ccbd252857cea9e4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a75ecbdfb75309… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Feb 25 19:29:56 2011 +0100 Windows agent: new section systemtime --- agents/windows/check_mk_agent.cc | 8 ++++---- agents/windows/check_mk_agent.exe | Bin 95232 -> 95744 bytes 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index f2c0625..2a576b4 100755 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -232,10 +232,10 @@ void section_uptime(SOCKET &out) } -void section_localtime(SOCKET &out) +void section_systemtime(SOCKET &out) { - output(out, "<<<localtime>>>\n"); - sprintf(out, "%ld\n", time(0)); + output(out, "<<<systemtime>>>\n"); + output(out, "%ld\n", time(0)); } @@ -1119,7 +1119,7 @@ void output_data(SOCKET &out) section_eventlog(out); section_plugins(out); section_local(out); - section_localtime(out); + section_systemtime(out); } diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index 81a3c6a..056f40d 100755 Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe differ

13 years, 6 months

Check_MK Git: check_mk: Fix Perf-O-Meter layout

by mk＠mathias-kettner.de

Module: check_mk Branch: master Commit: 039a6efb604a4ede5733d6ccd97c4174bf1a8e62 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=039a6efb604a4e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Feb 25 19:27:40 2011 +0100 Fix Perf-O-Meter layout --- web/htdocs/check_mk.css | 4 ++-- web/plugins/views/perfometer.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index 95c5b4d..f5abad2 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -812,18 +812,18 @@ td.perfometer table { width: 120px; height: 22px; border-spacing: 0px; - border-collapse:collapse; padding: 0px; margin: 0px; border: 1px solid #aaa; height: 100%; } -td.perfometer td { +td.perfometer table tr td.inner { padding: 0px; margin: 0px; border: none; height: 22px; + padding-left: 1px; } td.perfometer a { diff --git a/web/plugins/views/perfometer.py b/web/plugins/views/perfometer.py index 122c598..afd7b84 100644 --- a/web/plugins/views/perfometer.py +++ b/web/plugins/views/perfometer.py @@ -31,7 +31,7 @@ perfometers = {} # Helper functions for perfometers def perfometer_td(perc, color): - return '<td style="background-color: %s; width: %d%%;"></td>' % (color, int(float(perc))) + return '<td class="inner" style="background-color: %s; width: %d%%;"></td>' % (color, int(float(perc))) # Paint linear performeter with one value def perfometer_linear(perc, color):

13 years, 6 months

Check_MK Git: check_mk: systemtime: new check for Windows time precision

by mk＠mathias-kettner.de

Module: check_mk Branch: master Commit: 2063752c337a27c60cc65955908614411c6ee50c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2063752c337a27… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Feb 25 19:18:34 2011 +0100 systemtime: new check for Windows time precision --- ChangeLog | 3 +- checks/systemtime | 52 +++++++++++++++++++++++++++++++++ pnp-templates/check_mk-systemtime.php | 51 ++++++++++++++++++++++++++++++++ web/plugins/perfometer/check_mk.py | 9 +++-- 4 files changed, 110 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 307a5bb..f39c5cc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,7 +5,8 @@ Checks & Agents: * FIX: drbd now handles output of older version without an ep field - + * systemtime: new simple check for time synchronization on Windows + (needs agent update) 1.1.9i9: diff --git a/checks/systemtime b/checks/systemtime new file mode 100644 index 0000000..471a9dd --- /dev/null +++ b/checks/systemtime @@ -0,0 +1,52 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2010 mk(a)mathias-kettner.de | +# +------------------------------------------------------------------+ +# +# This file is part of Check_MK. +# The official homepage is at http://mathias-kettner.de/check_mk. +# +# check_mk is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation in version 2. check_mk is distributed +# in the hope that it will be useful, but WITHOUT ANY WARRANTY; with- +# out even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. See the GNU General Public License for more de- +# ails. You should have received a copy of the GNU General Public +# License along with GNU Make; see the file COPYING. If not, write +# to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, +# Boston, MA 02110-1301 USA. + +systemtime_default_values = (30, 60) # warn/crit sec. offset + +def inventory_systemtime(checkname, info): + if len(info) >= 1: + return [(None, "systemtime_default_values")] + +def check_systemtime(item, params, info): + if len(info) == 0: + return (3, "UNKNOWN - no information sent by agent") + + systemtime = int(info[0][0]) + ourtime = time.time() + offset = systemtime - ourtime + warn, crit = params + infotext = "Offset is %+.1f sec (levels at %d/%d sec)" % (offset, warn, crit) + perfdata = [ ("offset", offset, warn, crit, 0) ] + + if abs(offset) >= crit: + return (2, "CRIT - " + infotext, perfdata) + elif abs(offset) >= warn: + return (1, "WARN - " + infotext, perfdata) + else: + return (0, "OK - " + infotext, perfdata) + +check_info["systemtime"] = ( check_systemtime, "System Time", 1, inventory_systemtime ) + diff --git a/pnp-templates/check_mk-systemtime.php b/pnp-templates/check_mk-systemtime.php new file mode 100644 index 0000000..82fe70e --- /dev/null +++ b/pnp-templates/check_mk-systemtime.php @@ -0,0 +1,51 @@ +<?php +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2010 mk(a)mathias-kettner.de | +# +------------------------------------------------------------------+ +# +# This file is part of Check_MK. +# The official homepage is at http://mathias-kettner.de/check_mk. +# +# check_mk is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation in version 2. check_mk is distributed +# in the hope that it will be useful, but WITHOUT ANY WARRANTY; with- +# out even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. See the GNU General Public License for more de- +# ails. You should have received a copy of the GNU General Public +# License along with GNU Make; see the file COPYING. If not, write +# to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, +# Boston, MA 02110-1301 USA. + +$range = $CRIT[1]; + +$opt[1] = "--vertical-label 'offset (s)' -l -$range -u $range --title '$hostname: system time offset to Nagios' "; + +$def[1] = "DEF:offset_max=$RRDFILE[1]:$DS[1]:MAX ". + "DEF:offset_min=$RRDFILE[1]:$DS[1]:MIN ". + "DEF:offset_avg=$RRDFILE[1]:$DS[1]:AVERAGE ". + "CDEF:offmax=offset_max,0,MAX ". + "CDEF:offmin=offset_min,0,MIN ". + "CDEF:offsetabs_min=offset_min,ABS ". + "CDEF:offsetabs_max=offset_max,ABS ". + "CDEF:offsetabs=offset_min,offset_max,MAX ". + "AREA:offmax#4080ff:\"time offset \" ". + "AREA:offmin#4080ff ". + "LINE1:offmin#2060d0: ". + "LINE1:offmax#2060d0: ". + "HRULE:0#c0c0c0: ". + "HRULE:$WARN[1]#ffff00:\"\" ". + "HRULE:-$WARN[1]#ffff00:\"Warning\\: +/- $WARN[1] s \" ". + "HRULE:$CRIT[1]#ff0000:\"\" ". + "HRULE:-$CRIT[1]#ff0000:\"Critical\\: +/- $CRIT[1] s \\n\" ". + "GPRINT:offset_avg:LAST:\"current\: %.1lf s\" ". + "GPRINT:offsetabs:MAX:\"max(+/-)\: %.1lf s \" ". + "GPRINT:offsetabs:AVERAGE:\"avg(+/-)\: %.1lf s\" ". + ""; +?> diff --git a/web/plugins/perfometer/check_mk.py b/web/plugins/perfometer/check_mk.py index 75dc7f2..c23ddeb 100644 --- a/web/plugins/perfometer/check_mk.py +++ b/web/plugins/perfometer/check_mk.py @@ -132,7 +132,7 @@ def perfometer_check_mk_cpu_loads(row, check_command, perf_data): perfometers["check_mk-cpu.loads"] = perfometer_check_mk_cpu_loads perfometers["check_mk-ucd_cpu_load"] = perfometer_check_mk_cpu_loads -def perfometer_check_mk_ntp(row, check_command, perf_data): +def perfometer_check_mk_ntp(row, check_command, perf_data, unit = "ms"): offset = float(perf_data[0][1]) absoffset = abs(offset) warn = float(perf_data[0][3]) @@ -155,10 +155,11 @@ def perfometer_check_mk_ntp(row, check_command, perf_data): h += perfometer_td(50, "#fff") h += '</tr></table>' - return "%.1f ms" % offset, h + return "%.1f %s" % (offset, unit), h -perfometers["check_mk-ntp"] = perfometer_check_mk_ntp -perfometers["check_mk-ntp.time"] = perfometer_check_mk_ntp +perfometers["check_mk-ntp"] = perfometer_check_mk_ntp +perfometers["check_mk-ntp.time"] = perfometer_check_mk_ntp +perfometers["check_mk-systemtime"] = lambda r, c, p: perfometer_check_mk_ntp(r, c, p, "s") def perfometer_check_mk_ipmi_sensors(row, check_command, perf_data): state = row["service_state"]

13 years, 6 months

Check_MK Git: check_mk: Windows agent: new section localtime

by mk＠mathias-kettner.de

Module: check_mk Branch: master Commit: a86c7dd8497011a48688f23d3f0090e698472c88 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a86c7dd8497011… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Feb 25 18:34:53 2011 +0100 Windows agent: new section localtime --- agents/windows/check_mk_agent.cc | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index b7a76a4..f2c0625 100755 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -232,6 +232,13 @@ void section_uptime(SOCKET &out) } +void section_localtime(SOCKET &out) +{ + output(out, "<<<localtime>>>\n"); + sprintf(out, "%ld\n", time(0)); +} + + void section_df(SOCKET &out) { output(out, "<<<df>>>\n"); @@ -1112,6 +1119,7 @@ void output_data(SOCKET &out) section_eventlog(out); section_plugins(out); section_local(out); + section_localtime(out); }

13 years, 6 months

Check_MK Git: check_mk: windows time: changed plugin, still not usable

by mk＠mathias-kettner.de

Module: check_mk Branch: master Commit: 0d483da439ddba6620e2f412f01e0c8b30f82161 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0d483da439ddba… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Feb 25 18:08:59 2011 +0100 windows time: changed plugin, still not usable --- agents/windows/plugins/windows_time.bat | 26 ++------------------------ 1 files changed, 2 insertions(+), 24 deletions(-) diff --git a/agents/windows/plugins/windows_time.bat b/agents/windows/plugins/windows_time.bat index bd349be..035ff7c 100644 --- a/agents/windows/plugins/windows_time.bat +++ b/agents/windows/plugins/windows_time.bat @@ -1,25 +1,3 @@ @echo off - -REM Windows time checks -REM <fh(a)mathias-kettner.de> -REM -REM - -REM Win2008 -set W2K8 = "Microsoft Windows [Version 6.0.6002]" - - -echo "<<<windows_time>>>" - -REM only w2k8 / vista /win7 are able to report ntp status. -if ver = "%W2K8%" w32tm /query /status - -REM win2003 can _test_ the ntp server using w32tm /once, but we don't want -REM to test EVERY minute, it takes a few seconds and will hammer the NTP server. -REM I very much recommend to monitor for w32time errors in eventlog instead. - -REM all others since W2K can at least report their primary SNTP or NTP server -REM the MS-supplied timeserver is usually blocked in corporate networks, but -REM windows will default to it. -net time /querysntp - +echo ^<^<^<windows_time^>^>^> +w32tm /query /status

13 years, 6 months

Check_MK Git: check_mk: Added compile helper file

by mk＠mathias-kettner.de

Module: check_mk Branch: master Commit: fdc071c424b5d4d1ba25fe572d4407f09db6d003 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fdc071c424b5d4… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Feb 25 18:09:10 2011 +0100 Added compile helper file --- agents/.f12 | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/agents/.f12 b/agents/.f12 new file mode 100644 index 0000000..1c27cc5 --- /dev/null +++ b/agents/.f12 @@ -0,0 +1 @@ +sudo cp -r * /omd/versions/default/share/check_mk/agents/

13 years, 6 months

Check_MK Git: check_mk: removed obsolete windows plugins

by mk＠mathias-kettner.de

Module: check_mk Branch: master Commit: 1c627a82394eda661f3cc0e7054aabbe1200b8e2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1c627a82394eda… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Feb 25 17:37:11 2011 +0100 removed obsolete windows plugins --- agents/windows/win_mpio.cmd | 10 ---------- agents/windows/win_time.cmd | 19 ------------------- 2 files changed, 0 insertions(+), 29 deletions(-) diff --git a/agents/windows/win_mpio.cmd b/agents/windows/win_mpio.cmd deleted file mode 100644 index 1f2eb74..0000000 --- a/agents/windows/win_mpio.cmd +++ /dev/null @@ -1,10 +0,0 @@ -# DO NOT USE YET! - -@echo off -echo ^<^<^<win_mpio:sep^(44^)^>^>^> -#wmic process get name,pagefileusage,virtualsize,workingsetsize,usermodetime,kernelmodetime /format:csv -# MPIO_DSM_Path -# wmuc MPIO_DSM_Path_V2 LIST - - -# REM state speed diff --git a/agents/windows/win_time.cmd b/agents/windows/win_time.cmd deleted file mode 100644 index f7c37dd..0000000 --- a/agents/windows/win_time.cmd +++ /dev/null @@ -1,19 +0,0 @@ -# DO NOT USE YET! - -@echo off - -REM *** -REM Query Windows Time daemons -REM Only Windows 2008 can give a useful status of the current win32time status. -REM *** - -echo ^<^<^<win_time^>^>^> -REM read in windows version -ver - -REM by standard, just query the timeserver. -net time /querysntp | findstr SNTP - -REM if we're on W2K8 it is possible to query the timeserver status -REM otherwise this will fail. -w32tm /query /status

13 years, 6 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits