Change API for per-db metrics

Author: benjaminjb

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

@@ -2120,6 +2120,11 @@ spec:
                                   type: string
                                   x-kubernetes-validations:
                                   - rule: duration("0") <= self && self <= duration("60m")
+                                database:
+                                  description: |-
+                                    The database to target with added custom queries.
+                                    Default behavior is to target `postgres`.
+                                  type: string
                                 name:
                                   description: |-
                                     The name of this batch of queries, which will be used in naming the OTel
@@ -2165,6 +2170,12 @@ spec:
                               type: string
                             type: array
                         type: object
+                      perDBMetricTargets:
+                        description: User defined databases to target for default
+                          per-db metrics
+                        items:
+                          type: string
+                        type: array
                     type: object
                   resources:
                     description: Resources holds the resource requirements for the

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

@@ -11963,6 +11963,11 @@ spec:
                                   type: string
                                   x-kubernetes-validations:
                                   - rule: duration("0") <= self && self <= duration("60m")
+                                database:
+                                  description: |-
+                                    The database to target with added custom queries.
+                                    Default behavior is to target `postgres`.
+                                  type: string
                                 name:
                                   description: |-
                                     The name of this batch of queries, which will be used in naming the OTel
@@ -12008,6 +12013,12 @@ spec:
                               type: string
                             type: array
                         type: object
+                      perDBMetricTargets:
+                        description: User defined databases to target for default
+                          per-db metrics
+                        items:
+                          type: string
+                        type: array
                     type: object
                   resources:
                     description: Resources holds the resource requirements for the

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

@@ -107,6 +107,11 @@ type InstrumentationMetricsSpec struct {
 	// ---
 	// +optional
 	CustomQueries *InstrumentationCustomQueriesSpec `json:"customQueries,omitempty"`
+
+	// User defined databases to target for default per-db metrics
+	// ---
+	// +optional
+	PerDBMetricTargets []string `json:"perDBMetricTargets,omitempty"`
 }
 
 type InstrumentationCustomQueriesSpec struct {
@@ -159,6 +164,12 @@ type InstrumentationCustomQueries struct {
 	// +default="5s"
 	// +optional
 	CollectionInterval *Duration `json:"collectionInterval,omitempty"`
+
+	// The database to target with added custom queries.
+	// Default behavior is to target `postgres`.
+	// ---
+	// +optional
+	Database string `json:"database,omitempty"`
 }
 
 // ---