Checkmk git commits July 2015

checkmk-commits@lists.checkmk.com

8 participants
287 discussions

Check_MK Git: check_mk: #2489 FIX cmciii_lcp_water: New check replacing cmciii_lcp_waterin/out, support for newer devices

by Mathias Kettner

Module: check_mk Branch: master Commit: 13bc583f946dc234be771de1fe780fb9105c4441 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=13bc583f946dc2… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jul 28 12:07:57 2015 +0200 #2489 FIX cmciii_lcp_water: New check replacing cmciii_lcp_waterin/out, support for newer devices This is a more robust reimplementation of the Water-In/Out checks that also works for newer firmware and has been converted to the new temperature handling and thus also allows for custom levels (if you want to override those set in the device itself). Note: You need to reinventorize the hosts in order to use the new check. --- .werks/2489 | 13 +++++ ChangeLog | 2 + checkman/cmciii_lcp_water | 20 +++++++ checkman/cmciii_lcp_waterin | 26 ---------- checkman/cmciii_lcp_waterout | 26 ---------- checks/cmciii_lcp_water | 118 ++++++++++++++++++++++++++++++++++++++++++ checks/cmciii_lcp_waterin | 79 ---------------------------- checks/cmciii_lcp_waterout | 79 ---------------------------- 8 files changed, 153 insertions(+), 210 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=13bc583f94…

8 years, 11 months

Check_MK Git: check_mk: #2498 FIX livestatus_status: Records the number of hosts/services now

by Lars Michelsen

Module: check_mk Branch: master Commit: 83798aebd849eca8a0401151f532cea390178218 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=83798aebd849ec… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jul 28 11:26:29 2015 +0200 #2498 FIX livestatus_status: Records the number of hosts/services now --- .werks/2498 | 9 +++++++++ ChangeLog | 1 + checks/livestatus_status | 3 +++ web/plugins/metrics/check_mk.py | 24 ++++++++++++++++++++++-- 4 files changed, 35 insertions(+), 2 deletions(-) diff --git a/.werks/2498 b/.werks/2498 new file mode 100644 index 0000000..a2aab30 --- /dev/null +++ b/.werks/2498 @@ -0,0 +1,9 @@ +Title: livestatus_status: Records the number of hosts/services now +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i3 +Date: 1438075560 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 86607c8..8f84b04 100644 --- a/ChangeLog +++ b/ChangeLog @@ -83,6 +83,7 @@ * 2495 FIX: printer_supply: Fixed exception when unit type is not available via SNMP * 2496 FIX: Fixed CPU load checks when monitoring raspbian/babanian systems * 2497 FIX: veeam_client: Fixed exception when client is missing in agent output + * 2498 FIX: livestatus_status: Records the number of hosts/services now Multisite: * 2385 SEC: Fixed possible reflected XSS on all GUI pages where users can produce unhandled exceptions... diff --git a/checks/livestatus_status b/checks/livestatus_status index 43f2693..c3a53f5 100644 --- a/checks/livestatus_status +++ b/checks/livestatus_status @@ -96,6 +96,9 @@ def check_livestatus_status(item, params, parsed): rate = get_rate("livestatus_status.%s.%s" % (item, counter), this_time, int(status[counter])) yield 0, ("%.1f %s/s" % (rate, title)), [(counter, rate)] + yield 0, "%d Hosts" % int(status["num_hosts"]), [("monitored_hosts", int(status["num_hosts"]))] + yield 0, "%d Services" % int(status["num_services"]), [("monitored_services", int(status["num_services"]))] + # Output some general information yield 0, "Core version: %s" % status["program_version"] yield 0, "Livestatus version: %s" % status["livestatus_version"] diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index 03e3a72..d936c76 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -1732,7 +1732,13 @@ metric_info["fw_connections_passthrough"] = { metric_info["host_check_rate"] = { "title" : _("Host check rate"), "unit" : "1/s", - "color" : "#884422", + "color" : "52/a", +} + +metric_info["monitored_hosts"] = { + "title" : _("Monitored hosts"), + "unit" : "1/s", + "color" : "52/a", } metric_info["hosts_active"] = { @@ -1768,7 +1774,13 @@ metric_info["hosts_other"] = { metric_info["service_check_rate"] = { "title" : _("Service check rate"), "unit" : "1/s", - "color" : "#ffbb66", + "color" : "21/a", +} + +metric_info["monitored_services"] = { + "title" : _("Monitored services"), + "unit" : "1/s", + "color" : "21/a", } metric_info["livestatus_connect_rate"] = { @@ -4951,6 +4963,14 @@ graph_info.append({ }) graph_info.append({ + "title" : _("Number of Monitored Hosts and Services"), + "metrics" : [ + ( "monitored_hosts", "stack" ), + ( "monitored_services", "stack" ), + ], +}) + +graph_info.append({ "title" : _("Livestatus Connects and Requests"), "metrics" : [ ( "livestatus_request_rate", "area" ),

