Merge pull request #366 from frezes/feat/addPromqlEngineSwitch

add PromqlEngine switch
WizTelemetry · Sep 19, 2023 · a9e7af7 · a9e7af7
2 parents 20892e2 + 5c845d8
commit a9e7af7
Show file tree

Hide file tree

Showing 9 changed files with 93 additions and 1 deletion.
diff --git a/charts/whizard/Chart.yaml b/charts/whizard/Chart.yaml
@@ -14,5 +14,5 @@ maintainers:
     email: [email protected]
   - name: junot
     email: [email protected]
-version: 0.9.3
+version: 0.9.4
 appVersion: "latest"
diff --git a/charts/whizard/crds/monitoring.whizard.io_queries.yaml b/charts/whizard/crds/monitoring.whizard.io_queries.yaml
@@ -1008,6 +1008,8 @@ spec:
                   type: string
                 description: Define which Nodes the Pods are scheduled on.
                 type: object
+              promqlEngine:
+                type: string
               replicaLabelNames:
                 description: Labels to treat as a replica indicator along which data
                   is deduplicated.

diff --git a/charts/whizard/templates/query/query.yaml b/charts/whizard/templates/query/query.yaml
@@ -19,6 +19,10 @@ spec:
   {{- end }}
   replicas: {{ .Values.query.replicas }}
 
+  {{- if .Values.query.promqlEngine }}
+  promqlEngine: {{ .Values.query.promqlEngine }}
+  {{- end }}
+
   {{- with .Values.query.nodeSelector }}
   nodeSelector:
     {{- toYaml . | nindent 4 }}

diff --git a/charts/whizard/values.yaml b/charts/whizard/values.yaml
@@ -435,6 +435,8 @@ query:
     # repository: thanosio/thanos
     # tag: v0.28.0
 
+  promqlEngine: thanos
+
   resources: {}
   securityContext: {}
   nodeSelector: {}

diff --git a/config/bundle.yaml b/config/bundle.yaml
@@ -3285,6 +3285,8 @@ spec:
                   type: string
                 description: Define which Nodes the Pods are scheduled on.
                 type: object
+              promqlEngine:
+                type: string
               replicaLabelNames:
                 description: Labels to treat as a replica indicator along which data is deduplicated.
                 items:

diff --git a/config/crd/bases/monitoring.whizard.io_queries.yaml b/config/crd/bases/monitoring.whizard.io_queries.yaml
@@ -1008,6 +1008,8 @@ spec:
                   type: string
                 description: Define which Nodes the Pods are scheduled on.
                 type: object
+              promqlEngine:
+                type: string
               replicaLabelNames:
                 description: Labels to treat as a replica indicator along which data
                   is deduplicated.

diff --git a/pkg/api/monitoring/v1alpha1/types.go b/pkg/api/monitoring/v1alpha1/types.go
@@ -238,6 +238,8 @@ type QuerySpec struct {
 
 	HTTPServerTLSConfig *HTTPServerTLSConfig `json:"httpServerTLSConfig,omitempty"`
 
+	PromqlEngine string `json:"promqlEngine,omitempty"`
+
 	// Additional StoreApi servers from which Query component queries from
 	Stores []QueryStores `json:"stores,omitempty"`
 	// Selector labels that will be exposed in info endpoint.

diff --git a/pkg/api/monitoring/v1alpha1/zz_generated.deepcopy.go b/pkg/api/monitoring/v1alpha1/zz_generated.deepcopy.go
diff --git a/pkg/controllers/monitoring/resources/query/deployment.go b/pkg/controllers/monitoring/resources/query/deployment.go
@@ -157,6 +157,10 @@ func (q *Query) deployment() (runtime.Object, resources.Operation, error) {
 		d.Spec.Template.Spec.Volumes = append(d.Spec.Template.Spec.Volumes, volumes...)
 	}
 
+	if q.query.Spec.PromqlEngine != "" {
+		queryContainer.Args = append(queryContainer.Args, "--query.promql-engine="+q.query.Spec.PromqlEngine)
+	}
+
 	if q.query.Spec.LogLevel != "" {
 		queryContainer.Args = append(queryContainer.Args, "--log.level="+q.query.Spec.LogLevel)
 	}