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.

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

Prometheus client #329

Merged
merged 2 commits into from
Nov 2, 2015
Merged

Prometheus client #329

merged 2 commits into from
Nov 2, 2015

Conversation

sparrc
Copy link
Contributor

@sparrc sparrc commented Oct 28, 2015

No description provided.

oldmantaiter and others added 2 commits October 28, 2015 15:28
- Adds a client implementation using the prometheus go_client library
  that exposes metrics.

- Adds a new type of output "ServiceOutput" which follows inline with
  the "ServicePlugin", adding a Stop and Start method for the service

This change also requires the newer prometheus/client_golang code, so
the prometheus plugin needed to be changed.

Added the following to Godep:
    - bitbucket.org/ww/goautoneg (in github.com/common/expfmt/encode.go)
    - prometheus/common/expfmt (in plugins/prometheus.go)
    - github.com/prometheus/common/model (in plugins/prometheus.go)
    - github.com/prometheus/procfs (in github.com/client_golang/prometheus)
    - github.com/beorn7/perks/quantile (in github.com/client_golang/prometheus)

X-Github-Meta: closes #306
@sparrc
Copy link
Contributor Author

sparrc commented Oct 28, 2015

@oldmantaiter I've changed the test so that the server gets started in the init() function to ensure that it will be started by the time the other tests start.

I've also changed the default to "localhost:9126"

Was there anything else you needed to add to this? Looks to be passing all unit tests now

@oldmantaiter
Copy link
Contributor

@sparrc Nope, that was it. Thank you very much for fixing up the tests, been a bit busy so didn't get the time to fix it myself.

@sparrc
Copy link
Contributor Author

sparrc commented Oct 29, 2015

fantastic, thanks again @oldmantaiter

@sparrc sparrc merged commit d2fb065 into master Nov 2, 2015
@sparrc sparrc deleted the prometheus-client branch November 2, 2015 18:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants