From 09b756954462719ad61b3a26558cc0c101aeb802 Mon Sep 17 00:00:00 2001 From: cyrilico <19289022+cyrilico@users.noreply.github.com> Date: Mon, 25 Mar 2024 09:52:27 +0000 Subject: [PATCH 1/3] consider empty results set from new relic Signed-off-by: cyrilico <19289022+cyrilico@users.noreply.github.com> --- pkg/scalers/newrelic_scaler.go | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkg/scalers/newrelic_scaler.go b/pkg/scalers/newrelic_scaler.go index 1d62ea911e6..851747a5beb 100644 --- a/pkg/scalers/newrelic_scaler.go +++ b/pkg/scalers/newrelic_scaler.go @@ -158,6 +158,13 @@ func (s *newrelicScaler) executeNewRelicQuery(ctx context.Context) (float64, err if err != nil { return 0, fmt.Errorf("error running NRQL %s (%s)", s.metadata.nrql, err.Error()) } + // Check for empty results set, as New Relic lib does not report these as errors + if len(resp.Results) == 0 { + if s.metadata.noDataError { + return 0, fmt.Errorf("query return no results %s", s.metadata.nrql) + } + return 0, nil + } // Only use the first result from the query, as the query should not be multi row for _, v := range resp.Results[0] { val, ok := v.(float64) From 5ed37238cee0dac79d540e668300a5c32c652e10 Mon Sep 17 00:00:00 2001 From: cyrilico <19289022+cyrilico@users.noreply.github.com> Date: Mon, 25 Mar 2024 09:57:09 +0000 Subject: [PATCH 2/3] update changelog Signed-off-by: cyrilico <19289022+cyrilico@users.noreply.github.com> --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6dabcee34d6..d4e9c4d1246 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -71,6 +71,7 @@ Here is an overview of all new **experimental** features: ### Fixes +- **New Relic Scaler**: Consider empty results set from query executer ([#5619](https://github.com/kedacore/keda/pull/5619)) - **General**: Fix CVE-2024-28180 in github.com/go-jose/go-jose/v3 ([#5617](https://github.com/kedacore/keda/pull/5617)) - **General**: Prometheus metrics shows errors correctly ([#5597](https://github.com/kedacore/keda/issues/5597)) - **General**: Validate empty array value of triggers in ScaledObject/ScaledJob creation ([#5520](https://github.com/kedacore/keda/issues/5520)) From 9900a7ee14cba83c4b24025de192a0539ba8846c Mon Sep 17 00:00:00 2001 From: cyrilico <19289022+cyrilico@users.noreply.github.com> Date: Mon, 25 Mar 2024 11:16:22 +0000 Subject: [PATCH 3/3] fix changelog order Signed-off-by: cyrilico <19289022+cyrilico@users.noreply.github.com> --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d4e9c4d1246..79164cf9fdb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -71,10 +71,10 @@ Here is an overview of all new **experimental** features: ### Fixes -- **New Relic Scaler**: Consider empty results set from query executer ([#5619](https://github.com/kedacore/keda/pull/5619)) - **General**: Fix CVE-2024-28180 in github.com/go-jose/go-jose/v3 ([#5617](https://github.com/kedacore/keda/pull/5617)) - **General**: Prometheus metrics shows errors correctly ([#5597](https://github.com/kedacore/keda/issues/5597)) - **General**: Validate empty array value of triggers in ScaledObject/ScaledJob creation ([#5520](https://github.com/kedacore/keda/issues/5520)) +- **New Relic Scaler**: Consider empty results set from query executer ([#5619](https://github.com/kedacore/keda/pull/5619)) ### Deprecations