Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bump dependencies #227

Merged
merged 7 commits into from
Oct 28, 2020
Merged

bump dependencies #227

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a51e210
bump dependencies
rfratto Oct 27, 2020
cae7367
fix issue where tempo config was expecting remote_write over push_config
rfratto Oct 27, 2020
d2d18bc
update CHANGELOG
rfratto Oct 27, 2020
0643137
fix tests I broke :)
rfratto Oct 27, 2020
cc453e0
address review feedback
rfratto Oct 28, 2020
136ffb5
reference new prometheus service discovery mechanisms
rfratto Oct 28, 2020
340351f
address feedback
rfratto Oct 28, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
9 changes: 9 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,17 @@ NOTE: FreeBSD builds will not be included for this release. There is a bug in an
upstream library preventing cross-compilation of the Grafana Cloud Agent for
this platform. FreeBSD builds will return in a future release.

- [ENHANCEMENT] Bump Prometheus dependency to 2.21. (@rfratto)

- [ENHANCEMENT] Bump OpenTelemetry-collector dependency to 0.13.0 (@rfratto)

- [ENHANCEMENT] Bump Promtail dependency to 2.0. (@rfratto)

- [BUGFIX] Fix deb package prerm script so that it stops the agent on package removal. (@jdbaldry)

- [BUGFIX] Fix issue where the `push_config` for Tempo field was expected to be
`remote_write`. `push_config` now works as expected. (@rfratto)

# v0.7.1 (2020-10-23)

NOTE: FreeBSD builds will not be included for this release. There is a bug in an
Expand Down
363 changes: 358 additions & 5 deletions docs/configuration-reference.md
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 0 additions & 2 deletions example/docker-compose/agent/config/agent.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,5 +75,3 @@ tempo:
batch:
timeout: 5s
send_batch_size: 100
queue:
retry_on_failure: true
92 changes: 46 additions & 46 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,70 +3,70 @@ module github.com/grafana/agent
go 1.12

require (
contrib.go.opencensus.io/exporter/prometheus v0.2.0
github.com/cortexproject/cortex v1.2.1-0.20200803161316-7014ff11ed70
github.com/go-kit/kit v0.10.0
github.com/gogo/protobuf v1.3.1
github.com/golang/protobuf v1.4.2
github.com/gorilla/mux v1.8.0
github.com/grafana/loki v1.6.1
github.com/jsternberg/zap-logfmt v1.2.0
github.com/ncabatoff/process-exporter v0.0.0-00010101000000-000000000000
github.com/oklog/run v1.1.0
github.com/olekukonko/tablewriter v0.0.2
github.com/oliver006/redis_exporter v1.12.0
github.com/opentracing-contrib/go-grpc v0.0.0-20191001143057-db30781987df
github.com/opentracing/opentracing-go v1.2.0
github.com/pkg/errors v0.9.1
github.com/prometheus/client_golang v1.7.1
github.com/prometheus/common v0.11.1
github.com/prometheus/mysqld_exporter v0.0.0-00010101000000-000000000000
github.com/prometheus/node_exporter v1.0.1
github.com/prometheus/procfs v0.1.3
github.com/prometheus/prometheus v1.8.2-0.20200727090838-6f296594a852
github.com/sirupsen/logrus v1.7.0
github.com/spf13/cobra v1.0.0
github.com/spf13/viper v1.7.1
github.com/stretchr/testify v1.6.1
github.com/weaveworks/common v0.0.0-20200625145055-4b1847531bc9
go.opencensus.io v0.22.3
go.opentelemetry.io/collector v0.6.1
go.uber.org/atomic v1.6.0
go.uber.org/zap v1.14.1
google.golang.org/grpc v1.31.0
gopkg.in/alecthomas/kingpin.v2 v2.2.6
gopkg.in/yaml.v2 v2.3.0
contrib.go.opencensus.io/exporter/prometheus v0.2.0
github.com/cortexproject/cortex v1.4.1-0.20201022071705-85942c5703cf
github.com/go-kit/kit v0.10.0
github.com/gogo/protobuf v1.3.1
github.com/golang/protobuf v1.4.2
github.com/gorilla/mux v1.8.0
github.com/grafana/loki v1.6.2-0.20201026154740-6978ee5d7387
github.com/hashicorp/yamux v0.0.0-20190923154419-df201c70410d
github.com/jsternberg/zap-logfmt v1.2.0
github.com/ncabatoff/process-exporter v0.0.0-00010101000000-000000000000
github.com/oklog/run v1.1.0
github.com/olekukonko/tablewriter v0.0.2
github.com/oliver006/redis_exporter v1.12.0
github.com/opentracing-contrib/go-grpc v0.0.0-20191001143057-db30781987df
github.com/opentracing/opentracing-go v1.2.0
github.com/pkg/errors v0.9.1
github.com/prometheus/client_golang v1.7.1
github.com/prometheus/common v0.14.0
github.com/prometheus/mysqld_exporter v0.0.0-00010101000000-000000000000
github.com/prometheus/node_exporter v1.0.1
github.com/prometheus/procfs v0.1.3
github.com/prometheus/prometheus v1.8.2-0.20201014093524-73e2ce1bd643
github.com/sirupsen/logrus v1.7.0
github.com/spf13/cobra v1.0.0
github.com/spf13/viper v1.7.1
github.com/stretchr/testify v1.6.1
github.com/weaveworks/common v0.0.0-20200914083218-61ffdd448099
go.opencensus.io v0.22.4
go.opentelemetry.io/collector v0.13.0
go.uber.org/atomic v1.7.0
go.uber.org/zap v1.16.0
google.golang.org/grpc v1.32.0
gopkg.in/alecthomas/kingpin.v2 v2.2.6
gopkg.in/yaml.v2 v2.3.0
)

