Refactor/telemetry types

CHANGELOG/CHANGELOG-1.5.md

@@ -15,6 +15,7 @@ When cutting a new release, update the `unreleased` heading to the tag being gen
 
 ## unreleased
 * [FEATURE] [#783](https://github.com/k8ssandra/k8ssandra-operator/issues/783) Allow disabling MCAC
+* [FEATURE] [#739815](https://github.com/k8ssandra/k8ssandra-operator/issues/815) Add configuration block to CRDs for new Cassandra metrics agent.
 * [FEATURE] [#739](https://github.com/k8ssandra/k8ssandra-operator/issues/739) Add API for cluster-level tasks
 * [FEATURE] [#775](https://github.com/k8ssandra/k8ssandra-operator/issues/775) Add the ability to inject and configure a Vector agent sidecar in the Cassandra pods
 * [FEATURE] [#600](https://github.com/k8ssandra/k8ssandra-operator/issues/600) Disable secrets management and replication with the external secrets provider

apis/k8ssandra/v1alpha1/k8ssandracluster_types.go

@@ -364,7 +364,7 @@ type DatacenterOptions struct {
 	// If telemetry configurations are defined, telemetry resources will be deployed to integrate with
 	// a user-provided monitoring solution (at present, only support for Prometheus is available).
 	// +optional
-	Telemetry *telemetryapi.TelemetrySpec `json:"telemetry,omitempty"`
+	Telemetry *telemetryapi.CassandraTelemetrySpec `json:"telemetry,omitempty"`
 
 	// CDC defines the desired state for CDC integrations. It can be used to feed mutation events from Cassandra into an Apache Pulsar cluster,
 	// from where they can be expored to external systems.

apis/telemetry/v1alpha1/telemetry_methods.go

@@ -7,11 +7,16 @@ func (in *TelemetrySpec) MergeWith(clusterTemplate *TelemetrySpec) *TelemetrySpe
 	return goalesceutils.MergeCRs(clusterTemplate, in)
 }
 
+// MergeWith merges the given cluster-level template into this (DC-level) template.
+func (in *CassandraTelemetrySpec) MergeWith(clusterTemplate *CassandraTelemetrySpec) *CassandraTelemetrySpec {
+	return goalesceutils.MergeCRs(clusterTemplate, in)
+}
+
 func (in *TelemetrySpec) IsPrometheusEnabled() bool {
 	return in != nil && in.Prometheus != nil && in.Prometheus.Enabled != nil && *in.Prometheus.Enabled
 }
 
-func (in *TelemetrySpec) IsMcacEnabled() bool {
+func (in *CassandraTelemetrySpec) IsMcacEnabled() bool {
 	return in == nil || in.Mcac == nil || in.Mcac.Enabled == nil || *in.Mcac.Enabled
 }
 

apis/telemetry/v1alpha1/telemetry_types.go

@@ -3,16 +3,22 @@
 package v1alpha1
 
 import (
+	promapi "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
 type TelemetrySpec struct {
 	Prometheus *PrometheusTelemetrySpec `json:"prometheus,omitempty"`
-	Mcac       *McacTelemetrySpec       `json:"mcac,omitempty"`
 	Vector     *VectorSpec              `json:"vector,omitempty"`
 }
 
+type CassandraTelemetrySpec struct {
+	*TelemetrySpec `json:",inline"`
+	Mcac           *McacTelemetrySpec  `json:"mcac,omitempty"`
+	Cassandra      *CassandraAgentSpec `json:"cassandra,omitempty"`
+}
+
 type PrometheusTelemetrySpec struct {
 	// Enable the creation of Prometheus serviceMonitors for this resource (Cassandra or Stargate).
 	Enabled *bool `json:"enabled,omitempty"`
@@ -126,3 +132,13 @@ type McacTelemetrySpec struct {
 	// This is considered true by default.
 	Enabled *bool `json:"enabled,omitempty"`
 }
+
+type CassandraAgentSpec struct {
+	Endpoint Endpoint                `json:"endpoint,omitempty"`
+	Filters  []promapi.RelabelConfig `json:"filters,omitempty"`
+}
+
+type Endpoint struct {
+	Address string `json:"address,omitempty"`
+	Port    string `json:"port,omitempty"`
+}