Implementation addMonitoringPermissions via own func in database.go. Added for create and update. old code commented out before it is removed.

Author: Schmaetz

pkg/cluster/cluster.go

@@ -127,9 +127,9 @@ func New(cfg Config, kubeClient k8sutil.KubernetesClient, pgSpec cpov1.Postgresq
 	if !ok {
 		passwordEncryption = "scram-sha-256"
 	}
-	if pgSpec.Spec.Monitoring != nil {
-		pgSpec.AddMonitoringUser(monitorUsername)
-	}
+	// if pgSpec.Spec.Monitoring != nil {
+	// 	pgSpec.AddMonitoringUser(monitorUsername)
+	// }
 	cluster := &Cluster{
 		Config:         cfg,
 		Postgresql:     pgSpec,
@@ -352,12 +352,12 @@ func (c *Cluster) Create() (err error) {
 		}
 		c.logger.Info("a TDE secret was successfully created")
 	}
-	if c.Postgresql.Spec.Monitoring != nil {
-		if err := c.createMonitoringSecret(); err != nil {
-			return fmt.Errorf("could not create the monitoring secret: %v", err)
-		}
-		c.logger.Info("a monitoring secret was successfully created")
-	}
+	// if c.Postgresql.Spec.Monitoring != nil {
+	// 	if err := c.createMonitoringSecret(); err != nil {
+	// 		return fmt.Errorf("could not create the monitoring secret: %v", err)
+	// 	}
+	// 	c.logger.Info("a monitoring secret was successfully created")
+	// }
 
 	if specHasPgbackrestClone(&c.Postgresql.Spec) {
 		if err := c.createPgbackrestCloneConfig(); err != nil {
@@ -433,29 +433,33 @@ func (c *Cluster) Create() (err error) {
 	// something fails, report warning
 	c.createConnectionPooler(c.installLookupFunction)
 
-	//Setup cpo monitoring related sql statements
-	if c.Spec.Monitoring != nil {
-		c.logger.Info("setting up CPO monitoring")
-
-		// Open a new connection to the postgres db tp setup monitoring struc and permissions
-		if err := c.initDbConnWithName("postgres"); err != nil {
-			return fmt.Errorf("could not init database connection")
-		}
-		defer func() {
-			if c.connectionIsClosed() {
-				return
-			}
-
-			if err := c.closeDbConn(); err != nil {
-				c.logger.Errorf("could not close database connection: %v", err)
-			}
-		}()
-		_, err := c.pgDb.Exec(CPOmonitoring)
-		if err != nil {
-			return fmt.Errorf("CPO monitoring could not be setup: %v", err)
-		}
+	if c.Spec.Monitoring != nil { #Hinzufügen und in database.go die function von pooler nachbauen und dann den unteren teil (alt) komplett entfernen
+		c.addMonitoringPermissions()
 	}
 
+	//Setup cpo monitoring related sql statements
+	// if c.Spec.Monitoring != nil {
+	// 	c.logger.Info("setting up CPO monitoring")
+
+	// 	// Open a new connection to the postgres db tp setup monitoring struc and permissions
+	// 	if err := c.initDbConnWithName("postgres"); err != nil {
+	// 		return fmt.Errorf("could not init database connection")
+	// 	}
+	// 	defer func() {
+	// 		if c.connectionIsClosed() {
+	// 			return
+	// 		}
+
+	// 		if err := c.closeDbConn(); err != nil {
+	// 			c.logger.Errorf("could not close database connection: %v", err)
+	// 		}
+	// 	}()
+	// 	_, err := c.pgDb.Exec(CPOmonitoring)
+	// 	if err != nil {
+	// 		return fmt.Errorf("CPO monitoring could not be setup: %v", err)
+	// 	}
+	// }
+
 	// remember slots to detect deletion from manifest
 	for slotName, desiredSlot := range c.Spec.Patroni.Slots {
 		c.replicationSlots[slotName] = desiredSlot
@@ -1199,6 +1203,11 @@ func (c *Cluster) Update(oldSpec, newSpec *cpov1.Postgresql) error {
 		updateFailed = true
 	}
 
+	// Check if we need to call addMonitoringPermissions-func 
+	if c.Spec.Monitoring != nil && needMonitoring){
+		c.addMonitoringPermissions()
+	}
+
 	// streams
 	if len(newSpec.Spec.Streams) > 0 {
 		if err := c.syncStreams(); err != nil {

pkg/cluster/database.go

@@ -838,3 +838,27 @@ func (c *Cluster) installLookupFunction(poolerSchema, poolerUser string) error {
 
 	return nil
 }
+
+// Creates the needes structure and grant needed permissions for the Monitoring
+func (c *Cluster) addMonitoringPermissions() error {
+	c.logger.Info("setting up CPO monitoring")
+
+	// Open a new connection to the postgres db tp setup monitoring struc and permissions
+	if err := c.initDbConnWithName("postgres"); err != nil {
+		return fmt.Errorf("could not init database connection")
+	}
+	defer func() {
+		if c.connectionIsClosed() {
+			return
+		}
+
+		if err := c.closeDbConn(); err != nil {
+			c.logger.Errorf("could not close database connection: %v", err)
+		}
+	}()
+	_, err := c.pgDb.Exec(cpoMonitoring)
+	if err != nil {
+		return fmt.Errorf("CPO monitoring could not be setup: %v", err)
+	}
+	return nil
+}