OTel: Allow users to add metrics exporters.

Author: dsessler7

config/crd/bases/postgres-operator.crunchydata.com_pgadmins.yaml

@@ -2301,6 +2301,13 @@ spec:
                               type: string
                             type: array
                         type: object
+                      exporters:
+                        description: The names of exporters that should send metrics.
+                        items:
+                          type: string
+                        minItems: 1
+                        type: array
+                        x-kubernetes-list-type: set
                       perDBMetricTargets:
                         description: User defined databases to target for default
                           per-db metrics

config/crd/bases/postgres-operator.crunchydata.com_postgresclusters.yaml

@@ -12146,6 +12146,13 @@ spec:
                               type: string
                             type: array
                         type: object
+                      exporters:
+                        description: The names of exporters that should send metrics.
+                        items:
+                          type: string
+                        minItems: 1
+                        type: array
+                        x-kubernetes-list-type: set
                       perDBMetricTargets:
                         description: User defined databases to target for default
                           per-db metrics

internal/collector/naming.go

@@ -9,7 +9,7 @@ const DebugExporter = "debug"
 const LogsBatchProcessor = "batch/logs"
 const OneSecondBatchProcessor = "batch/1s"
 const SubSecondBatchProcessor = "batch/200ms"
-const Prometheus = "prometheus"
+const Prometheus = "prometheus/cpk-monitoring"
 const PrometheusPort = 9187
 const PGBouncerMetrics = "metrics/pgbouncer"
 const PostgresMetrics = "metrics/postgres"

internal/collector/patroni.go

@@ -168,14 +168,22 @@ func EnablePatroniMetrics(ctx context.Context,
 			},
 		}
 
+		// If there are exporters to be added to the metrics pipelines defined
+		// in the spec, add them to the pipeline.
+		exporters := []ComponentID{Prometheus}
+		if inCluster.Spec.Instrumentation.Metrics != nil &&
+			inCluster.Spec.Instrumentation.Metrics.Exporters != nil {
+			exporters = append(exporters, inCluster.Spec.Instrumentation.Metrics.Exporters...)
+		}
+
 		// Add Metrics Pipeline
 		outConfig.Pipelines[PatroniMetrics] = Pipeline{
 			Receivers: []ComponentID{Prometheus},
 			Processors: []ComponentID{
 				SubSecondBatchProcessor,
 				CompactingProcessor,
 			},
-			Exporters: []ComponentID{Prometheus},
+			Exporters: exporters,
 		}
 	}
 }

internal/collector/pgbouncer.go

@@ -187,14 +187,22 @@ func EnablePgBouncerMetrics(ctx context.Context, inCluster *v1beta1.PostgresClus
 			"queries": slices.Clone(pgBouncerMetricsQueries),
 		}
 
+		// If there are exporters to be added to the metrics pipelines defined
+		// in the spec, add them to the pipeline.
+		exporters := []ComponentID{Prometheus}
+		if inCluster.Spec.Instrumentation.Metrics != nil &&
+			inCluster.Spec.Instrumentation.Metrics.Exporters != nil {
+			exporters = append(exporters, inCluster.Spec.Instrumentation.Metrics.Exporters...)
+		}
+
 		// Add Metrics Pipeline
 		config.Pipelines[PGBouncerMetrics] = Pipeline{
 			Receivers: []ComponentID{SqlQuery},
 			Processors: []ComponentID{
 				SubSecondBatchProcessor,
 				CompactingProcessor,
 			},
-			Exporters: []ComponentID{Prometheus},
+			Exporters: exporters,
 		}
 	}
 }

internal/collector/postgres_metrics.go

@@ -171,14 +171,22 @@ func EnablePostgresMetrics(ctx context.Context, inCluster *v1beta1.PostgresClust
 			"queries":       slices.Clone(fiveMinuteMetricsClone),
 		}
 
+		// If there are exporters to be added to the metrics pipelines defined
+		// in the spec, add them to the pipeline.
+		exporters := []ComponentID{Prometheus}
+		if inCluster.Spec.Instrumentation.Metrics != nil &&
+			inCluster.Spec.Instrumentation.Metrics.Exporters != nil {
+			exporters = append(exporters, inCluster.Spec.Instrumentation.Metrics.Exporters...)
+		}
+
 		// Add Metrics Pipeline
 		config.Pipelines[PostgresMetrics] = Pipeline{
 			Receivers: []ComponentID{FiveSecondSqlQuery, FiveMinuteSqlQuery},
 			Processors: []ComponentID{
 				SubSecondBatchProcessor,
 				CompactingProcessor,
 			},
-			Exporters: []ComponentID{Prometheus},
+			Exporters: exporters,
 		}
 
 		// Add custom queries and per-db metrics if they are defined in the spec

pkg/apis/postgres-operator.crunchydata.com/v1beta1/instrumentation_types.go

@@ -117,6 +117,13 @@ type InstrumentationMetricsSpec struct {
 	// +optional
 	CustomQueries *InstrumentationCustomQueriesSpec `json:"customQueries,omitempty"`
 
+	// The names of exporters that should send metrics.
+	// ---
+	// +kubebuilder:validation:MinItems=1
+	// +listType=set
+	// +optional
+	Exporters []string `json:"exporters,omitempty"`
+
 	// User defined databases to target for default per-db metrics
 	// ---
 	// +optional