Merge pull request #2 from mgirgisf/cloudkitty-prom-collector

update prometheus_collector config

Author: jlarriba

api/v1beta1/cloudkitty_types.go

@@ -90,6 +90,21 @@ type CloudKittySpecBase struct {
 	// TopologyRef to apply the Topology defined by the associated CR referenced
 	// by name
 	TopologyRef *topologyv1.TopoRef `json:"topologyRef,omitempty"`
+
+	// Host of user deployed prometheus
+	// +kubebuilder:validation:Optional
+	PrometheusHost string `json:"prometheusHost,omitempty"`
+
+	// Port of user deployed prometheus
+	// +kubebuilder:validation:Minimum=1
+	// +kubebuilder:validation:Maximum=65535
+	// +kubebuilder:validation:Optional
+	PrometheusPort int32 `json:"prometheusPort,omitempty"`
+
+	// If defined, specifies which CA certificate to use for user deployed prometheus
+	// +kubebuilder:validation:Optional
+	// +nullable
+	PrometheusTLSCaCertSecret *corev1.SecretKeySelector `json:"prometheusTLSCaCertSecret,omitempty"`
 }
 
 // CloudKittySpecCore the same as CloudKittySpec without ContainerImage references
@@ -211,6 +226,15 @@ type CloudKittyStatus struct {
 	// controller has not started processing the latest changes, and the status
 	// and its conditions are likely stale.
 	ObservedGeneration int64 `json:"observedGeneration,omitempty"`
+
+	// PrometheusHost - Hostname for prometheus used for autoscaling
+	PrometheusHost string `json:"prometheusHostname,omitempty"`
+
+	// PrometheusPort - Port for prometheus used for autoscaling
+	PrometheusPort int32 `json:"prometheusPort,omitempty"`
+
+	// PrometheusTLS - Determines if TLS should be used for accessing prometheus
+	PrometheusTLS bool `json:"prometheusTLS,omitempty"`
 }
 
 //+kubebuilder:object:root=true

api/v1beta1/telemetry_types.go

@@ -194,6 +194,7 @@ type CloudKittySection struct {
 
 	// +kubebuilder:validation:Optional
 	//+operator-sdk:csv:customresourcedefinitions:type=spec
+	// +kubebuilder:default={apiTimeout: 60}
 	// Template - Overrides to use when creating the OpenStack CloudKitty service
 	CloudKittySpec `json:",inline"`
 }

controllers/cloudkitty_controller.go

@@ -19,7 +19,10 @@ package controllers
 import (
 	"context"
 	"fmt"
+	"strconv"
+
 	"github.com/openstack-k8s-operators/telemetry-operator/pkg/cloudkitty"
+	"github.com/openstack-k8s-operators/telemetry-operator/pkg/metricstorage"
 
 	k8s_errors "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/runtime"
@@ -813,6 +816,7 @@ func (r *CloudKittyReconciler) generateServiceConfigs(
 	memcached *memcachedv1.Memcached,
 	db *mariadbv1.Database,
 ) error {
+	Log := r.GetLogger(ctx)
 	//
 	// create Secret required for cloudkitty input
 	// - %-scripts holds scripts to e.g. bootstrap the service
@@ -855,6 +859,46 @@ func (r *CloudKittyReconciler) generateServiceConfigs(
 		return err
 	}
 
+	if instance.Spec.PrometheusHost == "" {
+		// We're using MetricStorage for Prometheus.
+		prometheusEndpointSecret := &corev1.Secret{}
+		err = r.Client.Get(ctx, client.ObjectKey{
+			Name:      cloudkitty.PrometheusEndpointSecret,
+			Namespace: instance.Namespace,
+		}, prometheusEndpointSecret)
+		if err != nil {
+			Log.Info("Prometheus Endpoint Secret not found")
+		}
+		if prometheusEndpointSecret.Data != nil {
+			instance.Status.PrometheusHost = string(prometheusEndpointSecret.Data[metricstorage.PrometheusHost])
+			port, err := strconv.Atoi(string(prometheusEndpointSecret.Data[metricstorage.PrometheusPort]))
+			if err != nil {
+				return err
+			}
+			instance.Status.PrometheusPort = int32(port)
+
+			metricStorage := &telemetryv1.MetricStorage{}
+			err = r.Client.Get(ctx, client.ObjectKey{
+				Namespace: instance.Namespace,
+				Name:      telemetryv1.DefaultServiceName,
+			}, metricStorage)
+			if err != nil {
+				instance.Status.Conditions.Set(condition.FalseCondition(
+					condition.ServiceConfigReadyCondition,
+					condition.ErrorReason,
+					condition.SeverityWarning,
+					condition.ServiceConfigReadyErrorMessage,
+					err.Error()))
+			}
+			instance.Status.PrometheusTLS = metricStorage.Spec.PrometheusTLS.Enabled()
+		}
+	} else {
+		// We're using user-deployed Prometheus.
+		instance.Status.PrometheusHost = instance.Spec.PrometheusHost
+		instance.Status.PrometheusPort = instance.Spec.PrometheusPort
+		instance.Status.PrometheusTLS = instance.Spec.PrometheusTLSCaCertSecret != nil
+	}
+
 	databaseAccount := db.GetAccount()
 	dbSecret := db.GetSecret()
 
@@ -864,6 +908,8 @@ func (r *CloudKittyReconciler) generateServiceConfigs(
 	templateParameters["KeystoneInternalURL"] = keystoneInternalURL
 	templateParameters["KeystonePublicURL"] = keystonePublicURL
 	templateParameters["TransportURL"] = string(transportURLSecret.Data["transport_url"])
+	templateParameters["PrometheusHost"] = instance.Status.PrometheusHost
+	templateParameters["PrometheusPort"] = instance.Status.PrometheusPort
 	templateParameters["DatabaseConnection"] = fmt.Sprintf("mysql+pymysql://%s:%s@%s/%s?read_default_file=/etc/my.cnf",
 		databaseAccount.Spec.UserName,
 		string(dbSecret.Data[mariadbv1.DatabasePasswordSelector]),

pkg/cloudkitty/const.go

@@ -49,6 +49,9 @@ const (
 
 	ShortDuration  = time.Duration(5) * time.Second
 	NormalDuration = time.Duration(10) * time.Second
+
+	// PrometheusEndpointSecret - The name of the secret that contains the Prometheus endpoint configuration.
+	PrometheusEndpointSecret = "metric-storage-prometheus-endpoint"
 )
 
 var ResultRequeue = ctrl.Result{RequeueAfter: NormalDuration}

templates/cloudkitty/config/cloudkitty.conf

@@ -45,8 +45,14 @@ collector = prometheus
 scope_key = project
 
 [collector_prometheus]
-prometheus_url = https://metric-storage-prometheus.openstack.svc:9090
+{{- if .TLS }}
+prometheus_url = https://{{ .PrometheusHost }}:{{ .PrometheusPort }}
+cafile = {{ .CAFile }}
+insecure = false
+{{- else }}
+prometheus_url = http://{{ .PrometheusHost }}:{{ .PrometheusPort }}
 insecure = true
+{{- end }}
 
 [output]
 pipeline = osrf