Lapi detailed metrics

cmd/crowdsec-cli/bouncers.go

@@ -27,6 +27,40 @@
 	"github.com/crowdsecurity/crowdsec/pkg/types"
 )
 
+type featureflagProvider interface {
+	GetFeatureflags() string
+}
+
+type osProvider interface {
+	GetOsname() string
+	GetOsversion() string
+}
+
+func getOSNameAndVersion(o osProvider) string {
+	ret := o.GetOsname()
+	if o.GetOsversion() != "" {
+		if ret != "" {
+			ret += "/"
+		}
+
+		ret += o.GetOsversion()
+	}
+
+	if ret == "" {
+		return "?"
+	}
+
+	return ret
+}
+
+func getFeatureFlagList(o featureflagProvider) []string {
+	if o.GetFeatureflags() == "" {
+		return nil
+	}
+
+	return strings.Split(o.GetFeatureflags(), ",")
+}
+
 func askYesNo(message string, defaultAnswer bool) (bool, error) {
 	var answer bool
 
@@ -137,8 +171,8 @@
 		Version: b.Version,
 		LastPull: b.LastPull,
 		AuthType: b.AuthType,
-		OS: b.GetOSNameAndVersion(),
-		Featureflags: b.GetFeatureFlagList(),
+		OS: getOSNameAndVersion(b),
+		Featureflags: getFeatureFlagList(b),
 	}
 }
 
@@ -434,10 +468,10 @@
 		{"Version", bouncer.Version},
 		{"Last Pull", lastPull},
 		{"Auth type", bouncer.AuthType},
-		{"OS", bouncer.GetOSNameAndVersion()},
+		{"OS", getOSNameAndVersion(bouncer)},
 	})
 
-	for _, ff := range bouncer.GetFeatureFlagList() {
+	for _, ff := range getFeatureFlagList(bouncer) {
 		t.AppendRow(table.Row{"Feature Flags", ff})
 	}
 

cmd/crowdsec-cli/machines.go

@@ -203,7 +203,7 @@
 			hb = emoji.Warning + " " + hb
 		}
 
-		t.AppendRow(table.Row{m.MachineId, m.IpAddress, m.UpdatedAt.Format(time.RFC3339), validated, m.Version, m.GetOSNameAndVersion(), m.AuthType, hb})
+		t.AppendRow(table.Row{m.MachineId, m.IpAddress, m.UpdatedAt.Format(time.RFC3339), validated, m.Version, getOSNameAndVersion(m), m.AuthType, hb})
 	}
 
 	fmt.Fprintln(out, t.Render())
@@ -236,8 +236,8 @@
 		Version:       m.Version,
 		IsValidated:   m.IsValidated,
 		AuthType:      m.AuthType,
-		OS:            m.GetOSNameAndVersion(),
-		Featureflags:  m.GetFeatureFlagList(),
+		OS:            getOSNameAndVersion(m),
+		Featureflags:  getFeatureFlagList(m),
 		Datasources:   m.Datasources,
 	}
 }
@@ -642,15 +642,15 @@
 		{"Last Heartbeat", machine.LastHeartbeat},
 		{"Validated?", machine.IsValidated},
 		{"CrowdSec version", machine.Version},
-		{"OS", machine.GetOSNameAndVersion()},
+		{"OS", getOSNameAndVersion(machine)},
 		{"Auth type", machine.AuthType},
 	})
 
 	for dsName, dsCount := range machine.Datasources {
 		t.AppendRow(table.Row{"Datasources", fmt.Sprintf("%s: %d", dsName, dsCount)})
 	}
 
-	for _, ff := range machine.GetFeatureFlagList() {
+	for _, ff := range getFeatureFlagList(machine) {
 		t.AppendRow(table.Row{"Feature Flags", ff})
 	}
 

cmd/crowdsec-cli/metrics/list.go

@@ -6,7 +6,9 @@
 
 	"github.com/fatih/color"
 	"github.com/spf13/cobra"
-	"gopkg.in/yaml.v3"
+
+	"github.com/jedib0t/go-pretty/v6/table"
+	"github.com/jedib0t/go-pretty/v6/text"
 
 	"github.com/crowdsecurity/go-cs-lib/maptools"
 
@@ -32,31 +34,45 @@
 		})
 	}
 
-	switch cli.cfg().Cscli.Output {
+	outputFormat := cli.cfg().Cscli.Output
+
+	switch outputFormat {
 	case "human":
-		t := cstable.New(color.Output, cli.cfg().Cscli.Color)
-		t.SetRowLines(true)
-		t.SetHeaders("Type", "Title", "Description")
+		out := color.Output
+		t := cstable.New(out, cli.cfg().Cscli.Color).Writer
+		t.AppendHeader(table.Row{"Type", "Title", "Description"})
+		t.SetColumnConfigs([]table.ColumnConfig{
+			{
+				Name: "Type",
+				AlignHeader: text.AlignCenter,
+			},
+			{
+				Name: "Title",
+				AlignHeader: text.AlignCenter,
+			},
+			{
+				Name: "Description",
+				AlignHeader: text.AlignCenter,
+				WidthMax: 60,
+				WidthMaxEnforcer: text.WrapSoft,
+			},
+		})
+		t.Style().Options.SeparateRows = true
 
 		for _, metric := range allMetrics {
-			t.AddRow(metric.Type, metric.Title, metric.Description)
+			t.AppendRow(table.Row{metric.Type, metric.Title, metric.Description})
 		}
 
-		t.Render()
+		fmt.Fprintln(out, t.Render())
 	case "json":
 		x, err := json.MarshalIndent(allMetrics, "", " ")
 		if err != nil {
 			return fmt.Errorf("failed to marshal metric types: %w", err)
 		}
 
 		fmt.Println(string(x))
-	case "raw":
-		x, err := yaml.Marshal(allMetrics)
-		if err != nil {
-			return fmt.Errorf("failed to marshal metric types: %w", err)
-		}
-
-		fmt.Println(string(x))
+	default:
+		return fmt.Errorf("output format '%s' not supported for this command", outputFormat)
 	}
 
 	return nil

cmd/crowdsec-cli/metrics/metrics.go

@@ -38,8 +38,8 @@
 cscli metrics list`,
 		Args:              cobra.ExactArgs(0),
 		DisableAutoGenTag: true,
-		RunE: func(_ *cobra.Command, _ []string) error {
-			return cli.show(nil, url, noUnit)
+		RunE: func(cmd *cobra.Command, _ []string) error {
+			return cli.show(cmd.Context(), nil, url, noUnit)
 		},
 	}
 

cmd/crowdsec-cli/metrics/number.go

@@ -3,6 +3,7 @@
 import (
 	"fmt"
 	"math"
+	"strconv"
 )
 
 type unit struct {
@@ -20,11 +21,15 @@
 	{value: 1, symbol: ""},
 }
 
-func formatNumber(num int) string {
+func formatNumber(num int64, withUnit bool) string {
+	if !withUnit {
+		return strconv.FormatInt(num, 10)
+	}
+
 	goodUnit := unit{}
 
 	for _, u := range ranges {
-		if int64(num) >= u.value {
+		if num >= u.value {
 			goodUnit = u
 			break
 		}

cmd/crowdsec-cli/metrics/show.go

@@ -1,19 +1,24 @@
 package metrics
 
 import (
+	"context"
 	"errors"
 	"fmt"
 
+	log "github.com/sirupsen/logrus"
+
 	"github.com/fatih/color"
 	"github.com/spf13/cobra"
+
+	"github.com/crowdsecurity/crowdsec/cmd/crowdsec-cli/require"
 )
 
 var (
 	ErrMissingConfig   = errors.New("prometheus section missing, can't show metrics")
 	ErrMetricsDisabled = errors.New("prometheus is not enabled, can't show metrics")
 )
 
-func (cli *cliMetrics) show(sections []string, url string, noUnit bool) error {
+func (cli *cliMetrics) show(ctx context.Context, sections []string, url string, noUnit bool) error {
 	cfg := cli.cfg()
 
 	if url != "" {
@@ -30,8 +35,16 @@
 
 	ms := NewMetricStore()
 
-	if err := ms.Fetch(cfg.Cscli.PrometheusUrl); err != nil {
-		return err
+	// XXX: only on lapi
+	db, err := require.DBClient(ctx, cfg.DbConfig)
+	if err != nil {
+		// XXX how to handle this - if we are not on lapi, etc.
+		// we may read lp metrics without lapi?
+		log.Warnf("unable to open database: %s", err)
+	}
+
+	if err := ms.Fetch(ctx, cfg.Cscli.PrometheusUrl, db); err != nil {
+		log.Warn(err)
 	}
 
 	// any section that we don't have in the store is an error
@@ -90,9 +103,9 @@
 cscli metrics show acquisition parsers scenarios stash -o json`,
 		// Positional args are optional
 		DisableAutoGenTag: true,
-		RunE: func(_ *cobra.Command, args []string) error {
+		RunE: func(cmd *cobra.Command, args []string) error {
 			args = expandAlias(args)
-			return cli.show(args, url, noUnit)
+			return cli.show(cmd.Context(), args, url, noUnit)
 		},
 	}