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

Explore/Logs: Update Parsed fields to Detected fields (#28881)

Browse Source 
* Change all parsed fields and functions to detected fields

* Update

* Sneak in UI improvement, add tooltip

* Update docs/sources/whatsnew/whats-new-in-v6-5.md

Co-authored-by: Diana Payton <52059945+oddlittlebird@users.noreply.github.com>

* Update docs/sources/whatsnew/whats-new-in-v6-5.md

Co-authored-by: Diana Payton <52059945+oddlittlebird@users.noreply.github.com>

* Remove changes from old Whats new

* Rename LogMessageParsed

Co-authored-by: Diana Payton <52059945+oddlittlebird@users.noreply.github.com>
This commit is contained in:
Ivana Huckova
2020-11-23 20:10:09 +01:00
committed by GitHub
parent 7e21863982
commit 83329ae7e4
13 changed files with 117 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -79,7 +79,7 @@ interface State {
wrapLogMessage: boolean;
logsSortOrder: LogsSortOrder | null;
isFlipping: boolean;
showParsedFields: string[];
showDetectedFields: string[];
}
export class Logs extends PureComponent<Props, State> {
@@ -92,7 +92,7 @@ export class Logs extends PureComponent<Props, State> {
wrapLogMessage: store.getBool(SETTINGS_KEYS.wrapLogMessage, true),
logsSortOrder: null,
isFlipping: false,
showParsedFields: [],
showDetectedFields: [],
};
componentWillUnmount() {
@@ -174,33 +174,33 @@ export class Logs extends PureComponent<Props, State> {
}
};
showParsedField = (key: string) => {
const index = this.state.showParsedFields.indexOf(key);
showDetectedField = (key: string) => {
const index = this.state.showDetectedFields.indexOf(key);
if (index === -1) {
this.setState(state => {
return {
showParsedFields: state.showParsedFields.concat(key),
showDetectedFields: state.showDetectedFields.concat(key),
};
});
}
};
hideParsedField = (key: string) => {
const index = this.state.showParsedFields.indexOf(key);
hideDetectedField = (key: string) => {
const index = this.state.showDetectedFields.indexOf(key);
if (index > -1) {
this.setState(state => {
return {
showParsedFields: state.showParsedFields.filter(k => key !== k),
showDetectedFields: state.showDetectedFields.filter(k => key !== k),
};
});
}
};
clearParsedFields = () => {
clearDetectedFields = () => {
this.setState(state => {
return {
showParsedFields: [],
showDetectedFields: [],
};
});
};
@@ -230,7 +230,7 @@ export class Logs extends PureComponent<Props, State> {
return null;
}
const { showLabels, showTime, wrapLogMessage, logsSortOrder, isFlipping, showParsedFields } = this.state;
const { showLabels, showTime, wrapLogMessage, logsSortOrder, isFlipping, showDetectedFields } = this.state;
const { dedupStrategy } = this.props;
const hasData = logRows && logRows.length > 0;
const dedupCount = dedupedRows
@@ -323,18 +323,18 @@ export class Logs extends PureComponent<Props, State> {
/>
)}
{showParsedFields && showParsedFields.length > 0 && (
{showDetectedFields && showDetectedFields.length > 0 && (
<MetaInfoText
metaItems={[
{
label: 'Showing only parsed fields',
value: renderMetaItem(showParsedFields, LogsMetaKind.LabelsMap),
label: 'Showing only detected fields',
value: renderMetaItem(showDetectedFields, LogsMetaKind.LabelsMap),
},
{
label: '',
value: (
<Button variant="secondary" size="sm" onClick={this.clearParsedFields}>
Show all parsed fields
<Button variant="secondary" size="sm" onClick={this.clearDetectedFields}>
Show all detected fields
</Button>
),
},
@@ -358,9 +358,9 @@ export class Logs extends PureComponent<Props, State> {
timeZone={timeZone}
getFieldLinks={getFieldLinks}
logsSortOrder={logsSortOrder}
showParsedFields={showParsedFields}
onClickShowParsedField={this.showParsedField}
onClickHideParsedField={this.hideParsedField}
showDetectedFields={showDetectedFields}
onClickShowDetectedField={this.showDetectedField}
onClickHideDetectedField={this.hideDetectedField}
/>
{!loading && !hasData && !scanning && (