tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Livestatus: Fix 'OutputFormat:json' w/o space is valid (NagVis bug) 

Fixes #6470
This commit is contained in:
Michael Friedrich 2014-06-11 22:53:56 +02:00
parent 318136257f
commit 8d344ebb3a
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
components/livestatus/livestatusquery.cpp
View File

@ -106,8 +106,11 @@ LivestatusQuery::LivestatusQuery(const std::vector<String>& lines, const String&
String header = line.SubStr(0, col_index); String header = line.SubStr(0, col_index);
String params; String params;
if (line.GetLength() > col_index + 2) //OutputFormat:json or OutputFormat: json
params = line.SubStr(col_index + 2); if (line.GetLength() > col_index + 1)
params = line.SubStr(col_index + 1);
params.Trim();
if (header == "ResponseHeader") if (header == "ResponseHeader")
m_ResponseHeader = params; m_ResponseHeader = params;

6
test/livestatus/queries/host/host_nagvis Normal file
View File

@ -0,0 +1,6 @@
GET hosts
Columns: name alias
OutputFormat:json
KeepAlive: on
ResponseHeader: fixed16