Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64449 discussions

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

by Andreas Boesl

Module: check_mk Branch: master Commit: 3dd9c0576280899b8292f232911559a63fa9bf1d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3dd9c057628089… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Mar 5 13:42:04 2013 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 7 months

Check_MK Git: check_mk: Fix problem in WATO inventory with g_service_description

by Mathias Kettner

Module: check_mk Branch: master Commit: aa0b2f65ed33777a0fe53afa7133e5293568dc2c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=aa0b2f65ed3377… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Mar 5 12:38:31 2013 +0100 Fix problem in WATO inventory with g_service_description --- modules/automation.py | 2 ++ pnp-templates/.f12 | 3 ++- 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/modules/automation.py b/modules/automation.py index 8eb3c4d..a0ed7e9 100644 --- a/modules/automation.py +++ b/modules/automation.py @@ -254,6 +254,8 @@ def automation_try_inventory_node(hostname): params = None if state_type not in [ 'legacy', 'active' ]: descr = service_description(ct, item) + global g_service_description + g_service_description = descr infotype = ct.split('.')[0] opt_use_cachefile = True opt_no_tcp = True diff --git a/pnp-templates/.f12 b/pnp-templates/.f12 index 909a51f..832634b 100644 --- a/pnp-templates/.f12 +++ b/pnp-templates/.f12 @@ -1,4 +1,5 @@ -sudo cp * /omd/versions/default/share/check_mk/pnp-templates +SITE=${SITE:-$(omd sites --bare | head -n 1)} +sudo cp * /omd/sites/$SITE/share/check_mk/pnp-templates echo 'location.reload();' | nc -w 0 localhost 32000

11 years, 7 months

Check_MK Git: check_mk: Prediction: remove weight parameter for the while

by Mathias Kettner

Module: check_mk Branch: master Commit: 523f14c16460822b3b2b5628589d872cc46f2679 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=523f14c1646082… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Mar 5 08:36:19 2013 +0100 Prediction: remove weight parameter for the while --- web/htdocs/wato.py | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 6b11fdf..58f71f2 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -10891,12 +10891,12 @@ def PredictiveLevels(**args): minvalue = 1, default_value = 90, )), - ( "weight", - Percentage( - title = _("Raise weight of recent time"), - label = _("by"), - default_value = 0, - )), + # ( "weight", + # Percentage( + # title = _("Raise weight of recent time"), + # label = _("by"), + # default_value = 0, + # )), ( "levels_upper", CascadingDropdown( title = _("Dynamic levels (upper bound)"),

11 years, 7 months

Check_MK Git: check_mk: Fixed typo

by Mathias Kettner

Module: check_mk Branch: master Commit: 494fc39c32de77f435195abb05c6c6fea0577668 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=494fc39c32de77… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Mar 4 21:43:19 2013 +0100 Fixed typo --- checkman/apache_status | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/checkman/apache_status b/checkman/apache_status index b5648f9..5f35356 100644 --- a/checkman/apache_status +++ b/checkman/apache_status @@ -12,7 +12,7 @@ description: but it fetches interesting performance data. As a preparation you need to install the agent plugin {apache_status} - into you agent's plugins directory (usually {/usr/lib/check_mk_agent/plugins}). + into your agent's plugins directory (usually {/usr/lib/check_mk_agent/plugins}). The plugin tries to autodetect all running apache servers. If that fails for some reason you need to create the configuration file {/etc/check_mk/apache_status.cfg} and list your servers here. Write

11 years, 7 months

Check_MK Git: check_mk: Added README for cached agent plugins

by Mathias Kettner

Module: check_mk Branch: master Commit: d43cda4f4e4f11fe02652c9ffa18bce6719b3522 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d43cda4f4e4f11… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Mar 4 21:47:21 2013 +0100 Added README for cached agent plugins --- agents/plugins/README | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/agents/plugins/README b/agents/plugins/README new file mode 100644 index 0000000..8072aff --- /dev/null +++ b/agents/plugins/README @@ -0,0 +1,17 @@ +These plugins can be installed in the plugins directory of the +Linux agent in /usr/lib/check_mk_agent/plugins/. Please only install +the plugins that you really need. + +If you want a plugin to be run asynchronously and also in +a larger interval then the normal check interval, then you can +copy it to a subdirectory named after a number of seconds, +e.g.: + +/usr/lib/check_mk_agent/plugins/3600/mk_zypper + +In that case the agent will: + + - Run this plugin in the background and wait not for it to finish. + - Store the result of the plugin in a cache file below /etc/check_mk/cache. + - Use that file for 300 seconds before running the script again. +

11 years, 7 months

Check_MK Git: check_mk: Linux agent: allow cached local/plugins checks ( see docu)

by Mathias Kettner

Module: check_mk Branch: master Commit: 96f52f9bd3d097ee3b65756708687e09d90c607e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=96f52f9bd3d097… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Mar 4 21:28:23 2013 +0100 Linux agent: allow cached local/plugins checks (see docu) --- ChangeLog | 1 + agents/check_mk_agent.linux | 128 ++++++++++++++++++++++-------------------- 2 files changed, 68 insertions(+), 61 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3824518..e9324bc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -38,6 +38,7 @@ new param post can now be configured via int and float, now supports percentage values * mounts: ignore multiple occurrances of the same device + * Linux agent: allow cached local/plugins checks (see docu) Livestatus: * Table statehist: Improved detection of vanished hosts and services. diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index c5ebbfe..5eb5e6f 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -52,6 +52,33 @@ else exec <&- 2>/dev/null fi +# Runs a command asynchronous by use of a cache file +function run_cached () { + if [ "$1" = -s ] ; then local section="echo '<<<$2>>>' ; " ; shift ; fi + local NAME=$1 + local MAXAGE=$2 + shift 2 + local CMDLINE="$section$@" + + if [ ! -d $MK_CONFDIR/cache ]; then mkdir -p $MK_CONFDIR/cache ; fi + CACHEFILE="$MK_CONFDIR/cache/$NAME.cache" + + # Check if cache file exists and is recent enough + if [ -s "$CACHEFILE" ] ; then + local NOW=$(date +%s) + local MTIME=$(stat -c %Y "$CACHEFILE") + if [ $((NOW - MTIME)) -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" + fi + + # Cache file outdated and new job not yet running? Start it + if [ -z "$USE_CACHEFILE" -a ! -e "$CACHEFILE.new" ] ; then + echo "$CMDLINE" | setsid bash -o noclobber > $CACHEFILE.new && mv $CACHEFILE.new $CACHEFILE || rm -f $CACHEFILE $CACHEFILE.new & + fi +} + echo '<<<check_mk>>>' echo Version: 1.2.3i1 echo AgentOS: linux @@ -224,39 +251,10 @@ date +%s sed -e 1,2d -e 's/:/ /g' < /proc/net/dev -if type ipmitool >/dev/null +# Hardware sensors via IPMI (need ipmitool) +if type ipmitool > /dev/null then - echo '<<<ipmi>>>' - IPMI_FILE=$MK_CONFDIR/ipmitool_sensors.cache - if [ ! -d $MK_CONFDIR ]; then - mkdir -p $MK_CONFDIR - fi - - # Do not use cache file after 20 minutes - IPMI_MAXAGE=1200 - - # Check if file exists and is recent enough - if [ -s $IPMI_FILE ] - then - NOW=$(date +%s) - MTIME=$(stat -c %Y $IPMI_FILE) - if [ $((NOW - MTIME)) -le $IPMI_MAXAGE ] ; then - USE_IPMI_FILE=1 - fi - fi - - if [ -s "$IPMI_FILE" ] - then - grep -v 'command failed' "$IPMI_FILE" \ - | sed -e 's/ *| */|/g' -e "s/ /_/g" -e 's/_*$//' -e 's/|/ /g' \ - | egrep -v '^[^ ]+ na ' \ - | grep -v ' discrete ' - fi - - if [ -z "$USE_IPMI_FILE" -a ! -e "$IPMI_FILE.new" ] - then - setsid bash -c "set -o noclobber ; ipmitool sensor list > $IPMI_FILE.new && mv $IPMI_FILE.new $IPMI_FILE || rm -f $IPMI_FILE*" & - fi + run_cached -s ipmi 300 "ipmitool sensor list | grep -v 'command failed' | sed -e 's/ *| */|/g' -e 's/ /_/g' -e 's/_*"'$'"//' -e 's/|/ /g' | egrep -v '^[^ ]+ na ' | grep -v ' discrete '" fi @@ -358,9 +356,8 @@ if [ -e /etc/openvpn/openvpn-status.log ] ; then fi if type ntpq > /dev/null 2>&1 ; then - echo '<<<ntp>>>' - # remote heading, make first column space separated - waitmax 2 ntpq -p | sed -e 1,2d -e 's/^$.$/\1 /' -e 's/^ /%/' + # remove heading, make first column space separated + run_cached -s ntp 30 "waitmax 5 ntpq -p | sed -e 1,2d -e 's/^$.$/\1 /' -e 's/^ /%/'" fi if type nvidia-settings >/dev/null && [ -S /tmp/.X11-unix/X0 ] @@ -431,8 +428,7 @@ fi # Check status of OMD sites if type omd >/dev/null then - echo '<<<omd_status>>>' - omd status --bare --auto + run_cached omd_status 60 "echo '<<<omd_status>>>' ; omd status --bare --auto" fi @@ -467,30 +463,6 @@ then done fi - -# Einbinden von lokalen Plugins, die eine eigene Sektion ausgeben -if cd $PLUGINSDIR -then - for skript in $(ls) - do - if [ -x "$skript" ] ; then - ./$skript - fi - done -fi - -# Lokale Einzelchecks -echo '<<<local>>>' -if cd $LOCALDIR -then - for skript in $(ls) - do - if [ -x "$skript" ] ; then - ./$skript - fi - done -fi - # MK's Remote Plugin Executor if [ -e "$MK_CONFDIR/mrpe.cfg" ] then @@ -504,3 +476,37 @@ then echo done fi + + +# Local checks +echo '<<<local>>>' +if cd $LOCALDIR ; then + for skript in $(ls) ; do + if [ -f "$skript" -a -x "$skript" ] ; then + ./$skript + fi + done + # Call some plugins only every X'th minute + for skript in [1-9]*/* ; do + if [ -x "$skript" ] ; then + run_cached local_${skript//\//\\} ${skript%/*} "$skript" + fi + done +fi + +# Plugins +if cd $PLUGINSDIR ; then + for skript in $(ls) ; do + if [ -f "$skript" -a -x "$skript" ] ; then + ./$skript + fi + done + # Call some plugins only every X'th minute + for skript in [1-9]*/* ; do + if [ -x "$skript" ] ; then + run_cached plugins_${skript//\//\\} ${skript%/*} "$skript" + fi + done +fi + +

