Checkmk git commits May 2012

checkmk-commits@lists.checkmk.com

2 participants
440 discussions

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: ba79400f2cf5a349f5c82fc7e362fa9a125d332a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ba79400f2cf5a3… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Tue May 29 16:18:15 2012 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 4 months

Check_MK Git: check_mk: AIX Agent: make multipath check simpler

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 3eb65c7834cd2881c4868c83aeabbeed63d41ac8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3eb65c7834cd28… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Tue May 29 15:04:19 2012 +0200 AIX Agent: make multipath check simpler --- agents/check_mk_agent.aix | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/agents/check_mk_agent.aix b/agents/check_mk_agent.aix index c0133e3..7684cad 100755 --- a/agents/check_mk_agent.aix +++ b/agents/check_mk_agent.aix @@ -93,8 +93,7 @@ fi echo '<<<aix_multipath>>>' -# output path status, but remove SAS enclsoure management devices - lspath -F"name parent path_status status" | grep -v ses + lspath -F"name parent status" echo '<<<tcp_conn_stats>>>'

12 years, 4 months

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

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: b3afedaf861ba65dd5424567e205599219028a33 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b3afedaf861ba6… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Tue May 29 15:04:36 2012 +0200 Merge branch 'master' of mathias-kettner.de:check_mk ---

12 years, 4 months

Check_MK Git: check_mk: Updated Changelog

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: e8d3bb29792a573c66c7742ee5dc428cc815c1cf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e8d3bb29792a57… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Tue May 29 12:41:58 2012 +0200 Updated Changelog --- ChangeLog | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9cdee8d..64c60c9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -8,6 +8,8 @@ * FIX: Fixed "make_utf is not defined" error when having custom timeperiods defined in WATO + Checks & Agents: + * MacOS X: Agent for MacOS (Thanks to Christian Zigotzky) 1.2.0b5: Core: * FIX: handle UTF-8 encoded binary strings correctly (e.g. in host alias)

12 years, 4 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: e2fd968b30b694bab5e88ae682757ce27b7fbc37 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e2fd968b30b694… Author: Christian Zigotzky <info(a)xenosoft.de> Date: Tue May 29 12:37:09 2012 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 4 months

Check_MK Git: check_mk: New Agent for MacOS

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 57255cf24dc8bafb00bff36b833ea7122b6fbc14 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=57255cf24dc8ba… Author: Christian Zigotzky <info(a)xenosoft.de> Date: Tue May 29 12:36:53 2012 +0200 New Agent for MacOS --- agents/check_mk_agent.macosx | 72 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 72 insertions(+), 0 deletions(-) diff --git a/agents/check_mk_agent.macosx b/agents/check_mk_agent.macosx new file mode 100755 index 0000000..7f143e9 --- /dev/null +++ b/agents/check_mk_agent.macosx @@ -0,0 +1,72 @@ +#!/bin/sh +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | 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. +# +# NOTE: This agent has beed adapted from the Check_MK linux agent. + +# Remove locale settings to eliminate localized outputs where possible +# Author: Christian Zigotzky <info(a)xenosoft.de> +export LC_ALL=C +unset LANG + +export MK_LIBDIR="/to/be/changed" +export MK_CONFDIR="/to/be/changed" + +echo '<<<check_mk>>>' +echo Version: 1.2.0b5 +echo AgentOS: macosx + +osver="$(uname -r)" + +echo '<<<df>>>'; +df -kPt hfs | sed -e 's/^$[^ ][^ ]*$ $.*$$/\1 hfs \2/' | sed 1d + +echo '<<<cpu>>>'; +echo `sysctl -n vm.loadavg | tr -d '{}'` `top -l 1 -n 1 | egrep ^Processes: | +awk '{print $4"/"$2;}'` `echo 'echo $$' | bash` `sysctl -n hw.ncpu` + +echo '<<<uptime>>>'; +echo `date +%s` - `sysctl -n kern.boottime | cut -d' ' -f 4,7 | tr ',' '.' | +tr -d ' '` | bc + +echo '<<<netctr>>>'; +date +'%s'; netstat -inb | egrep -v '(^Name|lo|plip)' | grep Link | awk '{ +print $1,$7,$5,$6,"0","0","0","0","0",$10,$8,$9,"0","0",$11,"0","0"; }' + +echo '<<<ps>>>' +ps ax -o user,vsz,rss,pcpu,command | sed -e 1d -e 's/ *$[^ ]*$ *$[^ ]*$ *$[^ ]*$ *$[^ ]*$ */(\1,\2,\3,\4) /' + +# MK's Remote Plugin Executor +if [ -e "/etc/mrpe.cfg" ] +then + echo '<<<mrpe>>>' + grep -Ev '^[[:space:]]*($|#)' "/etc/mrpe.cfg" | \ + while read descr cmdline + do + PLUGIN=${cmdline%% *} + OUTPUT=$(eval "$cmdline") + echo "(${PLUGIN##*/}) $descr $? $OUTPUT" | tr \\n \\1 + echo + done +fi

