Remove TargetRPS from DeciderSpec and use TargetValue; update dashboa…

…rd title
knative · Aug 22, 2019 · 5d3d452 · 5d3d452
1 parent ba70dd1
commit 5d3d452
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 5 deletions.
diff --git a/config/monitoring/metrics/prometheus/100-grafana-dash-knative-scaling.yaml b/config/monitoring/metrics/prometheus/100-grafana-dash-knative-scaling.yaml
@@ -592,7 +592,7 @@ data:
                "thresholds": [],
                "timeFrom": null,
                "timeShift": null,
-               "title": "Observed Concurrency",
+               "title": "Observed Concurrency and RPS",
                "tooltip": {
                "shared": true,
                "sort": 0,

diff --git a/pkg/autoscaler/autoscaler.go b/pkg/autoscaler/autoscaler.go
@@ -137,7 +137,7 @@ func (a *Autoscaler) Scale(ctx context.Context, now time.Time) (desiredPodCount
 		observedStableValue, observedPanicValue, err = a.metricClient.StableAndPanicRPS(metricKey, now)
 		a.reporter.ReportStableRPS(observedStableValue)
 		a.reporter.ReportPanicRPS(observedPanicValue)
-		a.reporter.ReportTargetRPS(spec.TargetRPS)
+		a.reporter.ReportTargetRPS(spec.TargetValue)
 	default:
 		metricName = autoscaling.Concurrency // concurrency is used by default
 		observedStableValue, observedPanicValue, err = a.metricClient.StableAndPanicConcurrency(metricKey, now)

diff --git a/pkg/autoscaler/multiscaler.go b/pkg/autoscaler/multiscaler.go
@@ -48,8 +48,6 @@ type DeciderSpec struct {
 	// The value of scaling metric per pod that we target to maintain.
 	// TargetValue <= TotalValue.
 	TargetValue float64
-	// The value of requests-per-second per pod that we target to maintain.
-	TargetRPS float64
 	// The total value of scaling metric that a pod can maintain.
 	TotalValue float64
 	// The burst capacity that user wants to maintain without queing at the POD level.

diff --git a/pkg/reconciler/autoscaling/kpa/resources/decider.go b/pkg/reconciler/autoscaling/kpa/resources/decider.go
@@ -65,7 +65,6 @@ func MakeDecider(ctx context.Context, pa *v1alpha1.PodAutoscaler, config *autosc
 			MaxScaleUpRate:      config.MaxScaleUpRate,
 			ScalingMetric:       pa.Metric(),
 			TargetValue:         target,
-			TargetRPS:           config.RPSTargetDefault,
 			TotalValue:          total,
 			TargetBurstCapacity: tbc,
 			PanicThreshold:      panicThreshold,