mirror of
https://github.com/grafana/grafana.git
synced 2025-02-11 16:15:42 -06:00
parent
7e7daf48f4
commit
b5fa9e3501
@ -170,7 +170,7 @@ func (moa *MultiOrgAlertmanager) SyncAlertmanagersForOrgs(ctx context.Context, o
|
||||
moa.alertmanagersMtx.Lock()
|
||||
for _, orgID := range orgIDs {
|
||||
if _, isDisabledOrg := moa.settings.UnifiedAlerting.DisabledOrgs[orgID]; isDisabledOrg {
|
||||
moa.logger.Debug("skipping syncing Alertmanger for disabled org", "org", orgID)
|
||||
moa.logger.Debug("skipping syncing Alertmanager for disabled org", "org", orgID)
|
||||
continue
|
||||
}
|
||||
orgsFound[orgID] = struct{}{}
|
||||
|
@ -430,7 +430,7 @@ func TestSchedule_ruleRoutine(t *testing.T) {
|
||||
}
|
||||
expectedToBeSent++
|
||||
}
|
||||
require.Greaterf(t, expectedToBeSent, 0, "State manger was expected to return at least one state that can be expired")
|
||||
require.Greaterf(t, expectedToBeSent, 0, "State manager was expected to return at least one state that can be expired")
|
||||
|
||||
t.Run("should do nothing if version in channel is the same", func(t *testing.T) {
|
||||
updateChan <- ruleVersion(rule.Version - 1)
|
||||
|
@ -62,7 +62,7 @@ export function ExternalAMdataSourceCard({ alertmanager, inactive }: ExternalAMd
|
||||
<Card.Heading className={styles.externalHeading}>
|
||||
{dataSource.name}{' '}
|
||||
{statusInconclusive && (
|
||||
<Tooltip content="Multiple Alertmangers have the same URL configured. The state might be inconclusive.">
|
||||
<Tooltip content="Multiple Alertmanagers have the same URL configured. The state might be inconclusive.">
|
||||
<Icon name="exclamation-triangle" size="md" className={styles.externalWarningIcon} />
|
||||
</Tooltip>
|
||||
)}
|
||||
|
Loading…
Reference in New Issue
Block a user