Module: check_mk
Branch: master
Commit: 0c264758cbc02e7800fb21ad07d9b5c5757d5f30
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0c264758cbc02e…
Author: Goetz Golla <gg(a)mathias-kettner.de>
Date: Thu Jan 29 19:37:38 2015 +0100
Updated bug entries #2292
---
.bugs/2292 | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
diff --git a/.bugs/2292 b/.bugs/2292
new file mode 100644
index 0000000..372d125
--- /dev/null
+++ b/.bugs/2292
@@ -0,0 +1,17 @@
+Title: omd_status agent section disappears when omd status has RC != 0
+Component: checks
+State: open
+Date: 2015-01-29 19:31:35
+Targetversion: 1.2.5i1
+Class: bug
+
+check_mk_agent calls
+
+run_cached 60 "omd status --bare --auto"
+
+to get the status of all omd site in mode AUTOSTART = on.
+
+If a site is not running, "omd status" gives a return code of 2.
+
+run_cached cannot handle this, and no longer produces any results, so that
+the omd_status section disappears from the agent output.
Module: check_mk
Branch: master
Commit: b93ef8c744b5499256d680767e1c140267a35ac1
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b93ef8c744b549…
Author: Bastian Kuhn <bk(a)mathias-kettner.de>
Date: Thu Jan 29 15:02:13 2015 +0100
Added missing manpage for df_zos
---
checkman/df_zos | 25 +++++++++++++++++++++++++
modules/catalog.py | 1 +
2 files changed, 26 insertions(+)
diff --git a/checkman/df_zos b/checkman/df_zos
new file mode 100644
index 0000000..60a504b
--- /dev/null
+++ b/checkman/df_zos
@@ -0,0 +1,25 @@
+title: zOS Mainframes: Used Space in Filesystems
+agents: z_os
+catalog: os/storage
+license: GPL
+distribution: check_mk
+description:
+ This check monitors the filesystem usage on IBM zOS Mainframes.
+
+ The check makes use of the general check framework of the {df} check. Please
+ refer to the man page of the {df} check for the detailed description of
+ the check and its numerous features.
+
+inventory:
+ All filesystems found will be inventorized except mount points listed
+ in {inventory_df_exclude_mountpoints} and filesystems with zero size.
+
+item:
+ The mount point of the filesystem
+
+perfdata:
+ See the man page of the {df} check
+
+[parameters]
+parameters (dict): See the man page of the {df} check
+
diff --git a/modules/catalog.py b/modules/catalog.py
index b67f46a..8db56f1 100644
--- a/modules/catalog.py
+++ b/modules/catalog.py
@@ -120,6 +120,7 @@ manpage_catalog_titles = {
"solaris" : "Solaris",
"vsphere" : "VMWare ESX (via vSphere)",
"windows" : "Microsoft Windows",
+ "z_os" : "IBM zOS Mainframes",
"hardware" : "Hardware Sensors",
"kernel" : "CPU, Memory and Kernel Performance",
Module: check_mk
Branch: master
Commit: acb87e2b53dbdf738a5fece4509f8823974b08bd
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=acb87e2b53dbdf…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Thu Jan 29 13:37:04 2015 +0100
Fixed some English texsts
Conflicts:
web/plugins/wato/check_parameters.py
---
web/plugins/wato/check_mk_configuration.py | 2 +-
web/plugins/wato/check_parameters.py | 6 +++---
web/plugins/wato/inventory.py | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py
index 9c3cdca..ce8c924 100644
--- a/web/plugins/wato/check_mk_configuration.py
+++ b/web/plugins/wato/check_mk_configuration.py
@@ -1103,7 +1103,7 @@ register_configvar(group,
( "zfsget", _("Used space in ZFS pools and filesystems")),
( "ps", _("State and Count of Processes") ),
( "ps.perf", _("State and Count of Processes (with additional performance data)")),
- ( "wmic_process", _("Ressource consumption of windows processes")),
+ ( "wmic_process", _("Resource consumption of windows processes")),
( "logwatch", _("Check logfiles for relevant new messages")),
( "cmk-inventory", _("Monitor hosts for unchecked services (Check_MK Discovery)")),
( "hyperv_vms", _("Hyper-V Server: State of VMs")),
diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py
index 13ce361..b2d33fd 100644
--- a/web/plugins/wato/check_parameters.py
+++ b/web/plugins/wato/check_parameters.py
@@ -4766,9 +4766,9 @@ register_rule(group + '/' + subgroup_networking,
register_rule(group + '/' + subgroup_inventory,
varname = "winperf_msx_queues_inventory",
title = _('MS Exchange Message Queues Inventory'),
- help = _('Per default all Counters a preconfigured in the check. '
- 'It needed it is possible to overwrite that with this rule. '
- 'To do that, knowledge about the Agent Output is needed. '),
+ help = _('Per default the offsets of all Windows performance counters are preconfigured in the check. '
+ 'If the format of your counters object is not compatible then you can adapt the counter '
+ 'offsets manually.'),
valuespec = ListOf(
Tuple(
orientation = "horizontal",
diff --git a/web/plugins/wato/inventory.py b/web/plugins/wato/inventory.py
index a56afe1..da14ca6 100644
--- a/web/plugins/wato/inventory.py
+++ b/web/plugins/wato/inventory.py
@@ -70,7 +70,7 @@ register_rule(group,
title = _("Export file to create, containing <tt><HOST></tt> for the hostname"),
help = _("Please specify the path to the export file. The text <tt><HOST></tt> "
"will be replaced with the host name the inventory has been done for. "
- "If you use a relative path then that will be replative to Check_MK's directory "
+ "If you use a relative path then that will be relative to Check_MK's directory "
"for variable data, which is <tt>%s</tt>.") % defaults.var_dir,
allow_empty = False,
size = 64,
Module: check_mk
Branch: master
Commit: a7374687838cbfa823dc8a333200329b15904fc9
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a7374687838cbf…
Author: Konstantin Büttner <kb(a)mathias-kettner.de>
Date: Thu Jan 29 11:27:21 2015 +0100
kentix_temp, lnx_thermal: Fixed formatting error in manpage
---
checkman/kentix_temp | 2 +-
checkman/lnx_thermal | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/checkman/kentix_temp b/checkman/kentix_temp
index 8d8a308..faca9af 100644
--- a/checkman/kentix_temp
+++ b/checkman/kentix_temp
@@ -31,7 +31,7 @@ according to the unit sent by the device. This key allows to override that. Trea
lightly, as this may lead to a misinterpreted temperature. Should only be used if
the device reports its unit incorrectly.
- {"device_levels_handling"]: How the check treats the device's internal levels
+ {"device_levels_handling"}: How the check treats the device's internal levels
versus the ones you specify yourself. The following options are supported: "best"
results in the best status between yours and the device's levels, "worst" in the
worst, "usr" ignore's the device's levels, "dev" ignores yours, usrdefault and
diff --git a/checkman/lnx_thermal b/checkman/lnx_thermal
index 390f013..6b4a1c1 100644
--- a/checkman/lnx_thermal
+++ b/checkman/lnx_thermal
@@ -32,7 +32,7 @@ according to the unit sent by the device. This key allows to override that. Trea
lightly, as this may lead to a misinterpreted temperature. Should only be used if
the device reports its unit incorrectly.
- {"device_levels_handling"]: How the check treats the device's internal levels
+ {"device_levels_handling"}: How the check treats the device's internal levels
versus the ones you specify yourself. The following options are supported: "best"
results in the best status between yours and the device's levels, "worst" in the
worst, "usr" ignore's the device's levels, "dev" ignores yours, usrdefault and