Checkmk git commits January 2015

checkmk-commits@lists.checkmk.com

8 participants
297 discussions

by Mathias Kettner

Module: check_mk Branch: master Commit: 66e47da97cbe292e29031d97b01dd851179757bb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=66e47da97cbe29… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jan 19 14:37:24 2015 +0100 Fixed comment --- checks/solaris_multipath | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/checks/solaris_multipath b/checks/solaris_multipath index 9c51c70..7c22a33 100644 --- a/checks/solaris_multipath +++ b/checks/solaris_multipath @@ -24,8 +24,8 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -#<<<solaris_multipath>>> -#/dev/rdsk/c4t600601608CB02A00DCFD2EEB19A0E111d0s2 4 4 +# <<<solaris_multipath>>> +# /dev/rdsk/c4t600601608CB02A00DCFD2EEB19A0E111d0s2 4 4 def inventory_solaris_multipath(info):

9 years, 8 months

Check_MK Git: check_mk: netscaler_health: interncal cleanup

by Mathias Kettner

Module: check_mk Branch: master Commit: 7548005311cb0750d6d2bb6b38b1d40b191fb4a9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7548005311cb07… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jan 19 14:33:37 2015 +0100 netscaler_health: interncal cleanup --- checks/netscaler_health | 42 ++++++++++++++++-------------------------- 1 file changed, 16 insertions(+), 26 deletions(-) diff --git a/checks/netscaler_health b/checks/netscaler_health index ee46e7e..b155c33 100644 --- a/checks/netscaler_health +++ b/checks/netscaler_health @@ -90,7 +90,7 @@ def check_netscaler_health_fan(item, params, info): for name, value in info: if name[:-5] == item: value=int(value) - infotext = "speed is %d rpm" % value + infotext = "speed is %d RPM" % value state = 0 lower_warn, lower_crit = params.get("lower", ("", "") ) @@ -110,6 +110,7 @@ def check_netscaler_health_fan(item, params, info): return state, infotext + check_info["netscaler_health.fan"] = { "check_function" : check_netscaler_health_fan, "inventory_function" : inventory_netscaler_health_fan, @@ -141,7 +142,7 @@ def inventory_netscaler_health_temp(info): def check_netscaler_health_temp(item, params, info): for name, value in info: if name[:-11] == item and name.endswith("Temperature"): - temp=int(value) + temp = int(value) return check_temperature(temp, params) check_info["netscaler_health.temp"] = { @@ -157,7 +158,7 @@ check_info["netscaler_health.temp"] = { } #. -# .--psus----------------------------------------------------------------. +# .--Power supply--------------------------------------------------------. # | | # | _ __ ___ _ _ ___ | # | | '_ \/ __| | | / __| | @@ -167,42 +168,31 @@ check_info["netscaler_health.temp"] = { # +----------------------------------------------------------------------+ def inventory_netscaler_health_psus(info): - for name, value in info: - value=int(value) - r = regex('(PowerSupply[\d])(Failure|)Status') + for name, state in info: + r = regex('PowerSupply([\d])(Failure|)Status') m = r.match(name) if m: - if value > 0: + if int(state) > 0: yield m.group(1), None + def check_netscaler_health_psus(item, _no_params, info): - ps_status_map = ( ("not supported", 1),# 0 - ("not present", 0), # 1 - ("failed", 2), # 2 - ("normal", 0), # 3 + ps_status_map = ( (3, "not supported"), # 0 + (2, "not present"), # 1 + (2, "failed"), # 2 + (0, "normal"), # 3 ) - for name, value in info: - if name.startswith(item) and name.endswith("Status") \ + for name, state in info: + if name.startswith("PowerSupply" + item) and name.endswith("Status") \ or name.endswith("FailureStatus"): - value=int(value) - name, state = ps_status_map[value] + return ps_status_map[int(state)] - state = 0 - infotext = "Status: " - if value >= len(ps_status_map): - infotext += "status code %d has no known meaning" % value - state = 1 - else: - infotext += "%s" % name - state = ps_status_map[value][1] - - return state, infotext check_info["netscaler_health.psus"] = { "check_function" : check_netscaler_health_psus, "inventory_function" : inventory_netscaler_health_psus, - "service_description" : "%s", + "service_description" : "Power supply %s", "snmp_info" : netscaler_health_info, "snmp_scan_function" : netscaler_health_scan, }

9 years, 8 months

Check_MK Git: check_mk: temperature.include: internal code cleanup

by Mathias Kettner

Module: check_mk Branch: master Commit: 9a07aa76273012519fc40bd2db1d9a3e6fc3cc5f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9a07aa76273012… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jan 19 13:51:52 2015 +0100 temperature.include: internal code cleanup --- checks/temperature.include | 239 +++++++++++++++++++++++++++----------------- 1 file changed, 148 insertions(+), 91 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=9a07aa7627…

9 years, 8 months

Check_MK Git: check_mk: #1214 ups_bat_temp, ups_capacity, ups_in_freq,

by Bastian Kuhn

ups_in_voltage,ups_out_load,ups_out_voltage: Checks now detect more UPS Devices Message-ID: <54bce515.a6JtOXPQxFIHqKgw%bk(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.5 6/20/10 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: 0536de5b8c4199dd9f4d4f24a612c0de6216f670 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0536de5b8c4199… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Mon Jan 19 12:05:51 2015 +0100 #1214 ups_bat_temp,ups_capacity,ups_in_freq,ups_in_voltage,ups_out_load,ups_out_voltage: Checks now detect more UPS Devices The SNMP scan function now checks also for the common ups interface MIB. --- .werks/1214 | 10 ++++++++++ ChangeLog | 1 + checks/ups_bat_temp | 3 ++- checks/ups_capacity | 5 +++-- checks/ups_in_freq | 3 ++- checks/ups_in_voltage | 5 +++-- checks/ups_out_load | 5 +++-- checks/ups_out_voltage | 5 +++-- 8 files changed, 27 insertions(+), 10 deletions(-) diff --git a/.werks/1214 b/.werks/1214 new file mode 100644 index 0000000..66f1d8c --- /dev/null +++ b/.werks/1214 @@ -0,0 +1,10 @@ +Title: ups_bat_temp,ups_capacity,ups_in_freq,ups_in_voltage,ups_out_load,ups_out_voltage: Checks now detect more UPS Devices +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i1 +Date: 1421665416 +Class: feature + +The SNMP scan function now checks also for the common ups interface MIB. + diff --git a/ChangeLog b/ChangeLog index db6f41e..88ae52b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -39,6 +39,7 @@ * 1669 mrpe program check_16bit_program.cc: Monitors 16 bit programs on windows... * 1849 netscaler_dnsrates: new check for DNS statistics of Citrix Netscaler Loadbalancers * 1850 netscaler_health.fan, netscaler_health.psus, netscaler_health.temp: new checks to monitor the health of Citrix Netscaler Loadbalancers + * 1214 ups_bat_temp,ups_capacity,ups_in_freq,ups_in_voltage,ups_out_load,ups_out_voltage: Checks now detect more UPS Devices... * 1457 FIX: logins: new check renamed from "users" check... NOTE: Please refer to the migration notes! * 1762 FIX: lnx_thermal: Now ignoring trip points with level 0... diff --git a/checks/ups_bat_temp b/checks/ups_bat_temp index 5088152..830c59a 100644 --- a/checks/ups_bat_temp +++ b/checks/ups_bat_temp @@ -52,7 +52,8 @@ check_info['ups_bat_temp'] = { "2.7", # upsBatteryTemperature ] ), "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") in \ - [ ".1.3.6.1.4.1.818.1.100.1.1", ".1.3.6.1.4.1.705.1.2", ".1.3.6.1.2.1.33", ".1.3.6.1.2.1.33.2", ".1.3.6.1.4.1.818.1.100.1.2" ] \ + [ ".1.3.6.1.4.1.818.1.100.1.1", ".1.3.6.1.4.1.705.1.2", ".1.3.6.1.2.1.33.2", ".1.3.6.1.4.1.818.1.100.1.2" ] \ + or oid(".1.3.6.1.2.1.1.2.0").startswith('.1.3.6.1.2.1.33') \ or oid('.1.3.6.1.2.1.33.1.1.1.0').startswith('RPS'), "includes" : [ "temperature.include" ], } diff --git a/checks/ups_capacity b/checks/ups_capacity index b99a4ce..de15dfe 100644 --- a/checks/ups_capacity +++ b/checks/ups_capacity @@ -59,6 +59,7 @@ check_info["ups_capacity"] = { "snmp_info" : ( ".1.3.6.1.2.1.33.1.2", [ "2.0" , "3.0" ,"4.0" ] ), "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") in \ [ ".1.3.6.1.4.1.534.1", ".1.3.6.1.4.1.705.1", ".1.3.6.1.4.1.818.1.100.1.1", - ".1.3.6.1.2.1.33", ".1.3.6.1.4.1.705.1.2", ".1.3.6.1.2.1.33.2", ".1.3.6.1.4.1.5491.6", - ".1.3.6.1.4.1.476.1.42", ".1.3.6.1.4.1.818.1.100.1.2" ] + "1.3.6.1.4.1.705.1.2", ".1.3.6.1.2.1.33.2", ".1.3.6.1.4.1.5491.6", + ".1.3.6.1.4.1.476.1.42", ".1.3.6.1.4.1.818.1.100.1.2" ] \ + or oid(".1.3.6.1.2.1.1.2.0").startswith('.1.3.6.1.2.1.33') } diff --git a/checks/ups_in_freq b/checks/ups_in_freq index c17c192..9656eaa 100644 --- a/checks/ups_in_freq +++ b/checks/ups_in_freq @@ -60,5 +60,6 @@ check_info['ups_in_freq'] = { "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") in \ [ ".1.3.6.1.4.1.534.1", ".1.3.6.1.4.1.705.1", ".1.3.6.1.4.1.818.1.100.1.1", ".1.3.6.1.2.1.33", ".1.3.6.1.4.1.705.1.2", ".1.3.6.1.2.1.33.2", ".1.3.6.1.4.1.5491.6", - ".1.3.6.1.4.1.476.1.42", ".1.3.6.1.4.1.818.1.100.1.2" ] + ".1.3.6.1.4.1.476.1.42", ".1.3.6.1.4.1.818.1.100.1.2" ] \ + or oid(".1.3.6.1.2.1.1.2.0").startswith('.1.3.6.1.2.1.33') } diff --git a/checks/ups_in_voltage b/checks/ups_in_voltage index b015bb7..f56b169 100644 --- a/checks/ups_in_voltage +++ b/checks/ups_in_voltage @@ -41,6 +41,7 @@ check_info['ups_in_voltage'] = { "snmp_info" : ( ".1.3.6.1.2.1.33.1.3.3.1", [ 0, 3 ] ), "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") in \ [ ".1.3.6.1.4.1.534.1", ".1.3.6.1.4.1.705.1",".1.3.6.1.4.1.705.1.2", ".1.3.6.1.4.1.818.1.100.1.1", - ".1.3.6.1.2.1.33", ".1.3.6.1.2.1.33.2", ".1.3.6.1.4.1.5491.6", - ".1.3.6.1.4.1.476.1.42", ".1.3.6.1.4.1.818.1.100.1.2" ] + ".1.3.6.1.2.1.33.2", ".1.3.6.1.4.1.5491.6", + ".1.3.6.1.4.1.476.1.42", ".1.3.6.1.4.1.818.1.100.1.2" ] \ + or oid(".1.3.6.1.2.1.1.2.0").startswith('.1.3.6.1.2.1.33') } diff --git a/checks/ups_out_load b/checks/ups_out_load index 5e0ddc8..88a2658 100644 --- a/checks/ups_out_load +++ b/checks/ups_out_load @@ -57,6 +57,7 @@ check_info['ups_out_load'] = { "snmp_info" : ( ".1.3.6.1.2.1.33.1.4.4.1", [ 0, 5 ] ), "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") in \ [ ".1.3.6.1.4.1.534.1", ".1.3.6.1.4.1.705.1",".1.3.6.1.4.1.705.1.2", ".1.3.6.1.4.1.818.1.100.1.1", - ".1.3.6.1.2.1.33", ".1.3.6.1.2.1.33.2", ".1.3.6.1.4.1.5491.6", - ".1.3.6.1.4.1.476.1.42", ".1.3.6.1.4.1.818.1.100.1.2" ] + ".1.3.6.1.2.1.33.2", ".1.3.6.1.4.1.5491.6", + ".1.3.6.1.4.1.476.1.42", ".1.3.6.1.4.1.818.1.100.1.2" ] \ + or oid(".1.3.6.1.2.1.1.2.0").startswith('.1.3.6.1.2.1.33') } diff --git a/checks/ups_out_voltage b/checks/ups_out_voltage index a54c109..3190a68 100644 --- a/checks/ups_out_voltage +++ b/checks/ups_out_voltage @@ -41,6 +41,7 @@ check_info['ups_out_voltage'] = { "snmp_info" : ( ".1.3.6.1.2.1.33.1.4.4.1", [ 0, 2 ] ), "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") in \ [ ".1.3.6.1.4.1.534.1", ".1.3.6.1.4.1.705.1",".1.3.6.1.4.1.705.1.2", ".1.3.6.1.4.1.818.1.100.1.1", - ".1.3.6.1.2.1.33", ".1.3.6.1.2.1.33.2", ".1.3.6.1.4.1.5491.6", - ".1.3.6.1.4.1.476.1.42", ".1.3.6.1.4.1.818.1.100.1.2" ] + ".1.3.6.1.2.1.33.2", ".1.3.6.1.4.1.5491.6", + ".1.3.6.1.4.1.476.1.42", ".1.3.6.1.4.1.818.1.100.1.2" ] \ + or oid(".1.3.6.1.2.1.1.2.0").startswith('.1.3.6.1.2.1.33') }

9 years, 8 months

Check_MK Git: check_mk: #1851 FIX win_exefiles: inventory check can now handle time stamps in us english locale

by Goetz Golla

Module: check_mk Branch: master Commit: 44198f6a435ba2cfabe85caab1e1c4972744c589 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=44198f6a435ba2… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Mon Jan 19 10:14:01 2015 +0100 #1851 FIX win_exefiles: inventory check can now handle time stamps in us english locale --- .werks/1851 | 9 +++++++++ ChangeLog | 3 +++ inventory/win_exefiles | 2 ++ 3 files changed, 14 insertions(+) diff --git a/.werks/1851 b/.werks/1851 new file mode 100644 index 0000000..fa47638 --- /dev/null +++ b/.werks/1851 @@ -0,0 +1,9 @@ +Title: win_exefiles: inventory check can now handle time stamps in us english locale +Level: 1 +Component: inv +Compatible: compat +Version: 1.2.7i1 +Date: 1421658742 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index db6f41e..b2d0de2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -135,6 +135,9 @@ * 1839 FIX: Fix exception when notifying EC alert into monitoring for traps (because PID is missing) * 1813 FIX: Fixed bug in event console rule editor when no contact groups configured + HW/SW-Inventory: + * 1851 FIX: win_exefiles: inventory check can now handle time stamps in us english locale + 1.2.6b1: Core & Setup: diff --git a/inventory/win_exefiles b/inventory/win_exefiles index 6d277c2..f533f46 100644 --- a/inventory/win_exefiles +++ b/inventory/win_exefiles @@ -38,6 +38,8 @@ def inv_win_exefiles(info): # 14.02.2014 23:12:04 if re.match("^\d{2}\.\d{2}\.20\d{2} \d{2}:\d{2}:\d{2}", write_time): install_date = int(time.mktime(time.strptime(write_time, "%d.%m.%Y %H:%M:%S"))) + elif re.match("^\d{1,2}/d{1,2}/20\d{2} \d{1,2}:\d{2}:\d{2} (AM|PM)", write_time): + install_date = int(time.mktime(time.strptime(write_time, "%m/%d/%Y %H:%M:%S %p"))) else: install_date = write_time

9 years, 8 months

Check_MK Git: check_mk: added catalogue entries for man pages

by Goetz Golla

Module: check_mk Branch: master Commit: a3a5e734b706cf4a26b3c9bc23f66274172f7a82 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a3a5e734b706cf… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Sat Jan 17 14:35:05 2015 +0100 added catalogue entries for man pages --- checkman/netscaler_health.fan | 1 + checkman/netscaler_health.psus | 1 + checkman/netscaler_health.temp | 1 + 3 files changed, 3 insertions(+) diff --git a/checkman/netscaler_health.fan b/checkman/netscaler_health.fan index a099899..f43aed4 100644 --- a/checkman/netscaler_health.fan +++ b/checkman/netscaler_health.fan @@ -1,5 +1,6 @@ title: Citrix Netscaler Loadbalancer: Speed of Fans agents: snmp +catalog: app/netscaler license: GPL distribution: check_mk description: diff --git a/checkman/netscaler_health.psus b/checkman/netscaler_health.psus index 5ed9752..19d2042 100644 --- a/checkman/netscaler_health.psus +++ b/checkman/netscaler_health.psus @@ -1,5 +1,6 @@ title: Citrix Netscaler Loadbalancer: Power Supply Health agents: snmp +catalog: app/netscaler license: GPL distribution: check_mk description: diff --git a/checkman/netscaler_health.temp b/checkman/netscaler_health.temp index 9bec218..97aaf22 100644 --- a/checkman/netscaler_health.temp +++ b/checkman/netscaler_health.temp @@ -1,5 +1,6 @@ title: Citrix Netscaler Loadbalancer: Temperature Sensors agents: snmp +catalog: app/netscaler license: GPL distribution: check_mk description:

9 years, 8 months

Check_MK Git: check_mk: #1850 netscaler_health.fan, netscaler_health.psus, netscaler_health.temp: new checks to monitor the health of Citrix Netscaler Loadbalancers

by Goetz Golla

Module: check_mk Branch: master Commit: c7fdf64437909843e689ecb0e80b072f229cd40f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c7fdf644379098… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Sat Jan 17 14:33:14 2015 +0100 #1850 netscaler_health.fan, netscaler_health.psus, netscaler_health.temp: new checks to monitor the health of Citrix Netscaler Loadbalancers --- .werks/1850 | 9 + ChangeLog | 1 + checkman/netscaler_health.fan | 29 +++ checkman/netscaler_health.psus | 16 ++ checkman/netscaler_health.temp | 34 ++++ checks/netscaler_health | 208 ++++++++++++++++++++++ pnp-templates/check_mk-netscaler_health.temp.php | 1 + web/plugins/perfometer/check_mk.py | 1 + 8 files changed, 299 insertions(+) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=c7fdf64437…

9 years, 8 months

Check_MK Git: check_mk: #1845 Keep record of original source IP address of a syslog message or SNMP trap

by Mathias Kettner

Module: check_mk Branch: master Commit: 0fe3c5221608afa5eba94cb6bbbbe768b8c5d912 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0fe3c5221608af… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Jan 17 11:49:05 2015 +0100 #1845 Keep record of original source IP address of a syslog message or SNMP trap The Event Console now stores the original source IP address when receiving an event directly via an SNMP trap or the builting syslog server. This ipaddress is put into a new dedicated field in the event and is shown in the details of the event. In the event rules you can now match on this address using a X.X.X.X/Y networking syntax. Note: If you receive syslog messages forwarded from another syslog server, then you will see the IP address of that server there - not from the original message. --- .werks/1845 | 15 +++++ ChangeLog | 1 + mkeventd/bin/mkeventd | 97 ++++++++++++++++++++++++++++-- mkeventd/web/htdocs/mkeventd.py | 45 +++++++++++++- mkeventd/web/plugins/views/mkeventd.py | 30 ++++++--- mkeventd/web/plugins/visuals/mkeventd.py | 5 +- mkeventd/web/plugins/wato/mkeventd.py | 18 +++++- 7 files changed, 192 insertions(+), 19 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=0fe3c52216…

9 years, 8 months

Check_MK Git: check_mk: #1849 netscaler_dnsrates: new check for DNS statistics of Citrix Netscaler Loadbalancers

by Goetz Golla

Module: check_mk Branch: master Commit: 36654c5552b1e2d69b7ed7183f91b88e892a33d8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=36654c5552b1e2… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Sat Jan 17 09:57:17 2015 +0100 #1849 netscaler_dnsrates: new check for DNS statistics of Citrix Netscaler Loadbalancers --- .werks/1849 | 9 ++++ ChangeLog | 1 + checkman/netscaler_dnsrates | 37 +++++++++++++++++ checks/netscaler_dnsrates | 76 ++++++++++++++++++++++++++++++++++ web/plugins/wato/check_parameters.py | 29 +++++++++++++ 5 files changed, 152 insertions(+) diff --git a/.werks/1849 b/.werks/1849 new file mode 100644 index 0000000..36d1323 --- /dev/null +++ b/.werks/1849 @@ -0,0 +1,9 @@ +Title: netscaler_dnsrates: new check for DNS statistics of Citrix Netscaler Loadbalancers +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i1 +Date: 1421484970 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 70c00fb..12aa031 100644 --- a/ChangeLog +++ b/ChangeLog @@ -37,6 +37,7 @@ * 1841 fileinfo, fileinfo.groups: new parameter for selecting ranges of the time of the day... * 1668 Interface groups: Can create groups out of interface item names... * 1669 mrpe program check_16bit_program.cc: Monitors 16 bit programs on windows... + * 1849 netscaler_dnsrates: new check for DNS statistics of Citrix Netscaler Loadbalancers * 1457 FIX: logins: new check renamed from "users" check... NOTE: Please refer to the migration notes! * 1762 FIX: lnx_thermal: Now ignoring trip points with level 0... diff --git a/checkman/netscaler_dnsrates b/checkman/netscaler_dnsrates new file mode 100644 index 0000000..9a56bf8 --- /dev/null +++ b/checkman/netscaler_dnsrates @@ -0,0 +1,37 @@ +title: Citrix Netscaler DNS Rates +agents: snmp +catalog: app/netscaler +license: GPL +distribution: check_mk +description: + + This check monitors various DNS counter rates of the Citrix Netscaler + Loadbalacing Appliance. It uses the {NS-ROOT-MIB} to access the + {nsDnsServerStatsGroup} via SNMP. + + Monitored counter rates are the total DNS queries and the total DNS + answers (aka replies). + + Warning and critical levels can be configured for each of the rates. + +inventory: + One service per loadbalancer device will be created. + +perfdata: + The counter rates of the monitored counters. + +item: + The name of counter. + +[parameters] +parameters(dict): parameters is a dictionary with a key for each monitored counter. + + {"query_rate"}: a tuple of warning and critical levels. + + {"answer_rate"}: a tuple of warning and critical levels. + + The numbers are integers and represent the counter increase per second. + +[configuration] +netscaler_dnsrates_default_levels(dict): This variable is preset to +{{ "query_rate": (1500.0, 2000.0), "answer_rate": (1500.0, 2000.0) }} diff --git a/checks/netscaler_dnsrates b/checks/netscaler_dnsrates new file mode 100644 index 0000000..1f672b9 --- /dev/null +++ b/checks/netscaler_dnsrates @@ -0,0 +1,76 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2014 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: +# .1.3.6.1.4.1.5951.4.1.1.53.1.1.0 13 +# .1.3.6.1.4.1.5951.4.1.1.53.1.2.0 11 + +factory_settings["netscaler_dnsrates_default_levels"] = { + "query": (1500.0, 2000.0), + "answer": (1500.0, 2000.0), +} + +def inventory_netscaler_dnsrates(info): + if info: + return [ (None, 'netscaler_dnsrates_default_levels') ] + +def check_netscaler_dnsrates(_no_item, params, info): + queries, answers = map(int, info[0]) + + now = time.time() + for name, counter in [ + ( "query", queries ), + ( "answer", answers ) ]: + + rate = get_rate(name, now, counter) + warn, crit = params[name] + infotext = "%s rate %.1f/sec" % (name, rate) + perfdata = [ (name+"_rate", rate, warn, crit, 0) ] + + state = 0 + if rate >= crit: + state = 2 + elif rate >= warn: + state = 1 + if state > 0: + infotext += " (levels are %.1f/%.1f /sec)" % (warn, crit) + + yield state, infotext, perfdata + +check_info["netscaler_dnsrates"] = { + "check_function" : check_netscaler_dnsrates, + "inventory_function" : inventory_netscaler_dnsrates, + "service_description" : "DNS rates", + "has_perfdata" : True, + "group" : "netscaler_dnsrates", + "snmp_info" : (".1.3.6.1.4.1.5951.4.1.1.53.1", [ # nsDnsServerStatsGroup + 1, # dnsTotQueries + 2, # dnsTotAnswers + ]), + "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.5951.1"), + "default_levels_variable" : "netscaler_dnsrates_default_levels", + +} diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 2e287fe..8ae9352 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -7503,3 +7503,32 @@ register_check_parameters( ), None, None ) + +register_check_parameters( + subgroup_applications, + "netscaler_dnsrates", + _("Citrix Netscaler DNS counter rates"), + Dictionary( + help = _("Counter rates of DNS parameters for Citrix Netscaler Loadbalancer " + "Appliances"), + elements = [ + ("query", + Tuple( + title = _("Upper Levels for Total Number of DNS queries"), + elements = [ + Float(title = _("Warning at"), default_value=1500.0, unit="/sec"), + Float(title = _("Critical at"), default_value=2000.0, unit="/sec")], + ), + ), + ("answer", + Tuple( + title = _("Upper Levels for Total Number of DNS replies"), + elements = [ + Float(title = _("Warning at"), default_value=1500.0, unit="/sec"), + Float(title = _("Critical at"), default_value=2000.0, unit="/sec")], + ), + ), + ] + ), + None, None +)

9 years, 8 months

Check_MK Git: check_mk: #1213 New Macro $SERVICEDESC_FOR_URL$ for asciimail

by Bastian Kuhn

Module: check_mk Branch: master Commit: dd327ed45956449a19e31824858d20bf70bc7f9a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dd327ed4595644… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Fri Jan 16 18:51:14 2015 +0100 #1213 New Macro $SERVICEDESC_FOR_URL$ for asciimail The new macrco $SERVICEDESC_FOR_URL$ can be used in the body of asciimails. The Macro replaces whitespaces in the servicename with %20. This makes it possible to create custom urls who can e.g. be used to ackknowledge services. --- .werks/1213 | 13 +++++++++++++ ChangeLog | 1 + notifications/asciimail | 1 + 3 files changed, 15 insertions(+) diff --git a/.werks/1213 b/.werks/1213 new file mode 100644 index 0000000..33c573c --- /dev/null +++ b/.werks/1213 @@ -0,0 +1,13 @@ +Title: New Macro $SERVICEDESC_FOR_URL$ for asciimail +Level: 1 +Component: notifications +Class: feature +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1421430462 + +The new macrco $SERVICEDESC_FOR_URL$ can be used in the body of asciimails. The Macro replaces +whitespaces in the servicename with %20. This makes it possible to create custom urls who can e.g. be used +to ackknowledge services. + diff --git a/ChangeLog b/ChangeLog index d90793b..2a631dc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -106,6 +106,7 @@ Notifications: * 1662 notification plugin spectrum: finalized script. now able to handle host notications + * 1213 New Macro $SERVICEDESC_FOR_URL$ for asciimail... * 1661 FIX: mknotifyd: improved performance when receiving forwarded notifications * 1664 FIX: mknotifyd: further performance improvements for notification forwarding * 1205 FIX: RBN: Fixed match contactgroup condition... diff --git a/notifications/asciimail b/notifications/asciimail old mode 100755 new mode 100644 index 5d6b203..9de5fa0 --- a/notifications/asciimail +++ b/notifications/asciimail @@ -159,6 +159,7 @@ def construct_content(context): tmpl_body += context["PARAMETER_SERVICE_BODY"] else: tmpl_body += tmpl_service_body + context['SERVICEDESC_FOR_URL'] = context['SERVICEDESC'].replace(' ','%20') context['SUBJECT'] = substitute_context(tmpl, context) body = substitute_context(tmpl_body, context)

9 years, 8 months

← Newer
1
...
18
19
20
21
22
23
24
...
30
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits January 2015