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

backport changes to upstream #39

Merged
merged 43 commits into from
Jun 21, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
8f9f9bd
Updating README.md
Dec 27, 2016
aa48f54
modulesync 0.16.7
bastelfreak Jan 4, 2017
f22f9c5
Merge pull request #1 from voxpupuli/modulesync
Jan 5, 2017
62f9329
Add Travis CI credentials
dhoppe Jan 5, 2017
4b8120b
Merge pull request #4 from dhoppe/modulesync
dhoppe Jan 7, 2017
a1a6481
Build fixes (#3)
Jan 10, 2017
6824b3b
Change 'staging' dependency to 'puppet/staging'
alexjfisher Jan 11, 2017
17e2651
Merge pull request #6 from alexjfisher/use_puppet_staging
dhoppe Jan 11, 2017
43b7251
Fixing forge badges to voxpupuli namespace
Jan 23, 2017
dde401f
Merge pull request #11 from james-powis/fix_readme_badges
juniorsysadmin Jan 23, 2017
1c39be9
Add a class for the HAProxy exporter (#10)
jghward Jan 31, 2017
98ee6c3
Update based on voxpupuli/modulesync_config 0.19.3 (#15)
dhoppe Feb 4, 2017
ffa8a74
modulesync 0.20.0
bastelfreak Feb 12, 2017
8c5cc83
delete unneeded spec.opts file
bastelfreak Feb 12, 2017
f3c31e9
Merge pull request #18 from voxpupuli/modulesync
sacres Feb 12, 2017
9560876
Add missing license
dhoppe Feb 3, 2017
0ac6b92
Add missing values
dhoppe Feb 3, 2017
1d369a8
Merge pull request #16 from dhoppe/license
alexjfisher Mar 5, 2017
1949521
modulesync 0.20.1
bastelfreak Mar 11, 2017
13e94b7
Merge pull request #19 from voxpupuli/modulesync
vinzent Mar 11, 2017
bce4528
Merge pull request #17 from dhoppe/metadata
bastelfreak Mar 12, 2017
db976b2
Add sane default values for `prometheus::daemon`
Jan 29, 2017
f996627
process-exporter (#14)
NairolfL Mar 13, 2017
f969e4e
Update metadata.json (#20)
Mar 13, 2017
d671842
Update to latest available versions
dhoppe Mar 26, 2017
f31a445
Merge pull request #22 from dhoppe/releases
bastelfreak Mar 26, 2017
f59f529
Migrate to archive module
dhoppe Mar 26, 2017
0508940
Merge pull request #23 from dhoppe/archive
bastelfreak Mar 26, 2017
2d07395
Bump version
dhoppe Mar 26, 2017
81acb4b
Merge pull request #25 from dhoppe/release
bastelfreak Mar 26, 2017
50f8dc4
Use same namespace for Prometheus and its components
dhoppe Mar 26, 2017
86ceaa3
Merge pull request #24 from dhoppe/daemon
bastelfreak Mar 26, 2017
de074ec
puppet-lint: fix arrow_on_right_operand_line
bastelfreak Mar 31, 2017
0148d7d
Merge pull request #27 from bastelfreak/puppet_lint
bastelfreak Mar 31, 2017
20e66d9
Reload alertmanager when config file changes
Apr 18, 2017
3ae81b3
Support alerting configuration for prometheus
steven-aerts May 10, 2017
fef3203
Reload Prometheus service instead of restarting
nikosmeds May 25, 2017
566bed3
Add service_name parameter for alertmanager
martin-koerner May 30, 2017
076d8ac
Merge pull request #1 from martin-koerner/alertmanager_service_name
martin-koerner May 30, 2017
00328b9
Merge pull request #33 from martin-koerner/master
bastelfreak Jun 21, 2017
cf518a3
Merge pull request #31 from byblakout/patch-1
bastelfreak Jun 21, 2017
b4cbb16
Merge pull request #30 from steven-aerts/alerting_config
bastelfreak Jun 21, 2017
388cb26
Merge pull request #29 from byblakout/alertmanager-configfile-reload
bastelfreak Jun 21, 2017
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .fixtures.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
fixtures:
repositories:
archive: "https://github.com/voxpupuli/puppet-archive"
stdlib: "https://github.com/puppetlabs/puppetlabs-stdlib"
staging: "https://github.com/nanliu/puppet-staging"
symlinks:
"prometheus": "#{source_dir}"
100 changes: 100 additions & 0 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,100 @@
This module has grown over time based on a range of contributions from
people using it. If you follow these contributing guidelines your patch
will likely make it into a release a little quicker.

## Contributing

Please note that this project is released with a Contributor Code of Conduct.
By participating in this project you agree to abide by its terms.
[Contributor Code of Conduct](https://voxpupuli.org/coc/).

1. Fork the repo.

1. Create a separate branch for your change.

1. Run the tests. We only take pull requests with passing tests, and
documentation.

1. Add a test for your change. Only refactoring and documentation
changes require no new tests. If you are adding functionality
or fixing a bug, please add a test.

1. Squash your commits down into logical components. Make sure to rebase
against the current master.

1. Push the branch to your fork and submit a pull request.

Please be prepared to repeat some of these steps as our contributors review
your code.

## Dependencies

The testing and development tools have a bunch of dependencies,
all managed by [bundler](http://bundler.io/) according to the
[Puppet support matrix](http://docs.puppetlabs.com/guides/platforms.html#ruby-versions).

By default the tests use a baseline version of Puppet.

If you have Ruby 2.x or want a specific version of Puppet,
you must set an environment variable such as:

export PUPPET_VERSION="~> 4.2.0"

Install the dependencies like so...

bundle install

## Syntax and style

The test suite will run [Puppet Lint](http://puppet-lint.com/) and
[Puppet Syntax](https://github.com/gds-operations/puppet-syntax) to
check various syntax and style things. You can run these locally with:

bundle exec rake lint
bundle exec rake validate

It will also run some [Rubocop](http://batsov.com/rubocop/) tests
against it. You can run those locally ahead of time with:

bundle exec rake rubocop

## Running the unit tests

The unit test suite covers most of the code, as mentioned above please
add tests if you're adding new functionality. If you've not used
[rspec-puppet](http://rspec-puppet.com/) before then feel free to ask
about how best to test your new feature.

To run your all the unit tests

bundle exec rake spec SPEC_OPTS='--format documentation'

To run a specific spec test set the `SPEC` variable:

bundle exec rake spec SPEC=spec/foo_spec.rb

To run the linter, the syntax checker and the unit tests:

bundle exec rake test

## Integration tests

The unit tests just check the code runs, not that it does exactly what
we want on a real machine. For that we're using
[beaker](https://github.com/puppetlabs/beaker).

This fires up a new virtual machine (using vagrant) and runs a series of
simple tests against it after applying the module. You can run this
with:

bundle exec rake acceptance

This will run the tests on an Ubuntu 12.04 virtual machine. You can also
run the integration tests against Centos 6.6 with.

BEAKER_set=centos-66-x64 bundle exec rake acceptances

If you don't want to have to recreate the virtual machine every time you
can use `BEAKER_DESTROY=no` and `BEAKER_PROVISION=no`. On the first run you will
at least need `BEAKER_PROVISION` set to yes (the default). The Vagrantfile
for the created virtual machines will be in `.vagrant/beaker_vagrant_fies`.
26 changes: 26 additions & 0 deletions .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
<!--
Thank you for contributing to this project!

- This project has a Contributor Code of Conduct: https://voxpupuli.org/coc/
- Please check that here is no existing issue or PR that addresses your problem.
- Please fill the following form to enable us to help you.
- Our vulnerabilities reporting process is at https://voxpupuli.org/security/

-->

## Affected Puppet, Ruby, OS and module versions/distributions

- Puppet:
- Ruby:
- Distribution:
- Module version:

## How to reproduce (e.g Puppet code you use)

## What are you seeing

## What behaviour did you expect instead

## Output log

## Any additional information you'd like to impart
8 changes: 8 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<!--
Thank you for contributing to this project!

- This project has a Contributor Code of Conduct: https://voxpupuli.org/coc/
- Please check that here is no existing issue or PR that addresses your problem.
- Our vulnerabilities reporting process is at https://voxpupuli.org/security/

-->
19 changes: 18 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,19 @@
pkg/
Gemfile.lock
spec/fixtures/modules/*
Gemfile.local
vendor/
.vendor/
spec/fixtures/manifests/
spec/fixtures/modules/
.vagrant/
.bundle/
.ruby-version
coverage/
log/
.idea/
.dependencies/
.librarian/
Puppetfile.lock
*.iml
.*.sw?
.yardoc/
1 change: 1 addition & 0 deletions .msync.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
modulesync_config_version: '0.20.1'
20 changes: 20 additions & 0 deletions .pmtignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
docs/
pkg/
Gemfile.lock
Gemfile.local
vendor/
.vendor/
spec/fixtures/manifests/
spec/fixtures/modules/
.vagrant/
.bundle/
.ruby-version
coverage/
log/
.idea/
.dependencies/
.librarian/
Puppetfile.lock
*.iml
.*.sw?
.yardoc/
2 changes: 2 additions & 0 deletions .rspec
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
--format documentation
--color
Loading