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

sysv, armv6/7 fixes #270

Merged
merged 12 commits into from
Feb 4, 2019
Merged

sysv, armv6/7 fixes #270

merged 12 commits into from
Feb 4, 2019

Conversation

defenestration
Copy link

Pull Request (PR) description

This adds support for armv6/7 releases.
Also on cent6 the 'service_provider' fact gets detected as 'redhat', added fixes to use this like sysv provider.

This Pull Request (PR) fixes the following issues

Fixes #268
Fixes #265

manifests/init.pp Outdated Show resolved Hide resolved
@bastelfreak
Copy link
Member

Hi @defenestration, thanks for the PR! Can you take a look at the failing spec tests?

@defenestration
Copy link
Author

I added additional commits to hopefully resolve the ruby tests, which seem to just complain about using double quotes in strings without variables.

@bastelfreak
Copy link
Member

The code looks fine and I'm unable to reproduce the issue locally. I rebased your branch. Let's see if this works now.

@bastelfreak
Copy link
Member

Now we have an actual failure. Can you please take a look at the travis issues?

@dhoppe
Copy link
Member

dhoppe commented Dec 3, 2018

@bastelfreak I think we need to update the fixtures, because the parameter -log.format has been moved to $daemon_flags.

"$DAEMON" -log.format logger:stdout -config.file=/etc/prometheus/prometheus.yaml \

"$DAEMON" -log.format logger:stdout --config.file=/etc/prometheus/prometheus.yaml \

@defenestration
Copy link
Author

I edited the file that the tests use to compare against, removing the -log.format option, which seems to have been the only issue.

One of the travis builds failed due to apt timing out, but I think it will pass if it is retried, which i can't seem to do.

@bastelfreak
Copy link
Member

I restarted the failed job

@bastelfreak bastelfreak added bug Something isn't working and removed tests-fail labels Feb 4, 2019
@bastelfreak bastelfreak merged commit 492d18f into voxpupuli:master Feb 4, 2019
@wiebe
Copy link

wiebe commented Feb 13, 2019

Support for ARMv5, 6 and 7 was already merged, there are double entries now in init.pp!

@bastelfreak
Copy link
Member

ups. Will provide a patch for this.

@bastelfreak
Copy link
Member

#295

cegeka-jenkins pushed a commit to cegeka/puppet-prometheus that referenced this pull request Aug 28, 2019
Rovanion pushed a commit to Rovanion/puppet-prometheus that referenced this pull request May 5, 2021
This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Pupppet sysv fails due to -log.format option Unable to force arch for installing exporter
5 participants