Fix k8s scheduler compatibility issue (#19699)

CHANGELOG.next.asciidoc

@@ -269,6 +269,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
 - Fix bug incorrect parsing of float numbers as integers in Couchbase module {issue}18949[18949] {pull}19055[19055]
 - Fix config example in the perfmon configuration files. {pull}19539[19539]
 - Add missing info about the rest of the azure metricsets in the documentation. {pull}19601[19601]
+- Fix k8s scheduler compatibility issue. {pull}19699[19699]
 
 *Packetbeat*
 

metricbeat/docs/fields.asciidoc

@@ -25872,7 +25872,7 @@ type: long
 
 --
 
-*`kubernetes.scheduler.scheduling.pod.preemption.victims.count`*::
+*`kubernetes.scheduler.scheduling.pod.preemption.victims.bucket.*`*::
 +
 --
 Pod preemption victims
@@ -25881,6 +25881,24 @@ type: long
 
 --
 
+*`kubernetes.scheduler.scheduling.pod.preemption.victims.sum`*::
++
+--
+Pod preemption victims sum
+
+type: long
+
+--
+
+*`kubernetes.scheduler.scheduling.pod.preemption.victims.count`*::
++
+--
+Pod preemption victims count
+
+type: long
+
+--
+
 *`kubernetes.scheduler.scheduling.pod.attempts.count`*::
 +
 --

metricbeat/helper/prometheus/metric.go

@@ -18,6 +18,7 @@
 package prometheus
 
 import (
+	"fmt"
 	"math"
 	"strconv"
 	"strings"
@@ -102,6 +103,14 @@ func OpMultiplyBuckets(multiplier float64) MetricOption {
 	}
 }
 
+// OpSetSuffix extends the field's name with the given suffix if the value of the metric
+// is numeric (and not histogram or quantile), otherwise does nothing
+func OpSetNumericMetricSuffix(suffix string) MetricOption {
+	return opSetNumericMetricSuffix{
+		suffix: suffix,
+	}
+}
+
 // Metric directly maps a Prometheus metric to a Metricbeat field
 func Metric(field string, options ...MetricOption) MetricMap {
 	return &commonMetric{
@@ -378,6 +387,20 @@ func (o opMultiplyBuckets) Process(field string, value interface{}, labels commo
 	return field, histogram, labels
 }
 
+type opSetNumericMetricSuffix struct {
+	suffix string
+}
+
+// Process will extend the field's name with the given suffix
+func (o opSetNumericMetricSuffix) Process(field string, value interface{}, labels common.MapStr) (string, interface{}, common.MapStr) {
+	_, ok := value.(float64)
+	if !ok {
+		return field, value, labels
+	}
+	field = fmt.Sprintf("%v.%v", field, o.suffix)
+	return field, value, labels
+}
+
 type opUnixTimestampValue struct {
 }
 

metricbeat/module/kubernetes/scheduler/_meta/fields.yml

@@ -112,9 +112,15 @@
       - name: e2e.duration.us.count
         type: long
         description: End to end scheduling count
-      - name: pod.preemption.victims.count
+      - name: pod.preemption.victims.bucket.*
         type: long
         description: Pod preemption victims
+      - name: pod.preemption.victims.sum
+        type: long
+        description: Pod preemption victims sum
+      - name: pod.preemption.victims.count
+        type: long
+        description: Pod preemption victims count
       - name: pod.attempts.count
         type: long
         description: Pod attempts count