operator: Add automatic stream sharding support

operator/CHANGELOG.md

@@ -1,7 +1,11 @@
 ## Main
 
 - [11091](https://github.com/grafana/loki/pull/11091) **periklis**: Add automatic stream sharding support
-
+- [11022](https://github.com/grafana/loki/pull/11022) **JoaoBraveCoding**: Remove outdated BoltDB dashboards 
+- [10932](https://github.com/grafana/loki/pull/10932) **JoaoBraveCoding**: Adds new value v13 to schema
+- [11232](https://github.com/grafana/loki/pull/11232) **periklis**: Update dependencies and dev tools
+- [11129](https://github.com/grafana/loki/pull/11129) **periklis**: Update deps to secure webhooks for CVE-2023-44487
+- 
 ## 0.5.0 (2023-10-24)
 
 - [10924](https://github.com/grafana/loki/pull/10924) **periklis**: Update Loki operand to v2.9.2

operator/apis/loki/v1/lokistack_types.go

@@ -636,11 +636,11 @@ type QueryLimitSpec struct {
 // IngestionLimitSpec defines the limits applied at the ingestion path.
 type IngestionLimitSpec struct {
 	// DesiredRate defines the desired ingestion rate per second that LokiStack should
-	// target applyfing automatic stream sharding. Units Bytes.
+	// target applying automatic stream sharding. Unit MB.
 	//
 	// +optional
 	// +kubebuilder:validation:Optional
-	// +operator-sdk:csv:customresourcedefinitions:type=spec,xDescriptors="urn:alm:descriptor:com.tectonic.ui:number",displayName="Desired Ingestion Rate (in Bytes)"
+	// +operator-sdk:csv:customresourcedefinitions:type=spec,xDescriptors="urn:alm:descriptor:com.tectonic.ui:number",displayName="Desired Ingestion Rate (in MB)"
 	DesiredRate int32 `json:"desiredRate,omitempty"`
 
 	// IngestionRate defines the sample size per second. Units MB.

operator/apis/loki/v1/v1.go

@@ -83,7 +83,7 @@ var (
 	ErrReplicationSpecConflict = errors.New("replicationSpec and replicationFactor (deprecated) cannot be used at the same time")
 	// ErrIPv6InstanceAddrTypeNotAllowed when the default InstanceAddrType is used with enableIPv6.
 	ErrIPv6InstanceAddrTypeNotAllowed = errors.New(`instanceAddrType "default" cannot be used with enableIPv6 at the same time`)
-	// ErrDesiredRateAndPerStreamRateNotAllowed when both fields are set.
+	// ErrDesiredRateAndPerStreamRateNotAllowed when there's a conflict in the rate limiting configuration because both desiredRate and perStreamRateLimit are set.
 	ErrDesiredRateAndPerStreamRateNotAllowed = errors.New("fields desiredRate and perStreamRateLimit cannot be used together")
 
 	// ErrRuleMustMatchNamespace indicates that an expression used in an alerting or recording rule is missing

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.5.0
-    createdAt: "2023-10-31T08:47:51Z"
+    createdAt: "2023-11-03T11:44:16Z"
     description: The Community Loki Operator provides Kubernetes native deployment
       and management of Loki and related logging components.
     operators.operatorframework.io/builder: operator-sdk-unknown
@@ -295,8 +295,8 @@ spec:
         displayName: Global Limits
         path: limits.global
       - description: DesiredRate defines the desired ingestion rate per second that
-          LokiStack should target applyfing automatic stream sharding. Units Bytes.
-        displayName: Desired Ingestion Rate (in Bytes)
+          LokiStack should target applying automatic stream sharding. Unit MB.
+        displayName: Desired Ingestion Rate (in MB)
         path: limits.global.ingestion.desiredRate
         x-descriptors:
         - urn:alm:descriptor:com.tectonic.ui:number
@@ -385,8 +385,8 @@ spec:
         displayName: Limits per Tenant
         path: limits.tenants
       - description: DesiredRate defines the desired ingestion rate per second that
-          LokiStack should target applyfing automatic stream sharding. Units Bytes.
-        displayName: Desired Ingestion Rate (in Bytes)
+          LokiStack should target applying automatic stream sharding. Unit MB.
+        displayName: Desired Ingestion Rate (in MB)
         path: limits.tenants.ingestion.desiredRate
         x-descriptors:
         - urn:alm:descriptor:com.tectonic.ui:number

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

@@ -100,8 +100,8 @@ spec:
                         properties:
                           desiredRate:
                             description: DesiredRate defines the desired ingestion
-                              rate per second that LokiStack should target applyfing
-                              automatic stream sharding. Units Bytes.
+                              rate per second that LokiStack should target applying
+                              automatic stream sharding. Unit MB.
                             format: int32
                             type: integer
                           ingestionBurstSize:
@@ -231,8 +231,8 @@ spec:
                           properties:
                             desiredRate:
                               description: DesiredRate defines the desired ingestion
-                                rate per second that LokiStack should target applyfing
-                                automatic stream sharding. Units Bytes.
+                                rate per second that LokiStack should target applying
+                                automatic stream sharding. Unit MB.
                               format: int32
                               type: integer
                             ingestionBurstSize:

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.5.0
-    createdAt: "2023-10-31T08:47:49Z"
+    createdAt: "2023-11-03T11:44:14Z"
     description: The Community Loki Operator provides Kubernetes native deployment
       and management of Loki and related logging components.
     operators.operatorframework.io/builder: operator-sdk-unknown
@@ -295,8 +295,8 @@ spec:
         displayName: Global Limits
         path: limits.global
       - description: DesiredRate defines the desired ingestion rate per second that
-          LokiStack should target applyfing automatic stream sharding. Units Bytes.
-        displayName: Desired Ingestion Rate (in Bytes)
+          LokiStack should target applying automatic stream sharding. Unit MB.
+        displayName: Desired Ingestion Rate (in MB)
         path: limits.global.ingestion.desiredRate
         x-descriptors:
         - urn:alm:descriptor:com.tectonic.ui:number
@@ -385,8 +385,8 @@ spec:
         displayName: Limits per Tenant
         path: limits.tenants
       - description: DesiredRate defines the desired ingestion rate per second that
-          LokiStack should target applyfing automatic stream sharding. Units Bytes.
-        displayName: Desired Ingestion Rate (in Bytes)
+          LokiStack should target applying automatic stream sharding. Unit MB.
+        displayName: Desired Ingestion Rate (in MB)
         path: limits.tenants.ingestion.desiredRate
         x-descriptors:
         - urn:alm:descriptor:com.tectonic.ui:number

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

@@ -100,8 +100,8 @@ spec:
                         properties:
                           desiredRate:
                             description: DesiredRate defines the desired ingestion
-                              rate per second that LokiStack should target applyfing
-                              automatic stream sharding. Units Bytes.
+                              rate per second that LokiStack should target applying
+                              automatic stream sharding. Unit MB.
                             format: int32
                             type: integer
                           ingestionBurstSize:
@@ -231,8 +231,8 @@ spec:
                           properties:
                             desiredRate:
                               description: DesiredRate defines the desired ingestion
-                                rate per second that LokiStack should target applyfing
-                                automatic stream sharding. Units Bytes.
+                                rate per second that LokiStack should target applying
+                                automatic stream sharding. Unit MB.
                               format: int32
                               type: integer
                             ingestionBurstSize:

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: "2023-10-31T08:47:54Z"
+    createdAt: "2023-11-03T11:44:18Z"
     description: |
       The Loki Operator for OCP provides a means for configuring and managing a Loki stack for cluster logging.
       ## Prerequisites and Requirements
@@ -308,8 +308,8 @@ spec:
         displayName: Global Limits
         path: limits.global
       - description: DesiredRate defines the desired ingestion rate per second that
-          LokiStack should target applyfing automatic stream sharding. Units Bytes.
-        displayName: Desired Ingestion Rate (in Bytes)
+          LokiStack should target applying automatic stream sharding. Unit MB.
+        displayName: Desired Ingestion Rate (in MB)
         path: limits.global.ingestion.desiredRate
         x-descriptors:
         - urn:alm:descriptor:com.tectonic.ui:number
@@ -398,8 +398,8 @@ spec:
         displayName: Limits per Tenant
         path: limits.tenants
       - description: DesiredRate defines the desired ingestion rate per second that
-          LokiStack should target applyfing automatic stream sharding. Units Bytes.
-        displayName: Desired Ingestion Rate (in Bytes)
+          LokiStack should target applying automatic stream sharding. Unit MB.
+        displayName: Desired Ingestion Rate (in MB)
         path: limits.tenants.ingestion.desiredRate
         x-descriptors:
         - urn:alm:descriptor:com.tectonic.ui:number

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

@@ -100,8 +100,8 @@ spec:
                         properties:
                           desiredRate:
                             description: DesiredRate defines the desired ingestion
-                              rate per second that LokiStack should target applyfing
-                              automatic stream sharding. Units Bytes.
+                              rate per second that LokiStack should target applying
+                              automatic stream sharding. Unit MB.
                             format: int32
                             type: integer
                           ingestionBurstSize:
@@ -231,8 +231,8 @@ spec:
                           properties:
                             desiredRate:
                               description: DesiredRate defines the desired ingestion
-                                rate per second that LokiStack should target applyfing
-                                automatic stream sharding. Units Bytes.
+                                rate per second that LokiStack should target applying
+                                automatic stream sharding. Unit MB.
                               format: int32
                               type: integer
                             ingestionBurstSize:

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

@@ -82,8 +82,8 @@ spec:
                         properties:
                           desiredRate:
                             description: DesiredRate defines the desired ingestion
-                              rate per second that LokiStack should target applyfing
-                              automatic stream sharding. Units Bytes.
+                              rate per second that LokiStack should target applying
+                              automatic stream sharding. Unit MB.
                             format: int32
                             type: integer
                           ingestionBurstSize:
@@ -213,8 +213,8 @@ spec:
                           properties:
                             desiredRate:
                               description: DesiredRate defines the desired ingestion
-                                rate per second that LokiStack should target applyfing
-                                automatic stream sharding. Units Bytes.
+                                rate per second that LokiStack should target applying
+                                automatic stream sharding. Unit MB.
                               format: int32
                               type: integer
                             ingestionBurstSize:

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

@@ -208,8 +208,8 @@ spec:
         displayName: Global Limits
         path: limits.global
       - description: DesiredRate defines the desired ingestion rate per second that
-          LokiStack should target applyfing automatic stream sharding. Units Bytes.
-        displayName: Desired Ingestion Rate (in Bytes)
+          LokiStack should target applying automatic stream sharding. Unit MB.
+        displayName: Desired Ingestion Rate (in MB)
         path: limits.global.ingestion.desiredRate
         x-descriptors:
         - urn:alm:descriptor:com.tectonic.ui:number
@@ -298,8 +298,8 @@ spec:
         displayName: Limits per Tenant
         path: limits.tenants
       - description: DesiredRate defines the desired ingestion rate per second that
-          LokiStack should target applyfing automatic stream sharding. Units Bytes.
-        displayName: Desired Ingestion Rate (in Bytes)
+          LokiStack should target applying automatic stream sharding. Unit MB.
+        displayName: Desired Ingestion Rate (in MB)
         path: limits.tenants.ingestion.desiredRate
         x-descriptors:
         - urn:alm:descriptor:com.tectonic.ui:number

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

@@ -208,8 +208,8 @@ spec:
         displayName: Global Limits
         path: limits.global
       - description: DesiredRate defines the desired ingestion rate per second that
-          LokiStack should target applyfing automatic stream sharding. Units Bytes.
-        displayName: Desired Ingestion Rate (in Bytes)
+          LokiStack should target applying automatic stream sharding. Unit MB.
+        displayName: Desired Ingestion Rate (in MB)
         path: limits.global.ingestion.desiredRate
         x-descriptors:
         - urn:alm:descriptor:com.tectonic.ui:number
@@ -298,8 +298,8 @@ spec:
         displayName: Limits per Tenant
         path: limits.tenants
       - description: DesiredRate defines the desired ingestion rate per second that
-          LokiStack should target applyfing automatic stream sharding. Units Bytes.
-        displayName: Desired Ingestion Rate (in Bytes)
+          LokiStack should target applying automatic stream sharding. Unit MB.
+        displayName: Desired Ingestion Rate (in MB)
         path: limits.tenants.ingestion.desiredRate
         x-descriptors:
         - urn:alm:descriptor:com.tectonic.ui:number

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

@@ -220,8 +220,8 @@ spec:
         displayName: Global Limits
         path: limits.global
       - description: DesiredRate defines the desired ingestion rate per second that
-          LokiStack should target applyfing automatic stream sharding. Units Bytes.
-        displayName: Desired Ingestion Rate (in Bytes)
+          LokiStack should target applying automatic stream sharding. Unit MB.
+        displayName: Desired Ingestion Rate (in MB)
         path: limits.global.ingestion.desiredRate
         x-descriptors:
         - urn:alm:descriptor:com.tectonic.ui:number
@@ -310,8 +310,8 @@ spec:
         displayName: Limits per Tenant
         path: limits.tenants
       - description: DesiredRate defines the desired ingestion rate per second that
-          LokiStack should target applyfing automatic stream sharding. Units Bytes.
-        displayName: Desired Ingestion Rate (in Bytes)
+          LokiStack should target applying automatic stream sharding. Unit MB.
+        displayName: Desired Ingestion Rate (in MB)
         path: limits.tenants.ingestion.desiredRate
         x-descriptors:
         - urn:alm:descriptor:com.tectonic.ui:number

operator/docs/operator/api.md

@@ -1090,7 +1090,7 @@ int32
 <td>
 <em>(Optional)</em>
 <p>DesiredRate defines the desired ingestion rate per second that LokiStack should
-target applyfing automatic stream sharding. Units Bytes.</p>
+target applying automatic stream sharding. Unit MB.</p>
 </td>
 </tr>
 <tr>

operator/internal/manifests/internal/config/build.go

@@ -25,7 +25,9 @@ var (
 	//go:embed loki-runtime-config.yaml
 	lokiRuntimeConfigYAMLTmplFile embed.FS
 
-	lokiConfigYAMLTmpl = template.Must(template.ParseFS(lokiConfigYAMLTmplFile, "loki-config.yaml"))
+	lokiConfigYAMLTmpl = template.Must(template.New("loki-config.yaml").Funcs(template.FuncMap{
+		"toBytes": toBytes,
+	}).ParseFS(lokiConfigYAMLTmplFile, "loki-config.yaml"))
 
 	lokiRuntimeConfigYAMLTmpl = template.Must(template.ParseFS(lokiRuntimeConfigYAMLTmplFile, "loki-runtime-config.yaml"))
 )
@@ -54,3 +56,7 @@ func Build(opts Options) ([]byte, []byte, error) {
 	}
 	return cfg, rcfg, nil
 }
+
+func toBytes(s int32) int32 {
+	return int32(float32(s) * (1 << 20))
+}