Module: check_mk
Branch: master
Commit: e68541ebdfaaf8dad630e190e25074ffbba48e56
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e68541ebdfaaf8…
Author: Marcel Arentz <ma(a)mathias-kettner.de>
Date: Fri Oct 21 15:32:38 2016 +0200
3949 ucd_cpu_load: Genugate devices are now displaying CPU load
Genugate devices are only using some parts of the UCD MIB for the CPU load. This is now implemented.
---
.werks/3949 | 9 +++++++++
ChangeLog | 1 +
checks/ucd.include | 1 +
checks/ucd_cpu_load | 25 +++++++++++++++++++++++--
4 files changed, 34 insertions(+), 2 deletions(-)
diff --git a/.werks/3949 b/.werks/3949
new file mode 100644
index 0000000..7f5c66b
--- /dev/null
+++ b/.werks/3949
@@ -0,0 +1,9 @@
+Title: ucd_cpu_load: Genugate devices are now displaying CPU load
+Level: 1
+Component: checks
+Compatible: compat
+Version: 1.4.0i2
+Date: 1477056627
+Class: feature
+
+Genugate devices are only using some parts of the UCD MIB for the CPU load. This is now implemented.
diff --git a/ChangeLog b/ChangeLog
index e337c41..5e31742 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,6 +14,7 @@
* 3956 fileinfo.groups: now allows regular expressions within include and exclude patterns each beginning with a tilde
* 3947 mssql_blocked_sessions: thresholds for wait time can be set now...
* 3830 netapp_api_luns: new check to monitor the filesystem usage of LUNs
+ * 3949 ucd_cpu_load: Genugate devices are now displaying CPU load...
* 3894 FIX: mkeventd_status: Fixed bug in case Event Console is not running
* 3907 FIX: oracle_tablespaces: simplyfied free space calculation depending on version...
* 3819 FIX: windows agent: fixed 2 bugs related to mrpe...
diff --git a/checks/ucd.include b/checks/ucd.include
index e337cd0..3c7eb6f 100644
--- a/checks/ucd.include
+++ b/checks/ucd.include
@@ -37,6 +37,7 @@ def ucd_scan_function(oid):
"HP Onboard Administrator" in oid(".1.3.6.1.2.1.1.1.0") or \
# for barracuda spam firewall appliance
"barracuda" in oid(".1.3.6.1.2.1.1.1.0").lower() or \
+ "genugate" in oid(".1.3.6.1.2.1.1.1.0") or \
# for artec email archiv appliance
( oid('.1.3.6.1.2.1.1.2.0') == '.1.3.6.1.4.1.8072.3.2.10' and \
"version" in oid('.1.3.6.1.2.1.1.1.0').lower() and \
diff --git a/checks/ucd_cpu_load b/checks/ucd_cpu_load
index 04bfae0..c5f303f 100644
--- a/checks/ucd_cpu_load
+++ b/checks/ucd_cpu_load
@@ -25,6 +25,14 @@
# Boston, MA 02110-1301 USA.
+# .1.3.6.1.4.1.2021.10.1.5.1 691 1 min
+# .1.3.6.1.4.1.2021.10.1.5.2 855 5 min
+# .1.3.6.1.4.1.2021.10.1.5.3 895 15 min
+# .1.3.6.1.4.1.2021.10.1.6.1 1.350000 1 min
+# .1.3.6.1.4.1.2021.10.1.6.2 1.250000 5 min
+# .1.3.6.1.4.1.2021.10.1.6.3 1.240000 15 min
+
+
cpuload_default_levels = (5.0, 10.0)
@@ -34,8 +42,18 @@ def inventory_ucd_cpu_load(info):
def check_ucd_cpu_load(item, params, info):
+ # Some devices provide only one table. We prefer float table
+ this_cpu_load_table = []
+ for int_cpu_load_str, float_cpu_load_str in info:
+ if float_cpu_load_str:
+ this_cpu_load_table.append( float(float_cpu_load_str.replace(",", ".")) )
+ elif int_cpu_load_str:
+ this_cpu_load_table.append( float(int_cpu_load_str)/100.0 )
+ else:
+ this_cpu_load_table.append( 0 )
+
# Note: Some dump devices send 12,540000 instead of 12.540000
- return check_cpu_load_generic(params, [ float(l[0].replace(",", ".")) for l in info ])
+ return check_cpu_load_generic( params, this_cpu_load_table )
check_info["ucd_cpu_load"] = {
@@ -43,7 +61,10 @@ check_info["ucd_cpu_load"] = {
'inventory_function': inventory_ucd_cpu_load,
'service_description': 'CPU load',
'has_perfdata': True,
- 'snmp_info': ('.1.3.6.1.4.1.2021.10.1', [6]),
+ 'snmp_info': ('.1.3.6.1.4.1.2021.10.1', [
+ "5", # UCD-SNMP-MIB::laLoadInt Int table
+ "6", # UCD-SNMP-MIB::laLoadFloat Float table
+ ]),
# 'CPU load' is not available in the HR-MIB
# thus we cannot use 'prefer_hr_scan_function'
'snmp_scan_function': ucd_scan_function,
Module: check_mk
Branch: master
Commit: b38b33e6ee9f70a598f0b2ccd7111f3c6c256af1
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b38b33e6ee9f70…
Author: Andreas Boesl <ab(a)mathias-kettner.de>
Date: Fri Oct 21 13:54:32 2016 +0200
3830 netapp_api_luns: new check to monitor the filesystem usage of LUNs
---
.werks/3830 | 9 ++++
ChangeLog | 1 +
agents/special/agent_netapp | 16 +++++++
checkman/netapp_api_luns | 16 +++++++
web/plugins/wato/check_parameters.py | 81 ++++++++++++++++++++++++++++++++++++
5 files changed, 123 insertions(+)
diff --git a/.werks/3830 b/.werks/3830
new file mode 100644
index 0000000..3dec926
--- /dev/null
+++ b/.werks/3830
@@ -0,0 +1,9 @@
+Title: netapp_api_luns: new check to monitor the filesystem usage of LUNs
+Level: 1
+Component: checks
+Compatible: compat
+Version: 1.4.0i2
+Date: 1477050849
+Class: feature
+
+
diff --git a/ChangeLog b/ChangeLog
index 4fd63f8..e337c41 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,7 @@
* 3945 fortigate_node: Memory on fortigate clusters are now configurable by WATO...
* 3956 fileinfo.groups: now allows regular expressions within include and exclude patterns each beginning with a tilde
* 3947 mssql_blocked_sessions: thresholds for wait time can be set now...
+ * 3830 netapp_api_luns: new check to monitor the filesystem usage of LUNs
* 3894 FIX: mkeventd_status: Fixed bug in case Event Console is not running
* 3907 FIX: oracle_tablespaces: simplyfied free space calculation depending on version...
* 3819 FIX: windows agent: fixed 2 bugs related to mrpe...
diff --git a/agents/special/agent_netapp b/agents/special/agent_netapp
index 23e0d1d..a615eff 100755
--- a/agents/special/agent_netapp
+++ b/agents/special/agent_netapp
@@ -926,6 +926,22 @@ try:
"aggr-space-attributes.size-total" : "size-total"})
+ # LUNs
+ luns = query("lun-get-iter")
+ if luns:
+ print "<<<netapp_api_luns:sep(9)>>>"
+ print format_config(luns, "lun", "path",
+ config_report = [
+ "size",
+ "size-used",
+ "path",
+ "online",
+ "read-only",
+ "vserver",
+ "volume"
+ ])
+
+
# Diagnosis status
diag_status = query("diagnosis-status-get")
if diag_status:
diff --git a/checkman/netapp_api_luns b/checkman/netapp_api_luns
new file mode 100644
index 0000000..fb0281a
--- /dev/null
+++ b/checkman/netapp_api_luns
@@ -0,0 +1,16 @@
+title: NetApp Filers: Used space of LUNs
+agents: netapp
+catalog: hw/storagehw/netapp
+license: GPL
+distribution: check_mk
+description:
+ This check measures the usage of LUNs of Netapp filers running in clustermode.
+ A WATO rule allows you to configure levels for each LUN. You can also configure that no levels
+ should get checked, since some LUNs reported incorrect usage values
+
+item:
+ Name of the LUN as defined in the system
+
+inventory:
+ All LUNs are automatically inventorized.
+
diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py
index 44ba5e2..ca7c462 100644
--- a/web/plugins/wato/check_parameters.py
+++ b/web/plugins/wato/check_parameters.py
@@ -9973,6 +9973,87 @@ register_check_parameters(
)
register_check_parameters(
+ subgroup_storage,
+ "netapp_luns",
+ _("NetApp LUNs"),
+ Alternative(
+ elements = [
+ FixedValue(
+ title = _("Ignore used space"),
+ help = _("Some luns, e.g. jfs formatted, tend to report incorrect used space values"),
+ label = _("Ignore used space"),
+ value = True,
+ totext = "",
+ ),
+ Dictionary(
+ title = _("Configure levels for used space"),
+ elements = [
+ ("levels",
+ Alternative(
+ title = _("Levels for LUN"),
+ show_alternative_title = True,
+ default_value = (80.0, 90.0),
+ match = match_dual_level_type,
+ elements = [
+ get_free_used_dynamic_valuespec("free", "LUN"),
+ Transform(
+ get_free_used_dynamic_valuespec("used", "LUN", default_value = (20.0, 10.0)),
+ allow_empty = False,
+ forth = transform_filesystem_free,
+ back = transform_filesystem_free,
+ )
+ ]
+ )
+ ),
+ ( "trend_range",
+ Optional(
+ Integer(
+ title = _("Time Range for lun filesystem trend computation"),
+ default_value = 24,
+ minvalue = 1,
+ unit= _("hours")),
+ title = _("Trend computation"),
+ label = _("Enable trend computation"))),
+ ( "trend_mb",
+ Tuple(
+ title = _("Levels on trends in MB per time range"),
+ elements = [
+ Integer(title = _("Warning at"), unit = _("MB / range"), default_value = 100),
+ Integer(title = _("Critical at"), unit = _("MB / range"), default_value = 200)
+ ])),
+ ( "trend_perc",
+ Tuple(
+ title = _("Levels for the percentual growth per time range"),
+ elements = [
+ Percentage(title = _("Warning at"), unit = _("% / range"), default_value = 5,),
+ Percentage(title = _("Critical at"), unit = _("% / range"), default_value = 10,),
+ ])),
+ ( "trend_timeleft",
+ Tuple(
+ title = _("Levels on the time left until the lun filesystem gets full"),
+ elements = [
+ Integer(title = _("Warning if below"), unit = _("hours"), default_value = 12,),
+ Integer(title = _("Critical if below"), unit = _("hours"), default_value = 6, ),
+ ])),
+ ( "trend_showtimeleft",
+ Checkbox( title = _("Display time left in check output"), label = _("Enable"),
+ help = _("Normally, the time left until the lun filesystem is full is only displayed when "
+ "the configured levels have been breached. If you set this option "
+ "the check always reports this information"))
+ ),
+ ( "trend_perfdata",
+ Checkbox(
+ title = _("Trend performance data"),
+ label = _("Enable generation of performance data from trends"))),
+ ]
+ )
+ ]
+ ),
+ TextAscii(title = _("LUN name")),
+ match_type = "dict",
+)
+
+register_check_parameters(
subgroup_applications,
"services",
_("Windows Services"),
Module: check_mk
Branch: master
Commit: 208fb3959b19765cfa765edb6314beecc54b8835
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=208fb3959b1976…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Thu Oct 20 14:45:26 2016 +0200
3969 FIX CentOS 5.5: Fixed incompatibility with the available OpenSSL 0.98
When opening the GUI, the following error occured, making the GUI unusable:
RuntimeError: You are linking against OpenSSL 0.9.8, which is no longer support by the OpenSSL project. You need to upgrade to a newer version of OpenSSL.
This has been fixed now.
---
.werks/3969 | 13 +++++++++++++
ChangeLog | 1 +
web/htdocs/key_mgmt.py | 5 +++++
3 files changed, 19 insertions(+)
diff --git a/.werks/3969 b/.werks/3969
new file mode 100644
index 0000000..641214f
--- /dev/null
+++ b/.werks/3969
@@ -0,0 +1,13 @@
+Title: CentOS 5.5: Fixed incompatibility with the available OpenSSL 0.98
+Level: 1
+Component: multisite
+Compatible: compat
+Version: 1.4.0i2
+Date: 1476967437
+Class: fix
+
+When opening the GUI, the following error occured, making the GUI unusable:
+
+RuntimeError: You are linking against OpenSSL 0.9.8, which is no longer support by the OpenSSL project. You need to upgrade to a newer version of OpenSSL.
+
+This has been fixed now.
diff --git a/ChangeLog b/ChangeLog
index abf0e19..4fd63f8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -42,6 +42,7 @@
* 3897 FIX: Fixed possible exception in raw edition when rendering graphs
* 3898 FIX: Unmonitored services: Fixed possible bug in case discovery service produces unexpected output
* 3902 FIX: Graph search view: Changing painter options made page empty
+ * 3969 FIX: CentOS 5.5: Fixed incompatibility with the available OpenSSL 0.98...
WATO:
* 3915 User access times: New icon when never logged in; New column "last seen"
diff --git a/web/htdocs/key_mgmt.py b/web/htdocs/key_mgmt.py
index 68e2998..0dce783 100644
--- a/web/htdocs/key_mgmt.py
+++ b/web/htdocs/key_mgmt.py
@@ -26,6 +26,11 @@
import os
import pprint
+
+# This is needed for at least CentOS 5.5
+# TODO: Drop this until all supported platforms have newer versions available.
+os.environ["CRYPTOGRAPHY_ALLOW_OPENSSL_098"] = "1"
+
from OpenSSL import crypto
import table
Module: check_mk
Branch: master
Commit: be7f0ae1ab29ca654990e816c9fa279947585a28
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=be7f0ae1ab29ca…
Author: Simon Betz <si(a)mathias-kettner.de>
Date: Fri Oct 21 09:25:22 2016 +0200
oracle_performance now handles empty sections as other oracle checks
---
checks/oracle_performance | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/checks/oracle_performance b/checks/oracle_performance
index 134775f..f547f64 100644
--- a/checks/oracle_performance
+++ b/checks/oracle_performance
@@ -134,6 +134,12 @@ def check_oracle_performance(item, _no_params, parsed):
perfdata.append((perfvar, rate))
yield 0, ", ".join(infotexts), perfdata
+ return
+
+ # In case of missing information we assume that the login into
+ # the database has failed and we simply skip this check. It won't
+ # switch to UNKNOWN, but will get stale.
+ raise MKCounterWrapped("Login into database failed")
check_info['oracle_performance'] = {
Module: check_mk
Branch: master
Commit: 82c7a43351a17269595cd10f8148b1bbe5397635
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=82c7a43351a172…
Author: Sven Rueß <sr(a)mathias-kettner.de>
Date: Thu Oct 20 21:02:01 2016 +0200
New feature request for scheduled reports
---
.bugs/2521 | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/.bugs/2521 b/.bugs/2521
new file mode 100644
index 0000000..aa552be
--- /dev/null
+++ b/.bugs/2521
@@ -0,0 +1,10 @@
+Title: Scheduled reports should be save on network share
+Component: multisite
+State: open
+Date: 2016-10-20 20:59:31
+Targetversion: future
+Class: feature
+
+Scheduled reports should not only be send by email.
+It should be possible, that the user can save them on a network share.
+We have just integrated network mounts. It should be possible to use them for saving generated reports, too.