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
7ba04466
Commit
7ba04466
authored
Nov 15, 2018
by
bergquist
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
alerting: improve annotations for pending state
parent
e7260d77
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
19 additions
and
1 deletions
+19
-1
public/app/core/utils/colors.ts
+1
-0
public/app/features/annotations/event_manager.ts
+6
-0
public/app/features/panel/panel_directive.ts
+5
-1
public/sass/pages/_alerting.scss
+7
-0
No files found.
public/app/core/utils/colors.ts
View file @
7ba04466
...
...
@@ -7,6 +7,7 @@ export const DEFAULT_ANNOTATION_COLOR = 'rgba(0, 211, 255, 1)';
export
const
OK_COLOR
=
'rgba(11, 237, 50, 1)'
;
export
const
ALERTING_COLOR
=
'rgba(237, 46, 24, 1)'
;
export
const
NO_DATA_COLOR
=
'rgba(150, 150, 150, 1)'
;
export
const
PENDING_COLOR
=
'rgba(247, 149, 32, 1)'
;
export
const
REGION_FILL_ALPHA
=
0.09
;
const
colors
=
[
...
...
public/app/features/annotations/event_manager.ts
View file @
7ba04466
...
...
@@ -7,6 +7,7 @@ import {
OK_COLOR
,
ALERTING_COLOR
,
NO_DATA_COLOR
,
PENDING_COLOR
,
DEFAULT_ANNOTATION_COLOR
,
REGION_FILL_ALPHA
,
}
from
'app/core/utils/colors'
;
...
...
@@ -71,6 +72,11 @@ export class EventManager {
position
:
'BOTTOM'
,
markerSize
:
5
,
},
$__pending
:
{
color
:
PENDING_COLOR
,
position
:
'BOTTOM'
,
markerSize
:
5
,
},
$__editing
:
{
color
:
DEFAULT_ANNOTATION_COLOR
,
position
:
'BOTTOM'
,
...
...
public/app/features/panel/panel_directive.ts
View file @
7ba04466
...
...
@@ -161,7 +161,11 @@ module.directive('grafanaPanel', ($rootScope, $document, $timeout) => {
panelContainer
.
removeClass
(
'panel-alert-state--'
+
lastAlertState
);
}
if
(
ctrl
.
alertState
.
state
===
'ok'
||
ctrl
.
alertState
.
state
===
'alerting'
)
{
if
(
ctrl
.
alertState
.
state
===
'ok'
||
ctrl
.
alertState
.
state
===
'alerting'
||
ctrl
.
alertState
.
state
===
'pending'
)
{
panelContainer
.
addClass
(
'panel-alert-state--'
+
ctrl
.
alertState
.
state
);
}
...
...
public/sass/pages/_alerting.scss
View file @
7ba04466
...
...
@@ -66,6 +66,13 @@
content
:
'\e611'
;
}
}
&
--pending
{
.panel-alert-icon
:before
{
color
:
$warn
;
content
:
'\e611'
;
}
}
}
@keyframes
alerting-panel
{
...
...
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