12 years, 4 months

Check_MK Git: check_mk: Fixed background color of warning windows

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: ca1edc385717e3d35e47e180939b0b211028789f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ca1edc385717e3… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat May 26 15:40:15 2012 +0200 Fixed background color of warning windows --- web/htdocs/check_mk.css | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index 2b384e0..8cc0988 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -338,6 +338,10 @@ div.error a { div.warning { background-color: #ff4; border-color: #fc0; + color: #000; +} +div.warning a { + color: #000; } /*-ValueSpec---------------------------------------------------------------.

12 years, 4 months

Check_MK Git: check_mk: FIX: Edit view: could not edit filter settings

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 3df61a777d233880e63cfb4e53200737ba31b8f2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3df61a777d2338… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat May 26 21:21:33 2012 +0200 FIX: Edit view: could not edit filter settings --- ChangeLog | 1 + web/htdocs/js/checkmk.js | 15 ++++++++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index d277058..9cdee8d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,7 @@ Multisite: * FIX: Fixed layout of some dropdown fields in view filters * Make heading in each page clickable -> reload page + * FIX: Edit view: couldn't edit filter settings Core: * FIX: Fixed "make_utf is not defined" error when having custom diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index 695a2ee..b92519e 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -294,13 +294,18 @@ function filter_activation(oSelect) oDiv.setAttribute("className", "filtersetting " + usage); oDiv.setAttribute("class", "filtersetting " + usage); + // If the filter is not in state hard or show, disable filter + // input var disabled = usage != "hard" && usage != "show"; - var oNode; - for (var i in oDiv.childNodes) { - oNode = oDiv.childNodes[i]; - if (oNode.tagName == "INPUT" || oNode.tagName == "SELECT") { - oNode.disabled = disabled; + var oFloatFilter = oSelect.nextSibling; + if (oFloatFilter) { + for (var i in oFloatFilter.childNodes) { + oNode = oFloatFilter.childNodes[i]; + if (oNode.tagName == "INPUT" || oNode.tagName == "SELECT") { + oNode.disabled = disabled; + } } + oFloatFilter = null; } p = null;

12 years, 4 months

Check_MK Git: check_mk: Styling: color of Livestatus headers in debug mode black

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: d14841c3e05d62b657c00be7c772b047677354c6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d14841c3e05d62… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat May 26 22:44:37 2012 +0200 Styling: color of Livestatus headers in debug mode black --- web/htdocs/check_mk.css | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index 8cc0988..a533478 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -221,6 +221,7 @@ div.livestatus.message { left: 10px; font-size: 8pt; z-index: 20; + color: black; } /*-------------------------------------------------------------------------.

12 years, 4 months

Check_MK Git: check_mk: Generlize concept of configuration domains ( for mkeventd)

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 6e95a3a710da63b239d4fef0d2cc79e821b1cb0a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6e95a3a710da63… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon May 28 15:21:06 2012 +0200 Generlize concept of configuration domains (for mkeventd) --- web/htdocs/wato.py | 25 +++++++++++++++++++------ 1 files changed, 19 insertions(+), 6 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 0cbf419..17b07fc 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -5350,6 +5350,19 @@ def register_configvar(group, varname, valuespec, domain="check_mk", need_restar g_configvar_groups.setdefault(group, []).append((domain, varname, valuespec)) g_configvars[varname] = domain, valuespec, need_restart +g_configvar_domains = { + "check_mk" : { + "configdir" : root_dir, + }, + "multisite" : { + "configdir" : multisite_dir, + }, +} + +def register_configvar_domain(domain, configdir): + g_configvar_domains[domain] = { + "configdir" : configdir, + } # Persistenz: Speicherung der Werte # - WATO speichert seine Variablen für main.mk in conf.d/wato/global.mk @@ -5369,8 +5382,8 @@ def register_configvar(group, varname, valuespec, domain="check_mk", need_restar def load_configuration_settings(): settings = {} - load_configuration_vars(multisite_dir + "global.mk", settings) - load_configuration_vars(root_dir + "global.mk", settings) + for domain, domain_info in g_configvar_domains.items(): + load_configuration_vars(domain_info["configdir"] + "global.mk", settings) return settings @@ -5397,10 +5410,10 @@ def save_configuration_settings(vars): continue per_domain.setdefault(domain, {})[varname] = vars[varname] - make_nagios_directory(root_dir) - save_configuration_vars(per_domain.get("check_mk", {}), root_dir + "global.mk") - make_nagios_directory(multisite_dir) - save_configuration_vars(per_domain.get("multisite", {}), multisite_dir + "global.mk") + for domain, domain_info in g_configvar_domains.items(): + dir = domain_info["configdir"] + make_nagios_directory(dir) + save_configuration_vars(per_domain.get(domain, {}), dir + "global.mk") def save_configuration_vars(vars, filename): out = create_user_file(filename, 'w')

12 years, 4 months

← Newer
1
2
3
4
5
6
7
...
44
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits May 2012