Support go.mod

Makefile

@@ -1,17 +1,22 @@
 GIT_BRANCH=$(shell git rev-parse --abbrev-ref HEAD 2>/dev/null)
 GIT_COMMIT=$(shell git rev-parse --short HEAD)
-GOPATH=${CURDIR}
 LDFLAGS=-ldflags "-s -w -X main.GitBranch=${GIT_BRANCH} -X main.GitCommit=${GIT_COMMIT} -X main.BuildDate=`date -u +%Y-%m-%d.%H:%M:%S`"
 CGO_ENABLED=0
 
 build:
 	@[ -d build ] || mkdir -p build
-	go build ${LDFLAGS} -o build/seslog-server src/cmd/seslog-server/main.go
+	go build ${LDFLAGS} -o build/seslog-server cmd/seslog-server/main.go
 	@file  build/seslog-server
 	@du -h build/seslog-server
 
+build-json2ch:
+	@[ -d build ] || mkdir -p build
+	go build ${LDFLAGS} -o build/seslog-json2ch cmd/seslog-json2ch/main.go
+	@file  build/seslog-json2ch
+	@du -h build/seslog-json2ch
+
 br:
-	go build --race -o build/seslog-server -v -ldflags "-s" src/cmd/seslog-server/main.go
+	go build --race -o build/seslog-server -v -ldflags "-s" cmd/seslog-server/main.go
 
 d:
 	docker-compose -f dockerfiles/docker-compose.yml rm --force
@@ -21,12 +26,9 @@ f:
 	gofmt -l -s -w `find . -type f -name '*.go' -not -path "./*/vendor/*"`
 	goimports -l -w `find . -type f -name '*.go' -not -path "./*/vendor/*"`
 
-deb: build
-	@nfpm pkg --target build/seslog-server.deb
-	@dpkg-deb -I build/seslog-server.deb
-
 zip: build
 	@[ -d build/seslog/resources ] || mkdir -p build/seslog/resources
+	@cp config.json build/seslog/config.json
 	@cp resources/regexes.yaml build/seslog/resources/regexes.yaml
 	@cp build/seslog-server build/seslog/seslog-server
 	@cp -r package/systemd build/seslog

src/cmd/seslog-json2ch/main.go → cmd/seslog-json2ch/main.go

@@ -3,23 +3,21 @@ package main
 import (
 	"flag"
 	"fmt"
-	"pkg/seslog"
+	"github.com/andrylavr/seslog/src/seslog"
+	"log"
 )
 
 var (
 	BuildDate            string
 	GitBranch, GitCommit string
 )
 
