From 2d9f460e19cb94a6dfbcc46671d4fc1f51253567 Mon Sep 17 00:00:00 2001 From: Ivana Huckova <30407135+ivanahuckova@users.noreply.github.com> Date: Fri, 26 Feb 2021 15:33:34 +0100 Subject: [PATCH] LogsPanel: Show all received logs (#31505) * Show all received logs in LogsPanel * Remove rowLimit --- packages/grafana-ui/src/components/Logs/LogRows.tsx | 9 ++------- public/app/features/explore/Logs.tsx | 1 - 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/packages/grafana-ui/src/components/Logs/LogRows.tsx b/packages/grafana-ui/src/components/Logs/LogRows.tsx index 91fee6a6804..eba3ff43476 100644 --- a/packages/grafana-ui/src/components/Logs/LogRows.tsx +++ b/packages/grafana-ui/src/components/Logs/LogRows.tsx @@ -11,7 +11,6 @@ import { LogRow } from './LogRow'; import { RowContextOptions } from './LogRowContextProvider'; export const PREVIEW_LIMIT = 100; -export const RENDER_LIMIT = 500; export interface Props extends Themeable { logRows?: LogRowModel[]; @@ -24,7 +23,6 @@ export interface Props extends Themeable { wrapLogMessage: boolean; timeZone: TimeZone; logsSortOrder?: LogsSortOrder | null; - rowLimit?: number; allowDetails?: boolean; previewLimit?: number; // Passed to fix problems with inactive scrolling in Logs Panel @@ -48,7 +46,6 @@ class UnThemedLogRows extends PureComponent { static defaultProps = { previewLimit: PREVIEW_LIMIT, - rowLimit: RENDER_LIMIT, }; state: State = { @@ -95,7 +92,6 @@ class UnThemedLogRows extends PureComponent { timeZone, onClickFilterLabel, onClickFilterOutLabel, - rowLimit, theme, allowDetails, previewLimit, @@ -123,8 +119,7 @@ class UnThemedLogRows extends PureComponent { const processedRows = dedupedRows ? dedupedRows : []; const orderedRows = logsSortOrder ? this.sortLogs(processedRows, logsSortOrder) : processedRows; const firstRows = orderedRows.slice(0, previewLimit!); - const rowCount = Math.min(orderedRows.length, rowLimit!); - const lastRows = orderedRows.slice(previewLimit!, rowCount); + const lastRows = orderedRows.slice(previewLimit!, orderedRows.length); // React profiler becomes unusable if we pass all rows to all rows and their labels, using getter instead const getRows = this.makeGetRows(orderedRows); @@ -184,7 +179,7 @@ class UnThemedLogRows extends PureComponent { ))} {hasData && !renderAll && ( - Rendering {rowCount - previewLimit!} rows... + Rendering {orderedRows.length - previewLimit!} rows... )} diff --git a/public/app/features/explore/Logs.tsx b/public/app/features/explore/Logs.tsx index 7af6ff9f822..b0ed8dd00a0 100644 --- a/public/app/features/explore/Logs.tsx +++ b/public/app/features/explore/Logs.tsx @@ -352,7 +352,6 @@ export class UnthemedLogs extends PureComponent { dedupStrategy={dedupStrategy} getRowContext={this.props.getRowContext} highlighterExpressions={highlighterExpressions} - rowLimit={logRows ? logRows.length : undefined} onClickFilterLabel={onClickFilterLabel} onClickFilterOutLabel={onClickFilterOutLabel} showContextToggle={showContextToggle}