mirror of
https://github.com/prometheus/prometheus.git
synced 2025-10-24 05:51:12 +02:00
Init Commit: fix for issue #4510
Signed-off-by: Sahil Rasaikar <sahil.rasaikar@gmail.com>
This commit is contained in:
parent
f4b8840f51
commit
516afbea67
@ -58,6 +58,8 @@ const (
|
||||
// StateFiring is the state of an alert that has been active for longer than
|
||||
// the configured threshold duration.
|
||||
StateFiring
|
||||
// StateUnknown is the state of an alert that has not yet been evaluated.
|
||||
StateUnknown
|
||||
)
|
||||
|
||||
func (s AlertState) String() string {
|
||||
@ -68,6 +70,8 @@ func (s AlertState) String() string {
|
||||
return "pending"
|
||||
case StateFiring:
|
||||
return "firing"
|
||||
case StateUnknown:
|
||||
return "unknown"
|
||||
}
|
||||
panic(fmt.Errorf("unknown alert state: %d", s))
|
||||
}
|
||||
@ -530,8 +534,13 @@ func (r *AlertingRule) Eval(ctx context.Context, queryOffset time.Duration, ts t
|
||||
}
|
||||
|
||||
// State returns the maximum state of alert instances for this rule.
|
||||
// StateFiring > StatePending > StateInactive.
|
||||
// StateFiring > StatePending > StateInactive > StateUnknown.
|
||||
func (r *AlertingRule) State() AlertState {
|
||||
// If the rule has never been evaluated, return StateUnknown
|
||||
if r.GetEvaluationTimestamp().IsZero() {
|
||||
return StateUnknown
|
||||
}
|
||||
|
||||
r.activeMtx.Lock()
|
||||
defer r.activeMtx.Unlock()
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
type RuleState = "pending" | "firing" | "inactive";
|
||||
type RuleState = "pending" | "firing" | "inactive" | "unknown";
|
||||
|
||||
export interface Alert {
|
||||
labels: Record<string, string>;
|
||||
|
||||
@ -45,6 +45,7 @@ type AlertsPageData = {
|
||||
inactive: number;
|
||||
pending: number;
|
||||
firing: number;
|
||||
unknown: number;
|
||||
};
|
||||
groups: {
|
||||
name: string;
|
||||
@ -55,6 +56,7 @@ type AlertsPageData = {
|
||||
inactive: number;
|
||||
pending: number;
|
||||
firing: number;
|
||||
unknown: number;
|
||||
};
|
||||
rules: {
|
||||
rule: AlertingRule;
|
||||
@ -82,6 +84,7 @@ const buildAlertsPageData = (
|
||||
inactive: 0,
|
||||
pending: 0,
|
||||
firing: 0,
|
||||
unknown: 0,
|
||||
},
|
||||
groups: [],
|
||||
};
|
||||
@ -92,6 +95,7 @@ const buildAlertsPageData = (
|
||||
inactive: 0,
|
||||
pending: 0,
|
||||
firing: 0,
|
||||
unknown: 0,
|
||||
};
|
||||
|
||||
for (const r of group.rules) {
|
||||
@ -109,6 +113,10 @@ const buildAlertsPageData = (
|
||||
pageData.globalCounts.pending++;
|
||||
groupCounts.pending++;
|
||||
break;
|
||||
case "unknown":
|
||||
pageData.globalCounts.unknown++;
|
||||
groupCounts.unknown++;
|
||||
break;
|
||||
default:
|
||||
throw new Error(`Unknown rule state: ${r.state}`);
|
||||
}
|
||||
@ -239,6 +247,11 @@ export default function AlertsPage() {
|
||||
pending ({g.counts.pending})
|
||||
</Badge>
|
||||
)}
|
||||
{g.counts.unknown > 0 && (
|
||||
<Badge className={badgeClasses.healthUnknown}>
|
||||
unknown ({g.counts.unknown})
|
||||
</Badge>
|
||||
)}
|
||||
{g.counts.inactive > 0 && (
|
||||
<Badge className={badgeClasses.healthOk}>
|
||||
inactive ({g.counts.inactive})
|
||||
@ -285,7 +298,9 @@ export default function AlertsPage() {
|
||||
? panelClasses.panelHealthErr
|
||||
: r.counts.pending > 0
|
||||
? panelClasses.panelHealthWarn
|
||||
: panelClasses.panelHealthOk
|
||||
: r.rule.state === "unknown"
|
||||
? panelClasses.panelHealthUnknown
|
||||
: panelClasses.panelHealthOk
|
||||
}
|
||||
>
|
||||
<Accordion.Control
|
||||
@ -401,13 +416,15 @@ export default function AlertsPage() {
|
||||
<Stack mt="xs">
|
||||
<Group>
|
||||
<StateMultiSelect
|
||||
options={["inactive", "pending", "firing"]}
|
||||
options={["inactive", "pending", "firing", "unknown"]}
|
||||
optionClass={(o) =>
|
||||
o === "inactive"
|
||||
? badgeClasses.healthOk
|
||||
: o === "pending"
|
||||
? badgeClasses.healthWarn
|
||||
: badgeClasses.healthErr
|
||||
: o === "firing"
|
||||
? badgeClasses.healthErr
|
||||
: badgeClasses.healthUnknown
|
||||
}
|
||||
optionCount={(o) =>
|
||||
alertsPageData.globalCounts[
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user