Use go 1.19 and add prometheus server

Author: sbs2001

.github/workflows/build-binary-package.yml

@@ -10,10 +10,10 @@ jobs:
     name: Build and upload binary package
     runs-on: ubuntu-latest
     steps:
-    - name: Set up Go 1.13
+    - name: Set up Go 1.19
       uses: actions/setup-go@v1
       with:
-        go-version: 1.13
+        go-version: 1.19
       id: go
     - name: Check out code into the Go module directory
       uses: actions/checkout@v2

.github/workflows/go.yml

@@ -23,8 +23,3 @@ jobs:
       run: make build
     - name: Test
       run: go test -v
-
-      
-
-      
-  

config.go

@@ -13,26 +13,33 @@ import (
 	"gopkg.in/yaml.v2"
 )
 
+type PrometheusConfig struct {
+	Enabled       bool   `yaml:"enabled"`
+	ListenAddress string `yaml:"listen_addr"`
+	ListenPort    string `yaml:"listen_port"`
+}
+
 type bouncerConfig struct {
-	BinPath                    string        `yaml:"bin_path"` // path to binary
-	PidDir                     string        `yaml:"piddir"`
-	UpdateFrequency            string        `yaml:"update_frequency"`
-	IncludeScenariosContaining []string      `yaml:"include_scenarios_containing"`
-	ExcludeScenariosContaining []string      `yaml:"exclude_scenarios_containing"`
-	OnlyIncludeDecisionsFrom   []string      `yaml:"only_include_decisions_from"`
-	Daemon                     bool          `yaml:"daemonize"`
-	LogMode                    string        `yaml:"log_mode"`
-	LogDir                     string        `yaml:"log_dir"`
-	LogLevel                   log.Level     `yaml:"log_level"`
-	LogMaxSize                 int           `yaml:"log_max_size,omitempty"`
-	LogMaxFiles                int           `yaml:"log_max_files,omitempty"`
-	LogMaxAge                  int           `yaml:"log_max_age,omitempty"`
-	CompressLogs               *bool         `yaml:"compress_logs,omitempty"`
-	APIUrl                     string        `yaml:"api_url"`
-	APIKey                     string        `yaml:"api_key"`
-	CacheRetentionDuration     time.Duration `yaml:"cache_retention_duration"`
-	FeedViaStdin               bool          `yaml:"feed_via_stdin"`
-	TotalRetries               int           `yaml:"total_retries"`
+	BinPath                    string           `yaml:"bin_path"` // path to binary
+	PidDir                     string           `yaml:"piddir"`
+	UpdateFrequency            string           `yaml:"update_frequency"`
+	IncludeScenariosContaining []string         `yaml:"include_scenarios_containing"`
+	ExcludeScenariosContaining []string         `yaml:"exclude_scenarios_containing"`
+	OnlyIncludeDecisionsFrom   []string         `yaml:"only_include_decisions_from"`
+	Daemon                     bool             `yaml:"daemonize"`
+	LogMode                    string           `yaml:"log_mode"`
+	LogDir                     string           `yaml:"log_dir"`
+	LogLevel                   log.Level        `yaml:"log_level"`
+	LogMaxSize                 int              `yaml:"log_max_size,omitempty"`
+	LogMaxFiles                int              `yaml:"log_max_files,omitempty"`
+	LogMaxAge                  int              `yaml:"log_max_age,omitempty"`
+	CompressLogs               *bool            `yaml:"compress_logs,omitempty"`
+	APIUrl                     string           `yaml:"api_url"`
+	APIKey                     string           `yaml:"api_key"`
+	CacheRetentionDuration     time.Duration    `yaml:"cache_retention_duration"`
+	FeedViaStdin               bool             `yaml:"feed_via_stdin"`
+	TotalRetries               int              `yaml:"total_retries"`
+	PrometheusConfig           PrometheusConfig `yaml:"prometheus"`
 }
 
 func NewConfig(configPath string) (*bouncerConfig, error) {

config/crowdsec-custom-bouncer.yaml

@@ -15,3 +15,8 @@ log_max_backups: 3
 log_max_age: 30
 api_url: http://localhost:8080/
 api_key: ${API_KEY}
+
+prometheus:
+  enabled: true
+  listen_addr: 127.0.0.1
+  listen_port: 60602 

go.mod

@@ -7,6 +7,7 @@ require (
 	github.com/crowdsecurity/crowdsec v1.4.1
 	github.com/crowdsecurity/go-cs-bouncer v0.0.0-20220817075151-29237cbe9873
 	github.com/go-openapi/swag v0.22.3 // indirect
+	github.com/prometheus/client_golang v1.13.0
 	github.com/sirupsen/logrus v1.9.0
 	golang.org/x/net v0.0.0-20220822230855-b0a4917ee28c // indirect
 	golang.org/x/sys v0.0.0-20220823224334-20c2bfdbfe24 // indirect
@@ -38,7 +39,6 @@ require (
 	github.com/mitchellh/mapstructure v1.5.0 // indirect
 	github.com/oklog/ulid v1.3.1 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
-	github.com/prometheus/client_golang v1.13.0 // indirect
 	github.com/prometheus/client_model v0.2.0 // indirect
 	github.com/prometheus/common v0.37.0 // indirect
 	github.com/prometheus/procfs v0.8.0 // indirect

go.sum

@@ -180,6 +180,7 @@ github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA
 github.com/census-instrumentation/opencensus-proto v0.3.0/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/certifi/gocertifi v0.0.0-20191021191039-0944d244cd40/go.mod h1:sGbDF6GwGcLpkNXPUTkMRoywsNa/ol15pxFe6ERfguA=
 github.com/certifi/gocertifi v0.0.0-20200922220541-2c3bb06c6054/go.mod h1:sGbDF6GwGcLpkNXPUTkMRoywsNa/ol15pxFe6ERfguA=
+github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko=
 github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
 github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cbYE=

main.go

@@ -3,13 +3,17 @@ package main
 import (
 	"flag"
 	"fmt"
+	"net"
+	"net/http"
 	"os"
 	"os/exec"
 	"os/signal"
 	"syscall"
 	"time"
 
 	"github.com/coreos/go-systemd/daemon"
+	"github.com/prometheus/client_golang/prometheus"
+	"github.com/prometheus/client_golang/prometheus/promhttp"
 	log "github.com/sirupsen/logrus"
 	"github.com/sirupsen/logrus/hooks/writer"
 
@@ -118,6 +122,19 @@ func main() {
 		bouncer.Run()
 		return fmt.Errorf("stream api init failed")
 	})
+	if config.PrometheusConfig.Enabled {
+		prometheus.MustRegister(csbouncer.TotalLAPICalls, csbouncer.TotalLAPIError)
+		go func() {
+			http.Handle("/metrics", promhttp.Handler())
+			listenOn := net.JoinHostPort(
+				config.PrometheusConfig.ListenAddress,
+				config.PrometheusConfig.ListenPort,
+			)
+			log.Infof("Serving metrics at %s", listenOn+"/metrics")
+			log.Error(http.ListenAndServe(listenOn, nil))
+		}()
+	}
+	go bouncer.Run()
 	if config.FeedViaStdin {
 		t.Go(
 			func() error {