Checkmk git commits February 2015

checkmk-commits@lists.checkmk.com

8 participants
297 discussions

Check_MK Git: check_mk: #2036 docsis_channels_upstream: Add handling for codewords (WATO rule, rate computation, Perf-O-Meter)

by Mathias Kettner

Module: check_mk Branch: master Commit: fb0fff394b34187b93f88a81f37a69dc43a809eb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fb0fff394b3418… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Feb 23 15:09:03 2015 +0100 #2036 docsis_channels_upstream: Add handling for codewords (WATO rule, rate computation, Perf-O-Meter) --- .werks/2036 | 9 ++++++++ ChangeLog | 1 + checks/docsis_channels_upstream | 38 ++++++++++++++++++++++++++++++---- web/plugins/metrics/check_mk.py | 31 +++++++++++++++++++++++++++ web/plugins/perfometer/check_mk.py | 12 +++++------ web/plugins/wato/check_parameters.py | 14 +++++++++++++ 6 files changed, 95 insertions(+), 10 deletions(-) diff --git a/.werks/2036 b/.werks/2036 new file mode 100644 index 0000000..a966729 --- /dev/null +++ b/.werks/2036 @@ -0,0 +1,9 @@ +Title: docsis_channels_upstream: Add handling for codewords (WATO rule, rate computation, Perf-O-Meter) +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i1 +Date: 1424700519 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 45f91fb..5abda72 100644 --- a/ChangeLog +++ b/ChangeLog @@ -91,6 +91,7 @@ * 1889 cmciii.phase: New check to monitor input phases for Raritan PDUs * 2005 services: change service description from service_ to Service or new installations * 1862 netscaler_vserver: new check to monitor VServers on Citrix Netscaler Appliance + * 2036 docsis_channels_upstream: Add handling for codewords (WATO rule, rate computation, Perf-O-Meter) * 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/docsis_channels_upstream b/checks/docsis_channels_upstream index 6b9ce5e..5345b1c 100644 --- a/checks/docsis_channels_upstream +++ b/checks/docsis_channels_upstream @@ -25,7 +25,9 @@ # Boston, MA 02110-1301 USA. factory_settings["docsis_channels_upstream_default_levels"] = { - "signal_noise" : ( 10.0, 5.0 ), # dB + "signal_noise" : ( 10.0, 5.0 ), # dB + "corrected" : ( 5.0, 8.0 ), # Percent + "uncorrectable" : ( 1.0, 2.0 ), # Percent } def docsis_channels_upstream_convert(info): @@ -80,9 +82,6 @@ def check_docsis_channels_upstream(item, params, info): fields = [ ( "frequency", float(mhz) / 1000000, "Frequency", "%.2f", " MHz"), - ( "unerroreds", int(unerroreds), "codewords without errors", "%d", "" ), - ( "correcteds", int(correcteds), "corrected errors", "%d", "" ), - ( "uncorrectables", int(uncorrectables), "uncorrectable errors", "%d", "" ), ] if len(entry) >= 10: total, active, registered, avg_util = entry[6:10] @@ -96,6 +95,37 @@ def check_docsis_channels_upstream(item, params, info): for varname, value, title, form, unit in fields: yield 0, title + ": " + (form + "%s") % (value, unit), [ (varname, value) ] + # Handle codewords. These are counters. + now = time.time() + rates = {} + total_rate = 0.0 + for what, counter in [ + ( "unerrored", int(unerroreds), ), + ( "corrected", int(correcteds), ), + ( "uncorrectable", int(uncorrectables)), + ]: + rate = get_rate("docsis_channels_upstream.%s.%s" % (item, what), now, counter) + rates[what] = rate + total_rate += rate + + if total_rate: + for what, title in [ + ( "corrected", "corrected errors", ), + ( "uncorrectable", "uncorrectable errors", )]: + ratio = rates[what] / total_rate + perc = 100.0 * ratio + warn, crit = params[what] + infotext = "%s %s" % (get_percent_human_readable(perc), title) + levelstext = " (warn/crit at %.1f/%.1f%%)" % (warn, crit) + if perc >= crit: + state = 2 + infotext += levelstext + elif perc >= crit: + state = 1 + infotext += levelstext + else: + state = 0 + yield state, infotext, [ ("codewords_" + what, ratio, warn/100.0, crit/100.0) ] return diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index 749fe85..644a742 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -123,6 +123,13 @@ unit_info["dbm"] = { "render" : lambda v: "%s %s" % (drop_dotzero(v), _("dBm")), } +unit_info["db"] = { + "title" : _("Decibel"), + "symbol" : _("dB"), + "render" : lambda v: physical_precision(v, 3, _("dB")), +} + + #. # .--Metrics-------------------------------------------------------------. @@ -344,6 +351,24 @@ metric_info["busy_workers"] = { "color" : "#a080b0", } +metric_info["signal_noise"] = { + "title" : _("Signal/Noise Ratio"), + "unit" : "db", + "color" : "#aadd66", +} + +metric_info["codewords_corrected"] = { + "title" : _("Corrected Codewords"), + "unit" : "ratio", + "color" : "#ff8040", +} + +metric_info["codewords_uncorrectable"] = { + "title" : _("Uncorrectable Codewords"), + "unit" : "ratio", + "color" : "#ff4020", +} + #. # .--Checks--------------------------------------------------------------. @@ -480,6 +505,7 @@ check_metrics["check_mk-ups_socomec_outphase"] = {} check_metrics["check_mk-bluecoat_sensors"] = {} check_metrics["check_mk-zfs_arc_cache"] = { "hit_ratio" : { "scale" : 0.01 }} +check_metrics["check_mk-docsis_channels_upstream"] = {} #. # .--Perf-O-Meters-------------------------------------------------------. @@ -534,6 +560,11 @@ perfometer_info.append(("stacked", [ ( "logarithmic", ( "busy_workers", 10, 2))])) perfometer_info.append(("linear", ( [ "hit_ratio" ], 1.0, None))) +perfometer_info.append(("stacked", [ + ("logarithmic", ( "signal_noise", 50.0, 2.0)), + ("linear", ( [ "codewords_corrected", "codewords_uncorrectable" ], 1.0, None)), +])) +perfometer_info.append(("logarithmic", ( "signal_noise", 50.0, 2.0))) # Fallback if no codewords are available #. # .--Graphs--------------------------------------------------------------. diff --git a/web/plugins/perfometer/check_mk.py b/web/plugins/perfometer/check_mk.py index 68a1070..7df6fcf 100644 --- a/web/plugins/perfometer/check_mk.py +++ b/web/plugins/perfometer/check_mk.py @@ -1085,12 +1085,6 @@ def perfometer_dbmv(row, check_command, perf_data): perfometers["check_mk-docsis_channels_downstream"] = perfometer_dbmv perfometers["check_mk-docsis_cm_status"] = perfometer_dbmv -def perfometer_docsis_snr(row, check_command, perf_data): - dbmv = float(perf_data[0][1]) - return "%.1f dB" % dbmv, perfometer_logarithmic(dbmv, 50, 2, "#ad6") - -perfometers["check_mk-docsis_channels_upstream"] = perfometer_docsis_snr - def perfometer_veeam_client(row, check_command, perf_data): for graph in perf_data: if graph[0] == "avgspeed": @@ -1264,3 +1258,9 @@ def perfometer_check_mk_cpu_threads(row, check_command, perf_data): return "%d" % int(perf_data[0][1]), perfometer_logarithmic(perf_data[0][1], 400, 2, color) perfometers["check_mk-cpu.threads"] = perfometer_check_mk_cpu_threads + +def perfometer_docsis_snr(row, check_command, perf_data): + dbmv = float(perf_data[0][1]) + return "%.1f dB" % dbmv, perfometer_logarithmic(dbmv, 50, 2, "#ad6") + +perfometers["check_mk-docsis_channels_upstream"] = perfometer_docsis_snr diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 43118a0..dd74933 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -1573,6 +1573,20 @@ register_check_parameters( Float(title = _("Critical at or below"), unit = "dB", default_value = 5.0 ), ] )), + ( 'correcteds', Tuple( + title = _("Levels for rate of corrected errors"), + elements = [ + Percentage(title = _("Warning at"), default_value = 5.0), + Percentage(title = _("Critical at"), default_value = 8.0), + ] + )), + ( 'uncorrectables', Tuple( + title = _("Levels for rate of uncorrectable errors"), + elements = [ + Percentage(title = _("Warning at"), default_value = 1.0), + Percentage(title = _("Critical at"), default_value = 2.0), + ] + )), ] ), TextAscii(title = _("ID of the channel (usually ranging from 1)")),

