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

Merge branch 'master' into explore/dedup-strategu-url

Browse Source
This commit is contained in:
Dominik Prokop
2019-02-11 12:03:45 +01:00
parent c9fbd43231 ba2f698b81
commit 14bf960b64
105 changed files with 1678 additions and 773 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
public/app/features/explore/LogsContainer.tsx
View File

@@ -27,6 +27,7 @@ interface LogsContainerProps {
toggleLogs: typeof toggleLogs;
changeDedupStrategy: typeof changeDedupStrategy;
dedupStrategy: LogsDedupStrategy;
width: number;
}
export class LogsContainer extends PureComponent<LogsContainerProps> {
@@ -51,7 +52,8 @@ export class LogsContainer extends PureComponent<LogsContainerProps> {
range,
showingLogs,
scanning,
scanRange
scanRange,
width,
} = this.props;
return (
@@ -71,6 +73,7 @@ export class LogsContainer extends PureComponent<LogsContainerProps> {
range={range}
scanning={scanning}
scanRange={scanRange}
width={width}
/>
</Panel>
);