8 years, 11 months

Check_MK Git: check_mk: #2497 FIX veeam_client: Fixed exception when client is missing in agent output

by Lars Michelsen

Module: check_mk Branch: master Commit: 00982cb9b6749720f399a6fdffca1860ae8bce59 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=00982cb9b67497… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jul 28 10:44:26 2015 +0200 #2497 FIX veeam_client: Fixed exception when client is missing in agent output --- .werks/2497 | 10 ++++++++++ ChangeLog | 1 + checks/veeam_client | 10 ++++++---- 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/.werks/2497 b/.werks/2497 new file mode 100644 index 0000000..77c9118 --- /dev/null +++ b/.werks/2497 @@ -0,0 +1,10 @@ +Title: veeam_client: Fixed exception when client is missing in agent output +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i3 +Date: 1438073041 + + diff --git a/ChangeLog b/ChangeLog index edf312f..86607c8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -82,6 +82,7 @@ * 2494 FIX: Clasic SNMP mode now uses normal snmpwalk when bulkwalks are disabled with SNMPv3 * 2495 FIX: printer_supply: Fixed exception when unit type is not available via SNMP * 2496 FIX: Fixed CPU load checks when monitoring raspbian/babanian systems + * 2497 FIX: veeam_client: Fixed exception when client is missing in agent output Multisite: * 2385 SEC: Fixed possible reflected XSS on all GUI pages where users can produce unhandled exceptions... diff --git a/checks/veeam_client b/checks/veeam_client index e84fd8f..a240b17 100644 --- a/checks/veeam_client +++ b/checks/veeam_client @@ -55,11 +55,13 @@ def inventory_veeam_client(parsed): def check_veeam_client(item, params, parsed): # Fallback for old None item version #FIXME Can be remvoed in CMK 2.0 - if item == None: - key = parsed.keys()[0] - data = parsed[key] - else: + if item == None and len(parsed) > 0: + item = parsed.keys()[0] + + try: data = parsed[item] + except KeyError: + return 3, "Client not found in agent output" perfdata = [] infotexts = []

8 years, 11 months

Check_MK Git: check_mk: Fix possible exception with missing single_infos

by Mathias Kettner

Module: check_mk Branch: master Commit: 9d6e2039f965b006089c2544c8a2e5a20f0ee4bf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9d6e2039f965b0… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jul 28 10:38:03 2015 +0200 Fix possible exception with missing single_infos --- web/htdocs/visuals.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/visuals.py b/web/htdocs/visuals.py index 81b65d4..9002b55 100644 --- a/web/htdocs/visuals.py +++ b/web/htdocs/visuals.py @@ -1243,7 +1243,7 @@ def info_params(info_key): def get_single_info_keys(visual): keys = [] - for info_key in visual['single_infos']: + for info_key in visual.get('single_infos', []): keys += info_params(info_key) return list(set(keys))

8 years, 11 months

Check_MK Git: check_mk: #2496 FIX Fixed CPU load checks when monitoring raspbian/babanian systems

by Lars Michelsen

Module: check_mk Branch: master Commit: 6cd51239cd3c6b315fab4fe9e81706b5e43aa6bb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6cd51239cd3c6b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jul 28 10:30:33 2015 +0200 #2496 FIX Fixed CPU load checks when monitoring raspbian/babanian systems --- .werks/2496 | 9 +++++++++ ChangeLog | 1 + agents/check_mk_agent.linux | 7 ++++++- 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/.werks/2496 b/.werks/2496 new file mode 100644 index 0000000..6505c7a --- /dev/null +++ b/.werks/2496 @@ -0,0 +1,9 @@ +Title: Fixed CPU load checks when monitoring raspbian/babanian systems +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i3 +Date: 1438072191 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 3f38fc8..edf312f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -81,6 +81,7 @@ * 2488 FIX: veem_jobs: fix problems with spaces or single quotes in the names of jobs... * 2494 FIX: Clasic SNMP mode now uses normal snmpwalk when bulkwalks are disabled with SNMPv3 * 2495 FIX: printer_supply: Fixed exception when unit type is not available via SNMP + * 2496 FIX: Fixed CPU load checks when monitoring raspbian/babanian systems Multisite: * 2385 SEC: Fixed possible reflected XSS on all GUI pages where users can produce unhandled exceptions... diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index 42ccdf3..38faab7 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -210,7 +210,12 @@ egrep -v '^Swap:|^Mem:|total:' < /proc/meminfo # Load and number of processes echo '<<<cpu>>>' -echo "$(cat /proc/loadavg) $(grep -E '^CPU|^processor' < /proc/cpuinfo | wc -l)" +if [ $(uname -m) = "armv7l" ]; then + CPU_REGEX='^processor' +else + CPU_REGEX='^CPU|^processor' +fi +echo "$(cat /proc/loadavg) $(grep -E $CPU_REGEX < /proc/cpuinfo | wc -l)" # Uptime echo '<<<uptime>>>'

