Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: voxpupuli/puppet-telegraf
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 1.2.1
Choose a base ref
...
head repository: voxpupuli/puppet-telegraf
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 1.3.0
Choose a head ref
  • 9 commits
  • 12 files changed
  • 4 contributors

Commits on May 10, 2016

  1. Update input.pp to use the $name variable 

    The plugin_type variable should be defaulted to the name of the resource.
    @lswith
    lswith committed May 10, 2016
    Configuration menu
    Copy the full SHA
    fca36b3 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #23 from Lswith/patch-2 

    Update input.pp to use the $name variable
    @yankcrime
    yankcrime committed May 10, 2016
    Configuration menu
    Copy the full SHA
    2f7e29a View commit details
    Browse the repository at this point in the history

  3. Housekeeping - update .gitignore and Travis CI configuration

    @yankcrime
    yankcrime committed May 10, 2016
    Configuration menu
    Copy the full SHA
    9d04a12 View commit details
    Browse the repository at this point in the history

Commits on May 12, 2016

  1. Updates to Gemfile and (hopefully) fix Travis CI

    @yankcrime
    yankcrime committed May 12, 2016
    Configuration menu
    Copy the full SHA
    88b431b View commit details
    Browse the repository at this point in the history

Commits on May 25, 2016

  1. Update input.conf.erb to handle more than strings (#22) 

    * Update input.conf.erb to handle more than strings

This change is a repeat of what is going on in the other template file.

* Update input.conf.erb
    @lswith @yankcrime
    lswith authored and yankcrime committed May 25, 2016
    Configuration menu
    Copy the full SHA
    26cca5a View commit details
    Browse the repository at this point in the history

  2. Support merging configuration from multiple files (#25) 

    * support hiera configs merging

* code formatting

* update readme

* use deeper merging
    @deric @yankcrime
    deric authored and yankcrime committed May 25, 2016
    Configuration menu
    Copy the full SHA
    bf45b4b View commit details
    Browse the repository at this point in the history

Commits on Jun 1, 2016

  1. Fix hiera_merge behavior (#28) 

    Fixes #27. This wasn't implemented correctly in #25. The `$telegraf::params::inputs` and `$telegraf::params::outputs` values are never read because they are only provided as a default value.
    @joshuaspence @yankcrime
    joshuaspence authored and yankcrime committed Jun 1, 2016
    Configuration menu
    Copy the full SHA
    627c93e View commit details
    Browse the repository at this point in the history

  2. Fix telegraf::input template options variable lookup (#29) 

    This commit fixes the error to do with qualifying the `options` variable
when undef'd.  This allows for an input to be defined with just a
`plugin_type`.

It also adds a test for this behaviour.

Fixes #24.
    @yankcrime
    yankcrime committed Jun 1, 2016
    Configuration menu
    Copy the full SHA
    ca88d18 View commit details
    Browse the repository at this point in the history

Commits on Jun 2, 2016

  1. Housekeeping - typos, bump version to 1.3 (#30)

    @yankcrime
    yankcrime committed Jun 2, 2016
    Configuration menu
    Copy the full SHA
    cf57e03 View commit details
    Browse the repository at this point in the history
Loading