From ffacd27cfeb0f9f1e485953104557c316cacddd6 Mon Sep 17 00:00:00 2001 From: Hendrik Hofstadt Date: Mon, 3 Dec 2018 11:24:18 +0100 Subject: [PATCH] Update Tendermint --- Gopkg.lock | 44 +++++++++++++++++++------------------------- Gopkg.toml | 2 +- README.md | 8 +------- alerter/main.go | 35 ++++++++++++----------------------- main.go | 4 ---- net_exporter/main.go | 16 ++++++---------- 6 files changed, 39 insertions(+), 70 deletions(-) diff --git a/Gopkg.lock b/Gopkg.lock index 90c0e48..00d2189 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -25,11 +25,6 @@ revision = "8991bc29aa16c548c550c7ff78260e27b9ab7c73" version = "v1.1.1" -[[projects]] - name = "github.com/ebuchman/fail-test" - packages = ["."] - revision = "95f809107225be108efcf10a3509e4ea6ceef3c4" - [[projects]] branch = "master" name = "github.com/getsentry/raven-go" @@ -146,9 +141,11 @@ name = "github.com/prometheus/client_golang" packages = [ "prometheus", + "prometheus/internal", "prometheus/promhttp" ] - revision = "ae27198cdd90bf12cd134ad79d1366a6cf49f632" + revision = "abad2d1bd44235a26707c172eab6bca5bf2dbad3" + version = "v0.9.1" [[projects]] branch = "master" @@ -182,6 +179,12 @@ packages = ["."] revision = "e2704e165165ec55d062f5919b4b29494e9fa790" +[[projects]] + name = "github.com/rs/cors" + packages = ["."] + revision = "9a47f48565a795472d43519dd49aac781f3034fb" + version = "v1.6.0" + [[projects]] branch = "master" name = "github.com/syndtr/goleveldb" @@ -206,21 +209,11 @@ packages = ["btcec"] revision = "e5840949ff4fff0c56f9b6a541e22b63581ea9df" -[[projects]] - branch = "master" - name = "github.com/tendermint/ed25519" - packages = [ - ".", - "edwards25519", - "extra25519" - ] - revision = "d8387025d2b9d158cf4efb07e7ebf814bcce2057" - [[projects]] name = "github.com/tendermint/go-amino" packages = ["."] - revision = "faa6e731944e2b7b6a46ad202902851e8ce85bee" - version = "v0.12.0" + revision = "dc14acf9ef15f85828bfbc561ed9dd9d2a284885" + version = "v0.14.1" [[projects]] name = "github.com/tendermint/tendermint" @@ -247,6 +240,7 @@ "libs/common", "libs/db", "libs/events", + "libs/fail", "libs/flowrate", "libs/log", "libs/pubsub", @@ -256,14 +250,12 @@ "p2p", "p2p/conn", "p2p/pex", - "p2p/upnp", "privval", "proxy", "rpc/client", "rpc/core", "rpc/core/types", "rpc/grpc", - "rpc/lib", "rpc/lib/client", "rpc/lib/server", "rpc/lib/types", @@ -275,8 +267,8 @@ "types/time", "version" ] - revision = "d419fffe18531317c28c29a292ad7d253f6cafdf" - version = "v0.24.0" + revision = "44b769b1acd0b2aaa8c199b0885bc2811191fb2e" + version = "v0.27.0-dev1" [[projects]] branch = "master" @@ -285,11 +277,12 @@ revision = "58bfd21040084b3e377ef748e559e2bd3e7c826e" [[projects]] - branch = "master" name = "golang.org/x/crypto" packages = [ "chacha20poly1305", "curve25519", + "ed25519", + "ed25519/internal/edwards25519", "hkdf", "internal/chacha20", "internal/subtle", @@ -300,7 +293,8 @@ "ripemd160", "salsa20/salsa" ] - revision = "0e37d006457bf46f9e6692014ba72ef82c33022c" + revision = "3764759f34a542a3aef74d6b02e35be7ab893bba" + source = "github.com/tendermint/crypto" [[projects]] name = "golang.org/x/net" @@ -391,6 +385,6 @@ [solve-meta] analyzer-name = "dep" analyzer-version = 1 - inputs-digest = "ab514f3338aa3bcb40402417543121f6f7dcba16f6908cf92fcc6e5c9eafaf7b" + inputs-digest = "53d0d244965fe556de238b836eac5936e34476aee845aa0f5d309161f2646ba3" solver-name = "gps-cdcl" solver-version = 1 diff --git a/Gopkg.toml b/Gopkg.toml index c1e99f1..8348f88 100644 --- a/Gopkg.toml +++ b/Gopkg.toml @@ -27,7 +27,7 @@ [[constraint]] name = "github.com/tendermint/tendermint" - version = "0.24.0" + version = "0.27.0-dev1" [prune] go-tests = true diff --git a/README.md b/README.md index 937c521..fc6a2c4 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,5 @@ # chain_exporter -Metrics exporter and alerter tools for cosmos-sdk. - -[Subscribe to our newsletter](https://mailchi.mp/38ac109a9ab2/certusone) for updates on this project, -insights on the upcoming Game of Stakes and more. +Metrics exporter and alerter tools for cosmos-sdk ## chain_exporter @@ -12,7 +9,6 @@ Environment: ``` "GAIA_URL" = "http://gaia-node1:26657" # gaia URL "DB_HOST" = "postgres-chain:5432" # Postgres host:port -"DB_NAME" = "postgres" # DB name "DB_USER" = "postgres" # DB username "DB_PW"= "mypwd" # DB password "LCD_URL" = "https://gaia-lcd:1317" # gaia lcd URL @@ -27,7 +23,6 @@ Environment: ``` "GAIA_URLs" = "http://gaia-node0:26657,http://gaia-node1:26657" # gaia URLs (comma-separated) "DB_HOST" = "postgres-chain:5432" # Postgres host:port -"DB_NAME" = "postgres" # DB name "DB_USER" = "postgres" # DB username "DB_PW"= "mypwd" # DB password "PERIOD" = "10" # Period to save data in seconds @@ -41,7 +36,6 @@ Environment: ``` "DB_HOST" = "postgres-chain:5432" # Postgres host:port "DB_USER" = "postgres" # DB username -"DB_NAME" = "postgres" # DB name "DB_PW"= "mypwd" # DB password "RAVEN_DSN" = "http://xxxxxxx" # DSN_URL from Sentry (hosted or self-hosted) "ADDRESS" = "ABCDDED" # Address of the validator to alert on diff --git a/alerter/main.go b/alerter/main.go index b0abfe1..51ac2cf 100644 --- a/alerter/main.go +++ b/alerter/main.go @@ -23,9 +23,6 @@ func main() { if os.Getenv("DB_HOST") == "" { panic(errors.New("DB_HOST needs to be set")) } - if os.Getenv("DB_NAME") == "" { - panic(errors.New("DB_NAME needs to be set")) - } if os.Getenv("DB_USER") == "" { panic(errors.New("DB_USER needs to be set")) } @@ -45,7 +42,6 @@ func main() { // Connect to the postgres datastore db := pg.Connect(&pg.Options{ Addr: os.Getenv("DB_HOST"), - Database: os.Getenv("DB_NAME"), User: os.Getenv("DB_USER"), Password: os.Getenv("DB_PW"), }) @@ -55,30 +51,23 @@ func main() { monitor := &Monitor{db, os.Getenv("ADDRESS")} go func() { - for { - select { - // Check for alert conditions every second - case <-time.Tick(time.Second): - fmt.Println("start - alerting on misses") - err := monitor.AlertMisses() - if err != nil { - fmt.Printf("error - alerting on misses: %v\n", err) - } - fmt.Println("finish - alerting on misses") + for range time.Tick(time.Second) { + fmt.Println("start - alerting on misses") + err := monitor.AlertMisses() + if err != nil { + fmt.Printf("error - alerting on misses: %v\n", err) } + fmt.Println("finish - alerting on misses") } }() go func() { - for { - select { - case <-time.Tick(time.Second): - fmt.Println("start - alerting on governance") - err := monitor.AlertGovernance() - if err != nil { - fmt.Printf("error - alerting on governance: %v\n", err) - } - fmt.Println("finish - alerting on governance") + for range time.Tick(time.Second) { + fmt.Println("start - alerting on governance") + err := monitor.AlertGovernance() + if err != nil { + fmt.Printf("error - alerting on governance: %v\n", err) } + fmt.Println("finish - alerting on governance") } }() diff --git a/main.go b/main.go index 0eda65a..c5d203d 100644 --- a/main.go +++ b/main.go @@ -29,9 +29,6 @@ func main() { if os.Getenv("DB_HOST") == "" { panic(errors.New("DB_HOST needs to be set")) } - if os.Getenv("DB_NAME") == "" { - panic(errors.New("DB_NAME needs to be set")) - } if os.Getenv("DB_USER") == "" { panic(errors.New("DB_USER needs to be set")) } @@ -46,7 +43,6 @@ func main() { db := pg.Connect(&pg.Options{ Addr: os.Getenv("DB_HOST"), - Database: os.Getenv("DB_NAME"), User: os.Getenv("DB_USER"), Password: os.Getenv("DB_PW"), }) diff --git a/net_exporter/main.go b/net_exporter/main.go index bc59524..300d1ff 100644 --- a/net_exporter/main.go +++ b/net_exporter/main.go @@ -29,9 +29,6 @@ func main() { if os.Getenv("DB_HOST") == "" { panic(errors.New("DB_HOST needs to be set")) } - if os.Getenv("DB_NAME") == "" { - panic(errors.New("DB_NAME needs to be set")) - } if os.Getenv("DB_USER") == "" { panic(errors.New("DB_USER needs to be set")) } @@ -60,7 +57,6 @@ func main() { // Connect to the postgres datastore db := pg.Connect(&pg.Options{ Addr: os.Getenv("DB_HOST"), - Database: os.Getenv("DB_NAME"), User: os.Getenv("DB_USER"), Password: os.Getenv("DB_PW"), }) @@ -134,12 +130,12 @@ func (m *Monitor) CaptureNetData(client *client.HTTP, name string) error { data.Timestamp = timestamp data.Node = name - data.Channels = peer.Channels.String() - data.PeerID = string(peer.ID) - data.ListenAddr = peer.ListenAddr - data.Network = peer.Network - data.Version = peer.Version - data.Moniker = peer.Moniker + data.Channels = peer.NodeInfo.Channels.String() + data.PeerID = string(peer.NodeInfo.ID()) + data.ListenAddr = peer.NodeInfo.ListenAddr + data.Network = peer.NodeInfo.Network + data.Version = peer.NodeInfo.Version + data.Moniker = peer.NodeInfo.Moniker data.IsOutbound = peer.IsOutbound data.SendData = peer.ConnectionStatus.SendMonitor