From 48877f91872ca1a94d071a8f3e5f65b2e080397a Mon Sep 17 00:00:00 2001 From: Will Browne Date: Fri, 4 Apr 2025 10:37:55 +0100 Subject: [PATCH] Alerting: Fix plugin not found error during condition validation (#102437) improve error --- pkg/services/ngalert/eval/validate.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/services/ngalert/eval/validate.go b/pkg/services/ngalert/eval/validate.go index 3d4b98a46b0..37c58385102 100644 --- a/pkg/services/ngalert/eval/validate.go +++ b/pkg/services/ngalert/eval/validate.go @@ -37,7 +37,7 @@ func (e *ConditionValidator) Validate(ctx EvaluationContext, condition models.Co case expr.TypeDatasourceNode: p, found := e.pluginsStore.Plugin(ctx.Ctx, query.DataSource.Type) if !found { // technically this should fail earlier during datasource resolution phase. - return fmt.Errorf("datasource refID %s could not be found: %w", query.RefID, plugins.ErrPluginUnavailable) + return fmt.Errorf("plugin %s could not be found for datasource query refID %s: %w", query.DataSource.Type, query.RefID, plugins.ErrPluginNotRegistered) } if !p.Backend { return fmt.Errorf("datasource refID %s is not a backend datasource", query.RefID) @@ -45,7 +45,7 @@ func (e *ConditionValidator) Validate(ctx EvaluationContext, condition models.Co case expr.TypeMLNode: _, found := e.pluginsStore.Plugin(ctx.Ctx, query.DataSource.Type) if !found { - return fmt.Errorf("datasource refID %s could not be found: %w", query.RefID, plugins.ErrPluginUnavailable) + return fmt.Errorf("plugin %s could not be found for datasource query refID %s: %w", query.DataSource.Type, query.RefID, plugins.ErrPluginNotRegistered) } case expr.TypeCMDNode: }