Module: check_mk
Branch: master
Commit: 206387b134c3a1db80716a980c3de61bb4317665
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=206387b134c3a1…
Author: Konstantin Büttner <kb(a)mathias-kettner.de>
Date: Wed Oct 29 13:29:19 2014 +0100
ups_socomec_out_source: Changed interpretation of states to v6 MIB
---
checkman/ups_socomec_out_source | 7 +++++--
checks/ups_socomec_out_source | 3 +--
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/checkman/ups_socomec_out_source b/checkman/ups_socomec_out_source
index 50acc2d..e15613e 100644
--- a/checkman/ups_socomec_out_source
+++ b/checkman/ups_socomec_out_source
@@ -5,8 +5,11 @@ license: GPL
distribution: check_mk
description:
Checks by which source the output phase is powered. Warns if the device
- reports internal maintenance bypass, goes critical during battery operation
- or when offline. SNMP state "other" is treated as unknown.
+ reports internal maintenance bypass or bypass, goes critical during battery operation
+ ({"On inverter"}) or when offline. Caveat: Currently, states are interpreted according to
+ the NetVision-nv6 MIB. Other firmware versions might be incompatible. Please send us a
+ {cmk --snmpwalk} along with a description as to how the check behaves unexpectedly in
+ your setup.
inventory:
One check per Socomec UPS is created.
diff --git a/checks/ups_socomec_out_source b/checks/ups_socomec_out_source
index 3c3ea7b..c64e1ca 100644
--- a/checks/ups_socomec_out_source
+++ b/checks/ups_socomec_out_source
@@ -49,7 +49,6 @@ check_info['ups_socomec_out_source'] = {
"inventory_function" : inventory_ups_socomec_out_source,
"check_function" : check_ups_socomec_out_source,
"service_description" : "Output Source",
- "has_perfdata" : False,
"snmp_info" : ( ".1.3.6.1.4.1.4555.1.1.1.1.4", ["1"] ),
- "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.1.0").startswith("Net Vision"),
+ "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") == ".1.3.6.1.4.1.4555.1.1.1",
}
Module: check_mk
Branch: master
Commit: 681a6ed95b651ee7e84d41dc2f5163e5d4c51c52
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=681a6ed95b651e…
Author: Andreas Boesl <ab(a)mathias-kettner.de>
Date: Wed Oct 29 10:35:57 2014 +0100
werk 1429: done some formatting
---
.werks/1429 | 1 +
1 file changed, 1 insertion(+)
diff --git a/.werks/1429 b/.werks/1429
index d9470d5..9df5e81 100644
--- a/.werks/1429
+++ b/.werks/1429
@@ -11,6 +11,7 @@ with the full palette of all available snmp inventory functions. The filtering o
was done afterwards. This caused needless snmp queries towards the snmp host.
The filtering of unwanted checktypes is now done before the snmp host is contacted.
+
Note: This only applies to the WATO rule <i>Disabled checktypes</i> respectively the parameters
<tt>ignored_checktypes</tt> and <tt>ignored_checks</tt>, but not to <i>Disabled services</i>.
The latter one matches to service descriptions which are the result of a successful inventory.
Module: check_mk
Branch: master
Commit: e1d5b5f3799d1cf44fa64d2e60e921df8e6b9dce
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e1d5b5f3799d1c…
Author: Andreas Boesl <ab(a)mathias-kettner.de>
Date: Wed Oct 29 10:32:49 2014 +0100
Behaviour in the previous version: If a host should be inventorized it was checked
with the full palette of all available snmp inventory functions. The filtering of unwanted checktypes
was done afterwards. This caused needless snmp queries towards the snmp host.
The filtering of unwanted checktypes is now done before the snmp host is contacted.
Note: This only applies to the WATO rule <i>Disabled checktypes</i> respectively the parameters
<tt>ignored_checktypes</tt> and <tt>ignored_checks</tt>, but not to <i>Disabled services</i>.
The latter one matches to service descriptions which are the result of a successful inventory.
---
.werks/1429 | 17 +++++++++++++++++
ChangeLog | 1 +
modules/check_mk.py | 13 ++++++++-----
3 files changed, 26 insertions(+), 5 deletions(-)
diff --git a/.werks/1429 b/.werks/1429
new file mode 100644
index 0000000..d9470d5
--- /dev/null
+++ b/.werks/1429
@@ -0,0 +1,17 @@
+Title: Disabled snmp checktypes are now sorted out before Check_MK contacts the snmp host
+Level: 2
+Component: core
+Compatible: compat
+Version: 1.2.5i6
+Date: 1414574411
+Class: fix
+
+Behaviour in the previous version: If a snmp host should be inventorized it was checked
+with the full palette of all available snmp inventory functions. The filtering of unwanted checktypes
+was done afterwards. This caused needless snmp queries towards the snmp host.
+
+The filtering of unwanted checktypes is now done before the snmp host is contacted.
+Note: This only applies to the WATO rule <i>Disabled checktypes</i> respectively the parameters
+<tt>ignored_checktypes</tt> and <tt>ignored_checks</tt>, but not to <i>Disabled services</i>.
+The latter one matches to service descriptions which are the result of a successful inventory.
+
diff --git a/ChangeLog b/ChangeLog
index 43ccf0f..2c9d4f0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,7 @@
* 1425 New section header option "encoding" for agent output...
* 1129 FIX: Windows MSI-Installer: some systems created corrupted check_mk_agent.msi files...
* 1426 FIX: windows agent: logwatch: no longer reports incorrect formatted texts (japanese characters)...
+ * 1429 FIX: Disabled snmp checktypes are now sorted out before Check_MK contacts the snmp host...
Checks & Agents:
* 0185 knuerr_rms_humidity, knuerr_rms_temp: Two new Checks to Monitor the Temperature and the Humidity on Knürr RMS Devices
diff --git a/modules/check_mk.py b/modules/check_mk.py
index 1781abc..f6ba3c6 100755
--- a/modules/check_mk.py
+++ b/modules/check_mk.py
@@ -2857,10 +2857,13 @@ def make_inventory(checkname, hostnamelist, check_only=False, include_state=Fals
try:
for host in hostnamelist:
-
- # Skip SNMP checks on non-SNMP hosts
- if is_snmp_check and not is_snmp_host(host):
- continue
+ if is_snmp_check:
+ # Skip SNMP check on non-SNMP hosts
+ if not is_snmp_host(host):
+ continue
+ # Skip SNMP check if this checktype is disabled
+ if service_ignored(host, checkname, None):
+ continue
# The decision wether to contact the agent via TCP
# is done in get_realhost_info(). This is due to
@@ -3109,7 +3112,7 @@ def check_inventory(hostname):
def service_ignored(hostname, checktype, service_description):
if checktype and checktype in ignored_checktypes:
return True
- if in_boolean_serviceconf_list(hostname, service_description, ignored_services):
+ if service_description != None and in_boolean_serviceconf_list(hostname, service_description, ignored_services):
return True
if checktype and checktype_ignored_for_host(hostname, checktype):
return True
Module: check_mk
Branch: master
Commit: eb504eee987f216f0583405f66c05f0a91ac4253
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=eb504eee987f21…
Author: Andreas Boesl <ab(a)mathias-kettner.de>
Date: Wed Oct 29 09:51:12 2014 +0100
#1428 Web-API: now able to add cluster hosts
Its quite easy to accomplish. On your add host telegram simply add
the new key <tt>{ ".nodes" = ["nodename1", "nodename2"] }</tt>.
Please note that the existance of the nodes is not verified.
So you might get an invalid host configuration and being unable
to activate the changes.
---
.werks/1428 | 14 ++++++++++++++
ChangeLog | 1 +
web/htdocs/wato.py | 2 +-
3 files changed, 16 insertions(+), 1 deletion(-)
diff --git a/.werks/1428 b/.werks/1428
new file mode 100644
index 0000000..f49c6c2
--- /dev/null
+++ b/.werks/1428
@@ -0,0 +1,14 @@
+Title: Web-API: now able to add cluster hosts
+Level: 1
+Component: wato
+Compatible: compat
+Version: 1.2.5i6
+Date: 1414572424
+Class: feature
+
+Its quite easy to accomplish. On your add host telegram simply add
+the new key <tt>{ ".nodes" = ["nodename1", "nodename2"] }</tt>.
+
+Please note that the existance of the nodes is not verified.
+So you might get an invalid host configuration and being unable
+to activate the changes.
diff --git a/ChangeLog b/ChangeLog
index c99ad78..e6f674c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -157,6 +157,7 @@
* 1404 Make title/help of custom user attributes localizable...
* 1159 Remote BI Aggregations can now be configured to be checked as single services...
* 1163 Service discovery: Added direct link to check parameter ruleset of services...
+ * 1428 Web-API: now able to add cluster hosts...
* 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/htdocs/wato.py b/web/htdocs/wato.py
index 18dfd15..338a40f 100644
--- a/web/htdocs/wato.py
+++ b/web/htdocs/wato.py
@@ -17134,7 +17134,7 @@ class API:
def __get_valid_api_host_attributes(self, attributes):
result = {}
- host_attribute_names = map(lambda (x, y): x.name(), host_attributes) + ["inventory_failed"]
+ host_attribute_names = map(lambda (x, y): x.name(), host_attributes) + ["inventory_failed", ".nodes"]
for key, value in attributes.items():
if key in host_attribute_names: