+ );
+ }
+}
+
+export default SharedPreferences;
diff --git a/public/app/core/logs_model.ts b/public/app/core/logs_model.ts
index ab0a3f26a88..2485dbda40a 100644
--- a/public/app/core/logs_model.ts
+++ b/public/app/core/logs_model.ts
@@ -3,25 +3,26 @@ import { TimeSeries } from 'app/core/core';
import colors from 'app/core/utils/colors';
export enum LogLevel {
- crit = 'crit',
- warn = 'warn',
+ crit = 'critical',
+ critical = 'critical',
+ warn = 'warning',
+ warning = 'warning',
err = 'error',
error = 'error',
info = 'info',
debug = 'debug',
trace = 'trace',
- none = 'none',
+ unkown = 'unkown',
}
export const LogLevelColor = {
- [LogLevel.crit]: colors[7],
- [LogLevel.warn]: colors[1],
- [LogLevel.err]: colors[4],
+ [LogLevel.critical]: colors[7],
+ [LogLevel.warning]: colors[1],
[LogLevel.error]: colors[4],
[LogLevel.info]: colors[0],
- [LogLevel.debug]: colors[3],
- [LogLevel.trace]: colors[3],
- [LogLevel.none]: '#eee',
+ [LogLevel.debug]: colors[5],
+ [LogLevel.trace]: colors[2],
+ [LogLevel.unkown]: '#ddd',
};
export interface LogSearchMatch {
@@ -31,6 +32,7 @@ export interface LogSearchMatch {
}
export interface LogRow {
+ duplicates?: number;
entry: string;
key: string; // timestamp + labels
labels: string;
@@ -71,6 +73,71 @@ export interface LogsStreamLabels {
[key: string]: string;
}
+export enum LogsDedupStrategy {
+ none = 'none',
+ exact = 'exact',
+ numbers = 'numbers',
+ signature = 'signature',
+}
+
+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: LogRow, other: LogRow, strategy: LogsDedupStrategy): boolean {
+ switch (strategy) {
+ case LogsDedupStrategy.exact:
+ // Exact still strips dates
+ return row.entry.replace(isoDateRegexp, '') === other.entry.replace(isoDateRegexp, '');
+
+ case LogsDedupStrategy.numbers:
+ return row.entry.replace(/\d/g, '') === other.entry.replace(/\d/g, '');
+
+ case LogsDedupStrategy.signature:
+ return row.entry.replace(/\w/g, '') === other.entry.replace(/\w/g, '');
+
+ default:
+ return false;
+ }
+}
+
+export function dedupLogRows(logs: LogsModel, strategy: LogsDedupStrategy): LogsModel {
+ if (strategy === LogsDedupStrategy.none) {
+ return logs;
+ }
+
+ const dedupedRows = logs.rows.reduce((result: LogRow[], row: LogRow, index, list) => {
+ const previous = result[result.length - 1];
+ if (index > 0 && isDuplicateRow(row, previous, strategy)) {
+ previous.duplicates++;
+ } else {
+ row.duplicates = 0;
+ result.push(row);
+ }
+ return result;
+ }, []);
+
+ return {
+ ...logs,
+ rows: dedupedRows,
+ };
+}
+
+export function filterLogLevels(logs: LogsModel, hiddenLogLevels: Set