8 years, 11 months

Check_MK Git: check_mk: #2495 FIX printer_supply: Fixed exception when unit type is not available via SNMP

by Lars Michelsen

Module: check_mk Branch: master Commit: 1ce81f4656e085a0da7a2401bef76a463242e56e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1ce81f4656e085… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jul 28 10:24:23 2015 +0200 #2495 FIX printer_supply: Fixed exception when unit type is not available via SNMP --- .werks/2495 | 10 ++++++++++ ChangeLog | 1 + checks/printer_supply | 7 ++++++- 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/.werks/2495 b/.werks/2495 new file mode 100644 index 0000000..fd7e061 --- /dev/null +++ b/.werks/2495 @@ -0,0 +1,10 @@ +Title: printer_supply: Fixed exception when unit type is not available via SNMP +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i3 +Date: 1438071821 + + diff --git a/ChangeLog b/ChangeLog index 5e905fa..3f38fc8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -80,6 +80,7 @@ * 1274 FIX: heartbeat_crm: Handle case of error messages from CRM * 2488 FIX: veem_jobs: fix problems with spaces or single quotes in the names of jobs... * 2494 FIX: Clasic SNMP mode now uses normal snmpwalk when bulkwalks are disabled with SNMPv3 + * 2495 FIX: printer_supply: Fixed exception when unit type is not available via SNMP Multisite: * 2385 SEC: Fixed possible reflected XSS on all GUI pages where users can produce unhandled exceptions... diff --git a/checks/printer_supply b/checks/printer_supply index 88f8d6d..c283519 100644 --- a/checks/printer_supply +++ b/checks/printer_supply @@ -105,7 +105,12 @@ def check_printer_supply(item, params, info): # 4 = supplyThatIsFilled # the value is contains the current level if this supply is a container # but when the remaining space if this supply is a receptacle - unit_type = int(line[3]) + # + # This table can be missing on some devices. Assume type 3 in this case. + if line[3] == '': + unit_type = 3 + else: + unit_type = int(line[3]) if type(params) == tuple: if len(params) == 2:

8 years, 11 months

Check_MK Git: check_mk: #2494 FIX Clasic SNMP mode now uses normal snmpwalk when bulkwalks are disabled with SNMPv3

by Lars Michelsen

Module: check_mk Branch: master Commit: 62a61cbdead5a25bbaa6db0edb5832aedcec3f1e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=62a61cbdead5a2… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jul 28 10:12:09 2015 +0200 #2494 FIX Clasic SNMP mode now uses normal snmpwalk when bulkwalks are disabled with SNMPv3 --- .werks/2494 | 10 ++++++++++ ChangeLog | 1 + modules/check_mk.py | 4 +++- 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/.werks/2494 b/.werks/2494 new file mode 100644 index 0000000..90d7c0c --- /dev/null +++ b/.werks/2494 @@ -0,0 +1,10 @@ +Title: Clasic SNMP mode now uses normal snmpwalk when bulkwalks are disabled with SNMPv3 +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i3 +Date: 1438071098 + + diff --git a/ChangeLog b/ChangeLog index 1901761..871aef7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -78,6 +78,7 @@ * 2476 FIX: check_bi_aggr: Fixed exception when authentication is enabled * 2477 FIX: SNMP: Fixed exception when processing specific SNMP data with missing columns... * 1274 FIX: heartbeat_crm: Handle case of error messages from CRM + * 2494 FIX: Clasic SNMP mode now uses normal snmpwalk when bulkwalks are disabled with SNMPv3 Multisite: * 2385 SEC: Fixed possible reflected XSS on all GUI pages where users can produce unhandled exceptions... diff --git a/modules/check_mk.py b/modules/check_mk.py index 1998b62..ee7dd36 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -722,8 +722,10 @@ def snmp_base_command(what, hostname): command = 'snmpget' elif what == 'getnext': command = 'snmpgetnext -Cf' - else: + elif is_bulkwalk_host(hostname): command = 'snmpbulkwalk' + else: + command = 'snmpwalk' # Handle V1 and V2C if type(credentials) in [ str, unicode ]:

