From 9c34efa8bda74b7c25d669c5d8ce2f2fc18ff695 Mon Sep 17 00:00:00 2001 From: Jatin Suri Date: Mon, 1 Jul 2024 15:29:58 -0400 Subject: [PATCH 01/11] Enabled the volume API and added a limiter to it --- operator/internal/manifests/internal/config/loki-config.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/operator/internal/manifests/internal/config/loki-config.yaml b/operator/internal/manifests/internal/config/loki-config.yaml index 38326157f293..837db1ed4e93 100644 --- a/operator/internal/manifests/internal/config/loki-config.yaml +++ b/operator/internal/manifests/internal/config/loki-config.yaml @@ -201,6 +201,8 @@ limits_config: cardinality_limit: {{ .Stack.Limits.Global.QueryLimits.CardinalityLimit }} max_streams_matchers_per_query: 1000 query_timeout: {{ .Stack.Limits.Global.QueryLimits.QueryTimeout }} + volume_enabled: true + volume_max_series: 1000 {{- if .Retention.Enabled }}{{- with .Stack.Limits.Global.Retention }} retention_period: {{.Days}}d {{- with .Streams }} From f2f102e881428dcc8541266a9ca9116bcbc0a0f0 Mon Sep 17 00:00:00 2001 From: Jatin Suri Date: Tue, 2 Jul 2024 09:56:05 -0400 Subject: [PATCH 02/11] Added volume to lokistack types --- operator/apis/loki/v1/lokistack_types.go | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/operator/apis/loki/v1/lokistack_types.go b/operator/apis/loki/v1/lokistack_types.go index 185f6bb1d846..02b4ae0bc8fe 100644 --- a/operator/apis/loki/v1/lokistack_types.go +++ b/operator/apis/loki/v1/lokistack_types.go @@ -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. From db04dc41ce48de5cc3e4fff7ced45c092e505fab Mon Sep 17 00:00:00 2001 From: Jatin Suri Date: Tue, 2 Jul 2024 11:26:11 -0400 Subject: [PATCH 03/11] Updated testing to reflect the addition of the volume API --- .../manifests/internal/config/build_test.go | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/operator/internal/manifests/internal/config/build_test.go b/operator/internal/manifests/internal/config/build_test.go index 9486771f2611..76e94c56b47e 100644 --- a/operator/internal/manifests/internal/config/build_test.go +++ b/operator/internal/manifests/internal/config/build_test.go @@ -110,6 +110,8 @@ limits_config: max_cache_freshness_per_query: 10m split_queries_by_interval: 30m query_timeout: 1m + volume_enabled: true + volume_max_series: 1000 per_stream_rate_limit: 5MB per_stream_rate_limit_burst: 15MB shard_streams: @@ -368,6 +370,8 @@ limits_config: max_cache_freshness_per_query: 10m split_queries_by_interval: 30m query_timeout: 1m + volume_enabled: true + volume_max_series: 1000 per_stream_rate_limit: 5MB per_stream_rate_limit_burst: 15MB shard_streams: @@ -795,6 +799,8 @@ limits_config: max_cache_freshness_per_query: 10m split_queries_by_interval: 30m query_timeout: 1m + volume_enabled: true + volume_max_series: 1000 per_stream_rate_limit: 5MB per_stream_rate_limit_burst: 15MB shard_streams: @@ -1154,6 +1160,8 @@ limits_config: max_cache_freshness_per_query: 10m split_queries_by_interval: 30m query_timeout: 1m + volume_enabled: true + volume_max_series: 1000 per_stream_rate_limit: 5MB per_stream_rate_limit_burst: 15MB shard_streams: @@ -1514,6 +1522,8 @@ limits_config: max_cache_freshness_per_query: 10m split_queries_by_interval: 30m query_timeout: 1m + volume_enabled: true + volume_max_series: 1000 per_stream_rate_limit: 5MB per_stream_rate_limit_burst: 15MB shard_streams: @@ -1912,6 +1922,8 @@ limits_config: max_cache_freshness_per_query: 10m split_queries_by_interval: 30m query_timeout: 1m + volume_enabled: true + volume_max_series: 1000 per_stream_rate_limit: 5MB per_stream_rate_limit_burst: 15MB shard_streams: @@ -2243,6 +2255,8 @@ limits_config: max_cache_freshness_per_query: 10m split_queries_by_interval: 30m query_timeout: 2m + volume_enabled: true + volume_max_series: 1000 per_stream_rate_limit: 5MB per_stream_rate_limit_burst: 15MB shard_streams: @@ -2683,6 +2697,8 @@ limits_config: max_cache_freshness_per_query: 10m split_queries_by_interval: 30m query_timeout: 1m + volume_enabled: true + volume_max_series: 1000 per_stream_rate_limit: 5MB per_stream_rate_limit_burst: 15MB shard_streams: @@ -3008,6 +3024,8 @@ limits_config: max_cache_freshness_per_query: 10m split_queries_by_interval: 30m query_timeout: 2m + volume_enabled: true + volume_max_series: 1000 per_stream_rate_limit: 5MB per_stream_rate_limit_burst: 15MB shard_streams: @@ -3506,6 +3524,8 @@ limits_config: max_cache_freshness_per_query: 10m split_queries_by_interval: 30m query_timeout: 1m + volume_enabled: true + volume_max_series: 1000 per_stream_rate_limit: 5MB per_stream_rate_limit_burst: 15MB shard_streams: @@ -3768,6 +3788,8 @@ limits_config: max_cache_freshness_per_query: 10m split_queries_by_interval: 30m query_timeout: 1m + volume_enabled: true + volume_max_series: 1000 per_stream_rate_limit: 5MB per_stream_rate_limit_burst: 15MB shard_streams: @@ -4031,6 +4053,8 @@ limits_config: max_cache_freshness_per_query: 10m split_queries_by_interval: 30m query_timeout: 1m + volume_enabled: true + volume_max_series: 1000 per_stream_rate_limit: 5MB per_stream_rate_limit_burst: 15MB shard_streams: @@ -4295,6 +4319,8 @@ limits_config: max_cache_freshness_per_query: 10m split_queries_by_interval: 30m query_timeout: 1m + volume_enabled: true + volume_max_series: 1000 per_stream_rate_limit: 5MB per_stream_rate_limit_burst: 15MB shard_streams: @@ -4595,6 +4621,8 @@ limits_config: max_cache_freshness_per_query: 10m split_queries_by_interval: 30m query_timeout: 1m + volume_enabled: true + volume_max_series: 1000 per_stream_rate_limit: 5MB per_stream_rate_limit_burst: 15MB shard_streams: @@ -4895,6 +4923,8 @@ limits_config: split_queries_by_interval: 30m tsdb_max_query_parallelism: 512 query_timeout: 1m + volume_enabled: true + volume_max_series: 1000 allow_structured_metadata: true memberlist: abort_if_cluster_join_fails: true @@ -5386,6 +5416,8 @@ limits_config: per_stream_rate_limit_burst: 15MB split_queries_by_interval: 30m query_timeout: 1m + volume_enabled: true + volume_max_series: 1000 allow_structured_metadata: true memberlist: abort_if_cluster_join_fails: true @@ -5561,6 +5593,8 @@ limits_config: per_stream_rate_limit_burst: 15MB split_queries_by_interval: 30m query_timeout: 1m + volume_enabled: true + volume_max_series: 1000 allow_structured_metadata: true memberlist: abort_if_cluster_join_fails: true @@ -5730,6 +5764,8 @@ limits_config: max_cache_freshness_per_query: 10m split_queries_by_interval: 30m query_timeout: 1m + volume_enabled: true + volume_max_series: 1000 per_stream_rate_limit: 5MB per_stream_rate_limit_burst: 15MB shard_streams: From 38d6ea628edc130e4caa64454bdf4ca0af8cab78 Mon Sep 17 00:00:00 2001 From: Jatin Suri Date: Tue, 2 Jul 2024 11:50:35 -0400 Subject: [PATCH 04/11] Added CRD variable --- operator/internal/manifests/internal/config/loki-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/operator/internal/manifests/internal/config/loki-config.yaml b/operator/internal/manifests/internal/config/loki-config.yaml index 837db1ed4e93..7db4597f1c62 100644 --- a/operator/internal/manifests/internal/config/loki-config.yaml +++ b/operator/internal/manifests/internal/config/loki-config.yaml @@ -202,7 +202,7 @@ limits_config: max_streams_matchers_per_query: 1000 query_timeout: {{ .Stack.Limits.Global.QueryLimits.QueryTimeout }} volume_enabled: true - volume_max_series: 1000 + volume_max_series: {{ .Stack.Limits.Global.QueryLimits.MaxVolumeSeries }} {{- if .Retention.Enabled }}{{- with .Stack.Limits.Global.Retention }} retention_period: {{.Days}}d {{- with .Streams }} From e771653aeb4bdc1be96a6a33a21ef0e391297980 Mon Sep 17 00:00:00 2001 From: Jatin Suri Date: Tue, 2 Jul 2024 12:25:05 -0400 Subject: [PATCH 05/11] COmmited make bundle-all --- .../loki-operator.clusterserviceversion.yaml | 14 +++++++++++++- .../manifests/loki.grafana.com_lokistacks.yaml | 10 ++++++++++ .../loki-operator.clusterserviceversion.yaml | 14 +++++++++++++- .../manifests/loki.grafana.com_lokistacks.yaml | 10 ++++++++++ .../loki-operator.clusterserviceversion.yaml | 14 +++++++++++++- .../manifests/loki.grafana.com_lokistacks.yaml | 10 ++++++++++ .../crd/bases/loki.grafana.com_lokistacks.yaml | 10 ++++++++++ .../bases/loki-operator.clusterserviceversion.yaml | 12 ++++++++++++ .../bases/loki-operator.clusterserviceversion.yaml | 12 ++++++++++++ .../bases/loki-operator.clusterserviceversion.yaml | 12 ++++++++++++ 10 files changed, 115 insertions(+), 3 deletions(-) diff --git a/operator/bundle/community-openshift/manifests/loki-operator.clusterserviceversion.yaml b/operator/bundle/community-openshift/manifests/loki-operator.clusterserviceversion.yaml index bd28187a5f01..e91e10a64442 100644 --- a/operator/bundle/community-openshift/manifests/loki-operator.clusterserviceversion.yaml +++ b/operator/bundle/community-openshift/manifests/loki-operator.clusterserviceversion.yaml @@ -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" @@ -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 @@ -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 diff --git a/operator/bundle/community-openshift/manifests/loki.grafana.com_lokistacks.yaml b/operator/bundle/community-openshift/manifests/loki.grafana.com_lokistacks.yaml index df256e183a01..7cfeec6d074f 100644 --- a/operator/bundle/community-openshift/manifests/loki.grafana.com_lokistacks.yaml +++ b/operator/bundle/community-openshift/manifests/loki.grafana.com_lokistacks.yaml @@ -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 @@ -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 diff --git a/operator/bundle/community/manifests/loki-operator.clusterserviceversion.yaml b/operator/bundle/community/manifests/loki-operator.clusterserviceversion.yaml index 42d3b88c6d79..03195bfe7cce 100644 --- a/operator/bundle/community/manifests/loki-operator.clusterserviceversion.yaml +++ b/operator/bundle/community/manifests/loki-operator.clusterserviceversion.yaml @@ -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 @@ -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 @@ -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 diff --git a/operator/bundle/community/manifests/loki.grafana.com_lokistacks.yaml b/operator/bundle/community/manifests/loki.grafana.com_lokistacks.yaml index b349edbecec9..234ec782eb1b 100644 --- a/operator/bundle/community/manifests/loki.grafana.com_lokistacks.yaml +++ b/operator/bundle/community/manifests/loki.grafana.com_lokistacks.yaml @@ -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 @@ -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 diff --git a/operator/bundle/openshift/manifests/loki-operator.clusterserviceversion.yaml b/operator/bundle/openshift/manifests/loki-operator.clusterserviceversion.yaml index b270d8227260..d21f1adbb7c4 100644 --- a/operator/bundle/openshift/manifests/loki-operator.clusterserviceversion.yaml +++ b/operator/bundle/openshift/manifests/loki-operator.clusterserviceversion.yaml @@ -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 @@ -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 @@ -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 diff --git a/operator/bundle/openshift/manifests/loki.grafana.com_lokistacks.yaml b/operator/bundle/openshift/manifests/loki.grafana.com_lokistacks.yaml index fe4d81f5646f..4ab2f8aaba2a 100644 --- a/operator/bundle/openshift/manifests/loki.grafana.com_lokistacks.yaml +++ b/operator/bundle/openshift/manifests/loki.grafana.com_lokistacks.yaml @@ -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 @@ -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 diff --git a/operator/config/crd/bases/loki.grafana.com_lokistacks.yaml b/operator/config/crd/bases/loki.grafana.com_lokistacks.yaml index cc971fd0c562..2429338bd3a6 100644 --- a/operator/config/crd/bases/loki.grafana.com_lokistacks.yaml +++ b/operator/config/crd/bases/loki.grafana.com_lokistacks.yaml @@ -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 @@ -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 diff --git a/operator/config/manifests/community-openshift/bases/loki-operator.clusterserviceversion.yaml b/operator/config/manifests/community-openshift/bases/loki-operator.clusterserviceversion.yaml index 3627c03d5857..b655b250aea3 100644 --- a/operator/config/manifests/community-openshift/bases/loki-operator.clusterserviceversion.yaml +++ b/operator/config/manifests/community-openshift/bases/loki-operator.clusterserviceversion.yaml @@ -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 @@ -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 diff --git a/operator/config/manifests/community/bases/loki-operator.clusterserviceversion.yaml b/operator/config/manifests/community/bases/loki-operator.clusterserviceversion.yaml index 0aefa95fc280..7d12fc8ddaad 100644 --- a/operator/config/manifests/community/bases/loki-operator.clusterserviceversion.yaml +++ b/operator/config/manifests/community/bases/loki-operator.clusterserviceversion.yaml @@ -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 @@ -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 diff --git a/operator/config/manifests/openshift/bases/loki-operator.clusterserviceversion.yaml b/operator/config/manifests/openshift/bases/loki-operator.clusterserviceversion.yaml index 77bb3bff6fcd..d55686c3addc 100644 --- a/operator/config/manifests/openshift/bases/loki-operator.clusterserviceversion.yaml +++ b/operator/config/manifests/openshift/bases/loki-operator.clusterserviceversion.yaml @@ -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 @@ -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 From 845ae3f94b5f1775ec9f21c3ee7f56ca9dbc9642 Mon Sep 17 00:00:00 2001 From: Jatin Suri Date: Tue, 2 Jul 2024 12:28:05 -0400 Subject: [PATCH 06/11] Added default values to sizes.go --- operator/internal/manifests/internal/sizes.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/operator/internal/manifests/internal/sizes.go b/operator/internal/manifests/internal/sizes.go index be5ac2eefb01..4962e4b3e762 100644 --- a/operator/internal/manifests/internal/sizes.go +++ b/operator/internal/manifests/internal/sizes.go @@ -252,6 +252,7 @@ var StackSizeTable = map[lokiv1.LokiStackSizeType]lokiv1.LokiStackSpec{ MaxQuerySeries: 500, QueryTimeout: "3m", CardinalityLimit: 100000, + MaxVolumeSeries: 1000, }, }, }, @@ -308,6 +309,7 @@ var StackSizeTable = map[lokiv1.LokiStackSizeType]lokiv1.LokiStackSpec{ MaxQuerySeries: 500, QueryTimeout: "3m", CardinalityLimit: 100000, + MaxVolumeSeries: 1000, }, }, }, @@ -367,6 +369,7 @@ var StackSizeTable = map[lokiv1.LokiStackSizeType]lokiv1.LokiStackSpec{ MaxQuerySeries: 500, QueryTimeout: "3m", CardinalityLimit: 100000, + MaxVolumeSeries: 1000, }, }, }, @@ -426,6 +429,7 @@ var StackSizeTable = map[lokiv1.LokiStackSizeType]lokiv1.LokiStackSpec{ MaxQuerySeries: 500, QueryTimeout: "3m", CardinalityLimit: 100000, + MaxVolumeSeries: 1000, }, }, }, From 1e7ebc7e72a80372bf30dc953662a5c70a3a110c Mon Sep 17 00:00:00 2001 From: Jatin Suri Date: Tue, 2 Jul 2024 12:32:18 -0400 Subject: [PATCH 07/11] Updated tests for MaxVolulmeSeries --- .../manifests/internal/config/build_test.go | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/operator/internal/manifests/internal/config/build_test.go b/operator/internal/manifests/internal/config/build_test.go index 76e94c56b47e..6fdbdd7181e5 100644 --- a/operator/internal/manifests/internal/config/build_test.go +++ b/operator/internal/manifests/internal/config/build_test.go @@ -208,6 +208,7 @@ overrides: MaxQuerySeries: 500, QueryTimeout: "1m", CardinalityLimit: 100000, + MaxVolumeSeries: 1000, }, }, }, @@ -484,6 +485,7 @@ overrides: MaxQuerySeries: 500, QueryTimeout: "1m", CardinalityLimit: 100000, + MaxVolumeSeries: 1000, }, }, Tenants: map[string]lokiv1.PerTenantLimitsTemplateSpec{ @@ -951,6 +953,7 @@ overrides: MaxQuerySeries: 500, QueryTimeout: "1m", CardinalityLimit: 100000, + MaxVolumeSeries: 1000, }, }, }, @@ -1312,6 +1315,7 @@ overrides: MaxQuerySeries: 500, QueryTimeout: "1m", CardinalityLimit: 100000, + MaxVolumeSeries: 1000, }, }, }, @@ -1687,6 +1691,7 @@ overrides: MaxQuerySeries: 500, QueryTimeout: "1m", CardinalityLimit: 100000, + MaxVolumeSeries: 1000, }, }, }, @@ -2030,6 +2035,7 @@ overrides: MaxQuerySeries: 500, QueryTimeout: "1m", CardinalityLimit: 100000, + MaxVolumeSeries: 1000, }, Retention: &lokiv1.RetentionLimitSpec{ Days: 15, @@ -2433,6 +2439,7 @@ overrides: MaxQuerySeries: 500, QueryTimeout: "2m", CardinalityLimit: 100000, + MaxVolumeSeries: 1000, }, }, }, @@ -2832,6 +2839,7 @@ overrides: MaxQuerySeries: 500, QueryTimeout: "1m", CardinalityLimit: 100000, + MaxVolumeSeries: 1000, }, }, }, @@ -3230,6 +3238,7 @@ overrides: MaxQuerySeries: 500, QueryTimeout: "2m", CardinalityLimit: 100000, + MaxVolumeSeries: 1000, }, }, }, @@ -3623,6 +3632,7 @@ overrides: MaxQuerySeries: 500, QueryTimeout: "1m", CardinalityLimit: 100000, + MaxVolumeSeries: 1000, }, }, }, @@ -3887,6 +3897,7 @@ overrides: MaxQuerySeries: 500, QueryTimeout: "1m", CardinalityLimit: 100000, + MaxVolumeSeries: 1000, }, }, }, @@ -4151,6 +4162,7 @@ overrides: MaxQuerySeries: 500, QueryTimeout: "1m", CardinalityLimit: 100000, + MaxVolumeSeries: 1000, }, }, }, @@ -4422,6 +4434,7 @@ overrides: MaxQuerySeries: 500, QueryTimeout: "1m", CardinalityLimit: 100000, + MaxVolumeSeries: 1000, }, }, Tenants: map[string]lokiv1.PerTenantLimitsTemplateSpec{ @@ -4724,6 +4737,7 @@ overrides: MaxQuerySeries: 500, QueryTimeout: "1m", CardinalityLimit: 100000, + MaxVolumeSeries: 1000, }, }, Tenants: map[string]lokiv1.PerTenantLimitsTemplateSpec{ @@ -5015,6 +5029,7 @@ overrides: MaxQuerySeries: 500, QueryTimeout: "1m", CardinalityLimit: 100000, + MaxVolumeSeries: 1000, }, }, }, @@ -5105,6 +5120,7 @@ func defaultOptions() Options { MaxQuerySeries: 500, QueryTimeout: "1m", CardinalityLimit: 100000, + MaxVolumeSeries: 1000, }, }, }, @@ -5927,6 +5943,7 @@ overrides: MaxQuerySeries: 500, QueryTimeout: "1m", CardinalityLimit: 100000, + MaxVolumeSeries: 1000, }, }, }, From b2c0081ef003cddc9301ecae7ee7ba25a6d6a6bb Mon Sep 17 00:00:00 2001 From: Jatin Suri Date: Tue, 2 Jul 2024 13:05:29 -0400 Subject: [PATCH 08/11] Added MaxVolumeSeries to loki-runtime-config --- .../internal/manifests/internal/config/loki-runtime-config.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/operator/internal/manifests/internal/config/loki-runtime-config.yaml b/operator/internal/manifests/internal/config/loki-runtime-config.yaml index 935c53f5692d..78c60b449f9e 100644 --- a/operator/internal/manifests/internal/config/loki-runtime-config.yaml +++ b/operator/internal/manifests/internal/config/loki-runtime-config.yaml @@ -54,6 +54,8 @@ overrides: {{- if $spec.QueryLimits.CardinalityLimit }} cardinality_limit: {{ $spec.QueryLimits.CardinalityLimit }} {{- end }} + {{- if $spec.QueryLimits.MaxVolumeSeries }} + max_volume_series: {{ $spec.QueryLimits.MaxVolumeSeries }} {{- with $l.Blocked }} blocked_queries: {{- range $blockedQuery := . }} From 26c1077b7163b9111f78d7b6dbc363835d02e08f Mon Sep 17 00:00:00 2001 From: Jatin Suri <52750297+jatinsu@users.noreply.github.com> Date: Tue, 2 Jul 2024 14:17:41 -0400 Subject: [PATCH 09/11] Update operator/internal/manifests/internal/config/loki-runtime-config.yaml Co-authored-by: Periklis Tsirakidis --- .../internal/manifests/internal/config/loki-runtime-config.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/operator/internal/manifests/internal/config/loki-runtime-config.yaml b/operator/internal/manifests/internal/config/loki-runtime-config.yaml index 78c60b449f9e..7d5b5e242108 100644 --- a/operator/internal/manifests/internal/config/loki-runtime-config.yaml +++ b/operator/internal/manifests/internal/config/loki-runtime-config.yaml @@ -56,6 +56,7 @@ overrides: {{- end }} {{- if $spec.QueryLimits.MaxVolumeSeries }} max_volume_series: {{ $spec.QueryLimits.MaxVolumeSeries }} + {{- end }} {{- with $l.Blocked }} blocked_queries: {{- range $blockedQuery := . }} From 8ebb94757ca9df926df5666c4a6ea86b93289d04 Mon Sep 17 00:00:00 2001 From: Jatin Suri Date: Tue, 2 Jul 2024 14:19:12 -0400 Subject: [PATCH 10/11] Ran api.md and fmt for linter --- operator/apis/loki/v1/lokistack_types.go | 2 +- operator/docs/operator/api.md | 169 ++---------------- .../manifests/internal/config/build_test.go | 32 ++-- 3 files changed, 33 insertions(+), 170 deletions(-) diff --git a/operator/apis/loki/v1/lokistack_types.go b/operator/apis/loki/v1/lokistack_types.go index 02b4ae0bc8fe..90cee75d9447 100644 --- a/operator/apis/loki/v1/lokistack_types.go +++ b/operator/apis/loki/v1/lokistack_types.go @@ -643,7 +643,7 @@ 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 diff --git a/operator/docs/operator/api.md b/operator/docs/operator/api.md index ca71ecee6ce3..b8da6e57c937 100644 --- a/operator/docs/operator/api.md +++ b/operator/docs/operator/api.md @@ -5,8 +5,8 @@ lead: "" draft: false images: [] menu: - docs: - parent: "operator" ++docs: ++parent: "operator" weight: 1000 toc: true --- @@ -17,7 +17,6 @@ This Document contains the types introduced by the Loki Operator to be consumed

