Merge branch 'remove-slo' into 'develop'

Remove slo See merge request music-cloud-native/horizon/horizon!624
horizoncd · Dec 1, 2022 · 4fd3c8e · 4fd3c8e
2 parents 81f4915 + a8a9bbb
commit 4fd3c8e
Show file tree

Hide file tree

Showing 10 changed files with 1 addition and 186 deletions.
diff --git a/config.yaml b/config.yaml
@@ -71,10 +71,6 @@ tektonMapper:
       disableSSL: false
       skipVerify: true
       s3ForcePathStyle: true
-grafanaSLO:
-  overviewDashboard: "http://grafana.yf-dev2.netease.com/d/Wz3GSBank/slo-gai-lan?orgId=1&kiosk&theme=light&var-env=%s"
-  apiDashboard: "http://grafana.yf-dev2.netease.com/d/tKjaD1-nk/horizon-api-slo?orgId=1&kiosk&theme=light"
-  pipelineDashboard: "http://grafana.yf-dev2.netease.com/d/g40XAtbnk/horizon-pipeline-slo?orgId=1&kiosk&theme=light&var-env=%s"
 grafanaConfig:
   host: http://localhost:3000
   namespace: horizon

diff --git a/core/cmd/cmd.go b/core/cmd/cmd.go
@@ -35,7 +35,6 @@ import (
 	registryctl "g.hz.netease.com/horizon/core/controller/registry"
 	roltctl "g.hz.netease.com/horizon/core/controller/role"
 	scopectl "g.hz.netease.com/horizon/core/controller/scope"
-	sloctl "g.hz.netease.com/horizon/core/controller/slo"
 	tagctl "g.hz.netease.com/horizon/core/controller/tag"
 	templatectl "g.hz.netease.com/horizon/core/controller/template"
 	templateschematagctl "g.hz.netease.com/horizon/core/controller/templateschematag"
@@ -59,8 +58,7 @@ import (
 	"g.hz.netease.com/horizon/core/http/api/v1/region"
 	"g.hz.netease.com/horizon/core/http/api/v1/registry"
 	roleapi "g.hz.netease.com/horizon/core/http/api/v1/role"
-	scope "g.hz.netease.com/horizon/core/http/api/v1/scope"
-	sloapi "g.hz.netease.com/horizon/core/http/api/v1/slo"
+	"g.hz.netease.com/horizon/core/http/api/v1/scope"
 	"g.hz.netease.com/horizon/core/http/api/v1/tag"
 	"g.hz.netease.com/horizon/core/http/api/v1/template"
 	templatev2 "g.hz.netease.com/horizon/core/http/api/v2/template"
@@ -447,7 +445,6 @@ func Run(flags *Flags) {
 		templateCtl          = templatectl.NewController(parameter, gitlabTemplate, templateRepo)
 		roleCtl              = roltctl.NewController(parameter)
 		terminalCtl          = terminalctl.NewController(parameter)
-		sloCtl               = sloctl.NewController(coreConfig.GrafanaSLO)
 		codeGitCtl           = codectl.NewController(gitGetter)
 		tagCtl               = tagctl.NewController(parameter)
 		templateSchemaTagCtl = templateschematagctl.NewController(parameter)
@@ -485,7 +482,6 @@ func Run(flags *Flags) {
 		registryAPI          = registry.NewAPI(registryCtl)
 		roleAPI              = roleapi.NewAPI(roleCtl)
 		terminalAPI          = terminalapi.NewAPI(terminalCtl)
-		sloAPI               = sloapi.NewAPI(sloCtl)
 		codeGitAPI           = codeapi.NewAPI(codeGitCtl)
 		tagAPI               = tag.NewAPI(tagCtl)
 		templateSchemaTagAPI = templateschematagapi.NewAPI(templateSchemaTagCtl)
@@ -553,7 +549,6 @@ func Run(flags *Flags) {
 	member.RegisterRoutes(r, memberAPI)
 	roleapi.RegisterRoutes(r, roleAPI)
 	terminalapi.RegisterRoutes(r, terminalAPI)
-	sloapi.RegisterRoutes(r, sloAPI)
 	codeapi.RegisterRoutes(r, codeGitAPI)
 	tag.RegisterRoutes(r, tagAPI)
 	templateschematagapi.RegisterRoutes(r, templateSchemaTagAPI)

diff --git a/core/config/config.go b/core/config/config.go
@@ -38,7 +38,6 @@ type Config struct {
 	AccessSecretKeys       authenticate.KeysConfig `yaml:"accessSecretKeys"`
 	CmdbConfig             cmdb.Config             `yaml:"cmdbConfig"`
 	GrafanaConfig          grafana.Config          `yaml:"grafanaConfig"`
-	GrafanaSLO             grafana.SLO             `yaml:"grafanaSLO"`
 	Oauth                  oauth.Server            `yaml:"oauth"`
 	AutoFreeConfig         autofree.Config         `yaml:"autoFree"`
 	KubeConfig             string                  `yaml:"kubeconfig"`

diff --git a/core/controller/slo/controller.go b/core/controller/slo/controller.go
diff --git a/core/controller/slo/controller_test.go b/core/controller/slo/controller_test.go
diff --git a/core/controller/slo/models.go b/core/controller/slo/models.go
diff --git a/core/http/api/v1/slo/apis.go b/core/http/api/v1/slo/apis.go
diff --git a/core/http/api/v1/slo/routers.go b/core/http/api/v1/slo/routers.go
diff --git a/openapi/front/slo.yaml b/openapi/front/slo.yaml
diff --git a/pkg/config/grafana/grafana.go b/pkg/config/grafana/grafana.go
@@ -2,11 +2,6 @@ package grafana
 
 import "time"
 
-type SLO struct {
-	OverviewDashboard string `yaml:"overviewDashboard"`
-	HistoryDashboard  string `yaml:"historyDashboard"`
-}
-
 type Config struct {
 	Host                 string               `yaml:"host"`
 	Namespace            string               `yaml:"namespace"`