Add version, gitcommit, MCG, and ASM to analytics (#128)

Author: askmeegs

analytics/server.go

@@ -29,6 +29,10 @@ type Cluster struct {
 	ClusterId string `json:"clusterId"`
 	CreateId  string `json:"createId"`
 
+	// What version is the user running?
+	Version   string `json:"version"`
+	GitCommit string `json:"gitCommit"`
+
 	// The rest of these fields must be populated by the client on POST.
 	//String Format: 2006-01-02T15:04:05.000Z		Test string: 2021-11-12T11:45:26.371Z
 	Timestamp string `json:"timestamp"`
@@ -42,6 +46,8 @@ type Cluster struct {
 	DefaultNodepoolOS         string `json:"defaultNodepoolOS"`
 	PrivateEndpoint           bool   `json:"privateEndpoint"`
 	EnableConfigSync          bool   `json:"enableConfigSync"`
+	AnthosServiceMesh         bool   `json:"anthosServiceMesh"`
+	MultiClusterGateway       bool   `json:"multiClusterGateway"`
 	EnablePolicyController    bool   `json:"enablePolicyController"`
 	VPCType                   string `json:"vpcType"`
 
@@ -175,9 +181,11 @@ func initCloudSQL() (*app, error) {
 	}
 
 	tableCreate := `
-	CREATE TABLE IF NOT EXISTS CLUSTERS(
+	CREATE TABLE IF NOT EXISTS CLUSTERS3(
 		ClusterId 						TEXT, 
 		CreateId 						TEXT, 
+		Version							TEXT,
+		GitCommit						TEXT,
 		Timestamp 						TIMESTAMP,
 		OS								TEXT,
 		TerraformState 					TEXT,
@@ -188,6 +196,8 @@ func initCloudSQL() (*app, error) {
 		PrivateEndpoint 				BOOL,
 		EnableConfigSync        		BOOL, 
 		EnablePolicyController 			BOOL,
+		AnthosServiceMesh				BOOL,
+		MultiClusterGateway				BOOL,
 		VPCType 						TEXT,
 		ClusterIndex 					INTEGER,
 		ClusterNumNodes 				INTEGER, 
@@ -206,9 +216,9 @@ func initCloudSQL() (*app, error) {
 
 // Helper - writes Cluster object to Cloud SQL on localhost (via proxy)
 func writeToCloudSQL(app *app, c Cluster) error {
-	sqlInsert := "INSERT INTO CLUSTERS(ClusterId, CreateId, Timestamp, OS, TerraformState, Region, EnableWorkloadIdentity, EnablePreemptibleNodepool, DefaultNodepoolOS, PrivateEndpoint, EnableConfigSync, EnablePolicyController, VPCType, ClusterIndex, ClusterNumNodes, ClusterMachineType, ClusterRegion, ClusterZone) VALUES($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16, $17, $18)"
+	sqlInsert := "INSERT INTO CLUSTERS3(ClusterId, CreateId, Version, GitCommit, Timestamp, OS, TerraformState, Region, EnableWorkloadIdentity, EnablePreemptibleNodepool, DefaultNodepoolOS, PrivateEndpoint, EnableConfigSync, EnablePolicyController, AnthosServiceMesh, MultiClusterGateway, VPCType, ClusterIndex, ClusterNumNodes, ClusterMachineType, ClusterRegion, ClusterZone) VALUES($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16, $17, $18, $19, $20, $21, $22)"
 
-	_, err := app.db.Exec(sqlInsert, c.ClusterId, c.CreateId, c.Timestamp, c.OS, c.TerraformState, c.Region, c.EnableWorkloadIdentity, c.EnablePreemptibleNodepool, c.DefaultNodepoolOS, c.PrivateEndpoint, c.EnableConfigSync, c.EnablePolicyController, c.VPCType, c.ClusterIndex, c.ClusterNumNodes, c.ClusterMachineType, c.ClusterRegion, c.ClusterZone)
+	_, err := app.db.Exec(sqlInsert, c.ClusterId, c.CreateId, c.Version, c.GitCommit, c.Timestamp, c.OS, c.TerraformState, c.Region, c.EnableWorkloadIdentity, c.EnablePreemptibleNodepool, c.DefaultNodepoolOS, c.PrivateEndpoint, c.EnableConfigSync, c.EnablePolicyController, c.AnthosServiceMesh, c.MultiClusterGateway, c.VPCType, c.ClusterIndex, c.ClusterNumNodes, c.ClusterMachineType, c.ClusterRegion, c.ClusterZone)
 
 	if err != nil {
 		return fmt.Errorf("Error on Cloud SQL Insert: %v", err)

cli/cmd/create.go

@@ -37,7 +37,7 @@ var createCmd = &cobra.Command{
 
 		// Send user analytics - async
 		if conf.SendAnalytics {
-			go analytics.SendAnalytics(conf)
+			go analytics.SendAnalytics(conf, Version, GitCommit)
 		}
 
 		config.GenerateTfvars(conf)

cli/pkg/analytics/client.go

@@ -4,6 +4,7 @@ import (
 	"bytes"
 	"encoding/json"
 	"gkekitctl/pkg/config"
+
 	"net/http"
 	"runtime"
 	"time"
@@ -18,6 +19,8 @@ import (
 type Cluster struct {
 	ClusterId                 string `json:"clusterId"`
 	CreateId                  string `json:"createId"`
+	Version                   string `json:"version"`
+	GitCommit                 string `json:"gitCommit"`
 	Timestamp                 string `json:"timestamp"`
 	OS                        string `json:"os"`
 	TerraformState            string `json:"terraformState"`
@@ -28,6 +31,8 @@ type Cluster struct {
 	PrivateEndpoint           bool   `json:"privateEndpoint"`
 	EnableConfigSync          bool   `json:"enableConfigSync"`
 	EnablePolicyController    bool   `json:"enablePolicyController"`
+	AnthosServiceMesh         bool   `json:"anthosServiceMesh"`
+	MultiClusterGateway       bool   `json:"multiClusterGateway"`
 	VPCType                   string `json:"vpcType"`
 	ClusterIndex              int    `json:"clusterIndex"`
 	ClusterNumNodes           int    `json:"clusterNumNodes"`
@@ -37,7 +42,7 @@ type Cluster struct {
 	ClusterZone               string `json:"clusterZone"`
 }
 
-func SendAnalytics(conf *config.Config) {
+func SendAnalytics(conf *config.Config, version string, gitCommit string) {
 	// Generate timestamp. Format: 2006-01-02T15:04:05.000Z
 	now := time.Now()
 	timestamp := now.Format("2006-01-02T15:04:05.000Z")
@@ -64,6 +69,8 @@ func SendAnalytics(conf *config.Config) {
 		sendObject := Cluster{
 			ClusterId:                 clusterId.String(),
 			CreateId:                  createId.String(),
+			Version:                   version,
+			GitCommit:                 gitCommit,
 			Timestamp:                 timestamp,
 			OS:                        runtime.GOOS,
 			TerraformState:            conf.TerraformState,
@@ -74,6 +81,8 @@ func SendAnalytics(conf *config.Config) {
 			PrivateEndpoint:           conf.PrivateEndpoint,
 			EnableConfigSync:          conf.ConfigSync,
 			EnablePolicyController:    conf.PolicyController,
+			AnthosServiceMesh:         conf.AnthosServiceMesh,
+			MultiClusterGateway:       conf.MultiClusterGateway,
 			VPCType:                   conf.VpcConfig.VpcType,
 			ClusterIndex:              i,
 			ClusterNumNodes:           cluster.NumNodes,

cli/pkg/config/config.go

@@ -47,6 +47,8 @@ type Config struct {
 	ClustersProjectID         string          `yaml:"clustersProjectId"`
 	GovernanceProjectID       string          `yaml:"governanceProjectId"`
 	ConfigSync                bool            `yaml:"configSync"`
+	AnthosServiceMesh         bool            `yaml:"anthosServiceMesh"`
+	MultiClusterGateway       bool            `yaml:"multiClusterGateway"`
 	PolicyController          bool            `yaml:"policyController"`
 	PrivateEndpoint           bool            `yaml:"privateEndpoint"`
 	EnableWorkloadIdentity    bool            `yaml:"enableWorkloadIdentity"`