Skip to content

Commit

Permalink
Merge pull request #63 from justwatchcom/feature/update-ch-dependency
Browse files Browse the repository at this point in the history
Add Clickhouse v2 driver
  • Loading branch information
dewey authored May 23, 2022
2 parents f9d6fbe + 56d5b35 commit 96f1952
Show file tree
Hide file tree
Showing 327 changed files with 23,858 additions and 8,202 deletions.
1 change: 1 addition & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ FROM alpine:latest

RUN apk --update upgrade && \
apk add curl ca-certificates && \
apk add tzdata && \
update-ca-certificates && \
rm -rf /var/cache/apk/*

Expand Down
12 changes: 7 additions & 5 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module github.com/justwatchcom/sql_exporter
go 1.17

require (
github.com/ClickHouse/clickhouse-go v1.5.2
github.com/ClickHouse/clickhouse-go/v2 v2.0.14
github.com/cenkalti/backoff v2.2.1+incompatible
github.com/denisenkom/go-mssqldb v0.0.0-20191128021309-1d7a30a10f73
github.com/go-kit/log v0.2.0
Expand Down Expand Up @@ -37,10 +37,8 @@ require (
github.com/aws/smithy-go v1.9.0 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/cespare/xxhash/v2 v2.1.2 // indirect
github.com/cloudflare/golz4 v0.0.0-20150217214814-ef862a3cdc58 // indirect
github.com/form3tech-oss/jwt-go v3.2.5+incompatible // indirect
github.com/gabriel-vasile/mimetype v1.4.0 // indirect
github.com/go-kit/kit v0.12.0 // indirect
github.com/go-logfmt/logfmt v0.5.1 // indirect
github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe // indirect
github.com/golang/protobuf v1.5.2 // indirect
Expand All @@ -50,15 +48,19 @@ require (
github.com/klauspost/compress v1.13.6 // indirect
github.com/mattn/go-ieproxy v0.0.1 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
github.com/pierrec/lz4/v4 v4.1.11 // indirect
github.com/paulmach/orb v0.7.1 // indirect
github.com/pierrec/lz4/v4 v4.1.14 // indirect
github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8 // indirect
github.com/prometheus/client_model v0.2.0 // indirect
github.com/prometheus/procfs v0.7.3 // indirect
github.com/satori/go.uuid v1.2.0 // indirect
github.com/shopspring/decimal v1.3.1 // indirect
github.com/sirupsen/logrus v1.8.1 // indirect
go.opentelemetry.io/otel v1.7.0 // indirect
go.opentelemetry.io/otel/trace v1.7.0 // indirect
golang.org/x/crypto v0.0.0-20211117183948-ae814b36b871 // indirect
golang.org/x/net v0.0.0-20211118161319-6a13c67c3ce4 // indirect
golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 // indirect
golang.org/x/sys v0.0.0-20220429233432-b5fbb4746d32 // indirect
golang.org/x/text v0.3.7 // indirect
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
google.golang.org/protobuf v1.27.1 // indirect
Expand Down
387 changes: 378 additions & 9 deletions go.sum

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion job.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"strings"
"time"

_ "github.com/ClickHouse/clickhouse-go" // register the ClickHouse driver
_ "github.com/ClickHouse/clickhouse-go/v2" // register the ClickHouse driver
"github.com/cenkalti/backoff"
_ "github.com/denisenkom/go-mssqldb" // register the MS-SQL driver
"github.com/go-kit/log"
Expand Down
20 changes: 0 additions & 20 deletions vendor/github.com/ClickHouse/clickhouse-go/.travis.yml

This file was deleted.

21 changes: 0 additions & 21 deletions vendor/github.com/ClickHouse/clickhouse-go/LICENSE

This file was deleted.

8 changes: 0 additions & 8 deletions vendor/github.com/ClickHouse/clickhouse-go/Makefile

This file was deleted.

Loading

0 comments on commit 96f1952

Please sign in to comment.