Checkmk git commits February 2015

checkmk-commits@lists.checkmk.com

8 participants
297 discussions

Check_MK Git: check_mk: #1936 FIX check_form_submit: fixed crash on certain form fields with unnamed input elements

by Andreas Boesl

Module: check_mk Branch: master Commit: fad2266a8efde658fbabc7d22b6711bbce03bd8e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fad2266a8efde6… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Feb 5 10:26:19 2015 +0100 #1936 FIX check_form_submit: fixed crash on certain form fields with unnamed input elements --- .werks/1936 | 10 ++++++++++ ChangeLog | 1 + doc/treasures/active_checks/check_form_submit | 5 ++++- 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/.werks/1936 b/.werks/1936 new file mode 100644 index 0000000..db65719 --- /dev/null +++ b/.werks/1936 @@ -0,0 +1,10 @@ +Title: check_form_submit: fixed crash on certain form fields with unnamed input elements +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1423128338 + + diff --git a/ChangeLog b/ChangeLog index b3059f6..340d9e4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -143,6 +143,7 @@ * 1931 FIX: agent_vsphere: no longer crashes when host has no license information * 1932 FIX: check_http: Check SSL Certificate: did not work when SNI Option was set... * 1975 FIX: check_bi_aggr: Ignoring proxy settings from environment now + * 1936 FIX: check_form_submit: fixed crash on certain form fields with unnamed input elements Multisite: * 1758 Improved exception hander: Shows details without additional debug request, added mailto link for error report... diff --git a/doc/treasures/active_checks/check_form_submit b/doc/treasures/active_checks/check_form_submit index 134c469..8b9f160 100755 --- a/doc/treasures/active_checks/check_form_submit +++ b/doc/treasures/active_checks/check_form_submit @@ -232,7 +232,10 @@ class FormParser(HTMLParser): if self.current_form is None: debug('Ignoring form field out of form tag') else: - self.current_form['elements'][attrs['name']] = attrs.get('value', '') + if 'name' in attrs: + self.current_form['elements'][attrs['name']] = attrs.get('value', '') + else: + debug('Ignoring form field without name %r' % attrs) def handle_endtag(self, tag): if tag == 'form':

9 years, 4 months

Check_MK Git: check_mk: #1222 mbg_lantime_ng_state: Support for the new Meinberg Lantime MIB (MBG-LANTIME-NG-MIB)

by Bastian Kuhn

Module: check_mk Branch: master Commit: e8a4e36e444d8ffb3ce4bcca49371ae2e515c2a9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e8a4e36e444d8f… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Thu Feb 5 10:20:18 2015 +0100 #1222 mbg_lantime_ng_state: Support for the new Meinberg Lantime MIB (MBG-LANTIME-NG-MIB) This new Checks supports the NG MIB on Meinberg Lantime devices. The old version of the check (mbg_lantime_state) now also uses the same sourcecode base and benefits from the new Wato option. --- .werks/1222 | 12 +++++++++++ ChangeLog | 1 + checks/mbg_lantime.include | 4 ++-- web/plugins/wato/check_parameters.py | 38 ++++++++++++++++++++++++++++++++++ 4 files changed, 53 insertions(+), 2 deletions(-) diff --git a/.werks/1222 b/.werks/1222 new file mode 100644 index 0000000..96b5b38 --- /dev/null +++ b/.werks/1222 @@ -0,0 +1,12 @@ +Title: mbg_lantime_ng_state: Support for the new Meinberg Lantime MIB (MBG-LANTIME-NG-MIB) +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i1 +Date: 1423127749 +Class: feature + +This new Checks supports the NG MIB on Meinberg Lantime devices. +The old version of the check (mbg_lantime_state) now also uses the same sourcecode base and benefits +from the new Wato option. + diff --git a/ChangeLog b/ChangeLog index 47cb51b..b3059f6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -74,6 +74,7 @@ * 1930 Windows agent: now able to unpack plugins.cap file (created by Check_MK agent bakery)... * 1933 esx_vsphere_objects: now able to set a different alert level when the host/vm reports 'unknown'... * 1860 df and other filesystem checks: process total fs size as perfdata... + * 1222 mbg_lantime_ng_state: Support for the new Meinberg Lantime MIB (MBG-LANTIME-NG-MIB)... * 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/mbg_lantime.include b/checks/mbg_lantime.include index 639350e..b942da5 100644 --- a/checks/mbg_lantime.include +++ b/checks/mbg_lantime.include @@ -72,7 +72,7 @@ def check_mbg_lantime_state_common(states, _no_item, params, info): elif pos_refclock_offset >= warn: state = 1 if state != 0: - levels_text = " (warn/crit at %d/%d us)" % (warn, crit) + levels_text = " (warn/crit at %d/%d µs)" % (warn, crit) perfdata = [('offset', refclock_offset, warn * 1000, crit * 1000)] # all in us - yield state, 'Reference clock offset: %g us%s' % (refclock_offset, levels_text), perfdata + yield state, 'Reference clock offset: %g µs%s' % (refclock_offset, levels_text), perfdata diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 470ae3b..aa8223f 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -6168,6 +6168,44 @@ register_check_parameters( register_check_parameters( subgroup_applications, + "mbg_lantime_state", + _("Meinberg Lantime State"), + Dictionary( + title = _("Meinberg Lantime State"), + elements = [ + ("stratum", Tuple( + title = _("Warning levels for Stratum"), + elements = [ + Integer( + title = _("Warning at"), + default_value = 1, + ), + Integer( + title = _("Critical at"), + default_value = 1, + ), + ])), + ("offset", Tuple( + title = _("Warning levels for Time Offset"), + elements = [ + Integer( + title = _("Warning at"), + unit = _("microseconds"), + default_value = 1, + ), + Integer( + title = _("Critical at"), + unit = _("microseconds"), + default_value = 1, + ), + ])), + ]), + None, + "first" +) + +register_check_parameters( + subgroup_applications, "datacore_poolallocation", _("Datacore: pool allocation"), Tuple(

9 years, 4 months

Check_MK Git: check_mk: fixed typo

by Andreas Boesl

Module: check_mk Branch: master Commit: 4e9c078e6551af0b87452e1ff7f2725cb9146c17 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4e9c078e6551af… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Feb 5 09:39:19 2015 +0100 fixed typo --- web/htdocs/wato.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 9e32cec..dd4eae3 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -8942,7 +8942,7 @@ def mode_notifications(phase): context = entry.items() context.sort() tooltip = "".join(("%s: %s\n" % e).decode('utf-8') for e in context) - html.icon_button(analyse_url, _("Anaylse ruleset with this notification:\n%s" % tooltip), "analyze") + html.icon_button(analyse_url, _("Analyze ruleset with this notification:\n%s" % tooltip), "analyze") replay_url = html.makeactionuri([("_replay", str(nr))]) html.icon_button(replay_url, _("Replay this notification, send it again!"), "replay") if html.var("analyse") and nr == int(html.var("analyse")):

9 years, 4 months

Check_MK Git: check_mk: #1976 FIX Sorting BI rule choice dropdown field entries now

by Lars Michelsen

Module: check_mk Branch: master Commit: ec3f1782e52951a04ce3c1b86304b895c00cd03a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ec3f1782e52951… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Feb 5 08:28:31 2015 +0100 #1976 FIX Sorting BI rule choice dropdown field entries now --- .werks/1976 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/wato.py | 1 + 3 files changed, 12 insertions(+) diff --git a/.werks/1976 b/.werks/1976 new file mode 100644 index 0000000..e3ea567 --- /dev/null +++ b/.werks/1976 @@ -0,0 +1,10 @@ +Title: Sorting BI rule choice dropdown field entries now +Level: 1 +Component: wato +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1423121276 + + diff --git a/ChangeLog b/ChangeLog index b228b2e..47cb51b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -200,6 +200,7 @@ * 1883 FIX: Fixed lossing service context when cloning a rule * 1925 FIX: Fix missing auxilliary tags that have their own topic... * 1927 FIX: Fixed level description in WATO rules, change from if above into at + * 1976 FIX: Sorting BI rule choice dropdown field entries now Notifications: * 1662 notification plugin spectrum: finalized script. now able to handle host notications diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index a6f93fd..9e32cec 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -16812,6 +16812,7 @@ def declare_bi_valuespecs(aggregation_rules): DropdownChoice( title = _("Rule:"), choices = rule_choices, + sorted = True, ), ListOfStrings( orientation = "horizontal",

9 years, 4 months

Check_MK Git: check_mk: #1989 FIX Fix sorting of services in availability views

by Mathias Kettner

Module: check_mk Branch: master Commit: f9ddc5b8d605b3d665da1e33eeed6a487432b6b6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f9ddc5b8d605b3… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Feb 4 17:59:06 2015 +0100 #1989 FIX Fix sorting of services in availability views --- .werks/1989 | 10 ++++++++++ ChangeLog | 1 + web/plugins/views/availability.py | 10 +++++++++- 3 files changed, 20 insertions(+), 1 deletion(-) diff --git a/.werks/1989 b/.werks/1989 new file mode 100644 index 0000000..d61c082 --- /dev/null +++ b/.werks/1989 @@ -0,0 +1,10 @@ +Title: Fix sorting of services in availability views +Level: 2 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1423069133 + + diff --git a/ChangeLog b/ChangeLog index 6a5c58e..b228b2e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -175,6 +175,7 @@ * 1885 FIX: Fixed filtering by software versions in software package search * 1972 FIX: Prevent erasing of quicksearch field when sidebar is reloaded (e.g. during activate changes)... * 1221 FIX: veeam_client: Multisite perfometer is now more robust + * 1989 FIX: Fix sorting of services in availability views WATO: * 1760 Added search form to manual checks page diff --git a/web/plugins/views/availability.py b/web/plugins/views/availability.py index 506ed51..8c99a98 100644 --- a/web/plugins/views/availability.py +++ b/web/plugins/views/availability.py @@ -1311,7 +1311,15 @@ def render_availability_group(group_title, range_title, group_id, availability, do_csv = html.output_format == "csv_export" no_html = do_csv or fetch - availability.sort() + # Sort according to host and service. First after site, then + # host (natural sort), then service + def cmp_av_entry(a, b): + return cmp(a[0], b[0]) or \ + cmp(num_split(a[1]) + (a[1],), num_split(b[1]) + (b[1],)) or \ + cmp(cmp_service_name_equiv(a[2]), cmp_service_name_equiv(b[2])) or \ + cmp(a[2], b[2]) + + group_availability.sort(cmp = cmp_av_entry) show_summary = avoptions.get("summary") summary = {} summary_counts = {}

9 years, 4 months

Check_MK Git: check_mk: mbg_lantime_ng_state: Converting values to microseconds

by Bastian Kuhn

Module: check_mk Branch: master Commit: 73882a069bdd26b77d9a99eb522c1b76d4a75997 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=73882a069bdd26… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Wed Feb 4 17:56:30 2015 +0100 mbg_lantime_ng_state: Converting values to microseconds --- checks/mbg_lantime_ng_state | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/checks/mbg_lantime_ng_state b/checks/mbg_lantime_ng_state index 9445b5f..d6cd8c1 100644 --- a/checks/mbg_lantime_ng_state +++ b/checks/mbg_lantime_ng_state @@ -30,7 +30,10 @@ def check_mbg_lantime_nb_state(_no_item, params, info): '1': (2, 'not synchronized'), '2': (0, 'synchronized'), } - return check_mbg_lantime_state_common(states, _no_item, params, info) + converted_info = info[0] + #Convert to microseconds + converted_info[3] = float(converted_info[3]) * 1000 + return check_mbg_lantime_state_common(states, _no_item, params, [converted_info]) check_info["mbg_lantime_ng_state"] = {

9 years, 4 months

Check_MK Git: check_mk: Small fix for .f12 file in agents directory

by Mathias Kettner

Module: check_mk Branch: master Commit: d5648427f155bd737923c8854c7ea27bd02ebf06 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d5648427f155bd… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Feb 4 17:45:18 2015 +0100 Small fix for .f12 file in agents directory --- agents/.f12 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agents/.f12 b/agents/.f12 index f8ed361..6484ad4 100644 --- a/agents/.f12 +++ b/agents/.f12 @@ -1,7 +1,7 @@ #!/bin/bash SITE=${SITE:-$(cat ../.site 2>/dev/null || true)} SITE=${SITE:-$(omd sites --bare | head -n 1)} -sudo cp -r * /omd/sites/$SITE/share/check_mk/agents/ +sudo rsync -varx --delete ./ /omd/sites/$SITE/share/check_mk/agents/ if [ -e /etc/check_mk ] then sudo install -m 644 cfg_examples/logwatch.cfg /etc/check_mk/

9 years, 4 months

Check_MK Git: check_mk: Further fix in LANTIME checks

by Mathias Kettner

Module: check_mk Branch: master Commit: e45fca05c09f9befc5ce51f8f1e523a368efdb90 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e45fca05c09f9b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Feb 4 17:37:55 2015 +0100 Further fix in LANTIME checks --- checks/mbg_lantime.include | 6 +++--- web/htdocs/lib.py | 10 +++++++--- web/htdocs/metrics.py | 1 + web/plugins/metrics/check_mk.py | 18 +++++++++++++++++- 4 files changed, 28 insertions(+), 7 deletions(-) diff --git a/checks/mbg_lantime.include b/checks/mbg_lantime.include index 1a94b86..639350e 100644 --- a/checks/mbg_lantime.include +++ b/checks/mbg_lantime.include @@ -27,7 +27,7 @@ factory_settings['mbg_lantime_state_default_levels'] = { "stratum" : (1, 1), - "offset" : (500, 1000), # ms + "offset" : (500, 1000), # us } @@ -72,7 +72,7 @@ def check_mbg_lantime_state_common(states, _no_item, params, info): elif pos_refclock_offset >= warn: state = 1 if state != 0: - levels_text = " (warn/crit at %d/%d ms)" % (warn, crit) - perfdata = [('offset', refclock_offset, warn, crit )] + levels_text = " (warn/crit at %d/%d us)" % (warn, crit) + perfdata = [('offset', refclock_offset, warn * 1000, crit * 1000)] # all in us yield state, 'Reference clock offset: %g us%s' % (refclock_offset, levels_text), perfdata diff --git a/web/htdocs/lib.py b/web/htdocs/lib.py index f4b3bda..61a6d56 100644 --- a/web/htdocs/lib.py +++ b/web/htdocs/lib.py @@ -452,12 +452,16 @@ def number_human_readable(n, precision=1, unit="B"): return (f + "%s") % (n, unit) def age_human_readable(secs, min_only=False): - if min_only: + if secs > 0 and secs < 0.0001: # us + return "%.1f us" % (secs * 1000000) + elif secs > 0 and secs < 1: # ms + return "%.2f ms" % (secs * 1000) + elif min_only: mins = secs / 60.0 return "%.1f %s" % (mins, _("min")) - if secs < 10: + elif secs < 10: return "%.2f %s" % (secs, _("sec")) - if secs < 60: + elif secs < 60: return "%.1f %s" % (secs, _("sec")) elif secs < 240: return "%d %s" % (secs, _("sec")) diff --git a/web/htdocs/metrics.py b/web/htdocs/metrics.py index 3941cce..0f849e0 100644 --- a/web/htdocs/metrics.py +++ b/web/htdocs/metrics.py @@ -348,6 +348,7 @@ def output_pnp_graph(graph, host_name, service_desc, translated_metrics): unit = unit_info[mi["unit"]] rrd = rrd_path(host_name, service_desc, translated_metrics[metric_name]["orig_name"]) rrdgraph_commands += "DEF:%s=%s:1:MAX " % (metric_name, rrd) + # TODO: Hier muss noch die Skalierung rein!!! rrdgraph_commands += "%s:%s%s:\"%s\"%s " % (draw_type, metric_name, mi["color"], ("%-20s" % mi["title"]), draw_stack) rrdgraph_commands += "GPRINT:%s:AVERAGE:\"avg\\: %%8.2lf %s\" " % (metric_name, unit["symbol"].replace("%", "%%")) rrdgraph_commands += "GPRINT:%s:MAX:\"max\\: %%8.2lf %s\" " % (metric_name, unit["symbol"].replace("%", "%%")) diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index cd86fbd..7f84a73 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -136,7 +136,6 @@ metric_info["swap_free"] = { "color" : "#eeeeee", } - metric_info["execution_time"] = { "title" : _("Execution time"), "unit" : "s", @@ -206,6 +205,13 @@ metric_info["io_wait"] = { "color" : "#00b0c0", } +metric_info["time_offset"] = { + "title" : _("Time offset"), + "unit" : "s", + "color" : "#9a52bf", +} + + #. # .--Checks--------------------------------------------------------------. # | ____ _ _ | @@ -299,6 +305,9 @@ check_metrics["check_mk-vms_cpu"] = { "wait" : { " check_metrics["check_mk-ucd_cpu_util"] = { "wait" : { "name" : "io_wait" } } check_metrics["check_mk-lparstat_aix.cpu_util"] = { "wait" : { "name" : "io_wait" } } +check_metrics["check_mk-mbg_lantime_state"] = { "offset" : { "name" : "time_offset", "scale" : 0.000001 }} # convert us -> sec +check_metrics["check_mk-mbg_lantime_nb_state"] = { "offset" : { "name" : "time_offset", "scale" : 0.000001 }} # convert us -> sec + #. # .--Perf-O-Meters-------------------------------------------------------. # | ____ __ ___ __ __ _ | @@ -322,6 +331,7 @@ perfometer_info.append(("stacked", ( [ "user", "system", "io_wait" ], perfometer_info.append(("stacked", ( [ "fs_used(%)" ], 100.0, None))) perfometer_info.append(("stacked", ( [ "mem_used", "swap_used", "caches", "mem_free", "swap_free" ], None, ("mem_total,mem_used,swap_used,+,/", "100%")))) perfometer_info.append(("stacked", ( [ "mem_used" ], "mem_total", None))) +perfometer_info.append(("logarithmic", ( "time_offset", 1.0, 10.0))) #. @@ -351,3 +361,9 @@ graph_info.append({ ( "io_wait", "stack" ), ] }) + +graph_info.append({ + "metrics" : [ + ( "time_offset", "area" ), + ] +})

9 years, 4 months

Check_MK Git: check_mk: Small update for lantime checks

by Mathias Kettner

Module: check_mk Branch: master Commit: fce48dad55d49c6e365b9103b5203de351fd8a89 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fce48dad55d49c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Feb 4 17:16:25 2015 +0100 Small update for lantime checks --- checks/mbg_lantime.include | 34 ++++++++++++++++++++++------------ checks/mbg_lantime_ng_state | 31 +++++++++++++------------------ checks/mbg_lantime_state | 38 +++++++++++++++++--------------------- 3 files changed, 52 insertions(+), 51 deletions(-) diff --git a/checks/mbg_lantime.include b/checks/mbg_lantime.include index bda2881..1a94b86 100644 --- a/checks/mbg_lantime.include +++ b/checks/mbg_lantime.include @@ -24,45 +24,55 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. + +factory_settings['mbg_lantime_state_default_levels'] = { + "stratum" : (1, 1), + "offset" : (500, 1000), # ms +} + + def inventory_mbg_lantime_state_common(info): return [(None, {})] + def check_mbg_lantime_state_common(states, _no_item, params, info): ntp_state, stratum, refclock_name, refclock_offset = info[0] if type(params) != dict: params = { 'stratum' : (params[0], params[1]), - 'offset' : (params[2], params[3]), + 'offset' : (params[2], params[3]), } # Handle State yield states[ntp_state][0], "State: " + states[ntp_state][1] - # handle the reported stratum + # Check the reported stratum state = 0 - levels = "" + levels_text = "" warn, crit = params['stratum'] if int(stratum) > crit: state = 2 elif int(stratum) > warn: state = 1 if state != 0: - levels = " (Warn/Crit at %s/%s)" % (warn, crit) - yield state, "Stratum: %s%s" % (stratum, levels) + levels_text = " (warn/crit at %d/%d)" % (warn, crit) + yield state, "Stratum: %s%s" % (stratum, levels_text) # Add refclock information - yield 0, 'Refclock: ' + refclock_name + yield 0, 'Reference clock: ' + refclock_name + # Check offset state = 0 - levels = "" + levels_text = "" warn, crit = params['offset'] - pos_refclock_offset = abs(float(refclock_offset)) - if pos_refclock_offset > crit: + refclock_offset = float(refclock_offset) + pos_refclock_offset = abs(refclock_offset) + if pos_refclock_offset >= crit: state = 2 - elif pos_refclock_offset > warn: + elif pos_refclock_offset >= warn: state = 1 if state != 0: - levels = " (Warn/Crit at %d/%d ms)" + levels_text = " (warn/crit at %d/%d ms)" % (warn, crit) perfdata = [('offset', refclock_offset, warn, crit )] - yield state, 'Refclock Offset: %0.4f ms%s' % (float(refclock_offset) / 1000, levels), perfdata + yield state, 'Reference clock offset: %g us%s' % (refclock_offset, levels_text), perfdata diff --git a/checks/mbg_lantime_ng_state b/checks/mbg_lantime_ng_state index d12f433..9445b5f 100644 --- a/checks/mbg_lantime_ng_state +++ b/checks/mbg_lantime_ng_state @@ -24,34 +24,29 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -factory_settings['mbg_lantime_ng_state'] = { - "stratum" : ( 2, 3 ), - "offset" : ( 500, 1000), -} - -mbg_lantime_ng_states = { - '0': (2, 'notAvailable'), - '1': (2, 'notSynchronized'), - '2': (0, 'synchronized'), -} +def check_mbg_lantime_nb_state(_no_item, params, info): + states = { + '0': (2, 'not aailable'), + '1': (2, 'not synchronized'), + '2': (0, 'synchronized'), + } + return check_mbg_lantime_state_common(states, _no_item, params, info) check_info["mbg_lantime_ng_state"] = { - 'check_function' : lambda item, params, info: \ - check_mbg_lantime_state_common(mbg_lantime_ng_states, item, params, info), + 'check_function' : check_mbg_lantime_nb_state, 'inventory_function' : inventory_mbg_lantime_state_common, 'service_description' : 'LANTIME State', 'has_perfdata' : True, - 'default_levels_variable' : "mbg_lantime_ng_state", + 'default_levels_variable' : "mbg_lantime_state_default_levels", 'group' : 'mbg_lantime_state', - 'includes' : ["mbg_lantime.include"], 'snmp_info' : ('.1.3.6.1.4.1.5597.30.0.2', [ - 1, # MBG-SNMP-LTNG-MIB::mbgLtNgNtpCurrentState + 1, # MBG-SNMP-LTNG-MIB::mbgLtNgNtpCurrentState 2, # MBG-SNMP-LTNG-MIB::mbgLtNgNtpStratum 3, # MBG-SNMP-LTNG-MIB::mbgLtNgNtpRefclockName 4, # MBG-SNMP-LTNG-MIB::mbgLtNgNtpRefclockOffset ]), - 'snmp_scan_function' : \ - lambda oid: oid(".1.3.6.1.2.1.1.2.0") == ".1.3.6.1.4.1.5597.3" and \ - oid(".1.3.6.1.4.1.5597.30.0.2.*"), + 'snmp_scan_function' : lambda oid: (oid(".1.3.6.1.2.1.1.2.0") == ".1.3.6.1.4.1.5597.3" and \ + oid(".1.3.6.1.4.1.5597.30.0.2.*")), + 'includes' : ["mbg_lantime.include"], } diff --git a/checks/mbg_lantime_state b/checks/mbg_lantime_state index 12c3468..bee78ea 100644 --- a/checks/mbg_lantime_state +++ b/checks/mbg_lantime_state @@ -24,36 +24,32 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -factory_settings['mbg_lantime_state_default_levels'] = { - "stratum" : ( 0, 0 ), - "offset" : ( 500, 1000), -} +def check_mbg_lantime_state(_no_item, params, info): + states = { + '0': (2 ,'not synchronized' ), + '1': (2 ,'no good reference clock' ), + '2': (0 ,'sync to external reference clock' ), + '3': (0 ,'sync to serial refernce clock' ), + '4': (0 ,'normal operation PPS' ), + '5': (0 ,'normal operation reference clock' ), + } + return check_mbg_lantime_state_common(states, _no_item, params, info) -mbg_lantime_states = { - '0': (2 ,'notSynchronized'), - '1': (2 ,'noGoodRefclock'), - '2': (0 ,'syncToExtRefclock'), - '3': (0 ,'syncToSerialRefclock'), - '4': (0 ,'normalOperationPPS'), - '5': (0 ,'normalOperationRefclock'), -} check_info["mbg_lantime_state"] = { - 'check_function' : lambda item, params, info: \ - check_mbg_lantime_state_common(mbg_lantime_states, item, params, info), + 'check_function' : check_mbg_lantime_state, 'inventory_function' : inventory_mbg_lantime_state_common, 'service_description' : 'LANTIME State', - 'has_perfdata': True, + 'has_perfdata' : True, 'group' : 'mbg_lantime_state', 'default_levels_variable' : "mbg_lantime_state_default_levels", - 'includes' : ["mbg_lantime.include"], - 'snmp_info': ('.1.3.6.1.4.1.5597.3.1', [ + 'snmp_info' : ('.1.3.6.1.4.1.5597.3.1', [ 2, # MBG-SNMP-MIB::mbgLtNtpCurrentStateVal 3, # MBG-SNMP-MIB::mbgLtNtpNtpStratum 5, # MBG-SNMP-MIB::mbgLtNtpActiveRefclockName 7, # MBG-SNMP-MIB::mbgLtNtpActiveRefclockOffsetVal - ]), - 'snmp_scan_function': \ - lambda oid: oid(".1.3.6.1.2.1.1.2.0") == ".1.3.6.1.4.1.5597.3" and not \ - oid(".1.3.6.1.4.1.5597.30.0.2.*"), + ]), + 'snmp_scan_function' : lambda oid: (oid(".1.3.6.1.2.1.1.2.0") == ".1.3.6.1.4.1.5597.3" and not \ + oid(".1.3.6.1.4.1.5597.30.0.2.*")), + 'includes' : ["mbg_lantime.include"], }

9 years, 4 months

Check_MK Git: check_mk: mbg_lantime_ng_state, mbg_lantime_state: Added support for new NG MIB

by Bastian Kuhn

Module: check_mk Branch: master Commit: 70c5d80e216734099c0f9e0c7bfb8be66cad6ae1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=70c5d80e216734… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Wed Feb 4 16:47:36 2015 +0100 mbg_lantime_ng_state, mbg_lantime_state: Added support for new NG MIB --- checkman/mbg_lantime_ng_state | 19 ++++++++++ checks/mbg_lantime.include | 68 +++++++++++++++++++++++++++++++++ checks/mbg_lantime_ng_state | 57 ++++++++++++++++++++++++++++ checks/mbg_lantime_state | 83 ++++++++++------------------------------- 4 files changed, 164 insertions(+), 63 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=70c5d80e21…

9 years, 4 months

← Newer
1
...
23
24
25
26
27
28
29
30
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2015