Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64139 discussions

Check_MK Git: check_mk: Updated bug entries

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: bf6c8905dc974218eafa4220343d423c65f397a3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bf6c8905dc9742… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Jan 22 13:54:59 2011 +0100 Updated bug entries --- .bugs/97 | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/.bugs/97 b/.bugs/97 new file mode 100644 index 0000000..f2cedac --- /dev/null +++ b/.bugs/97 @@ -0,0 +1,11 @@ +Title: Restart nagios on OMD - use OMD method +Component: core +Benefit: 1 +State: open +Cost: 1 +Date: 2011-01-22 13:53:40 +Class: cleanup + +When doing a restart of Nagios or a config check while running +under OMD, then better not call the start scripts directly, but +use omd to do this 'omd restart nagios'.

13 years, 8 months

Check_MK Git: check_mk: Set version to 1.1.9i6

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: f73eab2439167ee8938cff11ced149c9167d11b0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f73eab2439167e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Jan 22 13:53:26 2011 +0100 Set version to 1.1.9i6 --- Makefile | 2 +- agents/check_mk_agent.aix | 2 +- agents/check_mk_agent.freebsd | 2 +- agents/check_mk_agent.linux | 2 +- agents/check_mk_agent.solaris | 2 +- agents/windows/check_mk_agent.cc | 2 +- agents/windows/check_mk_agent.exe | Bin 95232 -> 95232 bytes agents/windows/crash.exe | Bin 20024 -> 20024 bytes livestatus/configure.ac | 2 +- scripts/install_nagios.sh | 2 +- scripts/setup.sh | 2 +- 11 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index d0c3458..7dceaf7 100644 --- a/Makefile +++ b/Makefile @@ -23,7 +23,7 @@ # Boston, MA 02110-1301 USA. SHELL = /bin/bash -VERSION = 1.1.9i5 +VERSION = 1.1.9i6 NAME = check_mk RPM_TOPDIR = rpm.topdir RPM_BUILDROOT = rpm.buildroot diff --git a/agents/check_mk_agent.aix b/agents/check_mk_agent.aix index b4593aa..042a897 100755 --- a/agents/check_mk_agent.aix +++ b/agents/check_mk_agent.aix @@ -38,7 +38,7 @@ LOCALDIR=$MK_LIBDIR/local echo '<<<check_mk>>>' -echo Version: 1.1.9i5 +echo Version: 1.1.9i6 echo AgentOS: aix echo '<<<df>>>' diff --git a/agents/check_mk_agent.freebsd b/agents/check_mk_agent.freebsd index 1c0c1b4..5093770 100755 --- a/agents/check_mk_agent.freebsd +++ b/agents/check_mk_agent.freebsd @@ -66,7 +66,7 @@ else fi echo '<<<check_mk>>>' -echo Version: 1.1.9i5 +echo Version: 1.1.9i6 echo AgentOS: freebsd # Partitionen (-P verhindert Zeilenumbruch bei langen Mountpunkten) diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index f68c734..3792a7e 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -53,7 +53,7 @@ else fi echo '<<<check_mk>>>' -echo Version: 1.1.9i5 +echo Version: 1.1.9i6 echo AgentOS: linux echo PluginsDirectory: $PLUGINSDIR echo LocalDirectory: $LOCALDIR diff --git a/agents/check_mk_agent.solaris b/agents/check_mk_agent.solaris index 794f5a1..14afd25 100755 --- a/agents/check_mk_agent.solaris +++ b/agents/check_mk_agent.solaris @@ -38,7 +38,7 @@ PLUGINSDIR=$MK_LIBDIR/plugins LOCALDIR=$MK_LIBDIR/local echo '<<<check_mk>>>' -echo Version: 1.1.9i5 +echo Version: 1.1.9i6 echo AgentOS: solaris echo '<<<df>>>' diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index 19876f8..70fe431 100755 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -61,7 +61,7 @@ #include <ctype.h> // isspace() -#define CHECK_MK_VERSION "1.1.9i5" +#define CHECK_MK_VERSION "1.1.9i6" #define CHECK_MK_AGENT_PORT 6556 #define SERVICE_NAME "Check_MK_Agent" #define KiloByte 1024 diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index dd089f9..92de07e 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 3ca411c..a6d6295 100755 Binary files a/agents/windows/crash.exe and b/agents/windows/crash.exe differ diff --git a/livestatus/configure.ac b/livestatus/configure.ac index fc1ed73..1fc2609 100644 --- a/livestatus/configure.ac +++ b/livestatus/configure.ac @@ -28,7 +28,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.61) -AC_INIT([MK Livestatus], [1.1.9i5], [mk(a)mathias-kettner.de]) +AC_INIT([MK Livestatus], [1.1.9i6], [mk(a)mathias-kettner.de]) AM_INIT_AUTOMAKE([-Wall foreign]) AC_CONFIG_SRCDIR([config.h.in]) AC_CONFIG_HEADER([config.h]) diff --git a/scripts/install_nagios.sh b/scripts/install_nagios.sh index ba12b63..dcc3b31 100644 --- a/scripts/install_nagios.sh +++ b/scripts/install_nagios.sh @@ -57,7 +57,7 @@ set -e NAGIOS_VERSION=3.2.3 PLUGINS_VERSION=1.4.15 RRDTOOL_VERSION=1.4.4 -CHECK_MK_VERSION=1.1.9i5 +CHECK_MK_VERSION=1.1.9i6 PNP_VERSION=0.6.6 NAGVIS_VERSION=1.5.6 diff --git a/scripts/setup.sh b/scripts/setup.sh index bb7fcc2..e8d280e 100755 --- a/scripts/setup.sh +++ b/scripts/setup.sh @@ -24,7 +24,7 @@ # Boston, MA 02110-1301 USA. -VERSION=1.1.9i5 +VERSION=1.1.9i6 NAME=check_mk LANG= LC_ALL=

