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

Rebase fixes

Browse Source
This commit is contained in:
David Kaltschmidt 2018-12-07 10:22:52 +01:00
parent acd52e6a93
commit fb4925a8c2
2 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -180,7 +180,7 @@ class Row extends PureComponent<RowProps, RowState> {
{showDuplicates && ( {showDuplicates && (
<div className="logs-row__duplicates">{row.duplicates > 0 ? `${row.duplicates + 1}x` : null}</div> <div className="logs-row__duplicates">{row.duplicates > 0 ? `${row.duplicates + 1}x` : null}</div>
)} )}
<div className={row.logLevel ? `logs-row__level logs__row-level-${row.logLevel}` : ''} /> <div className={row.logLevel ? `logs-row__level logs-row__level--${row.logLevel}` : ''} />
{showUtc && ( {showUtc && (
<div className="logs-row__time" title={`Local: ${row.timeLocal} (${row.timeFromNow})`}> <div className="logs-row__time" title={`Local: ${row.timeLocal} (${row.timeFromNow})`}>
{row.timestamp} {row.timestamp}
@ -217,13 +217,15 @@ class Row extends PureComponent<RowProps, RowState> {
)} )}
{!parsed && !needsHighlighter && row.entry} {!parsed && !needsHighlighter && row.entry}
{showFieldStats && ( {showFieldStats && (
<Stats <div className="logs-row__stats">
stats={fieldStats} <Stats
label={fieldLabel} stats={fieldStats}
value={fieldValue} label={fieldLabel}
onClickClose={this.onClickClose} value={fieldValue}
rowCount={fieldCount} onClickClose={this.onClickClose}
/> rowCount={fieldCount}
/>
</div>
)} )}
</div> </div>
</div> </div>

8
public/sass/components/_panel_logs.scss
View File

@ -171,6 +171,14 @@ $column-horizontal-spacing: 10px;
} }
} }
.logs-row__stats {
margin: 5px 0;
background-color: $popover-bg;
color: $popover-color;
border: 1px solid $popover-border-color;
padding: 10px;
}
.logs-row__field-highlight:hover { .logs-row__field-highlight:hover {
color: $typeahead-selected-color; color: $typeahead-selected-color;
border-bottom-style: solid; border-bottom-style: solid;