maxmustermann/kibana
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Logstash view cleanup fixes (#114218)

Browse source 
* Fix route ordering/duplication

* Take out "IDK" comments

I remember we figured this out last week while pairing :)
This commit is contained in:
Mat Schaffer 2021-10-08 00:07:14 +09:00 committed by GitHub
parent dee9444dcc
commit a5f4304672
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
x-pack/plugins/monitoring/public/application/index.tsx
View file

@ -231,34 +231,12 @@ const MonitoringApp: React.FC<{
fetchAllClusters={false}
/>
{/* APM Views */}
<RouteInit
path="/apm/instances/:instance"
component={ApmInstancePage}
codePaths={[CODE_PATH_APM]}
fetchAllClusters={false}
/>
{/* Logstash Routes */}
<RouteInit
path="/logstash/nodes"
component={LogStashNodesPage}
codePaths={[CODE_PATH_LOGSTASH]}
fetchAllClusters={false}
/>
<RouteInit
path="/logstash/node/:uuid/advanced"
component={LogStashNodeAdvancedPage}
codePaths={[CODE_PATH_LOGSTASH]}
fetchAllClusters={false}
/>
<RouteInit
path="/apm/instances"
component={ApmInstancesPage}
codePaths={[CODE_PATH_APM]}
fetchAllClusters={false}
/>
<RouteInit
path="/logstash/node/:uuid/pipelines"
@ -294,6 +272,22 @@ const MonitoringApp: React.FC<{
codePaths={[CODE_PATH_LOGSTASH]}
fetchAllClusters={false}
/>
{/* APM Views */}
<RouteInit
path="/apm/instances/:instance"
component={ApmInstancePage}
codePaths={[CODE_PATH_APM]}
fetchAllClusters={false}
/>
<RouteInit
path="/apm/instances"
component={ApmInstancesPage}
codePaths={[CODE_PATH_APM]}
fetchAllClusters={false}
/>
<RouteInit
path="/apm"
component={ApmOverviewPage}

6
x-pack/plugins/monitoring/public/application/pages/logstash/logstash_template.tsx
View file

@ -55,21 +55,21 @@ export const LogstashTemplate: React.FC<LogstashTemplateProps> = ({
label: i18n.translate('xpack.monitoring.logstashNavigation.instance.overviewLinkText', {
defaultMessage: 'Overview',
}),
route: `/logstash/node/${instance.nodeSummary?.uuid}`, // IDK if this is right
route: `/logstash/node/${instance.nodeSummary?.uuid}`,
});
tabs.push({
id: 'pipeline',
label: i18n.translate('xpack.monitoring.logstashNavigation.instance.pipelinesLinkText', {
defaultMessage: 'Pipelines',
}),
route: `/logstash/node/${instance.nodeSummary?.uuid}/pipelines`, // IDK if this is right
route: `/logstash/node/${instance.nodeSummary?.uuid}/pipelines`,
});
tabs.push({
id: 'advanced',
label: i18n.translate('xpack.monitoring.logstashNavigation.instance.advancedLinkText', {
defaultMessage: 'Advanced',
}),
route: `/logstash/node/${instance.nodeSummary?.uuid}/advanced`, // IDK if this is right
route: `/logstash/node/${instance.nodeSummary?.uuid}/advanced`,
});
}
}