11 years, 7 months

Check_MK Git: check_mk: Install Linux agent in .f12

by Mathias Kettner

Module: check_mk Branch: master Commit: 8f3aa7beed9693c10d5cb0e6e3f6e7d16ccd1a53 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8f3aa7beed9693… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Mar 4 20:13:02 2013 +0100 Install Linux agent in .f12 --- agents/.f12 | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/agents/.f12 b/agents/.f12 index 4c32b21..f46aa52 100644 --- a/agents/.f12 +++ b/agents/.f12 @@ -4,3 +4,4 @@ if [ -e /etc/check_mk ] then sudo install -m 644 logwatch.cfg /etc/check_mk/ fi +sudo install -m 755 check_mk_agent.linux /usr/bin/check_mk_agent

11 years, 7 months

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

by Mathias Kettner

Module: check_mk Branch: master Commit: 1f373a08d30a2eb5facbfe120a0454deac077db5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1f373a08d30a2e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Mar 4 21:28:31 2013 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 7 months

Check_MK Git: check_mk: Also detecting wether or not service/

by Lars Michelsen

host groups are used during deletion of them Message-ID: <5134f9ea.a6Jcn0ZMtVhKPrD2%lm(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.4 7/29/08 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: 354d96b0e907aedb6cc4661dfec6d8266758ba14 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=354d96b0e907ae… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Mar 4 20:43:51 2013 +0100 Also detecting wether or not service/host groups are used during deletion of them --- web/htdocs/wato.py | 65 ++++++++++++++++++++++++++++++--------------------- 1 files changed, 38 insertions(+), 27 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 7541070..6b11fdf 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -5647,16 +5647,10 @@ def save_configuration_vars(vars, filename): # | Mode for editing host-, service- and contact groups | # '----------------------------------------------------------------------' -# Check if a group is currently in use and cannot be deleted -# Returns a list of occurrances. -# Possible usages: -# - 1. rules: host to contactgroups, services to contactgroups -# - 2. user memberships -def find_usage_of_contact_groups(name): - # Part 1: Rules +def find_usages_of_group_in_rules(name, varnames): used_in = [] rulesets = load_all_rulesets() - for varname in [ 'host_contactgroups', 'service_contactgroups' ]: + for varname in varnames: ruleset = rulesets[varname] rulespec = g_rulespecs[varname] for folder, rule in ruleset: @@ -5664,6 +5658,16 @@ def find_usage_of_contact_groups(name): if value == name: used_in.append(("%s: %s" % (_("Ruleset"), g_rulespecs[varname]["title"]), make_link([("mode", "edit_ruleset"), ("varname", varname)]))) + return used_in + +# Check if a group is currently in use and cannot be deleted +# Returns a list of occurrances. +# Possible usages: +# - 1. rules: host to contactgroups, services to contactgroups +# - 2. user memberships +def find_usages_of_contact_group(name): + # Part 1: Rules + used_in = find_usages_of_group_in_rules(name, [ 'host_contactgroups', 'service_contactgroups' ]) # Is the contactgroup assigned to a user? users = filter_hidden_users(userdb.load_users()) @@ -5698,6 +5702,12 @@ def find_usage_of_contact_groups(name): return used_in +def find_usages_of_host_group(name): + return find_usages_of_group_in_rules(name, [ 'host_groups' ]) + +def find_usages_of_service_group(name): + return find_usages_of_group_in_rules(name, [ 'service_groups' ]) + def mode_groups(phase, what): if what == "host": what_name = _("host groups") @@ -5727,23 +5737,24 @@ def mode_groups(phase, what): delname = html.var("_delete") if what == 'contact': - usages = find_usage_of_contact_groups(delname) - if usages: - message = "%s %s:<ul>" % \ - (_("You cannot delete this contactgroup."), - _("It is still in use by")) - for title, link in usages: - message += '<li><a href="%s">%s</a></li>\n' % (link, title) - message += "</ul>" - raise MKUserError(None, message) + usages = find_usages_of_contact_group(delname) + elif what == 'host': + usages = find_usages_of_host_group(delname) + elif what == 'service': + usages = find_usages_of_service_group(delname) + + if usages: + message = "%s %s:<ul>" % \ + (_("You cannot delete this %s group.") % what, + _("It is still in use by")) + for title, link in usages: + message += '<li><a href="%s">%s</a></li>\n' % (link, title) + message += "</ul>" + raise MKUserError(None, message) - confirm_txt = _('Do you really want to delete the %s group %s?') % (what, delname) - else: - confirm_txt = _("Do you really want to delete the %s group %s? If there are still objects " - "assigned to that group, the group will kept up (but without an alias). " - "Removing all objects from the will make the group disappear completely. ") % (what, delname) + confirm_txt = _('Do you really want to delete the %s group "%s"?') % (what, delname) - c = wato_confirm(_("Confirm deletion of group %s" % delname), confirm_txt) + c = wato_confirm(_("Confirm deletion of group \"%s\"" % delname), confirm_txt) if c: del groups[delname] save_group_information(all_groups) @@ -5952,7 +5963,7 @@ def mode_timeperiods(phase): if phase == "action": delname = html.var("_delete") if html.transaction_valid(): - usages = find_usage_of_timeperiod(delname) + usages = find_usages_of_timeperiod(delname) if usages: message = "%s %s:<ul>" % \ (_("You cannot delete this timeperiod."), @@ -6296,7 +6307,7 @@ class TimeperiodSelection(ElementSelection): # - 1. rules: service/host-notification/check-period # - 2. user accounts (notification period) # - 3. excluded by other timeperiods -def find_usage_of_timeperiod(tpname): +def find_usages_of_timeperiod(tpname): # Part 1: Rules used_in = []

11 years, 7 months

Check_MK Git: check_mk: Now really fixed duplicate tag registration

by Lars Michelsen

Module: check_mk Branch: master Commit: 15f449ddc7300c00ec97aa025b548eb1b42e968b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=15f449ddc7300c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Mar 4 20:29:13 2013 +0100 Now really fixed duplicate tag registration --- web/htdocs/config.py | 12 +----------- web/htdocs/index.py | 4 ++-- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/web/htdocs/config.py b/web/htdocs/config.py index 8e6b9b4..25dfd8d 100644 --- a/web/htdocs/config.py +++ b/web/htdocs/config.py @@ -408,17 +408,7 @@ def read_site_config(): def save_site_config(): save_user_file("siteconfig", user_siteconf) -# Datastructures and functions needed before plugins can be loaded -loaded_with_language = False - def load_plugins(): - global loaded_with_language - if loaded_with_language == current_language: - return - load_web_plugins("config", globals()) - # This must be set after plugin loading to make broken plugins raise - # exceptions all the time and not only the first time (when the plugins - # are loaded). - loaded_with_language = current_language +load_plugins() diff --git a/web/htdocs/index.py b/web/htdocs/index.py index 882bdf4..ffd836c 100644 --- a/web/htdocs/index.py +++ b/web/htdocs/index.py @@ -34,8 +34,8 @@ __builtin__.current_language = None from mod_python import apache, util, Cookie import sys, os, pprint from lib import * -import livestatus, defaults, config -import htmllib, login, userdb, hooks, default_permissions +import livestatus +import defaults, config, htmllib, login, userdb, hooks, default_permissions # Load page handlers pagehandlers = {}

11 years, 7 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits