This improves the log ouput for statistics in the logcli. (#1644)

* This improves the log ouput for statistics in the logcli.

Signed-off-by: Cyril Tovena <cyril.tovena@gmail.com>

* Please the linter

Signed-off-by: Cyril Tovena <cyril.tovena@gmail.com>
pull/1699/head
Cyril Tovena 6 years ago committed by GitHub
parent 250b7d5dc6
commit 24d9956653
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 19
      pkg/logcli/query/query.go
  2. 15
      pkg/logql/stats/context.go

@ -3,8 +3,10 @@ package query
import (
"fmt"
"log"
"os"
"sort"
"strings"
"text/tabwriter"
"time"
"github.com/fatih/color"
@ -168,14 +170,21 @@ func (q *Query) printVector(vector loghttp.Vector) {
fmt.Print(string(bytes))
}
func (q *Query) printStats(stats stats.Result) {
bytes, err := json.MarshalIndent(stats, "", " ")
type kvLogger struct {
*tabwriter.Writer
}
if err != nil {
log.Fatalf("Error marshalling stats: %v", err)
func (k kvLogger) Log(keyvals ...interface{}) error {
for i := 0; i < len(keyvals); i += 2 {
fmt.Fprintln(k.Writer, color.BlueString("%s", keyvals[i]), "\t", fmt.Sprintf("%v", keyvals[i+1]))
}
k.Flush()
return nil
}
fmt.Print(string(bytes))
func (q *Query) printStats(stats stats.Result) {
writer := tabwriter.NewWriter(os.Stdout, 0, 8, 0, '\t', 0)
stats.Summary.Log(kvLogger{Writer: writer})
}
func (q *Query) resultsDirection() logproto.Direction {

@ -62,12 +62,17 @@ func (r Result) Log(log log.Logger) {
"Store.DecompressedLines", r.Store.DecompressedLines,
"Store.CompressedBytes", humanize.Bytes(uint64(r.Store.CompressedBytes)),
"Store.TotalDuplicates", r.Store.TotalDuplicates,
)
r.Summary.Log(log)
}
"Summary.BytesProcessedPerSeconds", humanize.Bytes(uint64(r.Summary.BytesProcessedPerSeconds)),
"Summary.LinesProcessedPerSeconds", r.Summary.LinesProcessedPerSeconds,
"Summary.TotalBytesProcessed", humanize.Bytes(uint64(r.Summary.TotalBytesProcessed)),
"Summary.TotalLinesProcessed", r.Summary.TotalLinesProcessed,
"Summary.ExecTime", time.Duration(int64(r.Summary.ExecTime*float64(time.Second))),
func (s Summary) Log(log log.Logger) {
_ = log.Log(
"Summary.BytesProcessedPerSeconds", humanize.Bytes(uint64(s.BytesProcessedPerSeconds)),
"Summary.LinesProcessedPerSeconds", s.LinesProcessedPerSeconds,
"Summary.TotalBytesProcessed", humanize.Bytes(uint64(s.TotalBytesProcessed)),
"Summary.TotalLinesProcessed", s.TotalLinesProcessed,
"Summary.ExecTime", time.Duration(int64(s.ExecTime*float64(time.Second))),
)
}

Loading…
Cancel
Save