Skip to content

Commit

Permalink
Revert "POC: Integrate logs into APM"
Browse files Browse the repository at this point in the history
This reverts commit 690130b.
  • Loading branch information
afgomez authored and Alejandro Fernández Gómez committed Sep 7, 2020
1 parent fa1caf6 commit a53ae34
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 20 deletions.
3 changes: 1 addition & 2 deletions x-pack/plugins/apm/kibana.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@
"kibanaReact",
"kibanaUtils",
"observability",
"home",
"infra"
"home"
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ import { fromQuery, toQuery } from '../../../shared/Links/url_helpers';
import { TransactionMetadata } from '../../../shared/MetadataTable/TransactionMetadata';
import { WaterfallContainer } from './WaterfallContainer';
import { IWaterfall } from './WaterfallContainer/Waterfall/waterfall_helpers/waterfall_helpers';
import { LogStream } from '../../../../../../infra/public';

const timelineTab = {
key: 'timeline',
Expand All @@ -31,13 +30,6 @@ const metadataTab = {
}),
};

const logsTab = {
key: 'logs',
label: i18n.translate('xpack.apm.propertiesTable.tabs.logsLabel', {
defaultMessage: 'Logs',
}),
};

interface Props {
location: Location;
transaction: Transaction;
Expand All @@ -54,9 +46,9 @@ export function TransactionTabs({
exceedsMax,
}: Props) {
const history = useHistory();
const tabs = [timelineTab, metadataTab, logsTab];
const tabs = [timelineTab, metadataTab];
const currentTab =
tabs.find((tab) => tab.key === urlParams.detailTab) ?? timelineTab;
urlParams.detailTab === metadataTab.key ? metadataTab : timelineTab;

return (
<React.Fragment>
Expand Down Expand Up @@ -91,14 +83,6 @@ export function TransactionTabs({
waterfall={waterfall}
exceedsMax={exceedsMax}
/>
) : currentTab.key === logsTab.key ? (
<div>
<LogStream
startTimestamp={Date.now() - 86400000}
endTimestamp={Date.now()}
query={`trace.id: "${urlParams.traceId}" OR "${urlParams.traceId}"`}
/>
</div>
) : (
<TransactionMetadata transaction={transaction} />
)}
Expand Down

0 comments on commit a53ae34

Please sign in to comment.