9 years, 4 months

Check_MK Git: check_mk: #2015 FIX Fixed sending notifications for services with umlauts in names

by Lars Michelsen

Module: check_mk Branch: master Commit: f54de0fc71e94f214d30ba09a865074533642bef URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f54de0fc71e94f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Feb 23 14:06:36 2015 +0100 #2015 FIX Fixed sending notifications for services with umlauts in names Previous versions were unable to send notifications for services with umlauts in their service descriptions. This issue has been fixed now. If you miss notifications, take a look at the notification log at <tt>var/log/notify.log</tt> (in your OMD sites) and search for exception tracebacks. --- .werks/2015 | 14 ++++++++++++++ ChangeLog | 1 + modules/notify.py | 2 +- notifications/mail | 10 +++++----- 4 files changed, 21 insertions(+), 6 deletions(-) diff --git a/.werks/2015 b/.werks/2015 new file mode 100644 index 0000000..dbe546d --- /dev/null +++ b/.werks/2015 @@ -0,0 +1,14 @@ +Title: Fixed sending notifications for services with umlauts in names +Level: 1 +Component: notifications +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1424696700 + +Previous versions were unable to send notifications for services with +umlauts in their service descriptions. This issue has been fixed now. +If you miss notifications, take a look at the notification log at +<tt>var/log/notify.log</tt> (in your OMD sites) and search for +exception tracebacks. diff --git a/ChangeLog b/ChangeLog index 45f91fb..2c8d308 100644 --- a/ChangeLog +++ b/ChangeLog @@ -276,6 +276,7 @@ * 1205 FIX: RBN: Fixed match contactgroup condition... * 1810 FIX: Rule based notifications: Fixed output of non contact mail recipient address in analyze table... * 1988 FIX: Gracefully handle invalid empty bulk notification files from previous buggy versions + * 2015 FIX: Fixed sending notifications for services with umlauts in names... BI: * 1784 FIX: Fix exception in BI Boxes when parents are being used diff --git a/modules/notify.py b/modules/notify.py index 5ea4064..7ae330f 100644 --- a/modules/notify.py +++ b/modules/notify.py @@ -1358,7 +1358,7 @@ def call_notification_script(plugin, plugin_context): notify_log(" executing %s" % path) out = os.popen(path + " 2>&1 </dev/null") for line in out: - notify_log("Output: %s" % line.rstrip()) + notify_log("Output: %s" % line.rstrip().decode('utf-8')) exitcode = out.close() if exitcode: notify_log("Plugin exited with code %d" % (exitcode >> 8)) diff --git a/notifications/mail b/notifications/mail index 67b6d11..d4aad2e 100755 --- a/notifications/mail +++ b/notifications/mail @@ -395,15 +395,15 @@ def send_mail(m, target, from_address): def fetch_pnp_data(context, params): try: # Autodetect the path in OMD environments - path = "%s/share/pnp4nagios/htdocs/index.php" % context['OMD_ROOT'] - php_save_path = "-d session.save_path=%s/tmp/php/session" % context['OMD_ROOT'] + path = "%s/share/pnp4nagios/htdocs/index.php" % context['OMD_ROOT'].encode('utf-8') + php_save_path = "-d session.save_path=%s/tmp/php/session" % context['OMD_ROOT'].encode('utf-8') env = 'REMOTE_USER="check-mk" SKIP_AUTHORIZATION=1' except: # Non-omd environment - use plugin argument 1 path = context.get('PARAMETER_1', '') php_save_path = "" # Using default path skip_authorization = False - env = 'REMOTE_USER="%s"' % context['CONTACTNAME'] + env = 'REMOTE_USER="%s"' % context['CONTACTNAME'].encode('utf-8') if not os.path.exists(path): raise GraphException('Unable to locate pnp4nagios index.php (%s)' % path) @@ -413,7 +413,7 @@ def fetch_pnp_data(context, params): def fetch_num_sources(context): svc_desc = context['WHAT'] == 'HOST' and '_HOST_' or context['SERVICEDESC'] infos = fetch_pnp_data(context, '/json?host=%s&srv=%s&view=0' % - (context['HOSTNAME'], svc_desc)) + (context['HOSTNAME'].encode('utf-8'), svc_desc.encode('utf-8'))) if not infos.startswith('[{'): raise GraphException('Unable to fetch graph infos: %s' % extract_graph_error(infos)) @@ -422,7 +422,7 @@ def fetch_num_sources(context): def fetch_graph(context, source, view = 1): svc_desc = context['WHAT'] == 'HOST' and '_HOST_' or context['SERVICEDESC'] graph = fetch_pnp_data(context, '/image?host=%s&srv=%s&view=%d&source=%d' % - (context['HOSTNAME'], svc_desc, view, source)) + (context['HOSTNAME'], svc_desc.encode('utf-8'), view, source)) if graph[:8] != '\x89PNG\r\n\x1a\n': raise GraphException('Unable to fetch the graph: %s' % extract_graph_error(graph))

