Skip to content

Commit

Permalink
Merge pull request #1 from persona-id/kuzmik/first-pass
Browse files Browse the repository at this point in the history
initial import of the actual code
  • Loading branch information
kuzmik authored Dec 15, 2023
2 parents 8d172c9 + 040f786 commit 9d5b425
Show file tree
Hide file tree
Showing 14 changed files with 764 additions and 0 deletions.
16 changes: 16 additions & 0 deletions build/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
FROM alpine:3.18

RUN sniper \
&& adduser -S sniper -u 1000 -G sniper

RUN apk add --no-cache bash=5.2.15-r5

# config.yaml should be a configmap mounted as /app/config.yaml
# credentials.yaml should be a secret mounted as /app/credentials.yaml (or whatever path is configured in config.yaml)
COPY --chown=root:root --chmod=755 query-sniper /app/

WORKDIR /app

USER sniper

ENTRYPOINT ["/app/query-sniper"]
37 changes: 37 additions & 0 deletions build/dev.Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
# syntax=docker/dockerfile:1

# Stage 1
FROM golang:1.21.5-alpine AS builder

ARG BUILD_SHA
ARG BUILD_TIME
ARG VERSION

ENV GO111MODULE=on

# Set destination for COPY
WORKDIR /build

COPY go.sum go.mod ./

RUN go mod download

COPY . .

RUN CGO_ENABLED="0" go build -o query-sniper cmd/query-sniper/main.go

# Stage 2
FROM alpine:3.18.4 as runner

RUN addgroup sniper && adduser -S sniper -u 1000 -G sniper

RUN apk add --no-cache bash

WORKDIR /app

# FIXME: missing the configs, I haven't decided how to deal with that yet.
COPY --chown=sniper:sniper --from=builder --chmod=700 /build/query-sniper /app/

USER sniper

ENTRYPOINT ["/app/query-sniper"]
64 changes: 64 additions & 0 deletions cmd/query-sniper/main.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
package main

import (
"context"
"log/slog"
"os"
"os/signal"
"syscall"

"github.com/persona-id/query-sniper/internal/configuration"
"github.com/persona-id/query-sniper/internal/sniper"
)

func main() {
settings, err := configuration.Configure()
if err != nil {
slog.Error("Error in Configure()", slog.Any("err", err))
os.Exit(1)
}

setupLogger(settings.LogLevel)

ctx, cancelFunc := context.WithCancel(context.Background())

go sniper.Run(ctx, settings)

termChan := make(chan os.Signal, 1)
signal.Notify(termChan, syscall.SIGINT, syscall.SIGTERM)
<-termChan

slog.Info("QuerySniper received TERM signal, shutting down")

cancelFunc()

slog.Info("QuerySniper shut down")
}

func setupLogger(level string) {
var logLevel slog.Level

switch level {
case "DEBUG":
logLevel = slog.LevelDebug
case "INFO":
logLevel = slog.LevelInfo
case "WARN":
logLevel = slog.LevelWarn
case "ERROR":
logLevel = slog.LevelError
default:
logLevel = slog.LevelInfo
}

opts := &slog.HandlerOptions{
AddSource: true,
Level: logLevel,
}

var handler slog.Handler = slog.NewTextHandler(os.Stdout, opts)

logger := slog.New(handler)

slog.SetDefault(logger)
}
1 change: 1 addition & 0 deletions cmd/query-sniper/main_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
package main
37 changes: 37 additions & 0 deletions configs/config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
---
# Path to the crednetials secret
credentials: configs/credentials.yaml

log_level: DEBUG

# List of databases to watch and various configuration options for them. The login creds
# are stored in the file defined above, and the keys to each database entry must match.
databases:
us1_primary:
address: 192.168.194.152:6033
schema: persona-web-us1
replica_lag_limit: 50s
hll_limit: 50
long_query_limit: 60s
interval: 1s
us1_replica0:
address: 192.168.194.152:6033
schema: persona-web-us1
replica_lag_limit: 60s
hll_limit: 60
long_query_limit: 120s
interval: 5s
us2_primary:
address: 192.168.194.152:6033
schema: persona-web-us2
replica_lag_limit: 70s
hll_limit: 70
long_query_limit: 60s
interval: 1s
us2_replica0:
address: 192.168.194.152:6033
schema: persona-web-us2
replica_lag_limit: 80s
hll_limit: 80
long_query_limit: 120s
interval: 5s
16 changes: 16 additions & 0 deletions configs/credentials.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
---
# Auth credentials for the configured databases.
# NB: The `databases` key needs to match the keys in the config file.
databases:
us1_primary:
username: persona-web-us1
password: persona-web-us1
us1_replica0:
username: persona-web-us1-ro
password: persona-web-us1-ro
us2_primary:
username: persona-web-us2
password: persona-web-us2
us2_replica0:
username: persona-web-us2-ro
password: persona-web-us2-ro
34 changes: 34 additions & 0 deletions go.mod
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
module github.com/persona-id/query-sniper

