diff --git a/src/server/status/lib/metrics.js b/src/server/status/lib/metrics.js index 1a7bcce65dfd..a16f1f8822ca 100644 --- a/src/server/status/lib/metrics.js +++ b/src/server/status/lib/metrics.js @@ -43,7 +43,6 @@ export class Metrics { }, response_times: {}, requests: { - status_codes: {} } }; } diff --git a/src/server/status/lib/metrics.test.js b/src/server/status/lib/metrics.test.js index c0afa6574954..00da1a40c01b 100644 --- a/src/server/status/lib/metrics.test.js +++ b/src/server/status/lib/metrics.test.js @@ -131,9 +131,6 @@ describe('Metrics', function () { }, 'requests': { 'disconnects': 0, - 'status_codes': { - '200': 22 - }, 'total': 22 }, 'response_times': { @@ -159,7 +156,7 @@ describe('Metrics', function () { memory: { free_in_bytes: 12, total_in_bytes: 24 }, }, response_times: { max_in_millis: 4 }, - requests: { total: 22, disconnects: 0, status_codes: { '200': 22 } }, + requests: { total: 22, disconnects: 0 }, }); }); }); diff --git a/test/api_integration/apis/stats/stats.js b/test/api_integration/apis/stats/stats.js index 4f25913b640c..142d1b91a0e9 100644 --- a/test/api_integration/apis/stats/stats.js +++ b/test/api_integration/apis/stats/stats.js @@ -47,7 +47,6 @@ const assertStatsAndMetrics = body => { expect(body.response_times.avg_ms).not.to.be(null); // ok if is undefined expect(body.response_times.max_ms).not.to.be(null); // ok if is undefined - expect(body.requests.status_codes).to.be.an('object'); expect(body.requests.total).to.be.a('number'); expect(body.requests.disconnects).to.be.a('number'); diff --git a/test/api_integration/apis/status/status.js b/test/api_integration/apis/status/status.js index 969558d38f93..08ab6fc7667a 100644 --- a/test/api_integration/apis/status/status.js +++ b/test/api_integration/apis/status/status.js @@ -59,7 +59,6 @@ export default function ({ getService }) { expect(body.metrics.requests.total).to.be.a('number'); expect(body.metrics.requests.disconnects).to.be.a('number'); - expect(body.metrics.requests.status_codes).to.be.an('object'); expect(body.metrics.concurrent_connections).to.be.a('number'); }); }); diff --git a/x-pack/plugins/monitoring/server/kibana_monitoring/bulk_uploader.combine_stats_legacy.test.js b/x-pack/plugins/monitoring/server/kibana_monitoring/bulk_uploader.combine_stats_legacy.test.js index 9b71d9417d52..2ecd9a8329ea 100644 --- a/x-pack/plugins/monitoring/server/kibana_monitoring/bulk_uploader.combine_stats_legacy.test.js +++ b/x-pack/plugins/monitoring/server/kibana_monitoring/bulk_uploader.combine_stats_legacy.test.js @@ -31,7 +31,6 @@ const getInitial = () => { 'requests': { 'disconnects': 0, 'total': 2, - 'status_codes': { '200': 2 } }, 'response_times': { 'average': 47, 'max': 47 }, 'timestamp': '2017-07-26T00:14:20.771Z', @@ -94,7 +93,6 @@ const getResult = () => { 'requests': { 'disconnects': 0, 'total': 2, - 'status_codes': { '200': 2 } }, 'response_times': { 'average': 47, 'max': 47 }, 'timestamp': '2017-07-26T00:14:20.771Z', diff --git a/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/ops_buffer/__tests__/event_roller.js b/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/ops_buffer/__tests__/event_roller.js index bb4af020f482..7c3f381af9bf 100644 --- a/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/ops_buffer/__tests__/event_roller.js +++ b/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/ops_buffer/__tests__/event_roller.js @@ -102,7 +102,6 @@ describe('Event Roller', () => { requests: { disconnects: 0, total: 138, // 103 + 35 - status_codes: { '200': 20, '304': 118 } }, response_times: { average: 5.213592233009709, // max of 5.213592233009709, 4.6 diff --git a/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/ops_buffer/__tests__/map_requests.js b/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/ops_buffer/__tests__/map_requests.js index d61347548bea..6fb139283038 100644 --- a/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/ops_buffer/__tests__/map_requests.js +++ b/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/ops_buffer/__tests__/map_requests.js @@ -11,7 +11,7 @@ import expect from 'expect.js'; describe('Map requests', () => { it('flatten ports', () => { const requests = { '5603': { total: 1, disconnects: 0, statusCodes: {} } }; - const expected = { total: 1, disconnects: 0, status_codes: {} }; + const expected = { total: 1, disconnects: 0 }; expect(_.isEqual(mapRequests(requests), expected)).to.be(true); }); @@ -37,10 +37,6 @@ describe('Map requests', () => { const expected = { total: 3, disconnects: 44, - status_codes: { - '200': 22, - '201': 4 - } }; expect(_.isEqual(mapRequests(requests), expected)).to.be(true); diff --git a/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/ops_buffer/event_roller.js b/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/ops_buffer/event_roller.js index 80c379c72af5..d03e49e829f7 100644 --- a/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/ops_buffer/event_roller.js +++ b/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/ops_buffer/event_roller.js @@ -13,7 +13,6 @@ import { mapConcurrentConnections } from './map_concurrent_connections'; // rollup functions are for objects with unpredictable keys (e.g., {'200': 1, '201': 2} + {'200':2} = {'200': 3, '201': 2}) const maxRollup = partialRight(assign, (latest, prev) => max([latest, prev])); -const sumRollup = partialRight(assign, (latest, prev) => sum([latest, prev])); export class EventRoller { constructor() { @@ -68,10 +67,6 @@ export class EventRoller { this.getFromRollup('requests.disconnects') ]), total: sum([requests.total, this.getFromRollup('requests.total')]), - status_codes: sumRollup( - requests.status_codes, - this.getFromRollup('requests.status_codes') - ) }, response_times: maxRollup( mapResponseTimes(event.responseTimes), diff --git a/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/ops_buffer/map_requests.js b/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/ops_buffer/map_requests.js index e715d1d500ed..c723c0ddc957 100644 --- a/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/ops_buffer/map_requests.js +++ b/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/ops_buffer/map_requests.js @@ -8,12 +8,8 @@ import _ from 'lodash'; export function mapRequests(requests) { return _.reduce(_.values(requests), (result, value) => { - _.each(value.statusCodes, (count, code) => { - if (_.isUndefined(_.get(result, `status_codes.${code}`))) { _.set(result, `status_codes.${code}`, 0); } - result.status_codes[code] += count; - }); result.total += value.total; result.disconnects += value.disconnects; return result; - }, { total: 0, disconnects: 0, status_codes: {} }); + }, { total: 0, disconnects: 0 }); }