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

[consul] more accurate nodes_* and services_* gauges #2130

Merged
merged 6 commits into from
Dec 7, 2015
+271 −39
Merged

[consul] more accurate nodes_* and services_* gauges #2130

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e36321f
The consul.catalog.nodes_up should reflect the # of nodes actually up…
Oct 30, 2015
60f0d4d
Python 2.6 doesn't like the way I did the n.get
Oct 30, 2015
25037d8
Update the mock to reflect the new API call
Nov 2, 2015
ad30027
[consul] Separate services_* metrics
talwai Dec 7, 2015
b71d7a3
[consul] comment out non-required config
talwai Dec 7, 2015
687ad69
[consul] update tests for service status metrics
talwai Dec 7, 2015
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
Prev Previous commit
Next Next commit
Update the mock to reflect the new API call
@talwai
Mike Tougeron authored and talwai committed Dec 4, 2015

Verified

This commit was signed with the committer’s verified signature.
addaleax Anna Henningsen
GPG key ID: A94130F0BFC8EBE9
Verified
Learn about vigilant mode
commit 25037d8c16a16e4e5fb81a0c6fb359dd56126a99
34 changes: 25 additions & 9 deletions tests/checks/mock/test_consul.py
View file
Original file line number Diff line number Diff line change
@@ -121,15 +121,31 @@ def _get_random_ip():

return [
{
"Address": _get_random_ip(),
"Node": "node-1",
"ServiceAddress": "",
"ServiceID": service,
"ServiceName": service,
"ServicePort": 80,
"ServiceTags": [
"az-us-east-1a"
]
"Checks": [
{
"CheckID": "serfHealth",
"Name": "Serf Health Status",
"Node": "node-1",
"Notes": "",
"Output": "Agent alive and reachable",
"ServiceID": "",
"ServiceName": "",
"Status": "passing"
}
],
"Node": {
"Address": _get_random_ip(),
"Node": "node-1"
},
"Service": {
"Address": "",
"ID": service,
"Port": 80,
"Service": service,
"Tags": [
"az-us-east-1a"
]
}
}
]