.msync.yml

@@ -1 +1 @@
-modulesync_config_version: '1.5.0'
+modulesync_config_version: '1.7.0'

.rubocop.yml

@@ -46,7 +46,7 @@ Style/HashSyntax:
 Style/RedundantReturn:
   Enabled: True
 
-Style/EndOfLine:
+Layout/EndOfLine:
   Enabled: False
 
 Lint/AmbiguousOperator:

.travis.yml

@@ -4,17 +4,24 @@ dist: trusty
 language: ruby
 cache: bundler
 before_install:
-  - bundle -v
-  - rm Gemfile.lock || true
-  - gem update --system
-  - gem update bundler
-  - gem --version
-  - bundle -v
+  - rm -f Gemfile.lock
 script:
   - 'bundle exec rake $CHECK'
 matrix:
   fast_finish: true
   include:
+  - rvm: 2.1.9
+    bundler_args: --without system_tests development release
+    env: PUPPET_VERSION="~> 4.0" CHECK=test PARALLEL_TEST_PROCESSORS=12
+  - rvm: 2.4.2
+    bundler_args: --without system_tests development release
+    env: PUPPET_VERSION="~> 5.0" CHECK=test_with_coveralls
+  - rvm: 2.4.2
+    bundler_args: --without system_tests development release
+    env: PUPPET_VERSION="~> 5.0" CHECK=rubocop
+  - rvm: 2.4.2
+    bundler_args: --without system_tests development release
+    env: PUPPET_VERSION="~> 5.0" CHECK=build DEPLOY_TO_FORGE=yes
   - rvm: 2.4.2
     bundler_args: --without development release
     dist: trusty
@@ -27,18 +34,6 @@ matrix:
     env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_set=docker/centos-7 CHECK=beaker
     services: docker
     sudo: required
-  - rvm: 2.1.9
-    bundler_args: --without system_tests development release
-    env: PUPPET_VERSION="~> 4.0" CHECK=test PARALLEL_TEST_PROCESSORS=16
-  - rvm: 2.4.2
-    bundler_args: --without system_tests development release
-    env: PUPPET_VERSION="~> 5.0" CHECK=test_with_coveralls
-  - rvm: 2.4.2
-    bundler_args: --without system_tests development release
-    env: PUPPET_VERSION="~> 5.0" CHECK=rubocop
-  - rvm: 2.4.2
-    bundler_args: --without system_tests development release
-    env: PUPPET_VERSION="~> 5.0" CHECK=build DEPLOY_TO_FORGE=yes
 branches:
   only:
   - master

CHANGELOG.md

