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

[Stack monitoring] Fix logstash functional tests for react #114819

Merged
merged 4 commits into from
Oct 14, 2021
Merged

[Stack monitoring] Fix logstash functional tests for react #114819

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
21c696f
update logstash pipelines test subject
estermv Oct 13, 2021
a16afbd
Add sorting to table options for pipelines table
estermv Oct 13, 2021
9325d8c
fix sorting in logstash node pipelines table
estermv Oct 13, 2021
acdd08f
remove commented code
estermv Oct 13, 2021
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
4 changes: 1 addition & 3 deletions x-pack/plugins/monitoring/public/application/pages/logstash/node_pipelines.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@ export const LogStashNodePipelinesPage: React.FC<ComponentProps> = ({ clusters }

const getPageData = useCallback(async () => {
const bounds = services.data?.query.timefilter.timefilter.getBounds();
const options: any = getPaginationRouteOptions();
const url = `../api/monitoring/v1/clusters/${clusterUuid}/logstash/node/${match.params.uuid}/pipelines`;
const response = await services.http?.fetch(url, {
method: 'POST',
Expand All @@ -68,8 +67,7 @@ export const LogStashNodePipelinesPage: React.FC<ComponentProps> = ({ clusters }
min: bounds.min.toISOString(),
max: bounds.max.toISOString(),
},
pagination: options.pagination,
queryText: options.queryText,
...getPaginationRouteOptions(),
}),
});

Expand Down
8 changes: 3 additions & 5 deletions x-pack/plugins/monitoring/public/application/pages/logstash/pipelines.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ export const LogStashPipelinesPage: React.FC<ComponentProps> = ({ clusters }) =>
const bounds = services.data?.query.timefilter.timefilter.getBounds();
const url = `../api/monitoring/v1/clusters/${clusterUuid}/logstash/pipelines`;

const options: any = getPaginationRouteOptions();
const response = await services.http?.fetch(url, {
method: 'POST',
body: JSON.stringify({
Expand All @@ -55,8 +54,7 @@ export const LogStashPipelinesPage: React.FC<ComponentProps> = ({ clusters }) =>
min: bounds.min.toISOString(),
max: bounds.max.toISOString(),
},
pagination: options.pagination,
queryText: options.queryText,
...getPaginationRouteOptions(),
}),
});

Expand Down Expand Up @@ -96,10 +94,10 @@ export const LogStashPipelinesPage: React.FC<ComponentProps> = ({ clusters }) =>
title={title}
pageTitle={pageTitle}
getPageData={getPageData}
data-test-subj="elasticsearchOverviewPage"
data-test-subj="logstashPipelinesListing"
cluster={cluster}
>
<div data-test-subj="elasticsearchOverviewPage">{renderOverview(data)}</div>
<div data-test-subj="logstashPipelinesListing">{renderOverview(data)}</div>
</LogstashTemplate>
);
};
Expand Down
4 changes: 0 additions & 4 deletions x-pack/test/functional/apps/monitoring/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,6 @@ export default function ({ loadTestFile }) {
loadTestFile(require.resolve('./kibana/instance'));
loadTestFile(require.resolve('./kibana/instance_mb'));

// loadTestFile(require.resolve('./logstash/overview'));
// loadTestFile(require.resolve('./logstash/nodes'));
// loadTestFile(require.resolve('./logstash/node'));
Comment on lines -37 to -39
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These files don't exist, so I just removed the commented code.
Opened an issue to add tests for logstash pages #114813


loadTestFile(require.resolve('./logstash/pipelines'));
loadTestFile(require.resolve('./logstash/pipelines_mb'));

Expand Down