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 #33

Merged
merged 34 commits into from
Jul 11, 2018
Merged

feature/prometheus #33

merged 34 commits into from
Jul 11, 2018

Conversation

zhangyelong
Copy link
Contributor

add prometheus metrics

zhangzhiqiang and others added 30 commits July 6, 2018 12:01
IRISHUB-34：irishub添加prometheus监控功能
f1897a1
@zhangyelong
Merge pull request #21 from zhiqiang-bianjie/feature/prometheus
4863118 
IRISHUB-34：irishub添加prometheus监控功能
@programokey
add some system monitor terms
4d96b0f
@programokey
add some system monitor terms
95d824b
@programokey
add some system monitor terms
2af5d36
@zhangyelong
Merge pull request #22 from programokey/feature/prometheus
2b738fe 
Feature/prometheus
@programokey
add some system monitor terms
08ae941
@zhangyelong
Merge pull request #23 from programokey/feature/prometheus
7ed2a60 
add some system monitor terms
@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
@zhangyelong zhangyelong merged commit b91a0ef into develop Jul 11, 2018
ka1fe1 pushed a commit to ka1fe1/irishub that referenced this pull request Nov 6, 2018
@zhangyelong
Merge pull request irisnet#33 from irisnet/feature/prometheus
56b347c 
feature/prometheus
Nimrostafarian pushed a commit to petri-labs/petrihub that referenced this pull request Jan 3, 2023
@javiersuweijie
Merge pull request irisnet#33 from terra-money/fix_test
83d6840 
feat: fix tests based on changes from Proposals
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 @programokey @dreamer-zq