Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64653 discussions

Check_MK Git: check_mk: #0190 docsis_signal_quality: New Check to monitor Signal Qualtiy on Devices with DOCSIS MIB

by Bastian Kuhn

Module: check_mk Branch: master Commit: 6868d11f607f59f4213efef096242bf4c65c6e30 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6868d11f607f59… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Thu Jul 31 11:20:43 2014 +0200 #0190 docsis_signal_quality: New Check to monitor Signal Qualtiy on Devices with DOCSIS MIB --- .werks/190 | 8 ++ ChangeLog | 3 +- checkman/{docsis_signal => docsis_signal_quality} | 4 +- checks/{docsis_signal => docsis.include} | 37 ++-------- checks/docsis_channels | 4 +- checks/docsis_signal_quality | 81 +++++++++++++++++++++ web/plugins/perfometer/check_mk.py | 9 ++- web/plugins/wato/check_parameters.py | 8 +- 8 files changed, 112 insertions(+), 42 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=6868d11f60…

10 years, 2 months

Check_MK Git: check_mk: Merge conflict

by Bastian Kuhn

Module: check_mk Branch: master Commit: f743c952188c6d1ef641ebc36ae38300a35c238e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f743c952188c6d… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Thu Jul 31 10:34:49 2014 +0200 Merge conflict ---

10 years, 2 months

Check_MK Git: check_mk: #0189 docsis_channels: Support for Frequency of Downstream Channels for Devices with DOCSIS MIB

by Bastian Kuhn

Module: check_mk Branch: master Commit: 0330957b1c1c4ac434060e9a5d864ad711a2ed9e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0330957b1c1c4a… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Thu Jul 31 10:32:49 2014 +0200 #0189 docsis_channels: Support for Frequency of Downstream Channels for Devices with DOCSIS MIB --- .werks/189 | 8 ++++ ChangeLog | 1 + checkman/docsis_channels | 14 ------- checks/docsis_channels | 69 ++++++++++++++++++++++------------ modules/check_mk.py | 2 + web/plugins/wato/check_parameters.py | 22 +++++++---- 6 files changed, 70 insertions(+), 46 deletions(-) diff --git a/.werks/189 b/.werks/189 new file mode 100644 index 0000000..0530618 --- /dev/null +++ b/.werks/189 @@ -0,0 +1,8 @@ +Title: docsis_channels: Support for Frequency of Downstream Channels for Devices with DOCSIS MIB +Level: 1 +Component: checks +Version: 1.2.5i6 +Date: 1406795521 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 5de59cb..2ab8d2c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,7 @@ * 0186 touchstone_cable_modem_fec: New Check to monitor the Forward error correction on touchstone cable modems * 1068 livedump: Added optional check interval (detect staleness) / option to encrypt mails... * 0188 touchstone_cable_modem_frequency: New check for line frequency in Mhz + * 0189 docsis_channels: Support for Frequency of Downstream Channels for Devices with DOCSIS MIB * 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/docsis_channels b/checkman/docsis_channels deleted file mode 100644 index 6686176..0000000 --- a/checkman/docsis_channels +++ /dev/null @@ -1,14 +0,0 @@ -title: DOCSIS: Frequency -agents: snmp -catalog: hw/network/arris -license: GPL -distribution: -description: - This check monitors the frequency on the modem line in Mhz. Levels for {WARN} and {CRIT} can be set. - -item: - None - -inventory: - One service will be created - diff --git a/checks/docsis_channels b/checks/docsis_channels index 030fa65..7fb84f9 100644 --- a/checks/docsis_channels +++ b/checks/docsis_channels @@ -24,32 +24,53 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -docsis_channels_default_levels = ( 155, 163 ) +factory_settings["docsis_channels_downstream"] = { + "frequency": ( 155 , 163 ), +} -def inventory_docsis_channels(info): - return [ (None, "docsis_channels_default_levels") ] +def inventory_docsis_channels_downstream(info): + for line in info: + if line[1] != '0': + yield line[0], {} -def check_docsis_channels(_no_item, params, info): - mhz = int(info[0][0]) / 1000000 - infotext = "Current Frequence is %d Mhz" % mhz - warn, crit = params - perfdata = [("frequence" , mhz, warn, crit )] - levels = " (Levels Warn/Crit at %d Mhz/ %d Mhz)" % ( warn, crit ) - state = 0 - if mhz >= crit: - state = 2 - infotext += levels - elif mhz >= warn: - state = 1 - infotext += levels - return state, infotext, perfdata +def check_docsis_channels_downstream( item, params, info): + for channel_id, frequency in info: + if channel_id == item: + frequency_mhz = int(frequency) / 1000000 + # Check Frequency + infotext = "Current Frequence is %d Mhz" % frequency_mhz + warn, crit = params["frequency"] + perfdata = [("frequence" , frequency_mhz, warn, crit )] + levels = " (Levels Warn/Crit at %d Mhz/ %d Mhz)" % ( warn, crit ) + state = 0 + if frequency_mhz >= crit: + state = 2 + infotext += levels + elif frequency_mhz >= warn: + state = 1 + infotext += levels + # Change this to yield in case of future extension of the check + return state, infotext, perfdata -check_info["docsis_channels"] = { - "check_function" : check_docsis_channels, - "inventory_function" : inventory_docsis_channels, - "service_description" : "Frequency", - "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") == ".1.3.6.1.4.1.4115.820.1.0.0.0.0.0", - "snmp_info" : ( ".1.3.6.1.2.1.10.127.1.1.1.1.2", [ 3 ]), - "group" : "docsis_channels", +# This Check is a subcheck because there is also a upstream version possible +check_info["docsis_channels.downstream"] = { + "check_function" : check_docsis_channels_downstream, + "inventory_function" : inventory_docsis_channels_downstream, + "service_description" : "Channel Downstream %s", + "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") in [ ".1.3.6.1.4.1.4115.820.1.0.0.0.0.0", + ".1.3.6.1.4.1.9.1.827" ], + "snmp_info" : ( ".1.3.6.1.2.1.10.127.1.1.1.1", [ 1, # Channel ID + 2, # Frequency + ]), + "group" : "docsis_channels_downstream", + "default_levels_variable" : "docsis_channels_downstream", } +# Information for future extensions of the check: +# docsIfDownChannelId 1.3.6.1.2.1.10.127.1.1.1.1.1 +# docsIfDownChannelFrequency 1.3.6.1.2.1.10.127.1.1.1.1.2 +# docsIfDownChannelWidth 1.3.6.1.2.1.10.127.1.1.1.1.3 +# docsIfDownChannelModulation 1.3.6.1.2.1.10.127.1.1.1.1.4 +# docsIfDownChannelInterleave 1.3.6.1.2.1.10.127.1.1.1.1.5 +# docsIfDownChannelPower 1.3.6.1.2.1.10.127.1.1.1.1.6 +# docsIfDownChannelAnnex 1.3.6.1.2.1.10.127.1.1.1.1.7 diff --git a/modules/check_mk.py b/modules/check_mk.py index 8c03880..95a433c 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -6162,9 +6162,11 @@ if __name__ == "__main__": except MKGeneralException, e: + print "hioer:" sys.stderr.write("%s\n" % e) if opt_debug: raise + print "nein" sys.exit(3) # handle -I / -II diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 65c9ba9..3b3b9ba 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -1343,17 +1343,23 @@ register_check_parameters( register_check_parameters( subgroup_networking, - "docsis_channels", - _("Modem Frequencies for Docsis"), # Name can be changed if the rule is used for another check - Tuple( - help = _("Levels for the frequencies of network devices like modems." ), + "docsis_channels_downstream", + _("Docsis Downstream Channels"), + Dictionary( elements = [ - Integer(title = _("warning if at"), unit = "Mhz", default_value = 155 ), - Integer(title = _("critical if at"), unit = "Mhz", default_value = 163 ), - ]), - None, + ( "frequency", Tuple( + title = _("Frequency"), + help = _("Levels for the frequencies of Downstram Channels of Docsis Devices" ), + elements = [ + Integer(title = _("warning if at"), unit = "Mhz", default_value = 155 ), + Integer(title = _("critical if at"), unit = "Mhz", default_value = 163 ), + ])), + ] + ), + TextAscii( title = _("ID of the Channel")), "first" ) + register_check_parameters( subgroup_networking, "vpn_tunnel",

10 years, 2 months

Check_MK Git: check_mk: #1093 windows agent: performance counter can now be specified by name

by Andreas Boesl

