Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions server/controller/config/common/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,13 @@ type Warrant struct {
Timeout int `default:"30" yaml:"timeout"`
}

type Manager struct {
Enabled bool `default:"false" yaml:"enabled"`
Host string `default:"manager" yaml:"host"`
Port int `default:"20403" yaml:"port"`
Timeout int `default:"30" yaml:"timeout"`
}

type FPermit struct {
Enabled bool `default:"false" yaml:"enabled"`
Host string `default:"fpermit" yaml:"host"`
Expand Down
5 changes: 5 additions & 0 deletions server/controller/controller/master.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ import (
"github.com/deepflowio/deepflow/server/controller/http/service"
resoureservice "github.com/deepflowio/deepflow/server/controller/http/service/resource"
"github.com/deepflowio/deepflow/server/controller/monitor"
"github.com/deepflowio/deepflow/server/controller/monitor/bill"
"github.com/deepflowio/deepflow/server/controller/monitor/license"
"github.com/deepflowio/deepflow/server/controller/monitor/vtap"
"github.com/deepflowio/deepflow/server/controller/prometheus"
Expand Down Expand Up @@ -96,6 +97,7 @@ func checkAndStartMasterFunctions(
vtapCheck := vtap.NewVTapCheck(cfg.MonitorCfg, ctx)
vtapRebalanceCheck := vtap.NewRebalanceCheck(cfg.MonitorCfg, ctx)
vtapLicenseAllocation := license.NewVTapLicenseAllocation(cfg.MonitorCfg, ctx)
billCheck := bill.NewBillCheck(cfg.BillingMethod, cfg.MonitorCfg, ctx)
recorderResource := recorder.GetResource()
domainChecker := resoureservice.NewDomainCheck(ctx)
prometheus := prometheus.GetSingleton()
Expand Down Expand Up @@ -151,6 +153,9 @@ func checkAndStartMasterFunctions(
vtapLicenseAllocation.Start(sCtx)
}

// bill check
billCheck.Start(sCtx)

// 资源数据清理
recorderResource.Cleaners.Start(sCtx)

Expand Down
46 changes: 46 additions & 0 deletions server/controller/monitor/bill/bill.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
/*
* Copyright (c) 2024 Yunshan Networks
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package bill

import (
"context"

"github.com/deepflowio/deepflow/server/controller/monitor/config"
)

type BillCheck struct {
vCtx context.Context
vCancel context.CancelFunc
config config.MonitorConfig
}

func NewBillCheck(method string, cfg config.MonitorConfig, ctx context.Context) *BillCheck {
vCtx, vCancel := context.WithCancel(ctx)
return &BillCheck{
vCtx: vCtx,
vCancel: vCancel,
config: cfg,
}
}

func (b *BillCheck) Start(sCtx context.Context) {}

func (b *BillCheck) Stop() {
if b.vCancel != nil {
b.vCancel()
}
}
3 changes: 3 additions & 0 deletions server/controller/monitor/bill/go.mod
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
module github.com/deepflowio/deepflow/server/controller/monitor/bill

go 1.24
2 changes: 2 additions & 0 deletions server/controller/monitor/config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,14 @@ type MonitorConfig struct {
HealthCheckPort int `default:"30417" yaml:"health_check_port"`
HealthCheckHandleChannelLen int `default:"1000" yaml:"health_check_handle_channel_len"`
LicenseCheckInterval int `default:"60" yaml:"license_check_interval"`
BillCheckInterval int `default:"3600" yaml:"bill_check_interval"`
VTapCheckInterval int `default:"60" yaml:"vtap_check_interval"`
ExceptionTimeFrame int `default:"3600" yaml:"exception_time_frame"`
AutoRebalanceVTap bool `default:"true" yaml:"auto_rebalance_vtap"`
RebalanceCheckInterval int `default:"300" yaml:"rebalance_check_interval"` // unit: second
VTapAutoDelete VTapAutoDelete `yaml:"vtap_auto_delete"`
Warrant configs.Warrant `yaml:"warrant"`
Manager configs.Manager `yaml:"manager"`
IngesterLoadBalancingConfig IngesterLoadBalancingStrategy `yaml:"ingester-load-balancing-strategy"`
SyncDefaultORGDataInterval int `default:"10" yaml:"sync_default_org_data_interval"`
}
Expand Down
2 changes: 2 additions & 0 deletions server/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ replace (
github.com/deepflowio/deepflow/server/controller/http/appender => ./controller/http/appender
github.com/deepflowio/deepflow/server/controller/http/service/agentlicense => ./controller/http/service/agentlicense
github.com/deepflowio/deepflow/server/controller/http/service/configuration => ./controller/http/service/configuration
github.com/deepflowio/deepflow/server/controller/monitor/bill => ./controller/monitor/bill
github.com/deepflowio/deepflow/server/controller/monitor/license => ./controller/monitor/license
github.com/deepflowio/deepflow/server/controller/monitor/vtap/version => ./controller/monitor/vtap/version
github.com/deepflowio/deepflow/server/controller/native_field => ./controller/native_field
Expand Down Expand Up @@ -67,6 +68,7 @@ require (
github.com/deepflowio/deepflow/server/controller/genesis/store/sync/redis v0.0.0-00010101000000-000000000000
github.com/deepflowio/deepflow/server/controller/http/appender v0.0.0-00010101000000-000000000000
github.com/deepflowio/deepflow/server/controller/http/service/agentlicense v0.0.0-00010101000000-000000000000
github.com/deepflowio/deepflow/server/controller/monitor/bill v0.0.0-00010101000000-000000000000
github.com/deepflowio/deepflow/server/controller/monitor/license v0.0.0-00010101000000-000000000000
github.com/deepflowio/deepflow/server/controller/monitor/vtap/version v0.0.0-00010101000000-000000000000
github.com/deepflowio/deepflow/server/controller/native_field v0.0.0-00010101000000-000000000000
Expand Down
Loading