Skip to content

fix: fix a bug when elastic as a provider #3904

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mowies merged 1 commit into from
Mar 24, 2025
Merged

fix: fix a bug when elastic as a provider #3904

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions metrics-operator/controllers/common/providers/elastic/elastic.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ func (r *KeptnElasticProvider) FetchAnalysisValue(ctx context.Context, query str
ctx, cancel := context.WithTimeout(ctx, 20*time.Second)
defer cancel()

result, err := r.runElasticQuery(ctx, query)
result, err := r.runElasticQuery(ctx, *provider, query)
if err != nil {
return "", err
}
Expand All @@ -98,7 +98,7 @@ func (r *KeptnElasticProvider) EvaluateQuery(ctx context.Context, metric metrics
ctx, cancel := context.WithTimeout(ctx, 20*time.Second)
defer cancel()

result, err := r.runElasticQuery(ctx, metric.Spec.Query)
result, err := r.runElasticQuery(ctx, provider, metric.Spec.Query)
if err != nil {
return "", nil, err
}
Expand All @@ -117,7 +117,13 @@ func (r *KeptnElasticProvider) EvaluateQueryForStep(ctx context.Context, metric
}

// runElasticQuery runs query on elastic search to get output from elasticsearch
func (r *KeptnElasticProvider) runElasticQuery(ctx context.Context, query string) (map[string]interface{}, error) {
func (r *KeptnElasticProvider) runElasticQuery(ctx context.Context, provider metricsapi.KeptnMetricsProvider, query string) (map[string]interface{}, error) {
var err error
r.Log.Info("Running Elasticsearch query", "query", query)
r.Elastic, err = GetElasticClient(provider)
if err != nil {
return nil, err
}

res, err := r.Elastic.Search(
r.Elastic.Search.WithContext(ctx),
Expand Down
2 changes: 1 addition & 1 deletion metrics-operator/controllers/common/providers/elastic/elastic_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ func TestRunElasticQuery(t *testing.T) {
ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
defer cancel()

result, err := provider.runElasticQuery(ctx, tt.query)
result, err := provider.runElasticQuery(ctx, metricsapi.KeptnMetricsProvider{}, tt.query)

if tt.expectedError {
assert.Error(t, err)
Expand Down
Loading