stream aggregation: sync options dropInputLabels, `ignoreFirstInter…

…vals`, `ignoreOldSamples` from upstream, and support using configmap as the source of aggregation rules

api/operator/v1beta1/vmagent_types.go

@@ -207,6 +207,9 @@ type VMAgentSpec struct {
 	// InlineRelabelConfig - defines GlobalRelabelConfig for vmagent, can be defined directly at CRD.
 	// +optional
 	InlineRelabelConfig []RelabelConfig `json:"inlineRelabelConfig,omitempty"`
+	// StreamAggrConfig defines global stream aggregation configuration for VMAgent
+	// +optional
+	StreamAggrConfig *StreamAggrConfig `json:"streamAggrConfig,omitempty"`
 	// SelectAllByDefault changes default behavior for empty CRD selectors, such ServiceScrapeSelector.
 	// with selectAllByDefault: true and empty serviceScrapeSelector and ServiceScrapeNamespaceSelector
 	// Operator selects all exist serviceScrapes
@@ -539,11 +542,6 @@ func (rw *VMAgentRemoteWriteSpec) AsConfigMapKey(idx int, suffix string) string
 	return fmt.Sprintf("RWS_%d-CM-%s", idx, strings.ToUpper(suffix))
 }
 
-// HasStreamAggr returns true if stream aggregation is enabled for this remoteWrite
-func (rw *VMAgentRemoteWriteSpec) HasStreamAggr() bool {
-	return rw.StreamAggrConfig != nil && len(rw.StreamAggrConfig.Rules) > 0
-}
-
 // VMAgentStatus defines the observed state of VMAgent
 // +k8s:openapi-gen=true
 type VMAgentStatus struct {
@@ -805,13 +803,17 @@ func (cr *VMAgent) HasAnyRelabellingConfigs() bool {
 	return false
 }
 
-// HasAnyStreamAggrConfigs checks if agent has any streaming aggregation config defined
+// HasAnyStreamAggrConfigs checks if vmagent has any defined aggregation rules
 func (cr *VMAgent) HasAnyStreamAggrConfigs() bool {
+	if cr.Spec.StreamAggrConfig.HasStreamAggrConfig() {
+		return true
+	}
 	for _, rw := range cr.Spec.RemoteWrite {
-		if rw.HasStreamAggr() {
+		if rw.StreamAggrConfig.HasStreamAggrConfig() {
 			return true
 		}
 	}
+
 	return false
 }
 

api/operator/v1beta1/vmextra_types.go

@@ -474,7 +474,11 @@ type ConfigMapKeyReference struct {
 // +k8s:openapi-gen=true
 type StreamAggrConfig struct {
 	// Stream aggregation rules
+	// +optional
 	Rules []StreamAggrRule `json:"rules"`
+	// ConfigMap with stream aggregation rules
+	// +optional
+	RuleConfigMap *v1.ConfigMapKeySelector `json:"configmap,omitempty"`
 	// Allows writing both raw and aggregate data
 	// +optional
 	KeepInput bool `json:"keepInput,omitempty"`
@@ -484,6 +488,13 @@ type StreamAggrConfig struct {
 	// Allows setting different de-duplication intervals per each configured remote storage
 	// +optional
 	DedupInterval string `json:"dedupInterval,omitempty"`
+	// labels to drop from samples for aggregator before stream de-duplication and aggregation
+	// +optional
+	DropInputLabels      []string `json:"dropInputLabels,omitempty"`
+	IgnoreFirstIntervals int      `json:"ignoreFirstIntervals,omitempty"`
+	// IgnoreOldSamples instructs to ignore samples with old timestamps outside the current aggregation interval.
+	// +optional
+	IgnoreOldSamples bool `json:"ignoreOldSamples,omitempty"`
 }
 
 // StreamAggrRule defines the rule in stream aggregation config
@@ -570,6 +581,8 @@ type StreamAggrRule struct {
 	// +optional
 	Without []string `json:"without,omitempty" yaml:"without,omitempty"`
 
+	IgnoreFirstIntervals *int `json:"ignore_first_intervals,omitempty" yaml:"ignore_first_intervals,omitempty"`
+
 	// DropInputLabels is an optional list with labels, which must be dropped before further processing of input samples.
 	//
 	// Labels are dropped before de-duplication and aggregation.
@@ -587,6 +600,18 @@ type StreamAggrRule struct {
 	OutputRelabelConfigs []RelabelConfig `json:"output_relabel_configs,omitempty" yaml:"output_relabel_configs,omitempty"`
 }
 
+// HasStreamAggr returns true if stream aggregation is enabled for this remoteWrite
+// func (rw *VMAgentRemoteWriteSpec) HasStreamAggr() bool {
+// 	return rw.StreamAggrConfig != nil
+// }
+
+func (config *StreamAggrConfig) HasStreamAggrConfig() bool {
+	if config != nil && (len(config.Rules) > 0 || config.RuleConfigMap != nil) {
+		return true
+	}
+	return false
+}
+
 // KeyValue defines a (key, value) tuple.
 // +kubebuilder:object:generate=false
 // +k8s:openapi-gen=false

api/operator/v1beta1/vmsingle_types.go

@@ -214,7 +214,7 @@ type VMSingleSpec struct {
 
 // HasStreamAggrConfig checks if streamAggrConfig present
 func (cr *VMSingle) HasStreamAggrConfig() bool {
-	return cr.Spec.StreamAggrConfig != nil && len(cr.Spec.StreamAggrConfig.Rules) > 0
+	return cr.Spec.StreamAggrConfig.HasStreamAggrConfig()
 }
 
 // UnmarshalJSON implements json.Unmarshaler interface