Checkmk git commits February 2016

checkmk-commits@lists.checkmk.com

7 participants
402 discussions

by Mathias Kettner

Module: check_mk Branch: master Commit: b3c66d92f2ae90341401585b70913b771f004dbd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b3c66d92f2ae90… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Feb 8 18:09:56 2016 +0100 Remove bogus test URL variable --- web/htdocs/metrics.py | 1 - 1 file changed, 1 deletion(-) diff --git a/web/htdocs/metrics.py b/web/htdocs/metrics.py index b6fd6ac..06e3c22 100644 --- a/web/htdocs/metrics.py +++ b/web/htdocs/metrics.py @@ -1460,7 +1460,6 @@ def render_metrics_table(translated_metrics, host_name, service_description): ("host", host_name), ("service", service_description), ("metric", metric_name), - ("back_url", "HIRN MIST TODO"), ] ) output += "</td>"

8 years, 7 months

Small code cleanup: fixed comment header in painters

by Mathias Kettner

Module: check_mk Branch: master Commit: 0fb96982d091a10979bcb909a699864d42bb88fa URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0fb96982d091a1… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Feb 8 17:50:06 2016 +0100 Small code cleanup: fixed comment header in painters --- web/plugins/views/painters.py | 227 ++++++++++++++++++++++++----------------- 1 file changed, 132 insertions(+), 95 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=0fb96982d0…

8 years, 7 months

juniper_cpu_util: fixed incorrect type

by Sebastian Herbord

