-
Notifications
You must be signed in to change notification settings - Fork 378
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
move monitor and change details to proto (#1196)
* move alert to core/monitor and change details-apis to proto * solve conflict in main.go * solve conflict in main.go * modify monitor.yaml * modify monitor.yaml * modify import in monitor/main.go
- Loading branch information
1 parent
f7d72c3
commit 7ca66d4
Showing
46 changed files
with
213 additions
and
105 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
50 changes: 50 additions & 0 deletions
50
modules/core/monitor/alert/details-apis/alertdetail.service.go
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,50 @@ | ||
| // Copyright (c) 2021 Terminus, Inc. | ||
| // | ||
| // This program is free software: you can use, redistribute, and/or modify | ||
| // it under the terms of the GNU Affero General Public License, version 3 | ||
| // or later ("AGPL"), as published by the Free Software Foundation. | ||
| // | ||
| // This program is distributed in the hope that it will be useful, but WITHOUT | ||
| // ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
| // FITNESS FOR A PARTICULAR PURPOSE. | ||
| // | ||
| // You should have received a copy of the GNU Affero General Public License | ||
| // along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
|
|
||
| package details_apis | ||
|
|
||
| import ( | ||
| "context" | ||
| "encoding/json" | ||
|
|
||
| "github.com/erda-project/erda-proto-go/core/monitor/alertdetail/pb" | ||
| "github.com/erda-project/erda/pkg/common/errors" | ||
| ) | ||
|
|
||
| type alertDetailService struct { | ||
| p *provider | ||
| } | ||
|
|
||
| func (a *alertDetailService) QuerySystemPodMetrics(ctx context.Context, request *pb.QuerySystemPodMetricsRequest) (*pb.QuerySystemPodMetricsResponse, error) { | ||
| start := request.Timestamp - 30*60*1000 | ||
| end := request.Timestamp + 30*60*1000 | ||
| pod, err := a.p.getPodInfo(request.ClusterName, request.Name, start, end) | ||
| if err != nil { | ||
| return nil, errors.NewInternalServerError(err) | ||
| } | ||
| data, err := json.Marshal(pod) | ||
| if err != nil { | ||
| return nil, errors.NewInternalServerError(err) | ||
| } | ||
| result := &pb.QuerySystemPodMetricsResponse{ | ||
| Data: &pb.PodInfo{ | ||
| Summary: nil, | ||
| Instances: make([]*pb.PodInfoInstanse, 0), | ||
| }, | ||
| } | ||
| err = json.Unmarshal(data, result.Data) | ||
| if err != nil { | ||
| return nil, errors.NewInternalServerError(err) | ||
| } | ||
| return result, nil | ||
| } |
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,88 @@ | ||
| // Copyright (c) 2021 Terminus, Inc. | ||
| // | ||
| // This program is free software: you can use, redistribute, and/or modify | ||
| // it under the terms of the GNU Affero General Public License, version 3 | ||
| // or later ("AGPL"), as published by the Free Software Foundation. | ||
| // | ||
| // This program is distributed in the hope that it will be useful, but WITHOUT | ||
| // ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
| // FITNESS FOR A PARTICULAR PURPOSE. | ||
| // | ||
| // You should have received a copy of the GNU Affero General Public License | ||
| // along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
|
|
||
| package details_apis | ||
|
|
||
| import ( | ||
| "time" | ||
|
|
||
| "github.com/erda-project/erda-infra/base/logs" | ||
| "github.com/erda-project/erda-infra/base/servicehub" | ||
| "github.com/erda-project/erda-infra/pkg/transport" | ||
| "github.com/erda-project/erda-infra/providers/httpserver" | ||
| "github.com/erda-project/erda-infra/providers/httpserver/interceptors" | ||
| "github.com/erda-project/erda-proto-go/core/monitor/alertdetail/pb" | ||
| "github.com/erda-project/erda/modules/core/monitor/metric/query/metricq" | ||
| "github.com/erda-project/erda/modules/pkg/bundle-ex/cmdb" | ||
| "github.com/erda-project/erda/pkg/common/apis" | ||
| perm "github.com/erda-project/erda/pkg/common/permission" | ||
| "github.com/erda-project/erda/pkg/http/httpclient" | ||
| ) | ||
|
|
||
| type config struct { | ||
| } | ||
|
|
||
| type provider struct { | ||
| L logs.Logger | ||
| metricq metricq.Queryer | ||
| //metricq metricpb.MetricServiceServer `autowired:"erda.core.monitor.metric.MetricService"` | ||
| cmdb *cmdb.Cmdb | ||
|
|
||
| Register transport.Register `autowired:"service-register"` | ||
| Perm perm.Interface `autowired:"permission"` | ||
| alertDetailService *alertDetailService | ||
| } | ||
|
|
||
| func (p *provider) Init(ctx servicehub.Context) error { | ||
| hc := httpclient.New(httpclient.WithTimeout(time.Second, time.Second*60)) | ||
| p.cmdb = cmdb.New(cmdb.WithHTTPClient(hc)) | ||
| p.metricq = ctx.Service("metrics-query").(metricq.Queryer) | ||
| p.alertDetailService = &alertDetailService{ | ||
| p: p, | ||
| } | ||
|
|
||
| if p.Register != nil { | ||
| type AlertDetailService = pb.AlertDetailServiceServer | ||
| pb.RegisterAlertDetailServiceImp(p.Register, p.alertDetailService, apis.Options(), p.Perm.Check( | ||
| perm.Method(AlertDetailService.QuerySystemPodMetrics, perm.ScopeOrg, "monitor_org_center", perm.ActionGet, p.OrgIDByCluster("clusterName")), | ||
| )) | ||
| } | ||
| routes := ctx.Service("http-server", | ||
| //telemetry.HttpMetric(), | ||
| interceptors.Recover(p.L)).(httpserver.Router) | ||
| return p.intRoutes(routes) | ||
| } | ||
|
|
||
| func (p *provider) Provide(ctx servicehub.DependencyContext, args ...interface{}) interface{} { | ||
| switch { | ||
| case ctx.Service() == "erda.core.monitor.alertdetail" || ctx.Type() == pb.AlertDetailServiceServerType() || ctx.Type() == pb.AlertDetailServiceHandlerType(): | ||
| return p.alertDetailService | ||
| } | ||
| return p | ||
| } | ||
|
|
||
| func init() { | ||
| servicehub.Register("erda.core.monitor.alertdetail", &servicehub.Spec{ | ||
| Services: pb.ServiceNames(), | ||
| Types: pb.Types(), | ||
| Dependencies: []string{"metrics-query"}, | ||
| OptionalDependencies: []string{"service-register"}, | ||
| Description: "", | ||
| ConfigFunc: func() interface{} { | ||
| return &config{} | ||
| }, | ||
| Creator: func() servicehub.Provider { | ||
| return &provider{} | ||
| }, | ||
| }) | ||
| } |
Oops, something went wrong.