Checkmk git commits May 2016

checkmk-commits@lists.checkmk.com

6 participants
231 discussions

3575 User logins can now be limited to single session at a time

by Lars Michelsen

Module: check_mk Branch: master Commit: 515aee05892237bd056435347e0c763b5a4c8c6f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=515aee05892237… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue May 24 14:59:41 2016 +0200 3575 User logins can now be limited to single session at a time Normally a user can login to the GUI from unlimited number of clients at the same time. If you want to enforce your users to be able to login only once (from one client which means device and browser), you can enable this option. When the user logs out or is inactive for the configured amount of time, the session is invalidated automatically and the user has to log in again from the current or another device. --- .werks/3575 | 14 +++ ChangeLog | 1 + web/htdocs/login.py | 141 ++++++++++++++++++++-------- web/htdocs/userdb.py | 124 +++++++++++++++++++++++- web/plugins/config/builtin.py | 1 + web/plugins/wato/check_mk_configuration.py | 22 +++++ 6 files changed, 260 insertions(+), 43 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=515aee0589…

8 years, 1 month

3538 Now hiding the activate changes button as long as another activation process is running

by Andreas Boesl

Module: check_mk Branch: master Commit: c9a1a29f103f26bb812d96d426d1d81303679ff3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c9a1a29f103f26… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue May 24 17:47:38 2016 +0200 3538 Now hiding the activate changes button as long as another activation process is running --- .werks/3538 | 9 ++++ ChangeLog | 1 + web/htdocs/wato.py | 131 ++++++++++++++++++++++++++++++++++++++-------------- 3 files changed, 106 insertions(+), 35 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=c9a1a29f10…

8 years, 1 month

windows agent: added output of additional skype perfcounters

by Sebastian Herbord