Module: check_mk Branch: master Commit: 4172486faf85ee78858d72a2173bc1817bc6e488 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4172486faf85ee… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Mon Feb 8 17:30:35 2016 +0100 juniper_cpu_util: fixed incorrect type --- checks/juniper_cpu_util | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/juniper_cpu_util b/checks/juniper_cpu_util index 2e61c98..092e889 100644 --- a/checks/juniper_cpu_util +++ b/checks/juniper_cpu_util @@ -52,6 +52,6 @@ check_info['juniper_cpu_util'] = { 5, #jnxOperatingDescr 8, #jnxOperatingCPU ]), - 'includes' : "cpu_util.include", + 'includes' : ["cpu_util.include"], 'default_levels_variable' : "juniper_cpu_util_default_levels" }

8 years, 7 months

linux and solaris agent: fixed broken quoting when using caching

by Sebastian Herbord

Module: check_mk Branch: master Commit: a08cf55421d0d4b06f37335432c0ff31d5b79514 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a08cf55421d0d4… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Mon Feb 8 16:41:34 2016 +0100 linux and solaris agent: fixed broken quoting when using caching --- agents/check_mk_agent.linux | 2 +- agents/check_mk_agent.solaris | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index 847c6aa..def834a 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -777,7 +777,7 @@ then then run_mrpe $descr "$cmdline" else - run_cached -m $descr $interval "\'$cmdline\'" + run_cached -m $descr $interval "$cmdline" fi done fi diff --git a/agents/check_mk_agent.solaris b/agents/check_mk_agent.solaris index 30642e2..d3e674b 100755 --- a/agents/check_mk_agent.solaris +++ b/agents/check_mk_agent.solaris @@ -360,7 +360,7 @@ then then run_mrpe $descr "$cmdline" else - run_cached -m $descr $interval "\'$cmdline\'" + run_cached -m $descr $interval "$cmdline" fi done fi

8 years, 7 months

Tiny cleanup.

by Sven Panne

Module: check_mk Branch: master Commit: 9ab2330558e00cf9a642eac3db4ba9de95fef288 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9ab2330558e00c… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Feb 8 15:53:13 2016 +0100 Tiny cleanup. --- livestatus/src/OffsetStringColumn.cc | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/livestatus/src/OffsetStringColumn.cc b/livestatus/src/OffsetStringColumn.cc index 7a888a0..e1d1491 100644 --- a/livestatus/src/OffsetStringColumn.cc +++ b/livestatus/src/OffsetStringColumn.cc @@ -25,13 +25,10 @@ #include "OffsetStringColumn.h" const char *OffsetStringColumn::getValue(void *data) { - if (data == nullptr) { - return ""; - } char *p = reinterpret_cast<char *>(shiftPointer(data)); if (p == nullptr) { return ""; } const char *s = *reinterpret_cast<char **>(p + _offset); - return s != nullptr ? s : ""; + return s == nullptr ? "" : s; }

8 years, 7 months

#2990 FIX netapp_api_vs_traffic: fixed incorrect CIFS latency

by Andreas Boesl

Module: check_mk Branch: master Commit: 9eaff0a7059d8507684f2aa866608dbb4f35b459 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9eaff0a7059d85… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Feb 8 15:39:31 2016 +0100 #2990 FIX netapp_api_vs_traffic: fixed incorrect CIFS latency The CIFS latency was off by a factor of 1000. --- .werks/2990 | 9 +++++++++ ChangeLog | 1 + checks/netapp_api_vs_traffic | 12 ++++++------ 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/.werks/2990 b/.werks/2990 new file mode 100644 index 0000000..08e2d27 --- /dev/null +++ b/.werks/2990 @@ -0,0 +1,9 @@ +Title: netapp_api_vs_traffic: fixed incorrect CIFS latency +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i4 +Date: 1454942332 +Class: fix + +The CIFS latency was off by a factor of 1000. diff --git a/ChangeLog b/ChangeLog index 2226b9d..e853a3d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -259,6 +259,7 @@ * 3167 FIX: apc_inrow_airflow: fix exception in displaying parameters in WATO services list... * 3070 FIX: windows agent: replaced a very costy section regarding installed software... * 3071 FIX: cisco_mem, cisco_sys_mem, cisco_mem_asa: fixed incorrect unit being displayed... + * 2990 FIX: netapp_api_vs_traffic: fixed incorrect CIFS latency... Multisite: * 2684 Added icons for downloading agent data / walks of hosts... diff --git a/checks/netapp_api_vs_traffic b/checks/netapp_api_vs_traffic index 216fd29..0cccff6 100644 --- a/checks/netapp_api_vs_traffic +++ b/checks/netapp_api_vs_traffic @@ -48,20 +48,20 @@ def check_netapp_api_vs_traffic(item, _no_params, parsed): ("sent_packet", "if_out_pkts", "sent packets", 1, int)]), "fcp_lif:vserver": ("FCP", - [ ("avg_read_latency", "fcp_read_latency", "avg. Read latency", 0.001, lambda x: "%s ms" % (x * 1000)), - ("avg_write_latency", "fcp_write_latency", "avg. Write latency", 0.001, lambda x: "%s ms" % (x * 1000)), + [ ("avg_read_latency", "fcp_read_latency", "avg. Read latency", 0.001, lambda x: "%.2f ms" % (x * 1000)), + ("avg_write_latency", "fcp_write_latency", "avg. Write latency", 0.001, lambda x: "%.2f ms" % (x * 1000)), ("read_data", "fcp_read_data", "read data", 1, get_bytes_human_readable), ("write_data", "fcp_write_data", "write data", 1, get_bytes_human_readable)]), "cifs:vserver": ("CIFS", - [ ("cifs_read_latency", "cifs_read_latency", "read latency", 0.000001, lambda x: "%s ms" % (x * 1000)), - ("cifs_write_latency", "cifs_write_latency", "write latency", 0.000001, lambda x: "%s ms" % (x * 1000)), + [ ("cifs_read_latency", "cifs_read_latency", "read latency", 0.000001, lambda x: "%.2f ms" % x), + ("cifs_write_latency", "cifs_write_latency", "write latency", 0.000001, lambda x: "%.2f ms" % x), ("cifs_read_ops", "cifs_read_ios", "read OPs", 1, int), ("cifs_write_ops", "cifs_write_ios", "write OPs", 1, int)]), "iscsi_lif:vserver": ("iSCSI", - [ ("avg_read_latency", "iscsi_read_latency", "avg. Read latency", 0.001, lambda x: "%s ms" % (x * 1000)), - ("avg_write_latency", "iscsi_write_latency", "avg. Write latency", 0.001, lambda x: "%s ms" % (x * 1000)), + [ ("avg_read_latency", "iscsi_read_latency", "avg. Read latency", 0.001, lambda x: "%.2f ms" % (x * 1000)), + ("avg_write_latency", "iscsi_write_latency", "avg. Write latency", 0.001, lambda x: "%.2f ms" % (x * 1000)), ("read_data", "iscsi_read_data", "read data", 1, get_bytes_human_readable), ("write_data", "iscsi_write_data", "write data", 1, get_bytes_human_readable)]),

8 years, 7 months

#3071 FIX cisco_mem, cisco_sys_mem, cisco_mem_asa: fixed incorrect unit being displayed

by Sebastian Herbord

Module: check_mk Branch: master Commit: 4a7a3bcf6a1a0941ae06918ba5b85ef24938d03c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4a7a3bcf6a1a09… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Mon Feb 8 14:41:36 2016 +0100 #3071 FIX cisco_mem, cisco_sys_mem, cisco_mem_asa: fixed incorrect unit being displayed Previously the memory used on this devices was displayed as n Bytes although n is memory usage in percent --- .werks/3071 | 10 ++++++++++ ChangeLog | 1 + web/plugins/metrics/check_mk.py | 12 ++++++++++++ 3 files changed, 23 insertions(+) diff --git a/.werks/3071 b/.werks/3071 new file mode 100644 index 0000000..d62cb1b --- /dev/null +++ b/.werks/3071 @@ -0,0 +1,10 @@ +Title: cisco_mem, cisco_sys_mem, cisco_mem_asa: fixed incorrect unit being displayed +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i4 +Date: 1454938819 +Class: fix + +Previously the memory used on this devices was displayed as n Bytes although n is memory usage in +percent diff --git a/ChangeLog b/ChangeLog index 88fb757..2226b9d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -258,6 +258,7 @@ * 3163 FIX: Treat interface name '1' and '01' as identical when grouping interfaces... * 3167 FIX: apc_inrow_airflow: fix exception in displaying parameters in WATO services list... * 3070 FIX: windows agent: replaced a very costy section regarding installed software... + * 3071 FIX: cisco_mem, cisco_sys_mem, cisco_mem_asa: fixed incorrect unit being displayed... Multisite: * 2684 Added icons for downloading agent data / walks of hosts... diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index 822ff53..18c050d 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -3602,6 +3602,18 @@ check_metrics["check_mk-mssql_counters.sqlstats"] = { "sql_re-compilations/sec" : { "name" : "requests_per_second" }, } +check_metrics["check_mk-cisco_mem"] = { + "mem_used" : { "name" : "mem_used_percent" } +} + +check_metrics["check_mk-cisco_sys_mem"] = { + "mem_used" : { "name" : "mem_used_percent" } +} + +check_metrics["check_mk-cisco_mem_asa"] = { + "mem_used" : { "name" : "mem_used_percent" } +} + #. # .--Perf-O-Meters-------------------------------------------------------.

8 years, 7 months

#3070 FIX windows agent: replaced a very costy section regarding installed software

by Sebastian Herbord

Module: check_mk Branch: master Commit: ce7d1288ec5b866f8a9e022eadfe254d597a01e8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ce7d1288ec5b86… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Mon Feb 8 14:22:09 2016 +0100 #3070 FIX windows agent: replaced a very costy section regarding installed software To retrieve the list of installed software the mk_inventory.vbs script uses two different approaches that heavily overlap: One retrieves the list of uninstall-entries from the registry, the other retrieved the list of installers registered in the windows installer database (via wmi query to Win32_Product). The latter list is usually a subset of the former and can take excessively long to query as it triggers a verification of the database. In the process it also prints a lot of messages to the event log (see https://support.microsoft.com/de-de/kb/974524). Therefore the query to Win32_Product has been replaced with a query via a vbs-interface to the installer database. This should produce the same results without the drawbacks mentioned. --- .werks/3070 | 18 +++++++++++++++++ ChangeLog | 1 + agents/windows/plugins/mk_inventory.vbs | 32 +++++++++++++++++++++++++++++-- 3 files changed, 49 insertions(+), 2 deletions(-) diff --git a/.werks/3070 b/.werks/3070 new file mode 100644 index 0000000..f640501 --- /dev/null +++ b/.werks/3070 @@ -0,0 +1,18 @@ +Title: windows agent: replaced a very costy section regarding installed software +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i4 +Date: 1454934777 +Class: fix + +To retrieve the list of installed software the mk_inventory.vbs script uses two different approaches +that heavily overlap: One retrieves the list of uninstall-entries from the registry, the other +retrieved the list of installers registered in the windows installer database (via wmi query to +Win32_Product). +The latter list is usually a subset of the former and can take excessively long to query as it +triggers a verification of the database. In the process it also prints a lot of messages to +the event log (see https://support.microsoft.com/de-de/kb/974524). + +Therefore the query to Win32_Product has been replaced with a query via a vbs-interface to the +installer database. This should produce the same results without the drawbacks mentioned. diff --git a/ChangeLog b/ChangeLog index fcce31e..88fb757 100644 --- a/ChangeLog +++ b/ChangeLog @@ -257,6 +257,7 @@ * 2930 FIX: juniper_cpu_util: Better detection, find more devices... * 3163 FIX: Treat interface name '1' and '01' as identical when grouping interfaces... * 3167 FIX: apc_inrow_airflow: fix exception in displaying parameters in WATO services list... + * 3070 FIX: windows agent: replaced a very costy section regarding installed software... Multisite: * 2684 Added icons for downloading agent data / walks of hosts... diff --git a/agents/windows/plugins/mk_inventory.vbs b/agents/windows/plugins/mk_inventory.vbs index f4b522a..190118a 100644 --- a/agents/windows/plugins/mk_inventory.vbs +++ b/agents/windows/plugins/mk_inventory.vbs @@ -43,10 +43,22 @@ If (fso.FileExists(timestamp)) Then End If End If + +' handle error message ourselves so this script can also be run directly, for testing +On Error Resume Next + ' create new timestamp file ' only allowed when script runs as administrator user Set stampo = fso.CreateTextFile(timestamp) +If Err.Number <> 0 Then + outPut "Failed to create time stamp: " & Err.Description & " (" & Err.Number & ")" + Err.Clear +End If + +On Error Goto 0 + + ' determine the timezone offset w/t GMT Set systemParams = objClass.ExecQuery("Select * from Win32_ComputerSystem") For Each param in systemParams @@ -117,6 +129,22 @@ Sub RecurseForExecs(strFolderPath) Next End Sub +Sub SoftwareFromInstaller(fields) + Dim installer + Set installer = CreateObject("WindowsInstaller.Installer") + Dim productCode, productName + For Each productCode In installer.Products + values = fields ' copy + idx = 0 + + For Each field In fields + values(idx) = installer.ProductInfo(productCode, field) + idx = idx + 1 + Next + outPut(Join(values, "|")) + Next +End Sub + ' Processor Call startSection("win_cpuinfo",58,timeUntil) cpuVars = Array( "Name","Manufacturer","Caption","DeviceID","MaxClockSpeed","AddressWidth","L2CacheSize","L3CacheSize","Architecture","NumberOfCores","NumberOfLogicalProcessors","CurrentVoltage","Status" ) @@ -152,8 +180,8 @@ Call getWMIObject("Win32_VideoController",adapterVars) ' Installed Software Call startSection("win_wmi_software",124,timeUntil) -swVars = Array( "Name", "Vendor", "Version", "InstallDate", "Language") -Call getWMIObject2("Win32_Product",swVars) +swVars = Array( "ProductName", "Publisher", "VersionString", "InstallDate", "Language") +Call SoftwareFromInstaller(swVars) ' Search Registry Call startSection("win_reg_uninstall",124,timeUntil)

8 years, 7 months

Added overrides to Table hierarchy.

by Sven Panne

Module: check_mk Branch: master Commit: ad351a66b5a021825bb56ac8f8ef9f8306bb1fd3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ad351a66b5a021… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Feb 8 13:55:35 2016 +0100 Added overrides to Table hierarchy. --- livestatus/src/Table.h | 4 +--- livestatus/src/TableColumns.h | 4 ++-- livestatus/src/TableCommands.h | 4 ++-- livestatus/src/TableContactgroups.h | 6 +++--- livestatus/src/TableContacts.h | 6 +++--- livestatus/src/TableDownComm.h | 6 +++--- livestatus/src/TableHostgroups.h | 8 ++++---- livestatus/src/TableHosts.h | 10 +++++----- livestatus/src/TableLog.h | 11 +++++------ livestatus/src/TableServicegroups.h | 8 ++++---- livestatus/src/TableServices.h | 10 +++++----- livestatus/src/TableStateHistory.h | 11 +++++------ livestatus/src/TableStatus.h | 4 ++-- livestatus/src/TableTimeperiods.h | 4 ++-- 14 files changed, 46 insertions(+), 50 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=ad351a66b5…

8 years, 7 months

fixed perfdata

by Simon Betz

Module: check_mk Branch: master Commit: a257b8a13f0ca79bdf58ae6701ac7ce0aa2a6b23 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a257b8a13f0ca7… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Feb 8 09:53:33 2016 +0100 fixed perfdata --- checks/wlc_clients.include | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/checks/wlc_clients.include b/checks/wlc_clients.include index 1379001..9e8fa75 100644 --- a/checks/wlc_clients.include +++ b/checks/wlc_clients.include @@ -47,7 +47,7 @@ def check_wlc_clients(item, params, parsed): num_conns, interface = parsed[item] state = 0 infotext = "%d connections" % num_conns - perfdata = [("conns", num_conns)] + perfdata = [("connections", num_conns)] if interface: infotext += " (%s)" % interface if params: @@ -59,7 +59,7 @@ def check_wlc_clients(item, params, parsed): elif num_conns >= warn: state = 1 - perfdata = [("conns", num_conns, warn, crit)] + perfdata = [("connections", num_conns, warn, crit)] elif params.get("levels_lower", None): warn_low, crit_low = params["levels"]

8 years, 7 months

← Newer
1
...
22
23
24
25
26
27
28
...
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