Showing with 31 additions and 5 deletions.
  1. +13 −1 CHANGELOG.md
  2. +14 −0 manifests/config.pp
  3. +3 −3 manifests/init.pp
  4. +1 −1 metadata.json
14 changes: 13 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,18 @@ All notable changes to this project will be documented in this file.
Each new release typically also includes the latest modulesync defaults.
These should not affect the functionality of the module.

## [v4.4.1](https://github.com/voxpupuli/puppet-grafana/tree/v4.4.1) (2018-07-04)

[Full Changelog](https://github.com/voxpupuli/puppet-grafana/compare/v4.4.0...v4.4.1)

**Fixed bugs:**

- Fix dependency in provisioning plugins [\#118](https://github.com/voxpupuli/puppet-grafana/pull/118) ([drshawnkwang](https://github.com/drshawnkwang))

**Closed issues:**

- grafana plugin install/check breaks catalog run when grafana-server service is not running [\#79](https://github.com/voxpupuli/puppet-grafana/issues/79)

## [v4.4.0](https://github.com/voxpupuli/puppet-grafana/tree/v4.4.0) (2018-06-21)

[Full Changelog](https://github.com/voxpupuli/puppet-grafana/compare/v4.3.0...v4.4.0)
Expand Down Expand Up @@ -321,4 +333,4 @@ This is the last Release that supports it!
First release on the Puppet Forge


\* *This Changelog was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*
\* *This Changelog was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*
14 changes: 14 additions & 0 deletions manifests/config.pp
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,13 @@
changes => $changes,
}
}

file { "${::grafana::data_dir}/plugins":
ensure => directory,
owner => 'grafana',
group => 'grafana',
mode => '0750',
}
}
'archive': {
$cfg = $::grafana::cfg
Expand All @@ -47,6 +54,13 @@
owner => 'grafana',
group => 'grafana',
}

file { "${::grafana::data_dir}/plugins":
ensure => directory,
owner => 'grafana',
group => 'grafana',
mode => '0750',
}
}
default: {
fail("Installation method ${::grafana::install_method} not supported")
Expand Down
6 changes: 3 additions & 3 deletions manifests/init.pp
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@
~> Class['grafana::service']

create_resources(grafana_plugin, $plugins)

Grafana_Plugin <| |> ~> Class['grafana::service']

# Dependency added for Grafana_plugins to ensure it runs at the
# correct time.
Class['grafana::config'] -> Grafana_Plugin <| |> ~> Class['grafana::service']
}
2 changes: 1 addition & 1 deletion metadata.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "puppet-grafana",
"version": "4.4.0",
"version": "4.4.1",
"author": "Vox Pupuli",
"summary": "This module provides Grafana, a dashboard and graph editor for Graphite and InfluxDB.",
"license": "Apache-2.0",
Expand Down