Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Monitoring] Re-enable logstash tests #59815

Merged
merged 6 commits into from
Mar 12, 2020
Merged

[Monitoring] Re-enable logstash tests #59815

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b85de86
Revert "Skip all logstash pipeline tests"
chrisronline Mar 10, 2020
dab2b4e
Reenable tests and fix them based on recent changes
chrisronline Mar 10, 2020
1a8c41f
Merge in master
chrisronline Mar 11, 2020
83e9e20
Fix more tests
chrisronline Mar 11, 2020
ab25058
Merge branch 'master' into monitoring/reenable_tests
elasticmachine Mar 11, 2020
e0c406f
Merge branch 'master' into monitoring/reenable_tests
elasticmachine Mar 12, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion x-pack/legacy/plugins/monitoring/server/lib/logstash/get_paginated_pipelines.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ export async function getPaginatedPipelines(
{ clusterUuid, logstashUuid },
{ throughputMetric, nodesCountMetric },
pagination,
sort,
sort = { field: null },
queryText
) {
const sortField = sort.field;
Expand Down
54 changes: 53 additions & 1 deletion x-pack/test/api_integration/apis/monitoring/logstash/fixtures/multicluster_pipelines.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,53 @@
{"pipelines":[{"id":"uno","metrics":{"throughput":{"bucket_size":"10 seconds","timeRange":{"min":1573485225266,"max":1573485425399},"metric":{"app":"logstash","field":"logstash_stats.pipelines.events.out","label":"Pipeline Throughput","description":"Number of events emitted per second by the Logstash pipeline at the outputs stage.","units":"e/s","format":"0,0.[00]","hasCalculation":true,"isDerivative":false},"data":[[1573485230000,0]]},"nodesCount":{"bucket_size":"10 seconds","timeRange":{"min":1573485225266,"max":1573485425399},"metric":{"app":"logstash","field":"logstash_stats.logstash.uuid","label":"Pipeline Node Count","description":"Number of nodes on which the Logstash pipeline is running.","units":"","format":"0,0.[00]","hasCalculation":true,"isDerivative":false},"data":[[1573485230000,1]]}},"latestThroughput":0,"latestNodesCount":1}],"clusterStatus":{"node_count":1,"events_in_total":0,"events_out_total":0,"avg_memory":1037959168,"avg_memory_used":203687512,"max_uptime":863288,"pipeline_count":1,"queue_types":{"memory":1,"persisted":0},"versions":["8.0.0"]},"totalPipelineCount":1}
{
"pipelines": [
{
"id": "uno",
"metrics": {
"throughput": {
"bucket_size": "10 seconds",
"timeRange": { "min": 1573485225266, "max": 1573485425399 },
"metric": {
"app": "logstash",
"field": "logstash_stats.pipelines.events.out",
"label": "Pipeline Throughput",
"description": "Number of events emitted per second by the Logstash pipeline at the outputs stage.",
"units": "e/s",
"format": "0,0.[00]",
"hasCalculation": false,
"isDerivative": true
},
"data": [[1573485230000, 0]]
},
"nodesCount": {
"bucket_size": "10 seconds",
"timeRange": { "min": 1573485225266, "max": 1573485425399 },
"metric": {
"app": "logstash",
"field": "logstash_stats.logstash.uuid",
"label": "Pipeline Node Count",
"description": "Number of nodes on which the Logstash pipeline is running.",
"units": "",
"format": "0,0.[00]",
"hasCalculation": true,
"isDerivative": false
},
"data": [[1573485230000, 1]]
}
},
"latestThroughput": 0,
"latestNodesCount": 1
}
],
"clusterStatus": {
"node_count": 1,
"events_in_total": 0,
"events_out_total": 0,
"avg_memory": 1037959168,
"avg_memory_used": 203687512,
"max_uptime": 863288,
"pipeline_count": 1,
"queue_types": { "memory": 1, "persisted": 0 },
"versions": ["8.0.0"]
},
"totalPipelineCount": 1
}
2 changes: 1 addition & 1 deletion x-pack/test/api_integration/apis/monitoring/logstash/fixtures/pipelines.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion x-pack/test/api_integration/apis/monitoring/logstash/multicluster_pipelines.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ export default function({ getService }) {
const supertest = getService('supertest');
const esArchiver = getService('esArchiver');

describe.skip('pipelines listing multicluster', () => {
describe('pipelines listing multicluster', () => {
const archive = 'monitoring/logstash_pipelines_multicluster';
const timeRange = {
min: '2019-11-11T15:13:45.266Z',
Expand Down
2 changes: 1 addition & 1 deletion x-pack/test/api_integration/apis/monitoring/logstash/pipelines.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ export default function({ getService }) {
const supertest = getService('supertest');
const esArchiver = getService('esArchiver');

describe.skip('pipelines', () => {
describe('pipelines', () => {
const archive = 'monitoring/logstash/changing_pipelines';
const timeRange = {
min: '2019-11-04T15:40:44.855Z',
Expand Down
2 changes: 1 addition & 1 deletion x-pack/test/functional/apps/monitoring/logstash/pipelines.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ export default function({ getService, getPageObjects }) {
const pipelinesList = getService('monitoringLogstashPipelines');
const lsClusterSummaryStatus = getService('monitoringLogstashSummaryStatus');

describe.skip('Logstash pipelines', () => {
describe('Logstash pipelines', () => {
const { setup, tearDown } = getLifecycleMethods(getService, getPageObjects);

before(async () => {
Expand Down