fixing metric name

truerocha · Apr 11, 2019 · ed088d3 · ed088d3
1 parent 0c191d0
commit ed088d3
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/clusterloader2/pkg/measurement/common/slos/api_responsiveness_prometheus.go b/clusterloader2/pkg/measurement/common/slos/api_responsiveness_prometheus.go
@@ -44,7 +44,7 @@ const (
 	// latencyQuery %v should be replaced with query window size.
 	latencyQuery = "quantile_over_time(0.99, apiserver:apiserver_request_latency:histogram_quantile[%v])"
 	// countQuery %v should be replaced with query window size.
-	countQuery = "sum(increase(apiserver_request_latency_seconds_count[%v])) by (resource, subresource, scope, verb)"
+	countQuery = "sum(increase(apiserver_request_duration_seconds_count[%v])) by (resource, subresource, scope, verb)"
 
 	latencyWindowSize = 5 * time.Minute
 	queryTimeout      = 5 * time.Minute
@@ -137,11 +137,11 @@ func (a *apiResponsivenessMeasurementPrometheus) gatherApiCalls(c clientset.Inte
 	measurementDuration := measurementEnd.Sub(a.startTime)
 	// Latency measurement is based on 5m window aggregation,
 	// therefore first 5 minutes of the test should be skipped.
-	latencymeasurementDuration := measurementDuration - latencyWindowSize
-	if latencymeasurementDuration < time.Minute {
-		latencymeasurementDuration = time.Minute
+	latencyMeasurementDuration := measurementDuration - latencyWindowSize
+	if latencyMeasurementDuration < time.Minute {
+		latencyMeasurementDuration = time.Minute
 	}
-	timeBoundedLatencyQuery := fmt.Sprintf(latencyQuery, measurementutil.ToPrometheusTime(latencymeasurementDuration))
+	timeBoundedLatencyQuery := fmt.Sprintf(latencyQuery, measurementutil.ToPrometheusTime(latencyMeasurementDuration))
 	latencySamples, err := gatherSamples(c, timeBoundedLatencyQuery, measurementEnd)
 	if err != nil {
 		return nil, err

diff --git a/clusterloader2/pkg/prometheus/manifests/prometheus-rules.yaml b/clusterloader2/pkg/prometheus/manifests/prometheus-rules.yaml
@@ -11,17 +11,17 @@ spec:
   - name: apiserver.rules
     rules:
     - expr: |
-        histogram_quantile(0.99, sum(rate(apiserver_request_latency_seconds_bucket[5m])) by (resource,  subresource, verb, scope, le))
+        histogram_quantile(0.99, sum(rate(apiserver_request_duration_seconds_bucket[5m])) by (resource,  subresource, verb, scope, le))
       record: apiserver:apiserver_request_latency:histogram_quantile
       labels:
         quantile: "0.99"
     - expr: |
-        histogram_quantile(0.9, sum(rate(apiserver_request_latency_seconds_bucket[5m])) by (resource,  subresource, verb, scope, le))
+        histogram_quantile(0.9, sum(rate(apiserver_request_duration_seconds_bucket[5m])) by (resource,  subresource, verb, scope, le))
       record: apiserver:apiserver_request_latency:histogram_quantile
       labels:
         quantile: "0.90"
     - expr: |
-        histogram_quantile(0.5, sum(rate(apiserver_request_latency_seconds_bucket[5m])) by (resource,  subresource, verb, scope, le))
+        histogram_quantile(0.5, sum(rate(apiserver_request_duration_seconds_bucket[5m])) by (resource,  subresource, verb, scope, le))
       record: apiserver:apiserver_request_latency:histogram_quantile
       labels:
         quantile: "0.50"