Module: check_mk
Branch: master
Commit: ad17a36dc01d1f8fbe99f702258809bd0d63270a
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ad17a36dc01d1f…
Author: Bastian Kuhn <bk(a)mathias-kettner.de>
Date: Wed Mar 26 14:50:06 2014 +0100
innovaphone_licenses: New Check to monitor licens usage on innovaphone devices
---
agents/special/agent_innovaphone | 15 ++++++++++-
checkman/innovaphone_licenses | 19 ++++++++++++++
checks/innovaphone_licenses | 51 ++++++++++++++++++++++++++++++++++++++
3 files changed, 84 insertions(+), 1 deletion(-)
diff --git a/agents/special/agent_innovaphone b/agents/special/agent_innovaphone
index 0654d53..c635d43 100755
--- a/agents/special/agent_innovaphone
+++ b/agents/special/agent_innovaphone
@@ -34,6 +34,7 @@ def get_pri_channel(channel_name):
link = data.get('link')
physical = data.get('physical')
if link != "Up" or physical != "Up":
+ print "%s %s %s 0 0 0" % ( channel_name, link, physical )
return
idle = 0
total = 0
@@ -42,8 +43,17 @@ def get_pri_channel(channel_name):
idle += 1
total += 1
total -= 1
- print "%s %s %s" % (channel_name, idle, total)
+ print "%s %s %s %s %s" % ( channel_name, link, physical, idle, total)
+def get_licenses():
+ address = "http://%s/PBX0/ADMIN/mod_cmd_login.xml" % server
+ data = etree.parse(get_url(address)).getroot()
+ for child in data.findall('lic'):
+ if child.get('name') == "Port":
+ count = child.get('count')
+ used = child.get('used')
+ print count, used
+ break
base_url = "/LOG0/CNT/mod_cmd.xml?cmd=xml-counts"
@@ -66,3 +76,6 @@ for what in [ "CPU", "MEM", "TEMP"]:
print "<<<%schannels>>>" % s_prefix
for channel in range(1,5):
get_pri_channel('PRI'+str(channel))
+
+print "<<<%slicenses>>>" % s_prefix
+get_licenses()
diff --git a/checkman/innovaphone_licenses b/checkman/innovaphone_licenses
new file mode 100644
index 0000000..507aed1
--- /dev/null
+++ b/checkman/innovaphone_licenses
@@ -0,0 +1,19 @@
+title: Innovaphone Gateway: Port licenses
+agents: special
+catalog: hw/network/tel
+license: GPL
+distribution: check_mk
+description:
+ This Check monitors the total number of used port licenses.
+
+inventory:
+ One check will be created
+
+perfdata:
+ The license usage, together with it's warn and crit levels
+
+[parameters]
+warning (int): The percentage of used licenses that triggers
+ a WARNING state
+critical (int): The percentage of used licenses that triggers
+ a CRITICAL state
diff --git a/checks/innovaphone_licenses b/checks/innovaphone_licenses
new file mode 100644
index 0000000..e4b79bc
--- /dev/null
+++ b/checks/innovaphone_licenses
@@ -0,0 +1,51 @@
+#!/usr/bin/python
+# -*- encoding: utf-8; py-indent-offset: 4 -*-
+# +------------------------------------------------------------------+
+# | ____ _ _ __ __ _ __ |
+# | / ___| |__ ___ ___| | __ | \/ | |/ / |
+# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / |
+# | | |___| | | | __/ (__| < | | | | . \ |
+# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ |
+# | |
+# | 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.
+
+innovaphone_licenses_default_levels = ( 90.0, 95.0 )
+
+def inventory_innovaphone_licenses(info):
+ return [ ( None, 'innovaphone_licenses_default_levels') ]
+
+def check_innovaphone_licenses(_no_item, params, info):
+ total, used = map(savefloat, info[0])
+ perc_used = ( used/ 100 ) * total
+ warn, crit = params
+ message = "Used %.0f/%.0f Licences (%.0f%%)" % ( used, total, perc_used)
+ levels = "Warning/ Critical at (%s/%s)" % ( warn, crit )
+ perf = [ ('licenses', used, None, None, total ) ]
+ if perc_used > crit:
+ return 2, message + levels, perf
+ if perc_used > warn:
+ return 1, message + levels, perf
+ return 0, message, perf
+
+check_info["innovaphone_licenses"] = {
+ "check_function" : check_innovaphone_licenses,
+ "inventory_function" : inventory_innovaphone_licenses,
+ "service_description" : "Licenses",
+ "has_perfdata" : True,
+}
+
provisioning levels in WATO are no longer limited to 101%
Message-ID: <5332c6e4.AWes1nnl/w16A0KQ%gg(a)mathias-kettner.de>
User-Agent: Heirloom mailx 12.4 7/29/08
MIME-Version: 1.0
Content-Type: text/plain; charset=iso-8859-1
Content-Transfer-Encoding: 8bit
Module: check_mk
Branch: master
Commit: 2ddbcc878ea588221fc2194cd9a3cdc8a841aa02
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2ddbcc878ea588…
Author: Götz Golla <gg(a)mathias-kettner.de>
Date: Wed Mar 26 13:23:20 2014 +0100
FIX esx_vsphere_datastores: provisioning levels in WATO are no longer limited to 101%
---
.werks/599 | 8 ++++++++
ChangeLog | 3 ++-
web/plugins/wato/check_parameters.py | 4 ++--
3 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/.werks/599 b/.werks/599
new file mode 100644
index 0000000..a3c52ea
--- /dev/null
+++ b/.werks/599
@@ -0,0 +1,8 @@
+Title: esx_vsphere_datastores: provisioning levels in WATO are no longer limited to 101%
+Level: 1
+Component: checks
+Version: 1.2.5i1
+Date: 1395836386
+Class: fix
+
+
diff --git a/ChangeLog b/ChangeLog
index 4306759..3ad33e4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -125,10 +125,10 @@
* 0760 The windows agent contains meta information about version, manufacturer etc....
* 0145 apc_symmetra: Changed naming of Batterie Temperature to System Temerature...
NOTE: Please refer to the migration notes!
- * 0598 kentix_temp, kentix_humidity: new checks for Kentix MultiSensor-Rack
* 0735 mem.win: now able to configure swap file levels
* 0146 innovaphone_priports_l1, innovaphone_priports_l2: New Checks for Innovaphone PRI Ports
* 0707 ibm_svc_host: New check: Status of hosts an IBM SVC / V7000 presents volumes to
+ * 0598 kentix_temp, kentix_humidity: new checks for Kentix MultiSensor-Rack
* 0103 FIX: services: Fixed bug with service inventory defined in main.mk...
* 0299 FIX: borcade_mlx_fan: Prettified output, handling "other" state now
* 0300 FIX: cisco_fru_power: Trying not to inventorize not plugged in FRUs...
@@ -229,6 +229,7 @@
* 0142 FIX: winperf_if: treat unknown packets no longer as error packets
* 0593 FIX: zypper: agent plugin and check now lead to UNKNOWN result in case of repo problems
* 0758 FIX: check_sql: Fixed monitoring of stored procedures with oracle
+ * 0599 FIX: esx_vsphere_datastores: provisioning levels in WATO are no longer limited to 101%
Multisite:
* 0371 Added log class filter to hostsvcevents view
diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py
index 36c71f7..bab13c6 100644
--- a/web/plugins/wato/check_parameters.py
+++ b/web/plugins/wato/check_parameters.py
@@ -1761,8 +1761,8 @@ register_check_parameters(
title = _("Provisioning Levels"),
help = _("Configure thresholds for overprovisioning of datastores."),
elements = [
- Percentage(title = _("Warning at overprovisioning of")),
- Percentage(title = _("Critical at overprovisioning of")),
+ Percentage(title = _("Warning at overprovisioning of"), maxvalue = None),
+ Percentage(title = _("Critical at overprovisioning of"), maxvalue = None),
]
)),
],
Module: check_mk
Branch: master
Commit: 47552b96915e80233a3705c0ee4821d16d87b6b6
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=47552b96915e80…
Author: Andreas Boesl <ab(a)mathias-kettner.de>
Date: Wed Mar 26 13:16:33 2014 +0100
werk 736: improved wording
---
.werks/736 | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/.werks/736 b/.werks/736
index 0937301..9b8c346 100644
--- a/.werks/736
+++ b/.werks/736
@@ -9,7 +9,7 @@ Additional validations are now undertaken when creating or restoring a backup fi
New procedures and features
<ul>
-<li>Stopping and re-staring the record of performance data while the restore is in progress</li>
-<li>Correct evaluation of exit codes and error messages from the backup commands</li>
-<li>New backup/restore hooks: <tt>pre_restore</tt>, <tt>post_restore</t>, <tt>backup_command</tt>, <tt>restore_command</tt></li>
+<li>Stopping and re-starting performance data recording while the restore is in progress</li>
+<li>Correct evaluation of exit codes and error messages from the backup/restore commands</li>
+<li>New backup/restore hooks: <tt>pre_restore</tt>, <tt>post_restore</tt>, <tt>backup_command</tt>, <tt>restore_command</tt></li>
</ul>
Module: check_mk
Branch: master
Commit: 4b464a2f4e958feeb04f9fba3f8afbbc9b4f6378
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4b464a2f4e958f…
Author: Andreas Boesl <ab(a)mathias-kettner.de>
Date: Wed Mar 26 13:10:50 2014 +0100
FIX WATO backup and restore: improved error handling
Additional validations are now undertaken when creating or restoring a backup file.<br>
New procedures and features
<ul>
<li>Stopping and re-staring the record of performance data while the restore is in progress</li>
<li>Correct evaluation of exit codes and error messages from the backup commands</li>
<li>New backup/restore hooks: <tt>pre_restore</tt>, <tt>post_restore</t>, <tt>backup_command</tt>, <tt>restore_command</tt></li>
</ul>
---
.werks/736 | 15 ++++
ChangeLog | 3 +-
modules/automation.py | 68 ++++++++++++------
web/htdocs/multitar.py | 98 +++++++++++++++----------
web/htdocs/wato.py | 140 ++++++++++++++++++++----------------
web/plugins/wato/backup_domains.py | 55 +++++++++++---
6 files changed, 250 insertions(+), 129 deletions(-)
Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=4b464a2f4e…
Module: check_mk
Branch: master
Commit: d90a866b403df2fedaf66967835c84e696413739
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d90a866b403df2…
Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de>
Date: Wed Mar 26 11:22:20 2014 +0100
Updated bug entries #1066
---
.bugs/1066 | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/.bugs/1066 b/.bugs/1066
new file mode 100644
index 0000000..d2b88df
--- /dev/null
+++ b/.bugs/1066
@@ -0,0 +1,12 @@
+Title: cmk -m does not start if manpages without catalog: header
+Component: docu
+State: open
+Date: 2014-03-26 11:19:32
+Targetversion: 1.2.5i1
+Class: bug
+
+if you installed some mkp packages from the exchange or so and their
+check manpages do not contain a catalog: header then cmk -m
+does not start at all (failing)
+
+missing catalog: header must be caught