13 years, 8 months

Check_MK Git: check_mk: Multisite: new intelligent logwatch icon

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: e9618ca514b5d5bdda39bd9c6802f8c842a0eabd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e9618ca514b5d5… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Jan 16 11:32:27 2011 +0100 Multisite: new intelligent logwatch icon --- ChangeLog | 2 ++ web/.f12 | 2 +- web/htdocs/images/icon_logwatch.png | Bin 0 -> 7354 bytes web/plugins/views/painters.py | 21 +++++++++++++++++---- 4 files changed, 20 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index fba3b04..4cf2bc6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,8 @@ Multisite: * custom notes: new macros $URL_PREFIX$ and $SITE$, making multi site setups easier + * new intelligent logwatch icon, using url_prefix in multi site + setups 1.1.9i4: Core, Setup, etc.: diff --git a/web/.f12 b/web/.f12 index 8c90ab2..2e15990 100644 --- a/web/.f12 +++ b/web/.f12 @@ -1,2 +1,2 @@ sudo cp -prv * /omd/versions/default/share/check_mk/web/ -sudo su - -c 'omd reload wato apache' +sudo su - -c 'omd restart wato apache' diff --git a/web/htdocs/images/icon_logwatch.png b/web/htdocs/images/icon_logwatch.png new file mode 100644 index 0000000..b20f72c Binary files /dev/null and b/web/htdocs/images/icon_logwatch.png differ diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index 99a2b72..308608b 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -107,7 +107,7 @@ multisite_painter_options["ts_date"] = { icon_columns = [ "acknowledged", "scheduled_downtime_depth", "downtimes_with_info", "comments_with_info", "notifications_enabled", "is_flapping", "modified_attributes_list", "active_checks_enabled", "accept_passive_checks", "action_url_expanded", "notes_url_expanded", "in_notification_period", - "custom_variable_names", "custom_variable_values", "icon_image", "pnpgraph_present" ] + "custom_variable_names", "custom_variable_values", "icon_image", "pnpgraph_present", "check_command" ] # Additional columns only to fetch for services icon_service_columns = [ "service_description" ] @@ -134,6 +134,12 @@ def pnp_url(row, what = 'graph'): def pnp_popup_url(row): return pnp_url(row, 'popup') +def logwatch_url(sitename, notes_url): + i = notes_url.index("/check_mk/logwatch.py") + site = html.site_status[sitename]["site"] + return site["url_prefix"] + notes_url[i:] + + def wato_link(filename, site, hostname, where): if 'X' in html.display_options: prefix = config.site(site)["url_prefix"] + "check_mk/" @@ -190,9 +196,16 @@ def paint_icons(what, row): # what is "host" or "service" if action_url and not ('/pnp4nagios/' in action_url and pnpgraph_present >= 0): output += "<a href='%s'><img class=icon src=\"images/icon_action.gif\"></a>" % row[prefix + "action_url_expanded"] - # notes_url - if row[prefix + "notes_url_expanded"]: - output += "<a href='%s'><img class=icon src=\"images/icon_notes.gif\"></a>" % row[prefix + "notes_url_expanded"] + # notes_url (only, if not a Check_MK logwatch check pointing to logwatch.py. These is done by a special icon) + notes_url = row[prefix + "notes_url_expanded"] + check_command = row[prefix + "check_command"] + if notes_url: + # unmodified original logwatch link -> translate into more intelligent icon + if check_command == 'check_mk-logwatch' and "/check_mk/logwatch.py" in notes_url: + output += '<a href="%s"><img class=icon src="images/icon_logwatch.png\"></a>' % logwatch_url(row["site"], notes_url) + else: + output += "<a href='%s'><img class=icon src=\"images/icon_notes.gif\"></a>" % notes_url + # Problem has been acknowledged if row[prefix + "acknowledged"]:

