Merge pull request #1132 from YangLu1031/master

k8s-ci-robot · web-flow · commit cdb0e2877c41 · 2020-03-25T03:21:03.000-07:00
Expand the scraping timeout
diff --git a/clusterloader2/pkg/measurement/common/slos/windows_node_resource_usage.go b/clusterloader2/pkg/measurement/common/slos/windows_node_resource_usage.go
@@ -30,7 +30,7 @@ import (
 const (
 	windowsResourceUsagePrometheusMeasurementName = "WindowsResourceUsagePrometheus"
 	// get top 10 non-system processes with highest cpu usage within 1min query window size
-	cpuUsageQueryTop10                        = `topk(10, sum by (process) (rate(wmi_process_cpu_time_total{process!~"Idle|Total|System"}[1m]) / on(job) group_left wmi_cs_logical_processors) * 100)`
+	cpuUsageQueryTop10                        = `topk(10, sum by (process) (irate(wmi_process_cpu_time_total{process!~"Idle|Total|System"}[5m]) / on(job) group_left wmi_cs_logical_processors) * 100)`
 	currentWindowsResourceUsageMetricsVersion = "v1"
 )
 
diff --git a/clusterloader2/pkg/prometheus/manifests/prometheus-windows-scrape-configs.yaml b/clusterloader2/pkg/prometheus/manifests/prometheus-windows-scrape-configs.yaml
@@ -8,5 +8,7 @@ metadata:
 stringData:
   windows-scrape-configs.yaml: |-
     - job_name: "monitoring/windows_static"
+      scrape_interval: {{DefaultParam .CL2_WINDOWS_SCRAPE_INTERVAL "130s"}}
+      scrape_timeout: {{DefaultParam .CL2_WINDOWS_SCRAPE_TIMEOUT "120s"}}
       static_configs:
       - targets: ["{{$WINDOWS_NODE_NAME}}:5000"]

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ import (`
`30`	`30`	`const (`
`31`	`31`	`windowsResourceUsagePrometheusMeasurementName = "WindowsResourceUsagePrometheus"`
`32`	`32`	`// get top 10 non-system processes with highest cpu usage within 1min query window size`
`33`		- cpuUsageQueryTop10 = `topk(10, sum by (process) (rate(wmi_process_cpu_time_total{process!~"Idle\|Total\|System"}[1m]) / on(job) group_left wmi_cs_logical_processors) * 100)`
	`33`	+ cpuUsageQueryTop10 = `topk(10, sum by (process) (irate(wmi_process_cpu_time_total{process!~"Idle\|Total\|System"}[5m]) / on(job) group_left wmi_cs_logical_processors) * 100)`
`34`	`34`	`currentWindowsResourceUsageMetricsVersion = "v1"`
`35`	`35`	`)`
`36`	`36`