Package v1 contains API Schema definitions for the loki v1 API group

Resource Types: - ## AlertManagerClientBasicAuth { #loki-grafana-com-v1-AlertManagerClientBasicAuth }

(Appears on:AlertManagerClientConfig) @@ -59,7 +58,6 @@ string - ## AlertManagerClientConfig { #loki-grafana-com-v1-AlertManagerClientConfig }

(Appears on:AlertManagerSpec) @@ -119,7 +117,6 @@ AlertManagerClientBasicAuth - ## AlertManagerClientHeaderAuth { #loki-grafana-com-v1-AlertManagerClientHeaderAuth }

(Appears on:AlertManagerClientConfig) @@ -173,7 +170,6 @@ string - ## AlertManagerClientTLSConfig { #loki-grafana-com-v1-AlertManagerClientTLSConfig }

(Appears on:AlertManagerClientConfig) @@ -251,7 +247,6 @@ bool - ## AlertManagerDiscoverySpec { #loki-grafana-com-v1-AlertManagerDiscoverySpec }

(Appears on:AlertManagerSpec) @@ -295,7 +290,6 @@ PrometheusDuration - ## AlertManagerNotificationQueueSpec { #loki-grafana-com-v1-AlertManagerNotificationQueueSpec }

(Appears on:AlertManagerSpec) @@ -382,7 +376,6 @@ PrometheusDuration - ## AlertManagerSpec { #loki-grafana-com-v1-AlertManagerSpec }