13 years, 8 months

Check_MK Git: check_mk: Updated bug entries

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 04538f6e36d8a3bf45117a4d9090a7aecde3df23 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=04538f6e36d8a3… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Jan 16 10:59:48 2011 +0100 Updated bug entries --- .bugs/96 | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/.bugs/96 b/.bugs/96 new file mode 100644 index 0000000..06ee32d --- /dev/null +++ b/.bugs/96 @@ -0,0 +1,14 @@ +Title: PNP Popup does not work with HTTP-Login on different host +Component: multisite +Benefit: 2 +State: open +Cost: 2 +Date: 2011-01-16 10:57:40 +Class: bug + +In a multi site setup where the remote hosts are not transparently +reachable via HTTP proxy but are directly connected by the browser, +the user has to enter his login again for each remote site. While +this is not nice, it works nevertheless. + +But: the PNP popups do *not* work, even after one is logged in.

13 years, 8 months

Check_MK Git: check_mk: Multisite: new macros for custom notes

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 930823f62e21ba238e5183846e9374100ed0583b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=930823f62e21ba… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Jan 15 17:00:47 2011 +0100 Multisite: new macros for custom notes $URL_PREFIX$ and $SITE$ now make multi site setups easier --- ChangeLog | 5 +++++ web/plugins/views/painters.py | 10 +++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index b14a842..fba3b04 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +1.1.9i5: + Multisite: + * custom notes: new macros $URL_PREFIX$ and $SITE$, making + multi site setups easier + 1.1.9i4: Core, Setup, etc.: * added missing 'register 0' to host template diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index e440a6b..99a2b72 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -649,13 +649,17 @@ def paint_custom_notes(row): files.reverse() contents = [] def replace_tags(text): + sitename = row["site"] + site = html.site_status[sitename]["site"] return text\ - .replace('$HOSTNAME$', host)\ + .replace('$URL_PREFIX$', site["url_prefix"])\ + .replace('$SITE$', sitename)\ + .replace('$HOSTNAME$', host)\ .replace('$HOSTNAME_LOWER$', host.lower())\ .replace('$HOSTNAME_UPPER$', host.upper())\ .replace('$HOSTNAME_TITLE$', host[0].upper() + host[1:].lower())\ - .replace('$HOSTADDRESS$', row["host_address"])\ - .replace('$SERVICEDESC$', row.get("service_description", "")) + .replace('$HOSTADDRESS$', row["host_address"])\ + .replace('$SERVICEDESC$', row.get("service_description", "")) for f in files: contents.append(replace_tags(unicode(file(f).read(), "utf-8").strip())) return "", "<hr>".join(contents)

13 years, 8 months