Module: check_mk Branch: master Commit: eedfe432f798918b76d9eb22c8b480bf81464077 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=eedfe432f79891… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Jul 31 10:27:04 2014 +0200 #1093 windows agent: performance counter can now be specified by name It is no longer required to set a performance counter id in the <tt>check_mk.ini</tt> file F+:check_mk.ini [winperf] counters = 10332:msx_queues F-: You can now use the counter name instead F+:check_mk.ini [winperf] counters = MSExchangeTransport Queues:msx_queues F-: Note: Keep in mind that this name depends on you system language. If available, the windows agent tries to find the counter name in the registry key. <tt>SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Perflib\\CurrentLanguage</tt> If this key is missing, the english language key is used as fallback <tt>SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Perflib\\009</tt> --- .werks/1093 | 28 ++++++ ChangeLog | 2 + agents/windows/build_version | 2 +- agents/windows/check_mk_agent-64.exe | Bin 207360 -> 208896 bytes agents/windows/check_mk_agent-64.unversioned.exe | Bin 207360 -> 208896 bytes agents/windows/check_mk_agent.cc | 105 +++++++++++++++++++--- agents/windows/check_mk_agent.exe | Bin 176640 -> 178176 bytes agents/windows/check_mk_agent.unversioned.exe | Bin 176640 -> 178176 bytes agents/windows/install_agent-64.exe | Bin 155392 -> 159871 bytes agents/windows/install_agent.exe | Bin 152452 -> 156784 bytes 10 files changed, 124 insertions(+), 13 deletions(-) diff --git a/.werks/1093 b/.werks/1093 new file mode 100644 index 0000000..8ead350 --- /dev/null +++ b/.werks/1093 @@ -0,0 +1,28 @@ +Title: windows agent: performance counter can now be specified by name +Level: 1 +Component: checks +Version: 1.2.5i6 +Date: 1406794406 +Class: feature + +It is no longer required to set a performance counter id in the <tt>check_mk.ini</tt> file + +F+:check_mk.ini +[winperf] + counters = 10332:msx_queues +F-: + +You can now use the counter name instead + +F+:check_mk.ini +[winperf] + counters = MSExchangeTransport Queues:msx_queues +F-: + +Note: Keep in mind that this name depends on you system language. +If available, the windows agent tries to find the counter name in the registry key. +<tt>SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Perflib\\CurrentLanguage</tt> + +If this key is missing, the english language key is used as fallback +<tt>SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Perflib\\009</tt> + diff --git a/ChangeLog b/ChangeLog index f19e236..997e7a5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,7 @@ * 1065 heartbeat_crm / heartbeat_crm.resources: Rewrote checks / formalized parameters... * 0186 touchstone_cable_modem_fec: New Check to monitor the Forward error correction on touchstone cable modems * 1068 livedump: Added optional check interval (detect staleness) / option to encrypt mails... + * 1093 windows agent: performance counter can now be specified by name... * 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 @@ -17,6 +18,7 @@ * 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 + * 1092 FIX: logwatch: now able to enter unicode text into the "Pattern (Regex)" field 1.2.5i5: diff --git a/agents/windows/build_version b/agents/windows/build_version index b4de394..60d3b2f 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -11 +15 diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe index d537f7f..7e7f6ed 100755 Binary files a/agents/windows/check_mk_agent-64.exe and b/agents/windows/check_mk_agent-64.exe differ diff --git a/agents/windows/check_mk_agent-64.unversioned.exe b/agents/windows/check_mk_agent-64.unversioned.exe index acf90d6..66519d7 100755 Binary files a/agents/windows/check_mk_agent-64.unversioned.exe and b/agents/windows/check_mk_agent-64.unversioned.exe differ diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index 91e2864..bf03297 100755 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -264,6 +264,7 @@ void close_crash_log(); void crash_log(const char *format, ...); void lowercase(char* value); char* next_word(char** line); +int get_perf_counter_id(const char* counter_name); // .----------------------------------------------------------------------. // | ____ _ _ _ | @@ -3784,19 +3785,31 @@ bool handle_global_config_variable(char *var, char *value) bool handle_winperf_config_variable(char *var, char *value) { if (!strcmp(var, "counters")) { - char *word; - while (0 != (word = next_word(&value))) { - char *colon = strchr(word, ':'); - if (!colon) { - fprintf(stderr, "Invalid counter '%s' in section [winperf]: need number and colon, e.g. 238:processor.\n", word); - exit(1); - } - *colon = 0; - winperf_counter *tmp_counter = new winperf_counter(); - tmp_counter->name = strdup(colon + 1); - tmp_counter->id = atoi(word); - g_winperf_counters.push_back(tmp_counter); + char *colon = strchr(value, ':'); + if (!colon) { + fprintf(stderr, "Invalid counter '%s' in section [winperf]: need number(or text) and colon, e.g. 238:processor.\n", value); + exit(1); } + *colon = 0; + winperf_counter *tmp_counter = new winperf_counter(); + tmp_counter->name = strdup(colon + 1); + + bool is_digit = true; + for (unsigned int i = 0; i < strlen(value); i++) + if (!isdigit(value[i])) { + is_digit = false; + int id = get_perf_counter_id(value); + if (id == -1) { + fprintf(stderr, "No matching performance counter id found for %s.\n", value); + return false; + } + tmp_counter->id = id; + break; + } + + if(is_digit) + tmp_counter->id = atoi(value); + g_winperf_counters.push_back(tmp_counter); return true; } return false; @@ -4610,6 +4623,74 @@ void determine_directories() snprintf(g_logwatch_statefile, sizeof(g_logwatch_statefile), "%s\\logstate.txt", g_agent_directory); } +int get_perf_counter_id(const char *counter_name) { + + HKEY hKey; + LONG result; + TCHAR szValueName[300000]; + DWORD dwcbData = sizeof(szValueName); + + // Determine the correct perflib key.. + // CurrentLanguage first + result = RegOpenKeyEx(HKEY_LOCAL_MACHINE, + "SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Perflib\\CurrentLanguage", REG_MULTI_SZ, KEY_READ, &hKey); + RegQueryValueEx( + hKey, + "Counter", + NULL, + NULL, + (LPBYTE) szValueName, + &dwcbData + ); + RegCloseKey (hKey); + + if (result != ERROR_SUCCESS) // nothing found, try english (009) as fallback + { + result = RegOpenKeyEx(HKEY_LOCAL_MACHINE, + "SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Perflib\\009", REG_MULTI_SZ, KEY_READ, &hKey); + RegQueryValueEx( + hKey, + "Counter", + NULL, + NULL, + (LPBYTE) szValueName, + &dwcbData + ); + RegCloseKey (hKey); + if (result != ERROR_SUCCESS) + { + // Unable to open any perflib registry + return -1; + } + } + + + int length = 0; + int last_ctr_id = 0; + bool is_name = false; + DWORD offset = 0; + + TCHAR* ptr_perf = szValueName; + for(;;) { + if (offset > dwcbData) + break; + + length = strlen(ptr_perf); + if (length == 0) + break; + + if (is_name && !strcmp(counter_name, ptr_perf)) + return last_ctr_id; + else + last_ctr_id = atoi(ptr_perf); + + offset = offset + length + 1; + ptr_perf = szValueName + offset; + is_name = !is_name; + } + return -1; +} + int main(int argc, char **argv) { wsa_startup(); diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index e14c863..66fb39b 100755 Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe differ diff --git a/agents/windows/check_mk_agent.unversioned.exe b/agents/windows/check_mk_agent.unversioned.exe index fecf7c9..d22914e 100755 Binary files a/agents/windows/check_mk_agent.unversioned.exe and b/agents/windows/check_mk_agent.unversioned.exe differ diff --git a/agents/windows/install_agent-64.exe b/agents/windows/install_agent-64.exe index 21f4575..e21840f 100755 Binary files a/agents/windows/install_agent-64.exe and b/agents/windows/install_agent-64.exe differ diff --git a/agents/windows/install_agent.exe b/agents/windows/install_agent.exe index 9093e26..fc24dba 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ

10 years, 2 months

Check_MK Git: check_mk: Renamed the touchstone checks to docsis. But the checks a not finished yet

by Bastian Kuhn

Module: check_mk Branch: master Commit: 98b47a195ea6d912684bc9bb409dde33aee66fb1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=98b47a195ea6d9… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Wed Jul 30 17:18:36 2014 +0200 Renamed the touchstone checks to docsis. But the checks a not finished yet --- ...stone_cable_modem_frequency => docsis_channels} | 2 +- checkman/docsis_signal | 15 ++++++++++ checkman/touchstone_cable_modem_fec | 15 ---------- ...stone_cable_modem_frequency => docsis_channels} | 16 +++++------ .../{touchstone_cable_modem_fec => docsis_signal} | 16 +++++------ web/plugins/wato/check_parameters.py | 30 ++++++++++---------- 6 files changed, 47 insertions(+), 47 deletions(-) diff --git a/checkman/touchstone_cable_modem_frequency b/checkman/docsis_channels similarity index 85% rename from checkman/touchstone_cable_modem_frequency rename to checkman/docsis_channels index 7d9c3f4..6686176 100644 --- a/checkman/touchstone_cable_modem_frequency +++ b/checkman/docsis_channels @@ -1,4 +1,4 @@ -title: Touchstone Cable Modem: Frequency +title: DOCSIS: Frequency agents: snmp catalog: hw/network/arris license: GPL diff --git a/checkman/docsis_signal b/checkman/docsis_signal new file mode 100644 index 0000000..7320252 --- /dev/null +++ b/checkman/docsis_signal @@ -0,0 +1,15 @@ +title: DOCSIS Signal: Forward error correction +agents: snmp +catalog: hw/network/docsis +license: GPL +distribution: +description: + This check monitors the Forward Error correction rate on the docsis MIB. This works for example for Touchstone Cable Modems + It is possible to set levels in percent for uncorrected and corrected packages. + +item: + None + +inventory: + One service will be created + diff --git a/checkman/touchstone_cable_modem_fec b/checkman/touchstone_cable_modem_fec deleted file mode 100644 index 67183fa..0000000 --- a/checkman/touchstone_cable_modem_fec +++ /dev/null @@ -1,15 +0,0 @@ -title: Touchstone Cable Modem: Forward error correction -agents: snmp -catalog: hw/network/arris -license: GPL -distribution: -description: - This check monitors the Forward Error correction rate on Touchestone Cable Modems. - It is possible to set levels in percent for uncorrected and corrected packages. - -item: - None - -inventory: - One service will be created - diff --git a/checks/touchstone_cable_modem_frequency b/checks/docsis_channels similarity index 80% rename from checks/touchstone_cable_modem_frequency rename to checks/docsis_channels index 2c3e1a1..030fa65 100644 --- a/checks/touchstone_cable_modem_frequency +++ b/checks/docsis_channels @@ -24,12 +24,12 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -touchstone_cable_modem_frequency_default_levels = ( 155, 163 ) +docsis_channels_default_levels = ( 155, 163 ) -def inventory_touchstone_cable_modem_frequency(info): - return [ (None, "touchstone_cable_modem_frequency_default_levels") ] +def inventory_docsis_channels(info): + return [ (None, "docsis_channels_default_levels") ] -def check_touchstone_cable_modem_frequency(_no_item, params, info): +def check_docsis_channels(_no_item, params, info): mhz = int(info[0][0]) / 1000000 infotext = "Current Frequence is %d Mhz" % mhz warn, crit = params @@ -44,12 +44,12 @@ def check_touchstone_cable_modem_frequency(_no_item, params, info): infotext += levels return state, infotext, perfdata -check_info["touchstone_cable_modem_frequency"] = { - "check_function" : check_touchstone_cable_modem_frequency, - "inventory_function" : inventory_touchstone_cable_modem_frequency, +check_info["docsis_channels"] = { + "check_function" : check_docsis_channels, + "inventory_function" : inventory_docsis_channels, "service_description" : "Frequency", "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") == ".1.3.6.1.4.1.4115.820.1.0.0.0.0.0", "snmp_info" : ( ".1.3.6.1.2.1.10.127.1.1.1.1.2", [ 3 ]), - "group" : "network_freq_single", + "group" : "docsis_channels", } diff --git a/checks/touchstone_cable_modem_fec b/checks/docsis_signal similarity index 83% rename from checks/touchstone_cable_modem_fec rename to checks/docsis_signal index 14bad63..2547e9f 100644 --- a/checks/touchstone_cable_modem_fec +++ b/checks/docsis_signal @@ -24,15 +24,15 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -factory_settings["touchstone_cable_modem_fec_default_levels"] = { +factory_settings["docsis_signal_default_levels"] = { "corrected" : ( 25.0 , 30.0 ), "uncorrected" : ( 25.0 , 30.0 ), } -def inventory_touchstone_cable_modem_fec(info): +def inventory_docsis_signal(info): return [ (None, {}) ] -def check_touchstone_cable_modem_fec(_no_item, params, info): +def check_docsis_signal(_no_item, params, info): fec = {} good, fec['corrected'], fec['uncorrected'] = map(float, info[0]) fec['corrected_perc'] = ( fec['corrected'] / good ) * 100 @@ -48,13 +48,13 @@ def check_touchstone_cable_modem_fec(_no_item, params, info): yield state, "FEC %s at %.2f%%" % ( what, fec[what+"_perc"] ), [ ( what, fec[what], warn, crit ) ] yield 0, "Total: %d codewords" % good, [('total', good )] -check_info["touchstone_cable_modem_fec"] = { - "check_function" : check_touchstone_cable_modem_fec, - "inventory_function" : inventory_touchstone_cable_modem_fec, +check_info["docsis_signal"] = { + "check_function" : check_docsis_signal, + "inventory_function" : inventory_docsis_signal, "service_description" : "FEC", "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") == ".1.3.6.1.4.1.4115.820.1.0.0.0.0.0", "snmp_info" : ( ".1.3.6.1.2.1.10.127.1.1.4.1", [ 2, 3, 4 ]), - "default_levels_variable" : "touchstone_cable_modem_fec_default_levels", - "group" : "fec", + "default_levels_variable" : "docsis_signal_default_levels", + "group" : "docsis_signal", } diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 3dbe574..65c9ba9 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -1317,8 +1317,8 @@ register_check_parameters( register_check_parameters( subgroup_networking, - 'fec', - _("Forward error correction"), + 'docsis_signal', + _("Forward error correction for Docsis Systems"), Dictionary( elements = [ ( 'corrected', Tuple( @@ -1343,6 +1343,19 @@ register_check_parameters( register_check_parameters( subgroup_networking, + "docsis_channels", + _("Modem Frequencies for Docsis"), # Name can be changed if the rule is used for another check + Tuple( + help = _("Levels for the frequencies of network devices like modems." ), + elements = [ + Integer(title = _("warning if at"), unit = "Mhz", default_value = 155 ), + Integer(title = _("critical if at"), unit = "Mhz", default_value = 163 ), + ]), + None, + "first" +) +register_check_parameters( + subgroup_networking, "vpn_tunnel", _("VPN Tunnel"), Dictionary( @@ -5502,19 +5515,6 @@ register_check_parameters( "dict" ), -register_check_parameters( - subgroup_networking, - "network_freq_single", - _("Modem Frequencies"), # Name can be changed if the rule is used for another check - Tuple( - help = _("Levels for the frequencies of network devices like modems." ), - elements = [ - Integer(title = _("warning if at"), unit = "Mhz", default_value = 155 ), - Integer(title = _("critical if at"), unit = "Mhz", default_value = 163 ), - ]), - None, - "first" -) register_check_parameters( subgroup_storage,

10 years, 2 months

Check_MK Git: check_mk: #0188 touchstone_cable_modem_frequency: New check for line frequency in Mhz

by Bastian Kuhn

Module: check_mk Branch: master Commit: e9ac966b137e41a0792e8efe1598d2e136535b97 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e9ac966b137e41… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Wed Jul 30 15:20:33 2014 +0200 #0188 touchstone_cable_modem_frequency: New check for line frequency in Mhz --- .werks/188 | 8 +++++ ChangeLog | 2 ++ checkman/touchstone_cable_modem_fec | 2 +- checkman/touchstone_cable_modem_frequency | 14 ++++++++ checks/touchstone_cable_modem_frequency | 55 +++++++++++++++++++++++++++++ web/plugins/wato/check_parameters.py | 14 ++++++++ 6 files changed, 94 insertions(+), 1 deletion(-) diff --git a/.werks/188 b/.werks/188 new file mode 100644 index 0000000..6228bfc --- /dev/null +++ b/.werks/188 @@ -0,0 +1,8 @@ +Title: touchstone_cable_modem_frequency: New check for line frequency in Mhz +Level: 1 +Component: checks +Version: 1.2.5i6 +Date: 1406726413 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index f19e236..5de59cb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,7 @@ * 1065 heartbeat_crm / heartbeat_crm.resources: Rewrote checks / formalized parameters... * 0186 touchstone_cable_modem_fec: New Check to monitor the Forward error correction on touchstone cable modems * 1068 livedump: Added optional check interval (detect staleness) / option to encrypt mails... + * 0188 touchstone_cable_modem_frequency: New check for line frequency in Mhz * 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 @@ -17,6 +18,7 @@ * 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 + * 1092 FIX: logwatch: now able to enter unicode text into the "Pattern (Regex)" field 1.2.5i5: diff --git a/checkman/touchstone_cable_modem_fec b/checkman/touchstone_cable_modem_fec index 0ebc7e9..67183fa 100644 --- a/checkman/touchstone_cable_modem_fec +++ b/checkman/touchstone_cable_modem_fec @@ -5,7 +5,7 @@ license: GPL distribution: description: This check monitors the Forward Error correction rate on Touchestone Cable Modems. - It is possible to set levels in percent fir uncorrected and corrected packages. + It is possible to set levels in percent for uncorrected and corrected packages. item: None diff --git a/checkman/touchstone_cable_modem_frequency b/checkman/touchstone_cable_modem_frequency new file mode 100644 index 0000000..7d9c3f4 --- /dev/null +++ b/checkman/touchstone_cable_modem_frequency @@ -0,0 +1,14 @@ +title: Touchstone Cable Modem: Frequency +agents: snmp +catalog: hw/network/arris +license: GPL +distribution: +description: + This check monitors the frequency on the modem line in Mhz. Levels for {WARN} and {CRIT} can be set. + +item: + None + +inventory: + One service will be created + diff --git a/checks/touchstone_cable_modem_frequency b/checks/touchstone_cable_modem_frequency new file mode 100644 index 0000000..2c3e1a1 --- /dev/null +++ b/checks/touchstone_cable_modem_frequency @@ -0,0 +1,55 @@ +#!/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. + +touchstone_cable_modem_frequency_default_levels = ( 155, 163 ) + +def inventory_touchstone_cable_modem_frequency(info): + return [ (None, "touchstone_cable_modem_frequency_default_levels") ] + +def check_touchstone_cable_modem_frequency(_no_item, params, info): + mhz = int(info[0][0]) / 1000000 + infotext = "Current Frequence is %d Mhz" % mhz + warn, crit = params + perfdata = [("frequence" , mhz, warn, crit )] + levels = " (Levels Warn/Crit at %d Mhz/ %d Mhz)" % ( warn, crit ) + state = 0 + if mhz >= crit: + state = 2 + infotext += levels + elif mhz >= warn: + state = 1 + infotext += levels + return state, infotext, perfdata + +check_info["touchstone_cable_modem_frequency"] = { + "check_function" : check_touchstone_cable_modem_frequency, + "inventory_function" : inventory_touchstone_cable_modem_frequency, + "service_description" : "Frequency", + "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") == ".1.3.6.1.4.1.4115.820.1.0.0.0.0.0", + "snmp_info" : ( ".1.3.6.1.2.1.10.127.1.1.1.1.2", [ 3 ]), + "group" : "network_freq_single", +} + diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 6953a04..3dbe574 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -5503,6 +5503,20 @@ register_check_parameters( ), register_check_parameters( + subgroup_networking, + "network_freq_single", + _("Modem Frequencies"), # Name can be changed if the rule is used for another check + Tuple( + help = _("Levels for the frequencies of network devices like modems." ), + elements = [ + Integer(title = _("warning if at"), unit = "Mhz", default_value = 155 ), + Integer(title = _("critical if at"), unit = "Mhz", default_value = 163 ), + ]), + None, + "first" +) + +register_check_parameters( subgroup_storage, "fc_port", _("FibreChannel Ports (FCMGMT MIB)"),

10 years, 2 months

Check_MK Git: check_mk: touchstone_cable_modem_fec: Added perfometer

by Bastian Kuhn

Module: check_mk Branch: master Commit: 0740e2b93e47c6af74c0980070ae887de602b7bf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0740e2b93e47c6… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Wed Jul 30 14:41:03 2014 +0200 touchstone_cable_modem_fec: Added perfometer --- web/plugins/perfometer/check_mk.py | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/web/plugins/perfometer/check_mk.py b/web/plugins/perfometer/check_mk.py index 04f0168..4c58c62 100644 --- a/web/plugins/perfometer/check_mk.py +++ b/web/plugins/perfometer/check_mk.py @@ -1120,3 +1120,18 @@ def perfometer_voltage(row, check_command, perf_data): return "%0.3f V" % value, perfometer_logarithmic(value, 12, 2, color) perfometers["check_mk-bintec_sensors.voltage"] = perfometer_voltage + +def perfometer_fec( row, check_command, perf_data ): + total = float(perf_data[2][1]) + corrected = ( int(perf_data[0][1]) / total ) * 100 + uncorrected = ( int(perf_data[1][1]) / total ) * 100 + left = 100 - corrected - uncorrected + h = "<table><tr>" + h += perfometer_td( corrected, "yellow") + h += perfometer_td( uncorrected, "red") + h += perfometer_td( left, "green") + h += "</tr></table>" + return "Total", h + +perfometers["check_mk-touchstone_cable_modem_fec"] = perfometer_fec +

10 years, 2 months

Check_MK Git: check_mk: touchstone_cable_modem_fec: Changed check behavior

by Bastian Kuhn

Module: check_mk Branch: master Commit: 566b2206c878b0d13e803bf370ef893289bd1aa2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=566b2206c878b0… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Wed Jul 30 14:18:36 2014 +0200 touchstone_cable_modem_fec: Changed check behavior --- checkman/touchstone_cable_modem_fec | 2 +- checks/touchstone_cable_modem_fec | 19 +++++++++++-------- web/plugins/wato/check_parameters.py | 15 ++++----------- 3 files changed, 16 insertions(+), 20 deletions(-) diff --git a/checkman/touchstone_cable_modem_fec b/checkman/touchstone_cable_modem_fec index 4a62c65..0ebc7e9 100644 --- a/checkman/touchstone_cable_modem_fec +++ b/checkman/touchstone_cable_modem_fec @@ -5,7 +5,7 @@ license: GPL distribution: description: This check monitors the Forward Error correction rate on Touchestone Cable Modems. - It is possible to set levels for good, uncorrected and corrected packages. + It is possible to set levels in percent fir uncorrected and corrected packages. item: None diff --git a/checks/touchstone_cable_modem_fec b/checks/touchstone_cable_modem_fec index daca175..14bad63 100644 --- a/checks/touchstone_cable_modem_fec +++ b/checks/touchstone_cable_modem_fec @@ -25,9 +25,8 @@ # Boston, MA 02110-1301 USA. factory_settings["touchstone_cable_modem_fec_default_levels"] = { - "good" : ( 250000000000, 260000000000 ), - "corrected" : ( 250000000000, 260000000000 ), - "uncorrected" : ( 250000000000, 260000000000 ), + "corrected" : ( 25.0 , 30.0 ), + "uncorrected" : ( 25.0 , 30.0 ), } def inventory_touchstone_cable_modem_fec(info): @@ -35,15 +34,19 @@ def inventory_touchstone_cable_modem_fec(info): def check_touchstone_cable_modem_fec(_no_item, params, info): fec = {} - fec['good'], fec['corrected'], fec['uncorrected'] = map(int, info[0]) - for what in ['good', 'corrected', 'uncorrected']: + good, fec['corrected'], fec['uncorrected'] = map(float, info[0]) + fec['corrected_perc'] = ( fec['corrected'] / good ) * 100 + fec['uncorrected_perc'] = ( fec['uncorrected'] / good ) * 100 + + for what in [ 'corrected', 'uncorrected' ]: warn, crit = params[what] state = 0 - if fec[what] >= crit: + if fec[what+"_perc"] >= crit: state = 2 - elif fec[what] >= warn: + elif fec[what+"_perc"] >= warn: state = 1 - yield state, "FEC %s at %s" % ( what, fec[what] ), [ ( what, fec[what], warn, crit ) ] + yield state, "FEC %s at %.2f%%" % ( what, fec[what+"_perc"] ), [ ( what, fec[what], warn, crit ) ] + yield 0, "Total: %d codewords" % good, [('total', good )] check_info["touchstone_cable_modem_fec"] = { "check_function" : check_touchstone_cable_modem_fec, diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index a0cae68..6953a04 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -1321,25 +1321,18 @@ register_check_parameters( _("Forward error correction"), Dictionary( elements = [ - ( 'good', Tuple( - title = _("Levels for good Packages"), - elements = [ - Integer( title = _("Warning at"), default_value="250000000000"), - Integer( title = _("Critical at"), default_value="260000000000"), - ] - )), ( 'corrected', Tuple( title = _("Levels for corrected Packages"), elements = [ - Integer( title = _("Warning at"), default_value="250000000000"), - Integer( title = _("Critical at"), default_value="260000000000"), + Percentage( title = _("Warning at"), default_value = 25.0), + Percentage( title = _("Critical at"), default_value = 30.0 ), ] )), ( 'uncorrected', Tuple( title = _("Levels for uncorrected Packages"), elements = [ - Integer( title = _("Warning at"), default_value="250000000000"), - Integer( title = _("Critical at"), default_value="260000000000"), + Percentage( title = _("Warning at"), default_value = 25.0 ), + Percentage( title = _("Critical at"), default_value = 30.0 ), ] )), ]

10 years, 2 months

Check_MK Git: check_mk: Fixed syntax error in check

by Bastian Kuhn

Module: check_mk Branch: master Commit: 508df4dce9f97ce42c89a65cb19e2751c7290896 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=508df4dce9f97c… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Wed Jul 30 14:04:09 2014 +0200 Fixed syntax error in check --- checks/hp_proliant_power | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/checks/hp_proliant_power b/checks/hp_proliant_power index c078823..4039799 100644 --- a/checks/hp_proliant_power +++ b/checks/hp_proliant_power @@ -41,10 +41,10 @@ def check_hp_proliant_power(item, params, info): warn, crit = params state = 0 levels = '' - if reading => crit: + if reading >= crit: state = 2 levels = '( Warning/Critical %s/%s )' % ( warn, crit ) - elif reading => warn: + elif reading >= warn: state = 1 levels = '( Warning/Critical %s/%s )' % ( warn, crit )

10 years, 2 months

Check_MK Git: check_mk: logwatch: now able to enter unicode text into the ' Pattern (Regex)' field

by Andreas Boesl

Module: check_mk Branch: master Commit: a6b53c9799f86cc5e7228af94251e7483b92bdbe URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a6b53c9799f86c… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Jul 30 13:48:10 2014 +0200 logwatch: now able to enter unicode text into the 'Pattern (Regex)' field --- .werks/1092 | 9 +++++++++ web/plugins/wato/check_parameters.py | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/.werks/1092 b/.werks/1092 new file mode 100644 index 0000000..77203f1 --- /dev/null +++ b/.werks/1092 @@ -0,0 +1,9 @@ +Title: logwatch: now able to enter unicode text into the "Pattern (Regex)" field +Level: 1 +Component: wato +Class: fix +State: unknown +Version: 1.2.5i6 +Date: 1406720689 + + diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 932fee4..a0cae68 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -72,7 +72,7 @@ register_rule(group + '/' + subgroup_applications, ('I', _('IGNORE')), ], ), - RegExp( + RegExpUnicode( title = _("Pattern (Regex)"), size = 40, ),

10 years, 2 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits