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

Update LogsDedupStrategy enum to keep consistent with radio button capitalization

Browse Source
This commit is contained in:
Ivana
2020-08-12 16:33:49 +02:00
parent 1dd5b58e95
commit 0b05cd4e00
14 changed files with 34 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/grafana-data/src/types/logs.ts
View File

@@ -97,10 +97,10 @@ export interface LogLabelStatsModel {
}
export enum LogsDedupStrategy {
none = 'none',
exact = 'exact',
numbers = 'numbers',
signature = 'signature',
None = 'none',
Exact = 'exact',
Numbers = 'numbers',
Signature = 'signature',
}
export interface LogsParser {

12
packages/grafana-ui/src/components/Logs/LogRows.test.tsx
View File

@@ -11,7 +11,7 @@ describe('LogRows', () => {
const wrapper = mount(
<LogRows
logRows={rows}
dedupStrategy={LogsDedupStrategy.none}
dedupStrategy={LogsDedupStrategy.None}
highlighterExpressions={[]}
showLabels={false}
showTime={false}
@@ -32,7 +32,7 @@ describe('LogRows', () => {
const wrapper = mount(
<LogRows
logRows={rows}
dedupStrategy={LogsDedupStrategy.none}
dedupStrategy={LogsDedupStrategy.None}
highlighterExpressions={[]}
showLabels={false}
showTime={false}
@@ -62,7 +62,7 @@ describe('LogRows', () => {
<LogRows
logRows={rows}
deduplicatedRows={dedupedRows}
dedupStrategy={LogsDedupStrategy.none}
dedupStrategy={LogsDedupStrategy.None}
highlighterExpressions={[]}
showLabels={false}
showTime={false}
@@ -82,7 +82,7 @@ describe('LogRows', () => {
const wrapper = mount(
<LogRows
logRows={rows}
dedupStrategy={LogsDedupStrategy.none}
dedupStrategy={LogsDedupStrategy.None}
highlighterExpressions={[]}
showLabels={false}
showTime={false}
@@ -103,7 +103,7 @@ describe('LogRows', () => {
const wrapper = mount(
<LogRows
logRows={rows}
dedupStrategy={LogsDedupStrategy.none}
dedupStrategy={LogsDedupStrategy.None}
highlighterExpressions={[]}
showLabels={false}
showTime={false}
@@ -141,7 +141,7 @@ describe('LogRows', () => {
const wrapper = mount(
<LogRows
logRows={rows}
dedupStrategy={LogsDedupStrategy.none}
dedupStrategy={LogsDedupStrategy.None}
highlighterExpressions={[]}
showLabels={false}
showTime={false}

2
packages/grafana-ui/src/components/Logs/LogRows.tsx
View File

@@ -107,7 +107,7 @@ class UnThemedLogRows extends PureComponent<Props, State> {
const dedupCount = dedupedRows
? dedupedRows.reduce((sum, row) => (row.duplicates ? sum + row.duplicates : sum), 0)
: 0;
const showDuplicates = dedupStrategy !== LogsDedupStrategy.none && dedupCount > 0;
const showDuplicates = dedupStrategy !== LogsDedupStrategy.None && dedupCount > 0;
// For horizontal scrolling we can't use CustomScrollbar as it causes the problem with logs context - it is not visible
// for top log rows. Therefore we use CustomScrollbar only in LogsPanel and for Explore, we use custom css styling.

12
public/app/core/logs_model.test.ts
View File

@@ -20,7 +20,7 @@ describe('dedupLogRows()', () => {
entry: 'WARN test 1.23 on [xxx]',
},
] as any;
expect(dedupLogRows(rows, LogsDedupStrategy.none)).toMatchObject(rows);
expect(dedupLogRows(rows, LogsDedupStrategy.None)).toMatchObject(rows);
});
test('should dedup on exact matches', () => {
@@ -38,7 +38,7 @@ describe('dedupLogRows()', () => {
entry: 'WARN test 1.23 on [xxx]',
},
] as any;
expect(dedupLogRows(rows, LogsDedupStrategy.exact)).toEqual([
expect(dedupLogRows(rows, LogsDedupStrategy.Exact)).toEqual([
{
duplicates: 1,
entry: 'WARN test 1.23 on [xxx]',
@@ -69,7 +69,7 @@ describe('dedupLogRows()', () => {
entry: 'WARN test 1.23 on [xxx]',
},
] as any;
expect(dedupLogRows(rows, LogsDedupStrategy.numbers)).toEqual([
expect(dedupLogRows(rows, LogsDedupStrategy.Numbers)).toEqual([
{
duplicates: 1,
entry: 'WARN test 1.2323423 on [xxx]',
@@ -100,7 +100,7 @@ describe('dedupLogRows()', () => {
entry: 'WARN test 1.23 on [xxx]',
},
] as any;
expect(dedupLogRows(rows, LogsDedupStrategy.signature)).toEqual([
expect(dedupLogRows(rows, LogsDedupStrategy.Signature)).toEqual([
{
duplicates: 3,
entry: 'WARN test 1.2323423 on [xxx]',
@@ -120,7 +120,7 @@ describe('dedupLogRows()', () => {
entry: 'WARN 123',
},
] as any;
expect(dedupLogRows(rows, LogsDedupStrategy.exact)).toEqual([
expect(dedupLogRows(rows, LogsDedupStrategy.Exact)).toEqual([
{
duplicates: 0,
entry: 'INFO 123',
@@ -131,7 +131,7 @@ describe('dedupLogRows()', () => {
},
]);
expect(dedupLogRows(rows, LogsDedupStrategy.none)).toEqual(rows);
expect(dedupLogRows(rows, LogsDedupStrategy.None)).toEqual(rows);
});
});

8
public/app/core/logs_model.ts
View File

@@ -48,14 +48,14 @@ export const LogLevelColor = {
const isoDateRegexp = /\d{4}-[01]\d-[0-3]\dT[0-2]\d:[0-5]\d:[0-6]\d[,\.]\d+([+-][0-2]\d:[0-5]\d|Z)/g;
function isDuplicateRow(row: LogRowModel, other: LogRowModel, strategy?: LogsDedupStrategy): boolean {
switch (strategy) {
case LogsDedupStrategy.exact:
case LogsDedupStrategy.Exact:
// Exact still strips dates
return row.entry.replace(isoDateRegexp, '') === other.entry.replace(isoDateRegexp, '');
case LogsDedupStrategy.numbers:
case LogsDedupStrategy.Numbers:
return row.entry.replace(/\d/g, '') === other.entry.replace(/\d/g, '');
case LogsDedupStrategy.signature:
case LogsDedupStrategy.Signature:
return row.entry.replace(/\w/g, '') === other.entry.replace(/\w/g, '');
default:
@@ -64,7 +64,7 @@ function isDuplicateRow(row: LogRowModel, other: LogRowModel, strategy?: LogsDed
}
export function dedupLogRows(rows: LogRowModel[], strategy?: LogsDedupStrategy): LogRowModel[] {
if (strategy === LogsDedupStrategy.none) {
if (strategy === LogsDedupStrategy.None) {
return rows;
}

2
public/app/core/utils/explore.test.ts
View File

@@ -25,7 +25,7 @@ const DEFAULT_EXPLORE_STATE: ExploreUrlState = {
showingGraph: true,
showingTable: true,
showingLogs: true,
dedupStrategy: LogsDedupStrategy.none,
dedupStrategy: LogsDedupStrategy.None,
},
originPanelId: undefined,
};

2
public/app/core/utils/explore.ts
View File

@@ -43,7 +43,7 @@ export const DEFAULT_UI_STATE = {
showingTable: true,
showingGraph: true,
showingLogs: true,
dedupStrategy: LogsDedupStrategy.none,
dedupStrategy: LogsDedupStrategy.None,
};
const MAX_HISTORY_ITEMS = 100;

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

@@ -112,7 +112,7 @@ export class Logs extends PureComponent<Props, State> {
onChangeDedup = (dedup: LogsDedupStrategy) => {
const { onDedupStrategyChange } = this.props;
if (this.props.dedupStrategy === dedup) {
return onDedupStrategyChange(LogsDedupStrategy.none);
return onDedupStrategyChange(LogsDedupStrategy.None);
}
return onDedupStrategyChange(dedup);
};
@@ -202,7 +202,7 @@ export class Logs extends PureComponent<Props, State> {
: 0;
const meta = logsMeta ? [...logsMeta] : [];
if (dedupStrategy !== LogsDedupStrategy.none) {
if (dedupStrategy !== LogsDedupStrategy.None) {
meta.push({
label: 'Dedup count',
value: dedupCount,

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

@@ -116,6 +116,7 @@ export class LogsContainer extends PureComponent<LogsContainerProps, LogsContain
logsMeta,
logsSeries,
dedupedRows,
dedupStrategy,
onClickFilterLabel,
onClickFilterOutLabel,
onStartScanning,
@@ -159,7 +160,7 @@ export class LogsContainer extends PureComponent<LogsContainerProps, LogsContain
collapsible
>
<Logs
dedupStrategy={this.props.dedupStrategy || LogsDedupStrategy.none}
dedupStrategy={dedupStrategy || LogsDedupStrategy.None}
logRows={logRows}
logsMeta={logsMeta}
logsSeries={logsSeries}

2
public/app/features/explore/state/actions.test.ts
View File

@@ -63,7 +63,7 @@ const setup = (updateOverides?: Partial<ExploreUpdateState>) => {
const exploreId = ExploreId.left;
const containerWidth = 1920;
const eventBridge = {} as Emitter;
const ui = { dedupStrategy: LogsDedupStrategy.none, showingGraph: false, showingLogs: false, showingTable: false };
const ui = { dedupStrategy: LogsDedupStrategy.None, showingGraph: false, showingLogs: false, showingTable: false };
const timeZone = DefaultTimeZone;
const range = testRange;
const urlState: ExploreUrlState = {

2
public/app/features/explore/state/reducers.test.ts
View File

@@ -300,7 +300,7 @@ export const setup = (urlStateOverrides?: any) => {
to: '',
},
ui: {
dedupStrategy: LogsDedupStrategy.none,
dedupStrategy: LogsDedupStrategy.None,
showingGraph: false,
showingTable: false,
showingLogs: false,

2
public/app/features/explore/state/reducers.ts
View File

@@ -120,7 +120,7 @@ export const makeExploreItemState = (): ExploreItemState => ({
tableResult: null,
graphResult: null,
logsResult: null,
dedupStrategy: LogsDedupStrategy.none,
dedupStrategy: LogsDedupStrategy.None,
eventBridge: (null as unknown) as Emitter,
});

6
public/app/features/explore/state/selectors.test.ts
View File

@@ -53,7 +53,7 @@ const state: any = {
],
},
hiddenLogLevels: undefined,
dedupStrategy: LogsDedupStrategy.none,
dedupStrategy: LogsDedupStrategy.None,
};
describe('Deduplication selector', () => {
@@ -66,7 +66,7 @@ describe('Deduplication selector', () => {
it('should correctly extracts rows and deduplicates them', () => {
const dedups = deduplicatedRowsSelector({
...state,
dedupStrategy: LogsDedupStrategy.numbers,
dedupStrategy: LogsDedupStrategy.Numbers,
} as ExploreItemState);
expect(dedups?.length).toBe(2);
expect(dedups).not.toBe(state.logsResult.rows);
@@ -82,7 +82,7 @@ describe('Deduplication selector', () => {
dedups = deduplicatedRowsSelector({
...state,
dedupStrategy: LogsDedupStrategy.numbers,
dedupStrategy: LogsDedupStrategy.Numbers,
hiddenLogLevels: [LogLevel.debug],
} as ExploreItemState);

2
public/app/plugins/panel/logs/LogsPanel.tsx
View File

@@ -26,7 +26,7 @@ export const LogsPanel: React.FunctionComponent<LogsPanelProps> = ({
<CustomScrollbar autoHide>
<LogRows
logRows={newResults?.rows || []}
dedupStrategy={LogsDedupStrategy.none}
dedupStrategy={LogsDedupStrategy.None}
highlighterExpressions={[]}
showLabels={showLabels}
showTime={showTime}