add PgmonitorPassword setting to pgo.yaml, update cluster deployment template to only add pgmonitor env var if metrics is specified, update docs, update pgo show config

jmccormick2001 · jmccormick2001 · commit 8812ad31d0c6 · 2019-01-21T13:49:02.000-05:00
diff --git a/chart/postgres-operator/files/postgres-operator/cluster/1/pgmonitor-env-vars.json b/chart/postgres-operator/files/postgres-operator/cluster/1/pgmonitor-env-vars.json
@@ -0,0 +1,3 @@
+                        "name": "PGMONITOR_PASSWORD",
+                        "value": "{{.PgmonitorPassword}}"
+                    }, {
diff --git a/conf/postgres-operator/cluster/1/cluster-deployment-1.json b/conf/postgres-operator/cluster/1/cluster-deployment-1.json
@@ -68,12 +68,10 @@
                         "name": "PGDATA_PATH_OVERRIDE",
                         "value": "{{.DataPathOverride}}"
                     }, {
+			{{.PgmonitorEnvVars}}
 			{{.PgbackrestEnvVars}}
                         "name": "PG_DATABASE",
                         "value": "{{.Database}}"
-                    }, {
-                        "name": "PGMONITOR_PASSWORD",
-                        "value": "password"
                     }, {
                         "name": "ARCHIVE_MODE",
                         "value": "{{.ArchiveMode}}"
diff --git a/conf/postgres-operator/cluster/1/pgmonitor-env-vars.json b/conf/postgres-operator/cluster/1/pgmonitor-env-vars.json
@@ -0,0 +1,3 @@
+                        "name": "PGMONITOR_PASSWORD",
+                        "value": "{{.PgmonitorPassword}}"
+                    }, {
diff --git a/conf/postgres-operator/pgo.yaml b/conf/postgres-operator/pgo.yaml
@@ -21,6 +21,7 @@ Cluster:
   AutofailReplaceReplica:  false
   LogStatement:  none
   LogMinDurationStatement:  60000
+  PgmonitorPassword:  password
 PrimaryStorage: hostpathstorage
 XlogStorage: hostpathstorage
 BackupStorage: hostpathstorage
diff --git a/config/pgoconfig.go b/config/pgoconfig.go
@@ -49,6 +49,7 @@ type ClusterStruct struct {
 	Backrest                bool   `yaml:"Backrest"`
 	Autofail                bool   `yaml:"Autofail"`
 	AutofailReplaceReplica  bool   `yaml:"AutofailReplaceReplica"`
+	PgmonitorPassword       string `yaml:"PgmonitorPassword"`
 }
 
 type StorageStruct struct {
diff --git a/hugo/content/Configuration/pgo-yaml-configuration.md b/hugo/content/Configuration/pgo-yaml-configuration.md
@@ -24,6 +24,7 @@ The *pgo.yaml* file is broken into major sections as described below:
 |User        | the PostgreSQL normal user name
 |Strategy        | sets the deployment strategy to be used for deploying a cluster, currently there is only strategy *1*
 |Replicas        | the number of cluster replicas to create for newly created clusters
+|PgmonitorPassword        | the password to use for pgmonitor metrics collection if you specify --metrics when creating a PG cluster
 |Metrics        | boolean, if set to true will cause each new cluster to include crunchy-collect as a sidecar container for metrics collection, if set to false (default), users can still add metrics on a cluster-by-cluster basis using the pgo command flag --metrics
 |Badger        | boolean, if set to true will cause each new cluster to include crunchy-pgbadger as a sidecar container for static log analysis, if set to false (default), users can still add pgbadger on a cluster-by-cluster basis using the pgo create cluster command flag --pgbadger
 |Policies        | optional, list of policies to apply to a newly created cluster, comma separated, must be valid policies in the catalog
diff --git a/operator/cluster/cluster.go b/operator/cluster/cluster.go
@@ -86,19 +86,13 @@ type DeploymentTemplateFields struct {
 	ConfVolume              string
 	CollectAddon            string
 	BadgerAddon             string
+	PgmonitorEnvVars        string
 	PgbackrestEnvVars       string
 	//next 2 are for the replica deployment only
 	Replicas    string
 	PrimaryHost string
 }
 
-type PgbackrestEnvVarsTemplateFields struct {
-	PgbackrestStanza    string
-	PgbackrestDBPath    string
-	PgbackrestRepo1Path string
-	PgbackrestRepo1Host string
-}
-
 // ReplicaSuffix ...
 const ReplicaSuffix = "-replica"
 
diff --git a/operator/cluster/cluster_strategy_1.go b/operator/cluster/cluster_strategy_1.go
@@ -128,6 +128,7 @@ func (r Strategy1) AddCluster(clientset *kubernetes.Clientset, client *rest.REST
 		CollectAddon:            operator.GetCollectAddon(clientset, namespace, &cl.Spec),
 		BadgerAddon:             operator.GetBadgerAddon(clientset, namespace, &cl.Spec),
 		PgbackrestEnvVars:       operator.GetPgbackrestEnvVars(cl.Spec.UserLabels[util.LABEL_BACKREST], cl.Spec.Name, cl.Spec.Name),
+		PgmonitorEnvVars:        operator.GetPgmonitorEnvVars(cl.Spec.UserLabels[util.LABEL_COLLECT]),
 	}
 
 	log.Debug("collectaddon value is [" + deploymentFields.CollectAddon + "]")
@@ -382,6 +383,7 @@ func (r Strategy1) Scale(clientset *kubernetes.Clientset, client *rest.RESTClien
 		CollectAddon:            operator.GetCollectAddon(clientset, namespace, &cluster.Spec),
 		BadgerAddon:             operator.GetBadgerAddon(clientset, namespace, &cluster.Spec),
 		PgbackrestEnvVars:       operator.GetPgbackrestEnvVars(cluster.Spec.UserLabels[util.LABEL_BACKREST], replica.Spec.ClusterName, replica.Spec.Name),
+		PgmonitorEnvVars:        operator.GetPgmonitorEnvVars(cluster.Spec.UserLabels[util.LABEL_COLLECT]),
 	}
 
 	switch replica.Spec.ReplicaStorage.StorageType {
diff --git a/operator/clusterutilties.go b/operator/clusterutilties.go
@@ -53,14 +53,17 @@ type badgerTemplateFields struct {
 	ContainerResources string
 }
 
-// consolidate with cluster.PgbackrestEnvVarsTemplateFields
 type PgbackrestEnvVarsTemplateFields struct {
 	PgbackrestStanza    string
 	PgbackrestDBPath    string
 	PgbackrestRepo1Path string
 	PgbackrestRepo1Host string
 }
 
+type PgmonitorEnvVarsTemplateFields struct {
+	PgmonitorPassword string
+}
+
 // needs to be consolidated with cluster.DeploymentTemplateFields
 // DeploymentTemplateFields ...
 type DeploymentTemplateFields struct {
@@ -304,3 +307,21 @@ func GetReplicaAffinity(clusterLabels, replicaLabels map[string]string) string {
 	}
 	return GetAffinity(key, value, operator)
 }
+
+func GetPgmonitorEnvVars(metricsEnabled string) string {
+	if metricsEnabled == "true" {
+		fields := PgmonitorEnvVarsTemplateFields{
+			PgmonitorPassword: Pgo.Cluster.PgmonitorPassword,
+		}
+
+		var doc bytes.Buffer
+		err := PgmonitorEnvVarsTemplate.Execute(&doc, fields)
+		if err != nil {
+			log.Error(err.Error())
+			return ""
+		}
+		return doc.String()
+	}
+	return ""
+
+}
diff --git a/operator/common.go b/operator/common.go
@@ -30,6 +30,7 @@ var NAMESPACE string
 
 const pgoBackrestRepoTemplatePath = "/pgo-config/pgo-backrest-repo-template.json"
 const pgoBackrestRepoServiceTemplatePath = "/pgo-config/pgo-backrest-repo-service-template.json"
+const pgmonitorEnvVarsPath = "/pgo-config/pgmonitor-env-vars.json"
 const pgbackrestEnvVarsPath = "/pgo-config/pgbackrest-env-vars.json"
 const PgpoolTemplatePath = "/pgo-config/pgpool-template.json"
 const PgpoolConfTemplatePath = "/pgo-config/pgpool.conf"
@@ -58,6 +59,7 @@ const ContainerResourcesTemplate1Path = "/pgo-config/container-resources.json"
 
 var PgoBackrestRepoServiceTemplate *template.Template
 var PgoBackrestRepoTemplate *template.Template
+var PgmonitorEnvVarsTemplate *template.Template
 var PgbackrestEnvVarsTemplate *template.Template
 var JobTemplate *template.Template
 var UpgradeJobTemplate1 *template.Template
@@ -113,6 +115,7 @@ func Initialize() {
 
 	PgoBackrestRepoTemplate = util.LoadTemplate(pgoBackrestRepoTemplatePath)
 	PgoBackrestRepoServiceTemplate = util.LoadTemplate(pgoBackrestRepoServiceTemplatePath)
+	PgmonitorEnvVarsTemplate = util.LoadTemplate(pgmonitorEnvVarsPath)
 	PgbackrestEnvVarsTemplate = util.LoadTemplate(pgbackrestEnvVarsPath)
 	JobTemplate = util.LoadTemplate(jobPath)
 	PgpoolTemplate = util.LoadTemplate(PgpoolTemplatePath)
@@ -161,6 +164,12 @@ func Initialize() {
 	} else {
 		log.Debugf("COImagePrefix set, using %s", Pgo.Pgo.COImagePrefix)
 	}
+
+	if Pgo.Cluster.PgmonitorPassword == "" {
+		log.Debug("pgo.yaml PgmonitorPassword not set, using default")
+		Pgo.Cluster.PgmonitorPassword = "password"
+	}
+
 	if Pgo.Pgo.COImageTag == "" {
 		log.Error("pgo.yaml COImageTag not set, required ")
 		panic("pgo.yaml COImageTag env var not set")
diff --git a/pgo/cmd/config.go b/pgo/cmd/config.go
@@ -59,6 +59,7 @@ func showConfig(args []string) {
 	fmt.Printf("%s%s\n", "  CCPImageTag:  ", pgo.Cluster.CCPImageTag)
 	fmt.Printf("%s%s\n", "  ServiceType:  ", pgo.Cluster.ServiceType)
 	fmt.Printf("%s%t\n", "  Metrics:  ", pgo.Cluster.Metrics)
+	fmt.Printf("%s%s\n", "  PgmonitorPassword:  ", pgo.Cluster.PgmonitorPassword)
 	fmt.Printf("%s%t\n", "  Backrest:  ", pgo.Cluster.Backrest)
 	fmt.Printf("%s%d\n", "  BackrestPort:  ", pgo.Cluster.BackrestPort)
 	fmt.Printf("%s%t\n", "  Autofail:  ", pgo.Cluster.Autofail)

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+ "name": "PGMONITOR_PASSWORD",`
	`2`	`+ "value": "{{.PgmonitorPassword}}"`
	`3`	`+ }, {`
Original file line number	Diff line number	Diff line change
`@@ -49,6 +49,7 @@ type ClusterStruct struct {`
`49`	`49`	Backrest bool `yaml:"Backrest"`
`50`	`50`	Autofail bool `yaml:"Autofail"`
`51`	`51`	AutofailReplaceReplica bool `yaml:"AutofailReplaceReplica"`
	`52`	+ PgmonitorPassword string `yaml:"PgmonitorPassword"`
`52`	`53`	`}`
`53`	`54`
`54`	`55`	`type StorageStruct struct {`
Original file line number	Diff line number	Diff line change
`@@ -128,6 +128,7 @@ func (r Strategy1) AddCluster(clientset kubernetes.Clientset, client rest.REST`
`128`	`128`	`CollectAddon: operator.GetCollectAddon(clientset, namespace, &cl.Spec),`
`129`	`129`	`BadgerAddon: operator.GetBadgerAddon(clientset, namespace, &cl.Spec),`
`130`	`130`	`PgbackrestEnvVars: operator.GetPgbackrestEnvVars(cl.Spec.UserLabels[util.LABEL_BACKREST], cl.Spec.Name, cl.Spec.Name),`
	`131`	`+ PgmonitorEnvVars: operator.GetPgmonitorEnvVars(cl.Spec.UserLabels[util.LABEL_COLLECT]),`
`131`	`132`	`}`
`132`	`133`
`133`	`134`	`log.Debug("collectaddon value is [" + deploymentFields.CollectAddon + "]")`
`@@ -382,6 +383,7 @@ func (r Strategy1) Scale(clientset kubernetes.Clientset, client rest.RESTClien`
`382`	`383`	`CollectAddon: operator.GetCollectAddon(clientset, namespace, &cluster.Spec),`
`383`	`384`	`BadgerAddon: operator.GetBadgerAddon(clientset, namespace, &cluster.Spec),`
`384`	`385`	`PgbackrestEnvVars: operator.GetPgbackrestEnvVars(cluster.Spec.UserLabels[util.LABEL_BACKREST], replica.Spec.ClusterName, replica.Spec.Name),`
	`386`	`+ PgmonitorEnvVars: operator.GetPgmonitorEnvVars(cluster.Spec.UserLabels[util.LABEL_COLLECT]),`
`385`	`387`	`}`
`386`	`388`
`387`	`389`	`switch replica.Spec.ReplicaStorage.StorageType {`