add global metrics flag to pgo.yaml

Author: Jeff McCormick

apiserver/clusterservice/clusterimpl.go

@@ -452,7 +452,13 @@ func CreateCluster(request *msgs.CreateClusterRequest) msgs.CreateClusterRespons
 			}
 		}
 
-		//if metrics is chosen, stick it into the user labels
+		//set the metrics flag with the global setting first
+		userLabelsMap["crunchy-collect"] = strconv.FormatBool(apiserver.MetricsFlag)
+		if err != nil {
+			log.Error(err)
+		}
+
+		//if metrics is chosen on the pgo command, stick it into the user labels
 		if request.MetricsFlag {
 			userLabelsMap["crunchy-collect"] = "true"
 		}

apiserver/root.go

@@ -41,6 +41,9 @@ var RESTClient *rest.RESTClient
 // Clientset ...
 var Clientset *kubernetes.Clientset
 
+// MetricsFlag if set to true will cause crunchy-collect to be added into new clusters
+var MetricsFlag bool
+
 // AuditFlag if set to true will cause auditing to occur in the logs
 var AuditFlag bool
 
@@ -64,7 +67,7 @@ var Credentials map[string]string
 
 func init() {
 	BasicAuth = true
-
+	MetricsFlag = false
 	AuditFlag = false
 
 	log.Infoln("apiserver starts")
@@ -136,6 +139,11 @@ func initConfig() {
 		log.Info("audit flag is set to true")
 	}
 
+	MetricsFlag = viper.GetBool("Pgo.Metrics")
+	if MetricsFlag {
+		log.Info("metrics flag is set to true")
+	}
+
 	if DebugFlag || viper.GetBool("Pgo.Debug") {
 		log.Debug("debug flag is set to true")
 		log.SetLevel(log.DebugLevel)

conf/apiserver/pgo.yaml

@@ -23,6 +23,7 @@ ReplicaStorage:
   StorageType:  create
 Pgo:
   Audit:  false
+  Metrics:  false
   LSPVCTemplate:  /config/pgo.lspvc-template.json
   LoadTemplate:  /config/pgo.load-template.json
   COImagePrefix:  crunchydata

conf/postgres-operator/cluster/1/collect.json

@@ -13,7 +13,7 @@
         "value": "http://crunchy-metrics:9091"
     }, {
         "name": "DATA_SOURCE_NAME",
-        "value": "postgresql://primaryuser:password@{{.Name}}:5432/postgres?sslmode=disable"
+        "value": "postgresql://primaryuser:password@127.0.0.1:5432/postgres?sslmode=disable"
     }, {
         "name": "POSTGRES_EXPORTER_URL",
         "value": "http://localhost:9187/metrics"

docs/operator-docs.asciidoc

@@ -596,6 +596,7 @@ Values in the pgo configuration file have the following meaning:
 |Pgo.COImagePrefix        | image tag prefix to use for the Operator containers
 |Pgo.COImageTag        | image tag to use for the Operator containers
 |Pgo.Audit        | boolean, if set to true will cause each apiserver call to be logged with an *audit* marking
+|Pgo.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
 |======================
 
 *NOTE*: Regarding the PVC access mode variable; this is automatically set to ReadWriteMany but