Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(operator): Add support for the volume API #13369

Merged
merged 14 commits into from
Jul 3, 2024
+196 −3
Merged

feat(operator): Add support for the volume API #13369

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
9c34efa
Enabled the volume API and added a limiter to it
jatinsu Jul 1, 2024
f2f102e
Added volume to lokistack types
jatinsu Jul 2, 2024
072e6bf
Merge branch 'main' into main
jatinsu Jul 2, 2024
db04dc4
Updated testing to reflect the addition of the volume API
jatinsu Jul 2, 2024
f51fba0
Merge branch 'main' of https://github.com/jatinsu/loki
jatinsu Jul 2, 2024
38d6ea6
Added CRD variable
jatinsu Jul 2, 2024
e771653
COmmited make bundle-all
jatinsu Jul 2, 2024
845ae3f
Added default values to sizes.go
jatinsu Jul 2, 2024
1e7ebc7
Updated tests for MaxVolulmeSeries
jatinsu Jul 2, 2024
b2c0081
Added MaxVolumeSeries to loki-runtime-config
jatinsu Jul 2, 2024
26c1077
Update operator/internal/manifests/internal/config/loki-runtime-confi…
jatinsu Jul 2, 2024
8ebb947
Ran api.md and fmt for linter
jatinsu Jul 2, 2024
41e5a27
Merge branch 'main' of https://github.com/jatinsu/loki
jatinsu Jul 2, 2024
a005784
Hopefully fixed docs
jatinsu Jul 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions operator/apis/loki/v1/lokistack_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -643,6 +643,13 @@ type QueryLimitSpec struct {
// +kubebuilder:validation:Optional
// +operator-sdk:csv:customresourcedefinitions:type=spec,xDescriptors="urn:alm:descriptor:com.tectonic.ui:number",displayName="Cardinality Limit"
CardinalityLimit int32 `json:"cardinalityLimit,omitempty"`

// MaxVolumeSeries defines the maximum number of aggregated series in a log-volume response
//
// +optional
// +kubebuilder:validation:Optional
// +operator-sdk:csv:customresourcedefinitions:type=spec,xDescriptors="urn:alm:descriptor:com.tectonic.ui:number",displayName="Max Volume Series"
MaxVolumeSeries int32 `json:"maxVolumeSeries,omitempty"`
}

