Fix isActive function

Signed-off-by: Tomek Urbaszek <tomasz.urbaszek@polidea.com>
kedacore · Aug 25, 2020 · 29f1d0a · 29f1d0a
1 parent 7ecf151
commit 29f1d0a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 10 deletions.
diff --git a/pkg/scalers/http_scaler.go → pkg/scalers/metrics_api_scaler.go b/pkg/scalers/http_scaler.go → pkg/scalers/metrics_api_scaler.go
@@ -72,11 +72,6 @@ func parseHTTPMetadata(resolvedEnv, metadata, authParams map[string]string) (*ht
 	return &meta, nil
 }
 
-func (s *httpScaler) checkHealth() error {
-	u := fmt.Sprintf("%s/health/", s.metadata.apiURL)
-	_, err := http.Get(u)
-	return err
-}
 
 func (s *httpScaler) getMetricInfo() (*metric, error) {
 	var m *metric
@@ -104,18 +99,19 @@ func (s *httpScaler) Close() error {
 
 // IsActive returns true if there are pending messages to be processed
 func (s *httpScaler) IsActive(ctx context.Context) (bool, error) {
-	err := s.checkHealth()
+	m, err := s.getMetricInfo()
 	if err != nil {
 		httpLog.Error(err, fmt.Sprintf("Error when checking API health: %s", err))
 		return false, err
 	}
-	return true, nil
+
+	return m.Value > 0.0, nil
 }
 
 // GetMetricSpecForScaling returns the MetricSpec for the Horizontal Pod Autoscaler
 func (s *httpScaler) GetMetricSpecForScaling() []v2beta2.MetricSpec {
 	targetValue := resource.NewQuantity(int64(s.metadata.targetValue), resource.DecimalSI)
-	metricName := fmt.Sprintf("%s-%s", "http", kedautil.NormalizeString(s.metadata.apiURL), s.metadata.metricName)
+	metricName := fmt.Sprintf("%s-%s-%s", "http", kedautil.NormalizeString(s.metadata.apiURL), s.metadata.metricName)
 	externalMetric := &v2beta2.ExternalMetricSource{
 		Metric: v2beta2.MetricIdentifier{
 			Name: metricName,

diff --git a/pkg/scalers/http_scaler_test.go → pkg/scalers/metrics_api_scaler_test.go b/pkg/scalers/http_scaler_test.go → pkg/scalers/metrics_api_scaler_test.go
diff --git a/pkg/scaling/scale_handler.go b/pkg/scaling/scale_handler.go
@@ -396,6 +396,8 @@ func buildScaler(name, namespace, triggerType string, resolvedEnv, triggerMetada
 		return scalers.NewKafkaScaler(resolvedEnv, triggerMetadata, authParams)
 	case "liiklus":
 		return scalers.NewLiiklusScaler(resolvedEnv, triggerMetadata)
+	case "metrics-api":
+		return scalers.NewHTTPScaler(resolvedEnv, triggerMetadata, authParams)
 	case "mysql":
 		return scalers.NewMySQLScaler(resolvedEnv, triggerMetadata, authParams)
 	case "postgresql":
@@ -410,8 +412,6 @@ func buildScaler(name, namespace, triggerType string, resolvedEnv, triggerMetada
 		return scalers.NewRedisStreamsScaler(resolvedEnv, triggerMetadata, authParams)
 	case "stan":
 		return scalers.NewStanScaler(resolvedEnv, triggerMetadata)
-	case "external-metric-source":
-		return scalers.NewHTTPScaler(resolvedEnv, triggerMetadata, authParams)
 	default:
 		return nil, fmt.Errorf("no scaler found for type: %s", triggerType)
 	}