8 years, 11 months

Check_MK Git: check_mk: Fixed typo

by Konstantin Büttner

Module: check_mk Branch: master Commit: 5eba7127b7c43921c35d9e1b7f3742c86768ef6c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5eba7127b7c439… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Tue Jul 28 10:08:59 2015 +0200 Fixed typo --- checkman/mikrotik_signal | 2 +- checks/mikrotik_signal | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/checkman/mikrotik_signal b/checkman/mikrotik_signal index 695303d..814e239 100644 --- a/checkman/mikrotik_signal +++ b/checkman/mikrotik_signal @@ -1,4 +1,4 @@ -title: Mikrotik Wlan Bridge: Signal Strenght +title: Mikrotik Wlan Bridge: Signal Strength agents: linux catalog: hw/network/mikrotik license: GPL diff --git a/checks/mikrotik_signal b/checks/mikrotik_signal index 6ed9057..08e5a54 100644 --- a/checks/mikrotik_signal +++ b/checks/mikrotik_signal @@ -28,22 +28,22 @@ mikrotik_signal_default_levels = ( 80, 70 ) def inventory_mikrotik_signal(info): inventory = [] - for network, strenght, mode in info: + for network, strength, mode in info: inventory.append((network, "mikrotik_signal_default_levels")) return inventory def check_mikrotik_signal(item, params, info): warn, crit = params - for network, strenght, mode in info: + for network, strength, mode in info: if network == item: - strenght = saveint(strenght) + strength = saveint(strength) quality = "0" - if strenght <= -50 or strenght >= -100: - quality = 2 * ( strenght + 100 ) + if strength <= -50 or strength >= -100: + quality = 2 * ( strength + 100 ) if quality > 100: quality = 100 - infotext = "Signal quality %d%% (%ddBm). Mode is: %s" % ( quality, strenght, mode ) + infotext = "Signal quality %d%% (%ddBm). Mode is: %s" % ( quality, strength, mode ) perf = [ ("quality", quality, warn, crit) ] if quality <= crit: return 2, infotext, perf

8 years, 11 months

Check_MK Git: check_mk: #2488 FIX veem_jobs: fix problems with spaces or single quotes in the names of jobs

by Mathias Kettner

Module: check_mk Branch: master Commit: 769cfff4a9adae85188fa65fe907934dd92c0697 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=769cfff4a9adae… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jul 28 10:06:38 2015 +0200 #2488 FIX veem_jobs: fix problems with spaces or single quotes in the names of jobs The fix is in the agent plugin <tt>veeam_backup_status.ps1_</tt> so you need to update that in order to deploy the fix. Thanks to Andreas Döhler. --- .werks/2488 | 11 +++++++++++ ChangeLog | 1 + agents/windows/plugins/veeam_backup_status.ps1_ | 18 +++++++++++++----- 3 files changed, 25 insertions(+), 5 deletions(-) diff --git a/.werks/2488 b/.werks/2488 new file mode 100644 index 0000000..c9fe55e --- /dev/null +++ b/.werks/2488 @@ -0,0 +1,11 @@ +Title: veem_jobs: fix problems with spaces or single quotes in the names of jobs +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i3 +Date: 1438070733 + +The fix is in the agent plugin <tt>veeam_backup_status.ps1_</tt> so you need to +update that in order to deploy the fix. Thanks to Andreas Döhler. diff --git a/ChangeLog b/ChangeLog index 1901761..5c1ee6b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -78,6 +78,7 @@ * 2476 FIX: check_bi_aggr: Fixed exception when authentication is enabled * 2477 FIX: SNMP: Fixed exception when processing specific SNMP data with missing columns... * 1274 FIX: heartbeat_crm: Handle case of error messages from CRM + * 2488 FIX: veem_jobs: fix problems with spaces or single quotes in the names of jobs... Multisite: * 2385 SEC: Fixed possible reflected XSS on all GUI pages where users can produce unhandled exceptions... diff --git a/agents/windows/plugins/veeam_backup_status.ps1_ b/agents/windows/plugins/veeam_backup_status.ps1_ index cf8d38f..36a0226 100644 --- a/agents/windows/plugins/veeam_backup_status.ps1_ +++ b/agents/windows/plugins/veeam_backup_status.ps1_ @@ -6,6 +6,14 @@ # directory given in veeam_backup_status.bat and the .bat file needs to be # started by the check_mk agent instead. +$pshost = get-host +$pswindow = $pshost.ui.rawui + +$newsize = $pswindow.buffersize +$newsize.height = 300 +$newsize.width = 150 +$pswindow.buffersize = $newsize + # Get Information from veeam backup and replication in cmk-friendly format # V0.9 # Load Veeam Backup and Replication Powershell Snapin @@ -30,7 +38,7 @@ $myBackupJobs = Get-VBRJob | where {$_.IsScheduleEnabled -eq $true } foreach ($myJob in $myBackupJobs) { $myJobName = "" - $myJobName = $myJob.Name + $myJobName = $myJob.Name -replace "\'","_" -replace " ","_" $myJobType = "" $myJobType = $myjob.JobType @@ -78,13 +86,13 @@ foreach ($myJob in $myBackupJobs) $myTaskTotalSize = $myTask.Progress.TotalSize $myTaskText = "$myTaskText" + "TotalSizeByte" + "`t" + "$myTaskTotalSize" + "`n" - + $myTaskReadSize = $myTask.Progress.ReadSize - + $myTaskText = "$myTaskText" + "ReadSizeByte" + "`t" + "$myTaskReadSize" + "`n" - + $myTaskTransferedSize = $myTask.Progress.TransferedSize - + $myTaskText = "$myTaskText" + "TransferedSizeByte" + "`t" + "$myTaskTransferedSize" + "`n" $myTaskStartTime = ""

