api: adds scrapeTimeout - global configuration for vmagent

Author: f41gh7

api/v1beta1/vmagent_types.go

@@ -134,6 +134,10 @@ type VMAgentSpec struct {
 	// +optional
 	// +kubebuilder:validation:Pattern:="[0-9]+(ms|s|m|h)"
 	ScrapeInterval string `json:"scrapeInterval,omitempty"`
+	// ScrapeTimeout defines global timeout for targets scrape
+	// +optional
+	// +kubebuilder:validation:Pattern:="[0-9]+(ms|s|m|h)"
+	ScrapeTimeout string `json:"scrapeTimeout,omitempty"`
 
 	// APIServerConfig allows specifying a host and auth methods to access apiserver.
 	// If left empty, VMAgent is assumed to run inside of the cluster

api/v1beta1/vmservicescrape_types.go

@@ -1,6 +1,7 @@
 package v1beta1
 
 import (
+	"encoding/json"
 	"fmt"
 	"reflect"
 
@@ -390,6 +391,29 @@ type RelabelConfig struct {
 	Labels map[string]string `json:"labels,omitempty" yaml:"labels,omitempty"`
 }
 
+// UnmarshalJSON implements interface
+// handles cases for snake and camel cases of json tags
+func (rc *RelabelConfig) UnmarshalJSON(src []byte) error {
+	type rcfg RelabelConfig
+	if err := json.Unmarshal(src, (*rcfg)(rc)); err != nil {
+		return fmt.Errorf("cannot parse relabelConfig: %w", err)
+	}
+
+	if len(rc.SourceLabels) == 0 && len(rc.UnderScoreSourceLabels) > 0 {
+		rc.SourceLabels = append(rc.SourceLabels, rc.UnderScoreSourceLabels...)
+	}
+	if len(rc.UnderScoreSourceLabels) == 0 && len(rc.SourceLabels) > 0 {
+		rc.UnderScoreSourceLabels = append(rc.UnderScoreSourceLabels, rc.SourceLabels...)
+	}
+	if rc.TargetLabel == "" && rc.UnderScoreTargetLabel != "" {
+		rc.TargetLabel = rc.UnderScoreTargetLabel
+	}
+	if rc.UnderScoreTargetLabel == "" && rc.TargetLabel != "" {
+		rc.UnderScoreTargetLabel = rc.TargetLabel
+	}
+	return nil
+}
+
 func (rc *RelabelConfig) IsEmpty() bool {
 	if rc == nil {
 		return true

config/crd/bases/operator.victoriametrics.com_vmagents.yaml

@@ -2305,6 +2305,10 @@ spec:
                 description: ScrapeInterval defines how often scrape targets by default
                 pattern: '[0-9]+(ms|s|m|h)'
                 type: string
+              scrapeTimeout:
+                description: ScrapeTimeout defines global timeout for targets scrape
+                pattern: '[0-9]+(ms|s|m|h)'
+                type: string
               secrets:
                 description: Secrets is a list of Secrets in the same namespace as
                   the vmagent object, which shall be mounted into the vmagent Pods.