9 years, 4 months

Check_MK Git: check_mk: Currently suspend default.php, fixes PNP issues for the while

by Mathias Kettner

Module: check_mk Branch: master Commit: 0e3a67fab140bbc54976ee26ea960cd8baa84a28 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0e3a67fab140bb… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Feb 23 13:53:14 2015 +0100 Currently suspend default.php, fixes PNP issues for the while --- pnp-templates/{default.php => default.php.inactive} | 0 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/pnp-templates/default.php b/pnp-templates/default.php.inactive similarity index 100% rename from pnp-templates/default.php rename to pnp-templates/default.php.inactive

9 years, 4 months

Check_MK Git: check_mk: df_zos: added Perf-O-Meter

by Mathias Kettner

Module: check_mk Branch: master Commit: 77c5823d5bc7c1081c2a062a3bb289cde213dece URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=77c5823d5bc7c1… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Feb 23 13:39:55 2015 +0100 df_zos: added Perf-O-Meter --- web/plugins/perfometer/check_mk.py | 1 + 1 file changed, 1 insertion(+) diff --git a/web/plugins/perfometer/check_mk.py b/web/plugins/perfometer/check_mk.py index 67dd89e..68a1070 100644 --- a/web/plugins/perfometer/check_mk.py +++ b/web/plugins/perfometer/check_mk.py @@ -1241,6 +1241,7 @@ perfometers["check_mk-fast_lta_silent_cubes.capacity"] = perfometer_check_mk_df perfometers["check_mk-fast_lta_volumes"] = perfometer_check_mk_df perfometers["check_mk-libelle_business_shadow.archive_dir"] = perfometer_check_mk_df perfometers["check_mk-netapp_api_volumes"] = perfometer_check_mk_df +perfometers["check_mk-df_zos"] = perfometer_check_mk_df def perfometer_check_mk_kernel_util(row, check_command, perf_data): h = '<table><tr>'

