From f72dda955dda8ad37e3fb8c57962b57bb6309596 Mon Sep 17 00:00:00 2001 From: ysicing Date: Sun, 29 Sep 2024 15:35:03 +0800 Subject: [PATCH] * [misc] fix statistics code --- cmd/cluster/cluster.go | 2 +- cmd/init.go | 2 -- cmd/quickon/quickon.go | 2 +- cmd/uninstall.go | 2 -- pkg/providers/devops/devops.go | 6 ++++++ pkg/providers/quickon/quickon.go | 6 ++++++ 6 files changed, 14 insertions(+), 6 deletions(-) diff --git a/cmd/cluster/cluster.go b/cmd/cluster/cluster.go index caaa784c..436af689 100644 --- a/cmd/cluster/cluster.go +++ b/cmd/cluster/cluster.go @@ -127,7 +127,7 @@ func CleanCommand(f factory.Factory) *cobra.Command { return err } log.Donef("uninstall cluster success") - statistics.SendStatistics("uninstall") + statistics.SendStatistics("uninstall-cluster") return nil } log.Donef("cancel clean cluster") diff --git a/cmd/init.go b/cmd/init.go index 2478e2db..cb30ec73 100644 --- a/cmd/init.go +++ b/cmd/init.go @@ -17,7 +17,6 @@ import ( "github.com/easysoft/qcadmin/cmd/flags" "github.com/easysoft/qcadmin/cmd/precheck" "github.com/easysoft/qcadmin/common" - "github.com/easysoft/qcadmin/internal/api/statistics" "github.com/easysoft/qcadmin/internal/app/config" "github.com/easysoft/qcadmin/internal/pkg/k8s" "github.com/easysoft/qcadmin/internal/pkg/types" @@ -129,7 +128,6 @@ func newCmdInit(f factory.Factory) *cobra.Command { return } cp.Show() - statistics.SendStatistics("install") } return initCmd } diff --git a/cmd/quickon/quickon.go b/cmd/quickon/quickon.go index b717971e..dfa88f35 100644 --- a/cmd/quickon/quickon.go +++ b/cmd/quickon/quickon.go @@ -98,7 +98,7 @@ func UninstallCommand(f factory.Factory) *cobra.Command { return err } log.Done("uninstall platform success") - statistics.SendStatistics("uninstall") + statistics.SendStatistics("uninstall-platform") return nil } log.Donef("cancel uninstall platform") diff --git a/cmd/uninstall.go b/cmd/uninstall.go index b63668a6..0032e6eb 100644 --- a/cmd/uninstall.go +++ b/cmd/uninstall.go @@ -12,7 +12,6 @@ import ( "github.com/spf13/cobra" - "github.com/easysoft/qcadmin/internal/api/statistics" "github.com/easysoft/qcadmin/internal/pkg/util/factory" qcexec "github.com/easysoft/qcadmin/internal/pkg/util/exec" @@ -37,7 +36,6 @@ func newCmdUninstall(f factory.Factory) *cobra.Command { log.Errorf("uninstall platform failed, reason: %v", err) return } - statistics.SendStatistics("uninstall") if cleanCluster { // TODO 检查集群是否是quickon安装的 log.Debugf("start uninstall cluster") diff --git a/pkg/providers/devops/devops.go b/pkg/providers/devops/devops.go index 0356e8ed..6f618c8a 100644 --- a/pkg/providers/devops/devops.go +++ b/pkg/providers/devops/devops.go @@ -16,6 +16,7 @@ import ( "k8s.io/kubectl/pkg/util/templates" "github.com/easysoft/qcadmin/common" + "github.com/easysoft/qcadmin/internal/api/statistics" "github.com/easysoft/qcadmin/internal/app/config" "github.com/easysoft/qcadmin/internal/pkg/types" "github.com/easysoft/qcadmin/internal/pkg/util/kutil" @@ -100,6 +101,7 @@ func (q *Devops) Show() { q.MetaData.Log.Donef("🎉 zentao devops install success, docs: %s", common.ZentaoDocs) q.MetaData.Log.Info("----------------------------\t") q.MetaData.Log.Donef("console: %s", color.SGreen(domain)) + q.SendStatistics() } func (q *Devops) GetKubeClient() error { @@ -120,3 +122,7 @@ func (q *Devops) GetUsageExample() string { # init devops platform with example domain your.example.devops.domain z init --provider devops --domain your.example.devops.domain`)) } + +func (q *Devops) SendStatistics() { + statistics.SendStatistics("install") +} diff --git a/pkg/providers/quickon/quickon.go b/pkg/providers/quickon/quickon.go index 265ff01e..dffd9c3d 100644 --- a/pkg/providers/quickon/quickon.go +++ b/pkg/providers/quickon/quickon.go @@ -19,6 +19,7 @@ import ( "k8s.io/kubectl/pkg/util/templates" "github.com/easysoft/qcadmin/common" + "github.com/easysoft/qcadmin/internal/api/statistics" "github.com/easysoft/qcadmin/internal/app/config" "github.com/easysoft/qcadmin/internal/pkg/types" "github.com/easysoft/qcadmin/internal/pkg/util/kutil" @@ -118,6 +119,7 @@ func (q *Quickon) Show() { color.SGreen(domain), color.SGreen(common.QuchengDefaultUser), color.SGreen(q.MetaData.ConsolePassword)) q.MetaData.Log.Donef("docs: %s", common.QuchengDocs) q.MetaData.Log.Done("support: 768721743(QQGroup)") + q.SendStatistics() } func (q *Quickon) GetKubeClient() error { @@ -138,3 +140,7 @@ func (q *Quickon) GetUsageExample() string { # init quickon platform use example domain your.example.quickon.domain z init --provider quickon --domain your.example.quickon.domain`)) } + +func (q *Quickon) SendStatistics() { + statistics.SendStatistics("install") +}