From 487de2b832126060bb1001295765cd6dee3fdb34 Mon Sep 17 00:00:00 2001 From: David Kaltschmidt Date: Sun, 9 Dec 2018 13:06:34 +0100 Subject: [PATCH] Explore: Logging dedup tooltips - use title attribute of toggle button group - add descriptions for all dedup options --- .../ToggleButtonGroup/ToggleButtonGroup.tsx | 12 ++++++++++-- public/app/core/logs_model.ts | 7 +++++++ public/app/features/explore/Logs.tsx | 2 ++ 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/public/app/core/components/ToggleButtonGroup/ToggleButtonGroup.tsx b/public/app/core/components/ToggleButtonGroup/ToggleButtonGroup.tsx index 1e9ae4732df..077d8772393 100644 --- a/public/app/core/components/ToggleButtonGroup/ToggleButtonGroup.tsx +++ b/public/app/core/components/ToggleButtonGroup/ToggleButtonGroup.tsx @@ -49,9 +49,17 @@ interface ToggleButtonProps { value: any; className?: string; children: ReactNode; + title?: string; } -export const ToggleButton: SFC = ({ children, selected, className = '', value, onChange }) => { +export const ToggleButton: SFC = ({ + children, + selected, + className = '', + title = null, + value, + onChange, +}) => { const handleChange = event => { event.stopPropagation(); if (onChange) { @@ -61,7 +69,7 @@ export const ToggleButton: SFC = ({ children, selected, class const btnClassName = `btn ${className} ${selected ? 'active' : ''}`; return ( - ); diff --git a/public/app/core/logs_model.ts b/public/app/core/logs_model.ts index 09f5bb3a916..934b950be72 100644 --- a/public/app/core/logs_model.ts +++ b/public/app/core/logs_model.ts @@ -88,6 +88,13 @@ export interface LogsStreamLabels { [key: string]: string; } +export enum LogsDedupDescription { + none = 'No de-duplication', + exact = 'De-duplication of successive lines that are identical, ignoring ISO datetimes.', + numbers = 'De-duplication of successive lines that are identical when ignoring numbers, e.g., IP addresses, latencies.', + signature = 'De-duplication of successive lines that have identical punctuation and whitespace.', +} + export enum LogsDedupStrategy { none = 'none', exact = 'exact', diff --git a/public/app/features/explore/Logs.tsx b/public/app/features/explore/Logs.tsx index 108d4f37a6e..7a426ef4b57 100644 --- a/public/app/features/explore/Logs.tsx +++ b/public/app/features/explore/Logs.tsx @@ -6,6 +6,7 @@ import classnames from 'classnames'; import * as rangeUtil from 'app/core/utils/rangeutil'; import { RawTimeRange } from 'app/types/series'; import { + LogsDedupDescription, LogsDedupStrategy, LogsModel, dedupLogRows, @@ -445,6 +446,7 @@ export default class Logs extends PureComponent { key={i} value={dedupType} onChange={onChange} + title={LogsDedupDescription[dedupType] || null} selected={selectedValue === dedupType} > {dedupType}