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

Jump to bottom

feature/prometheus #31

Merged
merged 68 commits into from
Jul 11, 2018
Merged

feature/prometheus #31

merged 68 commits into from
Jul 11, 2018

Conversation

zhangyelong
Copy link
Contributor

add prometheus metrics

zhangzhiqiang and others added 30 commits June 20, 2018 10:48
update cosmos-sdk to v0.19.0
ddb015c
@zhangyelong
Merge pull request #11 from zhiqiang-bianjie/develop
7126c8c 
update cosmos-sdk to v0.19.0
update iris-hub to irishub
c2d5df7
update iris-hub to irishub
39b30a6
@zhangyelong
Merge pull request #12 from zhiqiang-bianjie/develop
7fe7401 
 update iris-hub to irishub
update iris version command
1ec9da2
@zhangyelong
Merge pull request #13 from zhiqiang-bianjie/develop
e2b1e3c 
update iris version command
update genesis
7278298
@zhangyelong
Merge pull request #14 from zhiqiang-bianjie/develop
15db17a 
update genesis
@zhangyelong
#DEVOPS-61 update README.md
2b3bcf8
@zhangyelong
#DEVOPS-64 configs for sandbox
b73ca80
@zhangyelong
#DEVOPS-64 update genesis.json
ee33fa5
@zhangyelong
#DEVOPS-64 add config for sandbox
0e67e6d
@zhangyelong
#DEVOPS-64 update config for sandbox
8cf2373
@zhangyelong
#DEVOPS-64 update config for sandbox
0d2970b
@zhangyelong
#DEVOPS-64 update config for sandbox
bf39d62
@zhangyelong
#DEVOPS-64 update config for sandbox
99f1060
@zhangyelong
#DEVOPS-64 fix start.sh for sandbox
1180fa2
@zhangyelong
#DEVOPS-64 update start-docker.sh & add README file
889faa9
Add offline signature API
86b7847
Add offline signature API（delegate,unbond）
271208e
Add offline signature API（delegate,unbond）
ef321e2
Merge branch 'develop' of https://github.com/irisnet/iris-hub into zh…
749fd86 
…iqiang/develop
Code optimization
194f234
@dreamer-zq
Add offline signature API (#16)
67105cd 
* Add offline signature API

* Add offline signature API（delegate,unbond）

* Add offline signature API（delegate,unbond）

* Code optimization
IRISHUB-9：Deals to send api adjusted by BroadcastTx to BroadcastTxAsync
ddc453f
@dreamer-zq
Merge branch 'develop' into develop
f8bc042
@zhangyelong
Merge pull request #17 from zhiqiang-bianjie/develop
25d832d 
Develop
IRISHUB-9：Deals to send api adjusted by BroadcastTx to BroadcastTxAsync
0ae4033
@zhangyelong
Merge pull request #18 from zhiqiang-bianjie/develop
0f5f907 
IRISHUB-9：Deals to send api adjusted by BroadcastTx to BroadcastTxAsync
programokey and others added 26 commits July 6, 2018 17:38
@programokey
Merge pull request #1 from irisnet/feature/prometheus
0c61031 
Feature/prometheus
@dreamer-zq
Merge pull request #1 from irisnet/feature/prometheus
093c5fd 
Feature/prometheus
@programokey
support multiple commands & files
0954ee9
IRISHUB-34：irishub添加prometheus监控功能(添加p2p,memo监控，系统监控)
031836f
@zhangyelong
Merge pull request #24 from zhiqiang-bianjie/feature/prometheus
5df114e 
IRISHUB-34：irishub添加prometheus监控功能(添加p2p,memo监控，系统监控)
IRISHUB-34：irishub添加prometheus监控功能(添加p2p,memo监控，系统监控)
9bdc080
@zhangyelong
Merge pull request #25 from zhiqiang-bianjie/feature/prometheus
3f7bcb3 
IRISHUB-34：irishub添加prometheus监控功能(添加p2p,memo监控，系统监控)
@programokey
Merge pull request #2 from irisnet/feature/prometheus
973d134 
Feature/prometheus
@programokey
Merge branch 'feature/prometheus' of https://github.com/programokey/i…
658c3c2 
…rishub into feature/prometheus

Conflicts:
	tools/prometheus/server.go
@programokey
update commands
27eee21
@programokey
add some test cases of system/Metrics
c0a3995
@programokey
add some test cases of system/metrics.go
7a02562
@programokey
add monitor terms of disk usage, and support monitoring directories a…
f05af8f 
…nd files
@programokey
IRISHUB-32 add monitor terms of disk usage
adaa8d1
IRISHUB-34：irishub添加prometheus监控指标:consensus_candidates
f598c1a
@zhangyelong
Merge pull request #26 from programokey/feature/prometheus
3c62306 
add monitor terms of system usage
@zhangyelong
Merge pull request #27 from zhiqiang-bianjie/feature/prometheus
0580a47 
IRISHUB-34：irishub添加prometheus监控指标:consensus_candidates
Code optimization
d1c241c
Code clear
9801bbe
@programokey
Merge pull request #3 from irisnet/feature/prometheus
5c76146 
Feature/prometheus
@zhangyelong
Merge pull request #28 from zhiqiang-bianjie/feature/prometheus
f294d54 
Code optimization
@programokey
Merge pull request #4 from irisnet/feature/prometheus
36c3ccf 
Feature/prometheus
@programokey
IRISHUB-32 fixed the bug in system/metrics and add app.DefaultHome to…
5a9ac07 
… parameter paths' default value
@zhangyelong
Merge pull request #29 from programokey/feature/prometheus
6b26352 
Feature/prometheus
Code optimization
16f3179
@zhangyelong
Merge pull request #30 from zhiqiang-bianjie/feature/prometheus
6fcbf64 
Code optimization
@zhangyelong zhangyelong merged commit 53ac635 into master Jul 11, 2018
@zhangyelong zhangyelong mentioned this pull request Jul 11, 2018
Merged
ka1fe1 pushed a commit to ka1fe1/irishub that referenced this pull request Nov 6, 2018
@zhangyelong
Merge pull request irisnet#31 from irisnet/feature/prometheus
f38106a 
feature/prometheus
Nimrostafarian pushed a commit to petri-labs/petrihub that referenced this pull request Jan 3, 2023
@javiersuweijie
Merge pull request irisnet#31 from terra-money/feat_testnet-scripts
97340b6 
feat: testnet scripts examples
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@zhangyelong @dreamer-zq @programokey