8 years, 11 months

Check_MK Git: check_mk: #2493 FIX Fixed wrong JSON format when using stats queries together with header columns

by Lars Michelsen

Module: check_mk Branch: master Commit: b98f45166023e538dda70300b68909b8273809bd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b98f45166023e5… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jul 28 09:55:39 2015 +0200 #2493 FIX Fixed wrong JSON format when using stats queries together with header columns e.g. this query lead to invalid JSON output: GET statehist Filter: time >= 1425168000 Filter: time < 1427846400 Filter: host_name = name Filter: service_description = Description Stats: sum duration_part_ok OutputFormat: json ColumnHeaders: on Output: [["stats_1"][0.0000000000e+00]] --- .werks/2493 | 22 ++++++++++++++++++++++ ChangeLog | 3 +++ livestatus/src/Query.cc | 5 +++++ 3 files changed, 30 insertions(+) diff --git a/.werks/2493 b/.werks/2493 new file mode 100644 index 0000000..3dc6eab --- /dev/null +++ b/.werks/2493 @@ -0,0 +1,22 @@ +Title: Fixed wrong JSON format when using stats queries together with header columns +Level: 1 +Component: livestatus +Compatible: compat +Version: 1.2.7i3 +Date: 1438069896 +Class: fix + +e.g. this query lead to invalid JSON output: + +GET statehist +Filter: time >= 1425168000 +Filter: time < 1427846400 +Filter: host_name = name +Filter: service_description = Description +Stats: sum duration_part_ok +OutputFormat: json +ColumnHeaders: on + +Output: +[["stats_1"][0.0000000000e+00]] + diff --git a/ChangeLog b/ChangeLog index ae5df7e..1901761 100644 --- a/ChangeLog +++ b/ChangeLog @@ -142,6 +142,9 @@ * 2322 FIX: mkeventd: MIBs are now only loaded if SNMP Traps translation is activated... * 2460 FIX: Slightly more robust SNMP trap translation... + Livestatus: + * 2493 FIX: Fixed wrong JSON format when using stats queries together with header columns... + HW/SW-Inventory: * 2128 mk_inventory.vbs: inventory plugin for Windows now available as vbs script... * 2367 FIX: win_system: Fixed exception when non-UTF-8 sequences are contained agent output diff --git a/livestatus/src/Query.cc b/livestatus/src/Query.cc index 8bb3b93..876cb5a 100644 --- a/livestatus/src/Query.cc +++ b/livestatus/src/Query.cc @@ -963,6 +963,11 @@ void Query::finish() // stats without group column else if (doStats()) { + if (_need_ds_separator && _output_format != OUTPUT_FORMAT_CSV) + _output->addBuffer(",\n", 2); + else + _need_ds_separator = true; + outputDatasetBegin(); for (unsigned i=0; i<_stats_columns.size(); i++) {

8 years, 11 months

← Newer
1
2
3
4
5
6
7
8
...
29
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits July 2015