diff --git a/.travis.yml b/.travis.yml index a344ecf..bb8adfd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,23 +1,19 @@ --- language: ruby bundler_args: --without development before_install: rm Gemfile.lock || true rvm: - 1.9.3 - - 2.1.0 + - 2.0.0 + - 2.1.4 env: - - PUPPET_VERSION="~> 3.2.0" - PUPPET_VERSION="~> 3.3.0" - - PUPPET_VERSION="~> 3.4.0" - - PUPPET_VERSION="~> 3.5.0" - - PUPPET_VERSION="~> 3.6.0" - PUPPET_VERSION="~> 3.7.0" + - PUPPET_VERSION="~> 3.7.0" FUTURE_PARSER="yes" matrix: exclude: - - rvm: 2.1.0 - env: PUPPET_VERSION="~> 3.2.0" - - rvm: 2.1.0 + - rvm: 2.1.4 + env: PUPPET_VERSION="~> 3.3.0" + - rvm: 2.1.4 env: PUPPET_VERSION="~> 3.3.0" - - rvm: 2.1.0 - env: PUPPET_VERSION="~> 3.4.0" script: bundle exec rake spec diff --git a/CHANGELOG b/CHANGELOG.md similarity index 95% rename from CHANGELOG rename to CHANGELOG.md index bd09f82..1a7e933 100644 --- a/CHANGELOG +++ b/CHANGELOG.md @@ -1,121 +1,128 @@ # Changelog +## 0.0.8 - 2015-02-06 + +Support the future parser. + +Contributors to this release: Rike-Benjamin Schuppner, Stig Sandbeck +Mathisen + ## 0.0.7 - 2014-12-05 This release adds support for DragonFly BSD, FreeBSD, OpenBSD. Other changes listed below, per component. Contributors to this release: Alex Hornung, Chris Roddy, Frank Groeneveld, Fredrik Thulin, Julien Pivotto, Martin Jackson, Sebastian Wiesinger, Stig Sandbeck Mathisen ### munin::node * Add "host_name" parameter to override the host name of the munin node. * Add "file_group" parameter, used for configuration and log files. * Add "log_dir" parameter. * Improved handling of "allow" ACL parameter. ### munin::master * Improved collection logic. Set "collect_nodes" to "mine" to collect nodes which are targeted for this master, or "unclaimed" to pick up nodes not aimed a specific master. * Add global tls_* parameters for connecting to nodes. * Add "dbdir", "htmldir", "rundir" parameters. * Add "extra_config" parameter, which takes an array of extra configuration lines for munin.conf. ### munin::plugin * Support absolute paths as target for a plugin. ## 0.0.6 - 2014-12-05 * Retracted, had a breaking bug on older (3.4.x) puppet versions. ## 0.0.5 - 2014-03-19 * Support multiple masters with different nodes (Thanks: Cristian Gae) * Support older (1.4.6) munin versions (Thanks: Sergio Oliveira) * Update for compatibility with puppet 3.4 (Thanks: Harald Skoglund) * Easier configuration with more parameters. All parameters have trivial validation. ### munin::master - new parameter "config_root". Defaults should match supported operating systems. ### munin::plugin - new parameter "config_root". Defaults should match supported operating systems. ### munin::node - new parameter "address". Default is $::fqdn. This will be used as the "address" when registering with the munin master. - new parameter "config_root". Defaults should match supported operating systems. - new parameter "package_name". Default should match supported operating systems. - new parameter "service_name". Default should match supported operating systems. - new parameter "service_ensure". Default is "". Possible values: "", "running" or "stopped". ### munin::params - new class ## 0.0.4 - 2013-08-13 Bugfix for the munin::plugin define. - Bugfix: Ensure that we can run tests on ruby 1.8. - Bugfix: No longer requires the class `Munin::Plugins`, which does not exist in this module. ([#3](https://github.com/ssm/ssm-munin/issues/3)) - The `ensure` attribute no longer defaults to "link". If not set, a potentially existing plugin with the same name is not touched. - Plugin and configuration directories are now configurable. - Improved rspec tests, which now actually match the documentation. ## 0.0.2 - 2013-06-31 A few pull requests - Bugfix: Install munin package before creating munin-conf.d directory ([#1](https://github.com/ssm/ssm-munin/pull/1)) - Make graph strategy configurable ([#2](https://github.com/ssm/ssm-munin/pull/2)) - Improve documentation ## 0.0.1 - 2013-06-02 Initial release diff --git a/manifests/params/node.pp b/manifests/params/node.pp index 0f736d5..587733a 100644 --- a/manifests/params/node.pp +++ b/manifests/params/node.pp @@ -1,70 +1,70 @@ class munin::params::node { $message = "Unsupported osfamily: ${::osfamily}" $address = $::fqdn $host_name = $::fqdn $allow = [] $masterconfig = [] $mastergroup = '' $mastername = '' $nodeconfig = [] $plugins = {} $service_ensure = '' $export_node = 'enabled' case $::osfamily { - RedHat: { + 'RedHat': { $config_root = '/etc/munin' $log_dir = '/var/log/munin-node' $service_name = 'munin-node' $package_name = 'munin-node' $plugin_share_dir = '/usr/share/munin/plugins' $file_group = 'root' } - Debian: { + 'Debian': { $config_root = '/etc/munin' $log_dir = '/var/log/munin' $service_name = 'munin-node' $package_name = 'munin-node' $plugin_share_dir = '/usr/share/munin/plugins' $file_group = 'root' } - Solaris: { + 'Solaris': { case $::operatingsystem { - SmartOS: { + 'SmartOS': { $config_root = '/opt/local/etc/munin' $log_dir = '/var/opt/log/munin' $service_name = 'smf:/munin-node' $package_name = 'munin-node' $plugin_share_dir = '/opt/local/share/munin/plugins' $file_group = 'root' } default: { fail("Unsupported operatingsystem ${::operatingsystem} for osfamily ${::osfamily}") } } } - FreeBSD, DragonFly: { + 'FreeBSD', 'DragonFly': { $config_root = '/usr/local/etc/munin' $log_dir = '/var/log/munin' $service_name = 'munin-node' $package_name = 'munin-node' $plugin_share_dir = '/usr/local/share/munin/plugins' $file_group = 'wheel' } - OpenBSD: { + 'OpenBSD': { $config_root = '/etc/munin' $log_dir = '/var/log/munin' $service_name = 'munin_node' $package_name = 'munin-node' $plugin_share_dir = '/usr/local/libexec/munin/plugins' $file_group = 'wheel' } default: { fail($message) } } } diff --git a/metadata.json b/metadata.json index f47dd22..a1cffca 100644 --- a/metadata.json +++ b/metadata.json @@ -1,52 +1,61 @@ { "name": "ssm/munin", - "version": "0.0.7", + "version": "0.0.8", "author": "ssm", - "license": "Apache License, Version 2.0", + "license": "Apache-2.0", "summary": "Configure munin master, node and plugins", "source": "https://github.com/ssm/ssm-munin", "dependencies": [ { "name": "puppetlabs/stdlib", "version_requirement": ">= 2.3.0" } ], "project_page": "https://github.com/ssm/ssm-munin", "issues_url": "https://github.com/ssm/ssm-munin/issues", "operatingsystem_support": [ { - "operatingsystem": "CentOS" + "operatingsystem": "CentOS", + "operatingsystemrelease": [ "5.0", "6.0", "7.0" ] }, { - "operatingsystem": "Debian" + "operatingsystem": "Debian", + "operatingsystemrelease": [ "6", "7", "8" ] }, { - "operatingsystem": "RedHat" + "operatingsystem": "OracleLinux", + "operatingsystemrelease": [ "5.0", "6.0", "7.0" ] }, { - "operatingsystem": "Scientific" + "operatingsystem": "RedHat", + "operatingsystemrelease": [ "5.0", "6.0", "7.0" ] + }, + { + "operatingsystem": "Scientific", + "operatingsystemrelease": [ "5.0", "6.0", "7.0" ] }, { "operatingsystem": "SmartOS" }, { - "operatingsystem": "Ubuntu" + "operatingsystem": "Ubuntu", + "operatingsystemrelease": [ "10.04", "12.04", "14.04" ] }, { "operatingsystem": "FreeBSD" }, { "operatingsystem": "DragonFly" }, { "operatingsystem": "OpenBSD" } ], "tags": [ "munin", "monitoring", "graphing", "performance", "trending" ] }