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.

Sign up for GitHub

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

Jump to bottom

cscli metrics: rename buckets -> scenarios #2848

Merged
merged 6 commits into from Feb 15, 2024
Merged

cscli metrics: rename buckets -> scenarios #2848

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d9933d0
cscli metrics: rename buckets -> scenarios
mmetc Feb 15, 2024
904ccb7
suggest "metrics list" in "metrics show --help"
mmetc Feb 15, 2024
6bd4fc0
lint
mmetc Feb 15, 2024
a7bf8f0
update lint configuration
mmetc Jan 17, 2024
db15417
link fix
mmetc Feb 13, 2024
8a35f78
lint: testify with float comparison
mmetc Feb 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 5 additions & 5 deletions cmd/crowdsec-cli/metrics.go
View file
Open in desktop
Expand Up @@ -59,7 +59,7 @@
func NewMetricStore() metricStore {
return metricStore{
"acquisition": statAcquis{},
"buckets": statBucket{},
"scenarios": statBucket{},
"parsers": statParser{},
"lapi": statLapi{},
"lapi-machine": statLapiMachine{},
Expand Down Expand Up @@ -110,7 +110,7 @@

mAcquis := ms["acquisition"].(statAcquis)
mParser := ms["parsers"].(statParser)
mBucket := ms["buckets"].(statBucket)
mBucket := ms["scenarios"].(statBucket)
mLapi := ms["lapi"].(statLapi)
mLapiMachine := ms["lapi-machine"].(statLapiMachine)
mLapiBouncer := ms["lapi-bouncer"].(statLapiBouncer)
Expand Down Expand Up @@ -383,7 +383,7 @@
for _, section := range args {
switch section {
case "engine":
ret = append(ret, "acquisition", "parsers", "buckets", "stash", "whitelists")
ret = append(ret, "acquisition", "parsers", "scenarios", "stash", "whitelists")

Check warning on line 386 in cmd/crowdsec-cli/metrics.go

View check run for this annotation

Codecov / codecov/patch

cmd/crowdsec-cli/metrics.go#L386 

Added line #L386 was not covered by tests
case "lapi":
ret = append(ret, "alerts", "decisions", "lapi", "lapi-bouncer", "lapi-decisions", "lapi-machine")
case "appsec":
Expand Down Expand Up @@ -413,10 +413,10 @@
cscli metrics show engine

# Show some specific metrics, show empty tables, connect to a different url
cscli metrics show acquisition parsers buckets stash --url http://lapi.local:6060/metrics
cscli metrics show acquisition parsers scenarios stash --url http://lapi.local:6060/metrics

# Show metrics in json format
cscli metrics show acquisition parsers buckets stash -o json`,
cscli metrics show acquisition parsers scenarios stash -o json`,
// Positional args are optional
DisableAutoGenTag: true,
RunE: func(_ *cobra.Command, args []string) error {
Expand Down
6 changes: 3 additions & 3 deletions cmd/crowdsec-cli/metrics_table.go
View file
Open in desktop
Expand Up @@ -127,7 +127,7 @@
}

func (s statBucket) Description() (string, string) {
return "Bucket Metrics",
return "Scenario Metrics",
`Measure events in different scenarios. Current count is the number of buckets during metrics collection. ` +
`Overflows are past event-producing buckets, while Expired are the ones that didn’t receive enough events to Overflow.`
}
Expand All @@ -143,13 +143,13 @@
func (s statBucket) Table(out io.Writer, noUnit bool, showEmpty bool) {
t := newTable(out)
t.SetRowLines(false)
t.SetHeaders("Bucket", "Current Count", "Overflows", "Instantiated", "Poured", "Expired")
t.SetHeaders("Scenario", "Current Count", "Overflows", "Instantiated", "Poured", "Expired")
t.SetAlignment(table.AlignLeft, table.AlignLeft, table.AlignLeft, table.AlignLeft, table.AlignLeft, table.AlignLeft)

keys := []string{"curr_count", "overflow", "instantiation", "pour", "underflow"}

if numRows, err := metricsToTable(t, s, keys, noUnit); err != nil {
log.Warningf("while collecting bucket stats: %s", err)
log.Warningf("while collecting scenario stats: %s", err)

Check warning on line 152 in cmd/crowdsec-cli/metrics_table.go

View check run for this annotation

Codecov / codecov/patch

cmd/crowdsec-cli/metrics_table.go#L152 

Added line #L152 was not covered by tests
} else if numRows > 0 || showEmpty {
title, _ := s.Description()
renderTableTitle(out, "\n"+title+":")
Expand Down