Check_MK Git: check_mk: Switched version to 1.1.9i5

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 642fcff113c5c19b5445baa6067c7a60cce981ea URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=642fcff113c5c1… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Jan 15 16:51:08 2011 +0100 Switched version to 1.1.9i5 --- Makefile | 2 +- agents/check_mk_agent.aix | 2 +- agents/check_mk_agent.freebsd | 2 +- agents/check_mk_agent.linux | 2 +- agents/check_mk_agent.solaris | 2 +- agents/windows/check_mk_agent.cc | 2 +- agents/windows/check_mk_agent.exe | Bin 95232 -> 95232 bytes agents/windows/crash.exe | Bin 20024 -> 20024 bytes livestatus/configure.ac | 2 +- scripts/install_nagios.sh | 2 +- scripts/setup.sh | 2 +- 11 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index 99b28d5..d0c3458 100644 --- a/Makefile +++ b/Makefile @@ -23,7 +23,7 @@ # Boston, MA 02110-1301 USA. SHELL = /bin/bash -VERSION = 1.1.9i4 +VERSION = 1.1.9i5 NAME = check_mk RPM_TOPDIR = rpm.topdir RPM_BUILDROOT = rpm.buildroot diff --git a/agents/check_mk_agent.aix b/agents/check_mk_agent.aix index 6b564c5..b4593aa 100755 --- a/agents/check_mk_agent.aix +++ b/agents/check_mk_agent.aix @@ -38,7 +38,7 @@ LOCALDIR=$MK_LIBDIR/local echo '<<<check_mk>>>' -echo Version: 1.1.9i4 +echo Version: 1.1.9i5 echo AgentOS: aix echo '<<<df>>>' diff --git a/agents/check_mk_agent.freebsd b/agents/check_mk_agent.freebsd index 0e89b1d..1c0c1b4 100755 --- a/agents/check_mk_agent.freebsd +++ b/agents/check_mk_agent.freebsd @@ -66,7 +66,7 @@ else fi echo '<<<check_mk>>>' -echo Version: 1.1.9i4 +echo Version: 1.1.9i5 echo AgentOS: freebsd # Partitionen (-P verhindert Zeilenumbruch bei langen Mountpunkten) diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index c81cbe4..f68c734 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -53,7 +53,7 @@ else fi echo '<<<check_mk>>>' -echo Version: 1.1.9i4 +echo Version: 1.1.9i5 echo AgentOS: linux echo PluginsDirectory: $PLUGINSDIR echo LocalDirectory: $LOCALDIR diff --git a/agents/check_mk_agent.solaris b/agents/check_mk_agent.solaris index c9d46ca..794f5a1 100755 --- a/agents/check_mk_agent.solaris +++ b/agents/check_mk_agent.solaris @@ -38,7 +38,7 @@ PLUGINSDIR=$MK_LIBDIR/plugins LOCALDIR=$MK_LIBDIR/local echo '<<<check_mk>>>' -echo Version: 1.1.9i4 +echo Version: 1.1.9i5 echo AgentOS: solaris echo '<<<df>>>' diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index 2189c8a..19876f8 100755 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -61,7 +61,7 @@ #include <ctype.h> // isspace() -#define CHECK_MK_VERSION "1.1.9i4" +#define CHECK_MK_VERSION "1.1.9i5" #define CHECK_MK_AGENT_PORT 6556 #define SERVICE_NAME "Check_MK_Agent" #define KiloByte 1024 diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index 326af5e..dd089f9 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 90485e4..3ca411c 100755 Binary files a/agents/windows/crash.exe and b/agents/windows/crash.exe differ diff --git a/livestatus/configure.ac b/livestatus/configure.ac index 725bf98..fc1ed73 100644 --- a/livestatus/configure.ac +++ b/livestatus/configure.ac @@ -28,7 +28,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.61) -AC_INIT([MK Livestatus], [1.1.9i4], [mk(a)mathias-kettner.de]) +AC_INIT([MK Livestatus], [1.1.9i5], [mk(a)mathias-kettner.de]) AM_INIT_AUTOMAKE([-Wall foreign]) AC_CONFIG_SRCDIR([config.h.in]) AC_CONFIG_HEADER([config.h]) diff --git a/scripts/install_nagios.sh b/scripts/install_nagios.sh index a0d668d..ba12b63 100644 --- a/scripts/install_nagios.sh +++ b/scripts/install_nagios.sh @@ -57,7 +57,7 @@ set -e NAGIOS_VERSION=3.2.3 PLUGINS_VERSION=1.4.15 RRDTOOL_VERSION=1.4.4 -CHECK_MK_VERSION=1.1.9i4 +CHECK_MK_VERSION=1.1.9i5 PNP_VERSION=0.6.6 NAGVIS_VERSION=1.5.6 diff --git a/scripts/setup.sh b/scripts/setup.sh index b8dcf47..bb7fcc2 100755 --- a/scripts/setup.sh +++ b/scripts/setup.sh @@ -24,7 +24,7 @@ # Boston, MA 02110-1301 USA. -VERSION=1.1.9i4 +VERSION=1.1.9i5 NAME=check_mk LANG= LC_ALL=