(Appears on:RulerConfigSpec, RulerOverrides) @@ -505,7 +498,6 @@ AlertManagerClientConfig - ## AlertingRule { #loki-grafana-com-v1-AlertingRule }

AlertingRule is the Schema for the alertingrules API

@@ -558,7 +550,6 @@ AlertingRuleStatus - ## AlertingRuleGroup { #loki-grafana-com-v1-AlertingRuleGroup }

(Appears on:AlertingRuleSpec) @@ -627,7 +618,6 @@ int32 - ## AlertingRuleGroupSpec { #loki-grafana-com-v1-AlertingRuleGroupSpec }

(Appears on:AlertingRuleGroup) @@ -709,7 +699,6 @@ map[string]string - ## AlertingRuleSpec { #loki-grafana-com-v1-AlertingRuleSpec }

(Appears on:AlertingRule) @@ -752,7 +741,6 @@ string - ## AlertingRuleStatus { #loki-grafana-com-v1-AlertingRuleStatus }

(Appears on:AlertingRule) @@ -784,7 +772,6 @@ string - ## AuthenticationSpec { #loki-grafana-com-v1-AuthenticationSpec }

(Appears on:TenantsSpec) @@ -852,7 +839,6 @@ MTLSSpec - ## AuthorizationSpec { #loki-grafana-com-v1-AuthorizationSpec }

(Appears on:TenantsSpec) @@ -913,7 +899,6 @@ OPASpec - ## BlockedQuerySpec { #loki-grafana-com-v1-BlockedQuerySpec }

(Appears on:PerTenantQueryLimitSpec) @@ -981,7 +966,6 @@ BlockedQueryTypes - ## BlockedQueryType { #loki-grafana-com-v1-BlockedQueryType } (string alias)

@@ -1005,7 +989,6 @@ BlockedQueryTypes - ## BlockedQueryTypes { #loki-grafana-com-v1-BlockedQueryTypes } ([]github.com/grafana/loki/operator/apis/loki/v1.BlockedQueryType alias)

@@ -1014,7 +997,6 @@ BlockedQueryTypes

BlockedQueryTypes defines a slice of BlockedQueryType values to be used for a blocked query.

- ## CASpec { #loki-grafana-com-v1-CASpec }

(Appears on:MTLSSpec, OIDCSpec, ObjectStorageTLSSpec) @@ -1057,7 +1039,6 @@ It needs to be in the same namespace as the LokiStack custom resource.

- ## ClusterProxy { #loki-grafana-com-v1-ClusterProxy }

(Appears on:LokiStackSpec) @@ -1111,7 +1092,6 @@ string - ## CredentialMode { #loki-grafana-com-v1-CredentialMode } (string alias)

@@ -1145,7 +1125,6 @@ a secret. This mode is only supported for certain object storage types in certai - ## HashRingSpec { #loki-grafana-com-v1-HashRingSpec }

(Appears on:LokiStackSpec) @@ -1190,7 +1169,6 @@ MemberListSpec - ## HashRingType { #loki-grafana-com-v1-HashRingType } (string alias)

@@ -1211,7 +1189,6 @@ MemberListSpec - ## IngestionLimitSpec { #loki-grafana-com-v1-IngestionLimitSpec }

(Appears on:LimitsTemplateSpec, PerTenantLimitsTemplateSpec) @@ -1356,7 +1333,6 @@ int32 - ## InstanceAddrType { #loki-grafana-com-v1-InstanceAddrType } (string alias)

@@ -1380,7 +1356,6 @@ int32 - ## LimitsSpec { #loki-grafana-com-v1-LimitsSpec }

(Appears on:LokiStackSpec) @@ -1427,7 +1402,6 @@ map[string]github.com/grafana/loki/operator/apis/loki/v1.PerTenantLimitsTemplate - ## LimitsTemplateSpec { #loki-grafana-com-v1-LimitsTemplateSpec }

(Appears on:LimitsSpec) @@ -1487,7 +1461,6 @@ RetentionLimitSpec - ## LokiComponentSpec { #loki-grafana-com-v1-LokiComponentSpec }

(Appears on:LokiTemplateSpec) @@ -1561,7 +1534,6 @@ of a component.

- ## LokiStack { #loki-grafana-com-v1-LokiStack }

LokiStack is the Schema for the lokistacks API

@@ -1616,7 +1588,6 @@ Refer to the Kubernetes API documentation for the fields of the - ## LokiStackComponentStatus { #loki-grafana-com-v1-LokiStackComponentStatus }

(Appears on:LokiStackStatus) @@ -1747,7 +1718,6 @@ PodStatusMap - ## LokiStackConditionReason { #loki-grafana-com-v1-LokiStackConditionReason } (string alias)

@@ -1842,7 +1812,6 @@ CredentialsRequest, but it can persist if the CCO or its configuration are incor - ## LokiStackConditionType { #loki-grafana-com-v1-LokiStackConditionType } (string alias)
@@ -1874,7 +1843,6 @@ issues. There can be multiple warning conditions active at a time.

- ## LokiStackSizeType { #loki-grafana-com-v1-LokiStackSizeType } (string alias)

@@ -1921,7 +1889,6 @@ requirement for single replication factor and auto-compaction.

- ## LokiStackSpec { #loki-grafana-com-v1-LokiStackSpec }

(Appears on:LokiStack) @@ -2101,7 +2068,6 @@ TenantsSpec - ## LokiStackStatus { #loki-grafana-com-v1-LokiStackStatus }

(Appears on:LokiStack) @@ -2163,7 +2129,6 @@ to the storage configuration.

- ## LokiStackStorageStatus { #loki-grafana-com-v1-LokiStackStorageStatus }

(Appears on:LokiStackStatus) @@ -2211,7 +2176,6 @@ CredentialMode - ## LokiTemplateSpec { #loki-grafana-com-v1-LokiTemplateSpec }

(Appears on:LokiStackSpec) @@ -2342,7 +2306,6 @@ LokiComponentSpec - ## MTLSSpec { #loki-grafana-com-v1-MTLSSpec }

(Appears on:AuthenticationSpec) @@ -2373,7 +2336,6 @@ CASpec - ## ManagementStateType { #loki-grafana-com-v1-ManagementStateType } (string alias)

@@ -2399,7 +2361,6 @@ reconciled by the operator.

- ## MemberListSpec { #loki-grafana-com-v1-MemberListSpec }

(Appears on:HashRingSpec) @@ -2448,7 +2409,6 @@ for the memberlist.

- ## ModeType { #loki-grafana-com-v1-ModeType } (string alias)

@@ -2479,7 +2439,6 @@ using an in-process OpenPolicyAgent Rego authorizer.

- ## OIDCSpec { #loki-grafana-com-v1-OIDCSpec }

(Appears on:AuthenticationSpec) @@ -2571,7 +2530,6 @@ string - ## OPASpec { #loki-grafana-com-v1-OPASpec }

(Appears on:AuthorizationSpec) @@ -2600,7 +2558,6 @@ string - ## ObjectStorageSchema { #loki-grafana-com-v1-ObjectStorageSchema }

(Appears on:LokiStackStorageStatus, ObjectStorageSpec) @@ -2648,7 +2605,6 @@ using it once the day rolls over.

- ## ObjectStorageSchemaVersion { #loki-grafana-com-v1-ObjectStorageSchemaVersion } (string alias)

@@ -2676,7 +2632,6 @@ used with the Loki cluster.

- ## ObjectStorageSecretSpec { #loki-grafana-com-v1-ObjectStorageSecretSpec }

(Appears on:ObjectStorageSpec) @@ -2734,7 +2689,6 @@ own configuration.

- ## ObjectStorageSecretType { #loki-grafana-com-v1-ObjectStorageSecretType } (string alias)

@@ -2767,7 +2721,6 @@ own configuration.

- ## ObjectStorageSpec { #loki-grafana-com-v1-ObjectStorageSpec }

(Appears on:LokiStackSpec) @@ -2828,7 +2781,6 @@ ObjectStorageTLSSpec - ## ObjectStorageTLSSpec { #loki-grafana-com-v1-ObjectStorageTLSSpec }

(Appears on:ObjectStorageSpec) @@ -2872,7 +2824,6 @@ It needs to be in the same namespace as the LokiStack custom resource.

- ## OpenshiftTenantSpec { #loki-grafana-com-v1-OpenshiftTenantSpec }

(Appears on:TenantsSpec) @@ -2907,7 +2858,6 @@ Setting this to an empty array disables admin groups.

- ## PerTenantLimitsTemplateSpec { #loki-grafana-com-v1-PerTenantLimitsTemplateSpec }

(Appears on:LimitsSpec) @@ -2967,7 +2917,6 @@ RetentionLimitSpec - ## PerTenantQueryLimitSpec { #loki-grafana-com-v1-PerTenantQueryLimitSpec }

(Appears on:PerTenantLimitsTemplateSpec) @@ -3011,7 +2960,6 @@ QueryLimitSpec - ## PermissionType { #loki-grafana-com-v1-PermissionType } (string alias)

@@ -3035,7 +2983,6 @@ QueryLimitSpec - ## PodStatus { #loki-grafana-com-v1-PodStatus } (string alias)

@@ -3069,7 +3016,6 @@ At least one container is still running or is in the process of being restarted. - ## PodStatusMap { #loki-grafana-com-v1-PodStatusMap } (map[github.com/grafana/loki/operator/apis/loki/v1.PodStatus][]string alias)

@@ -3078,7 +3024,6 @@ At least one container is still running or is in the process of being restarted.

PodStatusMap defines the type for mapping pod status to pod name.

- ## PrometheusDuration { #loki-grafana-com-v1-PrometheusDuration } (string alias)

@@ -3087,7 +3032,6 @@ At least one container is still running or is in the process of being restarted.

PrometheusDuration defines the type for Prometheus durations.

- ## QueryLimitSpec { #loki-grafana-com-v1-QueryLimitSpec }

(Appears on:LimitsTemplateSpec, PerTenantQueryLimitSpec) @@ -3165,9 +3109,20 @@ int32

CardinalityLimit defines the cardinality limit for index queries.

+ + +maxVolumeSeries
+ +int32 + + + +(Optional) +

MaxVolumeSeries defines the maximum number of aggregated series in a log-volume response

+ + - ## RecordingRule { #loki-grafana-com-v1-RecordingRule }

RecordingRule is the Schema for the recordingrules API

@@ -3220,7 +3175,6 @@ RecordingRuleStatus - ## RecordingRuleGroup { #loki-grafana-com-v1-RecordingRuleGroup }

(Appears on:RecordingRuleSpec) @@ -3289,7 +3243,6 @@ int32 - ## RecordingRuleGroupSpec { #loki-grafana-com-v1-RecordingRuleGroupSpec }

(Appears on:RecordingRuleGroup) @@ -3344,7 +3297,6 @@ map[string]string - ## RecordingRuleSpec { #loki-grafana-com-v1-RecordingRuleSpec }

(Appears on:RecordingRule) @@ -3387,7 +3339,6 @@ string - ## RecordingRuleStatus { #loki-grafana-com-v1-RecordingRuleStatus }

(Appears on:RecordingRule) @@ -3419,7 +3370,6 @@ string - ## RelabelActionType { #loki-grafana-com-v1-RelabelActionType } (string alias)

@@ -3428,7 +3378,6 @@ string

RelabelActionType defines the enumeration type for RelabelConfig actions.

- ## RelabelConfig { #loki-grafana-com-v1-RelabelConfig }

(Appears on:AlertManagerSpec, RemoteWriteClientSpec) @@ -3537,7 +3486,6 @@ RelabelActionType - ## RemoteWriteAuthType { #loki-grafana-com-v1-RemoteWriteAuthType } (string alias)

@@ -3561,7 +3509,6 @@ RelabelActionType - ## RemoteWriteClientQueueSpec { #loki-grafana-com-v1-RemoteWriteClientQueueSpec }

(Appears on:RemoteWriteSpec) @@ -3669,7 +3616,6 @@ PrometheusDuration - ## RemoteWriteClientSpec { #loki-grafana-com-v1-RemoteWriteClientSpec }

(Appears on:RemoteWriteSpec) @@ -3797,7 +3743,6 @@ bool - ## RemoteWriteSpec { #loki-grafana-com-v1-RemoteWriteSpec }

(Appears on:RulerConfigSpec) @@ -3869,7 +3814,6 @@ RemoteWriteClientQueueSpec - ## ReplicationSpec { #loki-grafana-com-v1-ReplicationSpec }

(Appears on:LokiStackSpec) @@ -3913,7 +3857,6 @@ IMPORTANT: Make sure that the replication factor defined is less than or equal t - ## RetentionLimitSpec { #loki-grafana-com-v1-RetentionLimitSpec }

(Appears on:LimitsTemplateSpec, PerTenantLimitsTemplateSpec) @@ -3956,7 +3899,6 @@ uint - ## RetentionStreamSpec { #loki-grafana-com-v1-RetentionStreamSpec }

(Appears on:RetentionLimitSpec) @@ -4008,7 +3950,6 @@ string - ## RoleBindingsSpec { #loki-grafana-com-v1-RoleBindingsSpec }

(Appears on:AuthorizationSpec) @@ -4058,7 +3999,6 @@ string - ## RoleSpec { #loki-grafana-com-v1-RoleSpec }

(Appears on:AuthorizationSpec) @@ -4118,7 +4058,6 @@ string - ## RulerConfig { #loki-grafana-com-v1-RulerConfig }

RulerConfig is the Schema for the rulerconfigs API

@@ -4171,7 +4110,6 @@ RulerConfigStatus - ## RulerConfigSpec { #loki-grafana-com-v1-RulerConfigSpec }

(Appears on:RulerConfig) @@ -4259,7 +4197,6 @@ map[string]github.com/grafana/loki/operator/apis/loki/v1.RulerOverrides - ## RulerConfigStatus { #loki-grafana-com-v1-RulerConfigStatus }

(Appears on:RulerConfig) @@ -4291,7 +4228,6 @@ map[string]github.com/grafana/loki/operator/apis/loki/v1.RulerOverrides - ## RulerOverrides { #loki-grafana-com-v1-RulerOverrides }

(Appears on:RulerConfigSpec) @@ -4323,7 +4259,6 @@ AlertManagerSpec - ## RulesSpec { #loki-grafana-com-v1-RulesSpec }

(Appears on:LokiStackSpec) @@ -4382,7 +4317,6 @@ the same namespace as the LokiStack object is in is used.

- ## StorageSchemaEffectiveDate { #loki-grafana-com-v1-StorageSchemaEffectiveDate } (string alias)

@@ -4391,7 +4325,6 @@ the same namespace as the LokiStack object is in is used.

StorageSchemaEffectiveDate defines the type for the Storage Schema Effect Date

- ## Subject { #loki-grafana-com-v1-Subject }

(Appears on:RoleBindingsSpec) @@ -4431,7 +4364,6 @@ SubjectKind - ## SubjectKind { #loki-grafana-com-v1-SubjectKind } (string alias)

@@ -4455,7 +4387,6 @@ SubjectKind - ## TenantSecretSpec { #loki-grafana-com-v1-TenantSecretSpec }

(Appears on:OIDCSpec) @@ -4485,7 +4416,6 @@ string - ## TenantsSpec { #loki-grafana-com-v1-TenantsSpec }

(Appears on:LokiStackSpec) @@ -4559,7 +4489,6 @@ OpenshiftTenantSpec - ## ZoneSpec { #loki-grafana-com-v1-ZoneSpec }

(Appears on:ReplicationSpec) @@ -4600,14 +4529,12 @@ string

- - ++newline # loki.grafana.com/v1beta1 { #loki-grafana-com-v1beta1 }

Package v1beta1 contains API Schema definitions for the loki v1beta1 API group

Resource Types: - ## AlertManagerClientBasicAuth { #loki-grafana-com-v1beta1-AlertManagerClientBasicAuth }

(Appears on:AlertManagerClientConfig) @@ -4649,7 +4576,6 @@ string - ## AlertManagerClientConfig { #loki-grafana-com-v1beta1-AlertManagerClientConfig }

(Appears on:AlertManagerSpec) @@ -4709,7 +4635,6 @@ AlertManagerClientBasicAuth - ## AlertManagerClientHeaderAuth { #loki-grafana-com-v1beta1-AlertManagerClientHeaderAuth }

(Appears on:AlertManagerClientConfig) @@ -4763,7 +4688,6 @@ string - ## AlertManagerClientTLSConfig { #loki-grafana-com-v1beta1-AlertManagerClientTLSConfig }

(Appears on:AlertManagerClientConfig) @@ -4829,7 +4753,6 @@ string - ## AlertManagerDiscoverySpec { #loki-grafana-com-v1beta1-AlertManagerDiscoverySpec }

(Appears on:AlertManagerSpec) @@ -4873,7 +4796,6 @@ PrometheusDuration - ## AlertManagerNotificationQueueSpec { #loki-grafana-com-v1beta1-AlertManagerNotificationQueueSpec }

(Appears on:AlertManagerSpec) @@ -4960,7 +4882,6 @@ PrometheusDuration - ## AlertManagerSpec { #loki-grafana-com-v1beta1-AlertManagerSpec }

(Appears on:RulerConfigSpec, RulerOverrides) @@ -5083,7 +5004,6 @@ AlertManagerClientConfig - ## AlertingRule { #loki-grafana-com-v1beta1-AlertingRule }

AlertingRule is the Schema for the alertingrules API

@@ -5136,7 +5056,6 @@ AlertingRuleStatus - ## AlertingRuleGroup { #loki-grafana-com-v1beta1-AlertingRuleGroup }

(Appears on:AlertingRuleSpec) @@ -5205,7 +5124,6 @@ int32 - ## AlertingRuleGroupSpec { #loki-grafana-com-v1beta1-AlertingRuleGroupSpec }

(Appears on:AlertingRuleGroup) @@ -5287,7 +5205,6 @@ map[string]string - ## AlertingRuleSpec { #loki-grafana-com-v1beta1-AlertingRuleSpec }

(Appears on:AlertingRule) @@ -5330,7 +5247,6 @@ string - ## AlertingRuleStatus { #loki-grafana-com-v1beta1-AlertingRuleStatus }

(Appears on:AlertingRule) @@ -5362,7 +5278,6 @@ string - ## AuthenticationSpec { #loki-grafana-com-v1beta1-AuthenticationSpec }

(Appears on:TenantsSpec) @@ -5415,7 +5330,6 @@ OIDCSpec - ## AuthorizationSpec { #loki-grafana-com-v1beta1-AuthorizationSpec }

(Appears on:TenantsSpec) @@ -5476,7 +5390,6 @@ OPASpec - ## IngestionLimitSpec { #loki-grafana-com-v1beta1-IngestionLimitSpec }

(Appears on:LimitsTemplateSpec) @@ -5584,7 +5497,6 @@ int32 - ## LimitsSpec { #loki-grafana-com-v1beta1-LimitsSpec }

(Appears on:LokiStackSpec) @@ -5632,7 +5544,6 @@ map[string]github.com/grafana/loki/operator/apis/loki/v1beta1.LimitsTemplateSpec - ## LimitsTemplateSpec { #loki-grafana-com-v1beta1-LimitsTemplateSpec }

(Appears on:LimitsSpec) @@ -5678,7 +5589,6 @@ QueryLimitSpec - ## LokiComponentSpec { #loki-grafana-com-v1beta1-LokiComponentSpec }

(Appears on:LokiTemplateSpec) @@ -5737,7 +5647,6 @@ the component onto it.

- ## LokiStack { #loki-grafana-com-v1beta1-LokiStack }

LokiStack is the Schema for the lokistacks API

@@ -5790,7 +5699,6 @@ Refer to the Kubernetes API documentation for the fields of the - ## LokiStackComponentStatus { #loki-grafana-com-v1beta1-LokiStackComponentStatus }

(Appears on:LokiStackStatus) @@ -5921,7 +5829,6 @@ PodStatusMap - ## LokiStackConditionReason { #loki-grafana-com-v1beta1-LokiStackConditionReason } (string alias)

@@ -5986,7 +5893,6 @@ for the ruler is missing.

- ## LokiStackConditionType { #loki-grafana-com-v1beta1-LokiStackConditionType } (string alias)
@@ -6014,7 +5920,6 @@ are degraded or the cluster cannot connect to object storage.

- ## LokiStackSizeType { #loki-grafana-com-v1beta1-LokiStackSizeType } (string alias)

@@ -6053,7 +5958,6 @@ requirement for single replication factor and auto-compaction.

- ## LokiStackSpec { #loki-grafana-com-v1beta1-LokiStackSpec }

(Appears on:LokiStack) @@ -6190,7 +6094,6 @@ TenantsSpec - ## LokiStackStatus { #loki-grafana-com-v1beta1-LokiStackStatus }

(Appears on:LokiStack) @@ -6252,7 +6155,6 @@ to the storage configuration.

- ## LokiStackStorageStatus { #loki-grafana-com-v1beta1-LokiStackStorageStatus }

(Appears on:LokiStackStatus) @@ -6286,7 +6188,6 @@ to the LokiStack.

- ## LokiTemplateSpec { #loki-grafana-com-v1beta1-LokiTemplateSpec }

(Appears on:LokiStackSpec) @@ -6417,7 +6318,6 @@ LokiComponentSpec - ## ManagementStateType { #loki-grafana-com-v1beta1-ManagementStateType } (string alias)

@@ -6443,7 +6343,6 @@ reconciled by the operator.

- ## ModeType { #loki-grafana-com-v1beta1-ModeType } (string alias)

@@ -6471,7 +6370,6 @@ using an in-process OpenPolicyAgent Rego authorizer.

- ## OIDCSpec { #loki-grafana-com-v1beta1-OIDCSpec }

(Appears on:AuthenticationSpec) @@ -6549,7 +6447,6 @@ string - ## OPASpec { #loki-grafana-com-v1beta1-OPASpec }

(Appears on:AuthorizationSpec) @@ -6578,7 +6475,6 @@ string - ## ObjectStorageSchema { #loki-grafana-com-v1beta1-ObjectStorageSchema }

(Appears on:LokiStackStorageStatus, ObjectStorageSpec) @@ -6625,7 +6521,6 @@ date in UTC.

- ## ObjectStorageSchemaVersion { #loki-grafana-com-v1beta1-ObjectStorageSchemaVersion } (string alias)

@@ -6650,7 +6545,6 @@ used with the Loki cluster.

- ## ObjectStorageSecretSpec { #loki-grafana-com-v1beta1-ObjectStorageSecretSpec }

(Appears on:ObjectStorageSpec) @@ -6692,7 +6586,6 @@ string - ## ObjectStorageSecretType { #loki-grafana-com-v1beta1-ObjectStorageSecretType } (string alias)

@@ -6722,7 +6615,6 @@ string - ## ObjectStorageSpec { #loki-grafana-com-v1beta1-ObjectStorageSpec }

(Appears on:LokiStackSpec) @@ -6783,7 +6675,6 @@ ObjectStorageTLSSpec - ## ObjectStorageTLSSpec { #loki-grafana-com-v1beta1-ObjectStorageTLSSpec }

(Appears on:ObjectStorageSpec) @@ -6814,7 +6705,6 @@ It needs to be in the same namespace as the LokiStack custom resource.

- ## PermissionType { #loki-grafana-com-v1beta1-PermissionType } (string alias)

@@ -6838,7 +6728,6 @@ It needs to be in the same namespace as the LokiStack custom resource.

- ## PodStatusMap { #loki-grafana-com-v1beta1-PodStatusMap } (map[k8s.io/api/core/v1.PodPhase][]string alias)

@@ -6847,7 +6736,6 @@ It needs to be in the same namespace as the LokiStack custom resource.

PodStatusMap defines the type for mapping pod status to pod name.

- ## PrometheusDuration { #loki-grafana-com-v1beta1-PrometheusDuration } (string alias)

@@ -6856,7 +6744,6 @@ It needs to be in the same namespace as the LokiStack custom resource.

PrometheusDuration defines the type for Prometheus durations.

- ## QueryLimitSpec { #loki-grafana-com-v1beta1-QueryLimitSpec }

(Appears on:LimitsTemplateSpec) @@ -6912,7 +6799,6 @@ that is returned by a metric query.

- ## RecordingRule { #loki-grafana-com-v1beta1-RecordingRule }

RecordingRule is the Schema for the recordingrules API

@@ -6965,7 +6851,6 @@ RecordingRuleStatus - ## RecordingRuleGroup { #loki-grafana-com-v1beta1-RecordingRuleGroup }

(Appears on:RecordingRuleSpec) @@ -7034,7 +6919,6 @@ int32 - ## RecordingRuleGroupSpec { #loki-grafana-com-v1beta1-RecordingRuleGroupSpec }

(Appears on:RecordingRuleGroup) @@ -7077,7 +6961,6 @@ pending/firing alerts.

- ## RecordingRuleSpec { #loki-grafana-com-v1beta1-RecordingRuleSpec }

(Appears on:RecordingRule) @@ -7120,7 +7003,6 @@ string - ## RecordingRuleStatus { #loki-grafana-com-v1beta1-RecordingRuleStatus }

(Appears on:RecordingRule) @@ -7152,7 +7034,6 @@ string - ## RelabelActionType { #loki-grafana-com-v1beta1-RelabelActionType } (string alias)

@@ -7161,7 +7042,6 @@ string

RelabelActionType defines the enumeration type for RelabelConfig actions.

- ## RelabelConfig { #loki-grafana-com-v1beta1-RelabelConfig }

(Appears on:AlertManagerSpec, RemoteWriteClientSpec) @@ -7270,7 +7150,6 @@ RelabelActionType - ## RemoteWriteAuthType { #loki-grafana-com-v1beta1-RemoteWriteAuthType } (string alias)

@@ -7294,7 +7173,6 @@ RelabelActionType - ## RemoteWriteClientQueueSpec { #loki-grafana-com-v1beta1-RemoteWriteClientQueueSpec }

(Appears on:RemoteWriteSpec) @@ -7402,7 +7280,6 @@ PrometheusDuration - ## RemoteWriteClientSpec { #loki-grafana-com-v1beta1-RemoteWriteClientSpec }

(Appears on:RemoteWriteSpec) @@ -7530,7 +7407,6 @@ bool - ## RemoteWriteSpec { #loki-grafana-com-v1beta1-RemoteWriteSpec }

(Appears on:RulerConfigSpec) @@ -7602,7 +7478,6 @@ RemoteWriteClientQueueSpec - ## RoleBindingsSpec { #loki-grafana-com-v1beta1-RoleBindingsSpec }

(Appears on:AuthorizationSpec) @@ -7652,7 +7527,6 @@ string - ## RoleSpec { #loki-grafana-com-v1beta1-RoleSpec }

(Appears on:AuthorizationSpec) @@ -7712,7 +7586,6 @@ string - ## RulerConfig { #loki-grafana-com-v1beta1-RulerConfig }

RulerConfig is the Schema for the rulerconfigs API

@@ -7765,7 +7638,6 @@ RulerConfigStatus - ## RulerConfigSpec { #loki-grafana-com-v1beta1-RulerConfigSpec }

(Appears on:RulerConfig) @@ -7853,7 +7725,6 @@ map[string]github.com/grafana/loki/operator/apis/loki/v1beta1.RulerOverrides - ## RulerConfigStatus { #loki-grafana-com-v1beta1-RulerConfigStatus }

(Appears on:RulerConfig) @@ -7885,7 +7756,6 @@ map[string]github.com/grafana/loki/operator/apis/loki/v1beta1.RulerOverrides - ## RulerOverrides { #loki-grafana-com-v1beta1-RulerOverrides }

(Appears on:RulerConfigSpec) @@ -7917,7 +7787,6 @@ AlertManagerSpec - ## RulesSpec { #loki-grafana-com-v1beta1-RulesSpec }

(Appears on:LokiStackSpec) @@ -7976,7 +7845,6 @@ the same namespace as the LokiStack object is in is used.

- ## StorageSchemaEffectiveDate { #loki-grafana-com-v1beta1-StorageSchemaEffectiveDate } (string alias)

@@ -7985,7 +7853,6 @@ the same namespace as the LokiStack object is in is used.

StorageSchemaEffectiveDate defines the type for the Storage Schema Effect Date

- ## Subject { #loki-grafana-com-v1beta1-Subject }

(Appears on:RoleBindingsSpec) @@ -8025,7 +7892,6 @@ SubjectKind - ## SubjectKind { #loki-grafana-com-v1beta1-SubjectKind } (string alias)

@@ -8049,7 +7915,6 @@ SubjectKind - ## TenantSecretSpec { #loki-grafana-com-v1beta1-TenantSecretSpec }

(Appears on:OIDCSpec) @@ -8079,7 +7944,6 @@ string - ## TenantsSpec { #loki-grafana-com-v1beta1-TenantsSpec }

(Appears on:LokiStackSpec) @@ -8140,5 +8004,4 @@ AuthorizationSpec

