Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(admin-cli): remove admin-cli use "pegasus-kv/collector" #2174

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
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
2 changes: 1 addition & 1 deletion admin-cli/executor/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import (

"github.com/apache/incubator-pegasus/admin-cli/client"
"github.com/apache/incubator-pegasus/admin-cli/util"
"github.com/pegasus-kv/collector/aggregate"
"github.com/apache/incubator-pegasus/collector/aggregate"
)

// Client represents as a manager of various SDKs that
Expand Down
2 changes: 1 addition & 1 deletion admin-cli/executor/nodes_stat.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ package executor
import (
"github.com/apache/incubator-pegasus/admin-cli/tabular"
"github.com/apache/incubator-pegasus/admin-cli/util"
"github.com/pegasus-kv/collector/aggregate"
"github.com/apache/incubator-pegasus/collector/aggregate"
)

var nodeStatsTemplate = `---
Expand Down
2 changes: 1 addition & 1 deletion admin-cli/executor/partition_stat.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (
"sort"

"github.com/apache/incubator-pegasus/admin-cli/tabular"
"github.com/pegasus-kv/collector/aggregate"
"github.com/apache/incubator-pegasus/collector/aggregate"
)

var partitionStatsTemplate = `---
Expand Down
2 changes: 1 addition & 1 deletion admin-cli/executor/table_stat.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (

"github.com/apache/incubator-pegasus/admin-cli/tabular"
"github.com/apache/incubator-pegasus/admin-cli/util"
"github.com/pegasus-kv/collector/aggregate"
"github.com/apache/incubator-pegasus/collector/aggregate"
)

var tableStatsTemplate = `---
Expand Down
2 changes: 1 addition & 1 deletion admin-cli/executor/toolkits/tablemigrator/migrator.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ import (
"github.com/apache/incubator-pegasus/admin-cli/executor"
"github.com/apache/incubator-pegasus/admin-cli/executor/toolkits"
"github.com/apache/incubator-pegasus/admin-cli/util"
"github.com/apache/incubator-pegasus/collector/aggregate"
"github.com/apache/incubator-pegasus/go-client/session"
"github.com/pegasus-kv/collector/aggregate"
)

var pendingMutationThreshold = 100000.0
Expand Down
11 changes: 6 additions & 5 deletions admin-cli/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,16 @@ module github.com/apache/incubator-pegasus/admin-cli
go 1.18

require (
github.com/apache/incubator-pegasus/collector v0.0.0-20250103031858-1091da5fbec8
github.com/apache/incubator-pegasus/go-client v0.0.0-20220617101220-e49a69d25a52
github.com/cheggaaa/pb/v3 v3.0.6
github.com/desertbit/grumble v1.1.1
github.com/dustin/go-humanize v1.0.0
github.com/go-resty/resty/v2 v2.6.0
github.com/go-zookeeper/zk v1.0.2
github.com/olekukonko/tablewriter v0.0.5
github.com/pegasus-kv/collector v0.0.0-20220526124628-023287923c32
github.com/sirupsen/logrus v1.8.1
github.com/stretchr/testify v1.6.1
github.com/stretchr/testify v1.8.2
gopkg.in/natefinch/lumberjack.v2 v2.0.0
gopkg.in/yaml.v2 v2.4.0
k8s.io/apimachinery v0.16.13
Expand All @@ -44,7 +44,7 @@ require (
github.com/desertbit/go-shlex v0.1.1 // indirect
github.com/desertbit/readline v1.5.1 // indirect
github.com/fatih/color v1.10.0 // indirect
github.com/fsnotify/fsnotify v1.4.9 // indirect
github.com/fsnotify/fsnotify v1.5.4 // indirect
github.com/hashicorp/errwrap v1.1.0 // indirect
github.com/hashicorp/go-multierror v1.1.1 // indirect
github.com/hashicorp/hcl v1.0.0 // indirect
Expand All @@ -69,7 +69,8 @@ require (
golang.org/x/net v0.23.0 // indirect
golang.org/x/sys v0.18.0 // indirect
golang.org/x/text v0.14.0 // indirect
gopkg.in/ini.v1 v1.62.0 // indirect
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
gopkg.in/tomb.v2 v2.0.0-20161208151619-d5d1b5820637 // indirect
gopkg.in/yaml.v3 v3.0.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
308 changes: 16 additions & 292 deletions admin-cli/go.sum

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion admin-cli/util/pegasus_node.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ import (
"strings"
"sync"

"github.com/apache/incubator-pegasus/collector/aggregate"
"github.com/apache/incubator-pegasus/go-client/idl/base"
"github.com/apache/incubator-pegasus/go-client/session"
"github.com/pegasus-kv/collector/aggregate"
)

// PegasusNode is a representation of MetaServer and ReplicaServer.
Expand Down
2 changes: 1 addition & 1 deletion admin-cli/util/perf_counter.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ package util
import (
"strings"

"github.com/pegasus-kv/collector/aggregate"
"github.com/apache/incubator-pegasus/collector/aggregate"
)

func GetPartitionStat(perfSession *aggregate.PerfSession, counter string) map[string]float64 {
Expand Down
Loading