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
3f212836
Unverified
Commit
3f212836
authored
Jul 30, 2020
by
Torkel Ödegaard
Committed by
GitHub
Jul 30, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Annotations: Ignore cancelled annotation queries (#26681)
parent
eb0b9de0
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
0 deletions
+5
-0
public/app/features/annotations/annotations_srv.ts
+5
-0
No files found.
public/app/features/annotations/annotations_srv.ts
View file @
3f212836
...
@@ -59,9 +59,14 @@ export class AnnotationsSrv {
...
@@ -59,9 +59,14 @@ export class AnnotationsSrv {
};
};
})
})
.
catch
(
err
=>
{
.
catch
(
err
=>
{
if
(
err
.
cancelled
)
{
return
[];
}
if
(
!
err
.
message
&&
err
.
data
&&
err
.
data
.
message
)
{
if
(
!
err
.
message
&&
err
.
data
&&
err
.
data
.
message
)
{
err
.
message
=
err
.
data
.
message
;
err
.
message
=
err
.
data
.
message
;
}
}
console
.
error
(
'AnnotationSrv.query error'
,
err
);
console
.
error
(
'AnnotationSrv.query error'
,
err
);
appEvents
.
emit
(
AppEvents
.
alertError
,
[
'Annotation Query Failed'
,
err
.
message
||
err
]);
appEvents
.
emit
(
AppEvents
.
alertError
,
[
'Annotation Query Failed'
,
err
.
message
||
err
]);
return
[];
return
[];
...
...
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