Applying new default configs

ViaQ · Nov 29, 2021 · c051cf1 · c051cf1
1 parent ec4b0d4
commit c051cf1
Show file tree

Hide file tree

Showing 8 changed files with 195 additions and 66 deletions.
diff --git a/api/v1beta1/lokistack_types.go b/api/v1beta1/lokistack_types.go
@@ -423,12 +423,28 @@ type IngestionLimitSpec struct {
 	// +operator-sdk:csv:customresourcedefinitions:type=spec,xDescriptors="urn:alm:descriptor:com.tectonic.ui:number",displayName="Max Global Streams per  Tenant"
 	MaxGlobalStreamsPerTenant int32 `json:"maxGlobalStreamsPerTenant,omitempty"`
 
-	// MaxLineSize defines the aximum line size on ingestion path. Units in Bytes.
+	// MaxLineSize defines the maximum line size on ingestion path. Units in Bytes.
 	//
 	// +optional
 	// +kubebuilder:validation:Optional
 	// +operator-sdk:csv:customresourcedefinitions:type=spec,xDescriptors="urn:alm:descriptor:com.tectonic.ui:number",displayName="Max Line Size"
 	MaxLineSize int32 `json:"maxLineSize,omitempty"`
+
+	// PerStreamRateLimit defines the maximum byte rate per second for each stream. Units in Bytes.
+	//
+	// +optional
+	// +kubebuilder:validation:Optional
+	// +operator-sdk:csv:customresourcedefinitions:type=spec,xDescriptors="urn:alm:descriptor:com.tectonic.ui:number",displayName="Per Stream Rate Limit"
+	PerStreamRateLimit int32 `json:"perStreamRateLimit,omitempty"`
+
+	// PerStreamRateLimitBurst defines the maximum burst bytes per stream.
+	// This value sets the upper limit for the stream rate limit. When exceeding
+	// this, the stream is limited.
+	//
+	// +optional
+	// +kubebuilder:validation:Optional
+	// +operator-sdk:csv:customresourcedefinitions:type=spec,xDescriptors="urn:alm:descriptor:com.tectonic.ui:number",displayName="PerStreamRateLimitBurst"
+	PerStreamRateLimitBurst int32 `json:"perStreamRateLimitBurst,omitempty"`
 }
 
 // LimitsTemplateSpec defines the limits  applied at ingestion or query path.

diff --git a/bundle/manifests/loki-operator.clusterserviceversion.yaml b/bundle/manifests/loki-operator.clusterserviceversion.yaml
@@ -128,12 +128,25 @@ spec:
         path: limits.global.ingestion.maxLabelValueLength
         x-descriptors:
         - urn:alm:descriptor:com.tectonic.ui:number
-      - description: MaxLineSize defines the aximum line size on ingestion path. Units
-          in Bytes.
+      - description: MaxLineSize defines the maximum line size on ingestion path.
+          Units in Bytes.
         displayName: Max Line Size
         path: limits.global.ingestion.maxLineSize
         x-descriptors:
         - urn:alm:descriptor:com.tectonic.ui:number
+      - description: PerStreamRateLimit defines the maximum byte rate per second for
+          each stream. Units in Bytes.
+        displayName: Per Stream Rate Limit
+        path: limits.global.ingestion.perStreamRateLimit
+        x-descriptors:
+        - urn:alm:descriptor:com.tectonic.ui:number
+      - description: PerStreamRateLimitBurst defines the maximum burst bytes per stream.
+          This value sets the upper limit for the stream rate limit. When exceeding
+          this, the stream is limited.
+        displayName: PerStreamRateLimitBurst
+        path: limits.global.ingestion.perStreamRateLimitBurst
+        x-descriptors:
+        - urn:alm:descriptor:com.tectonic.ui:number
       - description: MaxChunksPerQuery defines the maximum number of chunks that can
           be fetched by a single query.
         displayName: Max Chunk per Query
@@ -191,12 +204,25 @@ spec:
         path: limits.tenants.ingestion.maxLabelValueLength
         x-descriptors:
         - urn:alm:descriptor:com.tectonic.ui:number
-      - description: MaxLineSize defines the aximum line size on ingestion path. Units
-          in Bytes.
+      - description: MaxLineSize defines the maximum line size on ingestion path.
+          Units in Bytes.
         displayName: Max Line Size
         path: limits.tenants.ingestion.maxLineSize
         x-descriptors:
         - urn:alm:descriptor:com.tectonic.ui:number
+      - description: PerStreamRateLimit defines the maximum byte rate per second for
+          each stream. Units in Bytes.
+        displayName: Per Stream Rate Limit
+        path: limits.tenants.ingestion.perStreamRateLimit
+        x-descriptors:
+        - urn:alm:descriptor:com.tectonic.ui:number
+      - description: PerStreamRateLimitBurst defines the maximum burst bytes per stream.
+          This value sets the upper limit for the stream rate limit. When exceeding
+          this, the stream is limited.
+        displayName: PerStreamRateLimitBurst
+        path: limits.tenants.ingestion.perStreamRateLimitBurst
+        x-descriptors:
+        - urn:alm:descriptor:com.tectonic.ui:number
       - description: MaxChunksPerQuery defines the maximum number of chunks that can
           be fetched by a single query.
         displayName: Max Chunk per Query

diff --git a/bundle/manifests/loki.openshift.io_lokistacks.yaml b/bundle/manifests/loki.openshift.io_lokistacks.yaml
@@ -87,10 +87,22 @@ spec:
                             format: int32
                             type: integer
                           maxLineSize:
-                            description: MaxLineSize defines the aximum line size
+                            description: MaxLineSize defines the maximum line size
                               on ingestion path. Units in Bytes.
                             format: int32
                             type: integer
+                          perStreamRateLimit:
+                            description: PerStreamRateLimit defines the maximum byte
+                              rate per second for each stream. Units in Bytes.
+                            format: int32
+                            type: integer
+                          perStreamRateLimitBurst:
+                            description: PerStreamRateLimitBurst defines the maximum
+                              burst bytes per stream. This value sets the upper limit
+                              for the stream rate limit. When exceeding this, the
+                              stream is limited.
+                            format: int32
+                            type: integer
                         type: object
                       queries:
                         description: QueryLimits defines the limit applied on querying
@@ -157,10 +169,22 @@ spec:
                               format: int32
                               type: integer
                             maxLineSize:
-                              description: MaxLineSize defines the aximum line size
+                              description: MaxLineSize defines the maximum line size
                                 on ingestion path. Units in Bytes.
                               format: int32
                               type: integer
+                            perStreamRateLimit:
+                              description: PerStreamRateLimit defines the maximum
+                                byte rate per second for each stream. Units in Bytes.
+                              format: int32
+                              type: integer
+                            perStreamRateLimitBurst:
+                              description: PerStreamRateLimitBurst defines the maximum
+                                burst bytes per stream. This value sets the upper
+                                limit for the stream rate limit. When exceeding this,
+                                the stream is limited.
+                              format: int32
+                              type: integer
                           type: object
                         queries:
                           description: QueryLimits defines the limit applied on querying

diff --git a/config/crd/bases/loki.openshift.io_lokistacks.yaml b/config/crd/bases/loki.openshift.io_lokistacks.yaml
@@ -68,7 +68,15 @@ spec:
                             format: int32
                             type: integer
                           maxLineSize:
-                            description: MaxLineSize defines the aximum line size on ingestion path. Units in Bytes.
+                            description: MaxLineSize defines the maximum line size on ingestion path. Units in Bytes.
+                            format: int32
+                            type: integer
+                          perStreamRateLimit:
+                            description: PerStreamRateLimit defines the maximum byte rate per second for each stream. Units in Bytes.
+                            format: int32
+                            type: integer
+                          perStreamRateLimitBurst:
+                            description: PerStreamRateLimitBurst defines the maximum burst bytes per stream. This value sets the upper limit for the stream rate limit. When exceeding this, the stream is limited.
                             format: int32
                             type: integer
                         type: object
@@ -121,7 +129,15 @@ spec:
                               format: int32
                               type: integer
                             maxLineSize:
-                              description: MaxLineSize defines the aximum line size on ingestion path. Units in Bytes.
+                              description: MaxLineSize defines the maximum line size on ingestion path. Units in Bytes.
+                              format: int32
+                              type: integer
+                            perStreamRateLimit:
+                              description: PerStreamRateLimit defines the maximum byte rate per second for each stream. Units in Bytes.
+                              format: int32
+                              type: integer
+                            perStreamRateLimitBurst:
+                              description: PerStreamRateLimitBurst defines the maximum burst bytes per stream. This value sets the upper limit for the stream rate limit. When exceeding this, the stream is limited.
                               format: int32
                               type: integer
                           type: object

diff --git a/config/manifests/bases/loki-operator.clusterserviceversion.yaml b/config/manifests/bases/loki-operator.clusterserviceversion.yaml
@@ -107,12 +107,25 @@ spec:
         path: limits.global.ingestion.maxLabelValueLength
         x-descriptors:
         - urn:alm:descriptor:com.tectonic.ui:number
-      - description: MaxLineSize defines the aximum line size on ingestion path. Units
-          in Bytes.
+      - description: MaxLineSize defines the maximum line size on ingestion path.
+          Units in Bytes.
         displayName: Max Line Size
         path: limits.global.ingestion.maxLineSize
         x-descriptors:
         - urn:alm:descriptor:com.tectonic.ui:number
+      - description: PerStreamRateLimit defines the maximum byte rate per second for
+          each stream. Units in Bytes.
+        displayName: Per Stream Rate Limit
+        path: limits.global.ingestion.perStreamRateLimit
+        x-descriptors:
+        - urn:alm:descriptor:com.tectonic.ui:number
+      - description: PerStreamRateLimitBurst defines the maximum burst bytes per stream.
+          This value sets the upper limit for the stream rate limit. When exceeding
+          this, the stream is limited.
+        displayName: PerStreamRateLimitBurst
+        path: limits.global.ingestion.perStreamRateLimitBurst
+        x-descriptors:
+        - urn:alm:descriptor:com.tectonic.ui:number
       - description: MaxChunksPerQuery defines the maximum number of chunks that can
           be fetched by a single query.
         displayName: Max Chunk per Query
@@ -170,12 +183,25 @@ spec:
         path: limits.tenants.ingestion.maxLabelValueLength
         x-descriptors:
         - urn:alm:descriptor:com.tectonic.ui:number
-      - description: MaxLineSize defines the aximum line size on ingestion path. Units
-          in Bytes.
+      - description: MaxLineSize defines the maximum line size on ingestion path.
+          Units in Bytes.
         displayName: Max Line Size
         path: limits.tenants.ingestion.maxLineSize
         x-descriptors:
         - urn:alm:descriptor:com.tectonic.ui:number
+      - description: PerStreamRateLimit defines the maximum byte rate per second for
+          each stream. Units in Bytes.
+        displayName: Per Stream Rate Limit
+        path: limits.tenants.ingestion.perStreamRateLimit
+        x-descriptors:
+        - urn:alm:descriptor:com.tectonic.ui:number
+      - description: PerStreamRateLimitBurst defines the maximum burst bytes per stream.
+          This value sets the upper limit for the stream rate limit. When exceeding
+          this, the stream is limited.
+        displayName: PerStreamRateLimitBurst
+        path: limits.tenants.ingestion.perStreamRateLimitBurst
+        x-descriptors:
+        - urn:alm:descriptor:com.tectonic.ui:number
       - description: MaxChunksPerQuery defines the maximum number of chunks that can
           be fetched by a single query.
         displayName: Max Chunk per Query