Module: check_mk Branch: master Commit: 4b82dd8a783ccccb75f8db07be2d67a192a04b49 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4b82dd8a783ccc… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Tue May 24 16:54:43 2016 +0200 windows agent: added output of additional skype perfcounters --- agents/windows/build_version | 2 +- agents/windows/check_mk_agent-64.exe | Bin 1267712 -> 1268224 bytes agents/windows/check_mk_agent-64.unversioned.exe | Bin 1267712 -> 1268224 bytes agents/windows/check_mk_agent.cc | 7 +++++++ agents/windows/check_mk_agent.exe | Bin 1236480 -> 1236992 bytes agents/windows/check_mk_agent.msi | Bin 2772992 -> 2774016 bytes agents/windows/check_mk_agent.unversioned.exe | Bin 1236480 -> 1236992 bytes agents/windows/crashhandling.cc | 2 +- agents/windows/install_agent-64.exe | Bin 565279 -> 565457 bytes agents/windows/install_agent.exe | Bin 559579 -> 559756 bytes 10 files changed, 9 insertions(+), 2 deletions(-) diff --git a/agents/windows/build_version b/agents/windows/build_version index 57bf58c..32bb421 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -1727 +1729 diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe index a333e61..d3967ef 100755 Binary files a/agents/windows/check_mk_agent-64.exe and b/agents/windows/check_mk_agent-64.exe differ diff --git a/agents/windows/check_mk_agent-64.unversioned.exe b/agents/windows/check_mk_agent-64.unversioned.exe index 4a980ca..9045168 100755 Binary files a/agents/windows/check_mk_agent-64.unversioned.exe and b/agents/windows/check_mk_agent-64.unversioned.exe differ diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index f280bc4..935b8e9 100644 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -1660,26 +1660,33 @@ void section_skype(OutputProxy &out) { bool any_section_valid = false; for (const auto &data_source : {L"LS:WEB - Address Book Web Query", + L"LS:WEB - Address Book File Download", L"LS:WEB - Location Information Service", L"LS:WEB - Distribution List Expansion", L"LS:WEB - UCWA", L"LS:WEB - Mobile Communication Service", L"LS:WEB - Throttling and Authentication", + L"LS:WEB - Auth Provider related calls", L"LS:SIP - Protocol", L"LS:SIP - Responses", L"LS:SIP - Peers", L"LS:SIP - Load Management", + L"LS:SIP - Authentication", + L"LS:CAA - Operations", L"LS:DATAMCU - MCU Health And Performance", L"LS:AVMCU - MCU Health And Performance", L"LS:AsMcu - MCU Health And Performance", L"LS:ImMcu - MCU Health And Performance", L"LS:USrv - DBStore", + L"LS:USrv - Conference Mcu Allocator", + L"LS:JoinLauncher - Join Launcher Service Failure", L"LS:MediationServer - Health Indices", L"LS:MediationServer - Global Counters", L"LS:MediationServer - Global Per Gateway Counters", L"LS:MediationServer - Media Relay", L"LS:A/V Auth - Requests", L"LS:DATAPROXY - Server Connections", + L"LS:XmppFederationProxy - Streams", L"LS:A/V Edge - TCP Counters", L"LS:A/V Edge - UDP Counters"}) { any_section_valid |= output_perfcounter_table( diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index 63df0a3..1b153d1 100755 Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe differ diff --git a/agents/windows/check_mk_agent.msi b/agents/windows/check_mk_agent.msi index 91a5a3c..cd9c482 100755 Binary files a/agents/windows/check_mk_agent.msi and b/agents/windows/check_mk_agent.msi differ diff --git a/agents/windows/check_mk_agent.unversioned.exe b/agents/windows/check_mk_agent.unversioned.exe index 352fa93..bd487ea 100755 Binary files a/agents/windows/check_mk_agent.unversioned.exe and b/agents/windows/check_mk_agent.unversioned.exe differ diff --git a/agents/windows/crashhandling.cc b/agents/windows/crashhandling.cc index b1f451e..c6e924f 100644 --- a/agents/windows/crashhandling.cc +++ b/agents/windows/crashhandling.cc @@ -147,7 +147,7 @@ LONG WINAPI exception_handler(LPEXCEPTION_POINTERS ptrs) { log_backtrace(ptrs->ExceptionRecord->ExceptionAddress); ::SymCleanup(proc); -#else // __x86_64 +#else // __x86_64 // on x86 the backtrace can't be implemented in the same way #endif // __x86_64 diff --git a/agents/windows/install_agent-64.exe b/agents/windows/install_agent-64.exe index 81d5da9..ad52d80 100755 Binary files a/agents/windows/install_agent-64.exe and b/agents/windows/install_agent-64.exe differ diff --git a/agents/windows/install_agent.exe b/agents/windows/install_agent.exe index 1d7de95..64aeae5 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ

8 years, 1 month

3137 linux and solaris agent: mrpe checks now support option to append the cache age to cached results

by Sebastian Herbord

Module: check_mk Branch: master Commit: 8b74aeba00f6e3baddf0b0f4d321ad765a7565af URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8b74aeba00f6e3… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Tue May 24 15:59:26 2016 +0200 3137 linux and solaris agent: mrpe checks now support option to append the cache age to cached results --- .werks/3137 | 13 +++++++++++++ ChangeLog | 1 + agents/check_mk_agent.linux | 33 ++++++++++++++++++++++----------- agents/check_mk_agent.solaris | 26 ++++++++++++++++++-------- 4 files changed, 54 insertions(+), 19 deletions(-) diff --git a/.werks/3137 b/.werks/3137 new file mode 100644 index 0000000..64c3d3d --- /dev/null +++ b/.werks/3137 @@ -0,0 +1,13 @@ +Title: linux and solaris agent: mrpe checks now support option to append the cache age to cached results +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.9i1 +Date: 1464098117 +Class: feature + +To setup mrpe checks that also display the age of the cache, use a line in mrpe.cfg like this: +LOAD (interval=360:appendage=1) /usr/bin/check_load + +interval specifies the maximum cache age in seconds (here: 6 minutes) and appendage=1 instructs the +agent to append the cache age to the output. diff --git a/ChangeLog b/ChangeLog index 6b01b99..673fd3e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -84,6 +84,7 @@ * 3135 skype, skype.xmpp_proxy, skype.conferencing, skype.sip_stack: added furter metrics and adjusted default levels * 3609 apc_rackpdu_power: now upper levels for electrical current are confiugurable * 3136 windows agent: improved crash reporting... + * 3137 linux and solaris agent: mrpe checks now support option to append the cache age to cached results... * 3073 FIX: windows agent: relative paths to mrpe scripts are now treated as relative to the agent installation directory... * 3061 FIX: mk_jolokia: Fixed debugging of the agent plugin * 3074 FIX: windows agent: fixed incorrect values for 32-bit performance counters diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index 9ba058a..30afede 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -133,8 +133,10 @@ function run_cached () { local NOW=$(date +%s) local section= local mrpe=0 + local append_age=0 if [ "$1" = -s ] ; then local section="echo '<<<$2:cached($NOW,$3)>>>' ; " ; shift ; fi if [ "$1" = -m ] ; then local mrpe=1 ; shift ; fi + if [ "$1" = -a ] ; then local append_age=1 ; shift ; fi local NAME=$1 local MAXAGE=$2 shift 2 @@ -156,17 +158,27 @@ function run_cached () { fi fi + # Check if cache file exists and is recent enough if [ -s "$CACHEFILE" ] ; then local MTIME=$(stat -c %Y "$CACHEFILE") - if [ $((NOW - MTIME)) -le $MAXAGE ] ; then local USE_CACHEFILE=1 ; fi + local AGE=$((NOW - MTIME)) + if [ $AGE -le $MAXAGE ] ; then local USE_CACHEFILE=1 ; fi # Output the file in any case, even if it is # outdated. The new file will not yet be available - cat "$CACHEFILE" + if [ $append_age -eq 1 ] ; then + # insert the cached-string before the pipe (first -e) + # or, if no pipe found (-e t) append it (third -e), + # but only once and on the second line (2!b) (first line is section header, + # all further lines are long output) + cat "$CACHEFILE" | sed -e "2s/|/ (Cached: ${AGE}\/${MAXAGE}s)|/" -e t -e "2s/$/ (Cached: ${AGE}\/${MAXAGE}s)/" + else + cat "$CACHEFILE" + fi fi # Cache file outdated and new job not yet running? Start it - if [ -z "$USE_CACHEFILE" -a ! -e "$CACHEFILE.new" ] ; then + if [ -z "$USE_CACHEFILE" ] && [ ! -e "$CACHEFILE.new" ] ; then # When the command fails, the output is throws away ignored if [ $mrpe -eq 1 ] ; then echo "set -o noclobber ; exec > \"$CACHEFILE.new\" || exit 1 ; run_mrpe $NAME $CMDLINE && mv \"$CACHEFILE.new\" \"$CACHEFILE\" || rm -f \"$CACHEFILE\" \"$CACHEFILE.new\"" | nohup bash >/dev/null 2>&1 & @@ -792,23 +804,23 @@ then while read descr cmdline do interval= + args="-m" if [[ $cmdline =~ $([^$]*)\)[[:space:]](.*) ]] then parameters=${BASH_REMATCH[1]} cmdline=${BASH_REMATCH[2]} # split multiple parameter assignments - IFS=':' read -a parlist <<< $parameters - for par in "${parlist[@]}" + for par in $(echo $parameters | tr ":" "\n") do # split each assignment key=$(echo $par | cut -d= -f1) value=$(echo $par | cut -d= -f2) - if [ "$key" = "interval" ] - then + if [ "$key" = "interval" ] ; then interval=$value - # no other parameters supported currently + elif [ "$key" = "appendage" ] ; then + args="$args -a" fi done fi @@ -817,7 +829,7 @@ then then run_mrpe $descr "$cmdline" else - run_cached -m $descr $interval "$cmdline" + run_cached $args $descr $interval "$cmdline" fi done fi @@ -846,8 +858,7 @@ then cmdline=${BASH_REMATCH[2]} # split multiple parameter assignments - IFS=':' read -a parlist <<< $parameters - for par in "${parlist[@]}" + for par in $(echo $parameters | tr ":" "\n") do # split each assignment IFS='=' read key value <<< $par diff --git a/agents/check_mk_agent.solaris b/agents/check_mk_agent.solaris index efd53c3..17ce30e 100755 --- a/agents/check_mk_agent.solaris +++ b/agents/check_mk_agent.solaris @@ -74,8 +74,10 @@ export -f run_mrpe # Runs a command asynchronous by use of a cache file function run_cached () { local mrpe=0 + local append_age=0 if [ "$1" = -s ] ; then local section="echo '<<<$2>>>' ; " ; shift ; fi if [ "$1" = -m ] ; then local mrpe=1 ; shift ; fi + if [ "$1" = -a ] ; then local append_age=1 ; shift ; fi local NAME=$1 local MAXAGE=$2 shift 2 @@ -99,11 +101,19 @@ function run_cached () { if [ $AGE -le $MAXAGE ] ; then local USE_CACHEFILE=1 ; fi # Output the file in any case, even if it is # outdated. The new file will not yet be available - cat "$CACHEFILE" + if [ $append_age -eq 1 ] ; then + # insert the cached-string before the pipe (first -e) + # or, if no pipe found (-e t) append it (third -e), + # but only once and on the second line (2) (first line is section header, + # all further lines are long output) + cat "$CACHEFILE" | sed -e "2s/|/ (Cached: ${AGE}\/${MAXAGE}s)|/" -e t -e "2s/$/ (Cached: ${AGE}\/${MAXAGE}s)/" + else + cat "$CACHEFILE" + fi fi # Cache file outdated and new job not yet running? Start it - if [ -z "$USE_CACHEFILE" -a ! -e "$CACHEFILE.new" ] ; then + if [ -z "$USE_CACHEFILE" ] && [ ! -e "$CACHEFILE.new" ] ; then if [ $mrpe -eq 1 ] ; then echo "set -o noclobber ; exec > \"$CACHEFILE.new\" || exit 1 ; run_mrpe $NAME $CMDLINE && mv \"$CACHEFILE.new\" \"$CACHEFILE\" || rm -f \"$CACHEFILE\" \"$CACHEFILE.new\"" | nohup bash >/dev/null 2>&1 & else @@ -375,23 +385,23 @@ then while read descr cmdline do interval= + args="-m" if [[ $cmdline =~ $([^$]*)\)[[:space:]](.*) ]] then parameters=${BASH_REMATCH[1]} cmdline=${BASH_REMATCH[2]} # split multiple parameter assignments - IFS=':' read -a parlist <<< $parameters - for par in "${parlist[@]}" + for par in $(echo $parameters | tr ":" "\n") do # split each assignment key=$(echo $par | cut -d= -f1) value=$(echo $par | cut -d= -f2) - if [ "$key" = "interval" ] - then + if [ "$key" = "interval" ] ; then interval=$value - # no other parameters supported currently + elif [ "$key" = "appendage" ] ; then + args="$args -a" fi done fi @@ -400,7 +410,7 @@ then then run_mrpe $descr "$cmdline" else - run_cached -m $descr $interval "$cmdline" + run_cached $args $descr $interval "$cmdline" fi done fi

8 years, 1 month

skype: fixed crash on missing optional tables

by Sebastian Herbord

Module: check_mk Branch: master Commit: 07b4fc80d84e807cd26cb6248c207aeced68d9b1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=07b4fc80d84e80… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Tue May 24 15:40:13 2016 +0200 skype: fixed crash on missing optional tables --- checks/skype | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/checks/skype b/checks/skype index 375810c..55cf35a 100644 --- a/checks/skype +++ b/checks/skype @@ -123,23 +123,26 @@ def check_skype(item, params, parsed): perfvar="asp_requests_rejected", levels=params['asp_requests_rejected']) - yield wmi_yield_raw_persec(parsed["LS:WEB - AdressBookFile Download"], item, - "WEB - Failed File Requests/Second", - label=" failed file requests/sec", - perfvar="failed_file_requests", - levels=params['failed_file_requests']) - - yield wmi_yield_raw_counter(parsed["LS:JoinLauncher - Join Launcher Service Failure"], item, - "JOINLAUNCHER - Join failures", - label=" join failures", - perfvar="join_failures", - levels=params['join_failures']) - - yield wmi_yield_raw_counter(parsed["LS:WEB - Auth Provider related calls"], item, - "Web - Failed validate cert calls to the cert auth provider", - label=" failed cert validations", - perfvar="failed_validate_cert", - levels=params['failed_validate_cert']) + if "LS:WEB - Address Book File Download" in parsed: + yield wmi_yield_raw_persec(parsed["LS:WEB - AdressBookFile Download"], item, + "WEB - Failed File Requests/Second", + label=" failed file requests/sec", + perfvar="failed_file_requests", + levels=params['failed_file_requests']) + + if "LS:JoinLauncher - Join Launcher Service Failure" in parsed: + yield wmi_yield_raw_counter(parsed["LS:JoinLauncher - Join Launcher Service Failure"], + item, "JOINLAUNCHER - Join failures", + label=" join failures", + perfvar="join_failures", + levels=params['join_failures']) + + if "LS:WEB - Auth Provider related calls" in parsed: + yield wmi_yield_raw_counter(parsed["LS:WEB - Auth Provider related calls"], item, + "Web - Failed validate cert calls to the cert auth provider", + label=" failed cert validations", + perfvar="failed_validate_cert", + levels=params['failed_validate_cert']) check_info['skype'] = { @@ -149,10 +152,7 @@ check_info['skype'] = { "LS:WEB - Distribution List Expansion", "LS:SIP - Protocol", "LS:WEB - UCWA", - "ASP.NET Apps v4.0.30319", - "LS:WEB - Address Book File Download", - "LS: JoinLauncher – Join Launcher Service Failure", - "LS:WEB – Auth Provider related calls" + "ASP.NET Apps v4.0.30319" ]), 'check_function' : check_skype, 'parse_function' : lambda info: parse_wmi_table(info, key="instance"),

8 years, 1 month

update werk

by Andreas Boesl

Module: check_mk Branch: master Commit: d033cabb020b50b83fe013994aa8ac2a0a981583 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d033cabb020b50… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue May 24 11:54:48 2016 +0200 update werk Conflicts: ChangeLog --- .werks/3537 | 2 +- ChangeLog | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.werks/3537 b/.werks/3537 index db8aa3e..3720a7f 100644 --- a/.werks/3537 +++ b/.werks/3537 @@ -1,4 +1,4 @@ -Title: PNP/Graph Templates: fixed incorrect scaling of check-mk-ping and check-mk-host-ping +Title: PNP/Graph Templates: fixed incorrect scaling of check-mk-ping, check_mk-active-icmp and check-mk-host-ping Level: 1 Component: multisite Compatible: compat diff --git a/ChangeLog b/ChangeLog index cad4cd7..6b01b99 100644 --- a/ChangeLog +++ b/ChangeLog @@ -304,7 +304,7 @@ * 3569 FIX: Dashboard: Fixed wrong links to views in statistics dashlets when using state filters in dashlet * 3570 FIX: Dashboard: Fixed different issues with filtering using WATO folders * 3571 FIX: Fixed missing downtime author filter - * 3537 FIX: PNP/Graph Templates: fixed incorrect scaling of check-mk-ping and check-mk-host-ping... + * 3537 FIX: PNP/Graph Templates: fixed incorrect scaling of check-mk-ping, check_mk-active-icmp and check-mk-host-ping... WATO: * 3244 WATO BI Module: swap order of aggregation function and child node selection...

8 years, 1 month

removed broken link

by Andreas Boesl

Module: check_mk Branch: master Commit: b644bf1efd21e148d3db11ba10089d9cc16b3a8b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b644bf1efd21e1… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue May 24 11:53:43 2016 +0200 removed broken link --- pnp-templates/check_mk_active-icmp.php | 1 - 1 file changed, 1 deletion(-) diff --git a/pnp-templates/check_mk_active-icmp.php b/pnp-templates/check_mk_active-icmp.php deleted file mode 120000 index 98c29f2..0000000 --- a/pnp-templates/check_mk_active-icmp.php +++ /dev/null @@ -1 +0,0 @@ -check-mk-ping.php \ No newline at end of file

8 years, 1 month

3537 FIX PNP/Graph Templates: fixed incorrect scaling of check-mk-ping and check-mk-host-ping

by Andreas Boesl

Module: check_mk Branch: master Commit: a72ac211c7bc8e668d62851c72f86f00afe36672 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a72ac211c7bc8e… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue May 24 11:49:42 2016 +0200 3537 FIX PNP/Graph Templates: fixed incorrect scaling of check-mk-ping and check-mk-host-ping The values were off by a factor of 1000. --- .werks/3537 | 9 ++++++ ChangeLog | 1 + pnp-templates/check-mk-host-ping.php | 1 - pnp-templates/check-mk-ping.php | 59 ---------------------------------- web/plugins/metrics/check_mk.py | 13 ++++++++ 5 files changed, 23 insertions(+), 60 deletions(-) diff --git a/.werks/3537 b/.werks/3537 new file mode 100644 index 0000000..db8aa3e --- /dev/null +++ b/.werks/3537 @@ -0,0 +1,9 @@ +Title: PNP/Graph Templates: fixed incorrect scaling of check-mk-ping and check-mk-host-ping +Level: 1 +Component: multisite +Compatible: compat +Version: 1.2.9i1 +Date: 1464083314 +Class: fix + +The values were off by a factor of 1000. diff --git a/ChangeLog b/ChangeLog index 31ac7c4..cad4cd7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -304,6 +304,7 @@ * 3569 FIX: Dashboard: Fixed wrong links to views in statistics dashlets when using state filters in dashlet * 3570 FIX: Dashboard: Fixed different issues with filtering using WATO folders * 3571 FIX: Fixed missing downtime author filter + * 3537 FIX: PNP/Graph Templates: fixed incorrect scaling of check-mk-ping and check-mk-host-ping... WATO: * 3244 WATO BI Module: swap order of aggregation function and child node selection... diff --git a/pnp-templates/check-mk-host-ping.php b/pnp-templates/check-mk-host-ping.php deleted file mode 120000 index 98c29f2..0000000 --- a/pnp-templates/check-mk-host-ping.php +++ /dev/null @@ -1 +0,0 @@ -check-mk-ping.php \ No newline at end of file diff --git a/pnp-templates/check-mk-ping.php b/pnp-templates/check-mk-ping.php deleted file mode 100644 index 13b147d..0000000 --- a/pnp-templates/check-mk-ping.php +++ /dev/null @@ -1,59 +0,0 @@ -<?php -# +------------------------------------------------------------------+ -# | ____ _ _ __ __ _ __ | -# | / ___| |__ ___ ___| | __ | \/ | |/ / | -# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | -# | | |___| | | | __/ (__| < | | | | . \ | -# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | -# | | -# | Copyright Mathias Kettner 2014 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- -# tails. 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. - -$ds_name[1] = "Round Trip Averages"; -$opt[1] = "--vertical-label \"RTA (ms)\" -X0 --title \"Ping times for $hostname\" "; -$def[1] = "DEF:var1=$RRDFILE[1]:$DS[1]:AVERAGE " ; -$def[1] .= "DEF:var2=$RRDFILE[2]:$DS[2]:MAX " ; -$def[1] .= "VDEF:maxrta=var1,MAXIMUM " ; -$def[1] .= "CDEF:loss1=var2,100,/,maxrta,* " ; -$def[1] .= "CDEF:sp1=var1,100,/,12,* " ; -$def[1] .= "CDEF:sp2=var1,100,/,30,* " ; -$def[1] .= "CDEF:sp3=var1,100,/,50,* " ; -$def[1] .= "CDEF:sp4=var1,100,/,70,* " ; -$def[1] .= "CDEF:loss2=loss1,100,/,80,* " ; -$def[1] .= "CDEF:loss3=loss1,100,/,60,* " ; -$def[1] .= "CDEF:loss4=loss1,100,/,40,* " ; -$def[1] .= "CDEF:loss5=loss1,100,/,20,* " ; - -$def[1] .= "AREA:var1#00FF5C:\"Round Trip Times \" " ; -$def[1] .= "AREA:sp4#00FF7C: " ; -$def[1] .= "AREA:sp3#00FF9C: " ; -$def[1] .= "AREA:sp2#00FFBC: " ; -$def[1] .= "AREA:sp1#00FFDC: " ; -$def[1] .= "LINE1:var1#000000:\"\" " ; -$def[1] .= "GPRINT:var1:LAST:\"%6.2lf $UNIT[1] last \" " ; -$def[1] .= "GPRINT:var1:MAX:\"%6.2lf $UNIT[1] max \" " ; -$def[1] .= "GPRINT:var1:AVERAGE:\"%6.2lf $UNIT[1] avg \\n\" " ; - -$def[1] .= "AREA:loss1#F20:\"Packet Loss \" "; -$def[1] .= "AREA:loss2#F40 "; -$def[1] .= "AREA:loss3#F60 "; -$def[1] .= "AREA:loss4#F80 "; -$def[1] .= "AREA:loss5#FA0 "; - -$def[1] .= "GPRINT:var2:MAX:\"%3.0lf $UNIT[2] max \\n\" " ; - -?> diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index b90ffdc..8019946 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -3364,6 +3364,19 @@ check_metrics["check_mk_active-icmp"] = { "rtmin" : { "scale" : m }, } + +check_metrics["check-mk-host-ping"] = { + "rta" : { "scale" : m }, + "rtmax" : { "scale" : m }, + "rtmin" : { "scale" : m }, +} + +check_metrics["check-mk-ping"] = { + "rta" : { "scale" : m }, + "rtmax" : { "scale" : m }, + "rtmin" : { "scale" : m }, +} + check_metrics["check-mk-host-ping-cluster"] = { "~.*rta" : { "name" : "rta", "scale": m }, "~.*pl" : { "name" : "pl", "scale": m },

8 years, 1 month

3136 windows agent: improved crash reporting

by Sebastian Herbord

Module: check_mk Branch: master Commit: a476038710272c50904438446691d1c71164583e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a476038710272c… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Tue May 24 10:54:13 2016 +0200 3136 windows agent: improved crash reporting With crash debug enabled the agent will now report the windows exception code on crash as well as the address causing the crash and the exact git revision he agent was built from. On 64bit systems it will also print a full backtrace including register contents. Technical details: Our official builds are built with mingw-w64, so we can't use windows api to resolve debugging symbols in our own binaryi. These frames will only include addresses, while api calls are resolved. However, the agent is now built with dwarf-2 debugging symbols (outdated but better tool support) and stripped of symbols in a separate build step. With the correct unstripped exe the adresses can still be resolved using addr2line: addr2line -e check_mk_agent-64.unstripped.exe <address> --- .werks/3136 | 22 +++ ChangeLog | 1 + agents/windows/.gitignore | 1 + agents/windows/CONTENTS | 2 + agents/windows/Makefile | 21 ++- agents/windows/build_version | 2 +- agents/windows/check_mk_agent-64.exe | Bin 1250304 -> 1267712 bytes agents/windows/check_mk_agent-64.unversioned.exe | Bin 1250304 -> 1267712 bytes agents/windows/check_mk_agent.cc | 9 +- agents/windows/check_mk_agent.exe | Bin 1223168 -> 1236480 bytes agents/windows/check_mk_agent.msi | Bin 2741760 -> 2772992 bytes agents/windows/check_mk_agent.unversioned.exe | Bin 1223168 -> 1236480 bytes agents/windows/crashhandling.cc | 155 ++++++++++++++++++++++ agents/windows/crashhandling.h | 32 +++++ agents/windows/install_agent-64.exe | Bin 554590 -> 565279 bytes agents/windows/install_agent.exe | Bin 551424 -> 559579 bytes 16 files changed, 234 insertions(+), 11 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=a476038710…

8 years, 1 month

Cleaned up handcrafted icon rendering

by Lars Michelsen

Module: check_mk Branch: master Commit: dd012e663b124d79b8982bcc89eb27165db915fb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dd012e663b124d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon May 23 14:47:35 2016 +0200 Cleaned up handcrafted icon rendering --- web/htdocs/wato.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 9bb12bc..a3210da 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -4766,8 +4766,8 @@ def render_audit_log(log, what, with_filename = False, hilite_others=False): htmlcode += '<td class=nobreak>' user = user == '-' and ('<i>%s</i>' % _('internal')) or user if hilite: - htmlcode += '<img class=icon src="images/icon_foreign_changes.png" title="%s">' \ - % _("This change has been made by another user") + htmlcode += html.render_icon("foreign_changes", + _("This change has been made by another user")) htmlcode += user + '</td>' htmlcode += '</td><td width="100%%">%s</td></tr>\n' % html.attrencode(text)

8 years, 1 month

← Newer
1
2
3
4
5
6
7
8
9
...
24
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits May 2016