refactor promconverter

Author: AndrewChubatiuk

Makefile

@@ -399,7 +399,7 @@ CONTROLLER_TOOLS_VERSION ?= v0.20.1
 ENVTEST_VERSION ?= release-0.23
 GOLANGCI_LINT_VERSION ?= v2.10.1
 CODEGENERATOR_VERSION ?= v0.35.1
-KIND_VERSION ?= 89ff06bd25f016e095a4045ca0704ef1330a2dbc
+KIND_VERSION ?= v0.31.0
 OLM_VERSION ?= 0.40.0
 OPERATOR_SDK_VERSION ?= v1.42.0
 OPM_VERSION ?= v1.63.0

api/operator/v1beta1/vmextra_types.go

@@ -45,6 +45,21 @@ const (
 	ClusterComponentStorage  ClusterComponent = "storage"
 )
 
+type MetadataStrategy string
+
+const (
+	// MetadataStrategyPreferVM - prefers VM object meta values, ignores prometheus
+	MetadataStrategyPreferVM MetadataStrategy = "prefer-victoriametrics"
+	// MetadataStrategyPreferProm - prefers prometheus
+	MetadataStrategyPreferProm MetadataStrategy = "prefer-prometheus"
+	// MetadataStrategyMergeVMPriority merges both label sets
+	// its not possible to remove values
+	MetadataStrategyMergeVMPriority MetadataStrategy = "merge-victoriametrics-priority"
+	// MetadataStrategyMergePromPriority merges both label sets
+	// its not possible to remove values
+	MetadataStrategyMergePromPriority MetadataStrategy = "merge-prometheus-priority"
+)
+
 const (
 	httpPathPrefixFlag  = "http.pathPrefix"
 	reloadAuthKeyFlag   = "reloadAuthKey"
@@ -70,6 +85,19 @@ const (
 	VMAuthLBServiceProxyTargetLabel  = "operator.victoriametrics.com/vmauthlb-proxy-name"
 	VMAuthLBServiceProxyJobNameLabel = "operator.victoriametrics.com/vmauthlb-proxy-job-name"
 	KubeNodeEnvName                  = "KUBE_NODE_NAME"
+	// IgnoreConversionLabel this annotation disables updating of corresponding VMObject
+	// must be added to annotation of VMObject
+	// annotations:
+	// operator.victoriametrics.com/ignore-prometheus-updates: enabled
+	IgnoreConversionLabel = "operator.victoriametrics.com/ignore-prometheus-updates"
+	// IgnoreConversion - disables updates from prometheus api
+	IgnoreConversion = "enabled"
+	// MetadataStrategyLabel merge strategy by default prefer prometheus meta labels
+	// but with annotation value added to VMObject:
+	// annotations:
+	//   operator.victoriametrics.com/merge-api-strategy: prefer-victoriametrics
+	// metadata from VMObject will be preferred during merge
+	MetadataStrategyLabel = "operator.victoriametrics.com/merge-meta-strategy"
 )
 
 const (

docs/api.md

@@ -2552,6 +2552,8 @@ Appears in: [VLAgentSpec](#vlagentspec), [VLClusterSpec](#vlclusterspec), [VLSin
 | labels<a href="#managedobjectsmetadata-labels" id="managedobjectsmetadata-labels">#</a><br/>_object (keys:string, values:string)_ | _(Required)_<br/>Labels Map of string keys and values that can be used to organize and categorize<br />(scope and select) objects.<br />More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels |
 
 
+
+
 #### NamespaceDiscovery
 
 

internal/config/config.go

@@ -523,7 +523,7 @@ type BaseOperatorConf struct {
 
 	EnabledPrometheusConverter struct {
 		PodMonitor         bool `default:"true" env:"PODMONITOR"`
-		ServiceScrape      bool `default:"true" env:"SERVICESCRAPE"`
+		ServiceMonitor     bool `default:"true" env:"SERVICESCRAPE"`
 		PrometheusRule     bool `default:"true" env:"PROMETHEUSRULE"`
 		Probe              bool `default:"true" env:"PROBE"`
 		AlertmanagerConfig bool `default:"true" env:"ALERTMANAGERCONFIG"`

internal/controller/operator/controllers.go

@@ -63,11 +63,16 @@ var (
 		Name: "operator_controller_reconcile_errors_total",
 		Help: "Counts number context.Canceled errors",
 	})
+	activeConverterWatchers = prometheus.NewGaugeVec(prometheus.GaugeOpts{
+		Name: "operator_prometheus_converter_active_watchers",
+	}, []string{"object_type_name"})
 )
 
 // InitMetrics adds metrics to the Registry
 func init() {
-	metrics.Registry.MustRegister(parseObjectErrorsTotal, getObjectsErrorsTotal, conflictErrorsTotal, contextCancelErrorsTotal)
+	metrics.Registry.MustRegister(
+		parseObjectErrorsTotal, getObjectsErrorsTotal, conflictErrorsTotal,
+		contextCancelErrorsTotal, activeConverterWatchers)
 }
 
 func getDefaultOptions() controller.Options {

internal/controller/operator/converter/apis.go

@@ -21,8 +21,8 @@ const (
 
 var log = logf.Log.WithName("controller.PrometheusConverter")
 
-// ConvertPromRule creates VMRule from PrometheusRule
-func ConvertPromRule(prom *promv1.PrometheusRule, conf *config.BaseOperatorConf) *vmv1beta1.VMRule {
+// PrometheusRule creates VMRule from PrometheusRule
+func PrometheusRule(prom *promv1.PrometheusRule, conf *config.BaseOperatorConf) *vmv1beta1.VMRule {
 	ruleGroups := make([]vmv1beta1.RuleGroup, 0, len(prom.Spec.Groups))
 	for _, promGroup := range prom.Spec.Groups {
 		ruleItems := make([]vmv1beta1.Rule, 0, len(promGroup.Rules))
@@ -100,8 +100,8 @@ func MaybeAddArgoCDIgnoreAnnotations(mustAdd bool, dst map[string]string) map[st
 	return dst
 }
 
-// ConvertServiceMonitor create VMServiceScrape from ServiceMonitor
-func ConvertServiceMonitor(serviceMon *promv1.ServiceMonitor, conf *config.BaseOperatorConf) *vmv1beta1.VMServiceScrape {
+// ServiceMonitor create VMServiceScrape from ServiceMonitor
+func ServiceMonitor(serviceMon *promv1.ServiceMonitor, conf *config.BaseOperatorConf) *vmv1beta1.VMServiceScrape {
 	cs := &vmv1beta1.VMServiceScrape{
 		ObjectMeta: metav1.ObjectMeta{
 			Name:        serviceMon.Name,
@@ -383,8 +383,8 @@ func convertPodEndpoints(promPodEnpoints []promv1.PodMetricsEndpoint) []vmv1beta
 	return endPoints
 }
 
-// ConvertPodMonitor create VMPodScrape from PodMonitor
-func ConvertPodMonitor(podMon *promv1.PodMonitor, conf *config.BaseOperatorConf) *vmv1beta1.VMPodScrape {
+// PodMonitor create VMPodScrape from PodMonitor
+func PodMonitor(podMon *promv1.PodMonitor, conf *config.BaseOperatorConf) *vmv1beta1.VMPodScrape {
 	cs := &vmv1beta1.VMPodScrape{
 		ObjectMeta: metav1.ObjectMeta{
 			Name:        podMon.Name,
@@ -428,8 +428,8 @@ func ConvertPodMonitor(podMon *promv1.PodMonitor, conf *config.BaseOperatorConf)
 	return cs
 }
 
-// ConvertProbe creates VMProbe from prometheus probe
-func ConvertProbe(probe *promv1.Probe, conf *config.BaseOperatorConf) *vmv1beta1.VMProbe {
+// Probe creates VMProbe from prometheus probe
+func Probe(probe *promv1.Probe, conf *config.BaseOperatorConf) *vmv1beta1.VMProbe {
 	var (
 		k8sTargets    []*vmv1beta1.VMProbeTargetKubernetes
 		staticTargets *vmv1beta1.VMProbeTargetStatic