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

Annotations: Fix alerting annotation coloring (#37412)

Browse Source 
Co-authored-by: Ryan McKinley <ryantxu@gmail.com>
This commit is contained in:
Kyle Brandt
2021-08-12 12:37:54 -04:00
committed by GitHub
parent d18bd03a82
commit aef67994a1
3 changed files with 27 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/services/ngalert/state/manager.go
View File

@@ -181,7 +181,7 @@ func (st *Manager) setNextState(alertRule *ngModels.AlertRule, result eval.Resul
st.set(currentState)
if oldState != currentState.State {
go st.createAlertAnnotation(currentState.State, alertRule, result)
go st.createAlertAnnotation(currentState.State, alertRule, result, oldState)
}
return currentState
}
@@ -229,7 +229,7 @@ func translateInstanceState(state ngModels.InstanceStateType) eval.State {
}
}
func (st *Manager) createAlertAnnotation(new eval.State, alertRule *ngModels.AlertRule, result eval.Result) {
func (st *Manager) createAlertAnnotation(new eval.State, alertRule *ngModels.AlertRule, result eval.Result, oldState eval.State) {
st.log.Debug("alert state changed creating annotation", "alertRuleUID", alertRule.UID, "newState", new.String())
dashUid, ok := alertRule.Annotations["__dashboardUid__"]
if !ok {
@@ -255,12 +255,14 @@ func (st *Manager) createAlertAnnotation(new eval.State, alertRule *ngModels.Ale
return
}
annotationText := fmt.Sprintf("%s %s", result.Instance.String(), new.String())
annotationText := fmt.Sprintf("%s {%s} - %s", alertRule.Title, result.Instance.String(), new.String())
item := &annotations.Item{
OrgId: alertRule.OrgID,
DashboardId: query.Result.Id,
PanelId: panelId,
PrevState: oldState.String(),
NewState: new.String(),
Text: annotationText,
Epoch: result.EvaluatedAt.UnixNano() / int64(time.Millisecond),
}

18
public/app/features/annotations/standardAnnotationSupport.ts
View File

@@ -90,6 +90,7 @@ export interface AnnotationFieldInfo {
help?: string;
}
// These fields get added to the standard UI
export const annotationEventNames: AnnotationFieldInfo[] = [
{
key: 'time',
@@ -109,9 +110,18 @@ export const annotationEventNames: AnnotationFieldInfo[] = [
{
key: 'id',
},
// { key: 'userId' },
// { key: 'login' },
// { key: 'email' },
];
// Given legacy infrastructure, alert events are passed though the same annotation
// pipeline, but include fields that should not be exposed generally
const alertEventAndAnnotationFields: AnnotationFieldInfo[] = [
...annotationEventNames,
{ key: 'userId' },
{ key: 'login' },
{ key: 'email' },
{ key: 'prevState' },
{ key: 'newState' },
{ key: 'data' as any },
];
export function getAnnotationsFromData(
@@ -140,7 +150,7 @@ export function getAnnotationsFromData(
const fields: AnnotationEventFieldSetter[] = [];
for (const evts of annotationEventNames) {
for (const evts of alertEventAndAnnotationFields) {
const opt = options[evts.key] || {}; //AnnotationEventFieldMapping
if (opt.source === AnnotationEventFieldSource.Skip) {

10
public/app/features/query/state/DashboardQueryRunner/utils.ts
View File

@@ -59,9 +59,9 @@ export function translateQueryResult(annotation: AnnotationQuery, results: Annot
item.type = annotation.name;
item.isRegion = Boolean(item.timeEnd && item.time !== item.timeEnd);
switch (item.newState) {
switch (item.newState?.toLowerCase()) {
case 'pending':
item.color = 'gray';
item.color = 'yellow';
break;
case 'alerting':
item.color = 'red';
@@ -69,9 +69,15 @@ export function translateQueryResult(annotation: AnnotationQuery, results: Annot
case 'ok':
item.color = 'green';
break;
case 'normal': // ngalert ("normal" instead of "ok")
item.color = 'green';
break;
case 'no_data':
item.color = 'gray';
break;
case 'nodata': // ngalert
item.color = 'gray';
break;
}
}