adjusting api to leverage new telemetry (#247)

* adjusting api to leverage new telemetry

* adopt metrics-client v0.3.0 and implement parent_cluster_id

* setting parent cluster id

charts/kubefirst-api/templates/deployment.yaml

@@ -94,6 +94,8 @@ spec:
               value: {{ .Values.global.kubefirstTeamInfo | default "" | quote }}
             - name: KUBEFIRST_VERSION
               value: {{ .Values.global.kubefirstVersion | default "unset" }}
+            - name: PARENT_CLUSTER_ID
+              value: {{ .Values.global.clusterId | default $clusterId }}
             - name: USE_TELEMETRY
               value: {{ .Values.global.useTelemetry | default "true" | quote }}
             - name: IS_CLUSTER_ZERO
@@ -170,8 +172,6 @@ spec:
           imagePullPolicy: {{ .Values.image.hook.pullPolicy }}
           args: [
             "transmit",
-            "--type",
-            "cluster-zero",
           ]
           env:
             - name: CLOUD_PROVIDER
@@ -194,5 +194,7 @@ spec:
               value: {{ .Values.global.kubefirstTeamInfo | default "" | quote }}
             - name: KUBEFIRST_VERSION
               value: {{ .Values.global.kubefirstVersion | default "unset" }}
+            - name: PARENT_CLUSTER_ID
+              value: {{ .Values.global.clusterId | default $clusterId }}
             - name: USE_TELEMETRY
               value: {{ .Values.global.useTelemetry | default "true" | quote }}

go.mod

@@ -26,7 +26,7 @@ require (
 	github.com/google/go-github/v52 v52.0.0
 	github.com/hashicorp/vault/api v1.9.0
 	github.com/joho/godotenv v1.5.1
-	github.com/kubefirst/metrics-client v0.2.8
+	github.com/kubefirst/metrics-client v0.3.0
 	github.com/kubefirst/runtime v0.3.35
 	github.com/minio/minio-go/v7 v7.0.49
 	github.com/otiai10/copy v1.7.0

go.sum

@@ -740,6 +740,8 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/kubefirst/metrics-client v0.2.8 h1:JfaeiBifZD/DpyYW2QVHcrhH/KWA98OmM+7c7M12qMc=
 github.com/kubefirst/metrics-client v0.2.8/go.mod h1:GR7wsMcyYhd+EU67PeuMCBYFE6OJ7P/j5OI5BLOoRMc=
+github.com/kubefirst/metrics-client v0.3.0 h1:zCug82pEzeWhHhpeYQvdhytRNDxrLxX18dPQ5PSxY3s=
+github.com/kubefirst/metrics-client v0.3.0/go.mod h1:GR7wsMcyYhd+EU67PeuMCBYFE6OJ7P/j5OI5BLOoRMc=
 github.com/kubefirst/runtime v0.3.35 h1:wn430Irf0E1vc3X0WX3lYBpyhQ5TN6xxMcargILA9uI=
 github.com/kubefirst/runtime v0.3.35/go.mod h1:0CnYy+8JTG+/0f3QlkTQJqTT654Su6JXk30OufFVY98=
 github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=

internal/controller/controller.go

@@ -159,13 +159,12 @@ func (clctrl *ClusterController) InitController(def *pkgtypes.ClusterDefinition)
 		KubefirstTeam:     env.KubefirstTeam,
 		KubefirstTeamInfo: env.KubefirstTeamInfo,
 		MachineID:         env.ClusterId,
-		MetricName:        telemetry.ClusterInstallStarted,
+		ParentClusterId:   env.ParentClusterId,
+		MetricName:        telemetry.ClusterInstallCompleted,
 		UserId:            env.ClusterId,
 	}
 	clctrl.TelemetryEvent = telemetryEvent
 
-	telemetry.SendEvent(clctrl.TelemetryEvent, telemetry.ClusterInstallStarted, "")
-
 	//Copy Cluster Definiion to Cluster Controller
 	clctrl.AlertsEmail = def.AdminEmail
 	clctrl.CloudProvider = def.CloudProvider

internal/env/env.go

@@ -24,7 +24,8 @@ type Env struct {
 	KubefirstTeamInfo string `env:"KUBEFIRST_TEAM_INFO"`
 	AWSRegion         string `env:"AWS_REGION"`
 	AWSProfile        string `env:"AWS_PROFILE"`
-	IsClusterZero     string `env:"IS_CLUSTER_ZERO" envDefault:"false"`
+	IsClusterZero     string `env:"IS_CLUSTER_ZERO"`
+	ParentClusterId   string `env:"PARENT_CLUSTER_ID"`
 	InCluster         string `env:"IN_CLUSTER" envDefault:"false"`
 	EnterpriseApiUrl  string `env:"ENTERPRISE_API_URL"`
 }

main.go

@@ -96,7 +96,8 @@ func main() {
 		KubefirstTeam:     env.KubefirstTeam,
 		KubefirstTeamInfo: env.KubefirstTeamInfo,
 		MachineID:         env.ClusterId,
-		MetricName:        telemetry.ClusterInstallStarted,
+		MetricName:        telemetry.ClusterInstallCompleted,
+		ParentClusterId:   env.ParentClusterId,
 		UserId:            env.ClusterId,
 	}
 

pkg/segment/segment.go

@@ -0,0 +1,52 @@
+package segment
+
+import (
+	"os"
+
+	"github.com/denisbrodbeck/machineid"
+	"github.com/kubefirst/metrics-client/pkg/telemetry"
+
+	"github.com/segmentio/analytics-go"
+	log "github.com/sirupsen/logrus"
+)
+
+const (
+	kubefirstClient string = "api"
+)
+
+func InitClient() *telemetry.SegmentClient {
+
+	machineID, err := machineid.ID()
+	if err != nil {
+		log.Info("machine id FAILED")
+	}
+	sc := analytics.New(telemetry.SegmentIOWriteKey)
+
+	kubefirstVersion := os.Getenv("KUBEFIRST_VERSION")
+	if kubefirstVersion == "" {
+		kubefirstVersion = "development"
+	}
+
+	c := telemetry.SegmentClient{
+		TelemetryEvent: telemetry.TelemetryEvent{
+			CliVersion:        kubefirstVersion,
+			CloudProvider:     os.Getenv("CLOUD_PROVIDER"),
+			ClusterID:         os.Getenv("CLUSTER_ID"),
+			ClusterType:       os.Getenv("CLUSTER_TYPE"),
+			DomainName:        os.Getenv("DOMAIN_NAME"),
+			GitProvider:       os.Getenv("GIT_PROVIDER"),
+			InstallMethod:     os.Getenv("INSTALL_METHOD"),
+			KubefirstClient:   kubefirstClient,
+			KubefirstTeam:     os.Getenv("KUBEFIRST_TEAM"),
+			KubefirstTeamInfo: os.Getenv("KUBEFIRST_TEAM_INFO"),
+			MachineID:         machineID,
+			ParentClusterId:   os.Getenv("PARENT_CLUSTER_ID"),
+			ErrorMessage:      "",
+			UserId:            machineID,
+			MetricName:        telemetry.ClusterInstallCompleted,
+		},
+		Client: sc,
+	}
+
+	return &c
+}

providers/aws/create.go

@@ -13,7 +13,6 @@ import (
 	"github.com/kubefirst/kubefirst-api/internal/db"
 	"github.com/kubefirst/kubefirst-api/internal/services"
 	pkgtypes "github.com/kubefirst/kubefirst-api/pkg/types"
-	"github.com/kubefirst/metrics-client/pkg/telemetry"
 	awsinternal "github.com/kubefirst/runtime/pkg/aws"
 	"github.com/kubefirst/runtime/pkg/k8s"
 	log "github.com/sirupsen/logrus"
@@ -253,7 +252,7 @@ func CreateAWSCluster(definition *pkgtypes.ClusterDefinition) error {
 			return err
 		}
 
-		telemetry.SendEvent(ctrl.TelemetryEvent, telemetry.ClusterInstallCompleted, "")
+		log.Info("cluster creation complete")
 
 		// Create default service entries
 		cl, _ := db.Client.GetCluster(ctrl.ClusterName)

providers/civo/create.go

@@ -14,7 +14,6 @@ import (
 	"github.com/kubefirst/kubefirst-api/internal/db"
 	"github.com/kubefirst/kubefirst-api/internal/services"
 	pkgtypes "github.com/kubefirst/kubefirst-api/pkg/types"
-	"github.com/kubefirst/metrics-client/pkg/telemetry"
 	"github.com/kubefirst/runtime/pkg/k8s"
 	"github.com/kubefirst/runtime/pkg/ssl"
 	log "github.com/sirupsen/logrus"
@@ -233,7 +232,7 @@ func CreateCivoCluster(definition *pkgtypes.ClusterDefinition) error {
 			return err
 		}
 
-		telemetry.SendEvent(ctrl.TelemetryEvent, telemetry.ClusterInstallCompleted, "")
+		log.Info("cluster creation complete")
 
 		// Create default service entries
 		cl, _ := db.Client.GetCluster(ctrl.ClusterName)

providers/digitalocean/create.go

@@ -15,7 +15,6 @@ import (
 	"github.com/kubefirst/kubefirst-api/internal/db"
 	"github.com/kubefirst/kubefirst-api/internal/services"
 	pkgtypes "github.com/kubefirst/kubefirst-api/pkg/types"
-	"github.com/kubefirst/metrics-client/pkg/telemetry"
 	"github.com/kubefirst/runtime/pkg/k8s"
 	"github.com/kubefirst/runtime/pkg/ssl"
 	log "github.com/sirupsen/logrus"
@@ -229,8 +228,7 @@ func CreateDigitaloceanCluster(definition *pkgtypes.ClusterDefinition) error {
 			return err
 		}
 
-		// Telemetry handler
-		telemetry.SendEvent(ctrl.TelemetryEvent, telemetry.ClusterInstallCompleted, "")
+		log.Info("cluster creation complete")
 
 		// Create default service entries
 		cl, _ := db.Client.GetCluster(ctrl.ClusterName)

providers/google/create.go

@@ -16,7 +16,6 @@ import (
 	"github.com/kubefirst/kubefirst-api/internal/services"
 	"github.com/kubefirst/kubefirst-api/pkg/google"
 	pkgtypes "github.com/kubefirst/kubefirst-api/pkg/types"
-	"github.com/kubefirst/metrics-client/pkg/telemetry"
 	"github.com/kubefirst/runtime/pkg/k8s"
 	log "github.com/sirupsen/logrus"
 )
@@ -252,7 +251,7 @@ func CreateGoogleCluster(definition *pkgtypes.ClusterDefinition) error {
 			return err
 		}
 
-		telemetry.SendEvent(ctrl.TelemetryEvent, telemetry.ClusterInstallCompleted, "")
+		log.Info("cluster creation complete")
 
 		// Create default service entries
 		cl, _ := db.Client.GetCluster(ctrl.ClusterName)

providers/vultr/create.go

@@ -14,7 +14,6 @@ import (
 	"github.com/kubefirst/kubefirst-api/internal/db"
 	"github.com/kubefirst/kubefirst-api/internal/services"
 	pkgtypes "github.com/kubefirst/kubefirst-api/pkg/types"
-	"github.com/kubefirst/metrics-client/pkg/telemetry"
 	"github.com/kubefirst/runtime/pkg/k8s"
 	"github.com/kubefirst/runtime/pkg/ssl"
 	log "github.com/sirupsen/logrus"
@@ -224,7 +223,7 @@ func CreateVultrCluster(definition *pkgtypes.ClusterDefinition) error {
 			return err
 		}
 
-		telemetry.SendEvent(ctrl.TelemetryEvent, telemetry.ClusterInstallCompleted, "")
+		log.Info("cluster creation complete")
 
 		// Create default service entries
 		cl, _ := db.Client.GetCluster(ctrl.ClusterName)