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

update haproxy exporter default to 0.9.0, fix options and allow unix … #280

Merged
merged 3 commits into from
Jan 16, 2019
Merged

update haproxy exporter default to 0.9.0, fix options and allow unix … #280

merged 3 commits into from
Jan 16, 2019

Conversation

dynek
Copy link

@dynek dynek commented Nov 20, 2018

Pull Request (PR) description

  • Update default haproxy exporter version from 0.7.1 (released on 2016-10-12) with 0.9.0 (released on 2018-01-23)
  • Fix options since they moved to kingping: prometheus/haproxy_exporter@cb544ab
  • Allow polling from Unix socket
  • Remove Stdlib::HTTPSUrl from Variants as Stdlib::HTTPUrl covers both http and httpS

@dynek
Copy link
Author

dynek commented Nov 20, 2018

Failed because of:

debian8-64-1 10:45:16$ cat /etc/resolv.conf
  Attempting ssh connection to 0.0.0.0, user: root, opts: {:password=>"root", :port=>"53", :forward_agent=>false}
  Warning: Try 1 -- Host 0.0.0.0 unreachable: Errno::ECONNRESET - Connection reset by peer
  Warning: Trying again in 3 seconds

@dynek dynek closed this Nov 21, 2018
@dynek dynek reopened this Nov 21, 2018
@dynek dynek closed this Nov 21, 2018
@dynek dynek reopened this Nov 21, 2018
@dynek dynek force-pushed the unix_socket_haproxy_exporter branch from 1333dac to 3c8adea Compare November 23, 2018 14:30
bastelfreak
bastelfreak reviewed Nov 26, 2018
View reviewed changes
manifests/haproxy_exporter.pp
@@ -73,15 +73,15 @@
# The binary release version

class prometheus::haproxy_exporter(
Variant[Stdlib::HTTPUrl, Stdlib::HTTPSUrl] $cnf_scrape_uri,
Variant[Stdlib::HTTPUrl, Pattern[/unix:(?:\/.+)+/]] $cnf_scrape_uri,
Copy link
Member

Choose a reason for hiding this comment

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

Copy link
Author

@dynek dynek Nov 26, 2018 •
edited
Loading

Choose a reason for hiding this comment

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

I removed https type because Stdlib::HTTPUrl covers both http and httpS, see https://github.com/puppetlabs/puppetlabs-stdlib#user-content-stdlibhttpurl

Copy link
Author

Choose a reason for hiding this comment

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

Unixpath doesn't work for path as it doesn't allow ":" in the pattern.
Example of what I'm currently using: unix:/var/lib/haproxy/stats

bastelfreak
bastelfreak reviewed Nov 26, 2018
View reviewed changes
data/defaults.yaml
@@ -110,7 +110,7 @@ prometheus::haproxy_exporter::group: 'haproxy-exporter'
prometheus::haproxy_exporter::package_ensure: 'latest'
prometheus::haproxy_exporter::package_name: 'haproxy_exporter'
prometheus::haproxy_exporter::user: 'haproxy-user'
prometheus::haproxy_exporter::version: '0.7.1'
prometheus::haproxy_exporter::version: '0.9.0'
Copy link
Member

Choose a reason for hiding this comment

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

can you please add an acceptance test that first explictly installs 0.7.1 and afterwards upgrades it to 0.9.0? We already have a few tests in this repo that do the same for other exporters.

Copy link
Author

Choose a reason for hiding this comment

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

Makes sense. I'll check this asap.

@bastelfreak
Copy link
Member

Hi @dynek, thanks for the PR. Can you take a look at the used email address in your commits? It isn't associated with your github account.

@dynek dynek force-pushed the unix_socket_haproxy_exporter branch from 3c8adea to aa8dac7 Compare November 26, 2018 12:51
@dynek
Copy link
Author

dynek commented Nov 26, 2018

Hi @dynek, thanks for the PR. Can you take a look at the used email address in your commits? It isn't associated with your github account.

My bad - Is it OK for you now?

@dynek dynek force-pushed the unix_socket_haproxy_exporter branch from ae57e15 to 14cd466 Compare January 3, 2019 10:02
@dynek
Copy link
Author

dynek commented Jan 3, 2019

@bastelfreak finally added acceptance tests but all CI tests are failing because The program 'bundle' is currently not installed

@Dan33l
Copy link
Member

Dan33l commented Jan 3, 2019

@bastelfreak finally added acceptance tests but all CI tests are failing because The program 'bundle' is currently not installed

Yes it looks a travis issue. Several modules are concerned by this issue.

@dynek dynek closed this Jan 7, 2019
@dynek dynek reopened this Jan 7, 2019
@dynek dynek closed this Jan 8, 2019
@dynek dynek reopened this Jan 8, 2019
@dynek dynek closed this Jan 9, 2019
@dynek dynek reopened this Jan 9, 2019
@dynek
Copy link
Author

dynek commented Jan 9, 2019

There we go, checks have passed.

@dynek
Copy link
Author

dynek commented Jan 16, 2019

@bastelfreak anything else I can do?

@bastelfreak
Copy link
Member

Thanks for the PR @dynek !

@bastelfreak bastelfreak merged commit 5f42675 into voxpupuli:master Jan 16, 2019
@dynek dynek deleted the unix_socket_haproxy_exporter branch January 17, 2019 09:16
cegeka-jenkins pushed a commit to cegeka/puppet-prometheus that referenced this pull request Aug 28, 2019
@bastelfreak
Merge pull request voxpupuli#280 from dynek/unix_socket_haproxy_exporter
e239b0c 
update haproxy exporter default to 0.9.0, fix options and allow unix …
Rovanion pushed a commit to Rovanion/puppet-prometheus that referenced this pull request May 5, 2021
@bastelfreak
Merge pull request voxpupuli#280 from dynek/unix_socket_haproxy_exporter
eaf2dc0 
update haproxy exporter default to 0.9.0, fix options and allow unix …
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bastelfreak bastelfreak bastelfreak left review comments

Assignees
No one assigned
Labels
backwards-incompatible
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@dynek @bastelfreak @Dan33l