Checkmk git commits June 2013

checkmk-commits@lists.checkmk.com

4 participants
186 discussions

Check_MK Git: check_mk: no longer output cached data if its older than twice the max cache age

by Andreas Boesl

Module: check_mk Branch: master Commit: 65f91ab899f606fdc8234f93faca0b12a6036da3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=65f91ab899f606… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Jun 3 13:10:14 2013 +0200 no longer output cached data if its older than twice the max cache age --- ChangeLog | 2 ++ agents/check_mk_agent.linux | 11 ++++++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 8052cde..a56c28d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -19,6 +19,8 @@ * windows_agent: Now available as 64 bit version * agent_vsphere: fix problem where sensors were missing when you queried multiple host systems via vCenter + * cached checks: no longer output cached data if the age of the + cache file is twice the maximum cache age Notifications: * Flexible Notification can now filter service levels diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index 335ba79..2ef7e6e 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -63,9 +63,18 @@ function run_cached () { if [ ! -d $MK_CONFDIR/cache ]; then mkdir -p $MK_CONFDIR/cache ; fi CACHEFILE="$MK_CONFDIR/cache/$NAME.cache" + # Check if the creation of the cache takes suspiciously long and return + # nothing if the age (access time) of $CACHEFILE.new is twice the MAXAGE + local NOW=$(date +%s) + if [ -e "$CACHEFILE.new" ] ; then + local CF_ATIME=$(stat -c %X "$CACHEFILE.new") + if [ $((NOW - CF_ATIME)) -ge $((MAXAGE * 2)) ] ; then + return + fi + fi + # 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

11 years

Check_MK Git: check_mk: Allow to configure check-/

by Mathias Kettner

retry_interval in second precision Message-ID: <51aa2ab1.SSd/BkiyxZowkk8U%mk(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: 5965c75170359a272d1ed95ce9f2e5d82cc8e150 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5965c75170359a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Jun 1 19:09:04 2013 +0200 Allow to configure check-/retry_interval in second precision --- ChangeLog | 3 ++ web/plugins/wato/check_mk_configuration.py | 57 ++++++++++++++++------------ 2 files changed, 35 insertions(+), 25 deletions(-) diff --git a/ChangeLog b/ChangeLog index c6f7623..8052cde 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,6 +10,9 @@ performance value. This might not always be the one you like, but its far better than nothing. + WATO: + * Allow to configure check-/retry_interval in second precision + Checks & Agents: * lnx_if: Fixed crash on missing "Address" field * viprinet_router: Now able to set required target state via rule diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index f16ac04..8ef77b0 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -1072,28 +1072,32 @@ register_rule(group, register_rule(group, "extra_service_conf:check_interval", - Integer(title = _("Normal check interval for service checks"), - help = _("Check_MK usually uses an interval of one minute for the active Check_MK " - "check and for legacy checks. Here you can specify a larger interval. Please " - "note, that this setting only applies to active checks (those with the " - "%s reschedule button). If you want to change the check interval of " - "the Check_MK service only, specify <tt><b>Check_MK$</b></tt> in the list " - "of services.") % '<img class="icon docu" src="images/icon_reload.gif">', - minvalue = 1, - label = _("minutes")), + Transform( + Age(minvalue=1, default_value=60), + forth = lambda v: int(v * 60), + back = lambda v: float(v) / 60.0, + title = _("Normal check interval for service checks"), + help = _("Check_MK usually uses an interval of one minute for the active Check_MK " + "check and for legacy checks. Here you can specify a larger interval. Please " + "note, that this setting only applies to active checks (those with the " + "%s reschedule button). If you want to change the check interval of " + "the Check_MK service only, specify <tt><b>Check_MK$</b></tt> in the list " + "of services.") % '<img class="icon docu" src="images/icon_reload.gif">'), itemtype = "service") register_rule(group, "extra_service_conf:retry_interval", - Integer(title = _("Retry check interval for service checks"), - help = _("This setting is relevant if you have set the maximum number of check " - "attempts to a number greater than one. In case a service check is not OK " - "and the maximum number of check attempts is not yet reached, it will be " - "rescheduled with this interval. The retry interval is usually set to a smaller " - "value than the normal interval.<br><br>This setting only applies to " - "active checks."), - minvalue = 1, - label = _("minutes")), + Transform( + Age(minvalue=1, default_value=60), + forth = lambda v: int(v * 60), + back = lambda v: float(v) / 60.0, + title = _("Retry check interval for service checks"), + help = _("This setting is relevant if you have set the maximum number of check " + "attempts to a number greater than one. In case a service check is not OK " + "and the maximum number of check attempts is not yet reached, it will be " + "rescheduled with this interval. The retry interval is usually set to a smaller " + "value than the normal interval.<br><br>This setting only applies to " + "active checks.")), itemtype = "service") register_rule(group, @@ -1158,27 +1162,30 @@ register_rule(group, register_rule(group, "extra_host_conf:check_interval", - Integer( + Transform( + Age(minvalue=1, default_value=60), + forth = lambda v: int(v * 60), + back = lambda v: float(v) / 60.0, title = _("Normal check interval for host checks"), help = _("The default interval is set to one minute. Here you can specify a larger " "interval. The host is contacted in this interval on a regular base. The host " "check is also being executed when a problematic service state is detected to check " - "wether or not the service problem is resulting from a host problem."), - minvalue = 1, - label = _("minutes") + "wether or not the service problem is resulting from a host problem.") ) ) register_rule(group, "extra_host_conf:retry_interval", - Integer(title = _("Retry check interval for host checks"), + Transform( + Age(minvalue=1, default_value=60), + forth = lambda v: int(v * 60), + back = lambda v: float(v) / 60.0, + title = _("Retry check interval for host checks"), help = _("This setting is relevant if you have set the maximum number of check " "attempts to a number greater than one. In case a host check is not UP " "and the maximum number of check attempts is not yet reached, it will be " "rescheduled with this interval. The retry interval is usually set to a smaller " "value than the normal interval."), - minvalue = 1, - label = _("minutes") ) )

11 years

Check_MK Git: check_mk: Added PNP template for host ping

by Mathias Kettner

Module: check_mk Branch: master Commit: cccb746e4a75afdab7ef5ddbfe11c1f7cf24b2a5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cccb746e4a75af… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Jun 1 16:52:53 2013 +0200 Added PNP template for host ping --- pnp-templates/check-mk-host-ping.php | 1 + 1 file changed, 1 insertion(+) diff --git a/pnp-templates/check-mk-host-ping.php b/pnp-templates/check-mk-host-ping.php new file mode 120000 index 0000000..98c29f2 --- /dev/null +++ b/pnp-templates/check-mk-host-ping.php @@ -0,0 +1 @@ +check-mk-ping.php \ No newline at end of file

11 years

Check_MK Git: check_mk: Livestatus: fix some compile problems on lenny

by Mathias Kettner

Module: check_mk Branch: master Commit: b327fcd4f845010bca9b89b300f5e7f2de499eeb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b327fcd4f84501… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Jun 1 12:51:54 2013 +0200 Livestatus: fix some compile problems on lenny --- livestatus/src/LogCache.cc | 1 + livestatus/src/PerfdataAggregator.cc | 1 + 2 files changed, 2 insertions(+) diff --git a/livestatus/src/LogCache.cc b/livestatus/src/LogCache.cc index 7d6cca4..9f5b025 100644 --- a/livestatus/src/LogCache.cc +++ b/livestatus/src/LogCache.cc @@ -28,6 +28,7 @@ #include <unistd.h> #include <stddef.h> #include <stdarg.h> +#include <stdlib.h> #include "nagios.h" #include "logger.h" diff --git a/livestatus/src/PerfdataAggregator.cc b/livestatus/src/PerfdataAggregator.cc index 45a2576..3f1fd40 100644 --- a/livestatus/src/PerfdataAggregator.cc +++ b/livestatus/src/PerfdataAggregator.cc @@ -24,6 +24,7 @@ #include <string.h> #include <math.h> +#include <stdlib.h> #include "strutil.h" #include "logger.h"

11 years

Check_MK Git: check_mk: Removed old obsolete Makefile

by Mathias Kettner

Module: check_mk Branch: master Commit: bbc61b648789e6e224cc5c0a24c22f0e7b71b637 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bbc61b648789e6… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Jun 1 09:18:41 2013 +0200 Removed old obsolete Makefile --- livestatus/src/Makefile.manual | 79 ---------------------------------------- 1 file changed, 79 deletions(-) diff --git a/livestatus/src/Makefile.manual b/livestatus/src/Makefile.manual deleted file mode 100644 index fb35c57..0000000 --- a/livestatus/src/Makefile.manual +++ /dev/null @@ -1,79 +0,0 @@ -# +------------------------------------------------------------------+ -# | _ _ _ | -# | __| |_ ___ __| |__ _ __ | |__ | -# | / _| ' \/ -_) _| / / | ' \| / / | -# | \__|_||_\___\__|_\_\_|_|_|_|_\_\ | -# | |___| | -# | _ _ __ _ _ _ ____ | -# | / | / | / \| |__ ___| |_ __ _/ |__ | | -# | | |_| || () | '_ \/ -_) _/ _` | | / / | -# | |_(_)_(_)__/|_.__/\___|\__\__,_|_|/_/ | -# | check_mk 1.1.0beta17 | -# | | -# | Copyright Mathias Kettner 2009 mk(a)mathias-kettner.de | -# +------------------------------------------------------------------+ -# -# This file is part of check_mk 1.1.0beta17. -# 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. - -CFLAGS = -O2 -fPIC -I.. - -#ifdef DEBUG - CXXFLAGS += -Wall -pedantic -Werror -#endif -CXXFLAGS = $(CFLAGS) - - -OBJECTS = TableServices.o TableHosts.o Table.o Query.o StringColumn.o \ - OffsetStringColumn.o Store.o store.o logger.o strutil.o \ - Filter.o IntColumn.o OffsetIntColumn.o \ - AndingFilter.o StringColumnFilter.o IntColumnFilter.o \ - Column.o OffsetTimeperiodColumn.o ContactsColumn.o \ - HostContactsColumn.o ListColumnFilter.o ListColumn.o \ - ServiceContactsColumn.o TableContacts.o Downtime.o \ - TableDowntimes.o DowntimesColumn.o CustomVarsColumn.o \ - CustomVarsFilter.o TableHostgroups.o HostlistColumn.o \ - HostlistColumnFilter.o ServicelistColumn.o ServicelistColumnFilter.o \ - TableServicegroups.o OringFilter.o ServicelistStateColumn.o \ - HostlistStateColumn.o global_counters.o GlobalCountersColumn.o \ - TableStatus.o TableColumns.o ColumnsColumn.o TableCommands.o \ - ServicegroupsColumn.o HostgroupsColumn.o EmptyColumn.o \ - OutputBuffer.o DoubleColumn.o DoubleColumnFilter.o \ - OffsetDoubleColumn.o ClientQueue.o InputBuffer.o \ - HostSpecialIntColumn.o - - - -.PHONY: all clean deps tags - -all: livestatus.o unixcat - -livestatus.o: $(OBJECTS) livestatus.c - gcc $(CFLAGS) -shared -o $@ livestatus.c $(OBJECTS) -lpthread -lstdc++ - -unixcat: unixcat.c - $(CC) -lpthread -o $@ $^ - -clean: - rm -f *.o tags .deps *~ unixcat - -tags: - ctags $^ - -deps: - gcc -MM *.cc > .deps - --include .deps - -

11 years

Check_MK Git: check_mk: WATO: cleanup texts in activation page

by Mathias Kettner

Module: check_mk Branch: master Commit: 28dfe3d90d48f640c13255014052b2c19b1ad1ad URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=28dfe3d90d48f6… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Jun 1 08:57:07 2013 +0200 WATO: cleanup texts in activation page --- web/htdocs/wato.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 7305818..2949354 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -3492,6 +3492,7 @@ def mode_changelog(phase): sitestatus_do_async_replication = True else: # phase: regular page rendering + changes_activated = False if is_distributed(): # Distributed WATO: Show replication state of each site @@ -3671,6 +3672,7 @@ def mode_changelog(phase): # Single site setup if cmc_rush_ahead_activation(): html.message(_("All changes have been activated.")) + changes_activated = True else: # Is rendered on the page after hitting the "activate" button # Renders the html to show the progress and starts the sync via javascript @@ -3688,7 +3690,8 @@ def mode_changelog(phase): pending = parse_audit_log("pending") if len(pending) == 0: - html.write("<div class=info>" + _("There are no pending changes.") + "</div>") + if not changes_activated: + html.write("<div class=info>" + _("There are no pending changes.") + "</div>") else: html.write('<div id=pending_changes>') render_audit_log(pending, "pending", hilite_others=True)

11 years

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits June 2013