K8SPG-750 add cluster name to pmm

Author: nmarukovich

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

@@ -13422,6 +13422,8 @@ spec:
               pmm:
                 description: The specification of PMM sidecars.
                 properties:
+                  clusterName:
+                    type: string
                   containerSecurityContext:
                     description: |-
                       SecurityContext holds security configuration that will be applied to a container.

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

@@ -13827,6 +13827,8 @@ spec:
               pmm:
                 description: The specification of PMM sidecars.
                 properties:
+                  clusterName:
+                    type: string
                   containerSecurityContext:
                     description: |-
                       SecurityContext holds security configuration that will be applied to a container.

deploy/bundle.yaml

@@ -14120,6 +14120,8 @@ spec:
               pmm:
                 description: The specification of PMM sidecars.
                 properties:
+                  clusterName:
+                    type: string
                   containerSecurityContext:
                     description: |-
                       SecurityContext holds security configuration that will be applied to a container.

deploy/cr.yaml

@@ -471,6 +471,7 @@ spec:
 #    imagePullPolicy: IfNotPresent
     secret: cluster1-pmm-secret
     serverHost: monitoring-service
+#   clusterName: "<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

@@ -14120,6 +14120,8 @@ spec:
               pmm:
                 description: The specification of PMM sidecars.
                 properties:
+                  clusterName:
+                    type: string
                   containerSecurityContext:
                     description: |-
                       SecurityContext holds security configuration that will be applied to a container.

deploy/cw-bundle.yaml

@@ -14120,6 +14120,8 @@ spec:
               pmm:
                 description: The specification of PMM sidecars.
                 properties:
+                  clusterName:
+                    type: string
                   containerSecurityContext:
                     description: |-
                       SecurityContext holds security configuration that will be applied to a container.

e2e-tests/functions

@@ -181,7 +181,8 @@ get_cr() {
 		.spec.backups.pgbackrest.image = "'$IMAGE_BACKREST'" |
 		.spec.proxy.pgBouncer.image = "'$IMAGE_PGBOUNCER'" |
 		.spec.pmm.image = "'$IMAGE_PMM_CLIENT'" |
-		.spec.pmm.secret = "'${cr_name}'-pmm-secret"
+		.spec.pmm.secret = "'${cr_name}'-pmm-secret" |
+		.spec.pmm.clusterName = "'${cr_name}'-pmm-custom-name"
 		' $DEPLOY_DIR/cr.yaml >$TEMP_DIR/cr.yaml
 
 	if [[ $OPENSHIFT ]]; then

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

@@ -39,6 +39,7 @@ spec:
     enabled: true
     secret: monitoring-pmm3-pmm-secret
     serverHost: monitoring-service
+    clusterName: monitoring-pmm3-pmm-custom-name
   port: 5432
   proxy:
     pgBouncer:

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

@@ -39,6 +39,7 @@ spec:
     enabled: true
     secret: monitoring-pmm-secret
     serverHost: monitoring-service
+    clusterName: monitoring-pmm-custom-name
   port: 5432
   proxy:
     pgBouncer:

percona/pmm/pmm.go

@@ -224,15 +224,23 @@ func sidecarContainerV2(pgc *v2.PerconaPGCluster) corev1.Container {
 			},
 			{
 				Name:  "PMM_AGENT_PRERUN_SCRIPT",
-				Value: agentPrerunScript(pgc.Spec.PMM.QuerySource),
+				Value: agentPrerunScript(pgc.Spec.PMM.QuerySource, pgc),
+			},
+			{
+				Name:  "PMM_AGENT_PATHS_TEMPDIR",
+				Value: "/tmp",
 			},
 		},
 	}
 
-	if pgc.CompareVersion("2.3.0") >= 0 {
+	if pgc.CompareVersion("2.7.0") >= 0 {
+		clusterName := pgc.Name
+		if pgc.Spec.PMM.ClusterName != "" {
+			clusterName = pgc.Spec.PMM.ClusterName
+		}
 		container.Env = append(container.Env, corev1.EnvVar{
-			Name:  "PMM_AGENT_PATHS_TEMPDIR",
-			Value: "/tmp",
+			Name:  "CLUSTER_NAME",
+			Value: clusterName,
 		})
 	}
 
@@ -249,8 +257,7 @@ func sidecarContainerV3(pgc *v2.PerconaPGCluster) corev1.Container {
 	}
 
 	pmmSpec := pgc.Spec.PMM
-
-	return corev1.Container{
+	container := corev1.Container{
 		Name:            "pmm-client",
 		Image:           pmmSpec.Image,
 		ImagePullPolicy: pmmSpec.ImagePullPolicy,
@@ -412,17 +419,30 @@ func sidecarContainerV3(pgc *v2.PerconaPGCluster) corev1.Container {
 			},
 			{
 				Name:  "PMM_AGENT_PRERUN_SCRIPT",
-				Value: agentPrerunScript(pgc.Spec.PMM.QuerySource),
+				Value: agentPrerunScript(pgc.Spec.PMM.QuerySource, pgc),
 			},
 			{
 				Name:  "PMM_AGENT_PATHS_TEMPDIR",
 				Value: "/tmp",
 			},
 		},
 	}
+
+	if pgc.CompareVersion("2.7.0") >= 0 {
+		clusterName := pgc.Name
+		if pgc.Spec.PMM.ClusterName != "" {
+			clusterName = pgc.Spec.PMM.ClusterName
+		}
+		container.Env = append(container.Env, corev1.EnvVar{
+			Name:  "CLUSTER_NAME",
+			Value: clusterName,
+		})
+	}
+
+	return container
 }
 
-func agentPrerunScript(querySource v2.PMMQuerySource) string {
+func agentPrerunScript(querySource v2.PMMQuerySource, pgc *v2.PerconaPGCluster) string {
 	wait := "pmm-admin status --wait=10s"
 	annotate := "pmm-admin annotate --service-name=$(PMM_AGENT_SETUP_NODE_NAME) 'Service restarted'"
 
@@ -440,6 +460,12 @@ func agentPrerunScript(querySource v2.PMMQuerySource) string {
 		"--service-name=$(PMM_AGENT_SETUP_NODE_NAME)",
 		fmt.Sprintf("--query-source=%s", querySource),
 	}
+
+	if pgc.CompareVersion("2.7.0") >= 0 {
+		addServiceArgs = append(addServiceArgs,
+			"--cluster=$(CLUSTER_NAME)",
+		)
+	}
 	addService := fmt.Sprintf("pmm-admin add postgresql %s", strings.Join(addServiceArgs, " "))
 
 	return wait + "; " + addService + "; " + annotate