Module: check_mk
Branch: master
Commit: ba9b582fe3a82f23959b2f299be3edb8b259d45e
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ba9b582fe3a82f…
Author: Bastian Kuhn <bk(a)mathias-kettner.de>
Date: Tue Sep 9 11:18:26 2014 +0200
#1180 bluecat_dns, bluecat_dns_queries: New DNS Checks for Bluecat Adonis.
---
.werks/1180 | 9 +++++++
ChangeLog | 1 +
checkman/bluecat_dns | 12 +++++++++
checkman/bluecat_dns_queries | 11 ++++++++
checks/bluecat_dhcp | 2 +-
checks/bluecat_dns | 60 ++++++++++++++++++++++++++++++++++++++++++
checks/bluecat_dns_queries | 54 +++++++++++++++++++++++++++++++++++++
7 files changed, 148 insertions(+), 1 deletion(-)
diff --git a/.werks/1180 b/.werks/1180
new file mode 100644
index 0000000..1860ced
--- /dev/null
+++ b/.werks/1180
@@ -0,0 +1,9 @@
+Title: bluecat_dns, bluecat_dns_queries: New DNS Checks for Bluecat Adonis.
+Level: 1
+Component: checks
+Compatible: compat
+Version: 1.2.5i6
+Date: 1410254263
+Class: feature
+
+
diff --git a/ChangeLog b/ChangeLog
index 39768ac..02cac0e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -47,6 +47,7 @@
NOTE: Please refer to the migration notes!
* 1178 arris_cmts_mem: New check for Memory usage on arris cmts modules.
* 1179 bluecat_dhcp: New Check for DHCP Service on bluecat adonis devices.
+ * 1180 bluecat_dns, bluecat_dns_queries: New DNS Checks for Bluecat Adonis.
* 1051 FIX: tcp_conn_stats: fix missing performance data...
* 1142 FIX: winperf_ts_sessions: fix computation, check has never really worked
* 1090 FIX: zfsget: fixed exception which happened on incomplete zfs entries
diff --git a/checkman/bluecat_dns b/checkman/bluecat_dns
new file mode 100644
index 0000000..020826d
--- /dev/null
+++ b/checkman/bluecat_dns
@@ -0,0 +1,12 @@
+title: Bluecat Adonis DNS State
+agents: snmp
+catalog: hw/network/bluecat
+license: GPL
+distribution: check_mk
+description:
+ This Check monitors the OperState of the DNS Service on bluecat adonis devices.
+ 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
+
diff --git a/checkman/bluecat_dns_queries b/checkman/bluecat_dns_queries
new file mode 100644
index 0000000..2d597a8
--- /dev/null
+++ b/checkman/bluecat_dns_queries
@@ -0,0 +1,11 @@
+title: Bluecat Adonis DNS Queries
+agents: snmp
+catalog: hw/network/bluecat
+license: GPL
+distribution: check_mk
+description:
+ This check currently only returns variables for information. The check will be extended in the future.
+
+inventory:
+ One service will be created
+
diff --git a/checks/bluecat_dhcp b/checks/bluecat_dhcp
index aeae782..d303219 100644
--- a/checks/bluecat_dhcp
+++ b/checks/bluecat_dhcp
@@ -53,7 +53,7 @@ check_info["bluecat_dhcp"] = {
"check_function" : check_bluecat_dhcp,
"inventory_function" : inventory_bluecat_dhcp,
"service_description" : "DHCP",
- "has_perfdata" : False,
+ "has_perfdata" : True,
"snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") == ".1.3.6.1.4.1.13315.2.1",
"snmp_info" : (".1.3.6.1.4.1.13315.3.1.1.2.1", [
1, # dhcpOperState
diff --git a/checks/bluecat_dns b/checks/bluecat_dns
new file mode 100644
index 0000000..47c5479
--- /dev/null
+++ b/checks/bluecat_dns
@@ -0,0 +1,60 @@
+#!/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.
+
+# Example output from agent:
+# Put here the example output from your TCP-Based agent. If the
+# check is SNMP-Based, then remove this section
+
+def inventory_bluecat_dns(info):
+ return [(None, None)]
+
+def check_bluecat_dns(item, _no_params, info):
+ oper_state = int(info[0][0])
+ oper_states = {
+ 1 : "running normally",
+ 2 : "not running",
+ 3 : "currently starting",
+ 4 : "currently stopping",
+ 5 : "fault"
+
+ }
+ state = 0
+ if oper_state in [ 2, 3, 4 ]:
+ state = 1
+ elif oper_state == 5:
+ state = 2
+ yield state, "DNS is %s" % oper_states[oper_state]
+
+check_info["bluecat_dns"] = {
+ "check_function" : check_bluecat_dns,
+ "inventory_function" : inventory_bluecat_dns,
+ "service_description" : "DNS",
+ "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") == ".1.3.6.1.4.1.13315.2.1",
+ "snmp_info" : (".1.3.6.1.4.1.13315.3.1.2.2.1", [
+ 1, # DnsSerOperState
+ ])
+}
+
diff --git a/checks/bluecat_dns_queries b/checks/bluecat_dns_queries
new file mode 100644
index 0000000..242b319
--- /dev/null
+++ b/checks/bluecat_dns_queries
@@ -0,0 +1,54 @@
+#!/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.
+
+# Example output from agent:
+# Put here the example output from your TCP-Based agent. If the
+# check is SNMP-Based, then remove this section
+
+def inventory_bluecat_dns_queries(info):
+ return [(None, None)]
+
+def check_bluecat_dns_queries(item, _no_params, info):
+ value_names = [ 'Success', 'Referral', 'NXRSet',
+ 'NXDomain', 'Recursion', 'Failure' ]
+ for value, name in zip(info[0], value_names):
+ yield 0, "%s: %s" % (name, value), [ ( name, value )]
+
+check_info["bluecat_dns_queries"] = {
+ "check_function" : check_bluecat_dns_queries,
+ "inventory_function" : inventory_bluecat_dns_queries,
+ "service_description" : "DNS Queries",
+ "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") == ".1.3.6.1.4.1.13315.2.1",
+ "snmp_info" : (".1.3.6.1.4.1.13315.3.1.2.2.2.1", [
+ 1, # bcnDnsStatSrvQrySuccess
+ 2, # bcnDnsStatSrvQryReferral
+ 3, # bcnDnsStatSrvQryNXRRSet
+ 4, # bcnDnsStatSrvQryNXDomain
+ 5, # bcnDnsStatSrvQryRecursion
+ 6, # bcnDnsStatSrvQryFailure
+ ])
+}
+
Module: check_mk
Branch: master
Commit: 7cd44638e960bd15e1fdfabfb949881623f05507
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7cd44638e960bd…
Author: Bastian Kuhn <bk(a)mathias-kettner.de>
Date: Mon Sep 8 17:12:33 2014 +0200
#1179 bluecat_dhcp: New Check for DHCP Service on bluecat adonis devices.
---
.werks/1179 | 9 +++++++
ChangeLog | 5 ++--
checkman/bluecat_dhcp | 15 ++++++++++++
checks/bluecat_dhcp | 63 +++++++++++++++++++++++++++++++++++++++++++++++++
4 files changed, 90 insertions(+), 2 deletions(-)
diff --git a/.werks/1179 b/.werks/1179
new file mode 100644
index 0000000..416cb39
--- /dev/null
+++ b/.werks/1179
@@ -0,0 +1,9 @@
+Title: bluecat_dhcp: New Check for DHCP Service on bluecat adonis devices.
+Level: 1
+Component: checks
+Compatible: compat
+Version: 1.2.5i6
+Date: 1410189124
+Class: feature
+
+
diff --git a/ChangeLog b/ChangeLog
index 71d9669..39768ac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -43,9 +43,10 @@
* 1176 winperf_msx_queues: The list of counters for inventory can now be configured host based using wato
* 0656 brocade_fcport: inventory rule can now choose upon physical und operations states as well, state choices were also updated
* 1177 Hivemanger: New agent to check hivemanager devices
- * 1178 arris_cmts_mem: New check for Memory usage on arris cmts modules.
- * 1383 oracle_asm_diskgroup: Account for offline disks and required mirror free space
+ * 1383 oracle_asm_diskgroup: Account for offline disks and required mirror free space...
NOTE: Please refer to the migration notes!
+ * 1178 arris_cmts_mem: New check for Memory usage on arris cmts modules.
+ * 1179 bluecat_dhcp: New Check for DHCP Service on bluecat adonis devices.
* 1051 FIX: tcp_conn_stats: fix missing performance data...
* 1142 FIX: winperf_ts_sessions: fix computation, check has never really worked
* 1090 FIX: zfsget: fixed exception which happened on incomplete zfs entries
diff --git a/checkman/bluecat_dhcp b/checkman/bluecat_dhcp
new file mode 100644
index 0000000..13b5c52
--- /dev/null
+++ b/checkman/bluecat_dhcp
@@ -0,0 +1,15 @@
+title: Bluecat Adonis DHCP State
+agents: snmp
+catalog: hw/network/bluecat
+license: GPL
+distribution: check_mk
+description:
+ This Check monitors the OperState of the DHCP Service on bluecat adonis devices.
+ The Check will return {OK} if the Service is running, {CRITICAL} if the state is fault, {WARNING} in each other case.
+ The number of successful DHCP leases issued per second is return as information.
+
+inventory:
+ One service will be created
+
+perfdata:
+ One value is returned: The number of DHCP leases per second
diff --git a/checks/bluecat_dhcp b/checks/bluecat_dhcp
new file mode 100644
index 0000000..aeae782
--- /dev/null
+++ b/checks/bluecat_dhcp
@@ -0,0 +1,63 @@
+#!/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.
+
+# Example output from agent:
+# Put here the example output from your TCP-Based agent. If the
+# check is SNMP-Based, then remove this section
+
+def inventory_bluecat_dhcp(info):
+ return [(None, None)]
+
+def check_bluecat_dhcp(item, _no_params, info):
+ oper_state, leases_sec = map(int, info[0])
+ oper_states = {
+ 1 : "running normally",
+ 2 : "not running",
+ 3 : "currently starting",
+ 4 : "currently stopping",
+ 5 : "fault"
+
+ }
+ state = 0
+ if oper_state in [ 2, 3, 4 ]:
+ state = 1
+ elif oper_state == 5:
+ state = 2
+ yield state, "DHCP is %s" % oper_states[oper_state]
+ yield 0, '%s Leases per second' % leases_sec, [ ('leases', leases_sec ) ]
+
+check_info["bluecat_dhcp"] = {
+ "check_function" : check_bluecat_dhcp,
+ "inventory_function" : inventory_bluecat_dhcp,
+ "service_description" : "DHCP",
+ "has_perfdata" : False,
+ "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") == ".1.3.6.1.4.1.13315.2.1",
+ "snmp_info" : (".1.3.6.1.4.1.13315.3.1.1.2.1", [
+ 1, # dhcpOperState
+ 3, # dhcpLeaseStatsSuccess
+ ])
+}
+
Module: check_mk
Branch: master
Commit: e55febf2b3f69af1c6975c04ebdf1c190f88f63c
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e55febf2b3f69a…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Mon Sep 8 16:41:58 2014 +0200
Updated formatting of Werk 1103
---
.werks/1103 | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/.werks/1103 b/.werks/1103
index 032252a..0d45a7c 100644
--- a/.werks/1103
+++ b/.werks/1103
@@ -15,11 +15,12 @@ A new option <tt>nocontext</tt> has been introduced for the logfiles section in
F+:check_mk.ini
[logfiles]
-# The following textfile will not report any context info (nocontext option)
-textfile = nocontext C:\tmp\memo.udf
-# Set patterns for defined textfile
-warn = *overdue*
-ok = *mail sent*
+ # The following textfile will not report any context info (nocontext option)
+ textfile = nocontext C:\tmp\memo.udf
+
+ # Set patterns for defined textfile
+ warn = *overdue*
+ ok = *mail sent*
F-:
If you simply prepend the parameter <tt>nocontext</tt> to the actual path (or path pattern),
Module: check_mk
Branch: master
Commit: 81cca655eeeb7af7ddeb8b4e9813439c80cd7c4e
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=81cca655eeeb7a…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Mon Sep 8 16:41:29 2014 +0200
Updated ChangeLog
---
ChangeLog | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 71d9669..b3239c6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -43,9 +43,9 @@
* 1176 winperf_msx_queues: The list of counters for inventory can now be configured host based using wato
* 0656 brocade_fcport: inventory rule can now choose upon physical und operations states as well, state choices were also updated
* 1177 Hivemanger: New agent to check hivemanager devices
- * 1178 arris_cmts_mem: New check for Memory usage on arris cmts modules.
- * 1383 oracle_asm_diskgroup: Account for offline disks and required mirror free space
+ * 1383 oracle_asm_diskgroup: Account for offline disks and required mirror free space...
NOTE: Please refer to the migration notes!
+ * 1178 arris_cmts_mem: New check for Memory usage on arris cmts modules.
* 1051 FIX: tcp_conn_stats: fix missing performance data...
* 1142 FIX: winperf_ts_sessions: fix computation, check has never really worked
* 1090 FIX: zfsget: fixed exception which happened on incomplete zfs entries
Module: check_mk
Branch: master
Commit: 29b6f55c71b70d6a7429e65bcfbc7a575f124c03
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=29b6f55c71b70d…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Mon Sep 8 16:20:21 2014 +0200
Fixed example for Windows agent
---
agents/windows/check_mk.example.ini | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/agents/windows/check_mk.example.ini b/agents/windows/check_mk.example.ini
index 9c9797f..9b99ec6 100644
--- a/agents/windows/check_mk.example.ini
+++ b/agents/windows/check_mk.example.ini
@@ -53,7 +53,7 @@
# From system log send only warning/critical messages,
# but suppress any context messages
- # logfile system = warn nocontext
+ # logfile system = nocontext warn
# From the security log send all messages
# logfile security = all
@@ -63,8 +63,8 @@
# logfile * = off
[mrpe]
- # Run classical Nagios plugins. The word before the command
- # line is the service description for Nagios. Use backslashes
+ # Run classical monitoring plugins. The word before the command
+ # line is the service description for the monitoring. Use backslashes
# in Windows-paths.
# check = Dummy mrpe\check_crit
# check = IP_Configuration mrpe\check_ipconfig 1.2.3.4