Checkmk git commits February 2016

checkmk-commits@lists.checkmk.com

7 participants
402 discussions

by Simon Betz

Module: check_mk Branch: master Commit: ac3467f69602fd63425b7a6061cc5d249d51d7b0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ac3467f69602fd… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Feb 16 11:40:18 2016 +0100 renamed variable --- checks/varnish | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/checks/varnish b/checks/varnish index ea0c24f..e97ff75 100644 --- a/checks/varnish +++ b/checks/varnish @@ -623,22 +623,22 @@ factory_settings["varnish_worker_thread_ratio_default_levels"] = { def check_varnish_worker_thread_ratio(_no_item, params, parsed): if "n" in parsed: state = 0 - rate = 0.0 + ratio = 0.0 if parsed["n"]["wrk_create"][0] > 0: - rate = parsed["n"]["wrk"][0] / parsed["n"]["wrk_create"][0] * 100 + ratio = parsed["n"]["wrk"][0] / parsed["n"]["wrk_create"][0] * 100 - infotext = "%.1f%%" % rate + infotext = "%.1f%%" % ratio warn, crit = params["levels_lower"] - if rate < crit: + if ratio < crit: state = 2 - elif rate < warn: + elif ratio < warn: state = 1 if state > 0: infotext += " (warn/crit below %.1f%%/%.1f%%)" % (warn, crit) - return state, infotext, [("varnish_worker_thread_ratio", rate, warn, crit)] + return state, infotext, [("varnish_worker_thread_ratio", ratio, warn, crit)] check_info["varnish.worker_thread_ratio"] = {

8 years, 4 months

Updated bug entries #2329

by Mathias Kettner

Module: check_mk Branch: master Commit: 59854c30ffebd3b4fb02846a238f2ead7f7e22dd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=59854c30ffebd3… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Feb 16 11:38:06 2016 +0100 Updated bug entries #2329 --- .bugs/2329 | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.bugs/2329 b/.bugs/2329 index 786a3b4..e8e89f7 100644 --- a/.bugs/2329 +++ b/.bugs/2329 @@ -1,11 +1,13 @@ Title: check_mk-esx_vsphere_datastores usage can not be graphed with new graphing Component: checks -State: open +Class: bug +State: done Date: 2016-02-11 11:40:03 Targetversion: 1.2.8 -Class: bug When using the stored agent output "esx-6.0-1" the filesystem Filesystem EQLSAS-DS-SQL3 can not be render the graph for the usage of the datastore. Seems the translation is not working. The name of the perf variable is only "EQLSAS-DS-SQL3" which is really bad. + +2016-02-16 11:38:04: changed state open -> done

8 years, 4 months

#3176 FIX Fix invalid scaling of some obscure metrics by factor 100

by Mathias Kettner

Module: check_mk Branch: master Commit: 065e8ce14dbe39ce8226e33f2a06596fb15f6957 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=065e8ce14dbe39… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Feb 16 11:16:55 2016 +0100 #3176 FIX Fix invalid scaling of some obscure metrics by factor 100 This has been done by dropping the <tt>render_scale</tt> argument of metric units. The affected checks have been declared to scale by 100 explicitely now. --- .werks/3176 | 12 +++++++++ ChangeLog | 1 + web/htdocs/metrics.py | 5 ++-- web/plugins/metrics/check_mk.py | 51 +++++++++++++++++++++++---------------- 4 files changed, 45 insertions(+), 24 deletions(-) diff --git a/.werks/3176 b/.werks/3176 new file mode 100644 index 0000000..690388a --- /dev/null +++ b/.werks/3176 @@ -0,0 +1,12 @@ +Title: Fix invalid scaling of some obscure metrics by factor 100 +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1455617759 + +This has been done by dropping the <tt>render_scale</tt> argument of +metric units. The affected checks have been declared to scale by 100 +explicitely now. diff --git a/ChangeLog b/ChangeLog index 6829cfb..891c6d3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -18,6 +18,7 @@ * 3213 FIX: ibm_svc_disks netapp_api_disk: Fixed exception when disks are failed * 3185 FIX: ucd_cpu_load: this service will be discovered although we prefer HOST-RESOURCES MIB NOTE: Please refer to the migration notes! + * 3176 FIX: Fix invalid scaling of some obscure metrics by factor 100... Multisite: * 3059 FIX: Fixed highlighting of availability timeline time slices diff --git a/web/htdocs/metrics.py b/web/htdocs/metrics.py index 62c9df8..10f45dd 100644 --- a/web/htdocs/metrics.py +++ b/web/htdocs/metrics.py @@ -1080,11 +1080,10 @@ def render_graph_pnp(graph_template, translated_metrics): rrd = "$RRDBASE$_" + metrics["orig_name"] + ".rrd" scale = metrics["scale"] unit = metrics["unit"] - render_scale = unit.get("render_scale", 1) - if scale != 1.0 or render_scale != 1.0: + if scale != 1.0: rrdgraph_commands += "DEF:%s_UNSCALED=%s:1:MAX " % (var_name, rrd) - rrdgraph_commands += "CDEF:%s=%s_UNSCALED,%f,* " % (var_name, var_name, scale * render_scale) + rrdgraph_commands += "CDEF:%s=%s_UNSCALED,%f,* " % (var_name, var_name, scale) else: rrdgraph_commands += "DEF:%s=%s:1:MAX " % (var_name, rrd) diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index 6711209..620aa07 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -27,7 +27,7 @@ # TODO Graphingsystem: # - Default-Template: Wenn im Graph kein "range" angegeben ist, aber # in der Unit eine "range"-Angabe ist, dann soll diese genommen werden. -# "%" und "ratio". Und dann sämtliche Schablonen, die nur wegen Range +# Und dann sämtliche Schablonen, die nur wegen Range # 0..100 da sind, wieder durch generic ersetzen. # Metric definitions for Check_MK's checks @@ -67,14 +67,6 @@ unit_info["%"] = { "render" : lambda v: percent_human_redable(v, 3), } -# Similar as %, but value ranges from 0.0 ... 1.0 -unit_info["ratio"] = { - "title" : _("%"), - "description" : _("Percentage given in range (0...1)"), - "symbol" : _("%"), - "render_scale" : 100.0, # Scale by this before rendering if "render" not being used - "render" : lambda v: percent_human_redable(v, 3), -} unit_info["s"] = { "title" : _("sec"), @@ -1418,7 +1410,7 @@ metric_info["disk_queue_length"] = { metric_info["disk_utilization"] = { "title" : _("Disk utilization"), - "unit" : "ratio", + "unit" : "%", "color" : "#a05830", } @@ -3210,6 +3202,19 @@ check_metrics["check_mk-emc_isilon_quota"] = df_translation check_metrics["check_mk-emc_isilon_ifs"] = df_translation check_metrics["check_mk-mongodb_collections"] = df_translation +disk_utilization_translation = { "disk_utilization" : { "scale" : 100.0 } } + +check_metrics["check_mk-diskstat"] = disk_utilization_translation +check_metrics["check_mk-emc_vplex_director_stats"] = disk_utilization_translation +check_metrics["check_mk-emc_vplex_volumes"] = disk_utilization_translation +check_metrics["check_mk-esx_vsphere_counters.diskio"] = disk_utilization_translation +check_metrics["check_mk-hp_msa_controller.io"] = disk_utilization_translation +check_metrics["check_mk-hp_msa_disk.io"] = disk_utilization_translation +check_metrics["check_mk-hp_msa_volume.io"] = disk_utilization_translation +check_metrics["check_mk-winperf_phydisk"] = disk_utilization_translation +check_metrics["check_mk-arbor_peakflow_sp.disk_usage"] = disk_utilization_translation +check_metrics["check_mk-arbor_peakflow_tms.disk_usage"] = disk_utilization_translation +check_metrics["check_mk-arbor_pravail.disk_usage"] = disk_utilization_translation # in=0;;;0; inucast=0;;;; innucast=0;;;; indisc=0;;;; inerr=0;0.01;0.1;; out=0;;;0; outucast=0;;;; outnucast=0;;;; outdisc=0;;;; outerr=0;0.01;0.1;; outqlen=0;;;0; if_translation = { @@ -3293,10 +3298,11 @@ check_metrics["check_mk-mysql.innodb_io"] = { } check_metrics["check_mk-esx_vsphere_counters.diskio"] = { - "read" : { "name" : "disk_read_throughput" }, - "write" : { "name" : "disk_write_throughput" }, - "ios" : { "name" : "disk_ios" }, - "latency" : { "name" : "disk_latency" }, + "read" : { "name" : "disk_read_throughput" }, + "write" : { "name" : "disk_write_throughput" }, + "ios" : { "name" : "disk_ios" }, + "latency" : { "name" : "disk_latency" }, + "disk_utilization" : { "scale" : 100.0 }, } check_metrics["check_mk-emcvnx_disks"] = { @@ -3306,7 +3312,8 @@ check_metrics["check_mk-emcvnx_disks"] = { check_metrics["check_mk-diskstat"] = { "read" : { "name" : "disk_read_throughput" }, - "write": { "name" : "disk_write_throughput" } + "write": { "name" : "disk_write_throughput" }, + "disk_utilization" : { "scale" : 100.0 }, } check_metrics["check_mk-ibm_svc_systemstats.iops"] = { @@ -3524,11 +3531,13 @@ check_metrics["check_mk-raritan_pdu_outletcount"] = { } check_metrics["check_mk-docsis_channels_upstream"] = { - "total" : { "name" : "total_modems" }, - "active" : { "name" : "active_modems" }, - "registered" : { "name" : "registered_modems" }, - "util" : { "name" : "channel_utilization" }, - "frequency" : { "scale" : 1000000.0 }, + "total" : { "name" : "total_modems" }, + "active" : { "name" : "active_modems" }, + "registered" : { "name" : "registered_modems" }, + "util" : { "name" : "channel_utilization" }, + "frequency" : { "scale" : 1000000.0 }, + "codewords_corrected" : { "scale" : 100.0 }, + "codewords_uncorrectable" : { "scale" : 100.0 }, } check_metrics["check_mk-docsis_channels_downstream"] = { @@ -4131,7 +4140,7 @@ perfometer_info.append({ }) # TODO total = None? -perfometer_info.append(("linear", ( [ "mem_used", "swap_used", "caches", "mem_free", "swap_free" ], None, ("mem_total,mem_used,+,swap_used,/", "ratio")))) +perfometer_info.append(("linear", ( [ "mem_used", "swap_used", "caches", "mem_free", "swap_free" ], None, ("mem_total,mem_used,+,swap_used,/,100,*", "%")))) perfometer_info.append({ "type" : "linear",

8 years, 4 months

#3185 FIX ucd_cpu_load: this service will be discovered although we prefer HOST-RESOURCES MIB

by Simon Betz

Module: check_mk Branch: master Commit: 60ca3fdb9c287ebef205747c79bd6d20bdd6cdca URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=60ca3fdb9c287e… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Feb 16 10:47:20 2016 +0100 #3185 FIX ucd_cpu_load: this service will be discovered although we prefer HOST-RESOURCES MIB --- .werks/3185 | 9 +++++++++ ChangeLog | 2 ++ checks/hr_cpu | 8 ++++++++ checks/hr_fs | 13 +++++++++++++ checks/ucd.include | 28 +++++++++++++++++----------- checks/ucd_cpu_load | 2 ++ checks/ucd_cpu_util | 2 +- checks/ucd_disk | 2 +- checks/ucd_mem | 2 +- checks/ucd_processes | 2 +- 10 files changed, 55 insertions(+), 15 deletions(-) diff --git a/.werks/3185 b/.werks/3185 new file mode 100644 index 0000000..41ce879 --- /dev/null +++ b/.werks/3185 @@ -0,0 +1,9 @@ +Title: ucd_cpu_load: this service will be discovered although we prefer HOST-RESOURCES MIB +Level: 1 +Component: checks +Compatible: incomp +Version: 1.2.9i1 +Date: 1455615905 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index affb459..6829cfb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -16,6 +16,8 @@ * 3211 FIX: logwatch: Fixed broken error messages in case of failed filesystem operations * 3212 FIX: cmciii.phase: Fixed totally broken check * 3213 FIX: ibm_svc_disks netapp_api_disk: Fixed exception when disks are failed + * 3185 FIX: ucd_cpu_load: this service will be discovered although we prefer HOST-RESOURCES MIB + NOTE: Please refer to the migration notes! Multisite: * 3059 FIX: Fixed highlighting of availability timeline time slices diff --git a/checks/hr_cpu b/checks/hr_cpu index b1d8a4c..3f3e7b8 100644 --- a/checks/hr_cpu +++ b/checks/hr_cpu @@ -24,11 +24,19 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. + +# .1.3.6.1.2.1.25.3.3.1.2.768 1 --> HOST-RESOURCES-MIB::hrProcessorLoad.768 +# .1.3.6.1.2.1.25.3.3.1.2.769 1 --> HOST-RESOURCES-MIB::hrProcessorLoad.769 + + hr_cpu_default_levels = (80.0, 90.0) + + def inventory_hr_cpu(info): if len(info) >= 1: return [(None, "hr_cpu_default_levels")] + def check_hr_cpu(_no_item, params, info): num_cpus = 0 util = 0 diff --git a/checks/hr_fs b/checks/hr_fs index 8c9a591..6af8c21 100644 --- a/checks/hr_fs +++ b/checks/hr_fs @@ -24,6 +24,19 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. + +# .1.3.6.1.2.1.25.2.3.1.2.1 .1.3.6.1.2.1.25.2.1.2 --> HOST-RESOURCES-MIB::hrStorageType.1 +# .1.3.6.1.2.1.25.2.3.1.2.3 .1.3.6.1.2.1.25.2.1.3 --> HOST-RESOURCES-MIB::hrStorageType.3 +# .1.3.6.1.2.1.25.2.3.1.3.1 Physical memory --> HOST-RESOURCES-MIB::hrStorageDescr.1 +# .1.3.6.1.2.1.25.2.3.1.3.3 Virtual memory --> HOST-RESOURCES-MIB::hrStorageDescr.3 +# .1.3.6.1.2.1.25.2.3.1.4.1 1024 --> HOST-RESOURCES-MIB::hrStorageAllocationUnits.1 +# .1.3.6.1.2.1.25.2.3.1.4.3 1024 --> HOST-RESOURCES-MIB::hrStorageAllocationUnits.3 +# .1.3.6.1.2.1.25.2.3.1.5.1 8122520 --> HOST-RESOURCES-MIB::hrStorageSize.1 +# .1.3.6.1.2.1.25.2.3.1.5.3 21230740 --> HOST-RESOURCES-MIB::hrStorageSize.3 +# .1.3.6.1.2.1.25.2.3.1.6.1 7749124 --> HOST-RESOURCES-MIB::hrStorageUsed.1 +# .1.3.6.1.2.1.25.2.3.1.6.3 7749124 --> HOST-RESOURCES-MIB::hrStorageUsed.3 + + # Juniper devices put information about the device into the # field where we expect the mount point. Ugly. Remove that crap. def fix_hr_fs_mountpoint(mp): diff --git a/checks/ucd.include b/checks/ucd.include index 82d2fe6..e337cd0 100644 --- a/checks/ucd.include +++ b/checks/ucd.include @@ -32,14 +32,20 @@ def ucd_scan_function(oid): - return (("linux" in oid(".1.3.6.1.2.1.1.1.0").lower() or \ - "CMC-TC" in oid(".1.3.6.1.2.1.1.1.0") or \ - "HP Onboard Administrator" in oid(".1.3.6.1.2.1.1.1.0") or \ - # for barracuda spam firewall appliance - "barracuda" in oid(".1.3.6.1.2.1.1.1.0").lower() or \ - # for artec email archiv appliance - ( oid('.1.3.6.1.2.1.1.2.0') == '.1.3.6.1.4.1.8072.3.2.10' and \ - "version" in oid('.1.3.6.1.2.1.1.1.0').lower() and \ - "serial" in oid('.1.3.6.1.2.1.1.1.0').lower() )) and \ - # we prefer HOST-RESOURCES-MIB implementation - not oid(".1.3.6.1.2.1.25.1.1.0")) + return ("linux" in oid(".1.3.6.1.2.1.1.1.0").lower() or \ + "CMC-TC" in oid(".1.3.6.1.2.1.1.1.0") or \ + "HP Onboard Administrator" in oid(".1.3.6.1.2.1.1.1.0") or \ + # for barracuda spam firewall appliance + "barracuda" in oid(".1.3.6.1.2.1.1.1.0").lower() or \ + # for artec email archiv appliance + ( oid('.1.3.6.1.2.1.1.2.0') == '.1.3.6.1.4.1.8072.3.2.10' and \ + "version" in oid('.1.3.6.1.2.1.1.1.0').lower() and \ + "serial" in oid('.1.3.6.1.2.1.1.1.0').lower() )) + + +def prefer_hr_scan_function(oid): + # We prefer HOST-RESOURCES-MIB implementation but not in case + # of check 'ucd_cpu_load' because the HR-MIB has not data + # about cpu load + return ucd_scan_function(oid) and \ + not oid(".1.3.6.1.2.1.25.1.1.0") diff --git a/checks/ucd_cpu_load b/checks/ucd_cpu_load index a8c72d0..04bfae0 100644 --- a/checks/ucd_cpu_load +++ b/checks/ucd_cpu_load @@ -44,6 +44,8 @@ check_info["ucd_cpu_load"] = { 'service_description': 'CPU load', 'has_perfdata': True, 'snmp_info': ('.1.3.6.1.4.1.2021.10.1', [6]), + # 'CPU load' is not available in the HR-MIB + # thus we cannot use 'prefer_hr_scan_function' 'snmp_scan_function': ucd_scan_function, 'group': 'cpu_load', "includes": ["cpu_load.include", "ucd.include"], diff --git a/checks/ucd_cpu_util b/checks/ucd_cpu_util index 72287d2..bd17d85 100644 --- a/checks/ucd_cpu_util +++ b/checks/ucd_cpu_util @@ -88,7 +88,7 @@ check_info["ucd_cpu_util"] = { 'service_description': 'CPU utilization', 'has_perfdata': True, 'snmp_info': ('.1.3.6.1.4.1.2021.11', [50, 51, 52, 53, 54, 55, 56]), - 'snmp_scan_function': ucd_scan_function, + 'snmp_scan_function': prefer_hr_scan_function, 'includes': [ "ucd.include" ], 'group': 'cpu_iowait', } diff --git a/checks/ucd_disk b/checks/ucd_disk index c101254..b97ed6d 100644 --- a/checks/ucd_disk +++ b/checks/ucd_disk @@ -51,7 +51,7 @@ check_info['ucd_disk'] = { "6", # dskTotal -> in kBytes "7", # dskAvail -> in kBytes ]), - 'snmp_scan_function' : ucd_scan_function, + 'snmp_scan_function' : prefer_hr_scan_function, "group" : "filesystem", 'default_levels_variable' : "filesystem_default_levels", 'includes' : [ "ucd.include", "df.include" ], diff --git a/checks/ucd_mem b/checks/ucd_mem index 24bb8b7..54d9f94 100644 --- a/checks/ucd_mem +++ b/checks/ucd_mem @@ -58,7 +58,7 @@ check_info['ucd_mem'] = { "5", # memTotal -> kB "6", # memAvailable -> kB ]), - 'snmp_scan_function' : ucd_scan_function, + 'snmp_scan_function' : prefer_hr_scan_function, 'default_levels_variable' : 'ucd_mem_default_levels', 'group' : 'memory_simple', 'includes' : [ "ucd.include", "memory.include" ], diff --git a/checks/ucd_processes b/checks/ucd_processes index f70996e..63ca9e8 100644 --- a/checks/ucd_processes +++ b/checks/ucd_processes @@ -83,6 +83,6 @@ check_info['ucd_processes'] = { "100", # prErrFlag "101", # prErrMessage ]), - 'snmp_scan_function' : ucd_scan_function, + 'snmp_scan_function' : prefer_hr_scan_function, 'includes' : [ "ucd.include" ], }

8 years, 4 months

#3213 FIX ibm_svc_disks netapp_api_disk: Fixed exception when disks are failed

by Lars Michelsen

Module: check_mk Branch: master Commit: f132364582378ff4fd4d51a6caf9bacfd040d6d2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f132364582378f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 16 10:29:43 2016 +0100 #3213 FIX ibm_svc_disks netapp_api_disk: Fixed exception when disks are failed --- .werks/3213 | 10 ++++++++++ ChangeLog | 1 + checks/filerdisks.include | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/3213 b/.werks/3213 new file mode 100644 index 0000000..32245d1 --- /dev/null +++ b/.werks/3213 @@ -0,0 +1,10 @@ +Title: ibm_svc_disks netapp_api_disk: Fixed exception when disks are failed +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1455614967 + + diff --git a/ChangeLog b/ChangeLog index e380226..affb459 100644 --- a/ChangeLog +++ b/ChangeLog @@ -15,6 +15,7 @@ * 3210 FIX: oracle_asm_diskgroup: Fixed exception when using required mirror free space parameter * 3211 FIX: logwatch: Fixed broken error messages in case of failed filesystem operations * 3212 FIX: cmciii.phase: Fixed totally broken check + * 3213 FIX: ibm_svc_disks netapp_api_disk: Fixed exception when disks are failed Multisite: * 3059 FIX: Fixed highlighting of availability timeline time slices diff --git a/checks/filerdisks.include b/checks/filerdisks.include index 32e77c4..766678e 100644 --- a/checks/filerdisks.include +++ b/checks/filerdisks.include @@ -75,7 +75,7 @@ def check_filer_disks(disks, params): if len(total_disks) > 0: info_text = "%s disks" % len(total_disks) if len(prefailed_disks) > 0: - info_text += " (%d prefailed)" % (prefailed) + info_text += " (%d prefailed)" % (prefailed_disks) yield 0, info_text info_texts = [] for disk in prefailed_disks:

8 years, 4 months

added missing catalog

by Simon Betz

Module: check_mk Branch: master Commit: 97a22eb2687a94137ffca9f3e60e580f5a2a18a8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=97a22eb2687a94… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Feb 16 09:47:18 2016 +0100 added missing catalog --- checkman/varnish | 1 + checkman/varnish.backend | 1 + checkman/varnish.backend_success_ratio | 1 + checkman/varnish.cache | 1 + checkman/varnish.cache_hit_ratio | 1 + checkman/varnish.client | 1 + checkman/varnish.esi | 1 + checkman/varnish.fetch | 1 + checkman/varnish.objects | 1 + checkman/varnish.worker | 1 + checkman/varnish.worker_thread_ratio | 1 + 11 files changed, 11 insertions(+) diff --git a/checkman/varnish b/checkman/varnish index f9f94b9..73be2c2 100644 --- a/checkman/varnish +++ b/checkman/varnish @@ -1,5 +1,6 @@ title: HTTP Accelerator Statistics via Varnishstat on Linux: Uptime agents: linux +catalog: os/networking license: GPL distribution: check_mk description: diff --git a/checkman/varnish.backend b/checkman/varnish.backend index e0b7f5d..58d1053 100644 --- a/checkman/varnish.backend +++ b/checkman/varnish.backend @@ -1,5 +1,6 @@ title: HTTP Accelerator Statistics via Varnishstat on Linux: Backend agents: linux +catalog: os/networking license: GPL distribution: check_mk description: diff --git a/checkman/varnish.backend_success_ratio b/checkman/varnish.backend_success_ratio index 7134633..5d535e8 100644 --- a/checkman/varnish.backend_success_ratio +++ b/checkman/varnish.backend_success_ratio @@ -1,5 +1,6 @@ title: HTTP Accelerator Statistics via Varnishstat on Linux: Backend Success Ratio agents: linux +catalog: os/networking license: GPL distribution: check_mk description: diff --git a/checkman/varnish.cache b/checkman/varnish.cache index 446852f..7f405de 100644 --- a/checkman/varnish.cache +++ b/checkman/varnish.cache @@ -1,5 +1,6 @@ title: HTTP Accelerator Statistics via Varnishstat on Linux: Cache agents: linux +catalog: os/networking license: GPL distribution: check_mk description: diff --git a/checkman/varnish.cache_hit_ratio b/checkman/varnish.cache_hit_ratio index 79f749a..4726c17 100644 --- a/checkman/varnish.cache_hit_ratio +++ b/checkman/varnish.cache_hit_ratio @@ -1,5 +1,6 @@ title: HTTP Accelerator Statistics via Varnishstat on Linux: Cache Hit Ratio agents: linux +catalog: os/networking license: GPL distribution: check_mk description: diff --git a/checkman/varnish.client b/checkman/varnish.client index c88b8cd..90b2c4b 100644 --- a/checkman/varnish.client +++ b/checkman/varnish.client @@ -1,5 +1,6 @@ title: HTTP Accelerator Statistics via Varnishstat on Linux: Client agents: linux +catalog: os/networking license: GPL distribution: check_mk description: diff --git a/checkman/varnish.esi b/checkman/varnish.esi index 6fd9f4b..3762632 100644 --- a/checkman/varnish.esi +++ b/checkman/varnish.esi @@ -1,5 +1,6 @@ title: HTTP Accelerator Statistics via Varnishstat on Linux: ESI agents: linux +catalog: os/networking license: GPL distribution: check_mk description: diff --git a/checkman/varnish.fetch b/checkman/varnish.fetch index 0df06ae..e1a3a9d 100644 --- a/checkman/varnish.fetch +++ b/checkman/varnish.fetch @@ -1,5 +1,6 @@ title: HTTP Accelerator Statistics via Varnishstat on Linux: Fetch agents: linux +catalog: os/networking license: GPL distribution: check_mk description: diff --git a/checkman/varnish.objects b/checkman/varnish.objects index 03cd341..4a94457 100644 --- a/checkman/varnish.objects +++ b/checkman/varnish.objects @@ -1,5 +1,6 @@ title: HTTP Accelerator Statistics via Varnishstat on Linux: Objects agents: linux +catalog: os/networking license: GPL distribution: check_mk description: diff --git a/checkman/varnish.worker b/checkman/varnish.worker index d029157..16c6b43 100644 --- a/checkman/varnish.worker +++ b/checkman/varnish.worker @@ -1,5 +1,6 @@ title: HTTP Accelerator Statistics via Varnishstat on Linux: Worker agents: linux +catalog: os/networking license: GPL distribution: check_mk description: diff --git a/checkman/varnish.worker_thread_ratio b/checkman/varnish.worker_thread_ratio index bc32a5e..b20ff34 100644 --- a/checkman/varnish.worker_thread_ratio +++ b/checkman/varnish.worker_thread_ratio @@ -1,5 +1,6 @@ title: HTTP Accelerator Statistics via Varnishstat on Linux: Worker Thread Ratio agents: linux +catalog: os/networking license: GPL distribution: check_mk description:

8 years, 4 months

#3184 varnish, varnish.backend, varnish.backend_success_ratio,

by Simon Betz

varnish.cache, varnish.cache_hit_ratio, varnish.client, varnish.esi, varnish.fetch, varnish.objects, varnish.worker, varnish.worker_thread_ratio: new checks which monitor HTTP Accelerator Statistics via varnishstat on Linux Message-ID: <56c2e178.9CZtUzpoaXll1UQu%si(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.5 6/20/10 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: 7896fa6c595b130bcab4cdfdde5067cab4e7aef5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7896fa6c595b13… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Feb 16 09:44:16 2016 +0100 #3184 varnish, varnish.backend, varnish.backend_success_ratio, varnish.cache, varnish.cache_hit_ratio, varnish.client, varnish.esi, varnish.fetch, varnish.objects, varnish.worker, varnish.worker_thread_ratio: new checks which monitor HTTP Accelerator Statistics via varnishstat on Linux --- .werks/3184 | 9 + ChangeLog | 1 + agents/check_mk_agent.linux | 6 + checkman/varnish | 13 + checkman/varnish.backend | 13 + checkman/varnish.backend_success_ratio | 12 + checkman/varnish.cache | 12 + checkman/varnish.cache_hit_ratio | 12 + checkman/varnish.client | 13 + checkman/varnish.esi | 12 + checkman/varnish.fetch | 15 + checkman/varnish.objects | 13 + checkman/varnish.worker | 13 + checkman/varnish.worker_thread_ratio | 12 + checks/varnish | 652 ++++++++++++++++++++++++++++++++ web/plugins/metrics/check_mk.py | 212 +++++++++++ web/plugins/wato/check_parameters.py | 287 ++++++++++++++ 17 files changed, 1307 insertions(+) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=7896fa6c59…

8 years, 4 months

windows agent: fixed mixed up bits and bytes in buffer size of encryption stream

by Sebastian Herbord

Module: check_mk Branch: master Commit: 9ccc047fa6a1a46bf696c443f95b387c085544eb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9ccc047fa6a1a4… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Tue Feb 16 09:31:59 2016 +0100 windows agent: fixed mixed up bits and bytes in buffer size of encryption stream this has no real negative effects except that the code may be a bit confusing and the buffer is larger than necessary --- agents/windows/OutputProxy.cc | 9 +++++---- agents/windows/build_version | 2 +- agents/windows/check_mk_agent-64.exe | Bin 909824 -> 909824 bytes agents/windows/check_mk_agent-64.unversioned.exe | Bin 909824 -> 909824 bytes agents/windows/check_mk_agent.exe | Bin 835584 -> 835584 bytes agents/windows/check_mk_agent.msi | Bin 2006016 -> 2006016 bytes agents/windows/check_mk_agent.unversioned.exe | Bin 835584 -> 835584 bytes agents/windows/install_agent-64.exe | Bin 418320 -> 418357 bytes agents/windows/install_agent.exe | Bin 408685 -> 408679 bytes 9 files changed, 6 insertions(+), 5 deletions(-) diff --git a/agents/windows/OutputProxy.cc b/agents/windows/OutputProxy.cc index 44bdd25..60c5b4e 100644 --- a/agents/windows/OutputProxy.cc +++ b/agents/windows/OutputProxy.cc @@ -140,7 +140,7 @@ bool BufferedSocketProxy::flushInt() { EncryptingBufferedSocketProxy::EncryptingBufferedSocketProxy( SOCKET socket, const std::string &passphrase, size_t buffer_size) : BufferedSocketProxy(socket, buffer_size), _crypto(passphrase) { - _blockSize = _crypto.blockSize(); + _blockSize = _crypto.blockSize() / 8; _plain.resize(_blockSize * 8); } @@ -181,9 +181,10 @@ void EncryptingBufferedSocketProxy::output(const char *format, ...) { void EncryptingBufferedSocketProxy::flush() { // this assumes the plain buffer is large enouph for one measly block - DWORD required_size = _crypto.encrypt( - reinterpret_cast<BYTE *>(&(_plain)[0]), _written, _plain.size(), true); - writeBinary(&_plain[0], required_size); + char *buffer = &_plain[0]; + DWORD required_size = _crypto.encrypt(reinterpret_cast<BYTE *>(buffer), + _written, _plain.size(), true); + writeBinary(buffer, required_size); _written = 0; diff --git a/agents/windows/build_version b/agents/windows/build_version index a369ea6..b0077c6 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -1337 +1351 diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe index f4ac56c..b2c0c4a 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 c894aaf..411cd10 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.exe b/agents/windows/check_mk_agent.exe index c2e1df2..70e33d6 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.msi b/agents/windows/check_mk_agent.msi index 209cb8f..89b8f9d 100755 Binary files a/agents/windows/check_mk_agent.msi and b/agents/windows/check_mk_agent.msi differ diff --git a/agents/windows/check_mk_agent.unversioned.exe b/agents/windows/check_mk_agent.unversioned.exe index c9ce522..f13645f 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 b98cd9c..6fc9446 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 4e25713..932cdfb 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ

8 years, 4 months

#3212 FIX cmciii.phase: Fixed totally broken check

by Lars Michelsen

Module: check_mk Branch: master Commit: 8d0757f6d37d86b42669b0ce371edc4f9cd0b13a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8d0757f6d37d86… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 16 09:21:19 2016 +0100 #3212 FIX cmciii.phase: Fixed totally broken check --- .werks/3212 | 10 ++++++++++ ChangeLog | 1 + checks/cmciii | 26 +++++++++++++++++--------- 3 files changed, 28 insertions(+), 9 deletions(-) diff --git a/.werks/3212 b/.werks/3212 new file mode 100644 index 0000000..e589e23 --- /dev/null +++ b/.werks/3212 @@ -0,0 +1,10 @@ +Title: cmciii.phase: Fixed totally broken check +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1455610863 + + diff --git a/ChangeLog b/ChangeLog index af1b2cd..e57b07f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -13,6 +13,7 @@ * 3209 FIX: esx_vsphere_datastores: Added missing uncommitted and overprovisioned graphs * 3210 FIX: oracle_asm_diskgroup: Fixed exception when using required mirror free space parameter * 3211 FIX: logwatch: Fixed broken error messages in case of failed filesystem operations + * 3212 FIX: cmciii.phase: Fixed totally broken check Multisite: * 3059 FIX: Fixed highlighting of availability timeline time slices diff --git a/checks/cmciii b/checks/cmciii index 468f125..ca0e2d1 100644 --- a/checks/cmciii +++ b/checks/cmciii @@ -851,19 +851,28 @@ def reparse_cmciii_phase(parsed): output = {} for name, value in inputs.items(): if name[1].find("Phase") != -1: - device, phase, value_name = name[1].split('.') - unit_id = int( name[0]) - unit = units[unit_id-1][1] - phase = phase[-1] + parts = name[1].split('.') + if len(parts) == 3: + device, phase, value_name = parts + else: + device, phase, value_name, value_name_add = parts + value_name = (value_name, value_name_add) + + unit_id = int(name[0]) + unit = units[unit_id-1][1] + phase = phase[-1] + output.setdefault((unit, device, phase), {}) output[(unit, device, phase)][value_name] = value return output + def inventory_cmciii_phase(parsed): parsed = reparse_cmciii_phase(parsed) - for (device, unit, phase), values in parsed.items(): + for device, unit, phase in parsed.keys(): yield "%s %s Phase %s" % (device, unit, phase), {} + def check_cmciii_phase(item, params, parsed): device, unit, word, phase = item.split() data = reparse_cmciii_phase(parsed)[(device, unit, phase)] @@ -872,11 +881,10 @@ def check_cmciii_phase(item, params, parsed): parsed[item] = {} parsed[item]["voltage"] = float(data['Voltage']['Value'].split()[0]), None parsed[item]["current"] = float(data['Current']['Value'].split()[0]), None - parsed[item]["power"] = float(data['Power']['Value'].split()[0]), None - #parsed[item]["appower"] = float(data['Current']['Value'].split()[0]), None - parsed[item]["energy"] = float(data['Energy']['Value'].split()[0]), None + parsed[item]["power"] = float(data[('Power', 'Active')]['Value'].split()[0]), None + parsed[item]["energy"] = float(data[('Energy', 'Active')]['Value'].split()[0]), None - return check_elphase(item, params, unit_items) + return check_elphase(item, params, parsed) check_info['cmciii.phase'] = { "check_function" : check_cmciii_phase,

8 years, 4 months

#3211 FIX logwatch: Fixed broken error messages in case of failed filesystem operations

by Lars Michelsen

Module: check_mk Branch: master Commit: 5d36c3f27303c916ebbbfb682e5dae25449d91c0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5d36c3f27303c9… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 16 08:53:22 2016 +0100 #3211 FIX logwatch: Fixed broken error messages in case of failed filesystem operations --- .werks/3211 | 10 ++++++++++ ChangeLog | 1 + checks/logwatch | 11 ++++++++--- 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/.werks/3211 b/.werks/3211 new file mode 100644 index 0000000..ebfb973 --- /dev/null +++ b/.werks/3211 @@ -0,0 +1,10 @@ +Title: logwatch: Fixed broken error messages in case of failed filesystem operations +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1455609175 + + diff --git a/ChangeLog b/ChangeLog index 6111cd3..af1b2cd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -12,6 +12,7 @@ * 3206 FIX: esx_vsphere_hostsystem.mem_usage_cluster: Fixed broken check * 3209 FIX: esx_vsphere_datastores: Added missing uncommitted and overprovisioned graphs * 3210 FIX: oracle_asm_diskgroup: Fixed exception when using required mirror free space parameter + * 3211 FIX: logwatch: Fixed broken error messages in case of failed filesystem operations Multisite: * 3059 FIX: Fixed highlighting of availability timeline time slices diff --git a/checks/logwatch b/checks/logwatch index f33881e..3967175 100644 --- a/checks/logwatch +++ b/checks/logwatch @@ -348,6 +348,11 @@ def truncate_by_line(filename, offset): f.close() +def logwatch_username(): + import getpass + return getpass.getuser() + + def check_logwatch_generic(item, params, loglines, found, groups=False): # Create directories, if neccessary try: @@ -368,13 +373,13 @@ def check_logwatch_generic(item, params, loglines, found, groups=False): os.rmdir(logdir) raise MKGeneralException(("User %s cannot chown directory to group id %d: %s. Please make sure "+ "that %s is a member of that group.") % - (username(), www_group, e, username())) + (logwatch_username(), www_group, e, logwatch_username())) except MKGeneralException: raise except Exception, e: raise MKGeneralException("User %s cannot create logwatch directory: %s" % \ - (username(), e) ) + (logwatch_username(), e)) logfile = logdir + "/" + item.replace("/", "\\") @@ -461,7 +466,7 @@ def check_logwatch_generic(item, params, loglines, found, groups=False): else: logwatch_file = open(logfile, 'w') except Exception, e: - raise MKGeneralException("User %s cannot open file for writing: %s" % (username(), e)) + raise MKGeneralException("User %s cannot open file for writing: %s" % (logwatch_username(), e)) pattern_hash = hash(tuple(patterns))

8 years, 4 months

← Newer
1
...
9
10
11
12
13
14
15
...
41
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2016