Merge pull request #52 from filecoin-project/feat/dep/lotus-b8bbbf3e-…

…telegraf-cd895c0f dep: Update to lotus@b8bbbf3e, telegraf@cd895c0f
filecoin-project · Sep 1, 2020 · 39b63e2 · 39b63e2
2 parents eb1e054 + f80bf58
commit 39b63e2
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -19,6 +19,15 @@ services:
       - timescaledb
     volumes:
       - grafana-data:/var/lib/grafana/
+    environment:
+      GF_RENDERING_SERVER_URL: http://renderer:8081/render
+      GF_RENDERING_CALLBACK_URL: http://grafana:3000/
+      GF_LOG_FILTERS: rendering:debug
+
+  renderer:
+    image: grafana/grafana-image-renderer:latest
+    ports:
+      - 8081
 
 volumes:
   timescaledb:

diff --git a/lotus b/lotus
diff --git a/telegraf b/telegraf
+5 −2		.github/labels.yml
+55 −0		CHANGELOG.md
+4 −2		api/api_full.go
+12 −10		api/api_storage.go
+3 −1		api/api_worker.go
+16 −6		api/apistruct/struct.go
+2 −2		build/version.go
+4 −0		chain/beacon/beacon.go
+110 −47		chain/messagepool/messagepool.go
+12 −0		chain/messagepool/messagepool_test.go
+1 −1		chain/messagepool/repub.go
+30 −12		chain/messagepool/selection.go
+5 −0		chain/messagepool/selection_test.go
+1 −1		chain/stmgr/utils.go
+3 −1		chain/sub/incoming.go
+26 −1		chain/sync.go
+125 −74		cli/client.go
+17 −0		cli/cmd.go
+1 −1		cli/paych.go
+99 −11		cli/paych_test.go
+3 −1		cmd/lotus-chainwatch/processor/processor.go
+3 −2		cmd/lotus-chainwatch/syncer/blockssub.go
+21 −7		cmd/lotus-chainwatch/syncer/sync.go
+71 −0		cmd/lotus-seal-worker/info.go
+33 −2		cmd/lotus-seal-worker/main.go
+27 −2		cmd/lotus-seal-worker/rpc.go
+105 −0		cmd/lotus-seal-worker/storage.go
+10 −1		cmd/lotus-storage-miner/info.go
+9 −2		cmd/lotus-storage-miner/sealing.go
+2 −0		cmd/lotus-storage-miner/sectors.go
+10 −0		cmd/lotus/daemon.go
+42 −3		documentation/en/api-methods.md
+1 −1		documentation/en/api.md
+1 −1		documentation/en/mpool.md
+2 −2		extern/sector-storage/localworker.go
+14 −20		extern/sector-storage/manager.go
+5 −0		extern/sector-storage/request_queue.go
+6 −6		extern/sector-storage/resources.go
+134 −21		extern/sector-storage/sched.go
+21 −7		extern/sector-storage/sched_resources.go
+127 −2		extern/sector-storage/sched_test.go
+15 −9		extern/sector-storage/sealtasks/task.go
+1 −1		extern/sector-storage/selector_alloc.go
+1 −1		extern/sector-storage/selector_existing.go
+1 −1		extern/sector-storage/selector_task.go
+17 −1		extern/sector-storage/stats.go
+2 −1		extern/sector-storage/storiface/worker.go
+1 −1		extern/sector-storage/testworker_test.go
+82 −3		extern/storage-sealing/cbor_gen.go
+13 −1		extern/storage-sealing/checks.go
+164 −99		extern/storage-sealing/fsm.go
+39 −7		extern/storage-sealing/fsm_events.go
+11 −4		extern/storage-sealing/fsm_test.go
+1 −1		extern/storage-sealing/sealing.go
+7 −4		extern/storage-sealing/sector_state.go
+140 −1		extern/storage-sealing/states_failed.go
+40 −14		extern/storage-sealing/states_sealing.go
+13 −0		extern/storage-sealing/types.go
+4 −0		extern/storage-sealing/upgrade_queue.go
+4 −4		go.mod
+12 −4		go.sum
+7 −2		markets/storageadapter/provider.go
+31 −0		node/impl/client/client.go
+8 −13		node/impl/full/gas.go
+2 −34		node/impl/paych/paych.go
+7 −2		node/impl/storminer.go
+3 −1		node/modules/chain.go
+2 −2		node/modules/client.go
+7 −8		node/modules/lp2p/pubsub.go
+4 −3		node/modules/storageminer.go
+35 −1		paychmgr/cbor_gen.go
+8 −0		paychmgr/manager.go
+20 −0		paychmgr/mock_test.go
+102 −13		paychmgr/paych.go
+299 −7		paychmgr/paych_test.go
+2 −2		paychmgr/settler/settler.go
+72 −2		paychmgr/store.go
+1 −0		storage/sectorblocks/blocks.go