diff --git a/src/fixtures/vislib/mock_data/date_histogram/_columns.js b/src/fixtures/vislib/mock_data/date_histogram/_columns.js index 60166ba592684..a84b4683c3200 100644 --- a/src/fixtures/vislib/mock_data/date_histogram/_columns.js +++ b/src/fixtures/vislib/mock_data/date_histogram/_columns.js @@ -1,7 +1,8 @@ import moment from 'moment'; export default { - 'columns': [ + 'split': 'columns', + 'charts': [ { 'label': '200: response', 'xAxisLabel': '@timestamp per 30 sec', diff --git a/src/fixtures/vislib/mock_data/date_histogram/_rows.js b/src/fixtures/vislib/mock_data/date_histogram/_rows.js index b9b6df6c0916a..2849ce7657057 100644 --- a/src/fixtures/vislib/mock_data/date_histogram/_rows.js +++ b/src/fixtures/vislib/mock_data/date_histogram/_rows.js @@ -1,7 +1,8 @@ import moment from 'moment'; export default { - 'rows': [ + 'split': 'rows', + 'charts': [ { 'label': '0.0-1000.0: bytes', 'xAxisLabel': '@timestamp per 30 sec', diff --git a/src/fixtures/vislib/mock_data/date_histogram/_series.js b/src/fixtures/vislib/mock_data/date_histogram/_series.js index b26c687c6c86e..cad7fcc7b4668 100644 --- a/src/fixtures/vislib/mock_data/date_histogram/_series.js +++ b/src/fixtures/vislib/mock_data/date_histogram/_series.js @@ -1,151 +1,153 @@ import moment from 'moment'; export default { - 'label': '', - 'xAxisLabel': '@timestamp per 30 sec', - 'ordered': { - 'date': true, - 'min': 1411761457636, - 'max': 1411762357636, - 'interval': 30000 - }, - 'yAxisLabel': 'Count of documents', - 'series': [ - { - 'label': 'Count', - 'values': [ - { - 'x': 1411761450000, - 'y': 41 - }, - { - 'x': 1411761480000, - 'y': 18 - }, - { - 'x': 1411761510000, - 'y': 22 - }, - { - 'x': 1411761540000, - 'y': 17 - }, - { - 'x': 1411761570000, - 'y': 17 - }, - { - 'x': 1411761600000, - 'y': 21 - }, - { - 'x': 1411761630000, - 'y': 16 - }, - { - 'x': 1411761660000, - 'y': 17 - }, - { - 'x': 1411761690000, - 'y': 15 - }, - { - 'x': 1411761720000, - 'y': 19 - }, - { - 'x': 1411761750000, - 'y': 11 - }, - { - 'x': 1411761780000, - 'y': 13 - }, - { - 'x': 1411761810000, - 'y': 24 - }, - { - 'x': 1411761840000, - 'y': 20 - }, - { - 'x': 1411761870000, - 'y': 20 - }, - { - 'x': 1411761900000, - 'y': 21 - }, - { - 'x': 1411761930000, - 'y': 17 - }, - { - 'x': 1411761960000, - 'y': 20 - }, - { - 'x': 1411761990000, - 'y': 13 - }, - { - 'x': 1411762020000, - 'y': 14 - }, - { - 'x': 1411762050000, - 'y': 25 - }, - { - 'x': 1411762080000, - 'y': 17 - }, - { - 'x': 1411762110000, - 'y': 14 - }, - { - 'x': 1411762140000, - 'y': 22 - }, - { - 'x': 1411762170000, - 'y': 14 - }, - { - 'x': 1411762200000, - 'y': 19 - }, - { - 'x': 1411762230000, - 'y': 22 - }, - { - 'x': 1411762260000, - 'y': 17 - }, - { - 'x': 1411762290000, - 'y': 8 - }, - { - 'x': 1411762320000, - 'y': 15 - }, - { - 'x': 1411762350000, - 'y': 4 - } - ] + 'charts': [{ + 'label': '', + 'xAxisLabel': '@timestamp per 30 sec', + 'ordered': { + 'date': true, + 'min': 1411761457636, + 'max': 1411762357636, + 'interval': 30000 + }, + 'yAxisLabel': 'Count of documents', + 'series': [ + { + 'label': 'Count', + 'values': [ + { + 'x': 1411761450000, + 'y': 41 + }, + { + 'x': 1411761480000, + 'y': 18 + }, + { + 'x': 1411761510000, + 'y': 22 + }, + { + 'x': 1411761540000, + 'y': 17 + }, + { + 'x': 1411761570000, + 'y': 17 + }, + { + 'x': 1411761600000, + 'y': 21 + }, + { + 'x': 1411761630000, + 'y': 16 + }, + { + 'x': 1411761660000, + 'y': 17 + }, + { + 'x': 1411761690000, + 'y': 15 + }, + { + 'x': 1411761720000, + 'y': 19 + }, + { + 'x': 1411761750000, + 'y': 11 + }, + { + 'x': 1411761780000, + 'y': 13 + }, + { + 'x': 1411761810000, + 'y': 24 + }, + { + 'x': 1411761840000, + 'y': 20 + }, + { + 'x': 1411761870000, + 'y': 20 + }, + { + 'x': 1411761900000, + 'y': 21 + }, + { + 'x': 1411761930000, + 'y': 17 + }, + { + 'x': 1411761960000, + 'y': 20 + }, + { + 'x': 1411761990000, + 'y': 13 + }, + { + 'x': 1411762020000, + 'y': 14 + }, + { + 'x': 1411762050000, + 'y': 25 + }, + { + 'x': 1411762080000, + 'y': 17 + }, + { + 'x': 1411762110000, + 'y': 14 + }, + { + 'x': 1411762140000, + 'y': 22 + }, + { + 'x': 1411762170000, + 'y': 14 + }, + { + 'x': 1411762200000, + 'y': 19 + }, + { + 'x': 1411762230000, + 'y': 22 + }, + { + 'x': 1411762260000, + 'y': 17 + }, + { + 'x': 1411762290000, + 'y': 8 + }, + { + 'x': 1411762320000, + 'y': 15 + }, + { + 'x': 1411762350000, + 'y': 4 + } + ] + } + ], + 'xAxisFormatter': function (thing) { + return moment(thing); + }, + 'tooltipFormatter': function (d) { + return d; } - ], - 'hits': 533, - 'xAxisFormatter': function (thing) { - return moment(thing); - }, - 'tooltipFormatter': function (d) { - return d; - } + }], + 'hits': 533 }; diff --git a/src/fixtures/vislib/mock_data/date_histogram/_series_neg.js b/src/fixtures/vislib/mock_data/date_histogram/_series_neg.js index 15d08b1b0ac7f..348fecfe05fe8 100644 --- a/src/fixtures/vislib/mock_data/date_histogram/_series_neg.js +++ b/src/fixtures/vislib/mock_data/date_histogram/_series_neg.js @@ -1,151 +1,153 @@ import moment from 'moment'; export default { - 'label': '', - 'xAxisLabel': '@timestamp per 30 sec', - 'ordered': { - 'date': true, - 'min': 1411761457636, - 'max': 1411762357636, - 'interval': 30000 - }, - 'yAxisLabel': 'Count of documents', - 'series': [ - { - 'label': 'Count', - 'values': [ - { - 'x': 1411761450000, - 'y': -41 - }, - { - 'x': 1411761480000, - 'y': -18 - }, - { - 'x': 1411761510000, - 'y': -22 - }, - { - 'x': 1411761540000, - 'y': -17 - }, - { - 'x': 1411761570000, - 'y': -17 - }, - { - 'x': 1411761600000, - 'y': -21 - }, - { - 'x': 1411761630000, - 'y': -16 - }, - { - 'x': 1411761660000, - 'y': -17 - }, - { - 'x': 1411761690000, - 'y': -15 - }, - { - 'x': 1411761720000, - 'y': -19 - }, - { - 'x': 1411761750000, - 'y': -11 - }, - { - 'x': 1411761780000, - 'y': -13 - }, - { - 'x': 1411761810000, - 'y': -24 - }, - { - 'x': 1411761840000, - 'y': -20 - }, - { - 'x': 1411761870000, - 'y': -20 - }, - { - 'x': 1411761900000, - 'y': -21 - }, - { - 'x': 1411761930000, - 'y': -17 - }, - { - 'x': 1411761960000, - 'y': -20 - }, - { - 'x': 1411761990000, - 'y': -13 - }, - { - 'x': 1411762020000, - 'y': -14 - }, - { - 'x': 1411762050000, - 'y': -25 - }, - { - 'x': 1411762080000, - 'y': -17 - }, - { - 'x': 1411762110000, - 'y': -14 - }, - { - 'x': 1411762140000, - 'y': -22 - }, - { - 'x': 1411762170000, - 'y': -14 - }, - { - 'x': 1411762200000, - 'y': -19 - }, - { - 'x': 1411762230000, - 'y': -22 - }, - { - 'x': 1411762260000, - 'y': -17 - }, - { - 'x': 1411762290000, - 'y': -8 - }, - { - 'x': 1411762320000, - 'y': -15 - }, - { - 'x': 1411762350000, - 'y': -4 - } - ] + 'charts': [{ + 'label': '', + 'xAxisLabel': '@timestamp per 30 sec', + 'ordered': { + 'date': true, + 'min': 1411761457636, + 'max': 1411762357636, + 'interval': 30000 + }, + 'yAxisLabel': 'Count of documents', + 'series': [ + { + 'label': 'Count', + 'values': [ + { + 'x': 1411761450000, + 'y': -41 + }, + { + 'x': 1411761480000, + 'y': -18 + }, + { + 'x': 1411761510000, + 'y': -22 + }, + { + 'x': 1411761540000, + 'y': -17 + }, + { + 'x': 1411761570000, + 'y': -17 + }, + { + 'x': 1411761600000, + 'y': -21 + }, + { + 'x': 1411761630000, + 'y': -16 + }, + { + 'x': 1411761660000, + 'y': -17 + }, + { + 'x': 1411761690000, + 'y': -15 + }, + { + 'x': 1411761720000, + 'y': -19 + }, + { + 'x': 1411761750000, + 'y': -11 + }, + { + 'x': 1411761780000, + 'y': -13 + }, + { + 'x': 1411761810000, + 'y': -24 + }, + { + 'x': 1411761840000, + 'y': -20 + }, + { + 'x': 1411761870000, + 'y': -20 + }, + { + 'x': 1411761900000, + 'y': -21 + }, + { + 'x': 1411761930000, + 'y': -17 + }, + { + 'x': 1411761960000, + 'y': -20 + }, + { + 'x': 1411761990000, + 'y': -13 + }, + { + 'x': 1411762020000, + 'y': -14 + }, + { + 'x': 1411762050000, + 'y': -25 + }, + { + 'x': 1411762080000, + 'y': -17 + }, + { + 'x': 1411762110000, + 'y': -14 + }, + { + 'x': 1411762140000, + 'y': -22 + }, + { + 'x': 1411762170000, + 'y': -14 + }, + { + 'x': 1411762200000, + 'y': -19 + }, + { + 'x': 1411762230000, + 'y': -22 + }, + { + 'x': 1411762260000, + 'y': -17 + }, + { + 'x': 1411762290000, + 'y': -8 + }, + { + 'x': 1411762320000, + 'y': -15 + }, + { + 'x': 1411762350000, + 'y': -4 + } + ] + } + ], + 'xAxisFormatter': function (thing) { + return moment(thing); + }, + 'tooltipFormatter': function (d) { + return d; } - ], - 'hits': 533, - 'xAxisFormatter': function (thing) { - return moment(thing); - }, - 'tooltipFormatter': function (d) { - return d; - } + }], + 'hits': 533 }; diff --git a/src/fixtures/vislib/mock_data/date_histogram/_series_pos_neg.js b/src/fixtures/vislib/mock_data/date_histogram/_series_pos_neg.js index f85bb2b042d6f..0c03928fa92f8 100644 --- a/src/fixtures/vislib/mock_data/date_histogram/_series_pos_neg.js +++ b/src/fixtures/vislib/mock_data/date_histogram/_series_pos_neg.js @@ -1,151 +1,153 @@ import moment from 'moment'; export default { - 'label': '', - 'xAxisLabel': '@timestamp per 30 sec', - 'ordered': { - 'date': true, - 'min': 1411761457636, - 'max': 1411762357636, - 'interval': 30000 - }, - 'yAxisLabel': 'Count of documents', - 'series': [ - { - 'label': 'Count', - 'values': [ - { - 'x': 1411761450000, - 'y': 41 - }, - { - 'x': 1411761480000, - 'y': 18 - }, - { - 'x': 1411761510000, - 'y': -22 - }, - { - 'x': 1411761540000, - 'y': -17 - }, - { - 'x': 1411761570000, - 'y': -17 - }, - { - 'x': 1411761600000, - 'y': -21 - }, - { - 'x': 1411761630000, - 'y': -16 - }, - { - 'x': 1411761660000, - 'y': 17 - }, - { - 'x': 1411761690000, - 'y': 15 - }, - { - 'x': 1411761720000, - 'y': 19 - }, - { - 'x': 1411761750000, - 'y': 11 - }, - { - 'x': 1411761780000, - 'y': -13 - }, - { - 'x': 1411761810000, - 'y': -24 - }, - { - 'x': 1411761840000, - 'y': -20 - }, - { - 'x': 1411761870000, - 'y': -20 - }, - { - 'x': 1411761900000, - 'y': -21 - }, - { - 'x': 1411761930000, - 'y': 17 - }, - { - 'x': 1411761960000, - 'y': 20 - }, - { - 'x': 1411761990000, - 'y': -13 - }, - { - 'x': 1411762020000, - 'y': -14 - }, - { - 'x': 1411762050000, - 'y': 25 - }, - { - 'x': 1411762080000, - 'y': -17 - }, - { - 'x': 1411762110000, - 'y': -14 - }, - { - 'x': 1411762140000, - 'y': -22 - }, - { - 'x': 1411762170000, - 'y': -14 - }, - { - 'x': 1411762200000, - 'y': 19 - }, - { - 'x': 1411762230000, - 'y': 22 - }, - { - 'x': 1411762260000, - 'y': 17 - }, - { - 'x': 1411762290000, - 'y': 8 - }, - { - 'x': 1411762320000, - 'y': -15 - }, - { - 'x': 1411762350000, - 'y': -4 - } - ] + 'charts': [{ + 'label': '', + 'xAxisLabel': '@timestamp per 30 sec', + 'ordered': { + 'date': true, + 'min': 1411761457636, + 'max': 1411762357636, + 'interval': 30000 + }, + 'yAxisLabel': 'Count of documents', + 'series': [ + { + 'label': 'Count', + 'values': [ + { + 'x': 1411761450000, + 'y': 41 + }, + { + 'x': 1411761480000, + 'y': 18 + }, + { + 'x': 1411761510000, + 'y': -22 + }, + { + 'x': 1411761540000, + 'y': -17 + }, + { + 'x': 1411761570000, + 'y': -17 + }, + { + 'x': 1411761600000, + 'y': -21 + }, + { + 'x': 1411761630000, + 'y': -16 + }, + { + 'x': 1411761660000, + 'y': 17 + }, + { + 'x': 1411761690000, + 'y': 15 + }, + { + 'x': 1411761720000, + 'y': 19 + }, + { + 'x': 1411761750000, + 'y': 11 + }, + { + 'x': 1411761780000, + 'y': -13 + }, + { + 'x': 1411761810000, + 'y': -24 + }, + { + 'x': 1411761840000, + 'y': -20 + }, + { + 'x': 1411761870000, + 'y': -20 + }, + { + 'x': 1411761900000, + 'y': -21 + }, + { + 'x': 1411761930000, + 'y': 17 + }, + { + 'x': 1411761960000, + 'y': 20 + }, + { + 'x': 1411761990000, + 'y': -13 + }, + { + 'x': 1411762020000, + 'y': -14 + }, + { + 'x': 1411762050000, + 'y': 25 + }, + { + 'x': 1411762080000, + 'y': -17 + }, + { + 'x': 1411762110000, + 'y': -14 + }, + { + 'x': 1411762140000, + 'y': -22 + }, + { + 'x': 1411762170000, + 'y': -14 + }, + { + 'x': 1411762200000, + 'y': 19 + }, + { + 'x': 1411762230000, + 'y': 22 + }, + { + 'x': 1411762260000, + 'y': 17 + }, + { + 'x': 1411762290000, + 'y': 8 + }, + { + 'x': 1411762320000, + 'y': -15 + }, + { + 'x': 1411762350000, + 'y': -4 + } + ] + } + ], + 'xAxisFormatter': function (thing) { + return moment(thing); + }, + 'tooltipFormatter': function (d) { + return d; } - ], - 'hits': 533, - 'xAxisFormatter': function (thing) { - return moment(thing); - }, - 'tooltipFormatter': function (d) { - return d; - } + }], + 'hits': 533 }; diff --git a/src/fixtures/vislib/mock_data/date_histogram/_stacked_series.js b/src/fixtures/vislib/mock_data/date_histogram/_stacked_series.js index 8c77336f997b7..50b415cab6d05 100644 --- a/src/fixtures/vislib/mock_data/date_histogram/_stacked_series.js +++ b/src/fixtures/vislib/mock_data/date_histogram/_stacked_series.js @@ -1,1483 +1,1485 @@ import moment from 'moment'; export default { - 'label': '', - 'xAxisLabel': '@timestamp per 10 min', - 'ordered': { - 'date': true, - 'min': 1413544140087, - 'max': 1413587340087, - 'interval': 600000 - }, - 'yAxisLabel': 'Count of documents', - 'series': [ - { - 'label': 'html', - 'values': [ - { - 'x': 1413543600000, - 'y': 140 - }, - { - 'x': 1413544200000, - 'y': 1388 - }, - { - 'x': 1413544800000, - 'y': 1308 - }, - { - 'x': 1413545400000, - 'y': 1356 - }, - { - 'x': 1413546000000, - 'y': 1314 - }, - { - 'x': 1413546600000, - 'y': 1343 - }, - { - 'x': 1413547200000, - 'y': 1353 - }, - { - 'x': 1413547800000, - 'y': 1353 - }, - { - 'x': 1413548400000, - 'y': 1334 - }, - { - 'x': 1413549000000, - 'y': 1433 - }, - { - 'x': 1413549600000, - 'y': 1331 - }, - { - 'x': 1413550200000, - 'y': 1349 - }, - { - 'x': 1413550800000, - 'y': 1323 - }, - { - 'x': 1413551400000, - 'y': 1203 - }, - { - 'x': 1413552000000, - 'y': 1231 - }, - { - 'x': 1413552600000, - 'y': 1227 - }, - { - 'x': 1413553200000, - 'y': 1187 - }, - { - 'x': 1413553800000, - 'y': 1119 - }, - { - 'x': 1413554400000, - 'y': 1159 - }, - { - 'x': 1413555000000, - 'y': 1117 - }, - { - 'x': 1413555600000, - 'y': 1152 - }, - { - 'x': 1413556200000, - 'y': 1057 - }, - { - 'x': 1413556800000, - 'y': 1009 - }, - { - 'x': 1413557400000, - 'y': 979 - }, - { - 'x': 1413558000000, - 'y': 975 - }, - { - 'x': 1413558600000, - 'y': 848 - }, - { - 'x': 1413559200000, - 'y': 873 - }, - { - 'x': 1413559800000, - 'y': 808 - }, - { - 'x': 1413560400000, - 'y': 784 - }, - { - 'x': 1413561000000, - 'y': 799 - }, - { - 'x': 1413561600000, - 'y': 684 - }, - { - 'x': 1413562200000, - 'y': 727 - }, - { - 'x': 1413562800000, - 'y': 621 - }, - { - 'x': 1413563400000, - 'y': 615 - }, - { - 'x': 1413564000000, - 'y': 569 - }, - { - 'x': 1413564600000, - 'y': 523 - }, - { - 'x': 1413565200000, - 'y': 474 - }, - { - 'x': 1413565800000, - 'y': 470 - }, - { - 'x': 1413566400000, - 'y': 466 - }, - { - 'x': 1413567000000, - 'y': 394 - }, - { - 'x': 1413567600000, - 'y': 404 - }, - { - 'x': 1413568200000, - 'y': 389 - }, - { - 'x': 1413568800000, - 'y': 312 - }, - { - 'x': 1413569400000, - 'y': 274 - }, - { - 'x': 1413570000000, - 'y': 285 - }, - { - 'x': 1413570600000, - 'y': 299 - }, - { - 'x': 1413571200000, - 'y': 207 - }, - { - 'x': 1413571800000, - 'y': 213 - }, - { - 'x': 1413572400000, - 'y': 119 - }, - { - 'x': 1413573600000, - 'y': 122 - }, - { - 'x': 1413574200000, - 'y': 169 - }, - { - 'x': 1413574800000, - 'y': 151 - }, - { - 'x': 1413575400000, - 'y': 152 - }, - { - 'x': 1413576000000, - 'y': 115 - }, - { - 'x': 1413576600000, - 'y': 117 - }, - { - 'x': 1413577200000, - 'y': 108 - }, - { - 'x': 1413577800000, - 'y': 100 - }, - { - 'x': 1413578400000, - 'y': 78 - }, - { - 'x': 1413579000000, - 'y': 88 - }, - { - 'x': 1413579600000, - 'y': 63 - }, - { - 'x': 1413580200000, - 'y': 58 - }, - { - 'x': 1413580800000, - 'y': 45 - }, - { - 'x': 1413581400000, - 'y': 57 - }, - { - 'x': 1413582000000, - 'y': 34 - }, - { - 'x': 1413582600000, - 'y': 41 - }, - { - 'x': 1413583200000, - 'y': 24 - }, - { - 'x': 1413583800000, - 'y': 27 - }, - { - 'x': 1413584400000, - 'y': 19 - }, - { - 'x': 1413585000000, - 'y': 24 - }, - { - 'x': 1413585600000, - 'y': 18 - }, - { - 'x': 1413586200000, - 'y': 17 - }, - { - 'x': 1413586800000, - 'y': 14 - } - ] + 'charts': [{ + 'label': '', + 'xAxisLabel': '@timestamp per 10 min', + 'ordered': { + 'date': true, + 'min': 1413544140087, + 'max': 1413587340087, + 'interval': 600000 }, - { - 'label': 'php', - 'values': [ - { - 'x': 1413543600000, - 'y': 90 - }, - { - 'x': 1413544200000, - 'y': 949 - }, - { - 'x': 1413544800000, - 'y': 1012 - }, - { - 'x': 1413545400000, - 'y': 1027 - }, - { - 'x': 1413546000000, - 'y': 1073 - }, - { - 'x': 1413546600000, - 'y': 992 - }, - { - 'x': 1413547200000, - 'y': 1005 - }, - { - 'x': 1413547800000, - 'y': 1014 - }, - { - 'x': 1413548400000, - 'y': 987 - }, - { - 'x': 1413549000000, - 'y': 982 - }, - { - 'x': 1413549600000, - 'y': 1086 - }, - { - 'x': 1413550200000, - 'y': 998 - }, - { - 'x': 1413550800000, - 'y': 935 - }, - { - 'x': 1413551400000, - 'y': 995 - }, - { - 'x': 1413552000000, - 'y': 926 - }, - { - 'x': 1413552600000, - 'y': 897 - }, - { - 'x': 1413553200000, - 'y': 873 - }, - { - 'x': 1413553800000, - 'y': 885 - }, - { - 'x': 1413554400000, - 'y': 859 - }, - { - 'x': 1413555000000, - 'y': 852 - }, - { - 'x': 1413555600000, - 'y': 779 - }, - { - 'x': 1413556200000, - 'y': 739 - }, - { - 'x': 1413556800000, - 'y': 783 - }, - { - 'x': 1413557400000, - 'y': 784 - }, - { - 'x': 1413558000000, - 'y': 687 - }, - { - 'x': 1413558600000, - 'y': 660 - }, - { - 'x': 1413559200000, - 'y': 672 - }, - { - 'x': 1413559800000, - 'y': 600 - }, - { - 'x': 1413560400000, - 'y': 659 - }, - { - 'x': 1413561000000, - 'y': 540 - }, - { - 'x': 1413561600000, - 'y': 539 - }, - { - 'x': 1413562200000, - 'y': 481 - }, - { - 'x': 1413562800000, - 'y': 498 - }, - { - 'x': 1413563400000, - 'y': 444 - }, - { - 'x': 1413564000000, - 'y': 452 - }, - { - 'x': 1413564600000, - 'y': 408 - }, - { - 'x': 1413565200000, - 'y': 358 - }, - { - 'x': 1413565800000, - 'y': 321 - }, - { - 'x': 1413566400000, - 'y': 305 - }, - { - 'x': 1413567000000, - 'y': 292 - }, - { - 'x': 1413567600000, - 'y': 289 - }, - { - 'x': 1413568200000, - 'y': 239 - }, - { - 'x': 1413568800000, - 'y': 256 - }, - { - 'x': 1413569400000, - 'y': 220 - }, - { - 'x': 1413570000000, - 'y': 205 - }, - { - 'x': 1413570600000, - 'y': 201 - }, - { - 'x': 1413571200000, - 'y': 183 - }, - { - 'x': 1413571800000, - 'y': 172 - }, - { - 'x': 1413572400000, - 'y': 73 - }, - { - 'x': 1413573600000, - 'y': 90 - }, - { - 'x': 1413574200000, - 'y': 130 - }, - { - 'x': 1413574800000, - 'y': 104 - }, - { - 'x': 1413575400000, - 'y': 108 - }, - { - 'x': 1413576000000, - 'y': 92 - }, - { - 'x': 1413576600000, - 'y': 79 - }, - { - 'x': 1413577200000, - 'y': 90 - }, - { - 'x': 1413577800000, - 'y': 72 - }, - { - 'x': 1413578400000, - 'y': 68 - }, - { - 'x': 1413579000000, - 'y': 52 - }, - { - 'x': 1413579600000, - 'y': 60 - }, - { - 'x': 1413580200000, - 'y': 51 - }, - { - 'x': 1413580800000, - 'y': 32 - }, - { - 'x': 1413581400000, - 'y': 37 - }, - { - 'x': 1413582000000, - 'y': 30 - }, - { - 'x': 1413582600000, - 'y': 29 - }, - { - 'x': 1413583200000, - 'y': 24 - }, - { - 'x': 1413583800000, - 'y': 16 - }, - { - 'x': 1413584400000, - 'y': 15 - }, - { - 'x': 1413585000000, - 'y': 15 - }, - { - 'x': 1413585600000, - 'y': 10 - }, - { - 'x': 1413586200000, - 'y': 9 - }, - { - 'x': 1413586800000, - 'y': 9 - } - ] + 'yAxisLabel': 'Count of documents', + 'series': [ + { + 'label': 'html', + 'values': [ + { + 'x': 1413543600000, + 'y': 140 + }, + { + 'x': 1413544200000, + 'y': 1388 + }, + { + 'x': 1413544800000, + 'y': 1308 + }, + { + 'x': 1413545400000, + 'y': 1356 + }, + { + 'x': 1413546000000, + 'y': 1314 + }, + { + 'x': 1413546600000, + 'y': 1343 + }, + { + 'x': 1413547200000, + 'y': 1353 + }, + { + 'x': 1413547800000, + 'y': 1353 + }, + { + 'x': 1413548400000, + 'y': 1334 + }, + { + 'x': 1413549000000, + 'y': 1433 + }, + { + 'x': 1413549600000, + 'y': 1331 + }, + { + 'x': 1413550200000, + 'y': 1349 + }, + { + 'x': 1413550800000, + 'y': 1323 + }, + { + 'x': 1413551400000, + 'y': 1203 + }, + { + 'x': 1413552000000, + 'y': 1231 + }, + { + 'x': 1413552600000, + 'y': 1227 + }, + { + 'x': 1413553200000, + 'y': 1187 + }, + { + 'x': 1413553800000, + 'y': 1119 + }, + { + 'x': 1413554400000, + 'y': 1159 + }, + { + 'x': 1413555000000, + 'y': 1117 + }, + { + 'x': 1413555600000, + 'y': 1152 + }, + { + 'x': 1413556200000, + 'y': 1057 + }, + { + 'x': 1413556800000, + 'y': 1009 + }, + { + 'x': 1413557400000, + 'y': 979 + }, + { + 'x': 1413558000000, + 'y': 975 + }, + { + 'x': 1413558600000, + 'y': 848 + }, + { + 'x': 1413559200000, + 'y': 873 + }, + { + 'x': 1413559800000, + 'y': 808 + }, + { + 'x': 1413560400000, + 'y': 784 + }, + { + 'x': 1413561000000, + 'y': 799 + }, + { + 'x': 1413561600000, + 'y': 684 + }, + { + 'x': 1413562200000, + 'y': 727 + }, + { + 'x': 1413562800000, + 'y': 621 + }, + { + 'x': 1413563400000, + 'y': 615 + }, + { + 'x': 1413564000000, + 'y': 569 + }, + { + 'x': 1413564600000, + 'y': 523 + }, + { + 'x': 1413565200000, + 'y': 474 + }, + { + 'x': 1413565800000, + 'y': 470 + }, + { + 'x': 1413566400000, + 'y': 466 + }, + { + 'x': 1413567000000, + 'y': 394 + }, + { + 'x': 1413567600000, + 'y': 404 + }, + { + 'x': 1413568200000, + 'y': 389 + }, + { + 'x': 1413568800000, + 'y': 312 + }, + { + 'x': 1413569400000, + 'y': 274 + }, + { + 'x': 1413570000000, + 'y': 285 + }, + { + 'x': 1413570600000, + 'y': 299 + }, + { + 'x': 1413571200000, + 'y': 207 + }, + { + 'x': 1413571800000, + 'y': 213 + }, + { + 'x': 1413572400000, + 'y': 119 + }, + { + 'x': 1413573600000, + 'y': 122 + }, + { + 'x': 1413574200000, + 'y': 169 + }, + { + 'x': 1413574800000, + 'y': 151 + }, + { + 'x': 1413575400000, + 'y': 152 + }, + { + 'x': 1413576000000, + 'y': 115 + }, + { + 'x': 1413576600000, + 'y': 117 + }, + { + 'x': 1413577200000, + 'y': 108 + }, + { + 'x': 1413577800000, + 'y': 100 + }, + { + 'x': 1413578400000, + 'y': 78 + }, + { + 'x': 1413579000000, + 'y': 88 + }, + { + 'x': 1413579600000, + 'y': 63 + }, + { + 'x': 1413580200000, + 'y': 58 + }, + { + 'x': 1413580800000, + 'y': 45 + }, + { + 'x': 1413581400000, + 'y': 57 + }, + { + 'x': 1413582000000, + 'y': 34 + }, + { + 'x': 1413582600000, + 'y': 41 + }, + { + 'x': 1413583200000, + 'y': 24 + }, + { + 'x': 1413583800000, + 'y': 27 + }, + { + 'x': 1413584400000, + 'y': 19 + }, + { + 'x': 1413585000000, + 'y': 24 + }, + { + 'x': 1413585600000, + 'y': 18 + }, + { + 'x': 1413586200000, + 'y': 17 + }, + { + 'x': 1413586800000, + 'y': 14 + } + ] + }, + { + 'label': 'php', + 'values': [ + { + 'x': 1413543600000, + 'y': 90 + }, + { + 'x': 1413544200000, + 'y': 949 + }, + { + 'x': 1413544800000, + 'y': 1012 + }, + { + 'x': 1413545400000, + 'y': 1027 + }, + { + 'x': 1413546000000, + 'y': 1073 + }, + { + 'x': 1413546600000, + 'y': 992 + }, + { + 'x': 1413547200000, + 'y': 1005 + }, + { + 'x': 1413547800000, + 'y': 1014 + }, + { + 'x': 1413548400000, + 'y': 987 + }, + { + 'x': 1413549000000, + 'y': 982 + }, + { + 'x': 1413549600000, + 'y': 1086 + }, + { + 'x': 1413550200000, + 'y': 998 + }, + { + 'x': 1413550800000, + 'y': 935 + }, + { + 'x': 1413551400000, + 'y': 995 + }, + { + 'x': 1413552000000, + 'y': 926 + }, + { + 'x': 1413552600000, + 'y': 897 + }, + { + 'x': 1413553200000, + 'y': 873 + }, + { + 'x': 1413553800000, + 'y': 885 + }, + { + 'x': 1413554400000, + 'y': 859 + }, + { + 'x': 1413555000000, + 'y': 852 + }, + { + 'x': 1413555600000, + 'y': 779 + }, + { + 'x': 1413556200000, + 'y': 739 + }, + { + 'x': 1413556800000, + 'y': 783 + }, + { + 'x': 1413557400000, + 'y': 784 + }, + { + 'x': 1413558000000, + 'y': 687 + }, + { + 'x': 1413558600000, + 'y': 660 + }, + { + 'x': 1413559200000, + 'y': 672 + }, + { + 'x': 1413559800000, + 'y': 600 + }, + { + 'x': 1413560400000, + 'y': 659 + }, + { + 'x': 1413561000000, + 'y': 540 + }, + { + 'x': 1413561600000, + 'y': 539 + }, + { + 'x': 1413562200000, + 'y': 481 + }, + { + 'x': 1413562800000, + 'y': 498 + }, + { + 'x': 1413563400000, + 'y': 444 + }, + { + 'x': 1413564000000, + 'y': 452 + }, + { + 'x': 1413564600000, + 'y': 408 + }, + { + 'x': 1413565200000, + 'y': 358 + }, + { + 'x': 1413565800000, + 'y': 321 + }, + { + 'x': 1413566400000, + 'y': 305 + }, + { + 'x': 1413567000000, + 'y': 292 + }, + { + 'x': 1413567600000, + 'y': 289 + }, + { + 'x': 1413568200000, + 'y': 239 + }, + { + 'x': 1413568800000, + 'y': 256 + }, + { + 'x': 1413569400000, + 'y': 220 + }, + { + 'x': 1413570000000, + 'y': 205 + }, + { + 'x': 1413570600000, + 'y': 201 + }, + { + 'x': 1413571200000, + 'y': 183 + }, + { + 'x': 1413571800000, + 'y': 172 + }, + { + 'x': 1413572400000, + 'y': 73 + }, + { + 'x': 1413573600000, + 'y': 90 + }, + { + 'x': 1413574200000, + 'y': 130 + }, + { + 'x': 1413574800000, + 'y': 104 + }, + { + 'x': 1413575400000, + 'y': 108 + }, + { + 'x': 1413576000000, + 'y': 92 + }, + { + 'x': 1413576600000, + 'y': 79 + }, + { + 'x': 1413577200000, + 'y': 90 + }, + { + 'x': 1413577800000, + 'y': 72 + }, + { + 'x': 1413578400000, + 'y': 68 + }, + { + 'x': 1413579000000, + 'y': 52 + }, + { + 'x': 1413579600000, + 'y': 60 + }, + { + 'x': 1413580200000, + 'y': 51 + }, + { + 'x': 1413580800000, + 'y': 32 + }, + { + 'x': 1413581400000, + 'y': 37 + }, + { + 'x': 1413582000000, + 'y': 30 + }, + { + 'x': 1413582600000, + 'y': 29 + }, + { + 'x': 1413583200000, + 'y': 24 + }, + { + 'x': 1413583800000, + 'y': 16 + }, + { + 'x': 1413584400000, + 'y': 15 + }, + { + 'x': 1413585000000, + 'y': 15 + }, + { + 'x': 1413585600000, + 'y': 10 + }, + { + 'x': 1413586200000, + 'y': 9 + }, + { + 'x': 1413586800000, + 'y': 9 + } + ] + }, + { + 'label': 'png', + 'values': [ + { + 'x': 1413543600000, + 'y': 44 + }, + { + 'x': 1413544200000, + 'y': 495 + }, + { + 'x': 1413544800000, + 'y': 489 + }, + { + 'x': 1413545400000, + 'y': 492 + }, + { + 'x': 1413546000000, + 'y': 556 + }, + { + 'x': 1413546600000, + 'y': 536 + }, + { + 'x': 1413547200000, + 'y': 511 + }, + { + 'x': 1413547800000, + 'y': 479 + }, + { + 'x': 1413548400000, + 'y': 544 + }, + { + 'x': 1413549000000, + 'y': 513 + }, + { + 'x': 1413549600000, + 'y': 501 + }, + { + 'x': 1413550200000, + 'y': 532 + }, + { + 'x': 1413550800000, + 'y': 440 + }, + { + 'x': 1413551400000, + 'y': 455 + }, + { + 'x': 1413552000000, + 'y': 455 + }, + { + 'x': 1413552600000, + 'y': 471 + }, + { + 'x': 1413553200000, + 'y': 428 + }, + { + 'x': 1413553800000, + 'y': 457 + }, + { + 'x': 1413554400000, + 'y': 450 + }, + { + 'x': 1413555000000, + 'y': 418 + }, + { + 'x': 1413555600000, + 'y': 398 + }, + { + 'x': 1413556200000, + 'y': 397 + }, + { + 'x': 1413556800000, + 'y': 359 + }, + { + 'x': 1413557400000, + 'y': 398 + }, + { + 'x': 1413558000000, + 'y': 339 + }, + { + 'x': 1413558600000, + 'y': 363 + }, + { + 'x': 1413559200000, + 'y': 297 + }, + { + 'x': 1413559800000, + 'y': 323 + }, + { + 'x': 1413560400000, + 'y': 302 + }, + { + 'x': 1413561000000, + 'y': 260 + }, + { + 'x': 1413561600000, + 'y': 276 + }, + { + 'x': 1413562200000, + 'y': 249 + }, + { + 'x': 1413562800000, + 'y': 248 + }, + { + 'x': 1413563400000, + 'y': 235 + }, + { + 'x': 1413564000000, + 'y': 234 + }, + { + 'x': 1413564600000, + 'y': 188 + }, + { + 'x': 1413565200000, + 'y': 192 + }, + { + 'x': 1413565800000, + 'y': 173 + }, + { + 'x': 1413566400000, + 'y': 160 + }, + { + 'x': 1413567000000, + 'y': 137 + }, + { + 'x': 1413567600000, + 'y': 158 + }, + { + 'x': 1413568200000, + 'y': 111 + }, + { + 'x': 1413568800000, + 'y': 145 + }, + { + 'x': 1413569400000, + 'y': 118 + }, + { + 'x': 1413570000000, + 'y': 104 + }, + { + 'x': 1413570600000, + 'y': 80 + }, + { + 'x': 1413571200000, + 'y': 79 + }, + { + 'x': 1413571800000, + 'y': 86 + }, + { + 'x': 1413572400000, + 'y': 47 + }, + { + 'x': 1413573600000, + 'y': 49 + }, + { + 'x': 1413574200000, + 'y': 68 + }, + { + 'x': 1413574800000, + 'y': 78 + }, + { + 'x': 1413575400000, + 'y': 77 + }, + { + 'x': 1413576000000, + 'y': 50 + }, + { + 'x': 1413576600000, + 'y': 51 + }, + { + 'x': 1413577200000, + 'y': 40 + }, + { + 'x': 1413577800000, + 'y': 42 + }, + { + 'x': 1413578400000, + 'y': 29 + }, + { + 'x': 1413579000000, + 'y': 24 + }, + { + 'x': 1413579600000, + 'y': 30 + }, + { + 'x': 1413580200000, + 'y': 18 + }, + { + 'x': 1413580800000, + 'y': 15 + }, + { + 'x': 1413581400000, + 'y': 19 + }, + { + 'x': 1413582000000, + 'y': 18 + }, + { + 'x': 1413582600000, + 'y': 13 + }, + { + 'x': 1413583200000, + 'y': 11 + }, + { + 'x': 1413583800000, + 'y': 11 + }, + { + 'x': 1413584400000, + 'y': 13 + }, + { + 'x': 1413585000000, + 'y': 9 + }, + { + 'x': 1413585600000, + 'y': 9 + }, + { + 'x': 1413586200000, + 'y': 9 + }, + { + 'x': 1413586800000, + 'y': 3 + } + ] + }, + { + 'label': 'css', + 'values': [ + { + 'x': 1413543600000, + 'y': 35 + }, + { + 'x': 1413544200000, + 'y': 360 + }, + { + 'x': 1413544800000, + 'y': 343 + }, + { + 'x': 1413545400000, + 'y': 329 + }, + { + 'x': 1413546000000, + 'y': 345 + }, + { + 'x': 1413546600000, + 'y': 336 + }, + { + 'x': 1413547200000, + 'y': 330 + }, + { + 'x': 1413547800000, + 'y': 334 + }, + { + 'x': 1413548400000, + 'y': 326 + }, + { + 'x': 1413549000000, + 'y': 351 + }, + { + 'x': 1413549600000, + 'y': 334 + }, + { + 'x': 1413550200000, + 'y': 351 + }, + { + 'x': 1413550800000, + 'y': 337 + }, + { + 'x': 1413551400000, + 'y': 306 + }, + { + 'x': 1413552000000, + 'y': 346 + }, + { + 'x': 1413552600000, + 'y': 317 + }, + { + 'x': 1413553200000, + 'y': 298 + }, + { + 'x': 1413553800000, + 'y': 288 + }, + { + 'x': 1413554400000, + 'y': 283 + }, + { + 'x': 1413555000000, + 'y': 262 + }, + { + 'x': 1413555600000, + 'y': 245 + }, + { + 'x': 1413556200000, + 'y': 259 + }, + { + 'x': 1413556800000, + 'y': 267 + }, + { + 'x': 1413557400000, + 'y': 230 + }, + { + 'x': 1413558000000, + 'y': 218 + }, + { + 'x': 1413558600000, + 'y': 241 + }, + { + 'x': 1413559200000, + 'y': 213 + }, + { + 'x': 1413559800000, + 'y': 239 + }, + { + 'x': 1413560400000, + 'y': 208 + }, + { + 'x': 1413561000000, + 'y': 187 + }, + { + 'x': 1413561600000, + 'y': 166 + }, + { + 'x': 1413562200000, + 'y': 154 + }, + { + 'x': 1413562800000, + 'y': 184 + }, + { + 'x': 1413563400000, + 'y': 148 + }, + { + 'x': 1413564000000, + 'y': 153 + }, + { + 'x': 1413564600000, + 'y': 149 + }, + { + 'x': 1413565200000, + 'y': 102 + }, + { + 'x': 1413565800000, + 'y': 110 + }, + { + 'x': 1413566400000, + 'y': 121 + }, + { + 'x': 1413567000000, + 'y': 120 + }, + { + 'x': 1413567600000, + 'y': 86 + }, + { + 'x': 1413568200000, + 'y': 96 + }, + { + 'x': 1413568800000, + 'y': 71 + }, + { + 'x': 1413569400000, + 'y': 92 + }, + { + 'x': 1413570000000, + 'y': 65 + }, + { + 'x': 1413570600000, + 'y': 54 + }, + { + 'x': 1413571200000, + 'y': 68 + }, + { + 'x': 1413571800000, + 'y': 57 + }, + { + 'x': 1413572400000, + 'y': 33 + }, + { + 'x': 1413573600000, + 'y': 47 + }, + { + 'x': 1413574200000, + 'y': 42 + }, + { + 'x': 1413574800000, + 'y': 39 + }, + { + 'x': 1413575400000, + 'y': 25 + }, + { + 'x': 1413576000000, + 'y': 31 + }, + { + 'x': 1413576600000, + 'y': 37 + }, + { + 'x': 1413577200000, + 'y': 35 + }, + { + 'x': 1413577800000, + 'y': 19 + }, + { + 'x': 1413578400000, + 'y': 15 + }, + { + 'x': 1413579000000, + 'y': 21 + }, + { + 'x': 1413579600000, + 'y': 16 + }, + { + 'x': 1413580200000, + 'y': 18 + }, + { + 'x': 1413580800000, + 'y': 10 + }, + { + 'x': 1413581400000, + 'y': 13 + }, + { + 'x': 1413582000000, + 'y': 14 + }, + { + 'x': 1413582600000, + 'y': 11 + }, + { + 'x': 1413583200000, + 'y': 4 + }, + { + 'x': 1413583800000, + 'y': 6 + }, + { + 'x': 1413584400000, + 'y': 3 + }, + { + 'x': 1413585000000, + 'y': 6 + }, + { + 'x': 1413585600000, + 'y': 6 + }, + { + 'x': 1413586200000, + 'y': 2 + }, + { + 'x': 1413586800000, + 'y': 3 + } + ] + }, + { + 'label': 'gif', + 'values': [ + { + 'x': 1413543600000, + 'y': 21 + }, + { + 'x': 1413544200000, + 'y': 191 + }, + { + 'x': 1413544800000, + 'y': 176 + }, + { + 'x': 1413545400000, + 'y': 166 + }, + { + 'x': 1413546000000, + 'y': 183 + }, + { + 'x': 1413546600000, + 'y': 170 + }, + { + 'x': 1413547200000, + 'y': 153 + }, + { + 'x': 1413547800000, + 'y': 202 + }, + { + 'x': 1413548400000, + 'y': 175 + }, + { + 'x': 1413549000000, + 'y': 161 + }, + { + 'x': 1413549600000, + 'y': 174 + }, + { + 'x': 1413550200000, + 'y': 167 + }, + { + 'x': 1413550800000, + 'y': 171 + }, + { + 'x': 1413551400000, + 'y': 176 + }, + { + 'x': 1413552000000, + 'y': 139 + }, + { + 'x': 1413552600000, + 'y': 145 + }, + { + 'x': 1413553200000, + 'y': 157 + }, + { + 'x': 1413553800000, + 'y': 148 + }, + { + 'x': 1413554400000, + 'y': 149 + }, + { + 'x': 1413555000000, + 'y': 135 + }, + { + 'x': 1413555600000, + 'y': 118 + }, + { + 'x': 1413556200000, + 'y': 142 + }, + { + 'x': 1413556800000, + 'y': 141 + }, + { + 'x': 1413557400000, + 'y': 146 + }, + { + 'x': 1413558000000, + 'y': 114 + }, + { + 'x': 1413558600000, + 'y': 115 + }, + { + 'x': 1413559200000, + 'y': 136 + }, + { + 'x': 1413559800000, + 'y': 106 + }, + { + 'x': 1413560400000, + 'y': 92 + }, + { + 'x': 1413561000000, + 'y': 97 + }, + { + 'x': 1413561600000, + 'y': 90 + }, + { + 'x': 1413562200000, + 'y': 69 + }, + { + 'x': 1413562800000, + 'y': 66 + }, + { + 'x': 1413563400000, + 'y': 93 + }, + { + 'x': 1413564000000, + 'y': 75 + }, + { + 'x': 1413564600000, + 'y': 68 + }, + { + 'x': 1413565200000, + 'y': 55 + }, + { + 'x': 1413565800000, + 'y': 73 + }, + { + 'x': 1413566400000, + 'y': 57 + }, + { + 'x': 1413567000000, + 'y': 48 + }, + { + 'x': 1413567600000, + 'y': 41 + }, + { + 'x': 1413568200000, + 'y': 39 + }, + { + 'x': 1413568800000, + 'y': 32 + }, + { + 'x': 1413569400000, + 'y': 33 + }, + { + 'x': 1413570000000, + 'y': 39 + }, + { + 'x': 1413570600000, + 'y': 35 + }, + { + 'x': 1413571200000, + 'y': 25 + }, + { + 'x': 1413571800000, + 'y': 28 + }, + { + 'x': 1413572400000, + 'y': 8 + }, + { + 'x': 1413573600000, + 'y': 13 + }, + { + 'x': 1413574200000, + 'y': 23 + }, + { + 'x': 1413574800000, + 'y': 19 + }, + { + 'x': 1413575400000, + 'y': 16 + }, + { + 'x': 1413576000000, + 'y': 22 + }, + { + 'x': 1413576600000, + 'y': 13 + }, + { + 'x': 1413577200000, + 'y': 21 + }, + { + 'x': 1413577800000, + 'y': 11 + }, + { + 'x': 1413578400000, + 'y': 12 + }, + { + 'x': 1413579000000, + 'y': 10 + }, + { + 'x': 1413579600000, + 'y': 7 + }, + { + 'x': 1413580200000, + 'y': 4 + }, + { + 'x': 1413580800000, + 'y': 5 + }, + { + 'x': 1413581400000, + 'y': 7 + }, + { + 'x': 1413582000000, + 'y': 9 + }, + { + 'x': 1413582600000, + 'y': 2 + }, + { + 'x': 1413583200000, + 'y': 2 + }, + { + 'x': 1413583800000, + 'y': 4 + }, + { + 'x': 1413584400000, + 'y': 6 + }, + { + 'x': 1413585600000, + 'y': 2 + }, + { + 'x': 1413586200000, + 'y': 4 + }, + { + 'x': 1413586800000, + 'y': 4 + } + ] + } + ], + 'xAxisFormatter': function (thing) { + return moment(thing); }, - { - 'label': 'png', - 'values': [ - { - 'x': 1413543600000, - 'y': 44 - }, - { - 'x': 1413544200000, - 'y': 495 - }, - { - 'x': 1413544800000, - 'y': 489 - }, - { - 'x': 1413545400000, - 'y': 492 - }, - { - 'x': 1413546000000, - 'y': 556 - }, - { - 'x': 1413546600000, - 'y': 536 - }, - { - 'x': 1413547200000, - 'y': 511 - }, - { - 'x': 1413547800000, - 'y': 479 - }, - { - 'x': 1413548400000, - 'y': 544 - }, - { - 'x': 1413549000000, - 'y': 513 - }, - { - 'x': 1413549600000, - 'y': 501 - }, - { - 'x': 1413550200000, - 'y': 532 - }, - { - 'x': 1413550800000, - 'y': 440 - }, - { - 'x': 1413551400000, - 'y': 455 - }, - { - 'x': 1413552000000, - 'y': 455 - }, - { - 'x': 1413552600000, - 'y': 471 - }, - { - 'x': 1413553200000, - 'y': 428 - }, - { - 'x': 1413553800000, - 'y': 457 - }, - { - 'x': 1413554400000, - 'y': 450 - }, - { - 'x': 1413555000000, - 'y': 418 - }, - { - 'x': 1413555600000, - 'y': 398 - }, - { - 'x': 1413556200000, - 'y': 397 - }, - { - 'x': 1413556800000, - 'y': 359 - }, - { - 'x': 1413557400000, - 'y': 398 - }, - { - 'x': 1413558000000, - 'y': 339 - }, - { - 'x': 1413558600000, - 'y': 363 - }, - { - 'x': 1413559200000, - 'y': 297 - }, - { - 'x': 1413559800000, - 'y': 323 - }, - { - 'x': 1413560400000, - 'y': 302 - }, - { - 'x': 1413561000000, - 'y': 260 - }, - { - 'x': 1413561600000, - 'y': 276 - }, - { - 'x': 1413562200000, - 'y': 249 - }, - { - 'x': 1413562800000, - 'y': 248 - }, - { - 'x': 1413563400000, - 'y': 235 - }, - { - 'x': 1413564000000, - 'y': 234 - }, - { - 'x': 1413564600000, - 'y': 188 - }, - { - 'x': 1413565200000, - 'y': 192 - }, - { - 'x': 1413565800000, - 'y': 173 - }, - { - 'x': 1413566400000, - 'y': 160 - }, - { - 'x': 1413567000000, - 'y': 137 - }, - { - 'x': 1413567600000, - 'y': 158 - }, - { - 'x': 1413568200000, - 'y': 111 - }, - { - 'x': 1413568800000, - 'y': 145 - }, - { - 'x': 1413569400000, - 'y': 118 - }, - { - 'x': 1413570000000, - 'y': 104 - }, - { - 'x': 1413570600000, - 'y': 80 - }, - { - 'x': 1413571200000, - 'y': 79 - }, - { - 'x': 1413571800000, - 'y': 86 - }, - { - 'x': 1413572400000, - 'y': 47 - }, - { - 'x': 1413573600000, - 'y': 49 - }, - { - 'x': 1413574200000, - 'y': 68 - }, - { - 'x': 1413574800000, - 'y': 78 - }, - { - 'x': 1413575400000, - 'y': 77 - }, - { - 'x': 1413576000000, - 'y': 50 - }, - { - 'x': 1413576600000, - 'y': 51 - }, - { - 'x': 1413577200000, - 'y': 40 - }, - { - 'x': 1413577800000, - 'y': 42 - }, - { - 'x': 1413578400000, - 'y': 29 - }, - { - 'x': 1413579000000, - 'y': 24 - }, - { - 'x': 1413579600000, - 'y': 30 - }, - { - 'x': 1413580200000, - 'y': 18 - }, - { - 'x': 1413580800000, - 'y': 15 - }, - { - 'x': 1413581400000, - 'y': 19 - }, - { - 'x': 1413582000000, - 'y': 18 - }, - { - 'x': 1413582600000, - 'y': 13 - }, - { - 'x': 1413583200000, - 'y': 11 - }, - { - 'x': 1413583800000, - 'y': 11 - }, - { - 'x': 1413584400000, - 'y': 13 - }, - { - 'x': 1413585000000, - 'y': 9 - }, - { - 'x': 1413585600000, - 'y': 9 - }, - { - 'x': 1413586200000, - 'y': 9 - }, - { - 'x': 1413586800000, - 'y': 3 - } - ] - }, - { - 'label': 'css', - 'values': [ - { - 'x': 1413543600000, - 'y': 35 - }, - { - 'x': 1413544200000, - 'y': 360 - }, - { - 'x': 1413544800000, - 'y': 343 - }, - { - 'x': 1413545400000, - 'y': 329 - }, - { - 'x': 1413546000000, - 'y': 345 - }, - { - 'x': 1413546600000, - 'y': 336 - }, - { - 'x': 1413547200000, - 'y': 330 - }, - { - 'x': 1413547800000, - 'y': 334 - }, - { - 'x': 1413548400000, - 'y': 326 - }, - { - 'x': 1413549000000, - 'y': 351 - }, - { - 'x': 1413549600000, - 'y': 334 - }, - { - 'x': 1413550200000, - 'y': 351 - }, - { - 'x': 1413550800000, - 'y': 337 - }, - { - 'x': 1413551400000, - 'y': 306 - }, - { - 'x': 1413552000000, - 'y': 346 - }, - { - 'x': 1413552600000, - 'y': 317 - }, - { - 'x': 1413553200000, - 'y': 298 - }, - { - 'x': 1413553800000, - 'y': 288 - }, - { - 'x': 1413554400000, - 'y': 283 - }, - { - 'x': 1413555000000, - 'y': 262 - }, - { - 'x': 1413555600000, - 'y': 245 - }, - { - 'x': 1413556200000, - 'y': 259 - }, - { - 'x': 1413556800000, - 'y': 267 - }, - { - 'x': 1413557400000, - 'y': 230 - }, - { - 'x': 1413558000000, - 'y': 218 - }, - { - 'x': 1413558600000, - 'y': 241 - }, - { - 'x': 1413559200000, - 'y': 213 - }, - { - 'x': 1413559800000, - 'y': 239 - }, - { - 'x': 1413560400000, - 'y': 208 - }, - { - 'x': 1413561000000, - 'y': 187 - }, - { - 'x': 1413561600000, - 'y': 166 - }, - { - 'x': 1413562200000, - 'y': 154 - }, - { - 'x': 1413562800000, - 'y': 184 - }, - { - 'x': 1413563400000, - 'y': 148 - }, - { - 'x': 1413564000000, - 'y': 153 - }, - { - 'x': 1413564600000, - 'y': 149 - }, - { - 'x': 1413565200000, - 'y': 102 - }, - { - 'x': 1413565800000, - 'y': 110 - }, - { - 'x': 1413566400000, - 'y': 121 - }, - { - 'x': 1413567000000, - 'y': 120 - }, - { - 'x': 1413567600000, - 'y': 86 - }, - { - 'x': 1413568200000, - 'y': 96 - }, - { - 'x': 1413568800000, - 'y': 71 - }, - { - 'x': 1413569400000, - 'y': 92 - }, - { - 'x': 1413570000000, - 'y': 65 - }, - { - 'x': 1413570600000, - 'y': 54 - }, - { - 'x': 1413571200000, - 'y': 68 - }, - { - 'x': 1413571800000, - 'y': 57 - }, - { - 'x': 1413572400000, - 'y': 33 - }, - { - 'x': 1413573600000, - 'y': 47 - }, - { - 'x': 1413574200000, - 'y': 42 - }, - { - 'x': 1413574800000, - 'y': 39 - }, - { - 'x': 1413575400000, - 'y': 25 - }, - { - 'x': 1413576000000, - 'y': 31 - }, - { - 'x': 1413576600000, - 'y': 37 - }, - { - 'x': 1413577200000, - 'y': 35 - }, - { - 'x': 1413577800000, - 'y': 19 - }, - { - 'x': 1413578400000, - 'y': 15 - }, - { - 'x': 1413579000000, - 'y': 21 - }, - { - 'x': 1413579600000, - 'y': 16 - }, - { - 'x': 1413580200000, - 'y': 18 - }, - { - 'x': 1413580800000, - 'y': 10 - }, - { - 'x': 1413581400000, - 'y': 13 - }, - { - 'x': 1413582000000, - 'y': 14 - }, - { - 'x': 1413582600000, - 'y': 11 - }, - { - 'x': 1413583200000, - 'y': 4 - }, - { - 'x': 1413583800000, - 'y': 6 - }, - { - 'x': 1413584400000, - 'y': 3 - }, - { - 'x': 1413585000000, - 'y': 6 - }, - { - 'x': 1413585600000, - 'y': 6 - }, - { - 'x': 1413586200000, - 'y': 2 - }, - { - 'x': 1413586800000, - 'y': 3 - } - ] - }, - { - 'label': 'gif', - 'values': [ - { - 'x': 1413543600000, - 'y': 21 - }, - { - 'x': 1413544200000, - 'y': 191 - }, - { - 'x': 1413544800000, - 'y': 176 - }, - { - 'x': 1413545400000, - 'y': 166 - }, - { - 'x': 1413546000000, - 'y': 183 - }, - { - 'x': 1413546600000, - 'y': 170 - }, - { - 'x': 1413547200000, - 'y': 153 - }, - { - 'x': 1413547800000, - 'y': 202 - }, - { - 'x': 1413548400000, - 'y': 175 - }, - { - 'x': 1413549000000, - 'y': 161 - }, - { - 'x': 1413549600000, - 'y': 174 - }, - { - 'x': 1413550200000, - 'y': 167 - }, - { - 'x': 1413550800000, - 'y': 171 - }, - { - 'x': 1413551400000, - 'y': 176 - }, - { - 'x': 1413552000000, - 'y': 139 - }, - { - 'x': 1413552600000, - 'y': 145 - }, - { - 'x': 1413553200000, - 'y': 157 - }, - { - 'x': 1413553800000, - 'y': 148 - }, - { - 'x': 1413554400000, - 'y': 149 - }, - { - 'x': 1413555000000, - 'y': 135 - }, - { - 'x': 1413555600000, - 'y': 118 - }, - { - 'x': 1413556200000, - 'y': 142 - }, - { - 'x': 1413556800000, - 'y': 141 - }, - { - 'x': 1413557400000, - 'y': 146 - }, - { - 'x': 1413558000000, - 'y': 114 - }, - { - 'x': 1413558600000, - 'y': 115 - }, - { - 'x': 1413559200000, - 'y': 136 - }, - { - 'x': 1413559800000, - 'y': 106 - }, - { - 'x': 1413560400000, - 'y': 92 - }, - { - 'x': 1413561000000, - 'y': 97 - }, - { - 'x': 1413561600000, - 'y': 90 - }, - { - 'x': 1413562200000, - 'y': 69 - }, - { - 'x': 1413562800000, - 'y': 66 - }, - { - 'x': 1413563400000, - 'y': 93 - }, - { - 'x': 1413564000000, - 'y': 75 - }, - { - 'x': 1413564600000, - 'y': 68 - }, - { - 'x': 1413565200000, - 'y': 55 - }, - { - 'x': 1413565800000, - 'y': 73 - }, - { - 'x': 1413566400000, - 'y': 57 - }, - { - 'x': 1413567000000, - 'y': 48 - }, - { - 'x': 1413567600000, - 'y': 41 - }, - { - 'x': 1413568200000, - 'y': 39 - }, - { - 'x': 1413568800000, - 'y': 32 - }, - { - 'x': 1413569400000, - 'y': 33 - }, - { - 'x': 1413570000000, - 'y': 39 - }, - { - 'x': 1413570600000, - 'y': 35 - }, - { - 'x': 1413571200000, - 'y': 25 - }, - { - 'x': 1413571800000, - 'y': 28 - }, - { - 'x': 1413572400000, - 'y': 8 - }, - { - 'x': 1413573600000, - 'y': 13 - }, - { - 'x': 1413574200000, - 'y': 23 - }, - { - 'x': 1413574800000, - 'y': 19 - }, - { - 'x': 1413575400000, - 'y': 16 - }, - { - 'x': 1413576000000, - 'y': 22 - }, - { - 'x': 1413576600000, - 'y': 13 - }, - { - 'x': 1413577200000, - 'y': 21 - }, - { - 'x': 1413577800000, - 'y': 11 - }, - { - 'x': 1413578400000, - 'y': 12 - }, - { - 'x': 1413579000000, - 'y': 10 - }, - { - 'x': 1413579600000, - 'y': 7 - }, - { - 'x': 1413580200000, - 'y': 4 - }, - { - 'x': 1413580800000, - 'y': 5 - }, - { - 'x': 1413581400000, - 'y': 7 - }, - { - 'x': 1413582000000, - 'y': 9 - }, - { - 'x': 1413582600000, - 'y': 2 - }, - { - 'x': 1413583200000, - 'y': 2 - }, - { - 'x': 1413583800000, - 'y': 4 - }, - { - 'x': 1413584400000, - 'y': 6 - }, - { - 'x': 1413585600000, - 'y': 2 - }, - { - 'x': 1413586200000, - 'y': 4 - }, - { - 'x': 1413586800000, - 'y': 4 - } - ] + 'tooltipFormatter': function (d) { + return d; } - ], - 'hits': 108970, - 'xAxisFormatter': function (thing) { - return moment(thing); - }, - 'tooltipFormatter': function (d) { - return d; - } + }], + 'hits': 108970 }; diff --git a/src/fixtures/vislib/mock_data/histogram/_columns.js b/src/fixtures/vislib/mock_data/histogram/_columns.js index 422e2b56d4c05..b23c1508db924 100644 --- a/src/fixtures/vislib/mock_data/histogram/_columns.js +++ b/src/fixtures/vislib/mock_data/histogram/_columns.js @@ -1,7 +1,8 @@ import _ from 'lodash'; export default { - 'columns': [ + 'split': 'columns', + 'charts': [ { 'label': '404: response', 'xAxisLabel': 'machine.ram', diff --git a/src/fixtures/vislib/mock_data/histogram/_rows.js b/src/fixtures/vislib/mock_data/histogram/_rows.js index 8a9a08db2c29f..43546cc886066 100644 --- a/src/fixtures/vislib/mock_data/histogram/_rows.js +++ b/src/fixtures/vislib/mock_data/histogram/_rows.js @@ -1,7 +1,8 @@ import _ from 'lodash'; export default { - 'rows': [ + 'split': 'rows', + 'charts': [ { 'label': '404: response', 'xAxisLabel': 'machine.ram', diff --git a/src/fixtures/vislib/mock_data/histogram/_series.js b/src/fixtures/vislib/mock_data/histogram/_series.js index 90995a00a11ef..9adfec11c8ba0 100644 --- a/src/fixtures/vislib/mock_data/histogram/_series.js +++ b/src/fixtures/vislib/mock_data/histogram/_series.js @@ -1,104 +1,106 @@ import _ from 'lodash'; export default { - 'label': '', - 'xAxisLabel': 'machine.ram', - 'ordered': { - 'interval': 100 - }, - 'yAxisLabel': 'Count of documents', - 'series': [ - { - 'label': 'Count', - 'values': [ - { - 'x': 3221225400, - 'y': 5 - }, - { - 'x': 4294967200, - 'y': 2 - }, - { - 'x': 5368709100, - 'y': 5 - }, - { - 'x': 6442450900, - 'y': 4 - }, - { - 'x': 7516192700, - 'y': 1 - }, - { - 'x': 9663676400, - 'y': 9 - }, - { - 'x': 10737418200, - 'y': 5 - }, - { - 'x': 11811160000, - 'y': 5 - }, - { - 'x': 12884901800, - 'y': 2 - }, - { - 'x': 13958643700, - 'y': 3 - }, - { - 'x': 15032385500, - 'y': 3 - }, - { - 'x': 16106127300, - 'y': 3 - }, - { - 'x': 17179869100, - 'y': 1 - }, - { - 'x': 18253611000, - 'y': 6 - }, - { - 'x': 19327352800, - 'y': 3 - }, - { - 'x': 20401094600, - 'y': 3 - }, - { - 'x': 21474836400, - 'y': 7 - }, - { - 'x': 32212254700, - 'y': 4 - } - ] + 'charts': [{ + 'label': '', + 'xAxisLabel': 'machine.ram', + 'ordered': { + 'interval': 100 + }, + 'yAxisLabel': 'Count of documents', + 'series': [ + { + 'label': 'Count', + 'values': [ + { + 'x': 3221225400, + 'y': 5 + }, + { + 'x': 4294967200, + 'y': 2 + }, + { + 'x': 5368709100, + 'y': 5 + }, + { + 'x': 6442450900, + 'y': 4 + }, + { + 'x': 7516192700, + 'y': 1 + }, + { + 'x': 9663676400, + 'y': 9 + }, + { + 'x': 10737418200, + 'y': 5 + }, + { + 'x': 11811160000, + 'y': 5 + }, + { + 'x': 12884901800, + 'y': 2 + }, + { + 'x': 13958643700, + 'y': 3 + }, + { + 'x': 15032385500, + 'y': 3 + }, + { + 'x': 16106127300, + 'y': 3 + }, + { + 'x': 17179869100, + 'y': 1 + }, + { + 'x': 18253611000, + 'y': 6 + }, + { + 'x': 19327352800, + 'y': 3 + }, + { + 'x': 20401094600, + 'y': 3 + }, + { + 'x': 21474836400, + 'y': 7 + }, + { + 'x': 32212254700, + 'y': 4 + } + ] + } + ], + 'xAxisFormatter': function (val) { + if (_.isObject(val)) { + return JSON.stringify(val); + } + else if (val == null) { + return ''; + } + else { + return '' + val; + } + }, + 'tooltipFormatter': function (d) { + return d; } - ], - 'hits': 71, - 'xAxisFormatter': function (val) { - if (_.isObject(val)) { - return JSON.stringify(val); - } - else if (val == null) { - return ''; - } - else { - return '' + val; - } - }, - 'tooltipFormatter': function (d) { - return d; - } + }], + 'hits': 71 }; diff --git a/src/fixtures/vislib/mock_data/pie/_histogram.js b/src/fixtures/vislib/mock_data/pie/_histogram.js new file mode 100644 index 0000000000000..2117134d75870 --- /dev/null +++ b/src/fixtures/vislib/mock_data/pie/_histogram.js @@ -0,0 +1,39 @@ + +export default { + 'charts': [{ + 'label': 'chart title', + 'children': [ + { + 'label': 0, + 'values': [{ + 'value': 378611 + }], + }, + { + 'name': 1000, + 'values': [{ + 'value': 205997 + }] + }, + { + 'name': 2000, + 'values': [{ + 'value': 397189 + }] + }, + { + 'name': 3000, + 'values': [{ + 'value': 397195 + }] + }, + { + 'name': 4000, + 'values': [{ + 'value': 398429 + }] + }, + ] + }], + 'hits': 3967374 +}; diff --git a/src/fixtures/vislib/mock_data/range/_columns.js b/src/fixtures/vislib/mock_data/range/_columns.js index d75f80d8fcec8..9abcb8dbfbaa4 100644 --- a/src/fixtures/vislib/mock_data/range/_columns.js +++ b/src/fixtures/vislib/mock_data/range/_columns.js @@ -1,7 +1,8 @@ import _ from 'lodash'; export default { - 'columns': [ + 'split': 'columns', + 'charts': [ { 'label': 'apache: _type', 'xAxisLabel': 'bytes ranges', diff --git a/src/fixtures/vislib/mock_data/range/_rows.js b/src/fixtures/vislib/mock_data/range/_rows.js index 35a938851b130..6d922158c5791 100644 --- a/src/fixtures/vislib/mock_data/range/_rows.js +++ b/src/fixtures/vislib/mock_data/range/_rows.js @@ -1,7 +1,8 @@ import _ from 'lodash'; export default { - 'rows': [ + 'split': 'rows', + 'charts': [ { 'label': 'Mozilla/5.0 (X11; Linux x86_64; rv:6.0a1) Gecko/20110421 Firefox/6.0a1: agent.raw', 'xAxisLabel': 'bytes ranges', diff --git a/src/fixtures/vislib/mock_data/range/_series.js b/src/fixtures/vislib/mock_data/range/_series.js index 34454bbb2020b..ae5e81e7c54a7 100644 --- a/src/fixtures/vislib/mock_data/range/_series.js +++ b/src/fixtures/vislib/mock_data/range/_series.js @@ -1,37 +1,39 @@ import _ from 'lodash'; export default { - 'label': '', - 'xAxisLabel': 'bytes ranges', - 'yAxisLabel': 'Count of documents', - 'series': [ - { - 'label': 'Count', - 'values': [ - { - 'x': '0.0-1000.0', - 'y': 16576 - }, - { - 'x': '1000.0-2000.0', - 'y': 9005 - } - ] + charts: [{ + 'label': '', + 'xAxisLabel': 'bytes ranges', + 'yAxisLabel': 'Count of documents', + 'series': [ + { + 'label': 'Count', + 'values': [ + { + 'x': '0.0-1000.0', + 'y': 16576 + }, + { + 'x': '1000.0-2000.0', + 'y': 9005 + } + ] + } + ], + 'xAxisFormatter': function (val) { + if (_.isObject(val)) { + return JSON.stringify(val); + } + else if (val == null) { + return ''; + } + else { + return '' + val; + } + }, + 'tooltipFormatter': function (d) { + return d; } - ], - 'hits': 171500, - 'xAxisFormatter': function (val) { - if (_.isObject(val)) { - return JSON.stringify(val); - } - else if (val == null) { - return ''; - } - else { - return '' + val; - } - }, - 'tooltipFormatter': function (d) { - return d; - } + }], + 'hits': 171500 }; diff --git a/src/fixtures/vislib/mock_data/terms/_columns.js b/src/fixtures/vislib/mock_data/terms/_columns.js index fdcaf9987351d..b2c4a127d82d0 100644 --- a/src/fixtures/vislib/mock_data/terms/_columns.js +++ b/src/fixtures/vislib/mock_data/terms/_columns.js @@ -1,7 +1,8 @@ import _ from 'lodash'; export default { - 'columns': [ + 'split': 'columns', + 'charts': [ { 'label': 'logstash: index', 'xAxisLabel': 'Top 5 extension', diff --git a/src/fixtures/vislib/mock_data/terms/_rows.js b/src/fixtures/vislib/mock_data/terms/_rows.js index 7564258ddee8a..efbc8cb899661 100644 --- a/src/fixtures/vislib/mock_data/terms/_rows.js +++ b/src/fixtures/vislib/mock_data/terms/_rows.js @@ -1,7 +1,8 @@ import _ from 'lodash'; export default { - 'rows': [ + 'split': 'rows', + 'charts': [ { 'label': '0.0-1000.0: bytes', 'xAxisLabel': 'Top 5 extension', diff --git a/src/fixtures/vislib/mock_data/terms/_series.js b/src/fixtures/vislib/mock_data/terms/_series.js index 90db8af86fa57..d41ce760d7c2b 100644 --- a/src/fixtures/vislib/mock_data/terms/_series.js +++ b/src/fixtures/vislib/mock_data/terms/_series.js @@ -1,49 +1,51 @@ import _ from 'lodash'; export default { - 'label': '', - 'xAxisLabel': 'Top 5 extension', - 'yAxisLabel': 'Count of documents', - 'series': [ - { - 'label': 'Count', - 'values': [ - { - 'x': 'jpg', - 'y': 110710 - }, - { - 'x': 'css', - 'y': 27389 - }, - { - 'x': 'png', - 'y': 16661 - }, - { - 'x': 'gif', - 'y': 11269 - }, - { - 'x': 'php', - 'y': 5447 - } - ] + charts: [{ + 'label': '', + 'xAxisLabel': 'Top 5 extension', + 'yAxisLabel': 'Count of documents', + 'series': [ + { + 'label': 'Count', + 'values': [ + { + 'x': 'jpg', + 'y': 110710 + }, + { + 'x': 'css', + 'y': 27389 + }, + { + 'x': 'png', + 'y': 16661 + }, + { + 'x': 'gif', + 'y': 11269 + }, + { + 'x': 'php', + 'y': 5447 + } + ] + } + ], + 'xAxisFormatter': function (val) { + if (_.isObject(val)) { + return JSON.stringify(val); + } + else if (val == null) { + return ''; + } + else { + return '' + val; + } + }, + 'tooltipFormatter': function (d) { + return d; } - ], - 'hits': 171476, - 'xAxisFormatter': function (val) { - if (_.isObject(val)) { - return JSON.stringify(val); - } - else if (val == null) { - return ''; - } - else { - return '' + val; - } - }, - 'tooltipFormatter': function (d) { - return d; - } + }], + 'hits': 171476 }; diff --git a/src/fixtures/vislib/mock_data/terms/_seriesMultiple.js b/src/fixtures/vislib/mock_data/terms/_seriesMultiple.js index d2b2864760346..5a69d7eeecbd3 100644 --- a/src/fixtures/vislib/mock_data/terms/_seriesMultiple.js +++ b/src/fixtures/vislib/mock_data/terms/_seriesMultiple.js @@ -1,71 +1,73 @@ import _ from 'lodash'; export default { - 'yAxisLabel': 'Count', - 'zAxisLabel': 'machine.os.raw: Descending', - 'yScale': null, - 'series': [{ - 'label': 'ios', - 'aggLabel': 'Count', - 'aggId': '1', - 'values': [{ - 'x': '_all', - 'y': 2820, - 'series': 'ios' - }] - }, { - 'label': 'win 7', - 'aggLabel': 'Count', - 'aggId': '1', - 'values': [{ - 'x': '_all', - 'y': 2319, - 'series': 'win 7' - }] - }, { - 'label': 'win 8', - 'aggLabel': 'Count', - 'aggId': '1', - 'values': [{ - 'x': '_all', - 'y': 1835, - 'series': 'win 8' - }] - }, { - 'label': 'win xp', - 'aggLabel': 'Count', - 'aggId': '1', - 'values': [{ - 'x': '_all', - 'y': 734, - 'series': 'win xp' - }] - }, { - 'label': 'osx', - 'aggLabel': 'Count', - 'aggId': '1', - 'values': [{ - 'x': '_all', - 'y': 1352, - 'series': 'osx' - }] - }], - 'hits': 14005, - 'xAxisFormatter': function (val) { - if (_.isObject(val)) { - return JSON.stringify(val); - } - else if (val == null) { - return ''; + charts: [{ + 'yAxisLabel': 'Count', + 'zAxisLabel': 'machine.os.raw: Descending', + 'yScale': null, + 'series': [{ + 'label': 'ios', + 'aggLabel': 'Count', + 'aggId': '1', + 'values': [{ + 'x': '_all', + 'y': 2820, + 'series': 'ios' + }] + }, { + 'label': 'win 7', + 'aggLabel': 'Count', + 'aggId': '1', + 'values': [{ + 'x': '_all', + 'y': 2319, + 'series': 'win 7' + }] + }, { + 'label': 'win 8', + 'aggLabel': 'Count', + 'aggId': '1', + 'values': [{ + 'x': '_all', + 'y': 1835, + 'series': 'win 8' + }] + }, { + 'label': 'win xp', + 'aggLabel': 'Count', + 'aggId': '1', + 'values': [{ + 'x': '_all', + 'y': 734, + 'series': 'win xp' + }] + }, { + 'label': 'osx', + 'aggLabel': 'Count', + 'aggId': '1', + 'values': [{ + 'x': '_all', + 'y': 1352, + 'series': 'osx' + }] + }], + 'xAxisFormatter': function (val) { + if (_.isObject(val)) { + return JSON.stringify(val); + } + else if (val == null) { + return ''; + } + else { + return '' + val; + } + }, + 'yAxisFormatter': function (val) { + return val; + }, + 'tooltipFormatter': function (d) { + return d; } - else { - return '' + val; - } - }, - 'yAxisFormatter': function (val) { - return val; - }, - 'tooltipFormatter': function (d) { - return d; - } + }], + 'hits': 14005 }; diff --git a/src/ui/public/vislib/__tests__/lib/axis/axis.js b/src/ui/public/vislib/__tests__/lib/axis/axis.js index 1e835d5c08873..c27ec6981b076 100644 --- a/src/ui/public/vislib/__tests__/lib/axis/axis.js +++ b/src/ui/public/vislib/__tests__/lib/axis/axis.js @@ -18,69 +18,71 @@ describe('Vislib Axis Class Test Suite', function () { const data = { hits: 621, - ordered: { - date: true, - interval: 30000, - max: 1408734982458, - min: 1408734082458 - }, - series: [ - { - label: 'Count', - values: [ - { - x: 1408734060000, - y: 8 - }, - { - x: 1408734090000, - y: 23 - }, - { - x: 1408734120000, - y: 30 - }, - { - x: 1408734130000, - y: 30 - }, - { - x: 1408734150000, - y: 28 - } - ] + charts: [{ + ordered: { + date: true, + interval: 30000, + max: 1408734982458, + min: 1408734082458 }, - { - label: 'Count2', - values: [ - { - x: 1408734060000, - y: 8 - }, - { - x: 1408734090000, - y: 23 - }, - { - x: 1408734120000, - y: 30 - }, - { - x: 1408734140000, - y: 30 - }, - { - x: 1408734150000, - y: 28 - } - ] - } - ], - xAxisFormatter: function (thing) { - return new Date(thing); - }, - xAxisLabel: 'Date Histogram', - yAxisLabel: 'Count' + series: [ + { + label: 'Count', + values: [ + { + x: 1408734060000, + y: 8 + }, + { + x: 1408734090000, + y: 23 + }, + { + x: 1408734120000, + y: 30 + }, + { + x: 1408734130000, + y: 30 + }, + { + x: 1408734150000, + y: 28 + } + ] + }, + { + label: 'Count2', + values: [ + { + x: 1408734060000, + y: 8 + }, + { + x: 1408734090000, + y: 23 + }, + { + x: 1408734120000, + y: 30 + }, + { + x: 1408734140000, + y: 30 + }, + { + x: 1408734150000, + y: 28 + } + ] + } + ], + xAxisFormatter: function (thing) { + return new Date(thing); + }, + xAxisLabel: 'Date Histogram', + yAxisLabel: 'Count' + }] }; beforeEach(ngMock.module('kibana')); @@ -104,7 +106,7 @@ describe('Vislib Axis Class Test Suite', function () { id: 'ValueAxis-1' }); - seriesData = data.series.map(series => { + seriesData = data.charts[0].series.map(series => { return series.values; }); })); diff --git a/src/ui/public/vislib/__tests__/lib/axis_title.js b/src/ui/public/vislib/__tests__/lib/axis_title.js index 21cac5e4c4931..782428ffe2ae2 100644 --- a/src/ui/public/vislib/__tests__/lib/axis_title.js +++ b/src/ui/public/vislib/__tests__/lib/axis_title.js @@ -20,61 +20,63 @@ describe('Vislib AxisTitle Class Test Suite', function () { let yTitle; const data = { hits: 621, - ordered: { - date: true, - interval: 30000, - max: 1408734982458, - min: 1408734082458 - }, - series: [ - { - label: 'Count', - values: [ - { - x: 1408734060000, - y: 8 - }, - { - x: 1408734090000, - y: 23 - }, - { - x: 1408734120000, - y: 30 - }, - { - x: 1408734150000, - y: 28 - }, - { - x: 1408734180000, - y: 36 - }, - { - x: 1408734210000, - y: 30 - }, - { - x: 1408734240000, - y: 26 - }, - { - x: 1408734270000, - y: 22 - }, - { - x: 1408734300000, - y: 29 - }, - { - x: 1408734330000, - y: 24 - } - ] - } - ], - xAxisLabel: 'Date Histogram', - yAxisLabel: 'Count' + charts: [{ + ordered: { + date: true, + interval: 30000, + max: 1408734982458, + min: 1408734082458 + }, + series: [ + { + label: 'Count', + values: [ + { + x: 1408734060000, + y: 8 + }, + { + x: 1408734090000, + y: 23 + }, + { + x: 1408734120000, + y: 30 + }, + { + x: 1408734150000, + y: 28 + }, + { + x: 1408734180000, + y: 36 + }, + { + x: 1408734210000, + y: 30 + }, + { + x: 1408734240000, + y: 26 + }, + { + x: 1408734270000, + y: 22 + }, + { + x: 1408734300000, + y: 29 + }, + { + x: 1408734330000, + y: 24 + } + ] + } + ], + xAxisLabel: 'Date Histogram', + yAxisLabel: 'Count' + }] }; beforeEach(ngMock.module('kibana')); diff --git a/src/ui/public/vislib/__tests__/lib/chart_title.js b/src/ui/public/vislib/__tests__/lib/chart_title.js index 38935c48f52e1..aa335022fb603 100644 --- a/src/ui/public/vislib/__tests__/lib/chart_title.js +++ b/src/ui/public/vislib/__tests__/lib/chart_title.js @@ -14,61 +14,63 @@ describe('Vislib ChartTitle Class Test Suite', function () { let el; const data = { hits: 621, - ordered: { - date: true, - interval: 30000, - max: 1408734982458, - min: 1408734082458 - }, - series: [ - { - label: 'Count', - values: [ - { - x: 1408734060000, - y: 8 - }, - { - x: 1408734090000, - y: 23 - }, - { - x: 1408734120000, - y: 30 - }, - { - x: 1408734150000, - y: 28 - }, - { - x: 1408734180000, - y: 36 - }, - { - x: 1408734210000, - y: 30 - }, - { - x: 1408734240000, - y: 26 - }, - { - x: 1408734270000, - y: 22 - }, - { - x: 1408734300000, - y: 29 - }, - { - x: 1408734330000, - y: 24 - } - ] - } - ], - xAxisLabel: 'Date Histogram', - yAxisLabel: 'Count' + charts:[{ + ordered: { + date: true, + interval: 30000, + max: 1408734982458, + min: 1408734082458 + }, + series: [ + { + label: 'Count', + values: [ + { + x: 1408734060000, + y: 8 + }, + { + x: 1408734090000, + y: 23 + }, + { + x: 1408734120000, + y: 30 + }, + { + x: 1408734150000, + y: 28 + }, + { + x: 1408734180000, + y: 36 + }, + { + x: 1408734210000, + y: 30 + }, + { + x: 1408734240000, + y: 26 + }, + { + x: 1408734270000, + y: 22 + }, + { + x: 1408734300000, + y: 29 + }, + { + x: 1408734330000, + y: 24 + } + ] + } + ], + xAxisLabel: 'Date Histogram', + yAxisLabel: 'Count' + }] }; beforeEach(ngMock.module('kibana')); diff --git a/src/ui/public/vislib/__tests__/lib/data.js b/src/ui/public/vislib/__tests__/lib/data.js index d910b5e908d9d..f4d90b3a72fda 100644 --- a/src/ui/public/vislib/__tests__/lib/data.js +++ b/src/ui/public/vislib/__tests__/lib/data.js @@ -6,17 +6,20 @@ import { VislibLibDataProvider } from 'ui/vislib/lib/data'; import 'ui/persisted_state'; const seriesData = { - 'label': '', - 'series': [ - { - 'label': '100', - 'values': [{ x: 0, y: 1 }, { x: 1, y: 2 }, { x: 2, y: 3 }] - } - ] + 'charts': [{ + 'label': '', + 'series': [ + { + 'label': '100', + 'values': [{ x: 0, y: 1 }, { x: 1, y: 2 }, { x: 2, y: 3 }] + } + ] + }] }; const rowsData = { - 'rows': [ + 'split': 'rows', + 'charts': [ { 'label': 'a', 'series': [ @@ -57,7 +60,8 @@ const rowsData = { }; const colsData = { - 'columns': [ + 'split': 'columns', + 'charts': [ { 'label': 'a', 'series': [ @@ -122,13 +126,13 @@ describe('Vislib Data Class Test Suite', function () { describe('_removeZeroSlices', function () { let data; const pieData = { - slices: { + charts: [{ children: [ - { size: 30 }, - { size: 20 }, - { size: 0 } + { values: [{ value: 30 }] }, + { values: [{ value: 20 }] }, + { values: [{ value: 0 }] } ] - } + }] }; beforeEach(function () { @@ -136,7 +140,7 @@ describe('Vislib Data Class Test Suite', function () { }); it('should remove zero values', function () { - const slices = data._removeZeroSlices(data.data.slices); + const slices = data._removeZeroSlices(data.data.columns[0]); expect(slices.children.length).to.be(2); }); }); @@ -172,65 +176,6 @@ describe('Vislib Data Class Test Suite', function () { } }); - describe('geohashGrid methods', function () { - let data; - const geohashGridData = { - hits: 3954, - rows: [{ - title: 'Top 5 _type: apache', - label: 'Top 5 _type: apache', - geoJson: { - type: 'FeatureCollection', - features: [], - properties: { - min: 2, - max: 331, - zoom: 3, - center: [ - 47.517200697839414, - -112.06054687499999 - ] - } - }, - }, { - title: 'Top 5 _type: nginx', - label: 'Top 5 _type: nginx', - geoJson: { - type: 'FeatureCollection', - features: [], - properties: { - min: 1, - max: 88, - zoom: 3, - center: [ - 47.517200697839414, - -112.06054687499999 - ] - } - }, - }] - }; - - beforeEach(function () { - data = new Data(geohashGridData, persistedState); - }); - - describe('getVisData', function () { - it('should return the rows property', function () { - const visData = data.getVisData(); - expect(visData).to.eql(geohashGridData.rows); - }); - }); - - describe('getGeoExtents', function () { - it('should return the min and max geoJson properties', function () { - const minMax = data.getGeoExtents(); - expect(minMax.min).to.be(1); - expect(minMax.max).to.be(331); - }); - }); - }); - describe('null value check', function () { it('should return false', function () { const data = new Data(rowsData, persistedState); @@ -238,8 +183,8 @@ describe('Vislib Data Class Test Suite', function () { }); it('should return true', function () { - const nullRowData = { rows: rowsData.rows.slice(0) }; - nullRowData.rows.push({ + const nullRowData = { charts: rowsData.charts.slice(0) }; + nullRowData.charts.push({ 'label': 'e', 'series': [ { diff --git a/src/ui/public/vislib/__tests__/lib/handler/handler.js b/src/ui/public/vislib/__tests__/lib/handler/handler.js index 9eb65b1bf1197..17cd307c02675 100644 --- a/src/ui/public/vislib/__tests__/lib/handler/handler.js +++ b/src/ui/public/vislib/__tests__/lib/handler/handler.js @@ -21,133 +21,134 @@ const names = [ 'rows', 'stackedSeries' ]; +describe('', function () { + dateHistogramArray.forEach(function (data, i) { + describe('Vislib Handler Test Suite for ' + names[i] + ' Data', function () { + let vis; + let persistedState; + const events = [ + 'click', + 'brush' + ]; + + beforeEach(ngMock.module('kibana')); + beforeEach(ngMock.inject(function (Private, $injector) { + vis = Private(FixturesVislibVisFixtureProvider)(); + persistedState = new ($injector.get('PersistedState'))(); + vis.render(data, persistedState); + })); + + afterEach(function () { + vis.destroy(); + }); -dateHistogramArray.forEach(function (data, i) { - describe('Vislib Handler Test Suite for ' + names[i] + ' Data', function () { - let vis; - let persistedState; - const events = [ - 'click', - 'brush' - ]; - - beforeEach(ngMock.module('kibana')); - beforeEach(ngMock.inject(function (Private, $injector) { - vis = Private(FixturesVislibVisFixtureProvider)(); - persistedState = new ($injector.get('PersistedState'))(); - vis.render(data, persistedState); - })); - - afterEach(function () { - vis.destroy(); - }); - - describe('render Method', function () { - it('should render charts', function () { - expect(vis.handler.charts.length).to.be.greaterThan(0); - vis.handler.charts.forEach(function (chart) { - expect($(chart.chartEl).find('svg').length).to.be(1); + describe('render Method', function () { + it('should render charts', function () { + expect(vis.handler.charts.length).to.be.greaterThan(0); + vis.handler.charts.forEach(function (chart) { + expect($(chart.chartEl).find('svg').length).to.be(1); + }); }); }); - }); - describe('enable Method', function () { - let charts; + describe('enable Method', function () { + let charts; - beforeEach(function () { - charts = vis.handler.charts; + beforeEach(function () { + charts = vis.handler.charts; - charts.forEach(function (chart) { - events.forEach(function (event) { - vis.handler.enable(event, chart); + charts.forEach(function (chart) { + events.forEach(function (event) { + vis.handler.enable(event, chart); + }); }); }); - }); - it('should add events to chart and emit to the Events class', function () { - charts.forEach(function (chart) { - events.forEach(function (event) { - expect(chart.events.listenerCount(event)).to.be.above(0); + it('should add events to chart and emit to the Events class', function () { + charts.forEach(function (chart) { + events.forEach(function (event) { + expect(chart.events.listenerCount(event)).to.be.above(0); + }); }); }); }); - }); - describe('disable Method', function () { - let charts; + describe('disable Method', function () { + let charts; - beforeEach(function () { - charts = vis.handler.charts; + beforeEach(function () { + charts = vis.handler.charts; - charts.forEach(function (chart) { - events.forEach(function (event) { - vis.handler.disable(event, chart); + charts.forEach(function (chart) { + events.forEach(function (event) { + vis.handler.disable(event, chart); + }); }); }); - }); - it('should remove events from the chart', function () { - charts.forEach(function (chart) { - events.forEach(function (event) { - expect(chart.events.listenerCount(event)).to.be(0); + it('should remove events from the chart', function () { + charts.forEach(function (chart) { + events.forEach(function (event) { + expect(chart.events.listenerCount(event)).to.be(0); + }); }); }); + }); - }); + describe('removeAll Method', function () { + beforeEach(function () { + ngMock.inject(function () { + vis.handler.removeAll(vis.el); + }); + }); - describe('removeAll Method', function () { - beforeEach(function () { - ngMock.inject(function () { - vis.handler.removeAll(vis.el); + it('should remove all DOM elements from the el', function () { + expect($(vis.el).children().length).to.be(0); }); }); - it('should remove all DOM elements from the el', function () { - expect($(vis.el).children().length).to.be(0); - }); - }); + describe('error Method', function () { + beforeEach(function () { + vis.handler.error('This is an error!'); + }); - describe('error Method', function () { - beforeEach(function () { - vis.handler.error('This is an error!'); + it('should return an error classed DOM element with a text message', function () { + expect($(vis.el).find('.error').length).to.be(1); + expect($('.error h4').html()).to.be('This is an error!'); + }); }); - it('should return an error classed DOM element with a text message', function () { - expect($(vis.el).find('.error').length).to.be(1); - expect($('.error h4').html()).to.be('This is an error!'); - }); - }); + describe('destroy Method', function () { + beforeEach(function () { + vis.handler.destroy(); + }); - describe('destroy Method', function () { - beforeEach(function () { - vis.handler.destroy(); + it('should destroy all the charts in the visualization', function () { + expect(vis.handler.charts.length).to.be(0); + }); }); - it('should destroy all the charts in the visualization', function () { - expect(vis.handler.charts.length).to.be(0); - }); - }); + describe('event proxying', function () { - describe('event proxying', function () { + it('should only pass the original event object to downstream handlers', function (done) { + const event = {}; + const chart = vis.handler.charts[0]; - it('should only pass the original event object to downstream handlers', function (done) { - const event = {}; - const chart = vis.handler.charts[0]; + const mockEmitter = function () { + const args = Array.from(arguments); + expect(args.length).to.be(2); + expect(args[0]).to.be('click'); + expect(args[1]).to.be(event); + done(); + }; - const mockEmitter = function () { - const args = Array.from(arguments); - expect(args.length).to.be(2); - expect(args[0]).to.be('click'); - expect(args[1]).to.be(event); - done(); - }; + vis.emit = mockEmitter; + vis.handler.enable('click', chart); + chart.events.emit('click', event); + }); - vis.emit = mockEmitter; - vis.handler.enable('click', chart); - chart.events.emit('click', event); }); - }); }); }); diff --git a/src/ui/public/vislib/__tests__/lib/vis_config.js b/src/ui/public/vislib/__tests__/lib/vis_config.js index cbce4632f0c65..e428ce3edd548 100644 --- a/src/ui/public/vislib/__tests__/lib/vis_config.js +++ b/src/ui/public/vislib/__tests__/lib/vis_config.js @@ -9,61 +9,63 @@ describe('Vislib VisConfig Class Test Suite', function () { let el; const data = { hits: 621, - ordered: { - date: true, - interval: 30000, - max: 1408734982458, - min: 1408734082458 - }, - series: [ - { - label: 'Count', - values: [ - { - x: 1408734060000, - y: 8 - }, - { - x: 1408734090000, - y: 23 - }, - { - x: 1408734120000, - y: 30 - }, - { - x: 1408734150000, - y: 28 - }, - { - x: 1408734180000, - y: 36 - }, - { - x: 1408734210000, - y: 30 - }, - { - x: 1408734240000, - y: 26 - }, - { - x: 1408734270000, - y: 22 - }, - { - x: 1408734300000, - y: 29 - }, - { - x: 1408734330000, - y: 24 - } - ] - } - ], - xAxisLabel: 'Date Histogram', - yAxisLabel: 'Count' + charts: [{ + ordered: { + date: true, + interval: 30000, + max: 1408734982458, + min: 1408734082458 + }, + series: [ + { + label: 'Count', + values: [ + { + x: 1408734060000, + y: 8 + }, + { + x: 1408734090000, + y: 23 + }, + { + x: 1408734120000, + y: 30 + }, + { + x: 1408734150000, + y: 28 + }, + { + x: 1408734180000, + y: 36 + }, + { + x: 1408734210000, + y: 30 + }, + { + x: 1408734240000, + y: 26 + }, + { + x: 1408734270000, + y: 22 + }, + { + x: 1408734300000, + y: 29 + }, + { + x: 1408734330000, + y: 24 + } + ] + } + ], + xAxisLabel: 'Date Histogram', + yAxisLabel: 'Count' + }] }; beforeEach(ngMock.module('kibana')); diff --git a/src/ui/public/vislib/__tests__/lib/x_axis.js b/src/ui/public/vislib/__tests__/lib/x_axis.js index 6a6a45468e944..2531ee1ed0eca 100644 --- a/src/ui/public/vislib/__tests__/lib/x_axis.js +++ b/src/ui/public/vislib/__tests__/lib/x_axis.js @@ -16,64 +16,66 @@ describe('Vislib xAxis Class Test Suite', function () { let VisConfig; const data = { hits: 621, - ordered: { - date: true, - interval: 30000, - max: 1408734982458, - min: 1408734082458 - }, - series: [ - { - label: 'Count', - values: [ - { - x: 1408734060000, - y: 8 - }, - { - x: 1408734090000, - y: 23 - }, - { - x: 1408734120000, - y: 30 - }, - { - x: 1408734150000, - y: 28 - }, - { - x: 1408734180000, - y: 36 - }, - { - x: 1408734210000, - y: 30 - }, - { - x: 1408734240000, - y: 26 - }, - { - x: 1408734270000, - y: 22 - }, - { - x: 1408734300000, - y: 29 - }, - { - x: 1408734330000, - y: 24 - } - ] - } - ], - xAxisFormatter: function (thing) { - return new Date(thing); - }, - xAxisLabel: 'Date Histogram', - yAxisLabel: 'Count' + charts: [{ + ordered: { + date: true, + interval: 30000, + max: 1408734982458, + min: 1408734082458 + }, + series: [ + { + label: 'Count', + values: [ + { + x: 1408734060000, + y: 8 + }, + { + x: 1408734090000, + y: 23 + }, + { + x: 1408734120000, + y: 30 + }, + { + x: 1408734150000, + y: 28 + }, + { + x: 1408734180000, + y: 36 + }, + { + x: 1408734210000, + y: 30 + }, + { + x: 1408734240000, + y: 26 + }, + { + x: 1408734270000, + y: 22 + }, + { + x: 1408734300000, + y: 29 + }, + { + x: 1408734330000, + y: 24 + } + ] + } + ], + xAxisFormatter: function (thing) { + return new Date(thing); + }, + xAxisLabel: 'Date Histogram', + yAxisLabel: 'Count' + }] }; beforeEach(ngMock.module('kibana')); diff --git a/src/ui/public/vislib/__tests__/lib/y_axis.js b/src/ui/public/vislib/__tests__/lib/y_axis.js index 4eb9f4a6871ef..4480eb4af78f0 100644 --- a/src/ui/public/vislib/__tests__/lib/y_axis.js +++ b/src/ui/public/vislib/__tests__/lib/y_axis.js @@ -45,18 +45,20 @@ function makeSeriesData(data) { function createData(seriesData) { const data = { hits: 621, - label: 'test', - ordered: { - date: true, - interval: 30000, - max: 1408734982458, - min: 1408734082458 - }, - series: seriesData.map(function (series) { - return { values: makeSeriesData(series) }; - }), - xAxisLabel: 'Date Histogram', - yAxisLabel: 'Count' + charts: [{ + label: 'test', + ordered: { + date: true, + interval: 30000, + max: 1408734982458, + min: 1408734082458 + }, + series: seriesData.map(function (series) { + return { values: makeSeriesData(series) }; + }), + xAxisLabel: 'Date Histogram', + yAxisLabel: 'Count' + }] }; const node = $('
').css({ diff --git a/src/ui/public/vislib/__tests__/visualizations/area_chart.js b/src/ui/public/vislib/__tests__/visualizations/area_chart.js index d7286260d835c..1736a6de8af1a 100644 --- a/src/ui/public/vislib/__tests__/visualizations/area_chart.js +++ b/src/ui/public/vislib/__tests__/visualizations/area_chart.js @@ -22,187 +22,188 @@ const visLibParams = { mode: 'stacked' }; +describe('', function () { + _.forOwn(dataTypesArray, function (dataType, dataTypeName) { + describe('Vislib Area Chart Test Suite for ' + dataTypeName + ' Data', function () { + let vis; + let persistedState; + + beforeEach(ngMock.module('kibana')); + beforeEach(ngMock.inject(function (Private, $injector) { + vis = Private(FixturesVislibVisFixtureProvider)(visLibParams); + persistedState = new ($injector.get('PersistedState'))(); + vis.on('brush', _.noop); + vis.render(dataType, persistedState); + })); -_.forOwn(dataTypesArray, function (dataType, dataTypeName) { - describe('Vislib Area Chart Test Suite for ' + dataTypeName + ' Data', function () { - let vis; - let persistedState; - - beforeEach(ngMock.module('kibana')); - beforeEach(ngMock.inject(function (Private, $injector) { - vis = Private(FixturesVislibVisFixtureProvider)(visLibParams); - persistedState = new ($injector.get('PersistedState'))(); - vis.on('brush', _.noop); - vis.render(dataType, persistedState); - })); - - afterEach(function () { - vis.destroy(); - }); + afterEach(function () { + vis.destroy(); + }); - describe('stackData method', function () { - let stackedData; - let isStacked; + describe('stackData method', function () { + let stackedData; + let isStacked; - beforeEach(function () { - vis.handler.charts.forEach(function (chart) { - stackedData = chart.chartData; + beforeEach(function () { + vis.handler.charts.forEach(function (chart) { + stackedData = chart.chartData; - isStacked = stackedData.series.every(function (arr) { - return arr.values.every(function (d) { - return _.isNumber(d.y0); + isStacked = stackedData.series.every(function (arr) { + return arr.values.every(function (d) { + return _.isNumber(d.y0); + }); }); }); }); - }); - it('should append a d.y0 key to the data object', function () { - expect(isStacked).to.be(true); + it('should append a d.y0 key to the data object', function () { + expect(isStacked).to.be(true); + }); }); - }); - describe('addPath method', function () { - it('should append a area paths', function () { - vis.handler.charts.forEach(function (chart) { - expect($(chart.chartEl).find('path').length).to.be.greaterThan(0); + describe('addPath method', function () { + it('should append a area paths', function () { + vis.handler.charts.forEach(function (chart) { + expect($(chart.chartEl).find('path').length).to.be.greaterThan(0); + }); }); }); - }); - describe('addPathEvents method', function () { - let path; - let d3selectedPath; - let onMouseOver; + describe('addPathEvents method', function () { + let path; + let d3selectedPath; + let onMouseOver; - beforeEach(ngMock.inject(function () { - vis.handler.charts.forEach(function (chart) { - path = $(chart.chartEl).find('path')[0]; - d3selectedPath = d3.select(path)[0][0]; + beforeEach(ngMock.inject(function () { + vis.handler.charts.forEach(function (chart) { + path = $(chart.chartEl).find('path')[0]; + d3selectedPath = d3.select(path)[0][0]; - // d3 instance of click and hover - onMouseOver = (!!d3selectedPath.__onmouseover); - }); - })); + // d3 instance of click and hover + onMouseOver = (!!d3selectedPath.__onmouseover); + }); + })); - it('should attach a hover event', function () { - vis.handler.charts.forEach(function () { - expect(onMouseOver).to.be(true); + it('should attach a hover event', function () { + vis.handler.charts.forEach(function () { + expect(onMouseOver).to.be(true); + }); }); }); - }); - describe('addCircleEvents method', function () { - let circle; - let brush; - let d3selectedCircle; - let onBrush; - let onClick; - let onMouseOver; - - beforeEach(ngMock.inject(function () { - vis.handler.charts.forEach(function (chart) { - circle = $(chart.chartEl).find('circle')[0]; - brush = $(chart.chartEl).find('.brush'); - d3selectedCircle = d3.select(circle)[0][0]; - - // d3 instance of click and hover - onBrush = (!!brush); - onClick = (!!d3selectedCircle.__onclick); - onMouseOver = (!!d3selectedCircle.__onmouseover); + describe('addCircleEvents method', function () { + let circle; + let brush; + let d3selectedCircle; + let onBrush; + let onClick; + let onMouseOver; + + beforeEach(ngMock.inject(function () { + vis.handler.charts.forEach(function (chart) { + circle = $(chart.chartEl).find('circle')[0]; + brush = $(chart.chartEl).find('.brush'); + d3selectedCircle = d3.select(circle)[0][0]; + + // d3 instance of click and hover + onBrush = (!!brush); + onClick = (!!d3selectedCircle.__onclick); + onMouseOver = (!!d3selectedCircle.__onmouseover); + }); + })); + + // D3 brushing requires that a g element is appended that + // listens for mousedown events. This g element includes + // listeners, however, I was not able to test for the listener + // function being present. I will need to update this test + // in the future. + it('should attach a brush g element', function () { + vis.handler.charts.forEach(function () { + expect(onBrush).to.be(true); + }); }); - })); - // D3 brushing requires that a g element is appended that - // listens for mousedown events. This g element includes - // listeners, however, I was not able to test for the listener - // function being present. I will need to update this test - // in the future. - it('should attach a brush g element', function () { - vis.handler.charts.forEach(function () { - expect(onBrush).to.be(true); + it('should attach a click event', function () { + vis.handler.charts.forEach(function () { + expect(onClick).to.be(true); + }); }); - }); - it('should attach a click event', function () { - vis.handler.charts.forEach(function () { - expect(onClick).to.be(true); + it('should attach a hover event', function () { + vis.handler.charts.forEach(function () { + expect(onMouseOver).to.be(true); + }); }); }); - it('should attach a hover event', function () { - vis.handler.charts.forEach(function () { - expect(onMouseOver).to.be(true); + describe('addCircles method', function () { + it('should append circles', function () { + vis.handler.charts.forEach(function (chart) { + expect($(chart.chartEl).find('circle').length).to.be.greaterThan(0); + }); }); - }); - }); - describe('addCircles method', function () { - it('should append circles', function () { - vis.handler.charts.forEach(function (chart) { - expect($(chart.chartEl).find('circle').length).to.be.greaterThan(0); - }); - }); + it('should not draw circles where d.y === 0', function () { + vis.handler.charts.forEach(function (chart) { + const series = chart.chartData.series; + const isZero = series.some(function (d) { + return d.y === 0; + }); + const circles = $.makeArray($(chart.chartEl).find('circle')); + const isNotDrawn = circles.some(function (d) { + return d.__data__.y === 0; + }); - it('should not draw circles where d.y === 0', function () { - vis.handler.charts.forEach(function (chart) { - const series = chart.chartData.series; - const isZero = series.some(function (d) { - return d.y === 0; - }); - const circles = $.makeArray($(chart.chartEl).find('circle')); - const isNotDrawn = circles.some(function (d) { - return d.__data__.y === 0; + if (isZero) { + expect(isNotDrawn).to.be(false); + } }); - - if (isZero) { - expect(isNotDrawn).to.be(false); - } }); }); - }); - describe('draw method', function () { - it('should return a function', function () { - vis.handler.charts.forEach(function (chart) { - expect(_.isFunction(chart.draw())).to.be(true); + describe('draw method', function () { + it('should return a function', function () { + vis.handler.charts.forEach(function (chart) { + expect(_.isFunction(chart.draw())).to.be(true); + }); }); - }); - it('should return a yMin and yMax', function () { - vis.handler.charts.forEach(function (chart) { - const yAxis = chart.handler.valueAxes[0]; - const domain = yAxis.getScale().domain(); + it('should return a yMin and yMax', function () { + vis.handler.charts.forEach(function (chart) { + const yAxis = chart.handler.valueAxes[0]; + const domain = yAxis.getScale().domain(); - expect(domain[0]).to.not.be(undefined); - expect(domain[1]).to.not.be(undefined); + expect(domain[0]).to.not.be(undefined); + expect(domain[1]).to.not.be(undefined); + }); }); - }); - it('should render a zero axis line', function () { - vis.handler.charts.forEach(function (chart) { - const yAxis = chart.handler.valueAxes[0]; + it('should render a zero axis line', function () { + vis.handler.charts.forEach(function (chart) { + const yAxis = chart.handler.valueAxes[0]; - if (yAxis.yMin < 0 && yAxis.yMax > 0) { - expect($(chart.chartEl).find('line.zero-line').length).to.be(1); - } + if (yAxis.yMin < 0 && yAxis.yMax > 0) { + expect($(chart.chartEl).find('line.zero-line').length).to.be(1); + } + }); }); }); - }); - describe('defaultYExtents is true', function () { - beforeEach(function () { - vis.visConfigArgs.defaultYExtents = true; - vis.render(dataType, persistedState); - }); + describe('defaultYExtents is true', function () { + beforeEach(function () { + vis.visConfigArgs.defaultYExtents = true; + vis.render(dataType, persistedState); + }); - it('should return yAxis extents equal to data extents', function () { - vis.handler.charts.forEach(function (chart) { - const yAxis = chart.handler.valueAxes[0]; - const min = vis.handler.valueAxes[0].axisScale.getYMin(); - const max = vis.handler.valueAxes[0].axisScale.getYMax(); - const domain = yAxis.getScale().domain(); - expect(domain[0]).to.equal(min); - expect(domain[1]).to.equal(max); + it('should return yAxis extents equal to data extents', function () { + vis.handler.charts.forEach(function (chart) { + const yAxis = chart.handler.valueAxes[0]; + const min = vis.handler.valueAxes[0].axisScale.getYMin(); + const max = vis.handler.valueAxes[0].axisScale.getYMax(); + const domain = yAxis.getScale().domain(); + expect(domain[0]).to.equal(min); + expect(domain[1]).to.equal(max); + }); }); }); }); diff --git a/src/ui/public/vislib/__tests__/visualizations/chart.js b/src/ui/public/vislib/__tests__/visualizations/chart.js index 862991505d508..f6257497d83dc 100644 --- a/src/ui/public/vislib/__tests__/visualizations/chart.js +++ b/src/ui/public/vislib/__tests__/visualizations/chart.js @@ -15,67 +15,69 @@ describe('Vislib _chart Test Suite', function () { let config; const data = { hits : 621, - label : '', - ordered : { - date: true, - interval: 30000, - max : 1408734982458, - min : 1408734082458 - }, - series : [ - { - values: [ - { - x: 1408734060000, - y: 8 - }, - { - x: 1408734090000, - y: 23 - }, - { - x: 1408734120000, - y: 30 - }, - { - x: 1408734150000, - y: 28 - }, - { - x: 1408734180000, - y: 36 - }, - { - x: 1408734210000, - y: 30 - }, - { - x: 1408734240000, - y: 26 - }, - { - x: 1408734270000, - y: 22 - }, - { - x: 1408734300000, - y: 29 - }, - { - x: 1408734330000, - y: 24 - } - ] - } - ], - tooltipFormatter: function (datapoint) { - return datapoint; - }, - xAxisFormatter: function (thing) { - return thing; - }, - xAxisLabel: 'Date Histogram', - yAxisLabel: 'Count' + charts: [{ + label : '', + ordered : { + date: true, + interval: 30000, + max : 1408734982458, + min : 1408734082458 + }, + series : [ + { + values: [ + { + x: 1408734060000, + y: 8 + }, + { + x: 1408734090000, + y: 23 + }, + { + x: 1408734120000, + y: 30 + }, + { + x: 1408734150000, + y: 28 + }, + { + x: 1408734180000, + y: 36 + }, + { + x: 1408734210000, + y: 30 + }, + { + x: 1408734240000, + y: 26 + }, + { + x: 1408734270000, + y: 22 + }, + { + x: 1408734300000, + y: 29 + }, + { + x: 1408734330000, + y: 24 + } + ] + } + ], + tooltipFormatter: function (datapoint) { + return datapoint; + }, + xAxisFormatter: function (thing) { + return thing; + }, + xAxisLabel: 'Date Histogram', + yAxisLabel: 'Count' + }] }; beforeEach(ngMock.module('kibana')); diff --git a/src/ui/public/vislib/__tests__/visualizations/pie_chart.js b/src/ui/public/vislib/__tests__/visualizations/pie_chart.js index b4ba0ca5c6622..bbbb0f99c54da 100644 --- a/src/ui/public/vislib/__tests__/visualizations/pie_chart.js +++ b/src/ui/public/vislib/__tests__/visualizations/pie_chart.js @@ -2,45 +2,10 @@ import d3 from 'd3'; import expect from 'expect.js'; import ngMock from 'ng_mock'; import _ from 'lodash'; -import fixtures from 'fixtures/fake_hierarchical_data'; import $ from 'jquery'; import FixturesVislibVisFixtureProvider from 'fixtures/vislib/_vis_fixture'; -import { VisProvider } from 'ui/vis'; import 'ui/persisted_state'; -import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern'; -import { BuildHierarchicalDataProvider } from 'ui/agg_response/hierarchical/build_hierarchical_data'; - -const rowAgg = [ - { type: 'avg', schema: 'metric', params: { field: 'bytes' } }, - { type: 'terms', schema: 'split', params: { field: 'extension', rows: true } }, - { type: 'terms', schema: 'segment', params: { field: 'machine.os' } }, - { type: 'terms', schema: 'segment', params: { field: 'geo.src' } } -]; - -const colAgg = [ - { type: 'avg', schema: 'metric', params: { field: 'bytes' } }, - { type: 'terms', schema: 'split', params: { field: 'extension', row: false } }, - { type: 'terms', schema: 'segment', params: { field: 'machine.os' } }, - { type: 'terms', schema: 'segment', params: { field: 'geo.src' } } -]; - -const sliceAgg = [ - { type: 'avg', schema: 'metric', params: { field: 'bytes' } }, - { type: 'terms', schema: 'segment', params: { field: 'machine.os' } }, - { type: 'terms', schema: 'segment', params: { field: 'geo.src' } } -]; - -const aggArray = [ - rowAgg, - colAgg, - sliceAgg -]; - -const names = [ - 'rows', - 'columns', - 'slices' -]; +import pieData from 'fixtures/vislib/mock_data/pie/_histogram'; const sizes = [ 0, @@ -52,147 +17,64 @@ const sizes = [ ]; describe('No global chart settings', function () { - const visLibParams1 = { - el: '
', - type: 'pie', - addLegend: true, - addTooltip: true - }; - const visLibParams2 = { - el: '
', + const visLibParams = { + el: $('
'), type: 'pie', addLegend: true, addTooltip: true }; - let chart1; - let chart2; - let Vis; + let vis; let persistedState; - let indexPattern; - let buildHierarchicalData; - let data1; - let data2; beforeEach(ngMock.module('kibana')); beforeEach(ngMock.inject(function (Private, $injector) { - chart1 = Private(FixturesVislibVisFixtureProvider)(visLibParams1); - chart2 = Private(FixturesVislibVisFixtureProvider)(visLibParams2); - Vis = Private(VisProvider); + vis = Private(FixturesVislibVisFixtureProvider)(visLibParams); persistedState = new ($injector.get('PersistedState'))(); - indexPattern = Private(FixturesStubbedLogstashIndexPatternProvider); - buildHierarchicalData = Private(BuildHierarchicalDataProvider); - - let id1 = 1; - let id2 = 1; - const stubVis1 = new Vis(indexPattern, { - type: 'pie', - aggs: rowAgg - }); - const stubVis2 = new Vis(indexPattern, { - type: 'pie', - aggs: colAgg - }); - - // We need to set the aggs to a known value. - _.each(stubVis1.aggs, function (agg) { - agg.id = 'agg_' + id1++; - }); - _.each(stubVis2.aggs, function (agg) { - agg.id = 'agg_' + id2++; - }); - - data1 = buildHierarchicalData(stubVis1, fixtures.threeTermBuckets); - data2 = buildHierarchicalData(stubVis2, fixtures.threeTermBuckets); - - chart1.render(data1, persistedState); - chart2.render(data2, persistedState); + vis.on('brush', _.noop); + vis.render(pieData, persistedState); })); afterEach(function () { - chart1.destroy(); - chart2.destroy(); + vis.destroy(); }); it('should render chart titles for all charts', function () { - expect($(chart1.el).find('.y-axis-chart-title').length).to.be(1); - expect($(chart2.el).find('.x-axis-chart-title').length).to.be(1); + expect($(vis.el).find('.x-axis-chart-title').length).to.be(1); }); describe('_validatePieData method', function () { const allZeros = [ - { slices: { children: [] } }, - { slices: { children: [] } }, - { slices: { children: [] } } + { children: [] }, + { children: [] }, + { children: [] } ]; const someZeros = [ - { slices: { children: [{}] } }, - { slices: { children: [{}] } }, - { slices: { children: [] } } + { children: [{}] }, + { children: [{}] }, + { children: [] } ]; const noZeros = [ - { slices: { children: [{}] } }, - { slices: { children: [{}] } }, - { slices: { children: [{}] } } + { children: [{}] }, + { children: [{}] }, + { children: [{}] } ]; it('should throw an error when all charts contain zeros', function () { expect(function () { - chart1.handler.ChartClass.prototype._validatePieData(allZeros); + vis.handler.ChartClass.prototype._validatePieData(allZeros); }).to.throwError(); }); it('should not throw an error when only some or no charts contain zeros', function () { expect(function () { - chart1.handler.ChartClass.prototype._validatePieData(someZeros); + vis.handler.ChartClass.prototype._validatePieData(someZeros); }).to.not.throwError(); expect(function () { - chart1.handler.ChartClass.prototype._validatePieData(noZeros); + vis.handler.ChartClass.prototype._validatePieData(noZeros); }).to.not.throwError(); }); - }); -}); - -aggArray.forEach(function (dataAgg, i) { - describe('Vislib PieChart Class Test Suite for ' + names[i] + ' data', function () { - const visLibParams = { - type: 'pie', - addLegend: true, - addTooltip: true - }; - let vis; - let Vis; - let persistedState; - let indexPattern; - let buildHierarchicalData; - let data; - - beforeEach(ngMock.module('kibana')); - beforeEach(ngMock.inject(function (Private, $injector) { - vis = Private(FixturesVislibVisFixtureProvider)(visLibParams); - Vis = Private(VisProvider); - persistedState = new ($injector.get('PersistedState'))(); - indexPattern = Private(FixturesStubbedLogstashIndexPatternProvider); - buildHierarchicalData = Private(BuildHierarchicalDataProvider); - - let id = 1; - const stubVis = new Vis(indexPattern, { - type: 'pie', - aggs: dataAgg - }); - - // We need to set the aggs to a known value. - _.each(stubVis.aggs, function (agg) { agg.id = 'agg_' + id++; }); - - data = buildHierarchicalData(stubVis, fixtures.threeTermBuckets); - - vis.render(data, persistedState); - })); - - afterEach(function () { - vis.destroy(); - }); describe('addPathEvents method', function () { let path; @@ -235,7 +117,7 @@ aggArray.forEach(function (dataAgg, i) { width = $(chart.chartEl).width(); height = $(chart.chartEl).height(); svg = d3.select($(chart.chartEl).find('svg')[0]); - slices = chart.chartData.slices; + slices = chart.chartData; }); })); @@ -292,6 +174,5 @@ aggArray.forEach(function (dataAgg, i) { }); }); }); - }); }); diff --git a/src/ui/public/vislib/__tests__/visualizations/time_marker.js b/src/ui/public/vislib/__tests__/visualizations/time_marker.js index fdc6273abeeec..883de31064a83 100644 --- a/src/ui/public/vislib/__tests__/visualizations/time_marker.js +++ b/src/ui/public/vislib/__tests__/visualizations/time_marker.js @@ -42,8 +42,8 @@ describe('Vislib Time Marker Test Suite', function () { beforeEach(ngMock.module('kibana')); beforeEach(ngMock.inject(function (Private) { TimeMarker = Private(VislibVisualizationsTimeMarkerProvider); - minDomain = getExtent(series.series, d3.min); - maxDomain = getExtent(series.series, d3.max); + minDomain = getExtent(series.charts[0].series, d3.min); + maxDomain = getExtent(series.charts[0].series, d3.max); domain = [minDomain, maxDomain]; xScale = d3.time.scale().domain(domain).range([0, 500]); defaultMarker = new TimeMarker(times, xScale, height);