Skip to content

replace prom2json with native Prometheus parser and context-aware scraping in CLI metrics #3932

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

Merged
mmetc merged 3 commits into from
Nov 21, 2025
Merged

replace prom2json with native Prometheus parser and context-aware scraping in CLI metrics #3932

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ffd4844
deps: update prometheus client
mmetc Sep 30, 2025
77bb0a7
remove dependency on prom2json
mmetc Sep 30, 2025
f31148a
lint: protogetter
mmetc Nov 18, 2025
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
6 changes: 3 additions & 3 deletions cmd/crowdsec-cli/cliitem/cmdinspect.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ func (cli *cliItem) inspect(ctx context.Context, args []string, url string, diff

wantMetrics := !noMetrics && item.State.IsInstalled()

if err := inspectItem(hub, item, wantMetrics, cfg.Cscli.Output, cfg.Cscli.PrometheusUrl, cfg.Cscli.Color); err != nil {
if err := inspectItem(ctx, hub, item, wantMetrics, cfg.Cscli.Output, cfg.Cscli.PrometheusUrl, cfg.Cscli.Color); err != nil {
return err
}

Expand Down Expand Up @@ -200,7 +200,7 @@ func (cli *cliItem) newInspectCmd() *cobra.Command {
return cmd
}

func inspectItem(hub *cwhub.Hub, item *cwhub.Item, wantMetrics bool, output string, prometheusURL string, wantColor string) error {
func inspectItem(ctx context.Context, hub *cwhub.Hub, item *cwhub.Item, wantMetrics bool, output string, prometheusURL string, wantColor string) error {
// This is dirty...
// We want to show current dependencies (from content), not latest (from index).
// The item is modifed but after this function the whole hub should be thrown away.
Expand Down Expand Up @@ -235,7 +235,7 @@ func inspectItem(hub *cwhub.Hub, item *cwhub.Item, wantMetrics bool, output stri
if wantMetrics {
fmt.Fprint(os.Stdout, "\nCurrent metrics: \n")

if err := showMetrics(prometheusURL, hub, item, wantColor); err != nil {
if err := showMetrics(ctx, prometheusURL, hub, item, wantColor); err != nil {
return err
}
}
Expand Down
Loading