- - ++newline diff --git a/operator/internal/manifests/internal/config/build_test.go b/operator/internal/manifests/internal/config/build_test.go index 6fdbdd7181e5..7a9479c34dd4 100644 --- a/operator/internal/manifests/internal/config/build_test.go +++ b/operator/internal/manifests/internal/config/build_test.go @@ -485,7 +485,7 @@ overrides: MaxQuerySeries: 500, QueryTimeout: "1m", CardinalityLimit: 100000, - MaxVolumeSeries: 1000, + MaxVolumeSeries: 1000, }, }, Tenants: map[string]lokiv1.PerTenantLimitsTemplateSpec{ @@ -953,7 +953,7 @@ overrides: MaxQuerySeries: 500, QueryTimeout: "1m", CardinalityLimit: 100000, - MaxVolumeSeries: 1000, + MaxVolumeSeries: 1000, }, }, }, @@ -1315,7 +1315,7 @@ overrides: MaxQuerySeries: 500, QueryTimeout: "1m", CardinalityLimit: 100000, - MaxVolumeSeries: 1000, + MaxVolumeSeries: 1000, }, }, }, @@ -1691,7 +1691,7 @@ overrides: MaxQuerySeries: 500, QueryTimeout: "1m", CardinalityLimit: 100000, - MaxVolumeSeries: 1000, + MaxVolumeSeries: 1000, }, }, }, @@ -2035,7 +2035,7 @@ overrides: MaxQuerySeries: 500, QueryTimeout: "1m", CardinalityLimit: 100000, - MaxVolumeSeries: 1000, + MaxVolumeSeries: 1000, }, Retention: &lokiv1.RetentionLimitSpec{ Days: 15, @@ -2439,7 +2439,7 @@ overrides: MaxQuerySeries: 500, QueryTimeout: "2m", CardinalityLimit: 100000, - MaxVolumeSeries: 1000, + MaxVolumeSeries: 1000, }, }, }, @@ -2839,7 +2839,7 @@ overrides: MaxQuerySeries: 500, QueryTimeout: "1m", CardinalityLimit: 100000, - MaxVolumeSeries: 1000, + MaxVolumeSeries: 1000, }, }, }, @@ -3238,7 +3238,7 @@ overrides: MaxQuerySeries: 500, QueryTimeout: "2m", CardinalityLimit: 100000, - MaxVolumeSeries: 1000, + MaxVolumeSeries: 1000, }, }, }, @@ -3632,7 +3632,7 @@ overrides: MaxQuerySeries: 500, QueryTimeout: "1m", CardinalityLimit: 100000, - MaxVolumeSeries: 1000, + MaxVolumeSeries: 1000, }, }, }, @@ -3897,7 +3897,7 @@ overrides: MaxQuerySeries: 500, QueryTimeout: "1m", CardinalityLimit: 100000, - MaxVolumeSeries: 1000, + MaxVolumeSeries: 1000, }, }, }, @@ -4162,7 +4162,7 @@ overrides: MaxQuerySeries: 500, QueryTimeout: "1m", CardinalityLimit: 100000, - MaxVolumeSeries: 1000, + MaxVolumeSeries: 1000, }, }, }, @@ -4434,7 +4434,7 @@ overrides: MaxQuerySeries: 500, QueryTimeout: "1m", CardinalityLimit: 100000, - MaxVolumeSeries: 1000, + MaxVolumeSeries: 1000, }, }, Tenants: map[string]lokiv1.PerTenantLimitsTemplateSpec{ @@ -4737,7 +4737,7 @@ overrides: MaxQuerySeries: 500, QueryTimeout: "1m", CardinalityLimit: 100000, - MaxVolumeSeries: 1000, + MaxVolumeSeries: 1000, }, }, Tenants: map[string]lokiv1.PerTenantLimitsTemplateSpec{ @@ -5029,7 +5029,7 @@ overrides: MaxQuerySeries: 500, QueryTimeout: "1m", CardinalityLimit: 100000, - MaxVolumeSeries: 1000, + MaxVolumeSeries: 1000, }, }, }, @@ -5120,7 +5120,7 @@ func defaultOptions() Options { MaxQuerySeries: 500, QueryTimeout: "1m", CardinalityLimit: 100000, - MaxVolumeSeries: 1000, + MaxVolumeSeries: 1000, }, }, }, @@ -5943,7 +5943,7 @@ overrides: MaxQuerySeries: 500, QueryTimeout: "1m", CardinalityLimit: 100000, - MaxVolumeSeries: 1000, + MaxVolumeSeries: 1000, }, }, }, From a005784d4ac7292add684def9f7fab5652de26f1 Mon Sep 17 00:00:00 2001 From: Jatin Suri Date: Tue, 2 Jul 2024 14:45:07 -0400 Subject: [PATCH 11/11] Hopefully fixed docs --- operator/docs/operator/api.md | 157 +++++++++++++++++++++++++++++++++- 1 file changed, 153 insertions(+), 4 deletions(-) diff --git a/operator/docs/operator/api.md b/operator/docs/operator/api.md index b8da6e57c937..3e2cb6a850ac 100644 --- a/operator/docs/operator/api.md +++ b/operator/docs/operator/api.md @@ -5,8 +5,8 @@ lead: "" draft: false images: [] menu: -+docs: -+parent: "operator" + docs: + parent: "operator" weight: 1000 toc: true --- @@ -17,6 +17,7 @@ This Document contains the types introduced by the Loki Operator to be consumed

Package v1 contains API Schema definitions for the loki v1 API group

Resource Types: + ## AlertManagerClientBasicAuth { #loki-grafana-com-v1-AlertManagerClientBasicAuth }

(Appears on:AlertManagerClientConfig) @@ -58,6 +59,7 @@ string + ## AlertManagerClientConfig { #loki-grafana-com-v1-AlertManagerClientConfig }

(Appears on:AlertManagerSpec) @@ -117,6 +119,7 @@ AlertManagerClientBasicAuth + ## AlertManagerClientHeaderAuth { #loki-grafana-com-v1-AlertManagerClientHeaderAuth }

(Appears on:AlertManagerClientConfig) @@ -170,6 +173,7 @@ string + ## AlertManagerClientTLSConfig { #loki-grafana-com-v1-AlertManagerClientTLSConfig }

(Appears on:AlertManagerClientConfig) @@ -247,6 +251,7 @@ bool + ## AlertManagerDiscoverySpec { #loki-grafana-com-v1-AlertManagerDiscoverySpec }

(Appears on:AlertManagerSpec) @@ -290,6 +295,7 @@ PrometheusDuration + ## AlertManagerNotificationQueueSpec { #loki-grafana-com-v1-AlertManagerNotificationQueueSpec }

(Appears on:AlertManagerSpec) @@ -376,6 +382,7 @@ PrometheusDuration + ## AlertManagerSpec { #loki-grafana-com-v1-AlertManagerSpec }

(Appears on:RulerConfigSpec, RulerOverrides) @@ -498,6 +505,7 @@ AlertManagerClientConfig + ## AlertingRule { #loki-grafana-com-v1-AlertingRule }

AlertingRule is the Schema for the alertingrules API

@@ -550,6 +558,7 @@ AlertingRuleStatus + ## AlertingRuleGroup { #loki-grafana-com-v1-AlertingRuleGroup }

(Appears on:AlertingRuleSpec) @@ -618,6 +627,7 @@ int32 + ## AlertingRuleGroupSpec { #loki-grafana-com-v1-AlertingRuleGroupSpec }

(Appears on:AlertingRuleGroup) @@ -699,6 +709,7 @@ map[string]string + ## AlertingRuleSpec { #loki-grafana-com-v1-AlertingRuleSpec }

(Appears on:AlertingRule) @@ -741,6 +752,7 @@ string + ## AlertingRuleStatus { #loki-grafana-com-v1-AlertingRuleStatus }

(Appears on:AlertingRule) @@ -772,6 +784,7 @@ string + ## AuthenticationSpec { #loki-grafana-com-v1-AuthenticationSpec }

(Appears on:TenantsSpec) @@ -839,6 +852,7 @@ MTLSSpec + ## AuthorizationSpec { #loki-grafana-com-v1-AuthorizationSpec }

(Appears on:TenantsSpec) @@ -899,6 +913,7 @@ OPASpec + ## BlockedQuerySpec { #loki-grafana-com-v1-BlockedQuerySpec }

(Appears on:PerTenantQueryLimitSpec) @@ -966,6 +981,7 @@ BlockedQueryTypes + ## BlockedQueryType { #loki-grafana-com-v1-BlockedQueryType } (string alias)

@@ -989,6 +1005,7 @@ BlockedQueryTypes + ## BlockedQueryTypes { #loki-grafana-com-v1-BlockedQueryTypes } ([]github.com/grafana/loki/operator/apis/loki/v1.BlockedQueryType alias)

@@ -997,6 +1014,7 @@ BlockedQueryTypes

BlockedQueryTypes defines a slice of BlockedQueryType values to be used for a blocked query.

+ ## CASpec { #loki-grafana-com-v1-CASpec }

(Appears on:MTLSSpec, OIDCSpec, ObjectStorageTLSSpec) @@ -1039,6 +1057,7 @@ It needs to be in the same namespace as the LokiStack custom resource.

+ ## ClusterProxy { #loki-grafana-com-v1-ClusterProxy }

(Appears on:LokiStackSpec) @@ -1092,6 +1111,7 @@ string + ## CredentialMode { #loki-grafana-com-v1-CredentialMode } (string alias)

@@ -1125,6 +1145,7 @@ a secret. This mode is only supported for certain object storage types in certai + ## HashRingSpec { #loki-grafana-com-v1-HashRingSpec }

(Appears on:LokiStackSpec) @@ -1169,6 +1190,7 @@ MemberListSpec + ## HashRingType { #loki-grafana-com-v1-HashRingType } (string alias)

@@ -1189,6 +1211,7 @@ MemberListSpec + ## IngestionLimitSpec { #loki-grafana-com-v1-IngestionLimitSpec }

(Appears on:LimitsTemplateSpec, PerTenantLimitsTemplateSpec) @@ -1333,6 +1356,7 @@ int32 + ## InstanceAddrType { #loki-grafana-com-v1-InstanceAddrType } (string alias)

@@ -1356,6 +1380,7 @@ int32 + ## LimitsSpec { #loki-grafana-com-v1-LimitsSpec }

(Appears on:LokiStackSpec) @@ -1402,6 +1427,7 @@ map[string]github.com/grafana/loki/operator/apis/loki/v1.PerTenantLimitsTemplate + ## LimitsTemplateSpec { #loki-grafana-com-v1-LimitsTemplateSpec }

(Appears on:LimitsSpec) @@ -1461,6 +1487,7 @@ RetentionLimitSpec + ## LokiComponentSpec { #loki-grafana-com-v1-LokiComponentSpec }

(Appears on:LokiTemplateSpec) @@ -1534,6 +1561,7 @@ of a component.

+ ## LokiStack { #loki-grafana-com-v1-LokiStack }

LokiStack is the Schema for the lokistacks API

@@ -1588,6 +1616,7 @@ Refer to the Kubernetes API documentation for the fields of the + ## LokiStackComponentStatus { #loki-grafana-com-v1-LokiStackComponentStatus }

(Appears on:LokiStackStatus) @@ -1718,6 +1747,7 @@ PodStatusMap + ## LokiStackConditionReason { #loki-grafana-com-v1-LokiStackConditionReason } (string alias)

@@ -1812,6 +1842,7 @@ CredentialsRequest, but it can persist if the CCO or its configuration are incor + ## LokiStackConditionType { #loki-grafana-com-v1-LokiStackConditionType } (string alias)
@@ -1843,6 +1874,7 @@ issues. There can be multiple warning conditions active at a time.

+ ## LokiStackSizeType { #loki-grafana-com-v1-LokiStackSizeType } (string alias)

@@ -1889,6 +1921,7 @@ requirement for single replication factor and auto-compaction.

+ ## LokiStackSpec { #loki-grafana-com-v1-LokiStackSpec }

(Appears on:LokiStack) @@ -2068,6 +2101,7 @@ TenantsSpec + ## LokiStackStatus { #loki-grafana-com-v1-LokiStackStatus }

(Appears on:LokiStack) @@ -2129,6 +2163,7 @@ to the storage configuration.

+ ## LokiStackStorageStatus { #loki-grafana-com-v1-LokiStackStorageStatus }

(Appears on:LokiStackStatus) @@ -2176,6 +2211,7 @@ CredentialMode + ## LokiTemplateSpec { #loki-grafana-com-v1-LokiTemplateSpec }

(Appears on:LokiStackSpec) @@ -2306,6 +2342,7 @@ LokiComponentSpec + ## MTLSSpec { #loki-grafana-com-v1-MTLSSpec }

(Appears on:AuthenticationSpec) @@ -2336,6 +2373,7 @@ CASpec + ## ManagementStateType { #loki-grafana-com-v1-ManagementStateType } (string alias)

@@ -2361,6 +2399,7 @@ reconciled by the operator.

+ ## MemberListSpec { #loki-grafana-com-v1-MemberListSpec }

(Appears on:HashRingSpec) @@ -2409,6 +2448,7 @@ for the memberlist.