@@ -4,6 +4,22 @@ 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.1.0](https://github.com/voxpupuli/puppet-grafana/tree/v4.1.0) (2018-02-03)
+
+[Full Changelog](https://github.com/voxpupuli/puppet-grafana/compare/v4.0.3...v4.1.0)
+
+**Implemented enhancements:**
+
+- \(SIMP-4206\) Added organization provider and updated datasource provider [\#86](https://github.com/voxpupuli/puppet-grafana/pull/86) ([heliocentric](https://github.com/heliocentric))
+
+**Closed issues:**
+
+- "Could not autoload" error in grafana\_dashboard with ruby 2.4 on Centos 6 [\#83](https://github.com/voxpupuli/puppet-grafana/issues/83)
+
+**Merged pull requests:**
+
+- release 4.0.3 [\#81](https://github.com/voxpupuli/puppet-grafana/pull/81) ([bastelfreak](https://github.com/bastelfreak))
+
 ## [v4.0.3](https://github.com/voxpupuli/puppet-grafana/tree/v4.0.3) (2017-12-09)
 
 [Full Changelog](https://github.com/voxpupuli/puppet-grafana/compare/v4.0.2...v4.0.3)
@@ -253,4 +269,4 @@ This is the last Release that supports it!
 First release on the Puppet Forge
 
 
-\* *This Change Log 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)*

Gemfile

@@ -58,7 +58,7 @@ group :system_tests do
 end
 
 group :release do
-  gem 'github_changelog_generator',  :require => false if RUBY_VERSION >= '2.2.2'
+  gem 'github_changelog_generator',  :require => false, :git => 'https://github.com/skywinder/github-changelog-generator' if RUBY_VERSION >= '2.2.2'
   gem 'puppet-blacksmith',           :require => false
   gem 'voxpupuli-release',           :require => false, :git => 'https://github.com/voxpupuli/voxpupuli-release-gem'
   gem 'puppet-strings', '~> 1.0',    :require => false

README.md

@@ -340,7 +340,25 @@ Example:
 
 The module includes several custom types:
 
-##### `grafana_dashboard`
+#### `grafana_organization`
+
+In order to use the organization resource, add the following to your manifest:
+
+```puppet
+grafana_organization { 'example_org':
+  grafana_url      => 'http://localhost:3000',
+  grafana_user     => 'admin',
+  grafana_password => '5ecretPassw0rd',
+}
+```
+
+`grafana_url`, `grafana_user`, and `grafana_password` are required to create organizations via the API. 
+
+`name` is optional if the name will differ from example_org above.
+
+`address` is an optional parameter that requires a hash. Address settings are `{"address1":"","address2":"","city":"","zipCode":"","state":"","country":""}`
+
+#### `grafana_dashboard`
 
 In order to use the dashboard resource, add the following to your manifest:
 
@@ -386,6 +404,7 @@ grafana_datasource { 'influxdb':
   grafana_user      => 'admin',
   grafana_password  => '5ecretPassw0rd',
   type              => 'influxdb',
+  org_name          => 'NewOrg',
   url               => 'http://localhost:8086',
   user              => 'admin',
   password          => '1nFlux5ecret',
@@ -396,11 +415,15 @@ grafana_datasource { 'influxdb':
 }
 ```
 
-Available default types are: influxdb, elasticsearch, graphite, kairosdb, opentsdb, prometheus
+Available types are: influxdb, elasticsearch, graphite, cloudwatch, mysql, opentsdb, and prometheus
+
+`org_name` is used to set which organization a datasource will be created on. If this parameter is not set, it will default to organization ID 1 (Main Org. by default). If the default org is deleted, organizations will need to be specified. 
 
 Access mode determines how Grafana connects to the datasource, either `direct`
 from the browser, or `proxy` to send requests via grafana.
 
+Setting `basic_auth` to `true` will allow use of the `basic_auth_user` and `basic_auth_password` params.
+
 Authentication is optional, as is `database`; additional `json_data` can be
 provided to allow custom configuration options.
 
@@ -430,6 +453,96 @@ http_conn_validator { 'grafana-conn-validator' :
 }
 ```
 
+Note that the `database` is dynamic, setting things other than "database" for separate types. Ex: for Elasticsearch it will set the Index Name.
+
+**`jsonData` Settings**
+
+Note that there are separate options for json_data based on the type of datasource you create.
+
+##### **Elasticsearch**
+
+`esVersion` - Required, either 2 or 5, set as a bare number.
+
+`timeField` - Required. By default this is @timestamp, but without setting it in jsonData, the datasource won't work without refreshing it in the GUI.
+
+`timeInterval` - Optional. A lower limit for the auto group by time interval. Recommended to be set to write frequency, for example "1m" if your data is written every minute.
+
+Example:
+```puppet
+json_data => {"esVersion":5,"timeField":"@timestamp","timeInterval":"1m"}
+```
+
+##### **CloudWatch**
+
+`authType` - Required. Options are `Access & Secret Key`, `Credentials File`, or `ARN`.
+
+-"keys" = Access & Secret Key
+
+-"credentials" = Credentials File
+
+-"arn" = ARN
+
+*When setting authType to `credentials`, the `database` param will set the Credentials Profile Name.*
+
+*When setting authType to `arn`, another jsonData value of `assumeRoleARN` is available, which is not required for other authType settings*     
+
+`customMetricsNamespaces` - Optional. Namespaces of Custom Metrics, separated by commas within double quotes.
+
+`defaultRegion` - Required. Options are "ap-northeast-(1 or 2)", "ap-southeast-(1 or 2)", "ap-south-1", "ca-central-1", "cn-north-1", "eu-central-1", "eu-west-(1 or 2)", "sa-east-(1 or 2)", "us-east-(1 or 2)", "us-gov-west-1", "us-west-(1 or 2)".
+
+`timeField`
+
+Example: 
+```puppet
+{"authType":"arn","assumeRoleARN":"arn:aws:iam:*","customMetricsNamespaces":"Namespace1,Namespace2","defaultRegion":"us-east-1","timeField":"@timestamp"}
+```
+     
+##### **Graphite**
+
+`graphiteVersion` - Required. Available versions are `0.9` or `1.0`.
+
+`tlsAuth` - Set to `true` or `false`
+
+`tlsAuthWithCACert` - Set to `true` or `false`
+
+Example:
+```puppet
+{"graphiteVersion":"0.9","tlsAuth":true,"tlsAuthWithCACert":false}
+```
+
+##### **OpenTSDB**
+
+`tsdbResolution` - Required. Options are `1` or `2`.
+
+  `1` = second
+
+  `2` = millisecond
+
+`tsdbVersion` - Required. Options are `1`, `2`, or `3`.
+
+  `1` &nbsp;&nbsp; = &nbsp;&nbsp; <=2.1
+
+  `2` &nbsp;&nbsp; = &nbsp;&nbsp; ==2.2
+
+  `3` &nbsp;&nbsp; = &nbsp;&nbsp; ==2.3
+
+Example:
+```puppet
+{"tsdbResolution:1,"tsdbVersion":3}
+```
+
+##### **InfluxDB**
+
+N/A
+
+##### **MySQL**
+
+N/A
+
+##### **Prometheus**
+
+N/A
+
 ##### `grafana_plugin`
 
 An example is provided for convenience; for more details, please view the

Rakefile

@@ -26,6 +26,12 @@ exclude_paths = %w(
 PuppetLint.configuration.ignore_paths = exclude_paths
 PuppetSyntax.exclude_paths = exclude_paths
 
+desc 'Auto-correct puppet-lint offenses'
+task 'lint:auto_correct' do
+  PuppetLint.configuration.fix = true
+  Rake::Task[:lint].invoke
+end
+
 desc 'Run acceptance tests'
 RSpec::Core::RakeTask.new(:acceptance) do |t|
   t.pattern = 'spec/acceptance'
@@ -48,6 +54,27 @@ task test_with_coveralls: [:test] do
   end
 end
 
+desc "Print supported beaker sets"
+task 'beaker_sets', [:directory] do |t, args|
+  directory = args[:directory]
+
+  metadata = JSON.load(File.read('metadata.json'))
+
+  (metadata['operatingsystem_support'] || []).each do |os|
+    (os['operatingsystemrelease'] || []).each do |release|
+      if directory
+        beaker_set = "#{directory}/#{os['operatingsystem'].downcase}-#{release}"
+      else
+        beaker_set = "#{os['operatingsystem'].downcase}-#{release}-x64"
+      end
+
+      filename = "spec/acceptance/nodesets/#{beaker_set}.yml"
+
+      puts beaker_set if File.exists? filename
+    end
+  end
+end
+
 begin
   require 'github_changelog_generator/task'
   GitHubChangelogGenerator::RakeTask.new :changelog do |config|