Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
N
nexpie-grafana-theme
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Registry
Registry
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Kornkitt Poolsup
nexpie-grafana-theme
Commits
d9d84f45
Commit
d9d84f45
authored
Dec 03, 2018
by
Erik Sundell
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
only make it possible to scan for older logs if there is at least one non failing selector
parent
5641f453
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
2 deletions
+16
-2
public/app/features/explore/Explore.tsx
+2
-0
public/app/features/explore/Logs.tsx
+14
-2
No files found.
public/app/features/explore/Explore.tsx
View file @
d9d84f45
...
...
@@ -836,6 +836,7 @@ export class Explore extends React.PureComponent<ExploreProps, ExploreState> {
const
graphLoading
=
queryTransactions
.
some
(
qt
=>
qt
.
resultType
===
'Graph'
&&
!
qt
.
done
);
const
tableLoading
=
queryTransactions
.
some
(
qt
=>
qt
.
resultType
===
'Table'
&&
!
qt
.
done
);
const
logsLoading
=
queryTransactions
.
some
(
qt
=>
qt
.
resultType
===
'Logs'
&&
!
qt
.
done
);
const
logExpressionExists
=
queryTransactions
.
some
(
qt
=>
qt
.
resultType
===
'Logs'
&&
qt
.
query
.
expr
&&
!
qt
.
error
);
const
loading
=
queryTransactions
.
some
(
qt
=>
!
qt
.
done
);
return
(
...
...
@@ -969,6 +970,7 @@ export class Explore extends React.PureComponent<ExploreProps, ExploreState> {
range=
{
range
}
scanning=
{
scanning
}
scanRange=
{
scanRange
}
logExpressionExists=
{
logExpressionExists
}
/>
</
Panel
>
)
}
...
...
public/app/features/explore/Logs.tsx
View file @
d9d84f45
...
...
@@ -140,6 +140,7 @@ interface LogsProps {
range
?:
RawTimeRange
;
scanning
?:
boolean
;
scanRange
?:
RawTimeRange
;
logExpressionExists
?:
boolean
;
onChangeTime
?:
(
range
:
RawTimeRange
)
=>
void
;
onClickLabel
?:
(
label
:
string
,
value
:
string
)
=>
void
;
onStartScanning
?:
()
=>
void
;
...
...
@@ -239,7 +240,17 @@ export default class Logs extends PureComponent<LogsProps, LogsState> {
};
render
()
{
const
{
className
=
''
,
data
,
loading
=
false
,
onClickLabel
,
position
,
range
,
scanning
,
scanRange
}
=
this
.
props
;
const
{
className
=
''
,
data
,
loading
=
false
,
onClickLabel
,
position
,
range
,
scanning
,
scanRange
,
logExpressionExists
,
}
=
this
.
props
;
const
{
dedup
,
deferLogs
,
hiddenLogLevels
,
renderAll
,
showLocalTime
,
showUtc
}
=
this
.
state
;
let
{
showLabels
}
=
this
.
state
;
const
hasData
=
data
&&
data
.
rows
&&
data
.
rows
.
length
>
0
;
...
...
@@ -357,7 +368,8 @@ export default class Logs extends PureComponent<LogsProps, LogsState> {
))
}
{
hasData
&&
deferLogs
&&
<
span
>
Rendering
{
dedupedData
.
rows
.
length
}
rows...
</
span
>
}
</
div
>
{
!
loading
&&
{
logExpressionExists
&&
!
loading
&&
!
hasData
&&
!
scanning
&&
(
<
div
className=
"logs-nodata"
>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment