Allow for configuration of the period CloudKitty config option

Author: jlarriba

api/bases/telemetry.openstack.org_cloudkitties.yaml

@@ -541,6 +541,12 @@ spec:
                       service password from the Secret
                     type: string
                 type: object
+              period:
+                default: 300
+                description: Period for collecting metrics in seconds
+                format: int32
+                minimum: 1
+                type: integer
               preserveJobs:
                 default: false
                 description: PreserveJobs - do not delete jobs after they finished

api/bases/telemetry.openstack.org_telemetries.yaml

@@ -1106,6 +1106,12 @@ spec:
                           service password from the Secret
                         type: string
                     type: object
+                  period:
+                    default: 300
+                    description: Period for collecting metrics in seconds
+                    format: int32
+                    minimum: 1
+                    type: integer
                   preserveJobs:
                     default: false
                     description: PreserveJobs - do not delete jobs after they finished

api/v1beta1/cloudkitty_types.go

@@ -186,6 +186,12 @@ type CloudKittySpecBase struct {
 	// +nullable
 	PrometheusTLSCaCertSecret *corev1.SecretKeySelector `json:"prometheusTLSCaCertSecret,omitempty"`
 
+	// Period for collecting metrics in seconds
+	// +kubebuilder:validation:Minimum=1
+	// +kubebuilder:validation:Optional
+	// +kubebuilder:default=300
+	Period int32 `json:"period"`
+
 	// S3 related configuration passed to Loki
 	// +kubebuilder:validation:Optional
 	// +kubebuilder:default={secret: {name: "cloudkitty-loki-s3", type: "s3"}}

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

@@ -541,6 +541,12 @@ spec:
                       service password from the Secret
                     type: string
                 type: object
+              period:
+                default: 300
+                description: Period for collecting metrics in seconds
+                format: int32
+                minimum: 1
+                type: integer
               preserveJobs:
                 default: false
                 description: PreserveJobs - do not delete jobs after they finished

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

@@ -1106,6 +1106,12 @@ spec:
                           service password from the Secret
                         type: string
                     type: object
+                  period:
+                    default: 300
+                    description: Period for collecting metrics in seconds
+                    format: int32
+                    minimum: 1
+                    type: integer
                   preserveJobs:
                     default: false
                     description: PreserveJobs - do not delete jobs after they finished

controllers/cloudkitty_controller.go

@@ -1199,6 +1199,7 @@ func (r *CloudKittyReconciler) generateServiceConfigs(
 	templateParameters["TransportURL"] = string(transportURLSecret.Data["transport_url"])
 	templateParameters["PrometheusHost"] = instance.Status.PrometheusHost
 	templateParameters["PrometheusPort"] = instance.Status.PrometheusPort
+	templateParameters["Period"] = instance.Spec.Period
 	templateParameters["LokiHost"] = lokiHost
 	templateParameters["LokiPort"] = 8080
 	templateParameters["DatabaseConnection"] = fmt.Sprintf("mysql+pymysql://%s:%s@%s/%s?read_default_file=/etc/my.cnf",

templates/cloudkitty/config/cloudkitty.conf

@@ -39,7 +39,7 @@ bucket = cloudkitty
 url = http://influxdb:8086
 
 [collect]
-period = 300
+period = {{ .Period }}
 wait_periods = 0
 metrics_conf = /etc/cloudkitty/metrics.yaml
 collector = prometheus