Commit d003550b authored by Beata Skiba's avatar Beata Skiba

Differentiate between target and target average value

parent afe17246
...@@ -2830,13 +2830,13 @@ func describeHorizontalPodAutoscaler(hpa *autoscaling.HorizontalPodAutoscaler, e ...@@ -2830,13 +2830,13 @@ func describeHorizontalPodAutoscaler(hpa *autoscaling.HorizontalPodAutoscaler, e
hpa.Status.CurrentMetrics[i].External.CurrentAverageValue != nil { hpa.Status.CurrentMetrics[i].External.CurrentAverageValue != nil {
current = hpa.Status.CurrentMetrics[i].External.CurrentAverageValue.String() current = hpa.Status.CurrentMetrics[i].External.CurrentAverageValue.String()
} }
w.Write(LEVEL_1, "%q:\t%s / %s\n", metric.External.MetricName, current, metric.External.TargetAverageValue.String()) w.Write(LEVEL_1, "%q (target average value):\t%s / %s\n", metric.External.MetricName, current, metric.External.TargetAverageValue.String())
} else { } else {
current := "<unknown>" current := "<unknown>"
if len(hpa.Status.CurrentMetrics) > i && hpa.Status.CurrentMetrics[i].External != nil { if len(hpa.Status.CurrentMetrics) > i && hpa.Status.CurrentMetrics[i].External != nil {
current = hpa.Status.CurrentMetrics[i].External.CurrentValue.String() current = hpa.Status.CurrentMetrics[i].External.CurrentValue.String()
} }
w.Write(LEVEL_1, "%q:\t%s / %s\n", metric.External.MetricName, current, metric.External.TargetValue.String()) w.Write(LEVEL_1, "%q (target value):\t%s / %s\n", metric.External.MetricName, current, metric.External.TargetValue.String())
} }
case autoscaling.PodsMetricSourceType: case autoscaling.PodsMetricSourceType:
......
...@@ -1497,7 +1497,7 @@ func formatHPAMetrics(specs []autoscaling.MetricSpec, statuses []autoscaling.Met ...@@ -1497,7 +1497,7 @@ func formatHPAMetrics(specs []autoscaling.MetricSpec, statuses []autoscaling.Met
if len(statuses) > i && statuses[i].External != nil && statuses[i].External.CurrentAverageValue != nil { if len(statuses) > i && statuses[i].External != nil && statuses[i].External.CurrentAverageValue != nil {
current = statuses[i].External.CurrentAverageValue.String() current = statuses[i].External.CurrentAverageValue.String()
} }
list = append(list, fmt.Sprintf("%s/%s", current, spec.External.TargetAverageValue.String())) list = append(list, fmt.Sprintf("%s/%s (avg)", current, spec.External.TargetAverageValue.String()))
} else { } else {
current := "<unknown>" current := "<unknown>"
if len(statuses) > i && statuses[i].External != nil { if len(statuses) > i && statuses[i].External != nil {
......
...@@ -2200,7 +2200,7 @@ func TestPrintHPA(t *testing.T) { ...@@ -2200,7 +2200,7 @@ func TestPrintHPA(t *testing.T) {
DesiredReplicas: 5, DesiredReplicas: 5,
}, },
}, },
"some-hpa\tReplicationController/some-rc\t<unknown>/100m\t2\t10\t4\t<unknown>\n", "some-hpa\tReplicationController/some-rc\t<unknown>/100m (avg)\t2\t10\t4\t<unknown>\n",
}, },
// external source type, target average value // external source type, target average value
{ {
...@@ -2247,7 +2247,7 @@ func TestPrintHPA(t *testing.T) { ...@@ -2247,7 +2247,7 @@ func TestPrintHPA(t *testing.T) {
}, },
}, },
}, },
"some-hpa\tReplicationController/some-rc\t50m/100m\t2\t10\t4\t<unknown>\n", "some-hpa\tReplicationController/some-rc\t50m/100m (avg)\t2\t10\t4\t<unknown>\n",
}, },
// external source type, target value (no current) // external source type, target value (no current)
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment