Merge pull request #837 from jlarriba/add-loki-retention-days

Add lokiRetentionDays configuration for CloudKitty LokiStack

Author: openshift-merge-bot[bot]

api/bases/telemetry.openstack.org_cloudkitties.yaml

@@ -528,6 +528,12 @@ spec:
                   Right now required by the maridb-operator to get the credentials from the instance to create the DB
                   Might not be required in future
                 type: string
+              lokiRetentionDays:
+                default: 95
+                description: |-
+                  LokiRetentionDays defines the number of days logs are kept in Loki storage.
+                  Set to 0 to disable retention limits.
+                type: integer
               lokiStackSize:
                 default: 1x.demo
                 description: Size of the LokiStack. Supported are "1x.demo" (default),

api/bases/telemetry.openstack.org_telemetries.yaml

@@ -1096,6 +1096,12 @@ spec:
                     description: Enabled - Whether OpenStack CloudKitty service should
                       be deployed and managed
                     type: boolean
+                  lokiRetentionDays:
+                    default: 95
+                    description: |-
+                      LokiRetentionDays defines the number of days logs are kept in Loki storage.
+                      Set to 0 to disable retention limits.
+                    type: integer
                   lokiStackSize:
                     default: 1x.demo
                     description: Size of the LokiStack. Supported are "1x.demo" (default),

api/v1beta1/cloudkitty_types.go

@@ -205,6 +205,12 @@ type CloudKittySpecBase struct {
 	// +kubebuilder:validation:Enum="";"1x.demo";"1x.pico";"1x.extra-small";"1x.small";"1x.medium"
 	// +kubebuilder:default="1x.demo"
 	LokiStackSize string `json:"lokiStackSize"`
+
+	// LokiRetentionDays defines the number of days logs are kept in Loki storage.
+	// Set to 0 to disable retention limits.
+	// +kubebuilder:validation:Optional
+	// +kubebuilder:default=95
+	LokiRetentionDays uint `json:"lokiRetentionDays"`
 }
 
 // CloudKittySpecCore the same as CloudKittySpec without ContainerImage references

config/crd/bases/telemetry.openstack.org_cloudkitties.yaml

@@ -528,6 +528,12 @@ spec:
                   Right now required by the maridb-operator to get the credentials from the instance to create the DB
                   Might not be required in future
                 type: string
+              lokiRetentionDays:
+                default: 95
+                description: |-
+                  LokiRetentionDays defines the number of days logs are kept in Loki storage.
+                  Set to 0 to disable retention limits.
+                type: integer
               lokiStackSize:
                 default: 1x.demo
                 description: Size of the LokiStack. Supported are "1x.demo" (default),

config/crd/bases/telemetry.openstack.org_telemetries.yaml

@@ -1096,6 +1096,12 @@ spec:
                     description: Enabled - Whether OpenStack CloudKitty service should
                       be deployed and managed
                     type: boolean
+                  lokiRetentionDays:
+                    default: 95
+                    description: |-
+                      LokiRetentionDays defines the number of days logs are kept in Loki storage.
+                      Set to 0 to disable retention limits.
+                    type: integer
                   lokiStackSize:
                     default: 1x.demo
                     description: Size of the LokiStack. Supported are "1x.demo" (default),

internal/cloudkitty/lokistack.go

@@ -123,6 +123,19 @@ func LokiStack(
 	if instance.Spec.LokiStackSize != "" {
 		size = instance.Spec.LokiStackSize
 	}
+
+	// Build limits spec only if retention is enabled (lokiRetentionDays > 0)
+	var limitsSpec *lokistackv1.LimitsSpec
+	if instance.Spec.LokiRetentionDays > 0 {
+		limitsSpec = &lokistackv1.LimitsSpec{
+			Global: &lokistackv1.LimitsTemplateSpec{
+				Retention: &lokistackv1.RetentionLimitSpec{
+					Days: instance.Spec.LokiRetentionDays,
+				},
+			},
+		}
+	}
+
 	lokiStack := &lokistackv1.LokiStack{
 		ObjectMeta: metav1.ObjectMeta{
 			Name:      fmt.Sprintf("%s-lokistack", instance.Name),
@@ -135,6 +148,7 @@ func LokiStack(
 			Size:             lokistackv1.LokiStackSizeType(size),
 			Storage:          getLokiStackObjectStorageSpec(instance.Spec.S3StorageConfig),
 			StorageClassName: instance.Spec.StorageClass,
+			Limits:           limitsSpec,
 			Tenants: &lokistackv1.TenantsSpec{
 				Mode: lokistackv1.Static,
 				Authentication: []lokistackv1.AuthenticationSpec{

test/kuttl/tests/cloudkitty/02-deploy.yaml

@@ -49,3 +49,4 @@ spec:
   secret: osp-secret
   serviceUser: cloudkitty
   storageClass: local-storage
+  lokiRetentionDays: 0

test/kuttl/tests/cloudkitty/03-custom-config-secret.yaml

@@ -61,3 +61,4 @@ spec:
   secret: osp-secret
   serviceUser: cloudkitty
   storageClass: local-storage
+  lokiRetentionDays: 0

test/kuttl/tests/default/01-deploy.yaml

@@ -35,6 +35,7 @@ spec:
         name: logging-loki-s3
         type: s3
     storageClass: local-storage
+    lokiRetentionDays: 0
   logging:
     enabled: false
     port: 10514

test/kuttl/tests/tls/02-deploy.yaml

@@ -55,6 +55,7 @@ metadata:
   name: telemetry-kuttl-cloudkitty
 spec:
   enabled: true
+  lokiRetentionDays: 0
   s3StorageConfig:
     schemas:
     - effectiveDate: "2024-11-18"