Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 8 additions & 0 deletions x-pack/plugins/monitoring/public/application/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import { NoDataPage } from './pages/no_data';
import { ElasticsearchOverviewPage } from './pages/elasticsearch/overview';
import { BeatsOverviewPage } from './pages/beats/overview';
import { BeatsInstancesPage } from './pages/beats/instances';
import { BeatsInstancePage } from './pages/beats/instance';
import { CODE_PATH_ELASTICSEARCH, CODE_PATH_BEATS } from '../../common/constants';
import { ElasticsearchNodesPage } from './pages/elasticsearch/nodes_page';
import { ElasticsearchIndicesPage } from './pages/elasticsearch/indices_page';
Expand Down Expand Up @@ -111,6 +112,13 @@ const MonitoringApp: React.FC<{
/>

{/* Beats Views */}
<RouteInit
path="/beats/beat/:instance"
component={BeatsInstancePage}
codePaths={[CODE_PATH_BEATS]}
fetchAllClusters={false}
/>

<RouteInit
path="/beats/beats"
component={BeatsInstancesPage}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,26 +10,36 @@ import { PageTemplate } from '../page_template';
import { TabMenuItem, PageTemplateProps } from '../page_template';

interface BeatsTemplateProps extends PageTemplateProps {
cluster: any;
instance?: any;
}

export const BeatsTemplate: React.FC<BeatsTemplateProps> = ({ cluster, ...props }) => {
const tabs: TabMenuItem[] = [
{
export const BeatsTemplate: React.FC<BeatsTemplateProps> = ({ instance, ...props }) => {
const tabs: TabMenuItem[] = [];

if (!instance) {
tabs.push({
id: 'overview',
label: i18n.translate('xpack.monitoring.beatsNavigation.overviewLinkText', {
defaultMessage: 'Overview',
}),
route: '/beats',
},
{
});
tabs.push({
Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Borrowed the pattern from #113256 here

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

This could even be extracted to its own func as it looks like a good candidate for a unit test :)

id: 'instances',
label: i18n.translate('xpack.monitoring.beatsNavigation.instancesLinkText', {
defaultMessage: 'Instances',
}),
route: '/beats/beats',
},
];
});
} else {
tabs.push({
id: 'overview',
label: i18n.translate('xpack.monitoring.beatsNavigation.instance.overviewLinkText', {
defaultMessage: 'Overview',
}),
route: `/beats/beat/${instance}`,
});
}

return <PageTemplate {...props} tabs={tabs} product="beats" />;
};
Original file line number Diff line number Diff line change
@@ -0,0 +1,90 @@
/*
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
* or more contributor license agreements. Licensed under the Elastic License
* 2.0; you may not use this file except in compliance with the Elastic License
* 2.0.
*/

import React, { useContext, useState, useCallback, useEffect } from 'react';
import { useParams } from 'react-router-dom';
import { i18n } from '@kbn/i18n';
import { find } from 'lodash';
import { ComponentProps } from '../../route_init';
import { GlobalStateContext } from '../../global_state_context';
import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
import { useCharts } from '../../hooks/use_charts';
// @ts-ignore
import { Beat } from '../../../components/beats/beat';
import { BreadcrumbContainer } from '../../hooks/use_breadcrumbs';
import { BeatsTemplate } from './beats_template';

export const BeatsInstancePage: React.FC<ComponentProps> = ({ clusters }) => {
const { instance }: { instance: string } = useParams();

const globalState = useContext(GlobalStateContext);
const { services } = useKibana<{ data: any }>();
const { generate: generateBreadcrumbs } = useContext(BreadcrumbContainer.Context);
const { zoomInfo, onBrush } = useCharts();
const clusterUuid = globalState.cluster_uuid;
const ccs = globalState.ccs;
const cluster = find(clusters, {
cluster_uuid: clusterUuid,
}) as any;
const [data, setData] = useState({} as any);
const [beatName, setBeatName] = useState('');

const title = i18n.translate('xpack.monitoring.beats.instance.routeTitle', {
defaultMessage: 'Beats - {instanceName} - Overview',
values: {
instanceName: beatName,
},
});

const pageTitle = i18n.translate('xpack.monitoring.beats.instance.pageTitle', {
defaultMessage: 'Beat instance: {beatName}',
values: {
beatName,
},
});

useEffect(() => {
if (cluster) {
generateBreadcrumbs(cluster.cluster_name, {
inBeats: true,
instance: beatName,
});
}
}, [cluster, beatName, generateBreadcrumbs]);

const getPageData = useCallback(async () => {
const bounds = services.data?.query.timefilter.timefilter.getBounds();
const url = `../api/monitoring/v1/clusters/${clusterUuid}/beats/beat/${instance}`;
const response = await services.http?.fetch(url, {
method: 'POST',
body: JSON.stringify({
ccs,
timeRange: {
min: bounds.min.toISOString(),
max: bounds.max.toISOString(),
},
}),
});

setData(response);
setBeatName(response.summary.name);
}, [ccs, clusterUuid, instance, services.data?.query.timefilter.timefilter, services.http]);

return (
<BeatsTemplate
title={title}
pageTitle={pageTitle}
getPageData={getPageData}
instance={instance}
data-test-subj="beatDetailPage"
>
<div data-test-subj="monitoringBeatsInstanceApp">
<Beat summary={data.summary} metrics={data.metrics} onBrush={onBrush} zoomInfo={zoomInfo} />
</div>
</BeatsTemplate>
);
};
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,6 @@ export const BeatsInstancesPage: React.FC<ComponentProps> = ({ clusters }) => {
pageTitle={pageTitle}
getPageData={getPageData}
data-test-subj="beatsListingPage"
cluster={cluster}
>
<div data-test-subj="monitoringBeatsInstancesApp">
<SetupModeRenderer
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,6 @@ export const BeatsOverviewPage: React.FC<ComponentProps> = ({ clusters }) => {
pageTitle={pageTitle}
getPageData={getPageData}
data-test-subj="beatsOverviewPage"
cluster={cluster}
>
<div data-test-subj="beatsOverviewPage">{renderOverview(data)}</div>
</BeatsTemplate>
Expand Down