Skip to content

Commit d451e23

Browse files
jatinsuperiklis
andauthored
feat(operator): Add support for the volume API (#13369)
Co-authored-by: Periklis Tsirakidis <[email protected]>
1 parent c822c3a commit d451e23

16 files changed

+196
-3
lines changed

operator/apis/loki/v1/lokistack_types.go

+7
Original file line numberDiff line numberDiff line change
@@ -643,6 +643,13 @@ type QueryLimitSpec struct {
643643
// +kubebuilder:validation:Optional
644644
// +operator-sdk:csv:customresourcedefinitions:type=spec,xDescriptors="urn:alm:descriptor:com.tectonic.ui:number",displayName="Cardinality Limit"
645645
CardinalityLimit int32 `json:"cardinalityLimit,omitempty"`
646+
647+
// MaxVolumeSeries defines the maximum number of aggregated series in a log-volume response
648+
//
649+
// +optional
650+
// +kubebuilder:validation:Optional
651+
// +operator-sdk:csv:customresourcedefinitions:type=spec,xDescriptors="urn:alm:descriptor:com.tectonic.ui:number",displayName="Max Volume Series"
652+
MaxVolumeSeries int32 `json:"maxVolumeSeries,omitempty"`
646653
}
647654

648655
// BlockedQueryType defines which type of query a blocked query should apply to.

operator/bundle/community-openshift/manifests/loki-operator.clusterserviceversion.yaml

+13-1
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ metadata:
150150
categories: OpenShift Optional, Logging & Tracing
151151
certified: "false"
152152
containerImage: docker.io/grafana/loki-operator:0.6.1
153-
createdAt: "2024-06-12T17:07:27Z"
153+
createdAt: "2024-07-02T16:13:52Z"
154154
description: The Community Loki Operator provides Kubernetes native deployment
155155
and management of Loki and related logging components.
156156
features.operators.openshift.io/disconnected: "true"
@@ -384,6 +384,12 @@ spec:
384384
path: limits.global.queries.maxQuerySeries
385385
x-descriptors:
386386
- urn:alm:descriptor:com.tectonic.ui:number
387+
- description: MaxVolumeSeries defines the maximum number of aggregated series
388+
in a log-volume response
389+
displayName: Max Volume Series
390+
path: limits.global.queries.maxVolumeSeries
391+
x-descriptors:
392+
- urn:alm:descriptor:com.tectonic.ui:number
387393
- description: Timeout when querying ingesters or storage during the execution
388394
of a query request.
389395
displayName: Query Timeout
@@ -495,6 +501,12 @@ spec:
495501
path: limits.tenants.queries.maxQuerySeries
496502
x-descriptors:
497503
- urn:alm:descriptor:com.tectonic.ui:number
504+
- description: MaxVolumeSeries defines the maximum number of aggregated series
505+
in a log-volume response
506+
displayName: Max Volume Series
507+
path: limits.tenants.queries.maxVolumeSeries
508+
x-descriptors:
509+
- urn:alm:descriptor:com.tectonic.ui:number
498510
- description: Timeout when querying ingesters or storage during the execution
499511
of a query request.
500512
displayName: Query Timeout

operator/bundle/community-openshift/manifests/loki.grafana.com_lokistacks.yaml

+10
Original file line numberDiff line numberDiff line change
@@ -191,6 +191,11 @@ spec:
191191
that is returned by a metric query.
192192
format: int32
193193
type: integer
194+
maxVolumeSeries:
195+
description: MaxVolumeSeries defines the maximum number
196+
of aggregated series in a log-volume response
197+
format: int32
198+
type: integer
194199
queryTimeout:
195200
default: 3m
196201
description: Timeout when querying ingesters or storage
@@ -366,6 +371,11 @@ spec:
366371
that is returned by a metric query.
367372
format: int32
368373
type: integer
374+
maxVolumeSeries:
375+
description: MaxVolumeSeries defines the maximum number
376+
of aggregated series in a log-volume response
377+
format: int32
378+
type: integer
369379
queryTimeout:
370380
default: 3m
371381
description: Timeout when querying ingesters or storage

operator/bundle/community/manifests/loki-operator.clusterserviceversion.yaml

+13-1
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ metadata:
150150
categories: OpenShift Optional, Logging & Tracing
151151
certified: "false"
152152
containerImage: docker.io/grafana/loki-operator:0.6.1
153-
createdAt: "2024-06-12T17:07:25Z"
153+
createdAt: "2024-07-02T16:13:50Z"
154154
description: The Community Loki Operator provides Kubernetes native deployment
155155
and management of Loki and related logging components.
156156
operators.operatorframework.io/builder: operator-sdk-unknown
@@ -377,6 +377,12 @@ spec:
377377
path: limits.global.queries.maxQuerySeries
378378
x-descriptors:
379379
- urn:alm:descriptor:com.tectonic.ui:number
380+
- description: MaxVolumeSeries defines the maximum number of aggregated series
381+
in a log-volume response
382+
displayName: Max Volume Series
383+
path: limits.global.queries.maxVolumeSeries
384+
x-descriptors:
385+
- urn:alm:descriptor:com.tectonic.ui:number
380386
- description: Timeout when querying ingesters or storage during the execution
381387
of a query request.
382388
displayName: Query Timeout
@@ -488,6 +494,12 @@ spec:
488494
path: limits.tenants.queries.maxQuerySeries
489495
x-descriptors:
490496
- urn:alm:descriptor:com.tectonic.ui:number
497+
- description: MaxVolumeSeries defines the maximum number of aggregated series
498+
in a log-volume response
499+
displayName: Max Volume Series
500+
path: limits.tenants.queries.maxVolumeSeries
501+
x-descriptors:
502+
- urn:alm:descriptor:com.tectonic.ui:number
491503
- description: Timeout when querying ingesters or storage during the execution
492504
of a query request.
493505
displayName: Query Timeout

operator/bundle/community/manifests/loki.grafana.com_lokistacks.yaml

+10
Original file line numberDiff line numberDiff line change
@@ -191,6 +191,11 @@ spec:
191191
that is returned by a metric query.
192192
format: int32
193193
type: integer
194+
maxVolumeSeries:
195+
description: MaxVolumeSeries defines the maximum number
196+
of aggregated series in a log-volume response
197+
format: int32
198+
type: integer
194199
queryTimeout:
195200
default: 3m
196201
description: Timeout when querying ingesters or storage
@@ -366,6 +371,11 @@ spec:
366371
that is returned by a metric query.
367372
format: int32
368373
type: integer
374+
maxVolumeSeries:
375+
description: MaxVolumeSeries defines the maximum number
376+
of aggregated series in a log-volume response
377+
format: int32
378+
type: integer
369379
queryTimeout:
370380
default: 3m
371381
description: Timeout when querying ingesters or storage

operator/bundle/openshift/manifests/loki-operator.clusterserviceversion.yaml

+13-1
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ metadata:
150150
categories: OpenShift Optional, Logging & Tracing
151151
certified: "false"
152152
containerImage: quay.io/openshift-logging/loki-operator:0.1.0
153-
createdAt: "2024-06-12T17:07:29Z"
153+
createdAt: "2024-07-02T16:13:54Z"
154154
description: |
155155
The Loki Operator for OCP provides a means for configuring and managing a Loki stack for cluster logging.
156156
## Prerequisites and Requirements
@@ -397,6 +397,12 @@ spec:
397397
path: limits.global.queries.maxQuerySeries
398398
x-descriptors:
399399
- urn:alm:descriptor:com.tectonic.ui:number
400+
- description: MaxVolumeSeries defines the maximum number of aggregated series
401+
in a log-volume response
402+
displayName: Max Volume Series
403+
path: limits.global.queries.maxVolumeSeries
404+
x-descriptors:
405+
- urn:alm:descriptor:com.tectonic.ui:number
400406
- description: Timeout when querying ingesters or storage during the execution
401407
of a query request.
402408
displayName: Query Timeout
@@ -508,6 +514,12 @@ spec:
508514
path: limits.tenants.queries.maxQuerySeries
509515
x-descriptors:
510516
- urn:alm:descriptor:com.tectonic.ui:number
517+
- description: MaxVolumeSeries defines the maximum number of aggregated series
518+
in a log-volume response
519+
displayName: Max Volume Series
520+
path: limits.tenants.queries.maxVolumeSeries
521+
x-descriptors:
522+
- urn:alm:descriptor:com.tectonic.ui:number
511523
- description: Timeout when querying ingesters or storage during the execution
512524
of a query request.
513525
displayName: Query Timeout

operator/bundle/openshift/manifests/loki.grafana.com_lokistacks.yaml

+10
Original file line numberDiff line numberDiff line change
@@ -191,6 +191,11 @@ spec:
191191
that is returned by a metric query.
192192
format: int32
193193
type: integer
194+
maxVolumeSeries:
195+
description: MaxVolumeSeries defines the maximum number
196+
of aggregated series in a log-volume response
197+
format: int32
198+
type: integer
194199
queryTimeout:
195200
default: 3m
196201
description: Timeout when querying ingesters or storage
@@ -366,6 +371,11 @@ spec:
366371
that is returned by a metric query.
367372
format: int32
368373
type: integer
374+
maxVolumeSeries:
375+
description: MaxVolumeSeries defines the maximum number
376+
of aggregated series in a log-volume response
377+
format: int32
378+
type: integer
369379
queryTimeout:
370380
default: 3m
371381
description: Timeout when querying ingesters or storage

operator/config/crd/bases/loki.grafana.com_lokistacks.yaml

+10
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,11 @@ spec:
173173
that is returned by a metric query.
174174
format: int32
175175
type: integer
176+
maxVolumeSeries:
177+
description: MaxVolumeSeries defines the maximum number
178+
of aggregated series in a log-volume response
179+
format: int32
180+
type: integer
176181
queryTimeout:
177182
default: 3m
178183
description: Timeout when querying ingesters or storage
@@ -348,6 +353,11 @@ spec:
348353
that is returned by a metric query.
349354
format: int32
350355
type: integer
356+
maxVolumeSeries:
357+
description: MaxVolumeSeries defines the maximum number
358+
of aggregated series in a log-volume response
359+
format: int32
360+
type: integer
351361
queryTimeout:
352362
default: 3m
353363
description: Timeout when querying ingesters or storage

operator/config/manifests/community-openshift/bases/loki-operator.clusterserviceversion.yaml

+12
Original file line numberDiff line numberDiff line change
@@ -297,6 +297,12 @@ spec:
297297
path: limits.global.queries.maxQuerySeries
298298
x-descriptors:
299299
- urn:alm:descriptor:com.tectonic.ui:number
300+
- description: MaxVolumeSeries defines the maximum number of aggregated series
301+
in a log-volume response
302+
displayName: Max Volume Series
303+
path: limits.global.queries.maxVolumeSeries
304+
x-descriptors:
305+
- urn:alm:descriptor:com.tectonic.ui:number
300306
- description: Timeout when querying ingesters or storage during the execution
301307
of a query request.
302308
displayName: Query Timeout
@@ -408,6 +414,12 @@ spec:
408414
path: limits.tenants.queries.maxQuerySeries
409415
x-descriptors:
410416
- urn:alm:descriptor:com.tectonic.ui:number
417+
- description: MaxVolumeSeries defines the maximum number of aggregated series
418+
in a log-volume response
419+
displayName: Max Volume Series
420+
path: limits.tenants.queries.maxVolumeSeries
421+
x-descriptors:
422+
- urn:alm:descriptor:com.tectonic.ui:number
411423
- description: Timeout when querying ingesters or storage during the execution
412424
of a query request.
413425
displayName: Query Timeout

operator/config/manifests/community/bases/loki-operator.clusterserviceversion.yaml

+12
Original file line numberDiff line numberDiff line change
@@ -290,6 +290,12 @@ spec:
290290
path: limits.global.queries.maxQuerySeries
291291
x-descriptors:
292292
- urn:alm:descriptor:com.tectonic.ui:number
293+
- description: MaxVolumeSeries defines the maximum number of aggregated series
294+
in a log-volume response
295+
displayName: Max Volume Series
296+
path: limits.global.queries.maxVolumeSeries
297+
x-descriptors:
298+
- urn:alm:descriptor:com.tectonic.ui:number
293299
- description: Timeout when querying ingesters or storage during the execution
294300
of a query request.
295301
displayName: Query Timeout
@@ -401,6 +407,12 @@ spec:
401407
path: limits.tenants.queries.maxQuerySeries
402408
x-descriptors:
403409
- urn:alm:descriptor:com.tectonic.ui:number
410+
- description: MaxVolumeSeries defines the maximum number of aggregated series
411+
in a log-volume response
412+
displayName: Max Volume Series
413+
path: limits.tenants.queries.maxVolumeSeries
414+
x-descriptors:
415+
- urn:alm:descriptor:com.tectonic.ui:number
404416
- description: Timeout when querying ingesters or storage during the execution
405417
of a query request.
406418
displayName: Query Timeout

operator/config/manifests/openshift/bases/loki-operator.clusterserviceversion.yaml

+12
Original file line numberDiff line numberDiff line change
@@ -309,6 +309,12 @@ spec:
309309
path: limits.global.queries.maxQuerySeries
310310
x-descriptors:
311311
- urn:alm:descriptor:com.tectonic.ui:number
312+
- description: MaxVolumeSeries defines the maximum number of aggregated series
313+
in a log-volume response
314+
displayName: Max Volume Series
315+
path: limits.global.queries.maxVolumeSeries
316+
x-descriptors:
317+
- urn:alm:descriptor:com.tectonic.ui:number
312318
- description: Timeout when querying ingesters or storage during the execution
313319
of a query request.
314320
displayName: Query Timeout
@@ -420,6 +426,12 @@ spec:
420426
path: limits.tenants.queries.maxQuerySeries
421427
x-descriptors:
422428
- urn:alm:descriptor:com.tectonic.ui:number
429+
- description: MaxVolumeSeries defines the maximum number of aggregated series
430+
in a log-volume response
431+
displayName: Max Volume Series
432+
path: limits.tenants.queries.maxVolumeSeries
433+
x-descriptors:
434+
- urn:alm:descriptor:com.tectonic.ui:number
423435
- description: Timeout when querying ingesters or storage during the execution
424436
of a query request.
425437
displayName: Query Timeout

operator/docs/operator/api.md

+12
Original file line numberDiff line numberDiff line change
@@ -3165,6 +3165,18 @@ int32
31653165
<p>CardinalityLimit defines the cardinality limit for index queries.</p>
31663166
</td>
31673167
</tr>
3168+
<tr>
3169+
<td>
3170+
<code>maxVolumeSeries</code><br/>
3171+
<em>
3172+
int32
3173+
</em>
3174+
</td>
3175+
<td>
3176+
<em>(Optional)</em>
3177+
<p>MaxVolumeSeries defines the maximum number of aggregated series in a log-volume response</p>
3178+
</td>
3179+
</tr>
31683180
</tbody>
31693181
</table>
31703182

0 commit comments

Comments
 (0)