Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64454 discussions

Check_MK Git: check_mk: liveproxyd: gracefully handle invalid requests

by Mathias Kettner

Module: check_mk Branch: master Commit: 99723cb2ec6ec5bd8b803e6ace6516d0cee656a7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=99723cb2ec6ec5… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jun 4 16:52:42 2013 +0200 liveproxyd: gracefully handle invalid requests --- doc/treasures/liveproxy/liveproxyd | 131 +++++++++++++++++++++++++----------- 1 file changed, 91 insertions(+), 40 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=99723cb2ec…

11 years, 4 months

Check_MK Git: check_mk: apache_status: fix exception if parameter is None

by Mathias Kettner

Module: check_mk Branch: master Commit: f61b36348bf7447ff7780201454009afc6be89c8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f61b36348bf744… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jun 3 16:55:19 2013 +0200 apache_status: fix exception if parameter is None --- ChangeLog | 1 + checks/apache_status | 3 +++ 2 files changed, 4 insertions(+) diff --git a/ChangeLog b/ChangeLog index c6f7623..d2d9db6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -16,6 +16,7 @@ * windows_agent: Now available as 64 bit version * agent_vsphere: fix problem where sensors were missing when you queried multiple host systems via vCenter + * apache_status: fix exception if parameter is None Notifications: * Flexible Notification can now filter service levels diff --git a/checks/apache_status b/checks/apache_status index 991aebf..79f53b6 100644 --- a/checks/apache_status +++ b/checks/apache_status @@ -100,6 +100,9 @@ def inventory_apache_status(info): return inv def check_apache_status(item, params, info): + if params == None: + params = {} + all_data = apache_status_parse(info) if item not in all_data: return (3, 'Unable to find instance in agent output')

11 years, 4 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: 7aaaf4a8925e0de62670e0da0f723d24ab696e4b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7aaaf4a8925e0d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jun 3 16:55:43 2013 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk Conflicts: ChangeLog ---

11 years, 4 months

Check_MK Git: check_mk: Updated bug entries #0891

by Mathias Kettner

Module: check_mk Branch: master Commit: aad342dc99986b510906af3793ebdabfb269968f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=aad342dc99986b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jun 3 14:31:52 2013 +0200 Updated bug entries #0891 --- .bugs/891 | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.bugs/891 b/.bugs/891 new file mode 100644 index 0000000..942daaa --- /dev/null +++ b/.bugs/891 @@ -0,0 +1,10 @@ +Title: Optical representation of regex field +Component: wato +State: open +Date: 2013-06-03 14:23:08 +Targetversion: 1.4.0 +Class: nastiness + +I think we should hilite regex inputs fields optically and +maybe also validate them. This can prevent regex errors +deeply in the Check_MK code generation.

11 years, 4 months

Check_MK Git: check_mk: Updated bug entries #0890

by Mathias Kettner

Module: check_mk Branch: master Commit: 07ea424e418c33153df9421a21b6ad4f941f8101 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=07ea424e418c33… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jun 3 14:20:24 2013 +0200 Updated bug entries #0890 --- .bugs/890 | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.bugs/890 b/.bugs/890 new file mode 100644 index 0000000..30f064f --- /dev/null +++ b/.bugs/890 @@ -0,0 +1,11 @@ +Title: Better error handling for invalid regex in rule +Component: core +State: open +Date: 2013-06-03 14:18:36 +Targetversion: 1.2.3 +Class: nastiness + +If you enter e.g. H:\ into the "Mount Point" of the df-Rule then cmk -C +crashes with an exception. + +Can we make a validator here?

11 years, 4 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: 0e4d85efddc346dbff4e11a70909c27b7af11ae7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0e4d85efddc346… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jun 3 14:20:25 2013 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 4 months

Check_MK Git: check_mk: windows agent not longer executes directories

by Andreas Boesl

Module: check_mk Branch: master Commit: 8544bdbfff6277b20d56e5ab1fece74e1fd30965 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8544bdbfff6277… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Jun 3 14:18:46 2013 +0200 windows agent not longer executes directories --- ChangeLog | 1 + agents/windows/check_mk_agent.cc | 6 ++++++ agents/windows/check_mk_agent.exe | Bin 112640 -> 112640 bytes agents/windows/crash.exe | Bin 20024 -> 20024 bytes agents/windows/install_agent.exe | Bin 131798 -> 131811 bytes agents/windows/nowin.exe | Bin 22511 -> 22511 bytes 6 files changed, 7 insertions(+) diff --git a/ChangeLog b/ChangeLog index a56c28d..1daa238 100644 --- a/ChangeLog +++ b/ChangeLog @@ -21,6 +21,7 @@ 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 + * windows agent: no longer tries to execute directories Notifications: * Flexible Notification can now filter service levels diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index a69b596..4b2249c 100755 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -2087,6 +2087,12 @@ void launch_program(SOCKET &out, char *dirname, char *name, bool is_plugin){ char path[512]; snprintf(path, sizeof(path), "%s\\%s", dirname, name); + // If the path in question is a directory -> return + DWORD dwAttr = GetFileAttributes(path); + if(dwAttr != 0xffffffff && (dwAttr & FILE_ATTRIBUTE_DIRECTORY)) { + return; + } + crash_log("Running program %s", path); char newpath[512]; char *command = add_interpreter(path, newpath); diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index eb5abf3..b3f2665 100755 Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe differ diff --git a/agents/windows/crash.exe b/agents/windows/crash.exe index 65b86d5..eb151ae 100755 Binary files a/agents/windows/crash.exe and b/agents/windows/crash.exe differ diff --git a/agents/windows/install_agent.exe b/agents/windows/install_agent.exe index 5cad004..2f33014 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ diff --git a/agents/windows/nowin.exe b/agents/windows/nowin.exe index 63bdf3c..fbb9600 100755 Binary files a/agents/windows/nowin.exe and b/agents/windows/nowin.exe differ

11 years, 4 months

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, 4 months

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>Check_MK$</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>Check_MK$</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. 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. 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, 4 months

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, 4 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits