Просмотр исходного кода

fix: properly query for the cpu/memory autoscaling thresholds (#3430)

jose-fully-ported 2 лет назад
Родитель
Сommit
2f24f83381

+ 1 - 1
dashboard/src/main/home/app-dashboard/expanded-app/metrics/MetricsSection.tsx

@@ -149,7 +149,7 @@ const MetricsSection: React.FunctionComponent<PropsType> = ({
               "<token>",
               {
                 metric: hpaMetricType,
-                shouldsum: true,
+                shouldsum: false,
                 kind: kind,
                 name: selectedController?.metadata.name,
                 namespace: currentChart.namespace,

+ 8 - 8
internal/kubernetes/prometheus/metrics.go

@@ -443,7 +443,7 @@ func createHPAAbsoluteCPUThresholdQuery(cpuMetricName, metricName, podSelectionR
 	}
 
 	requestCPUOne := fmt.Sprintf(
-		`sum by (%s) (label_replace(%s{%s},"%s", "%s", "", ""))`,
+		`avg by (%s) (label_replace(%s{%s},"%s", "%s", "", ""))`,
 		hpaMetricName,
 		cpuMetricName,
 		kubeMetricsPodSelectorOne,
@@ -452,13 +452,13 @@ func createHPAAbsoluteCPUThresholdQuery(cpuMetricName, metricName, podSelectionR
 	)
 
 	targetCPUUtilThresholdOne := fmt.Sprintf(
-		`%s{%s} / 100`,
+		`%s{%s} / 50`,
 		metricName,
 		kubeMetricsHPASelectorOne,
 	)
 
 	requestCPUTwo := fmt.Sprintf(
-		`sum by (%s) (label_replace(%s{%s},"%s", "%s", "", ""))`,
+		`avg by (%s) (label_replace(%s{%s},"%s", "%s", "", ""))`,
 		hpaMetricName,
 		cpuMetricName,
 		kubeMetricsPodSelectorTwo,
@@ -467,7 +467,7 @@ func createHPAAbsoluteCPUThresholdQuery(cpuMetricName, metricName, podSelectionR
 	)
 
 	targetCPUUtilThresholdTwo := fmt.Sprintf(
-		`%s{%s} / 100`,
+		`%s{%s} / 50`,
 		metricName,
 		kubeMetricsHPASelectorTwo,
 	)
@@ -512,7 +512,7 @@ func createHPAAbsoluteMemoryThresholdQuery(memMetricName, metricName, podSelecti
 	}
 
 	requestMemOne := fmt.Sprintf(
-		`sum by (%s) (label_replace(%s{%s},"%s", "%s", "", ""))`,
+		`avg by (%s) (label_replace(%s{%s},"%s", "%s", "", ""))`,
 		hpaMetricName,
 		memMetricName,
 		kubeMetricsPodSelectorOne,
@@ -521,13 +521,13 @@ func createHPAAbsoluteMemoryThresholdQuery(memMetricName, metricName, podSelecti
 	)
 
 	targetMemUtilThresholdOne := fmt.Sprintf(
-		`%s{%s} / 100`,
+		`%s{%s} / 50`,
 		metricName,
 		kubeMetricsHPASelectorOne,
 	)
 
 	requestMemTwo := fmt.Sprintf(
-		`sum by (%s) (label_replace(%s{%s},"%s", "%s", "", ""))`,
+		`avg by (%s) (label_replace(%s{%s},"%s", "%s", "", ""))`,
 		hpaMetricName,
 		memMetricName,
 		kubeMetricsPodSelectorTwo,
@@ -536,7 +536,7 @@ func createHPAAbsoluteMemoryThresholdQuery(memMetricName, metricName, podSelecti
 	)
 
 	targetMemUtilThresholdTwo := fmt.Sprintf(
-		`%s{%s} / 100`,
+		`%s{%s} / 50`,
 		metricName,
 		kubeMetricsHPASelectorTwo,
 	)