Skip to content

Support latest versions and consul agent #20

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
Merged
geek merged 1 commit into from
Jun 15, 2017
Merged

Support latest versions and consul agent #20

geek merged 1 commit into from
Jun 15, 2017

Conversation

@geek
Copy link
Contributor

@geek geek commented Jun 15, 2017

No description provided.

tgross
tgross reviewed Jun 15, 2017
View reviewed changes
etc/containerpilot.json
"-config-dir=/config",
"-log-level=err",
"-rejoin",
"-retry-join", "{{ .CONSUL | default "consul" }}",
Copy link
Contributor

@tgross tgross Jun 15, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This assumes that we always have a Consul agent inside the container, which we need on Triton certainly but not when users reuse this blueprint in non-Triton environments.

Copy link

@jwreagor jwreagor Jun 15, 2017 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Now I get it. I've been wondering why you (@tgross) place a conditional around the consul agent.

jwreagor
jwreagor reviewed Jun 15, 2017
View reviewed changes
Copy link

@jwreagor jwreagor left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just a few comments, nothing earth shattering.

Dockerfile
&& curl -Lso /tmp/${prom}.tar.gz https://github.com/prometheus/prometheus/releases/download/v1.3.0/${prom}.tar.gz \
RUN export PROM_VERSION=1.7.1 \
&& export prom=prometheus-${PROM_VERSION}.linux-amd64 \
&& curl -Lso /tmp/${prom}.tar.gz https://github.com/prometheus/prometheus/releases/download/v${PROM_VERSION}/${prom}.tar.gz \
Copy link

@jwreagor jwreagor Jun 15, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd probably download this archive and manually create a sha256sum checksum just to be thorough. You can follow the same pattern as Consul below this.

etc/containerpilot.json
"-config-dir=/config",
"-log-level=err",
"-rejoin",
"-retry-join", "{{ .CONSUL | default "consul" }}",
Copy link

@jwreagor jwreagor Jun 15, 2017 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Now I get it. I've been wondering why you (@tgross) place a conditional around the consul agent.

@geek geek force-pushed the master branch 2 times, most recently from 76c12b4 to b15ac44 Compare June 15, 2017 20:03
@tgross
Copy link
Contributor

tgross commented Jun 15, 2017

LGTM.

@geek
Copy link
Contributor Author

geek commented Jun 15, 2017

@cheapRoc good to go, also checked consul-template, we weren't before

@geek geek merged commit 03c07b4 into autopilotpattern:master Jun 15, 2017
@geek geek self-assigned this Jun 15, 2017
@misterbisson
Copy link
Contributor

misterbisson commented Jun 16, 2017

This, sadly, created a bunch of conflicts for #18

double16 added a commit to double16/autopilotpattern-prometheus that referenced this pull request Dec 5, 2017
@double16
Squashed commit of the following:
b433ca0 
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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

2 more reviewers

@jwreagor jwreagor jwreagor left review comments

@tgross tgross tgross left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

@geek geek

Labels

enhancement

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@geek @tgross @misterbisson @jwreagor