// BlockedQueryType defines which type of query a blocked query should apply to.
Expand Down
14 changes: 13 additions & 1 deletion operator/bundle/community-openshift/manifests/loki-operator.clusterserviceversion.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ metadata:
categories: OpenShift Optional, Logging & Tracing
certified: "false"
containerImage: docker.io/grafana/loki-operator:0.6.1
createdAt: "2024-06-12T17:07:27Z"
createdAt: "2024-07-02T16:13:52Z"
description: The Community Loki Operator provides Kubernetes native deployment
and management of Loki and related logging components.
features.operators.openshift.io/disconnected: "true"
Expand Down Expand Up @@ -384,6 +384,12 @@ spec:
path: limits.global.queries.maxQuerySeries
x-descriptors:
- urn:alm:descriptor:com.tectonic.ui:number
- description: MaxVolumeSeries defines the maximum number of aggregated series
in a log-volume response
displayName: Max Volume Series
path: limits.global.queries.maxVolumeSeries
x-descriptors:
- urn:alm:descriptor:com.tectonic.ui:number
- description: Timeout when querying ingesters or storage during the execution
of a query request.
displayName: Query Timeout
Expand Down Expand Up @@ -495,6 +501,12 @@ spec:
path: limits.tenants.queries.maxQuerySeries
x-descriptors:
- urn:alm:descriptor:com.tectonic.ui:number
- description: MaxVolumeSeries defines the maximum number of aggregated series
in a log-volume response
displayName: Max Volume Series
path: limits.tenants.queries.maxVolumeSeries
x-descriptors:
- urn:alm:descriptor:com.tectonic.ui:number
- description: Timeout when querying ingesters or storage during the execution
of a query request.
displayName: Query Timeout
Expand Down
10 changes: 10 additions & 0 deletions operator/bundle/community-openshift/manifests/loki.grafana.com_lokistacks.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,11 @@ spec:
that is returned by a metric query.
format: int32
type: integer
maxVolumeSeries:
description: MaxVolumeSeries defines the maximum number
of aggregated series in a log-volume response
format: int32
type: integer
queryTimeout:
default: 3m
description: Timeout when querying ingesters or storage
Expand Down Expand Up @@ -366,6 +371,11 @@ spec:
that is returned by a metric query.
format: int32
type: integer
maxVolumeSeries:
description: MaxVolumeSeries defines the maximum number
of aggregated series in a log-volume response
format: int32
type: integer
queryTimeout:
default: 3m
description: Timeout when querying ingesters or storage
Expand Down
14 changes: 13 additions & 1 deletion operator/bundle/community/manifests/loki-operator.clusterserviceversion.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ metadata:
categories: OpenShift Optional, Logging & Tracing
certified: "false"
containerImage: docker.io/grafana/loki-operator:0.6.1
createdAt: "2024-06-12T17:07:25Z"
createdAt: "2024-07-02T16:13:50Z"
description: The Community Loki Operator provides Kubernetes native deployment
and management of Loki and related logging components.
operators.operatorframework.io/builder: operator-sdk-unknown
Expand Down Expand Up @@ -377,6 +377,12 @@ spec:
path: limits.global.queries.maxQuerySeries
x-descriptors:
- urn:alm:descriptor:com.tectonic.ui:number
- description: MaxVolumeSeries defines the maximum number of aggregated series
in a log-volume response
displayName: Max Volume Series
path: limits.global.queries.maxVolumeSeries
x-descriptors:
- urn:alm:descriptor:com.tectonic.ui:number
- description: Timeout when querying ingesters or storage during the execution
of a query request.
displayName: Query Timeout
Expand Down Expand Up @@ -488,6 +494,12 @@ spec:
path: limits.tenants.queries.maxQuerySeries
x-descriptors:
- urn:alm:descriptor:com.tectonic.ui:number
- description: MaxVolumeSeries defines the maximum number of aggregated series
in a log-volume response
displayName: Max Volume Series
path: limits.tenants.queries.maxVolumeSeries
x-descriptors:
- urn:alm:descriptor:com.tectonic.ui:number
- description: Timeout when querying ingesters or storage during the execution
of a query request.
displayName: Query Timeout
Expand Down
10 changes: 10 additions & 0 deletions operator/bundle/community/manifests/loki.grafana.com_lokistacks.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,11 @@ spec:
that is returned by a metric query.
format: int32
type: integer
maxVolumeSeries:
description: MaxVolumeSeries defines the maximum number
of aggregated series in a log-volume response
format: int32
type: integer
queryTimeout:
default: 3m
description: Timeout when querying ingesters or storage
Expand Down Expand Up @@ -366,6 +371,11 @@ spec:
that is returned by a metric query.
format: int32
type: integer
maxVolumeSeries:
description: MaxVolumeSeries defines the maximum number
of aggregated series in a log-volume response
format: int32
type: integer
queryTimeout:
default: 3m
description: Timeout when querying ingesters or storage
Expand Down
14 changes: 13 additions & 1 deletion operator/bundle/openshift/manifests/loki-operator.clusterserviceversion.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ metadata:
categories: OpenShift Optional, Logging & Tracing
certified: "false"
containerImage: quay.io/openshift-logging/loki-operator:0.1.0
createdAt: "2024-06-12T17:07:29Z"
createdAt: "2024-07-02T16:13:54Z"
description: |
The Loki Operator for OCP provides a means for configuring and managing a Loki stack for cluster logging.
## Prerequisites and Requirements
Expand Down Expand Up @@ -397,6 +397,12 @@ spec:
path: limits.global.queries.maxQuerySeries
x-descriptors:
- urn:alm:descriptor:com.tectonic.ui:number
- description: MaxVolumeSeries defines the maximum number of aggregated series
in a log-volume response
displayName: Max Volume Series
path: limits.global.queries.maxVolumeSeries
x-descriptors:
- urn:alm:descriptor:com.tectonic.ui:number
- description: Timeout when querying ingesters or storage during the execution
of a query request.
displayName: Query Timeout
Expand Down Expand Up @@ -508,6 +514,12 @@ spec:
path: limits.tenants.queries.maxQuerySeries
x-descriptors:
- urn:alm:descriptor:com.tectonic.ui:number
- description: MaxVolumeSeries defines the maximum number of aggregated series
in a log-volume response
displayName: Max Volume Series
path: limits.tenants.queries.maxVolumeSeries
x-descriptors:
- urn:alm:descriptor:com.tectonic.ui:number
- description: Timeout when querying ingesters or storage during the execution
of a query request.
displayName: Query Timeout
Expand Down
10 changes: 10 additions & 0 deletions operator/bundle/openshift/manifests/loki.grafana.com_lokistacks.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,11 @@ spec:
that is returned by a metric query.
format: int32
type: integer
maxVolumeSeries:
description: MaxVolumeSeries defines the maximum number
of aggregated series in a log-volume response
format: int32
type: integer
queryTimeout:
default: 3m
description: Timeout when querying ingesters or storage
Expand Down Expand Up @@ -366,6 +371,11 @@ spec:
that is returned by a metric query.
format: int32
type: integer
maxVolumeSeries:
description: MaxVolumeSeries defines the maximum number
of aggregated series in a log-volume response
format: int32
type: integer
queryTimeout:
default: 3m
description: Timeout when querying ingesters or storage
Expand Down
10 changes: 10 additions & 0 deletions operator/config/crd/bases/loki.grafana.com_lokistacks.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,11 @@ spec:
that is returned by a metric query.
format: int32
type: integer
maxVolumeSeries:
description: MaxVolumeSeries defines the maximum number
of aggregated series in a log-volume response
format: int32
type: integer
queryTimeout:
default: 3m
description: Timeout when querying ingesters or storage
Expand Down Expand Up @@ -348,6 +353,11 @@ spec:
that is returned by a metric query.
format: int32
type: integer
maxVolumeSeries:
description: MaxVolumeSeries defines the maximum number
of aggregated series in a log-volume response
format: int32
type: integer
queryTimeout:
default: 3m
description: Timeout when querying ingesters or storage
Expand Down
12 changes: 12 additions & 0 deletions operator/config/manifests/community-openshift/bases/loki-operator.clusterserviceversion.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,6 +297,12 @@ spec:
path: limits.global.queries.maxQuerySeries
x-descriptors:
- urn:alm:descriptor:com.tectonic.ui:number
- description: MaxVolumeSeries defines the maximum number of aggregated series
in a log-volume response
displayName: Max Volume Series
path: limits.global.queries.maxVolumeSeries
x-descriptors:
- urn:alm:descriptor:com.tectonic.ui:number
- description: Timeout when querying ingesters or storage during the execution
of a query request.
displayName: Query Timeout
Expand Down Expand Up @@ -408,6 +414,12 @@ spec:
path: limits.tenants.queries.maxQuerySeries
x-descriptors:
- urn:alm:descriptor:com.tectonic.ui:number
- description: MaxVolumeSeries defines the maximum number of aggregated series
in a log-volume response
displayName: Max Volume Series
path: limits.tenants.queries.maxVolumeSeries
x-descriptors:
- urn:alm:descriptor:com.tectonic.ui:number
- description: Timeout when querying ingesters or storage during the execution
of a query request.
displayName: Query Timeout
Expand Down
12 changes: 12 additions & 0 deletions operator/config/manifests/community/bases/loki-operator.clusterserviceversion.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,6 +290,12 @@ spec:
path: limits.global.queries.maxQuerySeries
x-descriptors:
- urn:alm:descriptor:com.tectonic.ui:number
- description: MaxVolumeSeries defines the maximum number of aggregated series
in a log-volume response
displayName: Max Volume Series
path: limits.global.queries.maxVolumeSeries
x-descriptors:
- urn:alm:descriptor:com.tectonic.ui:number
- description: Timeout when querying ingesters or storage during the execution
of a query request.
displayName: Query Timeout
Expand Down Expand Up @@ -401,6 +407,12 @@ spec:
path: limits.tenants.queries.maxQuerySeries
x-descriptors:
- urn:alm:descriptor:com.tectonic.ui:number
- description: MaxVolumeSeries defines the maximum number of aggregated series
in a log-volume response
displayName: Max Volume Series
path: limits.tenants.queries.maxVolumeSeries
x-descriptors:
- urn:alm:descriptor:com.tectonic.ui:number
- description: Timeout when querying ingesters or storage during the execution
of a query request.
displayName: Query Timeout
Expand Down
12 changes: 12 additions & 0 deletions operator/config/manifests/openshift/bases/loki-operator.clusterserviceversion.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,6 +309,12 @@ spec:
path: limits.global.queries.maxQuerySeries
x-descriptors:
- urn:alm:descriptor:com.tectonic.ui:number
- description: MaxVolumeSeries defines the maximum number of aggregated series
in a log-volume response
displayName: Max Volume Series
path: limits.global.queries.maxVolumeSeries
x-descriptors:
- urn:alm:descriptor:com.tectonic.ui:number
- description: Timeout when querying ingesters or storage during the execution
of a query request.
displayName: Query Timeout
Expand Down Expand Up @@ -420,6 +426,12 @@ spec:
path: limits.tenants.queries.maxQuerySeries
x-descriptors:
- urn:alm:descriptor:com.tectonic.ui:number
- description: MaxVolumeSeries defines the maximum number of aggregated series
in a log-volume response
displayName: Max Volume Series
path: limits.tenants.queries.maxVolumeSeries
x-descriptors:
- urn:alm:descriptor:com.tectonic.ui:number
- description: Timeout when querying ingesters or storage during the execution
of a query request.
displayName: Query Timeout
Expand Down
Loading
Loading