// Needed for Cortex's dependencies to work properly.
replace (
github.com/sercand/kuberesolver => github.com/sercand/kuberesolver v2.1.0+incompatible
go.etcd.io/etcd => go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738
google.golang.org/api => google.golang.org/api v0.14.0
google.golang.org/grpc => google.golang.org/grpc v1.25.1
k8s.io/client-go => k8s.io/client-go v0.18.5
go.etcd.io/etcd => go.etcd.io/etcd v0.5.0-alpha.5.0.20200520232829-54ba9589114f
google.golang.org/api => google.golang.org/api v0.14.0
google.golang.org/grpc => google.golang.org/grpc v1.29.1
k8s.io/client-go => k8s.io/client-go v0.18.5
)

// Replace directives from Prometheus
replace k8s.io/klog => github.com/simonpasquier/klog-gokit v0.1.0

// Replace directives from Cortex
replace (
git.apache.org/thrift.git => github.com/apache/thrift v0.0.0-20180902110319-2566ecd5d999
github.com/gocql/gocql => github.com/grafana/gocql v0.0.0-20200605141915-ba5dc39ece85
github.com/hpcloud/tail => github.com/grafana/tail v0.0.0-20191024143944-0b54ddf21fe7
github.com/satori/go.uuid => github.com/satori/go.uuid v1.2.0
git.apache.org/thrift.git => github.com/apache/thrift v0.0.0-20180902110319-2566ecd5d999
github.com/gocql/gocql => github.com/grafana/gocql v0.0.0-20200605141915-ba5dc39ece85
github.com/hpcloud/tail => github.com/grafana/tail v0.0.0-20191024143944-0b54ddf21fe7
github.com/satori/go.uuid => github.com/satori/go.uuid v1.2.0
)

replace github.com/prometheus/prometheus => github.com/grafana/prometheus v1.8.2-0.20200821135656-2efe42db3b77
replace github.com/prometheus/prometheus => github.com/grafana/prometheus v1.8.2-0.20201021200247-cf00050ed1e9

replace gopkg.in/yaml.v2 => github.com/rfratto/go-yaml v0.0.0-20200521142311-984fc90c8a04

// TODO(rfratto): remove forks when changes are merged upstream
replace (
github.com/ncabatoff/process-exporter => github.com/grafana/process-exporter v0.7.3-0.20200902205007-6343dc1182cf
github.com/oliver006/redis_exporter => github.com/grafana/redis_exporter v1.13.0
github.com/prometheus/mysqld_exporter => github.com/grafana/mysqld_exporter v0.12.2-0.20201015182516-5ac885b2d38a
github.com/ncabatoff/process-exporter => github.com/grafana/process-exporter v0.7.3-0.20200902205007-6343dc1182cf
github.com/oliver006/redis_exporter => github.com/grafana/redis_exporter v1.13.0
github.com/prometheus/mysqld_exporter => github.com/grafana/mysqld_exporter v0.12.2-0.20201015182516-5ac885b2d38a
)

// Required for redis_exporter, which is incompatible with v2.0.0+incompatible.
Expand Down
Loading