go 1.21.5

require (
github.com/go-sql-driver/mysql v1.7.1
github.com/openark/golib v0.0.0-20210531070646-355f37940af8
github.com/spf13/pflag v1.0.5
github.com/spf13/viper v1.18.1
github.com/stretchr/testify v1.8.4
)

require (
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/fsnotify/fsnotify v1.7.0 // indirect
github.com/hashicorp/hcl v1.0.0 // indirect
github.com/magiconair/properties v1.8.7 // indirect
github.com/mitchellh/mapstructure v1.5.0 // indirect
github.com/pelletier/go-toml/v2 v2.1.0 // indirect
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
github.com/sagikazarmark/locafero v0.4.0 // indirect
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
github.com/sourcegraph/conc v0.3.0 // indirect
github.com/spf13/afero v1.11.0 // indirect
github.com/spf13/cast v1.6.0 // indirect
github.com/subosito/gotenv v1.6.0 // indirect
go.uber.org/atomic v1.9.0 // indirect
go.uber.org/multierr v1.9.0 // indirect
golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect
golang.org/x/sys v0.15.0 // indirect
golang.org/x/text v0.14.0 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
73 changes: 73 additions & 0 deletions go.sum
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8=
github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=
github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA=
github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM=
github.com/go-sql-driver/mysql v1.7.1 h1:lUIinVbN1DY0xBg0eMOzmmtGoHwWBbvnWubQUrtU8EI=
github.com/go-sql-driver/mysql v1.7.1/go.mod h1:OXbVy3sEdcQ2Doequ6Z5BW6fXNQTmx+9S1MCJN5yJMI=
github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4=
github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0VQdvPDY=
github.com/magiconair/properties v1.8.7/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0=
github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
github.com/openark/golib v0.0.0-20210531070646-355f37940af8 h1:9ciIHNuyFqRWi9NpMNw9sVLB6z1ItpP5ZhTY9Q1xVu4=
github.com/openark/golib v0.0.0-20210531070646-355f37940af8/go.mod h1:1jj8x1eDVZxgc/Z4VyamX4qTbAdHPUQA6NeVtCd8Sl8=
github.com/pelletier/go-toml/v2 v2.1.0 h1:FnwAJ4oYMvbT/34k9zzHuZNrhlz48GB3/s6at6/MHO4=
github.com/pelletier/go-toml/v2 v2.1.0/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8=
github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
github.com/sagikazarmark/locafero v0.4.0 h1:HApY1R9zGo4DBgr7dqsTH/JJxLTTsOt7u6keLGt6kNQ=
github.com/sagikazarmark/locafero v0.4.0/go.mod h1:Pe1W6UlPYUk/+wc/6KFhbORCfqzgYEpgQ3O5fPuL3H4=
github.com/sagikazarmark/slog-shim v0.1.0 h1:diDBnUNK9N/354PgrxMywXnAwEr1QZcOr6gto+ugjYE=
github.com/sagikazarmark/slog-shim v0.1.0/go.mod h1:SrcSrq8aKtyuqEI1uvTDTK1arOWRIczQRv+GVI1AkeQ=
github.com/sourcegraph/conc v0.3.0 h1:OQTbbt6P72L20UqAkXXuLOj79LfEanQ+YQFNpLA9ySo=
github.com/sourcegraph/conc v0.3.0/go.mod h1:Sdozi7LEKbFPqYX2/J+iBAM6HpqSLTASQIKqDmF7Mt0=
github.com/spf13/afero v1.11.0 h1:WJQKhtpdm3v2IzqG8VMqrr6Rf3UYpEF239Jy9wNepM8=
github.com/spf13/afero v1.11.0/go.mod h1:GH9Y3pIexgf1MTIWtNGyogA5MwRIDXGUr+hbWNoBjkY=
github.com/spf13/cast v1.6.0 h1:GEiTHELF+vaR5dhz3VqZfFSzZjYbgeKDpBxQVS4GYJ0=
github.com/spf13/cast v1.6.0/go.mod h1:ancEpBxwJDODSW/UG4rDrAqiKolqNNh2DX3mk86cAdo=
github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
github.com/spf13/viper v1.18.1 h1:rmuU42rScKWlhhJDyXZRKJQHXFX02chSVW1IvkPGiVM=
github.com/spf13/viper v1.18.1/go.mod h1:EKmWIqdnk5lOcmR72yw6hS+8OPYcwD0jteitLMVB+yk=
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8=
github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU=
go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE=
go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
go.uber.org/multierr v1.9.0 h1:7fIwc/ZtS0q++VgcfqFDxSBZVv/Xo49/SYnDFupUwlI=
go.uber.org/multierr v1.9.0/go.mod h1:X2jQV1h+kxSjClGpnseKVIxpmcjrj7MNnI0bnlfKTVQ=
golang.org/x/exp v0.0.0-20230905200255-921286631fa9 h1:GoHiUyI/Tp2nVkLI2mCxVkOjsbSXD66ic0XW0js0R9g=
golang.org/x/exp v0.0.0-20230905200255-921286631fa9/go.mod h1:S2oDrQGGwySpoQPVqRShND87VCbxmc6bL1Yd2oYrm6k=
golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc=
golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo=
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA=
gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
95 changes: 95 additions & 0 deletions internal/configuration/configuration.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,95 @@
package configuration

import (
"errors"
"fmt"
"os"
"time"

"github.com/spf13/pflag"
"github.com/spf13/viper"
)

type Config struct {
LogLevel string `mapstructure:"log_level"`
Credentials string `mapstructure:"credentials"`
Databases map[string]struct {
Address string `mapstructure:"address"`
Schema string `mapstructure:"schema"`
Username string `mapstructure:"username"`
Password string `mapstructure:"password"`
ReplicaLagLimit time.Duration `mapstructure:"replica_lag_limit"`
HLLLimit int `mapstructure:"hll_limit"`
Interval time.Duration `mapstructure:"interval"`
LongQueryLimit time.Duration `mapstructure:"long_query_limit"`
} `mapstructure:"databases"`
}

func Configure() (*Config, error) {
if file := os.Getenv("SNIPER_CONFIG_FILE"); file != "" {
// if the config file path is specified in the env, load that
viper.SetConfigFile(file)
} else {
// otherwise setup some default locations
viper.SetConfigName("config")
viper.SetConfigType("yaml")
viper.AddConfigPath(".")
viper.AddConfigPath("configs")
}

// read the config file, if it exists. if not, keep on truckin'
if err := viper.ReadInConfig(); err != nil {
errVal := viper.ConfigFileNotFoundError{}
if ok := errors.As(err, &errVal); !ok {
return nil, err
}
}

// load the credentials config and merge it into the existing configuration.
if file := os.Getenv("SNIPER_CREDS_FILE"); file != "" {
viper.SetConfigFile(file)

err := viper.MergeInConfig()
if err != nil {
return nil, err
}
} else {
if creds := viper.GetViper().GetString("credentials"); creds != "" {
viper.SetConfigFile(creds)

err := viper.MergeInConfig()
if err != nil {
return nil, err
}
}
}

pflag.Bool("show-config", false, "Dump the configuration for debugging")

err := pflag.CommandLine.MarkHidden("show-config")
if err != nil {
return nil, err
}

pflag.Parse()

err = viper.BindPFlags(pflag.CommandLine)
if err != nil {
return nil, err
}

// we are only dumping the config if the secret flag show-config is specified, because the config
// contains the proxysql admin password
if viper.GetViper().GetBool("show-config") {
fmt.Println("settings", viper.GetViper().AllSettings())
}

settings := &Config{}

err = viper.Unmarshal(settings)
if err != nil {
return nil, err
}

return settings, nil
}
Loading

0 comments on commit 9d5b425

Please sign in to comment.