-var (
-	options seslog.Options
-)
-
-func init() {
-	flag.StringVar(&options.CHDSN, "dsn", "native://127.0.0.1:9000?compress=1", "ClickHouse DSN")
-}
-
 func main() {
+	options, err := seslog.ReadOptions()
+	if err != nil {
+		log.Fatal(err)
+	}
+
 	flag.Usage = func() {
 		fmt.Println("NAME:")
 		fmt.Println(" Seslog JSON2ClickHouse - push .json.gz files to ClickHouse")

src/cmd/seslog-server/main.go → cmd/seslog-server/main.go

@@ -3,26 +3,21 @@ package main
 import (
 	"flag"
 	"fmt"
+	"github.com/andrylavr/seslog/src/seslog"
 	"log"
-	"pkg/seslog"
 )
 
 var (
 	BuildDate            string
 	GitBranch, GitCommit string
 )
 
-var (
-	options seslog.Options
-)
-
-func init() {
-	flag.StringVar(&options.CHDSN, "dsn", "native://127.0.0.1:9000?compress=1", "ClickHouse DSN")
-	flag.StringVar(&options.Address, "addr", ":5514", "listen address")
-	flag.StringVar(&options.FlushInterval, "flush-interval", "60s", "Interval between ClickHouse flushes")
-}
-
 func main() {
+	options, err := seslog.ReadOptions()
+	if err != nil {
+		log.Fatal(err)
+	}
+
 	flag.Usage = func() {
 		fmt.Println("NAME:")
 		fmt.Println("  Seslog - syslog server for storing nginx access_log in ClickHouse")

config.json

@@ -0,0 +1,6 @@
+{
+  "README": "CHANGE THIS FILE CONTENT IF YOU WANT",
+  "clickhouse-dsn": "native://127.0.0.1:9000?compress=1",
+  "listen-addr": ":5514",
+  "flush-interval": "60s"
+}

go.mod

@@ -0,0 +1,11 @@
+module github.com/andrylavr/seslog
+
+go 1.13
+
+require (
+	github.com/ClickHouse/clickhouse-go v1.4.5
+	github.com/golang/glog v0.0.0-20210429001901-424d2337a529
+	github.com/patrickmn/go-cache v2.1.0+incompatible
+	github.com/ua-parser/uap-go v0.0.0-20210121150957-347a3497cc39
+	gopkg.in/mcuadros/go-syslog.v2 v2.3.0
+)

go.sum

@@ -0,0 +1,24 @@
+github.com/ClickHouse/clickhouse-go v1.4.5 h1:FfhyEnv6/BaWldyjgT2k4gDDmeNwJ9C4NbY/MXxJlXk=
+github.com/ClickHouse/clickhouse-go v1.4.5/go.mod h1:EaI/sW7Azgz9UATzd5ZdZHRUhHgv5+JMS9NSr2smCJI=
+github.com/bkaradzic/go-lz4 v1.0.0/go.mod h1:0YdlkowM3VswSROI7qDxhRvJ3sLhlFrRRwjwegp5jy4=
+github.com/cloudflare/golz4 v0.0.0-20150217214814-ef862a3cdc58/go.mod h1:EOBUe0h4xcZ5GoxqC5SDxFQ8gwyZPKQoEzownBlhI80=
+github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
+github.com/golang/glog v0.0.0-20210429001901-424d2337a529 h1:2voWjNECnrZRbfwXxHB1/j8wa6xdKn85B5NzgVL/pTU=
+github.com/golang/glog v0.0.0-20210429001901-424d2337a529/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
+github.com/jmoiron/sqlx v1.2.0/go.mod h1:1FEQNm3xlJgrMD+FBdI9+xvCksHtbpVBBw5dYhBSsks=
+github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
+github.com/mattn/go-sqlite3 v1.9.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=
+github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok+kx1WdO15EQc=
+github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ=
+github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
+github.com/ua-parser/uap-go v0.0.0-20210121150957-347a3497cc39 h1:kYO0jPTV2Co2s3unqZl3GgB+T27G+ZRRU2/iXEX+TK4=
+github.com/ua-parser/uap-go v0.0.0-20210121150957-347a3497cc39/go.mod h1:OBcG9bn7sHtXgarhUEb3OfCnNsgtGnkVf41ilSZ3K3E=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/mcuadros/go-syslog.v2 v2.3.0 h1:kcsiS+WsTKyIEPABJBJtoG0KkOS6yzvJ+/eZlhD79kk=
+gopkg.in/mcuadros/go-syslog.v2 v2.3.0/go.mod h1:l5LPIyOOyIdQquNg+oU6Z3524YwrcqEm0aKH+5zpt2U=
+gopkg.in/yaml.v2 v2.2.1 h1:mUhvW9EsL+naU5Q3cakzfE91YhliOondGd6ZrsDBHQE=
+gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=

src/pkg/seslog/clickhouse.go → src/seslog/clickhouse.go

@@ -12,10 +12,10 @@ import (
 	"sync"
 	"time"
 
-	"github.com/kshvakov/clickhouse/lib/data"
+	"github.com/ClickHouse/clickhouse-go"
+	"github.com/ClickHouse/clickhouse-go/lib/data"
 
 	"github.com/golang/glog"
-	"github.com/kshvakov/clickhouse"
 )
 
 const INSERT_SQL = "INSERT INTO seslog.access_log (" +

src/seslog/config.go

@@ -0,0 +1,14 @@
+package seslog
+
+import (
+	"encoding/json"
+	"os"
+)
+
+func ReadOptions() (options Options, err error) {
+	file, _ := os.Open("config.json")
+	decoder := json.NewDecoder(file)
+	options = Options{}
+	err = decoder.Decode(&options)
+	return
+}

src/pkg/seslog/types.go → src/seslog/types.go

@@ -5,9 +5,9 @@ import (
 )
 
 type Options struct {
-	CHDSN         string
-	Address       string
-	FlushInterval string
+	CHDSN         string `json:"clickhouse-dsn"`
+	Address       string `json:"listen-addr"`
+	FlushInterval string `json:"flush-interval"`
 }
 
 type NginxEvent struct {