Module: check_mk
Branch: master
Commit: 4fba7f770dcbd7eddacafe5098c246130b9af9e8
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4fba7f770dcbd7…
Author: Andreas Boesl <ab(a)mathias-kettner.de>
Date: Mon Sep 15 11:11:26 2014 +0200
#1115 Renamed rule: Hosts using SNMP v2c -> Legacy SNMP devices using SNMP v2c
The previous rule set "Hosts using SNMP v2c" only applied to legacy snmp devices.
So if you had your host configured as "SNMP (Networking device, Appliance)" it was
already marked as SNMP v2c, however with bulk walk...<br><br>
Renaming this rule set should now make its purpose more clear.
---
.werks/1115 | 13 +++++++++++++
ChangeLog | 1 +
web/plugins/wato/check_mk_configuration.py | 9 +++++----
3 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/.werks/1115 b/.werks/1115
new file mode 100644
index 0000000..7ebb268
--- /dev/null
+++ b/.werks/1115
@@ -0,0 +1,13 @@
+Title: Renamed rule: Hosts using SNMP v2c -> Legacy SNMP devices using SNMP v2c
+Level: 1
+Component: wato
+Compatible: compat
+Version: 1.2.5i6
+Date: 1410771999
+Class: feature
+
+The previous rule set "Hosts using SNMP v2c" only applied to legacy snmp devices.
+So if you had your host configured as "SNMP (Networking device, Appliance)" it was
+already marked as SNMP v2c, however with bulk walk...<br><br>
+
+Renaming this rule set should now make its purpose more clear.
diff --git a/ChangeLog b/ChangeLog
index d37bf38..7769aab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -105,6 +105,7 @@
WATO:
* 1096 New WATO webservices: manage hosts via webinterface...
* 1155 NagVis map edit/view permissions can now be set using roles/groups...
+ * 1115 Renamed rule: Hosts using SNMP v2c -> Legacy SNMP devices using SNMP v2c...
* 1064 FIX: Fixed rare issue with WATO communication in distributed setups (different OS versions)...
* 1089 FIX: Snapshot restore: fixed exception during exception handling......
* 1091 FIX: logwatch patterns: allow unicode text in pattern comment
diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py
index 6107bae..8079e5c 100644
--- a/web/plugins/wato/check_mk_configuration.py
+++ b/web/plugins/wato/check_mk_configuration.py
@@ -2265,10 +2265,11 @@ register_rule(group,
register_rule(group,
"snmpv2c_hosts",
- title = _("Hosts using SNMP v2c"),
- help = _("There exist a few devices out there that behave very badly when using SNMP bulk walk. "
- "If you want to use SNMP v2c on those devices, nevertheless, then use this rule set. "
- "One reason is enabling 64 bit counters."))
+ title = _("Legacy SNMP devices using SNMP v2c"),
+ help = _("There exist a few devices out there that behave very badly when using SNMP v2c and bulk walk. "
+ "If you want to use SNMP v2c on those devices, nevertheless, you need to configure this device as "
+ "legacy snmp device and upgrade it to SNMP v2c (without bulk walk) with this rule set. One reason is enabling 64 bit counters. "
+ "Note: This rule won't apply if the device is already configured as SNMP v2c device."))
register_rule(group,
"snmp_timing",
Module: check_mk
Branch: master
Commit: 38c2d8b389b5b7fb86fd0fdf6e7213f46f561188
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=38c2d8b389b5b7…
Author: Andreas Boesl <ab(a)mathias-kettner.de>
Date: Mon Sep 15 10:20:25 2014 +0200
#1114 FIX bluecat_threads: no longer detected on wrong systems
The oid in the snmp_scan function was incorrect.
This caused the check to appear on wrong hosts, where there was no bluecat_threads info available.
---
.werks/1114 | 10 ++++++++++
ChangeLog | 1 +
checks/bluecat_threads | 2 +-
3 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/.werks/1114 b/.werks/1114
new file mode 100644
index 0000000..453c3ae
--- /dev/null
+++ b/.werks/1114
@@ -0,0 +1,10 @@
+Title: bluecat_threads: no longer detected on wrong systems
+Level: 1
+Component: checks
+Compatible: compat
+Version: 1.2.5i6
+Date: 1410769126
+Class: fix
+
+The oid in the snmp_scan function was incorrect.
+This caused the check to appear on wrong hosts, where there was no bluecat_threads info available.
diff --git a/ChangeLog b/ChangeLog
index ced4d3a..d37bf38 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -92,6 +92,7 @@
* 1104 FIX: winperf_if: Improved matching of data from wmic_if.bat / wmic_if.ps1 scripts...
* 1110 FIX: windows agent: fixed missing agent section problem if a cached script ran into a timeout...
* 1113 FIX: oracle_rman: fixed exception when backup was currently running
+ * 1114 FIX: bluecat_threads: no longer detected on wrong systems...
Multisite:
* 1066 Implemented Dashboard Designer...
diff --git a/checks/bluecat_threads b/checks/bluecat_threads
index 6539445..7b67507 100644
--- a/checks/bluecat_threads
+++ b/checks/bluecat_threads
@@ -47,7 +47,7 @@ check_info["bluecat_threads"] = {
"service_description" : "Number of threads",
"group" : "threads",
"has_perfdata" : True,
- "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.13315.2.1"),
+ "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.13315.100.200"),
"snmp_info" : (".1.3.6.1.4.1.13315.100.200.1.1.2", [
1, # activeThreadCount
])
Module: check_mk
Branch: master
Commit: 555fb76255537bdfe1d5ed6b735d2e7418291a2b
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=555fb76255537b…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Mon Sep 15 09:39:56 2014 +0200
Remove several trailing white spaces
---
checkman/bluecat_commandserver | 2 +-
checkman/bluecat_dhcp | 2 +-
checkman/bluecat_dns | 2 +-
checkman/bluecat_dns_queries | 2 +-
checkman/bluecat_ha | 2 +-
checkman/bluecat_ntp | 4 ++--
checkman/esx_vsphere_hostsystem.mem_usage_cluster | 2 +-
web/plugins/wato/check_parameters.py | 12 ++++++------
8 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/checkman/bluecat_commandserver b/checkman/bluecat_commandserver
index 6aa7f75..5900cc0 100644
--- a/checkman/bluecat_commandserver
+++ b/checkman/bluecat_commandserver
@@ -9,5 +9,5 @@ description:
It is possible to change the behavior in WATO.
inventory:
- One service will be created
+ One service will be created
diff --git a/checkman/bluecat_dhcp b/checkman/bluecat_dhcp
index 13b5c52..699378e 100644
--- a/checkman/bluecat_dhcp
+++ b/checkman/bluecat_dhcp
@@ -9,7 +9,7 @@ description:
The number of successful DHCP leases issued per second is return as information.
inventory:
- One service will be created
+ One service will be created
perfdata:
One value is returned: The number of DHCP leases per second
diff --git a/checkman/bluecat_dns b/checkman/bluecat_dns
index 020826d..d2a32c8 100644
--- a/checkman/bluecat_dns
+++ b/checkman/bluecat_dns
@@ -8,5 +8,5 @@ description:
The Check will return {OK} if the Service is running, {CRITICAL} if the state is fault, {WARNING} in each other case.
inventory:
- One service will be created
+ One service will be created
diff --git a/checkman/bluecat_dns_queries b/checkman/bluecat_dns_queries
index 2d597a8..1ab9cfd 100644
--- a/checkman/bluecat_dns_queries
+++ b/checkman/bluecat_dns_queries
@@ -7,5 +7,5 @@ description:
This check currently only returns variables for information. The check will be extended in the future.
inventory:
- One service will be created
+ One service will be created
diff --git a/checkman/bluecat_ha b/checkman/bluecat_ha
index 28667c1..d9efba2 100644
--- a/checkman/bluecat_ha
+++ b/checkman/bluecat_ha
@@ -10,5 +10,5 @@ description:
The behavior can be changed using WATO.
inventory:
- One service will be created
+ One service will be created
diff --git a/checkman/bluecat_ntp b/checkman/bluecat_ntp
index c3bd49f..3f2ff6a 100644
--- a/checkman/bluecat_ntp
+++ b/checkman/bluecat_ntp
@@ -1,4 +1,4 @@
-title: Bluecat Adonis/ Proteus NTP
+title: Bluecat Adonis/ Proteus NTP
agents: snmp
catalog: hw/network/bluecat
license: GPL
@@ -10,5 +10,5 @@ description:
Also Checked are the Stratum and the Leap Seconds. Each aberrancy will lead to a {WARNING} state.
inventory:
- One service will be created
+ One service will be created
diff --git a/checkman/esx_vsphere_hostsystem.mem_usage_cluster b/checkman/esx_vsphere_hostsystem.mem_usage_cluster
index 36e00fd..1d019b3 100644
--- a/checkman/esx_vsphere_hostsystem.mem_usage_cluster
+++ b/checkman/esx_vsphere_hostsystem.mem_usage_cluster
@@ -10,7 +10,7 @@ description:
examples:
static_checks['mem_cluster'] = [
- ( ('esx_vsphere_hostsystem.mem_usage_cluster', None,
+ ( ('esx_vsphere_hostsystem.mem_usage_cluster', None,
[(2, (60.0, 70.0)),
(5, (70.0, 80.0)),
(7, (85.0, 90.0))
diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py
index 3876013..51f298b 100644
--- a/web/plugins/wato/check_parameters.py
+++ b/web/plugins/wato/check_parameters.py
@@ -6056,7 +6056,7 @@ register_check_parameters(
default_value = [ 2, 3, 4 ],
)
),
- ( "critical",
+ ( "critical",
ListChoice(
title = _("States treated as critical"),
choices = bluecat_operstates,
@@ -6071,7 +6071,7 @@ register_check_parameters(
Tuple(
title = _("Levels for Stratum "),
elements = [
- Integer(title = _("Warning if above")),
+ Integer(title = _("Warning if above")),
Integer(title = _("Critical if above")),
])
),
@@ -6098,7 +6098,7 @@ register_check_parameters(
default_value = [ 2, 3, 4 ],
)
),
- ( "critical",
+ ( "critical",
ListChoice(
title = _("States treated as critical"),
choices = bluecat_operstates,
@@ -6133,7 +6133,7 @@ register_check_parameters(
default_value = [ 2, 3, 4 ],
)
),
- ( "critical",
+ ( "critical",
ListChoice(
title = _("States treated as critical"),
choices = bluecat_operstates,
@@ -6168,7 +6168,7 @@ register_check_parameters(
default_value = [ 2, 3, 4 ],
)
),
- ( "critical",
+ ( "critical",
ListChoice(
title = _("States treated as critical"),
choices = bluecat_operstates,
@@ -6214,7 +6214,7 @@ register_check_parameters(
default_value = [ 5, 6, 7 ],
),
),
- ( "critical",
+ ( "critical",
ListChoice(
title = _("States treated as critical"),
choices = bluecat_ha_operstates ,