+ ## ModeType { #loki-grafana-com-v1-ModeType } (string alias)

@@ -2439,6 +2479,7 @@ using an in-process OpenPolicyAgent Rego authorizer.

+ ## OIDCSpec { #loki-grafana-com-v1-OIDCSpec }

(Appears on:AuthenticationSpec) @@ -2530,6 +2571,7 @@ string + ## OPASpec { #loki-grafana-com-v1-OPASpec }

(Appears on:AuthorizationSpec) @@ -2558,6 +2600,7 @@ string + ## ObjectStorageSchema { #loki-grafana-com-v1-ObjectStorageSchema }

(Appears on:LokiStackStorageStatus, ObjectStorageSpec) @@ -2605,6 +2648,7 @@ using it once the day rolls over.

+ ## ObjectStorageSchemaVersion { #loki-grafana-com-v1-ObjectStorageSchemaVersion } (string alias)

@@ -2632,6 +2676,7 @@ used with the Loki cluster.

+ ## ObjectStorageSecretSpec { #loki-grafana-com-v1-ObjectStorageSecretSpec }

(Appears on:ObjectStorageSpec) @@ -2689,6 +2734,7 @@ own configuration.

+ ## ObjectStorageSecretType { #loki-grafana-com-v1-ObjectStorageSecretType } (string alias)

@@ -2721,6 +2767,7 @@ own configuration.

+ ## ObjectStorageSpec { #loki-grafana-com-v1-ObjectStorageSpec }

(Appears on:LokiStackSpec) @@ -2781,6 +2828,7 @@ ObjectStorageTLSSpec + ## ObjectStorageTLSSpec { #loki-grafana-com-v1-ObjectStorageTLSSpec }

(Appears on:ObjectStorageSpec) @@ -2824,6 +2872,7 @@ It needs to be in the same namespace as the LokiStack custom resource.

+ ## OpenshiftTenantSpec { #loki-grafana-com-v1-OpenshiftTenantSpec }

(Appears on:TenantsSpec) @@ -2858,6 +2907,7 @@ Setting this to an empty array disables admin groups.

+ ## PerTenantLimitsTemplateSpec { #loki-grafana-com-v1-PerTenantLimitsTemplateSpec }

(Appears on:LimitsSpec) @@ -2917,6 +2967,7 @@ RetentionLimitSpec + ## PerTenantQueryLimitSpec { #loki-grafana-com-v1-PerTenantQueryLimitSpec }

(Appears on:PerTenantLimitsTemplateSpec) @@ -2960,6 +3011,7 @@ QueryLimitSpec + ## PermissionType { #loki-grafana-com-v1-PermissionType } (string alias)

@@ -2983,6 +3035,7 @@ QueryLimitSpec + ## PodStatus { #loki-grafana-com-v1-PodStatus } (string alias)

@@ -3016,6 +3069,7 @@ At least one container is still running or is in the process of being restarted. + ## PodStatusMap { #loki-grafana-com-v1-PodStatusMap } (map[github.com/grafana/loki/operator/apis/loki/v1.PodStatus][]string alias)

@@ -3024,6 +3078,7 @@ At least one container is still running or is in the process of being restarted.

PodStatusMap defines the type for mapping pod status to pod name.

+ ## PrometheusDuration { #loki-grafana-com-v1-PrometheusDuration } (string alias)

@@ -3032,6 +3087,7 @@ At least one container is still running or is in the process of being restarted.

PrometheusDuration defines the type for Prometheus durations.

+ ## QueryLimitSpec { #loki-grafana-com-v1-QueryLimitSpec }

(Appears on:LimitsTemplateSpec, PerTenantQueryLimitSpec) @@ -3123,6 +3179,7 @@ int32 + ## RecordingRule { #loki-grafana-com-v1-RecordingRule }

RecordingRule is the Schema for the recordingrules API

@@ -3175,6 +3232,7 @@ RecordingRuleStatus + ## RecordingRuleGroup { #loki-grafana-com-v1-RecordingRuleGroup }

(Appears on:RecordingRuleSpec) @@ -3243,6 +3301,7 @@ int32 + ## RecordingRuleGroupSpec { #loki-grafana-com-v1-RecordingRuleGroupSpec }

(Appears on:RecordingRuleGroup) @@ -3297,6 +3356,7 @@ map[string]string + ## RecordingRuleSpec { #loki-grafana-com-v1-RecordingRuleSpec }

(Appears on:RecordingRule) @@ -3339,6 +3399,7 @@ string + ## RecordingRuleStatus { #loki-grafana-com-v1-RecordingRuleStatus }

(Appears on:RecordingRule) @@ -3370,6 +3431,7 @@ string + ## RelabelActionType { #loki-grafana-com-v1-RelabelActionType } (string alias)

@@ -3378,6 +3440,7 @@ string

RelabelActionType defines the enumeration type for RelabelConfig actions.

+ ## RelabelConfig { #loki-grafana-com-v1-RelabelConfig }

(Appears on:AlertManagerSpec, RemoteWriteClientSpec) @@ -3486,6 +3549,7 @@ RelabelActionType + ## RemoteWriteAuthType { #loki-grafana-com-v1-RemoteWriteAuthType } (string alias)

@@ -3509,6 +3573,7 @@ RelabelActionType + ## RemoteWriteClientQueueSpec { #loki-grafana-com-v1-RemoteWriteClientQueueSpec }

(Appears on:RemoteWriteSpec) @@ -3616,6 +3681,7 @@ PrometheusDuration + ## RemoteWriteClientSpec { #loki-grafana-com-v1-RemoteWriteClientSpec }

(Appears on:RemoteWriteSpec) @@ -3743,6 +3809,7 @@ bool + ## RemoteWriteSpec { #loki-grafana-com-v1-RemoteWriteSpec }

(Appears on:RulerConfigSpec) @@ -3814,6 +3881,7 @@ RemoteWriteClientQueueSpec + ## ReplicationSpec { #loki-grafana-com-v1-ReplicationSpec }

(Appears on:LokiStackSpec) @@ -3857,6 +3925,7 @@ IMPORTANT: Make sure that the replication factor defined is less than or equal t + ## RetentionLimitSpec { #loki-grafana-com-v1-RetentionLimitSpec }

(Appears on:LimitsTemplateSpec, PerTenantLimitsTemplateSpec) @@ -3899,6 +3968,7 @@ uint + ## RetentionStreamSpec { #loki-grafana-com-v1-RetentionStreamSpec }

(Appears on:RetentionLimitSpec) @@ -3950,6 +4020,7 @@ string + ## RoleBindingsSpec { #loki-grafana-com-v1-RoleBindingsSpec }

(Appears on:AuthorizationSpec) @@ -3999,6 +4070,7 @@ string + ## RoleSpec { #loki-grafana-com-v1-RoleSpec }

(Appears on:AuthorizationSpec) @@ -4058,6 +4130,7 @@ string + ## RulerConfig { #loki-grafana-com-v1-RulerConfig }

RulerConfig is the Schema for the rulerconfigs API

@@ -4110,6 +4183,7 @@ RulerConfigStatus + ## RulerConfigSpec { #loki-grafana-com-v1-RulerConfigSpec }

(Appears on:RulerConfig) @@ -4197,6 +4271,7 @@ map[string]github.com/grafana/loki/operator/apis/loki/v1.RulerOverrides + ## RulerConfigStatus { #loki-grafana-com-v1-RulerConfigStatus }

(Appears on:RulerConfig) @@ -4228,6 +4303,7 @@ map[string]github.com/grafana/loki/operator/apis/loki/v1.RulerOverrides + ## RulerOverrides { #loki-grafana-com-v1-RulerOverrides }

(Appears on:RulerConfigSpec) @@ -4259,6 +4335,7 @@ AlertManagerSpec + ## RulesSpec { #loki-grafana-com-v1-RulesSpec }

(Appears on:LokiStackSpec) @@ -4317,6 +4394,7 @@ the same namespace as the LokiStack object is in is used.

+ ## StorageSchemaEffectiveDate { #loki-grafana-com-v1-StorageSchemaEffectiveDate } (string alias)

@@ -4325,6 +4403,7 @@ the same namespace as the LokiStack object is in is used.

StorageSchemaEffectiveDate defines the type for the Storage Schema Effect Date

+ ## Subject { #loki-grafana-com-v1-Subject }

(Appears on:RoleBindingsSpec) @@ -4364,6 +4443,7 @@ SubjectKind + ## SubjectKind { #loki-grafana-com-v1-SubjectKind } (string alias)

@@ -4387,6 +4467,7 @@ SubjectKind + ## TenantSecretSpec { #loki-grafana-com-v1-TenantSecretSpec }

(Appears on:OIDCSpec) @@ -4416,6 +4497,7 @@ string + ## TenantsSpec { #loki-grafana-com-v1-TenantsSpec }

(Appears on:LokiStackSpec) @@ -4489,6 +4571,7 @@ OpenshiftTenantSpec + ## ZoneSpec { #loki-grafana-com-v1-ZoneSpec }

(Appears on:ReplicationSpec) @@ -4529,12 +4612,14 @@ string

-+newline + + # loki.grafana.com/v1beta1 { #loki-grafana-com-v1beta1 }

Package v1beta1 contains API Schema definitions for the loki v1beta1 API group

Resource Types: + ## AlertManagerClientBasicAuth { #loki-grafana-com-v1beta1-AlertManagerClientBasicAuth }

(Appears on:AlertManagerClientConfig) @@ -4576,6 +4661,7 @@ string + ## AlertManagerClientConfig { #loki-grafana-com-v1beta1-AlertManagerClientConfig }

(Appears on:AlertManagerSpec) @@ -4635,6 +4721,7 @@ AlertManagerClientBasicAuth + ## AlertManagerClientHeaderAuth { #loki-grafana-com-v1beta1-AlertManagerClientHeaderAuth }

(Appears on:AlertManagerClientConfig) @@ -4688,6 +4775,7 @@ string + ## AlertManagerClientTLSConfig { #loki-grafana-com-v1beta1-AlertManagerClientTLSConfig }

(Appears on:AlertManagerClientConfig) @@ -4753,6 +4841,7 @@ string + ## AlertManagerDiscoverySpec { #loki-grafana-com-v1beta1-AlertManagerDiscoverySpec }

(Appears on:AlertManagerSpec) @@ -4796,6 +4885,7 @@ PrometheusDuration + ## AlertManagerNotificationQueueSpec { #loki-grafana-com-v1beta1-AlertManagerNotificationQueueSpec }

(Appears on:AlertManagerSpec) @@ -4882,6 +4972,7 @@ PrometheusDuration + ## AlertManagerSpec { #loki-grafana-com-v1beta1-AlertManagerSpec }

(Appears on:RulerConfigSpec, RulerOverrides) @@ -5004,6 +5095,7 @@ AlertManagerClientConfig + ## AlertingRule { #loki-grafana-com-v1beta1-AlertingRule }

AlertingRule is the Schema for the alertingrules API

@@ -5056,6 +5148,7 @@ AlertingRuleStatus + ## AlertingRuleGroup { #loki-grafana-com-v1beta1-AlertingRuleGroup }

(Appears on:AlertingRuleSpec) @@ -5124,6 +5217,7 @@ int32 + ## AlertingRuleGroupSpec { #loki-grafana-com-v1beta1-AlertingRuleGroupSpec }

(Appears on:AlertingRuleGroup) @@ -5205,6 +5299,7 @@ map[string]string + ## AlertingRuleSpec { #loki-grafana-com-v1beta1-AlertingRuleSpec }

(Appears on:AlertingRule) @@ -5247,6 +5342,7 @@ string + ## AlertingRuleStatus { #loki-grafana-com-v1beta1-AlertingRuleStatus }

(Appears on:AlertingRule) @@ -5278,6 +5374,7 @@ string + ## AuthenticationSpec { #loki-grafana-com-v1beta1-AuthenticationSpec }

(Appears on:TenantsSpec) @@ -5330,6 +5427,7 @@ OIDCSpec + ## AuthorizationSpec { #loki-grafana-com-v1beta1-AuthorizationSpec }

(Appears on:TenantsSpec) @@ -5390,6 +5488,7 @@ OPASpec + ## IngestionLimitSpec { #loki-grafana-com-v1beta1-IngestionLimitSpec }

(Appears on:LimitsTemplateSpec) @@ -5497,6 +5596,7 @@ int32 + ## LimitsSpec { #loki-grafana-com-v1beta1-LimitsSpec }

(Appears on:LokiStackSpec) @@ -5544,6 +5644,7 @@ map[string]github.com/grafana/loki/operator/apis/loki/v1beta1.LimitsTemplateSpec + ## LimitsTemplateSpec { #loki-grafana-com-v1beta1-LimitsTemplateSpec }

(Appears on:LimitsSpec) @@ -5589,6 +5690,7 @@ QueryLimitSpec + ## LokiComponentSpec { #loki-grafana-com-v1beta1-LokiComponentSpec }

(Appears on:LokiTemplateSpec) @@ -5647,6 +5749,7 @@ the component onto it.

+ ## LokiStack { #loki-grafana-com-v1beta1-LokiStack }

LokiStack is the Schema for the lokistacks API

@@ -5699,6 +5802,7 @@ Refer to the Kubernetes API documentation for the fields of the + ## LokiStackComponentStatus { #loki-grafana-com-v1beta1-LokiStackComponentStatus }

(Appears on:LokiStackStatus) @@ -5829,6 +5933,7 @@ PodStatusMap + ## LokiStackConditionReason { #loki-grafana-com-v1beta1-LokiStackConditionReason } (string alias)

@@ -5893,6 +5998,7 @@ for the ruler is missing.

+ ## LokiStackConditionType { #loki-grafana-com-v1beta1-LokiStackConditionType } (string alias)
@@ -5920,6 +6026,7 @@ are degraded or the cluster cannot connect to object storage.

+ ## LokiStackSizeType { #loki-grafana-com-v1beta1-LokiStackSizeType } (string alias)

@@ -5958,6 +6065,7 @@ requirement for single replication factor and auto-compaction.

+ ## LokiStackSpec { #loki-grafana-com-v1beta1-LokiStackSpec }

(Appears on:LokiStack) @@ -6094,6 +6202,7 @@ TenantsSpec + ## LokiStackStatus { #loki-grafana-com-v1beta1-LokiStackStatus }

(Appears on:LokiStack) @@ -6155,6 +6264,7 @@ to the storage configuration.

+ ## LokiStackStorageStatus { #loki-grafana-com-v1beta1-LokiStackStorageStatus }

(Appears on:LokiStackStatus) @@ -6188,6 +6298,7 @@ to the LokiStack.

+ ## LokiTemplateSpec { #loki-grafana-com-v1beta1-LokiTemplateSpec }

(Appears on:LokiStackSpec) @@ -6318,6 +6429,7 @@ LokiComponentSpec + ## ManagementStateType { #loki-grafana-com-v1beta1-ManagementStateType } (string alias)

@@ -6343,6 +6455,7 @@ reconciled by the operator.

+ ## ModeType { #loki-grafana-com-v1beta1-ModeType } (string alias)

@@ -6370,6 +6483,7 @@ using an in-process OpenPolicyAgent Rego authorizer.

+ ## OIDCSpec { #loki-grafana-com-v1beta1-OIDCSpec }

(Appears on:AuthenticationSpec) @@ -6447,6 +6561,7 @@ string + ## OPASpec { #loki-grafana-com-v1beta1-OPASpec }

(Appears on:AuthorizationSpec) @@ -6475,6 +6590,7 @@ string + ## ObjectStorageSchema { #loki-grafana-com-v1beta1-ObjectStorageSchema }

(Appears on:LokiStackStorageStatus, ObjectStorageSpec) @@ -6521,6 +6637,7 @@ date in UTC.

+ ## ObjectStorageSchemaVersion { #loki-grafana-com-v1beta1-ObjectStorageSchemaVersion } (string alias)

@@ -6545,6 +6662,7 @@ used with the Loki cluster.

+ ## ObjectStorageSecretSpec { #loki-grafana-com-v1beta1-ObjectStorageSecretSpec }

(Appears on:ObjectStorageSpec) @@ -6586,6 +6704,7 @@ string + ## ObjectStorageSecretType { #loki-grafana-com-v1beta1-ObjectStorageSecretType } (string alias)

@@ -6615,6 +6734,7 @@ string + ## ObjectStorageSpec { #loki-grafana-com-v1beta1-ObjectStorageSpec }

(Appears on:LokiStackSpec) @@ -6675,6 +6795,7 @@ ObjectStorageTLSSpec + ## ObjectStorageTLSSpec { #loki-grafana-com-v1beta1-ObjectStorageTLSSpec }

(Appears on:ObjectStorageSpec) @@ -6705,6 +6826,7 @@ It needs to be in the same namespace as the LokiStack custom resource.

+ ## PermissionType { #loki-grafana-com-v1beta1-PermissionType } (string alias)

@@ -6728,6 +6850,7 @@ It needs to be in the same namespace as the LokiStack custom resource.

+ ## PodStatusMap { #loki-grafana-com-v1beta1-PodStatusMap } (map[k8s.io/api/core/v1.PodPhase][]string alias)

@@ -6736,6 +6859,7 @@ It needs to be in the same namespace as the LokiStack custom resource.

PodStatusMap defines the type for mapping pod status to pod name.

+ ## PrometheusDuration { #loki-grafana-com-v1beta1-PrometheusDuration } (string alias)

@@ -6744,6 +6868,7 @@ It needs to be in the same namespace as the LokiStack custom resource.

PrometheusDuration defines the type for Prometheus durations.

+ ## QueryLimitSpec { #loki-grafana-com-v1beta1-QueryLimitSpec }

(Appears on:LimitsTemplateSpec) @@ -6799,6 +6924,7 @@ that is returned by a metric query.

+ ## RecordingRule { #loki-grafana-com-v1beta1-RecordingRule }

RecordingRule is the Schema for the recordingrules API

@@ -6851,6 +6977,7 @@ RecordingRuleStatus + ## RecordingRuleGroup { #loki-grafana-com-v1beta1-RecordingRuleGroup }

(Appears on:RecordingRuleSpec) @@ -6919,6 +7046,7 @@ int32 + ## RecordingRuleGroupSpec { #loki-grafana-com-v1beta1-RecordingRuleGroupSpec }

(Appears on:RecordingRuleGroup) @@ -6961,6 +7089,7 @@ pending/firing alerts.

+ ## RecordingRuleSpec { #loki-grafana-com-v1beta1-RecordingRuleSpec }

(Appears on:RecordingRule) @@ -7003,6 +7132,7 @@ string + ## RecordingRuleStatus { #loki-grafana-com-v1beta1-RecordingRuleStatus }

(Appears on:RecordingRule) @@ -7034,6 +7164,7 @@ string + ## RelabelActionType { #loki-grafana-com-v1beta1-RelabelActionType } (string alias)

@@ -7042,6 +7173,7 @@ string

RelabelActionType defines the enumeration type for RelabelConfig actions.

+ ## RelabelConfig { #loki-grafana-com-v1beta1-RelabelConfig }

(Appears on:AlertManagerSpec, RemoteWriteClientSpec) @@ -7150,6 +7282,7 @@ RelabelActionType + ## RemoteWriteAuthType { #loki-grafana-com-v1beta1-RemoteWriteAuthType } (string alias)

@@ -7173,6 +7306,7 @@ RelabelActionType + ## RemoteWriteClientQueueSpec { #loki-grafana-com-v1beta1-RemoteWriteClientQueueSpec }

(Appears on:RemoteWriteSpec) @@ -7280,6 +7414,7 @@ PrometheusDuration + ## RemoteWriteClientSpec { #loki-grafana-com-v1beta1-RemoteWriteClientSpec }

(Appears on:RemoteWriteSpec) @@ -7407,6 +7542,7 @@ bool + ## RemoteWriteSpec { #loki-grafana-com-v1beta1-RemoteWriteSpec }

(Appears on:RulerConfigSpec) @@ -7478,6 +7614,7 @@ RemoteWriteClientQueueSpec + ## RoleBindingsSpec { #loki-grafana-com-v1beta1-RoleBindingsSpec }

(Appears on:AuthorizationSpec) @@ -7527,6 +7664,7 @@ string + ## RoleSpec { #loki-grafana-com-v1beta1-RoleSpec }

(Appears on:AuthorizationSpec) @@ -7586,6 +7724,7 @@ string + ## RulerConfig { #loki-grafana-com-v1beta1-RulerConfig }

RulerConfig is the Schema for the rulerconfigs API

@@ -7638,6 +7777,7 @@ RulerConfigStatus + ## RulerConfigSpec { #loki-grafana-com-v1beta1-RulerConfigSpec }

(Appears on:RulerConfig) @@ -7725,6 +7865,7 @@ map[string]github.com/grafana/loki/operator/apis/loki/v1beta1.RulerOverrides + ## RulerConfigStatus { #loki-grafana-com-v1beta1-RulerConfigStatus }

(Appears on:RulerConfig) @@ -7756,6 +7897,7 @@ map[string]github.com/grafana/loki/operator/apis/loki/v1beta1.RulerOverrides + ## RulerOverrides { #loki-grafana-com-v1beta1-RulerOverrides }

(Appears on:RulerConfigSpec) @@ -7787,6 +7929,7 @@ AlertManagerSpec + ## RulesSpec { #loki-grafana-com-v1beta1-RulesSpec }

(Appears on:LokiStackSpec) @@ -7845,6 +7988,7 @@ the same namespace as the LokiStack object is in is used.

+ ## StorageSchemaEffectiveDate { #loki-grafana-com-v1beta1-StorageSchemaEffectiveDate } (string alias)

@@ -7853,6 +7997,7 @@ the same namespace as the LokiStack object is in is used.

StorageSchemaEffectiveDate defines the type for the Storage Schema Effect Date

+ ## Subject { #loki-grafana-com-v1beta1-Subject }

(Appears on:RoleBindingsSpec) @@ -7892,6 +8037,7 @@ SubjectKind + ## SubjectKind { #loki-grafana-com-v1beta1-SubjectKind } (string alias)

@@ -7915,6 +8061,7 @@ SubjectKind + ## TenantSecretSpec { #loki-grafana-com-v1beta1-TenantSecretSpec }

(Appears on:OIDCSpec) @@ -7944,6 +8091,7 @@ string + ## TenantsSpec { #loki-grafana-com-v1beta1-TenantsSpec }

(Appears on:LokiStackSpec) @@ -8004,4 +8152,5 @@ AuthorizationSpec

-+newline + +