13 years, 8 months

Check_MK Git: check_mk: Updated ChangeLog

by mk＠mathias-kettner.de

Module: check_mk Branch: master Commit: 4815d5c6a30594fd84167898af73281d7abe3df3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4815d5c6a30594… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jan 14 16:38:26 2011 +0100 Updated ChangeLog --- ChangeLog | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2ed206e..b14a842 100644 --- a/ChangeLog +++ b/ChangeLog @@ -15,7 +15,6 @@ Checks & Agents: * apc_symmetra: handle empty SNMP variables and treat as 0. - * Added new check df.trend to analyze df growth during given timeranges 1.1.9i3: INCOMPATIBLE CHANGES:

13 years, 8 months

Check_MK Git: check_mk: Recompiled windows agent with version number 1.1. 9i4

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 20800ac5d29c015a7ec1aeebcf6130a32bbbf44a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=20800ac5d29c01… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jan 14 16:30:53 2011 +0100 Recompiled windows agent with version number 1.1.9i4 --- agents/windows/check_mk_agent.exe | Bin 95232 -> 95232 bytes agents/windows/crash.exe | Bin 20024 -> 20024 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index 818b05f..326af5e 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 8fa12a6..90485e4 100755 Binary files a/agents/windows/crash.exe and b/agents/windows/crash.exe differ

13 years, 8 months

Check_MK Git: check_mk: Fixed bullet layout of two snapins

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: b1367f6997b8fa3595a7d15ed6d063f083ad5167 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b1367f6997b8fa… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jan 14 16:26:52 2011 +0100 Fixed bullet layout of two snapins --- web/plugins/sidebar/shipped.py | 2 ++ web/plugins/sidebar/wato.py | 2 ++ 2 files changed, 4 insertions(+), 0 deletions(-) diff --git a/web/plugins/sidebar/shipped.py b/web/plugins/sidebar/shipped.py index 97511cd..19e9c07 100644 --- a/web/plugins/sidebar/shipped.py +++ b/web/plugins/sidebar/shipped.py @@ -44,10 +44,12 @@ except NameError: # -------------------------------------------------------------- def render_about(): html.write("Version: " + defaults.check_mk_version) + html.write("<ul>") bulletlink("Homepage", "http://mathias-kettner.de/check_mk.html") bulletlink("Documentation", "http://mathias-kettner.de/checkmk.html") bulletlink("Download", "http://mathias-kettner.de/check_mk_download.html") bulletlink("Mathias Kettner", "http://mathias-kettner.de") + html.write("</ul>") sidebar_snapins["about"] = { "title" : "About Check_MK", diff --git a/web/plugins/sidebar/wato.py b/web/plugins/sidebar/wato.py index aeba3f7..a25f76f 100644 --- a/web/plugins/sidebar/wato.py +++ b/web/plugins/sidebar/wato.py @@ -28,9 +28,11 @@ def ajax_wato_files(h): global html html = h if config.may("use_wato"): + html.write('<ul>') for filename, title, roles in config.config_files: if config.role in roles: bulletlink(title, "wato.py?filename=%s" % filename) + html.write('</ul>') sidebar_snapins["wato"] = {

13 years, 8 months

