Skip to content

Commit

Permalink
Creating metrics from log messages.
Browse files Browse the repository at this point in the history
This change adds the ability of scanning log messages and incrementing counters
everytime a log message matches a given regular expression.
  • Loading branch information
sravotto committed Apr 18, 2024
1 parent eee4b93 commit b42a766
Show file tree
Hide file tree
Showing 25 changed files with 1,143 additions and 5 deletions.
6 changes: 6 additions & 0 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,11 @@ require (
honnef.co/go/tools v0.4.7
)

require (
github.com/fsnotify/fsnotify v1.6.0 // indirect
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
)

require (
github.com/BurntSushi/toml v1.3.2 // indirect
github.com/beorn7/perks v1.0.1 // indirect
Expand All @@ -43,6 +48,7 @@ require (
github.com/jackc/pgproto3/v2 v2.3.3 // indirect
github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a // indirect
github.com/jackc/puddle v1.3.0 // indirect
github.com/nxadm/tail v1.4.11
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/prometheus/procfs v0.12.0 // indirect
github.com/robfig/cron/v3 v3.0.1 // indirect
Expand Down
7 changes: 7 additions & 0 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -455,6 +455,8 @@ github.com/envoyproxy/go-control-plane v0.10.3/go.mod h1:fJJn/j26vwOu972OllsvAgJ
github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
github.com/envoyproxy/protoc-gen-validate v0.6.7/go.mod h1:dyJXwwfPK2VSqiB9Klm1J6romD608Ba7Hij42vrOBCo=
github.com/envoyproxy/protoc-gen-validate v0.9.1/go.mod h1:OKNgG7TCp5pF4d6XftA0++PMirau2/yoOwVac3AbF2w=
github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY=
github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw=
github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
github.com/go-co-op/gocron v1.37.0 h1:ZYDJGtQ4OMhTLKOKMIch+/CY70Brbb1dGdooLEhh7b0=
github.com/go-co-op/gocron v1.37.0/go.mod h1:3L/n6BkO7ABj+TrfSVXLRzsP26zmikL4ISkLQ0O8iNY=
Expand Down Expand Up @@ -654,6 +656,8 @@ github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope
github.com/mattn/go-isatty v0.0.5/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
github.com/mattn/go-isatty v0.0.7/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
github.com/nxadm/tail v1.4.11 h1:8feyoE3OzPrcshW5/MJ4sGESc5cqmGkGCWlco4l0bqY=
github.com/nxadm/tail v1.4.11/go.mod h1:OTaG3NK980DZzxbRq6lEuzgU+mug70nY11sMd4JXXHc=
github.com/pashagolub/pgxmock v1.8.0 h1:05JB+jng7yPdeC6i04i8TC4H1Kr7TfcFeQyf4JP6534=
github.com/pashagolub/pgxmock v1.8.0/go.mod h1:kDkER7/KJdD3HQjNvFw5siwR7yREKmMvwf8VhAgTK5o=
github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
Expand Down Expand Up @@ -983,6 +987,7 @@ golang.org/x/sys v0.0.0-20220624220833-87e55d714810/go.mod h1:oPkhp1MJrh7nUepCBc
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
Expand Down Expand Up @@ -1332,6 +1337,8 @@ gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntN
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
gopkg.in/inconshreveable/log15.v2 v2.0.0-20180818164646-67afb5ed74ec/go.mod h1:aPpfJ7XW+gOuirDoZ8gHhLh3kZ1B08FtV2bbmy7Jv3s=
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
Expand Down
315 changes: 315 additions & 0 deletions internal/cmd/scan/admin.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,315 @@
// Copyright 2022 Cockroach Labs Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

// Package scan defines the sub command to run visus scanner utilities.
package scan

import (
"bufio"
"bytes"
"errors"
"fmt"
"os"
"strings"
"time"

"github.com/cockroachlabs/visus/internal/database"
"github.com/cockroachlabs/visus/internal/scanner"
"github.com/cockroachlabs/visus/internal/store"
"github.com/creasty/defaults"
"github.com/prometheus/client_golang/prometheus"
"github.com/prometheus/common/expfmt"
log "github.com/sirupsen/logrus"
"github.com/spf13/cobra"
"gopkg.in/yaml.v3"
)

var databaseURL = ""

// patternDef yaml pattern definition
type patternDef struct {
Name string
Regex string
Help string
}

// config yaml scanner definition
type config struct {
Name string
Path string
Format string
Enabled bool
Patterns []patternDef
}

func marshal(logFile *store.Scan) ([]byte, error) {
patterns := make([]patternDef, 0)
for _, m := range logFile.Patterns {
metric := patternDef{
Name: m.Name,
Regex: m.Regex,
Help: m.Help,
}
patterns = append(patterns, metric)
}
config := &config{
Name: logFile.Name,
Path: logFile.Path,
Format: string(logFile.Format),
Enabled: logFile.Enabled,
Patterns: patterns,
}
return yaml.Marshal(config)
}

// listCmd list all the log scanners in the datababse
func listCmd(factory database.Factory) *cobra.Command {
c := &cobra.Command{
Use: "list",
Example: `./visus log list --url "postgresql://root@localhost:26257/defaultdb?sslmode=disable" `,
RunE: func(cmd *cobra.Command, args []string) error {
ctx := cmd.Context()
conn, err := factory.New(ctx, databaseURL)
if err != nil {
return err
}
store := store.New(conn)
logs, err := store.GetScanNames(ctx)
if err != nil {
fmt.Print("Error retrieving log targets")
return err
}
for _, lg := range logs {
fmt.Printf("%s\n", lg)
}
return nil
},
}
return c
}

func getCmd(factory database.Factory) *cobra.Command {
c := &cobra.Command{
Use: "get",
Args: cobra.ExactArgs(1),
Example: `./visus log get scanner_name --url "postgresql://root@localhost:26257/defaultdb?sslmode=disable" `,
RunE: func(cmd *cobra.Command, args []string) error {
ctx := cmd.Context()
logName := args[0]
conn, err := factory.New(ctx, databaseURL)
if err != nil {
return err
}
store := store.New(conn)
scanner, err := store.GetScan(ctx, logName)
if err != nil {
fmt.Printf("Error retrieving log %s.", logName)
return err
}
if scanner == nil {
fmt.Printf("Collection %s not found\n", logName)
} else {
res, err := marshal(scanner)
if err != nil {
fmt.Printf("Unabled to marshall %s\n", logName)
}
fmt.Println(string(res))
}
return nil
},
}
return c
}

func testCmd(factory database.Factory) *cobra.Command {
var interval time.Duration
var count int
c := &cobra.Command{
Use: "test",
Args: cobra.ExactArgs(1),
Example: `./visus log test scanner_name --url "postgresql://root@localhost:26257/defaultdb?sslmode=disable" `,
RunE: func(cmd *cobra.Command, args []string) error {
ctx := cmd.Context()
logName := args[0]
conn, err := factory.ReadOnly(ctx, databaseURL)
if err != nil {
return err
}
st := store.New(conn)
lg, err := st.GetScan(ctx, logName)
if err != nil {
fmt.Printf("Error retrieving scanner %s.", logName)
return err
}
if lg == nil {
fmt.Printf("Collection %s not found\n", logName)
} else {

scanner, err := scanner.New(ctx, lg,
&scanner.Config{
FromBeginning: true,
Pool: true,
Follow: false,
},
prometheus.DefaultRegisterer)
if err != nil {
return err
}
scanner.Start(ctx)
for i := 1; i <= count || count == 0; i++ {
select {
case <-ctx.Done():
return ctx.Err()
case <-time.After(interval):
}
gathering, err := prometheus.DefaultGatherer.Gather()
if err != nil {
fmt.Printf("Error collecting patterns %s.", err)
return err
}
fmt.Printf("\n---- %s %s -----\n", time.Now().Format("01-02-2006 15:04:05"), lg.Name)
for _, mf := range gathering {
if strings.HasPrefix(*mf.Name, logName) {
expfmt.MetricFamilyToText(os.Stdout, mf)

}
}
}
return scanner.Stop()
}
return nil
},
}
f := c.Flags()
f.DurationVar(&interval, "interval", 10*time.Second, "interval of scanner")
f.IntVar(&count, "count", 1, "number of times to run the scanner. Specify 0 for continuos scanner")
return c
}

func deleteCmd(factory database.Factory) *cobra.Command {
c := &cobra.Command{
Use: "delete",
Args: cobra.ExactArgs(1),
Example: `./visus scanner delete scanner_name --url "postgresql://root@localhost:26257/defaultdb?sslmode=disable" `,
RunE: func(cmd *cobra.Command, args []string) error {
ctx := cmd.Context()
logName := args[0]
conn, err := factory.New(ctx, databaseURL)
if err != nil {
return err
}
store := store.New(conn)
err = store.DeleteCollection(ctx, args[0])
if err != nil {
fmt.Printf("Error deleting scanner %s.\n", logName)
return err
}
fmt.Printf("Collection %s deleted.\n", logName)
return nil
},
}
return c
}

func putCmd(factory database.Factory) *cobra.Command {
var file string
c := &cobra.Command{
Use: "put",
Args: cobra.ExactArgs(0),
Example: `./visus scanner put --yaml config.yaml --url "postgresql://root@localhost:26257/defaultdb?sslmode=disable" `,
RunE: func(cmd *cobra.Command, args []string) error {
ctx := cmd.Context()
if file == "" {
return errors.New("yaml configuration required")
}
conn, err := factory.New(ctx, databaseURL)
if err != nil {
return err
}
var data []byte
if file == "-" {
var buffer bytes.Buffer
scanner := bufio.NewScanner(os.Stdin)
for scanner.Scan() {
buffer.Write(scanner.Bytes())
buffer.WriteString("\n")
}
if err := scanner.Err(); err != nil {
log.Errorf("reading standard input: %s", err.Error())
}
data = buffer.Bytes()
} else {
data, err = os.ReadFile(file)
if err != nil {
return err
}
}
config := &config{}
err = yaml.Unmarshal(data, &config)
if err != nil {
return err
}
if err := defaults.Set(config); err != nil {
return err
}
patterns := make([]store.Pattern, 0)
for _, p := range config.Patterns {
pattern := store.Pattern{
Name: p.Name,
Regex: p.Regex,
Help: p.Help,
}
patterns = append(patterns, pattern)
}
if config.Name == "" {
return errors.New("name must be specified")
}
logTarget := &store.Scan{
Enabled: config.Enabled,
Format: store.LogFormat(config.Format),
Path: config.Path,
Name: config.Name,
Patterns: patterns,
}
store := store.New(conn)
err = store.PutScan(ctx, logTarget)
if err != nil {
fmt.Printf("Error inserting scanner %s.", config.Name)
return err
}
fmt.Printf("Collection %s inserted.\n", config.Name)
return nil
},
}
f := c.Flags()
f.StringVar(&file, "yaml", "", "file containing the configuration")
return c
}

// Command runs the scanner tools to view and manage the configuration in the database.
func Command() *cobra.Command {
c := &cobra.Command{
Use: "scan",
}
f := c.PersistentFlags()
c.AddCommand(
getCmd(database.DefaultFactory),
listCmd(database.DefaultFactory),
deleteCmd(database.DefaultFactory),
putCmd(database.DefaultFactory),
testCmd(database.DefaultFactory))
f.StringVar(&databaseURL, "url", "",
"Connection URL, of the form: postgresql://[user[:passwd]@]host[:port]/[db][?parameters...]")
return c
}
Loading

0 comments on commit b42a766

Please sign in to comment.