9 years, 4 months

Check_MK Git: check_mk: Made some missing texts localizable

by Lars Michelsen

Module: check_mk Branch: master Commit: 0b200ccf6e4ed0f699c52454f03043921daafbac URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0b200ccf6e4ed0… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Feb 23 12:27:11 2015 +0100 Made some missing texts localizable Conflicts: web/htdocs/visuals.py --- web/htdocs/js/checkmk.js | 7 ++++--- web/htdocs/visuals.py | 4 ++-- web/plugins/views/painters.py | 4 ++-- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index ff8d68c..73e3216 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -575,7 +575,7 @@ function create_graph(data, params) { // Add the control for adding the graph to a dashboard var visualadd = document.createElement('a'); - visualadd.title = 'Add this view to...'; + visualadd.title = data['add_txt']; visualadd.className = 'visualadd'; visualadd.onclick = function(host, service, view, source) { return function(event) { @@ -605,14 +605,15 @@ function create_graph(data, params) { urlvars = null; } -function render_pnp_graphs(container, site, host, service, pnpview, base_url, pnp_url, with_link, from_ts, to_ts) { +function render_pnp_graphs(container, site, host, service, pnpview, base_url, pnp_url, with_link, add_txt, from_ts, to_ts) { from_ts = (typeof from_ts === 'undefined') ? null : from_ts; to_ts = (typeof to_ts === 'undefined') ? null : to_ts; var data = { 'container': container, 'base_url': base_url, 'pnp_url': pnp_url, 'site': site, 'host': host, 'service': service, - 'with_link': with_link, 'view': pnpview}; + 'with_link': with_link, 'view': pnpview, + 'add_txt': add_txt}; if (from_ts !== null && to_ts !== null) { data['start'] = from_ts; diff --git a/web/htdocs/visuals.py b/web/htdocs/visuals.py index caebd49..521e37b 100644 --- a/web/htdocs/visuals.py +++ b/web/htdocs/visuals.py @@ -1322,8 +1322,8 @@ def ajax_popup_add(): visual_module = __import__(module_name) handler = visual_module.__dict__[visual_type["popup_add_handler"]] visuals = handler() - html.write('<li><span>Add to %s:</span></li>' % visual_type["title"]) - for name, title in handler(): + html.write('<li><span>%s %s:</span></li>' % (_('Add to'), visual_type["title"])) + for name, title in sorted(handler(), key=lambda x: x[1]): html.write('<li><a href="javascript:void(0)" ' 'onclick="add_to_visual(\'%s\', \'%s\')"><img src="images/icon_%s.png"> %s</a></li>' % (visual_type_name, name, visual_type_name.rstrip('s'), title)) diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index d27ddee..6b66dde 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -801,9 +801,9 @@ def paint_pnpgraph(sitename, host, service = "_HOST_"): pnpview = pnp_timerange[1] return "pnpgraph", "<div id=\"%s\"></div>" \ - "<script>render_pnp_graphs('%s', '%s', '%s', '%s', '%s', '%s', '%s', %s, %s, %s)</script>" % \ + "<script>render_pnp_graphs('%s', '%s', '%s', '%s', '%s', '%s', '%s', %s, '%s', %s, %s)</script>" % \ (container_id, container_id, sitename, host, service, pnpview, - defaults.url_prefix + "check_mk/", pnp_url, with_link, from_ts, to_ts) + defaults.url_prefix + "check_mk/", pnp_url, with_link, _('Add this graph to...'), from_ts, to_ts) multisite_painters["svc_pnpgraph" ] = { "title" : _("PNP service graph"),

9 years, 4 months

Check_MK Git: check_mk: Updated bug entries #2294

by Goetz Golla

Module: check_mk Branch: master Commit: aff7cbdcc85ad05ab1f7f289032e3219f3dbab25 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=aff7cbdcc85ad0… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Mon Feb 23 12:23:19 2015 +0100 Updated bug entries #2294 --- .bugs/2294 | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.bugs/2294 b/.bugs/2294 new file mode 100644 index 0000000..4a5f2f7 --- /dev/null +++ b/.bugs/2294 @@ -0,0 +1,9 @@ +Title: hostname in cmk -vII often unreadable +Component: core +State: open +Date: 2015-02-23 12:20:50 +Targetversion: 1.2.6 +Class: bug + +When doing a bulk inventory on the CLI with cmk -vII the hostnames are printed +in "tty_white", which is unreadable on any terminals with a whitish background.

9 years, 4 months

Check_MK Git: check_mk: #1862 netscaler_vserver: new check to monitor VServers on Citrix Netscaler Appliance

by Goetz Golla

Module: check_mk Branch: master Commit: c4f9f6d85d5baf5235d66d5f3bd97ef9796013b4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c4f9f6d85d5baf… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Mon Feb 23 12:02:39 2015 +0100 #1862 netscaler_vserver: new check to monitor VServers on Citrix Netscaler Appliance --- .werks/1862 | 9 +++++ ChangeLog | 1 + checkman/netscaler_vserver | 18 +++++++++ checks/netscaler_vserver | 96 ++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 124 insertions(+) diff --git a/.werks/1862 b/.werks/1862 new file mode 100644 index 0000000..edd8147 --- /dev/null +++ b/.werks/1862 @@ -0,0 +1,9 @@ +Title: netscaler_vserver: new check to monitor VServers on Citrix Netscaler Appliance +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i1 +Date: 1424689326 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index aaf05ec..45f91fb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -90,6 +90,7 @@ NOTE: Please refer to the migration notes! * 1889 cmciii.phase: New check to monitor input phases for Raritan PDUs * 2005 services: change service description from service_ to Service or new installations + * 1862 netscaler_vserver: new check to monitor VServers on Citrix Netscaler Appliance * 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_vserver b/checkman/netscaler_vserver new file mode 100644 index 0000000..8fb161e --- /dev/null +++ b/checkman/netscaler_vserver @@ -0,0 +1,18 @@ +title: Citrix Netscaler VServer Status +agents: snmp +catalog: app/netscaler +license: GPL +distribution: check_mk +description: + This check monitors the status of the VServers of Citrix Netscaler + Loadbalacing Appliances. It uses snmp and the NS-ROOT-MIB to access the data. + + The check is in the state OK when the VServer is in the state {UP}. It is in the + state CRIT when the VServer is in the state {DOWN}. It is in the state WARN in + all other cases. + +inventory: + One service per VServer will be created. + +item: + The name of the VServer. diff --git a/checks/netscaler_vserver b/checks/netscaler_vserver new file mode 100644 index 0000000..72e12b9 --- /dev/null +++ b/checks/netscaler_vserver @@ -0,0 +1,96 @@ +#!/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. +# + +netscaler_vserver_states = { + 0: ("unknown", 1), + 1: ("down", 2), + 2: ("unknown", 1), + 3: ("busy", 1), + 4: ("out of service", 1), + 5: ("transition to out of service", 1), + 7: ("up", 0), +} + +netscaler_vserver_types = ( + "http", + "ftp", + "tcp", + "udp", + "sslBridge", + "monitor", + "monitorUdp", + "nntp", + "httpserver", + "httpclient", + "rpcserver", + "rpcclient", + "nat", + "any", + "ssl", + "dns", + "adns", + "snmp", + "ha", + "monitorPing", + "sslOtherTcp", + "aaa", + "secureMonitor", + "sslvpnUdp", + "rip", + "dnsClient", + "rpcServer", + "rpcClient", + "serviceUnknown", +) + +def inventory_netscaler_vserver(info): + for line in info: + if line[0]: + yield line[0], None + +def check_netscaler_vserver(item, _no_params, info): + for line in info: + if line[0] == item: + name, ip, port, srv_type, srv_state = line + infotext = "State: %s, Type: %s, Socket:%s:%s" % \ + (netscaler_vserver_states[int(srv_state)][0], netscaler_vserver_types[int(srv_type)], ip, port) + state = netscaler_vserver_states[int(srv_state)][1] + return state, infotext + +check_info["netscaler_vserver"] = { + "check_function" : check_netscaler_vserver, + "inventory_function" : inventory_netscaler_vserver, + "service_description" : "VServer %s", + "snmp_info" : (".1.3.6.1.4.1.5951.4.1.3.1.1", [ # nsVserverGroup.vserverTable.vserverEntry + 1, # vsvrName + 2, # vsvrIpAddress + 3, # vsvrPort + 4, # vsvrType + 5, # vsvrState + ]), + "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.5951.1"), +}

9 years, 4 months

Check_MK Git: check_mk: Disabled baking of agents during restart by default; added support for manual baking

by Lars Michelsen

Module: check_mk Branch: master Commit: a134f14f6ea957d001ac554fc4b4e52a6270110d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a134f14f6ea957… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Feb 23 11:46:04 2015 +0100 Disabled baking of agents during restart by default; added support for manual baking --- modules/automation.py | 5 +++++ modules/config.py | 2 +- web/htdocs/wato.py | 11 +++++++++++ 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/modules/automation.py b/modules/automation.py index 3a05ebd..95491e8 100644 --- a/modules/automation.py +++ b/modules/automation.py @@ -46,6 +46,8 @@ def do_automation(cmd, args): elif cmd == "update-dns-cache": read_config_files(with_autochecks=False) result = automation_update_dns_cache() + elif cmd == "bake-agents": + result = automation_bake_agents() else: read_config_files() if cmd == "try-inventory": @@ -1124,3 +1126,6 @@ def execute_check_plugin(commandline): def automation_update_dns_cache(): return do_update_dns_cache() +def automation_bake_agents(): + if "do_bake_agents" in globals(): + return do_bake_agents() diff --git a/modules/config.py b/modules/config.py index cd5e20a..9718c9f 100644 --- a/modules/config.py +++ b/modules/config.py @@ -167,4 +167,4 @@ use_new_descriptions_for = [] # Rulesets for agent bakery agent_config = {} -bake_agents_on_restart = True +bake_agents_on_restart = False diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 4cbfe4b..19e50b2 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -5043,6 +5043,10 @@ def log_pending(status, linkinfo, what, message, user_id = None): log_audit(linkinfo, what, message, user_id) need_sidebar_reload() + # On each change to the Check_MK configuration mark the agents to be rebuild + if 'need_to_bake_agents' in globals(): + need_to_bake_agents() + if not is_distributed(): if status != SYNC: log_entry(linkinfo, what, message, "pending.log", user_id) @@ -16102,6 +16106,13 @@ def create_sample_config(): # Global settings use_new_descriptions_for = [ "df", "ps" ] + # Initial baking of agents (when bakery is available) + if 'bake_agents' in globals(): + try: + bake_agents() + except: + pass # silently ignore building errors here + #. # .--Pattern Editor------------------------------------------------------. # | ____ _ _ _____ _ _ _ |

9 years, 4 months

Check_MK Git: check_mk: wmic_if.ps1: fixed broken encoding of wmic_if.ps1

by Andreas Boesl

Module: check_mk Branch: master Commit: 68652144e10f01505f41797f984d132de276f6ba URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=68652144e10f01… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Feb 23 11:37:34 2015 +0100 wmic_if.ps1: fixed broken encoding of wmic_if.ps1 --- agents/windows/plugins/wmic_if.ps1 | Bin 3635 -> 3634 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/agents/windows/plugins/wmic_if.ps1 b/agents/windows/plugins/wmic_if.ps1 index 49eb75b..9748b5a 100644 Binary files a/agents/windows/plugins/wmic_if.ps1 and b/agents/windows/plugins/wmic_if.ps1 differ

9 years, 4 months

Check_MK Git: check_mk: Fixed some english Texts

by Mathias Kettner

Module: check_mk Branch: master Commit: 7a9226a54765473ad32bf2fbea687b36b44c6c60 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7a9226a5476547… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Feb 23 10:49:56 2015 +0100 Fixed some english Texts --- web/htdocs/wato.py | 10 +++++----- web/plugins/wato/active_checks.py | 8 ++++---- web/plugins/wato/check_mk_configuration.py | 2 +- web/plugins/wato/check_parameters.py | 8 ++++---- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 4cbfe4b..bcb7056 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -3181,7 +3181,7 @@ def show_service_table(host, firsttime): except Exception, e: if config.debug: raise - html.show_error(_("Inventory failed for this host: %s") % e) + html.show_error(_("Service discovery failed for this host: %s") % e) return checktable.sort() @@ -3676,7 +3676,7 @@ def mode_bulk_import(phase): html.text_area('_hosts', cols = 70, rows = 10) forms.section(_('Options')) - html.checkbox('_do_service_detection', False, label = _('Perform automatic service detection')) + html.checkbox('_do_service_detection', False, label = _('Perform automatic service discovery')) forms.end() html.button('_import', _('Import')) @@ -3881,7 +3881,7 @@ def mode_bulk_inventory(phase): html.write(_("You have selected <b>%d</b> hosts for bulk discovery. ") % len(hostnames)) html.write(_("Check_MK service discovery will automatically find and configure " "services to be checked on your hosts.")) - forms.header(_("Bulk discovery")) + forms.header(_("Bulk Discovery")) forms.section(_("Mode")) html.radiobutton("how", "new", True, _("Find only new services") + "<br>") html.radiobutton("how", "remove", False, _("Remove obsolete services") + "<br>") @@ -11626,8 +11626,8 @@ def load_notification_table(): ( "only_hosts", ListOfStrings( title = _("Limit to the following hosts"), - help = _("Configure the hosts for this notification. Without prefix, only exact, case sensitive matches," - "! for negation and ~ for regex matches " ), + help = _("Configure the hosts for this notification. Without prefix, only exact, case sensitive matches, " + "<tt>!</tt> for negation and <tt>~</tt> for regex matches."), orientation = "horizontal", valuespec = RegExp(size = 20), ), diff --git a/web/plugins/wato/active_checks.py b/web/plugins/wato/active_checks.py index dc126e6..1f64d93 100644 --- a/web/plugins/wato/active_checks.py +++ b/web/plugins/wato/active_checks.py @@ -194,12 +194,12 @@ register_rule(group, ), ("remote_version", TextAscii( - title = _("Remote Version"), + title = _("Version of Server"), help = _("Warn if string doesn't match expected server version (ex: OpenSSH_3.9p1)"), )), ("remote_protocol", TextAscii( - title = _("Remote Protocol"), + title = _("Protocol of Server"), help = _("Warn if protocol doesn't match expected protocol version (ex: 2.0)"), )), ] @@ -1420,8 +1420,8 @@ register_rule(group, default_value = 'cookie', choices = [ ('cookie', _('Form (Cookie) based')), - ('basic', _('HTTP basic')), - ('digest', _('HTTP digest')), + ('basic', _('HTTP Basic')), + ('digest', _('HTTP Digest')), ], )), ("timeout", Integer( diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index af5220a..63210bb 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -1312,7 +1312,7 @@ register_configvar(group, register_configvar(group, "inventory_check_autotrigger", Checkbox( - title = _("Service Discovery triggers service discovery check"), + title = _("Service discovery triggers service discovery check"), label = _("Automatically schedule service discovery check after service configuration changes"), help = _("When this option is enabled then after each change of the service " "configuration of a host via WATO - may it be via manual changes or a bulk " diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 7da255c..43118a0 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -300,7 +300,7 @@ register_rule(group + '/' + subgroup_inventory, register_rule(group + '/' + subgroup_inventory, varname = "brocade_fcport_inventory", - title = _("Brocade Port Inventory"), + title = _("Brocade Port Discovery"), valuespec = Dictionary( elements = [ ("use_portname", Checkbox( @@ -3091,7 +3091,7 @@ register_check_parameters( ), ( "guestToolsNotInstalled", MonitoringState( - title = _("VMware Tools has never been installed"), + title = _("VMware Tools have never been installed"), default_value = 2, ) ), @@ -3839,7 +3839,7 @@ register_check_parameters( TextAscii( title = _("Scheduler Job Name"), help = _("Here you can set explicit Scheduler-Jobs by defining them via SID, Job-Owner " - "and Job-Name, separated by a dot, for example <b>TUX12C.SYS.PURGE_LOG</b>"), + "and Job-Name, separated by a dot, for example <tt>TUX12C.SYS.PURGE_LOG</tt>"), regex = '.+\..+', allow_empty = False), None @@ -5128,7 +5128,7 @@ register_check_parameters( register_check_parameters( subgroup_storage, "drbd", - _("DRBD roles and diskstates"), + _("DR:BD roles and diskstates"), Dictionary( elements = [ ( "roles",

9 years, 4 months

← Newer
1
...
6
7
8
9
10
11
12
...
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