Check_MK Git: check_mk: Revert "Added new check df. trend to analyze df growth within given timeranges"

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 84244c50b66242607b632471b2df1406274eb4b3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=84244c50b66242… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jan 14 15:45:04 2011 +0100 Revert "Added new check df.trend to analyze df growth within given timeranges" This reverts commit 518a623ed8f06257b4d900fcdbee070d20372517. --- checkman/df.trend | 78 ------------------------------- checks/df | 133 ----------------------------------------------------- 2 files changed, 0 insertions(+), 211 deletions(-) diff --git a/checkman/df.trend b/checkman/df.trend deleted file mode 100644 index 8bdd86d..0000000 --- a/checkman/df.trend +++ /dev/null @@ -1,78 +0,0 @@ -title: Check filesystem space usage trends within a given timerange -agents: linux, windows, aix, solaris, vms -author: lars Michelsen <lm(a)mathias-kettner.de -license: GPL -distribution: check_mk -description: - This check measures the disk usage trend within a given timerange. - Thresholds can be used to check if the trend is within a given range - and the disk space is enough for a given amount of time. - - The check snapshots the current disk usage and compares it with the - current usage until it is too old for the given timerange. Then the - snapshot is refreshed. - When setting up the check for a filesystem it needs one interval of - the given timerange to get an average value for this time. Until this - is done the check might be to sensitive. - - The check tries to calculate the time left until the disk is full. This - calculation is done on the average bytes per second within the given - timerange. This calculation assumes a linear growing disk usage. If you - find this senseless these checks can be disabled. - -item: - The mount point of the filesystem (UNIX) or the drive - letter in upper case followed by a colon (Windows). - -examples: - # Set default parameters to: - # 1. analyze the last 24 hours - # 2. growing of 1% within the given timerange raises a WARNING - # 3. growing of 2% within the given timerange raises a CRITICAL - # 4. 10 days left until disk is full (on linear growing) raises a CRITICAL - df_trend_default_levels = (24 * 60 * 60, 1.0, 2.0, 10, None) - - # Exclude temporary backup from inventory - inventory_df_exclude_mountpoints = [ "/mnt/backup" ] - - # Exclude certain filesystems from being inventorized at all - inventory_df_exclude_fs = [ "iso9660", "romfs" ] - -perfdata: - One variable: the used space of the filesystem in MB. Also the minimum (0 MB), - maximum (size of the filesystem) and the warning and critical - levels in MB are provided. - -inventory: - df.trend supports inventory. All filesystem the agent reports - will be inventorized except mount points listed in - {inventory_df_exclude_mountpoints} and filesystem types - listed in {inventory_df_exclude_fs}. The Windows agent - only reports fixed disks. The Linux agent reports filesystems - that have a size and are not of type smbfs, tmpfs, cifs or nfs. - -[parameters] - # 1. timerange to look at - # 2. warning grow percent - # 3. critical grow percent - # 4. warning days left (based on linear growing) - # 5. critical days left (based on linear growing) -timerange (int): The timerange to analyze (in seconds). Defaults to 86400. -warning_perc (float): Grow percent compared to the volume size within the given - timerange to raise a {WARNING} state. Can be set to {None} to disable this check. - Defaults to 1.0. -critical_perc (float): Grow percent compared to the volume size within the given - timerange to raise a {CRITICAL} state. Can be set to {None} to disable this check. - Defaults to 2.0. -warning_days (int): Days left when assuming linear growing as measured in the given - timerange to raise a {WARNING} state. Can be set to {None} to disable this check. - Defaults to {10} days. -critical_days (int): Days left when assuming linear growing as measured in the given - timerange to raise a {CRITICAL} state. Can be set to {None} to disable this check. - Defaults to {None}. - -[configuration] -inventory_df_exclude_fs (list of strings): Lists of filesystem types to exclude from inventory -inventory_df_exclude_mountpoints (list of strings): List of mount points to exclude from inventory -df_trend_default_levels (int, float, float, int, int): Default levels for filesystem trends detected by inventory. This variable is preset to {(86400, 1.0, 2.0, 10, None)}. - diff --git a/checks/df b/checks/df index 1555b66..a809e35 100644 --- a/checks/df +++ b/checks/df @@ -101,136 +101,3 @@ def inventory_df(checkname, info): return inventory check_info['df'] = (check_df, "fs_%s", 1, inventory_df) - - - -# New check: df.trend with checks the amount of space -# which has been allocated in a given time range -# -# Author: Lars Michelsen <lm(a)mathias-kettner.de - -df_trend_default_levels = (86400, 1.0, 2.0, 10, None) - -# This stores the current value and compares it with the value -# which before "backlog" seconds. If there is no value found -# with this age (check is too new) the oldest known value is used. -def get_trend(itemname, this_time, this_val, backlog): - - # first call: take current value - if not itemname in g_counters: - g_counters[itemname] = (this_time, this_val) - - if opt_dont_submit: - return 0, this_val - raise MKCounterWrapped(itemname, 'Counter initialization') - - # Get previous value and time difference - last_time, last_val = g_counters.get(itemname) - timedif = this_time - last_time - - # Only update when old data is older than 24h - if this_time - last_time > backlog: - print "get_trend: Saving new val" - g_counters[itemname] = (this_time, this_val) - - return timedif, (this_val - last_val) - -def inventory_df_trend(checkname, info): - inventory = [] - for line in info: - try: - fs_type = line[1] - size_kb = int(line[2]) - if size_kb == 0 or line[5] == '-': - continue # exclude filesystems without size - item = " ".join(line[6:]).replace('\\', '/') # Windows \ is replaced with / - - # exclude some filesystem types and some items - if fs_type not in inventory_df_exclude_fs and item not in inventory_df_exclude_mountpoints: - inventory.append((item, 'df_trend_default_levels')) - except ValueError,e: - sys.stderr.write("Invalid plugin output '%s'\n" % (line,)) - pass # ignore e.g. entries for /proc, etc. if plugin sends any - - return inventory - -# FIXME: There is some duplicate code with the df check. Maybe move to include file -def check_df_trend(item, params, info): - # df outputs seven columns: - # DEVICE FS-TYPE SIZE(KB) USED(KB) AVAIL(KB) USED(%) MOUNTPOINT - # The mount point may contain spaces (seen on VMWare volumes) - - used_list = [ l for l in info if " ".join(l[6:]).replace('\\','/') == item ] - - if len(used_list) == 0: - return (3, "UNKNOWN - %s missing or not a partition" % item ) - used = used_list[0] # might be listed twice. We take the first occurance - - # In some rare cases the item may contain a space (happened on ESX). - if len(used) > 7: - used = used[0:6] + [ " ".join(used[6:]) ] - - if len(used) != 7 or used[5][-1] != '%': - return (3, "UNKNOWN - Invalid output from agent (%s)" % (' '.join(used),)) - - bytes_total = saveint(used[2]) * 1024 - bytes_used = bytes_total - (saveint(used[4]) * 1024) - - # Get trend within the given timerange. When there are no information - # for the whole range get the oldest available data - try: - timedif, trend = get_trend("df.trend.%s" % item, time.time(), saveint(bytes_used), params[0]) - except MKCounterWrapped, e: - return (3, "UNKNOWN - Initialized value -> Skipping check result") - - # Check thresholds: percentage trend - perc_used = 100 * (bytes_used / float(bytes_total)) - perc_trend = 100 * (trend / float(bytes_total)) - status = 0 - status_txt = '' - if params[2] and perc_trend > params[2]: - status = 2 - status_txt = ' (grew more than %s%%)' % params[2] - elif params[1] and perc_trend > params[1]: - status = 1 - status_txt = ' (grew more than %s%%)' % params[1] - - # Format the timedif - (hours, seconds) = divmod(timedif, 3600) - (minutes, seconds) = divmod(seconds, 60) - timedif_txt = '%02d:%02d:%02d' % (int(hours), int(minutes), int(seconds)) - - perfdata = [ - ( 'trend_mb', '%.2fMB' % (trend / 1024 / 1024), '', '', 0, '%.2f' % (bytes_total / 1024 / 1024)), - ( 'trend_perc', '%.2f%%' % perc_trend, params[1], params[2], 0, 100 ), - ] - - output = "%s trend is %s (%.2f%%) for last %s%s" % \ - (item, get_bytes_human_readable(trend), perc_trend, timedif_txt, status_txt) - - # Calculate the time left, assuming linear growing - sec_left = -1 - if trend > 0: - bytes_per_sec = trend / timedif - sec_left = bytes_total / bytes_per_sec - - if params[4] and params[4] * 86400 > sec_left: - status = 2 - status_txt = ' (CRIT: less than %d days left)' % params[4] - elif params[3] and params[3] * 86400 > sec_left: - if status < 1: - status = 1 - status_txt = ' (WARN: less than %d days left)' % params[3] - - # Fortmat the output - (days, seconds) = divmod(sec_left, 86400) - (hours, seconds) = divmod(seconds, 3600) - (minutes, seconds) = divmod(seconds, 60) - output += ' - %d days, %d hours, %d minutes, %d seconds left%s' % \ - (int(days), int(hours), int(minutes), int(seconds), status_txt) - - perfdata += [('sec_left', sec_left, params[3], params[4])] - - return (status, '%s - %s' % (nagios_state_names[status], output), perfdata) - -check_info['df.trend'] = (check_df_trend, "Disk Usage Trend %s", 1, inventory_df_trend)

13 years, 8 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits