From 12718da95b3b54688bd48558887b4167c51c3763 Mon Sep 17 00:00:00 2001 From: Jan Zantinge Date: Thu, 14 Nov 2019 11:32:12 -0500 Subject: [PATCH] Removed the value label variable. --- docs/horizontalpodautoscaler-metrics.md | 2 +- internal/store/hpa.go | 6 ++---- internal/store/hpa_test.go | 4 ++-- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/docs/horizontalpodautoscaler-metrics.md b/docs/horizontalpodautoscaler-metrics.md index 4be0ea9574..abf1c3a3fc 100644 --- a/docs/horizontalpodautoscaler-metrics.md +++ b/docs/horizontalpodautoscaler-metrics.md @@ -6,7 +6,7 @@ | kube_hpa_metadata_generation | Gauge | `hpa`=<hpa-name>
`namespace`=<hpa-namespace> | STABLE | | kube_hpa_spec_max_replicas | Gauge | `hpa`=<hpa-name>
`namespace`=<hpa-namespace> | STABLE | | kube_hpa_spec_min_replicas | Gauge | `hpa`=<hpa-name>
`namespace`=<hpa-namespace> | STABLE | -| kube_hpa_spec_target_metric | Gauge | `hpa`=<hpa-name>
`namespace`=<hpa-namespace>
`metric_name`=<metric-name>
`metric_target_type`=<value\|utilization\|average> | EXPERIMENTAL | +| kube_hpa_spec_target_metric | Gauge | `hpa`=<hpa-name>
`namespace`=<hpa-namespace>
`metric_name`=<metric-name>
`metric_target_type`=<value\|average> | EXPERIMENTAL | | kube_hpa_status_condition | Gauge | `hpa`=<hpa-name>
`namespace`=<hpa-namespace>
`condition`=<hpa-condition>
`status`=<true\|false\|unknown> | STABLE | | kube_hpa_status_current_replicas | Gauge | `hpa`=<hpa-name>
`namespace`=<hpa-namespace> | STABLE | | kube_hpa_status_currentmetrics_average_utilization | Gauge | `hpa`=<hpa-name>
`namespace`=<hpa-namespace> | EXPERIMENTAL | diff --git a/internal/store/hpa.go b/internal/store/hpa.go index 8f08b9efb5..9de5cf6801 100644 --- a/internal/store/hpa.go +++ b/internal/store/hpa.go @@ -87,7 +87,6 @@ var ( for _, m := range a.Spec.Metrics { var metricName string var value, average int64 - valueLabel := "value" var valueOk, averageOk bool switch m.Type { @@ -107,7 +106,6 @@ var ( value = int64(*m.Resource.TargetAverageUtilization) valueOk = true - valueLabel = "utilization" if m.Resource.TargetAverageValue != nil { average, averageOk = m.Resource.TargetAverageValue.AsInt64() @@ -115,7 +113,7 @@ var ( case autoscaling.ExternalMetricSourceType: metricName = m.External.MetricName - // The TargetValue and TargetAverageValue are mutually exclusive + // The TargetValue and TargetAverageValue fields are mutually exclusive if m.External.TargetValue != nil { value, valueOk = m.External.TargetValue.AsInt64() } @@ -130,7 +128,7 @@ var ( if valueOk { targets = append(targets, &metric.Metric{ LabelKeys: targetMetricLabels, - LabelValues: []string{metricName, valueLabel}, + LabelValues: []string{metricName, "value"}, Value: float64(value), }) } diff --git a/internal/store/hpa_test.go b/internal/store/hpa_test.go index 6cddf2ece3..8fb40fa08e 100644 --- a/internal/store/hpa_test.go +++ b/internal/store/hpa_test.go @@ -153,8 +153,8 @@ func TestHPAStore(t *testing.T) { kube_hpa_spec_target_metric{hpa="hpa1",namespace="ns1",metric_name="hits",metric_target_type="value"} 10 kube_hpa_spec_target_metric{hpa="hpa1",namespace="ns1",metric_name="hits",metric_target_type="average"} 12 kube_hpa_spec_target_metric{hpa="hpa1",namespace="ns1",metric_name="transactions_processed",metric_target_type="average"} 33 - kube_hpa_spec_target_metric{hpa="hpa1",namespace="ns1",metric_name="cpu",metric_target_type="utilization"} 80 - kube_hpa_spec_target_metric{hpa="hpa1",namespace="ns1",metric_name="memory",metric_target_type="utilization"} 80 + kube_hpa_spec_target_metric{hpa="hpa1",namespace="ns1",metric_name="cpu",metric_target_type="value"} 80 + kube_hpa_spec_target_metric{hpa="hpa1",namespace="ns1",metric_name="memory",metric_target_type="value"} 80 kube_hpa_spec_target_metric{hpa="hpa1",namespace="ns1",metric_name="memory",metric_target_type="average"} 819200 kube_hpa_spec_target_metric{hpa="hpa1",namespace="ns1",metric_name="sqs_jobs",metric_target_type="value"} 30 kube_hpa_spec_target_metric{hpa="hpa1",namespace="ns1",metric_name="events",metric_target_type="average"} 30