IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Revert commit

Browse Source
This commit is contained in:
Erik Sundell 2018-12-03 17:17:57 +01:00
parent d9d84f45bc
commit e21ca3f545
2 changed files with 2 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/app/features/explore/Explore.tsx
View File

@ -836,7 +836,6 @@ export class Explore extends React.PureComponent<ExploreProps, ExploreState> {
const graphLoading = queryTransactions.some(qt => qt.resultType === 'Graph' && !qt.done);
const tableLoading = queryTransactions.some(qt => qt.resultType === 'Table' && !qt.done);
const logsLoading = queryTransactions.some(qt => qt.resultType === 'Logs' && !qt.done);
const logExpressionExists = queryTransactions.some(qt => qt.resultType === 'Logs' && qt.query.expr && !qt.error);
const loading = queryTransactions.some(qt => !qt.done);
return (
@ -970,7 +969,6 @@ export class Explore extends React.PureComponent<ExploreProps, ExploreState> {
range={range}
scanning={scanning}
scanRange={scanRange}
logExpressionExists={logExpressionExists}
/>
</Panel>
)}

16
public/app/features/explore/Logs.tsx
View File

@ -140,7 +140,6 @@ interface LogsProps {
range?: RawTimeRange;
scanning?: boolean;
scanRange?: RawTimeRange;
logExpressionExists?: boolean;
onChangeTime?: (range: RawTimeRange) => void;
onClickLabel?: (label: string, value: string) => void;
onStartScanning?: () => void;
@ -240,17 +239,7 @@ export default class Logs extends PureComponent<LogsProps, LogsState> {
};
render() {
const {
className = '',
data,
loading = false,
onClickLabel,
position,
range,
scanning,
scanRange,
logExpressionExists,
} = this.props;
const { className = '', data, loading = false, onClickLabel, position, range, scanning, scanRange } = this.props;
const { dedup, deferLogs, hiddenLogLevels, renderAll, showLocalTime, showUtc } = this.state;
let { showLabels } = this.state;
const hasData = data && data.rows && data.rows.length > 0;
@ -368,8 +357,7 @@ export default class Logs extends PureComponent<LogsProps, LogsState> {
))}
{hasData && deferLogs && <span>Rendering {dedupedData.rows.length} rows...</span>}
</div>
{logExpressionExists &&
!loading &&
{!loading &&
!hasData &&
!scanning && (
<div className="logs-nodata">