Module: check_mk
Branch: master
Commit: ee672b5ab4a5afcbd1548d0f0f360cea878f4dd9
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ee672b5ab4a5af…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Wed Nov 13 17:41:05 2013 +0100
Updated bug entries #0828
---
.bugs/828 | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/.bugs/828 b/.bugs/828
index edae99c..86b54f9 100644
--- a/.bugs/828
+++ b/.bugs/828
@@ -1,10 +1,10 @@
-Title: locale c.utf8 is missing at least in debian squezzy
+Title: locale c.utf8 is missing at least in Debian Squeeze
Component: checks
State: open
Date: 2013-08-19 09:38:38
Targetversion: future
Class: bug
-If using Debian 6 with flexible notification system, plain e mail and umlauts in alias,
-the mail never receives the mail. Reason is the missing c.utf8 locale. In german debian versions,
-there is only de_DE.utf8.
+If using Debian 6 with flexible notification system, plain e mail and umlauts
+in alias, the mail never receives the mail. Reason is the missing c.utf8
+locale. In german debian versions, there is only de_DE.utf8.
Module: check_mk
Branch: master
Commit: 76f6db0263db8896c420e5f77edbe2db45f44c66
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=76f6db0263db88…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Wed Nov 13 17:40:30 2013 +0100
Updated bug entries #1082
---
.bugs/1082 | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/.bugs/1082 b/.bugs/1082
index 8e6bc36..c3c775e 100644
--- a/.bugs/1082
+++ b/.bugs/1082
@@ -1,10 +1,12 @@
Title: Part of services missing after save in WATO
Component: wato
-State: open
+Class: bug
+State: done
Date: 2013-10-25 16:26:45
Targetversion: 1.2.2
-Class: bug
When you save the service list of a host in WATO then sometimes
some checks are not being saved and displayed as "missing" the
next time you enter the services list.
+
+2013-11-13 17:40:29: changed state open -> done
Module: check_mk
Branch: master
Commit: 578fcb5ecf5a4829c5344551fccf38304c9c1596
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=578fcb5ecf5a48…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Wed Nov 13 16:09:13 2013 +0100
df: dynamic filesystem levels now reorder levels automatically
When defining several step for dynamic filesystem levels, e.g. one for
disk greater then 10GB, of for disks greater then 100GB and one for
filesystems greater then 0B (the rest), then you had to make sure that
the step for lagers disks would appear later. Otherwise they would be
ignored. This is now fixed and Check_MK automatically chooses the correct
step for a disk - regardless of the order.
---
.bugs/1083 | 10 ++++++++++
.werks/4 | 13 +++++++++++++
ChangeLog | 1 +
checks/df.include | 8 ++++++--
4 files changed, 30 insertions(+), 2 deletions(-)
diff --git a/.bugs/1083 b/.bugs/1083
new file mode 100644
index 0000000..8017ae1
--- /dev/null
+++ b/.bugs/1083
@@ -0,0 +1,10 @@
+Title: df: do not display negative levels
+Component: checks
+State: open
+Date: 2013-11-13 15:20:04
+Targetversion: future
+Class: nastiness
+
+The df check can now use negative levels. This means *free* spac.
+But in the check output this should be made clear and not just
+printed negative values.
diff --git a/.werks/4 b/.werks/4
new file mode 100644
index 0000000..cb72415
--- /dev/null
+++ b/.werks/4
@@ -0,0 +1,13 @@
+Title: df: dynamic filesystem levels now reorder levels automatically
+Level: 1
+Component: checks
+Version: 1.2.3i7
+Date: 1384355214
+Class: feature
+
+When defining several step for dynamic filesystem levels, e.g. one for
+disk greater then 10GB, of for disks greater then 100GB and one for
+filesystems greater then 0B (the rest), then you had to make sure that
+the step for lagers disks would appear later. Otherwise they would be
+ignored. This is now fixed and Check_MK automatically chooses the correct
+step for a disk - regardless of the order.
diff --git a/ChangeLog b/ChangeLog
index 7d95ed1..6a16c4e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,7 @@
* 0068 check_sql: support for mssql databases included
* 0208 fileinfo.groups: Added minimum/maximum file size parameters...
* 0093 check_http: Default service description prefix can be avoided...
+ * 0004 df: dynamic filesystem levels now reorder levels automatically...
* 0024 FIX: cisco_wlc: removed configuration parameter ap_model
* 0065 FIX: veeam_client: check behaviour improved when backup is in progress
* 0066 FIX: veeam_jobs: check behaviour improved when backup is in progress
diff --git a/checks/df.include b/checks/df.include
index 477dbe6..7c4290c 100644
--- a/checks/df.include
+++ b/checks/df.include
@@ -142,11 +142,15 @@ def get_filesystem_levels(host, mountpoint, size_gb, params):
warn, crit = levels["levels"]
else:
# A list of levels. Choose the correct one depending on the
- # size of the current tablespace
+ # size of the current filesystem. We do not make the first
+ # rule match, but that with the largest size_gb. That way
+ # the order of the entries is not important.
found = False
+ found_size = 0
for to_size, this_levels in levels["levels"]:
- if size_gb * giga > to_size:
+ if size_gb * giga > to_size and to_size >= found_size:
warn, crit = this_levels
+ found_size = to_size
found = True
if not found:
warn, crit = 100.0, 100.0 # entry not found in list
Module: check_mk
Branch: master
Commit: 39cf631b455b93ed49bc849142fbceef0ebc0827
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=39cf631b455b93…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Wed Nov 13 12:07:04 2013 +0100
FIX ps: Remove exceeding [ and ] in service description when using process inventory
When using the process inventory with regular expressions that contain
groups, like <tt>"/sbin/getty .* (tty.)"</tt>, the matched group is inserted as
a replacement for <tt>%s</tt> in the service description. The bug resulted
in additional brackets. It was <tt>"[tty2]"</tt> instead of just <tt>"tty2"</tt>.
This has been fixed.
---
.werks/3 | 12 ++++++++++++
ChangeLog | 1 +
checks/ps | 2 +-
3 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/.werks/3 b/.werks/3
new file mode 100644
index 0000000..c23d3d6
--- /dev/null
+++ b/.werks/3
@@ -0,0 +1,12 @@
+Title: ps: Remove exceeding [ and ] in service description when using process inventory
+Level: 1
+Component: checks
+Version: 1.2.3i7
+Date: 1384340695
+Class: fix
+
+When using the process inventory with regular expressions that contain
+groups, like <tt>"/sbin/getty .* (tty.)"</tt>, the matched group is inserted as
+a replacement for <tt>%s</tt> in the service description. The bug resulted
+in additional brackets. It was <tt>"[tty2]"</tt> instead of just <tt>"tty2"</tt>.
+This has been fixed.
diff --git a/ChangeLog b/ChangeLog
index 8b6a0d4..7d95ed1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -16,6 +16,7 @@
* 0065 FIX: veeam_client: check behaviour improved when backup is in progress
* 0066 FIX: veeam_jobs: check behaviour improved when backup is in progress
* 0209 FIX: Cleaned up bad code in fileinfo.groups check
+ * 0003 FIX: ps: Remove exceeding [ and ] in service description when using process inventory...
Multisite:
* 0001 New filters for selecting several host/service-groups at once...
diff --git a/checks/ps b/checks/ps
index cac2e52..6aed87a 100644
--- a/checks/ps
+++ b/checks/ps
@@ -201,7 +201,7 @@ def inventory_ps_common(invdata, info, handle_perfdata = False):
# It is allowed (1.1.4) that the pattern contains more subexpressions then the
# service description. In that case only the first subexpressions are used as
# item.
- i_servicedesc = i_servicedesc % (matches[:num_perc_s])
+ i_servicedesc = i_servicedesc % tuple(matches[:num_perc_s])
# Problem here: We need to instantiate all subexpressions
# with their actual values of the found process.
Module: check_mk
Branch: master
Commit: b8f1b19116c137d6a96bf1f5ee6c0109b00b701c
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b8f1b19116c137…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Wed Nov 13 10:55:42 2013 +0100
You can now annotate events in the availability reporting
In the availability reporting there is now the possibility for annotating outages. In fact you
can attach an annotation to any arbitrary span of time of a host or service. For creating new
annotations you need to go to the "Timeline" view of a host or service. At each single period
there is now a new icon for creating an annotation (or changing an existing one).
Once the editor dialog is open you can decide to modify the time span, for example in order to
make the annotation cover a larger time period.
In any availability view all annotations that match the shown period of
time and selection of hosts and services are being displayed.
The annotations are saved globally and are shared amongst all users.
---
.werks/2 | 19 ++
ChangeLog | 3 +-
web/htdocs/forms.py | 16 +-
web/htdocs/htmllib.py | 19 +-
web/htdocs/images/button_annotation_hi.png | Bin 0 -> 3898 bytes
web/htdocs/images/button_annotation_lo.png | Bin 0 -> 5069 bytes
web/htdocs/images/icon_annotation.png | Bin 0 -> 5069 bytes
web/plugins/views/availability.py | 259 +++++++++++++++++++++++++++-
8 files changed, 299 insertions(+), 17 deletions(-)
Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=b8f1b19116…
Module: check_mk
Branch: master
Commit: a1e5951ba6f62fa0d2b9aa0ee5d1a09ff92f0141
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a1e5951ba6f62f…
Author: Bastian Kuhn <bk(a)mathias-kettner.de>
Date: Tue Nov 12 16:43:22 2013 +0100
check_http: Default service description prefix can be avoided
If the check_http service description is prefixed with a caret,
the default prefix HTTP will not be used.
---
.werks/93 | 9 +++++++++
ChangeLog | 1 +
checks/check_http | 6 +++++-
web/plugins/wato/active_checks.py | 3 ++-
4 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/.werks/93 b/.werks/93
new file mode 100644
index 0000000..e05753b
--- /dev/null
+++ b/.werks/93
@@ -0,0 +1,9 @@
+Title: check_http: Default service description prefix can be avoided
+Level: 1
+Component: checks
+Version: 1.2.3i7
+Date: 1384270642
+Class: feature
+
+If the check_http service description is prefixed with a caret,
+the default prefix HTTP will not be used.
diff --git a/ChangeLog b/ChangeLog
index 74ee996..defd675 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,7 @@
* 0090 apc_ats_status: New Check for monitoring APC Automatic Transfer Switches
* 0080 Added new checks for Brocade NetIron MLX switching / routing devices...
* 0091 apc_ats_output: new check for output measurements on APC ATS devices
+ * 0093 check_http: Default service description prefix can be avoided...
* 0024 FIX: cisco_wlc: removed configuration parameter ap_model
* 0065 FIX: veeam_client: check behaviour improved when backup is in progress
* 0066 FIX: veeam_jobs: check behaviour improved when backup is in progress
diff --git a/checks/check_http b/checks/check_http
index a75e64a..7e8b422 100644
--- a/checks/check_http
+++ b/checks/check_http
@@ -122,11 +122,15 @@ def check_http_arguments(params):
args = " -I $HOSTADDRESS$" + args
return args
+def check_http_desc(params):
+ if params[0].startswith("^"):
+ return params[0][1:]
+ return "HTTP %s" % params[0]
active_check_info['http'] = {
"command_line" : '$USER1$/check_http $ARG1$',
"argument_function" : check_http_arguments,
- "service_description" : lambda params: "HTTP %s" % params[0],
+ "service_description" : check_http_desc,
"has_perfdata" : True,
}
diff --git a/web/plugins/wato/active_checks.py b/web/plugins/wato/active_checks.py
index 4b1ccb9..fd22975 100644
--- a/web/plugins/wato/active_checks.py
+++ b/web/plugins/wato/active_checks.py
@@ -476,7 +476,8 @@ register_rule(group,
elements = [
TextUnicode(
title = _("Name"),
- help = _("Will be used in the service description"),
+ help = _("Will be used in the service description. If the name starts with"
+ "a caret (^) the service description will not be prefixed with HTTP." ),
allow_empty = False),
Alternative(
title = _("Mode of the Check"),