Skip to content
This repository has been archived by the owner on Jun 7, 2019. It is now read-only.

Vendor packages related to "Thanos" and "Prometheus" updated #1

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Gopkg.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions runnable/flags.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ func regCommonServerFlags(cmd *kingpin.CmdClause) (
grpcTLSSrvCert *string,
grpcTLSSrvKey *string,
grpcTLSSrvClientCA *string,
peerFunc func(log.Logger, *prometheus.Registry, bool, string, bool) (*cluster.Peer, error)) {
peerFunc func(log.Logger, *prometheus.Registry, bool, string, bool) (cluster.Peer, error)) {

grpcBindAddr = cmd.Flag("grpc-address", "Listen ip:port address for gRPC endpoints (StoreAPI). Make sure this address is routable from other components if you use gossip, 'grpc-advertise-address' is empty and you require cross-node connection.").
Default("0.0.0.0:10901").String()
Expand Down Expand Up @@ -68,7 +68,7 @@ func regCommonServerFlags(cmd *kingpin.CmdClause) (
grpcTLSSrvCert,
grpcTLSSrvKey,
grpcTLSSrvClientCA,
func(logger log.Logger, reg *prometheus.Registry, waitIfEmpty bool, httpAdvertiseAddr string, queryAPIEnabled bool) (*cluster.Peer, error) {
func(logger log.Logger, reg *prometheus.Registry, waitIfEmpty bool, httpAdvertiseAddr string, queryAPIEnabled bool) (cluster.Peer, error) {
host, port, err := cluster.CalculateAdvertiseAddress(*grpcBindAddr, *grpcAdvertiseAddr)
if err != nil {
return nil, errors.Wrapf(err, "calculate advertise StoreAPI addr for gossip based on bindAddr: %s and advAddr: %s", *grpcBindAddr, *grpcAdvertiseAddr)
Expand Down
10 changes: 5 additions & 5 deletions runnable/receiver.go
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ func RunReceiver(
httpMetricsBindAddr string,
remoteWriteAddress string,
dataDir string,
peer *cluster.Peer,
peer cluster.Peer,
component string,
) error {
level.Info(logger).Log("msg", "setting up receiver")
Expand All @@ -86,10 +86,10 @@ func RunReceiver(
}

tsdbCfg := &tsdb.Options{
Retention: model.Duration(time.Hour * 24 * 15),
NoLockfile: true,
MinBlockDuration: model.Duration(time.Hour * 2),
MaxBlockDuration: model.Duration(time.Hour * 2),
RetentionDuration: model.Duration(time.Hour * 24 * 15),
NoLockfile: true,
MinBlockDuration: model.Duration(time.Hour * 2),
MaxBlockDuration: model.Duration(time.Hour * 2),
}

ctxWeb, cancelWeb := context.WithCancel(context.Background())
Expand Down
133 changes: 7 additions & 126 deletions vendor/github.com/improbable-eng/thanos/pkg/block/block.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading