Merge branch 'main' into K8SPG-710

Author: egegunes

build/crd/percona/generated/pgv2.percona.com_perconapgclusters.yaml

@@ -13631,6 +13631,8 @@ spec:
                     - Never
                     - IfNotPresent
                     type: string
+                  postgresParams:
+                    type: string
                   querySource:
                     default: pgstatmonitor
                     enum:

config/crd/bases/pgv2.percona.com_perconapgclusters.yaml

@@ -14038,6 +14038,8 @@ spec:
                     - Never
                     - IfNotPresent
                     type: string
+                  postgresParams:
+                    type: string
                   querySource:
                     default: pgstatmonitor
                     enum:

deploy/bundle.yaml

@@ -14331,6 +14331,8 @@ spec:
                     - Never
                     - IfNotPresent
                     type: string
+                  postgresParams:
+                    type: string
                   querySource:
                     default: pgstatmonitor
                     enum:

deploy/cr.yaml

@@ -471,7 +471,8 @@ spec:
 #    imagePullPolicy: IfNotPresent
     secret: cluster1-pmm-secret
     serverHost: monitoring-service
-#   customClusterName: "<string>"
+#    customClusterName: "<string>"
+#    postgresParams: "<string>"
 #    querySource: pgstatmonitor
 #  patroni:
 #    # Some values of the Liveness/Readiness probes of the patroni container are calculated using syncPeriodSeconds by the following formulas:

deploy/crd.yaml

@@ -14331,6 +14331,8 @@ spec:
                     - Never
                     - IfNotPresent
                     type: string
+                  postgresParams:
+                    type: string
                   querySource:
                     default: pgstatmonitor
                     enum:

deploy/cw-bundle.yaml

@@ -14331,6 +14331,8 @@ spec:
                     - Never
                     - IfNotPresent
                     type: string
+                  postgresParams:
+                    type: string
                   querySource:
                     default: pgstatmonitor
                     enum:

e2e-tests/functions

@@ -182,7 +182,8 @@ get_cr() {
 		.spec.proxy.pgBouncer.image = "'$IMAGE_PGBOUNCER'" |
 		.spec.pmm.image = "'$IMAGE_PMM_CLIENT'" |
 		.spec.pmm.secret = "'${cr_name}'-pmm-secret" |
-		.spec.pmm.customClusterName = "'${cr_name}'-pmm-custom-name"
+		.spec.pmm.customClusterName = "'${cr_name}'-pmm-custom-name" |
+		.spec.pmm.postgresParams = "--environment=dev-postgres"
 		' $DEPLOY_DIR/cr.yaml >$TEMP_DIR/cr.yaml
 
 	if [[ $OPENSHIFT ]]; then
@@ -381,7 +382,7 @@ deploy_pmm3_server() {
 			oc create rolebinding pmm-pg-operator-namespace-only --role percona-postgresql-operator --serviceaccount=$NAMESPACE:pmm-server -n "${NAMESPACE}"
 			oc patch role/percona-postgresql-operator --type json -p='[{"op":"add","path": "/rules/-","value":{"apiGroups":["security.openshift.io"],"resources":["securitycontextconstraints"],"verbs":["use"],"resourceNames":["privileged"]}}]' -n "$NAMESPACE"
 		fi
-		helm install monitoring --set imageTag=${IMAGE_PMM3_SERVER#*:} --set imageRepo=${IMAGE_PMM3_SERVER%:*} --set platform=$platform --set sa=pmm-server --set supresshttp2=false https://percona-charts.storage.googleapis.com/pmm-server-${PMM3_SERVER_VERSION}.tgz -n "$NAMESPACE"
+		helm install monitoring --set imageTag=${IMAGE_PMM3_SERVER#*:} --set imageRepo=${IMAGE_PMM3_SERVER%:*} --set platform=$platform --set sa=pmm-server --set supresshttp2=false https://percona-charts.storage.googleapis.com/pmm-server-${PMM_SERVER_VERSION}.tgz -n "$NAMESPACE"
 	else
 		platform=kubernetes
 

e2e-tests/tests/monitoring-pmm3/03-assert.yaml

@@ -40,6 +40,7 @@ spec:
     secret: monitoring-pmm3-pmm-secret
     serverHost: monitoring-service
     customClusterName: monitoring-pmm3-pmm-custom-name
+    postgresParams: "--environment=dev-postgres"
   port: 5432
   proxy:
     pgBouncer:

e2e-tests/tests/monitoring/03-assert.yaml

@@ -40,6 +40,7 @@ spec:
     secret: monitoring-pmm-secret
     serverHost: monitoring-service
     customClusterName: monitoring-pmm-custom-name
+    postgresParams: "--environment=dev-postgres"
   port: 5432
   proxy:
     pgBouncer:

percona/pmm/pmm.go

@@ -238,10 +238,16 @@ func sidecarContainerV2(pgc *v2.PerconaPGCluster) corev1.Container {
 		if pgc.Spec.PMM.CustomClusterName != "" {
 			clusterName = pgc.Spec.PMM.CustomClusterName
 		}
-		container.Env = append(container.Env, corev1.EnvVar{
-			Name:  "CLUSTER_NAME",
-			Value: clusterName,
-		})
+		container.Env = append(container.Env,
+			corev1.EnvVar{
+				Name:  "CLUSTER_NAME",
+				Value: clusterName,
+			},
+			corev1.EnvVar{
+				Name:  "PMM_POSTGRES_PARAMS",
+				Value: pmmSpec.PostgresParams,
+			},
+		)
 	}
 
 	return container
@@ -434,6 +440,10 @@ func sidecarContainerV3(pgc *v2.PerconaPGCluster) corev1.Container {
 				Name:  "CLUSTER_NAME",
 				Value: clusterName,
 			},
+			{
+				Name:  "PMM_POSTGRES_PARAMS",
+				Value: pmmSpec.PostgresParams,
+			},
 		},
 	}
 
@@ -461,7 +471,7 @@ func agentPrerunScript(querySource v2.PMMQuerySource, pgc *v2.PerconaPGCluster)
 
 	if pgc.CompareVersion("2.7.0") >= 0 {
 		addServiceArgs = append(addServiceArgs,
-			"--cluster=$(CLUSTER_NAME)",
+			"--cluster=$(CLUSTER_NAME)", "$PMM_POSTGRES_PARAMS",
 		)
 	}
 	addService := fmt.Sprintf("pmm-admin add postgresql %s", strings.Join(addServiceArgs, " "))