Support triton metrics #21
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
examples/triton/setup.sh
Outdated
|
|
||
| echo '# Prometheus discovery for Triton' > _env | ||
| echo TRITON_ACCOUNT=${TRITON_ACCOUNT} >> _env | ||
| echo TRITON_DC=${TRITON_DC} >> _env |
Contributor
There was a problem hiding this comment.
I was intentionally trying avoid DC-specific details in the _env file, that's why this was commented out in https://github.com/autopilotpattern/prometheus/pull/18/files#diff-86aea33913dc22bc9ba97b5f7b8c956eR102
examples/triton/setup.sh
Outdated
| echo >> _env | ||
|
|
||
| echo '# Consul discovery via Triton CNS' >> _env | ||
| echo CONSUL=prometheus-consul.svc.${TRITON_ACCOUNT}.${TRITON_DC}.cns.joyent.com >> _env |
Contributor
There was a problem hiding this comment.
This could use the new triton-docker helpers for the Consul address. See https://github.com/joyent/triton-docker-cli#notes-and-cautions-about-cns-env-vars and an example in https://github.com/autopilotpattern/nginx/blob/master/examples/triton/docker-compose.yml#L12
Contributor
Author
|
@misterbisson updated. |
Contributor
Author
|
@misterbisson ping, how does this current implementation look to you? |
6 tasks
misterbisson
reviewed
Jul 5, 2017
|
|
||
| # Consul is the service catalog | ||
| consul: | ||
| image: autopilotpattern/consul:0.7.2-r0.8 |
Contributor
There was a problem hiding this comment.
We'll need to update this one (https://github.com/autopilotpattern/consul/releases), but we can do that later: #22
double16
added a commit
to double16/autopilotpattern-prometheus
that referenced
this pull request
Dec 5, 2017
commit cb417d8 Author: Patrick Double <pat@patdouble.com> Date: Tue Dec 5 08:16:00 2017 -0600 prometheus 1.7.2 commit 367b28c Merge: e59e56c 7d3ac64 Author: Patrick Double <pat@patdouble.com> Date: Tue Dec 5 08:06:57 2017 -0600 Merge remote-tracking branch 'upstream/master' into node_exporter commit e59e56c Author: Patrick Double <pat@patdouble.com> Date: Tue Dec 5 06:58:02 2017 -0600 Fix service name of node-exporter commit f063d0d Author: Patrick Double <pat@patdouble.com> Date: Mon Dec 4 09:19:14 2017 -0600 Consul 1.0.1, Containerpilot 3.5.1 commit 7d3ac64 Merge: 73f0b8e c12497a Author: Justin Reagor <cheapRoc@users.noreply.github.com> Date: Thu Jul 20 10:29:44 2017 -0400 Merge pull request autopilotpattern#24 from autopilotpattern/b-patch-doc Quick doc fix under Triton example commit c12497a Author: Justin Reagor <justin.reagor@joyent.com> Date: Thu Jul 20 10:00:05 2017 -0400 Mention triton-compose in triton example docs commit 73f0b8e Merge: 03c07b4 34db0b5 Author: Wyatt Preul <wpreul@gmail.com> Date: Fri Jul 7 19:16:31 2017 -0600 Merge pull request autopilotpattern#21 from geek/triton Support triton metrics commit a265179 Author: Patrick Double <pat@patdouble.com> Date: Wed Jun 21 17:56:49 2017 -0500 Add docker health check commit e4d996b Author: Patrick Double <pat@patdouble.com> Date: Wed Jun 21 12:56:08 2017 -0500 Use default scrape interval of 15s commit 34db0b5 Author: geek <wpreul@gmail.com> Date: Fri Jun 16 13:02:46 2017 -0500 Support triton metrics commit 03c07b4 Merge: 2dcb716 dd98a75 Author: Wyatt Preul <wpreul@gmail.com> Date: Thu Jun 15 15:25:34 2017 -0500 Merge pull request autopilotpattern#20 from geek/master Support latest versions and consul agent commit dd98a75 Author: geek <wpreul@gmail.com> Date: Thu Jun 15 12:44:59 2017 -0500 Support latest versions and consul agent commit da9fddd Author: Patrick Double <pat@patdouble.com> Date: Tue Jun 13 17:02:19 2017 -0500 Add node_exporter service
This was referenced Dec 10, 2017
Closed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Carries #18, which carried #17, which intended to fix: #16, #8, and #5, and #19
Remaining for future PR: /tests and makefile