this check is deprecated
Message-ID: <52b0415b.yyta8OyXx/LgXJvt%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: b6c6835edbd9098d36eddfa74c1cf7e94ebf9e57
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b6c6835edbd909…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Tue Dec 17 13:19:31 2013 +0100
FIX winperf.cpuusage: update man page: this check is deprecated
---
.werks/349 | 10 ++++++++++
ChangeLog | 1 +
checkman/winperf.cpuusage | 11 +++++++----
checkman/winperf_processor.util | 2 +-
4 files changed, 19 insertions(+), 5 deletions(-)
diff --git a/.werks/349 b/.werks/349
new file mode 100644
index 0000000..9e7bfff
--- /dev/null
+++ b/.werks/349
@@ -0,0 +1,10 @@
+Title: winperf.cpuusage: update man page: this check is deprecated
+Level: 1
+Component: checks
+Class: fix
+State: unknown
+Version: 1.2.5i1
+Date: 1387282751
+Targetversion: future
+
+
diff --git a/ChangeLog b/ChangeLog
index c05775e..c237f4e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -51,6 +51,7 @@
* 0380 FIX: jolokia_metrics.mem: PNP-Template now handles non existant max values...
* 0381 FIX: win_printers: Fixed creation of duplicate services...
* 0347 FIX: smart.stats: Remove duplicate disks...
+ * 0349 FIX: winperf.cpuusage: update man page: this check is deprecated
Multisite:
* 0371 Added log class filter to hostsvcevents view
diff --git a/checkman/winperf.cpuusage b/checkman/winperf.cpuusage
index c228052..dedd4fc 100644
--- a/checkman/winperf.cpuusage
+++ b/checkman/winperf.cpuusage
@@ -1,18 +1,21 @@
-title: CPU usage on Windows systems
+title: CPU usage on Windows systems (deprecated)
agents: windows
catalog: os/kernel
license: GPL
distribution: check_mk
description:
This check monitors the CPU usage on a Windows system using the
- windows performance counters (agent section {<<<winperf>>>}).
+ windows performance counters (agent section {winperf}).
In its current implementation this check is always OK.
Setting a level for warning or a critical state is possible, but might
- not be very usefull, since the computed value is an average over
- just one check cycle. A combination with a larger value of {max_check_attempts}
+ not be very usefull, since the computed value is an average over just one
+ check cycle. A combination with a larger value of {max_check_attempts}
or {notification_delay} might be useful here.
+ Note: this check is deprecated and not used by modern Check_MK agents.
+ It is replaced by {winperf_processor.util}.
+
perfdata:
The averaged percentage of CPU utilization during the last check cycle.
diff --git a/checkman/winperf_processor.util b/checkman/winperf_processor.util
index 3413259..f995171 100644
--- a/checkman/winperf_processor.util
+++ b/checkman/winperf_processor.util
@@ -5,7 +5,7 @@ license: GPL
distribution: check_mk
description:
This check monitors the CPU utilization on a Windows system using the
- windows performance counters (agent section {<<<winperf_processor>>>}).
+ windows performance counters (agent section {winperf_processor}).
This check replaces {winperf.cpuusage} which is outdated since version {1.1.11i1}
Setting a level for warning or a critical state is possible, but might
Module: check_mk
Branch: master
Commit: 06028f8d1802155bb06e7251eda42a11626af9a9
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=06028f8d180215…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Tue Dec 17 13:12:05 2013 +0100
Updated bug entries #2099
---
.bugs/2099 | 23 +++++++++++++++++++++++
1 file changed, 23 insertions(+)
diff --git a/.bugs/2099 b/.bugs/2099
new file mode 100644
index 0000000..0436b86
--- /dev/null
+++ b/.bugs/2099
@@ -0,0 +1,23 @@
+Title: ps check outputs wrong cpu usage
+Component: checks
+State: open
+Date: 2013-12-17 13:10:37
+Targetversion: 1.2.4
+Class: bug
+
+The check uses the average cpu usage since start of the process:
+
+
+***
+ CODE HEADER DESCRIPTION
+
+ %cpu %CPU cpu utilization of the process in "##.#" format.
+ Currently, it is the CPU time used divided by the
+ time the process has been running
+ (cputime/realtime ratio), expressed as a
+ percentage. It will not add up to 100% unless
+ you are lucky. (alias pcpu).
+***
+
+This is totally wrong. Better would be to use the raw counter values from ps and
+keep an eye on the counters on our own.
Module: check_mk
Branch: master
Commit: a3d447cf0ae465225a32634d2f38e3780c046844
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a3d447cf0ae465…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Tue Dec 17 12:47:58 2013 +0100
Active HTTP check now supports multiline regexp matching
Previous versions of the configuration form did not provide the
option to form regex patterns accross multi lines. The used
check_http plugin provides the option "-l" to realize this. The
WATO form now has a checkbox to make it possible to use this.
---
.werks/382 | 13 +++++++++++++
ChangeLog | 1 +
checks/check_http | 2 ++
web/plugins/wato/active_checks.py | 23 ++++++++++++++---------
4 files changed, 30 insertions(+), 9 deletions(-)
diff --git a/.werks/382 b/.werks/382
new file mode 100644
index 0000000..0186b27
--- /dev/null
+++ b/.werks/382
@@ -0,0 +1,13 @@
+Title: Active HTTP check now supports multiline regexp matching
+Level: 1
+Component: wato
+Class: feature
+State: unknown
+Version: 1.2.5i1
+Date: 1387280779
+Targetversion: future
+
+Previous versions of the configuration form did not provide the
+option to form regex patterns accross multi lines. The used
+check_http plugin provides the option "-l" to realize this. The
+WATO form now has a checkbox to make it possible to use this.
diff --git a/ChangeLog b/ChangeLog
index 06fc932..0558d5e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -70,6 +70,7 @@
* 0329 Removed Distributed WATO peer mode...
NOTE: Please refer to the migration notes!
* 0244 New features for WATO page Backup & Restore...
+ * 0382 Active HTTP check now supports multiline regexp matching...
* 0057 FIX: Fix exception in WATO host editor on custom tag without topic...
* 0241 FIX: Improved sorting of WATO folders in dropdown menu...
* 0019 FIX: Fixed wording in WATO rule for MSSQL check
diff --git a/checks/check_http b/checks/check_http
index d74666e..1ac9f7e 100644
--- a/checks/check_http
+++ b/checks/check_http
@@ -89,6 +89,8 @@ def check_http_arguments(params):
args += ' -s %s' % quote_shell_string(settings["expect_string"])
if "expect_regex" in settings:
+ if len(settings['expect_regex']) >= 4 and settings['expect_regex'][3]:
+ args += ' -l '
if settings['expect_regex'][1]:
args += ' -R'
else:
diff --git a/web/plugins/wato/active_checks.py b/web/plugins/wato/active_checks.py
index 5b0e27f..7285211 100644
--- a/web/plugins/wato/active_checks.py
+++ b/web/plugins/wato/active_checks.py
@@ -631,15 +631,20 @@ register_rule(group,
)
),
( "expect_regex",
- Tuple(
- title = _("Regular expression to expect in content"),
- orientation = "vertical",
- show_titles = False,
- elements = [
- RegExp(label = _("Regular expression: ")),
- Checkbox(label = _("Case insensitive")),
- Checkbox(label = _("return CRITICAL if found, OK if not")),
- ])
+ Transform(
+ Tuple(
+ orientation = "vertical",
+ show_titles = False,
+ elements = [
+ RegExp(label = _("Regular expression: ")),
+ Checkbox(label = _("Case insensitive")),
+ Checkbox(label = _("return CRITICAL if found, OK if not")),
+ Checkbox(label = _("Multiline string matching")),
+ ]
+ ),
+ forth = lambda x: len(x) == 3 and tuple(list(x) + [False]) or x,
+ title = _("Regular expression to expect in content"),
+ ),
),
( "post_data",
Tuple(
Module: check_mk
Branch: master
Commit: 63ceaa2a7111660131da4f1eda8d39cffe5d6623
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=63ceaa2a711166…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Tue Dec 17 12:34:50 2013 +0100
Updated bug entries #2098
---
.bugs/2098 | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/.bugs/2098 b/.bugs/2098
new file mode 100644
index 0000000..9cc6cfb
--- /dev/null
+++ b/.bugs/2098
@@ -0,0 +1,9 @@
+Title: Add try-out button to active check rule editor
+Component: wato
+State: open
+Date: 2013-12-17 12:26:03
+Targetversion: future
+Class: feature
+
+ich hätte da einen Vorschlag zu Active Checks.
+Wir wärs wenn man zu den Rules noch einen Try-it-out Button macht? dann sieht man sofort ob der Check fehlschlägt oder funktioniert.
Module: check_mk
Branch: master
Commit: 2a352c7298c6609c03604d0ca4fef01ead3cf157
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2a352c7298c660…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Tue Dec 17 12:26:42 2013 +0100
FIX smart.stats: Remove duplicate disks
In same cases a disk has two physical paths and thus is seen
two times by the <tt>smart</tt> plugin for Linux. This plugin
has now been fixed and no longer outputs duplicate entries.
---
.werks/347 | 12 ++++++++++++
ChangeLog | 1 +
agents/plugins/smart | 7 +++++++
3 files changed, 20 insertions(+)
diff --git a/.werks/347 b/.werks/347
new file mode 100644
index 0000000..72ef9c1
--- /dev/null
+++ b/.werks/347
@@ -0,0 +1,12 @@
+Title: smart.stats: Remove duplicate disks
+Level: 1
+Component: checks
+Class: fix
+State: unknown
+Version: 1.2.5i1
+Date: 1387279511
+Targetversion: future
+
+In same cases a disk has two physical paths and thus is seen
+two times by the <tt>smart</tt> plugin for Linux. This plugin
+has now been fixed and no longer outputs duplicate entries.
diff --git a/ChangeLog b/ChangeLog
index 06fc932..a2b23fb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -50,6 +50,7 @@
* 0245 FIX: Inline SNMP now longer throws an exception when using SNMPv3 credentials...
* 0380 FIX: jolokia_metrics.mem: PNP-Template now handles non existant max values...
* 0381 FIX: win_printers: Fixed creation of duplicate services...
+ * 0347 FIX: smart.stats: Remove duplicate disks...
Multisite:
* 0371 Added log class filter to hostsvcevents view
diff --git a/agents/plugins/smart b/agents/plugins/smart
index a1727f4..a995367 100755
--- a/agents/plugins/smart
+++ b/agents/plugins/smart
@@ -23,6 +23,7 @@ if which smartctl > /dev/null 2>&1 ; then
fi
echo '<<<smart>>>'
+ SEEN=
for D in /dev/disk/by-id/{scsi,ata}-*; do
[ "$D" != "${D%scsi-\*}" ] && continue
[ "$D" != "${D%ata-\*}" ] && continue
@@ -45,6 +46,12 @@ if which smartctl > /dev/null 2>&1 ; then
continue
fi
+ # Avoid duplicate entries for same device
+ if [ "${SEEN//.$N./}" != "$SEEN" ] ; then
+ continue
+ fi
+ SEEN="$SEEN.$N."
+
# strip device name for final output
DNAME=${D#/dev/disk/by-id/scsi-}
DNAME=${DNAME#/dev/disk/by-id/ata-}
Module: check_mk
Branch: master
Commit: 1beeafa48f089f9c033d9a6487390c05422ed121
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1beeafa48f089f…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Tue Dec 17 11:57:44 2013 +0100
FIX jolokia_metrics.mem: PNP-Template now handles non existant max values
With some application servers the maximum values for memory are not provided
by the agent. The checks did already handle this, but the PNP graph could
not be displayed in this case.
---
.werks/380 | 12 ++++++++++++
ChangeLog | 1 +
pnp-templates/check_mk-jolokia_metrics.mem.php | 12 ++++++++----
3 files changed, 21 insertions(+), 4 deletions(-)
diff --git a/.werks/380 b/.werks/380
new file mode 100644
index 0000000..3a487f0
--- /dev/null
+++ b/.werks/380
@@ -0,0 +1,12 @@
+Title: jolokia_metrics.mem: PNP-Template now handles non existant max values
+Level: 1
+Component: checks
+Class: fix
+State: unknown
+Version: 1.2.5i1
+Date: 1387277786
+Targetversion: future
+
+With some application servers the maximum values for memory are not provided
+by the agent. The checks did already handle this, but the PNP graph could
+not be displayed in this case.
diff --git a/ChangeLog b/ChangeLog
index b167301..1e3b68a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -48,6 +48,7 @@
* 0345 FIX: Linux agent: fix detaching of background plugins...
* 0378 FIX: agent_vsphere.pysphere: Trying to deal with permissions only on some guests/hosts
* 0245 FIX: Inline SNMP now longer throws an exception when using SNMPv3 credentials...
+ * 0380 FIX: jolokia_metrics.mem: PNP-Template now handles non existant max values...
Multisite:
* 0371 Added log class filter to hostsvcevents view
diff --git a/pnp-templates/check_mk-jolokia_metrics.mem.php b/pnp-templates/check_mk-jolokia_metrics.mem.php
index 9454309..2f79096 100644
--- a/pnp-templates/check_mk-jolokia_metrics.mem.php
+++ b/pnp-templates/check_mk-jolokia_metrics.mem.php
@@ -31,16 +31,20 @@ $def[1] = ""
. "CDEF:min_nonheap=0,nonheap,- "
. "CDEF:total=heap,nonheap,+ "
- . "AREA:heap#00c0ff:\"Heap\" "
- . "LINE1:$MAX[1]#003077:\"Heap MAX\" ";
+ . "AREA:heap#00c0ff:\"Heap\" ";
+if ($MAX[1]) {
+ $def[1] .= "LINE1:$MAX[1]#003077:\"Heap MAX\" ";
+}
if ($CRIT[1]) {
$def[1] .= "LINE1:$WARN[1]#a0ad00:\"Heap WARN\" "
. "LINE1:$CRIT[1]#ad0000:\"Heap CRIT\" ";
}
-$def[1] .= "AREA:min_nonheap#3430bf:\"Nonheap\" "
- . "LINE1:-$MAX[2]#003233:\"Nonheap MAX \" ";
+$def[1] .= "AREA:min_nonheap#3430bf:\"Nonheap\" ";
+if ($MAX[2]) {
+ $def[1] .= "LINE1:-$MAX[2]#003233:\"Nonheap MAX \" ";
+}
if ($CRIT[2]) {
$def[1] .= "LINE1:-$WARN[2]#adfd30:\"Nonheap WARN\" "
. "LINE1:-$CRIT[2]#ff0080:\"Nonheap CRIT\" ";