Module: check_mk
Branch: master
Commit: a25a9cabc67a837366232c901d011247200c7fe4
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a25a9cabc67a83…
Author: Bastian Kuhn <bk(a)mathias-kettner.de>
Date: Thu Jul 24 11:34:22 2014 +0200
raritan_pdu_plugs: extended man page
---
checkman/raritan_pdu_plugs | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/checkman/raritan_pdu_plugs b/checkman/raritan_pdu_plugs
index f7268c2..0afa47e 100644
--- a/checkman/raritan_pdu_plugs
+++ b/checkman/raritan_pdu_plugs
@@ -7,10 +7,10 @@ description:
This check monitors the state of the plugs of the Raritan PX-2000
family of intelligent rack power distribution units (iPDUs).
It has been tested with the model PX2-2180CR.
- As default plugs which are switched {on} are in the state {OK},
+ As default the state of the time from inventory will result in the state {OK},
other states are in the state {CRIT}.
- The required state can be configured to {off}. Then these plugs are in
- the state {OK} when they are switched off, and {CRIT} otherwise.
+ The required state can be configured to {on} or {off}. Then these plugs are in
+ the state {OK} when they are in the configured state, and {CRIT} otherwise.
item:
The ID Number of the plug as given by the device
Module: check_mk
Branch: master
Commit: 59892ed343b596a5b568409f4a50aeb005b1a9ba
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=59892ed343b596…
Author: Andreas Boesl <ab(a)mathias-kettner.de>
Date: Thu Jul 24 10:43:44 2014 +0200
included check_mk_agent windows msi installer
The new msi install check_mk_agent.msi package contains the 32 and 64 bit version of the check_mk_agent.exe.
Upon install the msi package will determine the os architecture and install the matching agent accordingly.
The installed 32/64 Bit Agent is always named check_mk_agent.exe.
Note: The msi installer always installs into the 32 bit program files folder. This is by design.
---
.werks/1088 | 12 +
ChangeLog | 1 +
Makefile | 6 +-
agents/windows/Makefile | 6 +-
agents/windows/install_agent-64.exe | Bin 159342 -> 159342 bytes
agents/windows/install_agent.exe | Bin 156400 -> 156400 bytes
agents/windows/msibuild/Makefile | 16 +-
agents/windows/msibuild/msi_container.msi | Bin 612864 -> 613376 bytes
.../msibuild/patches/configure_remove_wixl.dif | 622 ++++++++++++++++++++
9 files changed, 652 insertions(+), 11 deletions(-)
Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=59892ed343…
Module: check_mk
Branch: master
Commit: e6c137f792aaa7a2576009815f07010cdf2b0eef
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e6c137f792aaa7…
Author: Goetz Golla <gg(a)mathias-kettner.de>
Date: Wed Jul 23 23:24:43 2014 +0200
jolokia_metrics.gc, jolokia_metrics.tp: now come with its own pnp templates
---
.werks/640 | 8 ++++
ChangeLog | 3 +-
pnp-templates/check_mk-jolokia_metrics.gc.php | 61 ++++++++++++++++++++++++
pnp-templates/check_mk-jolokia_metrics.tp.php | 63 +++++++++++++++++++++++++
4 files changed, 134 insertions(+), 1 deletion(-)
diff --git a/.werks/640 b/.werks/640
new file mode 100644
index 0000000..5fb4c7b
--- /dev/null
+++ b/.werks/640
@@ -0,0 +1,8 @@
+Title: jolokia_metrics.gc, jolokia_metrics.tp: now come with its own pnp templates
+Level: 1
+Component: checks
+Version: 1.2.5i5
+Date: 1406150640
+Class: feature
+
+
diff --git a/ChangeLog b/ChangeLog
index c8ea5d9..8781323 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -40,6 +40,7 @@
* 1135 bintec_sensors.voltage, bintec_sensors.temp: New Checks for Voltage and Temperature Sensors of Bintec Routers
* 1048 mem.win: support predictive levels...
* 1136 bintec_brrp_status: New Check for BRRP States on Bintec Routers
+ * 0640 jolokia_metrics.gc, jolokia_metrics.tp: now come with its own pnp templates
* 0994 FIX: agent plugin smart: fixed syntax error
* 0989 FIX: logwatch.ec: Fix forwarding multiple messages via syslog/TCP...
* 0943 FIX: if.include: fixed incorrect traffic percentage values in the check output of if checks...
@@ -67,9 +68,9 @@
* 1083 FIX: ad_replication.bat: does not return data if the server is no DC
* 0638 FIX: windows_updates: agent plugin now always sends section header, even if no update information provided...
* 1084 FIX: ps: now able to handle bigger process groups without constant MKCounterWrapped Exceptions...
- * 0639 FIX: jolokia_metrics: fix for problem when catalina uses the standalone engine
* 1087 FIX: Active checks: Non-ascii check commands now converted into utf-8...
* 1049 FIX: ups_capacity: Fix exception when running on battery...
+ * 0639 FIX: jolokia_metrics: fix for problem when catalina uses the standalone engine
Multisite:
* 1013 Sort host names naturally, e.g. foobar11 comes after foobar2...
diff --git a/pnp-templates/check_mk-jolokia_metrics.gc.php b/pnp-templates/check_mk-jolokia_metrics.gc.php
new file mode 100644
index 0000000..aeb314a
--- /dev/null
+++ b/pnp-templates/check_mk-jolokia_metrics.gc.php
@@ -0,0 +1,61 @@
+<?php
+# +------------------------------------------------------------------+
+# | ____ _ _ __ __ _ __ |
+# | / ___| |__ ___ ___| | __ | \/ | |/ / |
+# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / |
+# | | |___| | | | __/ (__| < | | | | . \ |
+# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ |
+# | |
+# | Copyright Mathias Kettner 2013 mk(a)mathias-kettner.de |
+# +------------------------------------------------------------------+
+#
+# This file is part of Check_MK.
+# 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.
+
+
+$opt[1] = "--vertical-label \"GC Count\" --title \" $servicedesc for $hostname\" ";
+
+$def[1] = "DEF:c=$RRDFILE[1]:$DS[1]:AVERAGE ";
+
+$def[1] .= rrd::comment("$NAME[1]\: \\n");
+$def[1] .= "AREA:c#3bfcdf:\"\" " ;
+$def[1] .= "LINE1:c#00b499:\"GC Count per Minute\" " ;
+$def[1] .= "GPRINT:c:LAST:\"%3.4lg LAST \" ";
+$def[1] .= "GPRINT:c:AVERAGE:\"%3.4lg AVERAGE \" ";
+$def[1] .= "GPRINT:c:MAX:\"%3.4lg MAX \\n\" ";
+
+if ($WARN[1] != "") {
+ $def[1] .= "HRULE:$WARN[1]#FFFF00:\"Warning at $WARN[1]$UNIT[1] \\n\" ";
+}
+if ($CRIT[1] != "") {
+ $def[1] .= "HRULE:$CRIT[1]#FF0000:\"Critical at $CRIT[1]$UNIT[1] \\n\" ";
+}
+
+$opt[2] = "--vertical-label \"GC Time\" --title \" $servicedesc for $hostname\" ";
+
+$def[2] = "DEF:t=$RRDFILE[2]:$DS[2]:AVERAGE ";
+
+$def[2] .= rrd::comment("$NAME[2]\: \\n");
+$def[2] .= "AREA:t#ffc7ac:\"\" " ;
+$def[2] .= "LINE1:t#ff6d25:\"GC Time (ms) per Minute\" " ;
+$def[2] .= "GPRINT:t:LAST:\"%3.0lf$UNIT[2] LAST \" ";
+$def[2] .= "GPRINT:t:AVERAGE:\"%3.2lf$UNIT[2] AVERAGE \" ";
+$def[2] .= "GPRINT:t:MAX:\"%3.2lf$UNIT[2] MAX \\n\" ";
+if ($WARN[2] != "") {
+ $def[2] .= "HRULE:$WARN[2]#FFFF00:\"Warning at $WARN[2]$UNIT[2] \\n\" ";
+}
+if ($CRIT[2] != "") {
+ $def[2] .= "HRULE:$CRIT[2]#FF0000:\"Critical at $CRIT[2]$UNIT[2] \\n\" ";
+}
+?>
diff --git a/pnp-templates/check_mk-jolokia_metrics.tp.php b/pnp-templates/check_mk-jolokia_metrics.tp.php
new file mode 100644
index 0000000..cf53c1a
--- /dev/null
+++ b/pnp-templates/check_mk-jolokia_metrics.tp.php
@@ -0,0 +1,63 @@
+<?php
+# +------------------------------------------------------------------+
+# | ____ _ _ __ __ _ __ |
+# | / ___| |__ ___ ___| | __ | \/ | |/ / |
+# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / |
+# | | |___| | | | __/ (__| < | | | | . \ |
+# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ |
+# | |
+# | Copyright Mathias Kettner 2013 mk(a)mathias-kettner.de |
+# +------------------------------------------------------------------+
+#
+# This file is part of Check_MK.
+# 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.
+
+
+$opt[1] = "--vertical-label \"ThreadPool busy/count\" --title \" $servicedesc for $hostname\" ";
+
+$def[1] = "DEF:b=$RRDFILE[1]:$DS[1]:AVERAGE ";
+$def[1] .= "DEF:c=$RRDFILE[2]:$DS[2]:AVERAGE " ;
+
+
+# BUSY
+$def[1] .= rrd::comment("$NAME[2]\: ");
+$def[1] .= "AREA:c#00ff77:\"\" " ;
+$def[1] .= "LINE1:c#00b454:\"busy\" " ;
+$def[1] .= "GPRINT:c:LAST:\"%3.4lg LAST \" ";
+$def[1] .= "GPRINT:c:AVERAGE:\"%3.4lg AVERAGE \" ";
+$def[1] .= "GPRINT:c:MAX:\"%3.4lg MAX \\n\" ";
+if ($WARN[2] != "") {
+ $def[1] .= "HRULE:$WARN[2]#FFFF00:\" Warning at $WARN[2]$UNIT[2] \" ";
+}
+if ($CRIT[2] != "") {
+ $def[1] .= "HRULE:$CRIT[2]#FF0000:\" Critical at $CRIT[2]$UNIT[2] \" ";
+}
+# MAX
+$def[1] .= "HRULE:$MAX[1]#000000:\" Max at $MAX[1] \\n\" ";
+
+
+# COUNT
+$def[1] .= rrd::comment("$NAME[1]\: ");
+$def[1] .= "LINE1:b#00aae8:\"count\" " ;
+$def[1] .= "GPRINT:b:LAST:\"%3.4lg LAST \" ";
+$def[1] .= "GPRINT:b:AVERAGE:\"%3.4lg AVERAGE \" ";
+$def[1] .= "GPRINT:b:MAX:\"%3.4lg MAX \\n\" ";
+if ($WARN[1] != "") {
+ $def[1] .= "HRULE:$WARN[1]#E5B200:\" Warning at $WARN[1]$UNIT[1] \" ";
+}
+if ($CRIT[1] != "") {
+ $def[1] .= "HRULE:$CRIT[1]#E50066:\" Critical at $CRIT[1]$UNIT[1] \\n\" ";
+}
+
+?>
Module: check_mk
Branch: master
Commit: adea2c6c89bb27eca716e0086531ed91d732c396
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=adea2c6c89bb27…
Author: Andreas Boesl <ab(a)mathias-kettner.de>
Date: Wed Jul 23 14:13:38 2014 +0200
FIX Active checks: Non-ascii check commands now converted into utf-8
There were some instances where the arguments for an active check
did contain non-ASCII characters, for example python unicode.
This caused an exception during the configuration generation.<br>
Check commands for active checks are now always converted into utf-8.
---
.werks/1087 | 12 ++++++++++++
ChangeLog | 1 +
modules/check_mk.py | 2 +-
3 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/.werks/1087 b/.werks/1087
new file mode 100644
index 0000000..0c988e2
--- /dev/null
+++ b/.werks/1087
@@ -0,0 +1,12 @@
+Title: Active checks: Non-ascii check commands now converted into utf-8
+Level: 1
+Component: checks
+Version: 1.2.5i5
+Date: 1406117438
+Class: fix
+
+There were some instances where the arguments for an active check
+did contain non-ASCII characters, for example python unicode.
+This caused an exception during the configuration generation.<br>
+
+Check commands for active checks are now always converted into utf-8.
diff --git a/ChangeLog b/ChangeLog
index b12e814..ef761aa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -67,6 +67,7 @@
* 1083 FIX: ad_replication.bat: does not return data if the server is no DC
* 0638 FIX: windows_updates: agent plugin now always sends section header, even if no update information provided...
* 1084 FIX: ps: now able to handle bigger process groups without constant MKCounterWrapped Exceptions...
+ * 1087 FIX: Active checks: Non-ascii check commands now converted into utf-8...
Multisite:
* 1013 Sort host names naturally, e.g. foobar11 comes after foobar2...
diff --git a/modules/check_mk.py b/modules/check_mk.py
index c657767..9f9c4f9 100755
--- a/modules/check_mk.py
+++ b/modules/check_mk.py
@@ -2393,7 +2393,7 @@ define service {
check_command\t\t\t%s
active_checks_enabled\t\t1
%s}
-""" % (template, hostname, make_utf8(description), simulate_command(command), extraconf))
+""" % (template, hostname, make_utf8(description), make_utf8(simulate_command(command)), extraconf))
# write service dependencies for active checks
outfile.write(get_dependencies(hostname,description))
Module: check_mk
Branch: master
Commit: eb08ccffea07e111b802ccbc8d3a50d436322665
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=eb08ccffea07e1…
Author: Andreas Boesl <ab(a)mathias-kettner.de>
Date: Wed Jul 23 14:09:14 2014 +0200
check_http: now able to enter non-ascii signs in "Send HTTP POST data" rule
---
.werks/1086 | 9 +++++++++
ChangeLog | 3 ++-
web/plugins/wato/active_checks.py | 2 +-
3 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/.werks/1086 b/.werks/1086
new file mode 100644
index 0000000..e1200a2
--- /dev/null
+++ b/.werks/1086
@@ -0,0 +1,9 @@
+Title: check_http: now able to enter non-ascii signs in "Send HTTP POST data" rule
+Level: 1
+Component: wato
+Version: 1.2.5i5
+Date: 1406117033
+Class: feature
+
+You are now able to enter öäß.. characters into the POST field.
+When calling check_http, the entered text (unicode) will be converted into utf-8.
diff --git a/ChangeLog b/ChangeLog
index 4f05f54..b12e814 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -38,8 +38,8 @@
* 1133 qlogic_sanbox_fabric_element: New Check for Fabric Elements in QLogic SANbox Fibre Channel Switches
* 1134 bintec_sensors.fan: New Check for Fan Speed of Bintec Routers
* 1135 bintec_sensors.voltage, bintec_sensors.temp: New Checks for Voltage and Temperature Sensors of Bintec Routers
- * 1136 bintec_brrp_status: New Check for BRRP States on Bintec Routers
* 1048 mem.win: support predictive levels...
+ * 1136 bintec_brrp_status: New Check for BRRP States on Bintec Routers
* 0994 FIX: agent plugin smart: fixed syntax error
* 0989 FIX: logwatch.ec: Fix forwarding multiple messages via syslog/TCP...
* 0943 FIX: if.include: fixed incorrect traffic percentage values in the check output of if checks...
@@ -84,6 +84,7 @@
WATO:
* 0825 WATO: Hover menu of user online state shows the last seen date/time now
* 1057 WATO folder permissions are only exported to NagVis when configured...
+ * 1086 check_http: now able to enter non-ascii signs in "Send HTTP POST data" rule...
* 0990 FIX: Fix HTTP error handling in bulk inventory...
* 1004 FIX: Fix exception when saving rules, caused by empty item
* 0947 FIX: WATO snapshots: fixed missing files on restoring nagvis backup domains
diff --git a/web/plugins/wato/active_checks.py b/web/plugins/wato/active_checks.py
index 8e140b1..37d439f 100644
--- a/web/plugins/wato/active_checks.py
+++ b/web/plugins/wato/active_checks.py
@@ -667,7 +667,7 @@ register_rule(group,
Tuple(
title = _("Send HTTP POST data"),
elements = [
- TextAscii(
+ TextUnicode(
title = _("HTTP POST data"),
help = _("Data to send via HTTP POST method. "
"Please make sure, that the data is URL-encoded."),