fixing linter errors and inclusion

rplessl · Jun 21, 2016 · 9fbadf5 · 9fbadf5
1 parent 97158f3
commit 9fbadf5
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 10 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,4 +1,9 @@
-## v0.13.1 [2015-06-20]
+## v0.13.2 [2016-06-21]
+
+* fixing plugin inclusion -- @rplessl
+* fixing linter errors -- @rplessl
+
+## v0.13.1 [2016-06-20]
 
 * Enhanced for working with telegraf 0.13.x -- @thirdeyenick and @rplessl
 * Refactoring plugin system (closes #23) -- @rplessl

diff --git a/manifests/install.pp b/manifests/install.pp
@@ -85,7 +85,7 @@
             'source' => 'https://repos.influxdata.com/influxdb.key',
           },
         }
-        ensure_packages(['apt-transport-https'], { before => Class['apt::update'] }) 
+        ensure_packages(['apt-transport-https'], { before => Class['apt::update'] })
         Class['apt::update'] -> Package['telegraf']
       }
       'redhat': {

diff --git a/manifests/plugins/inputs/elasticsearch.pp b/manifests/plugins/inputs/elasticsearch.pp
@@ -17,8 +17,8 @@
 #
 # Copyright 2015 Asthon Davis
 #
-class telegraf::plugins::elasticsearch (
-  $servers          = ["http://localhost:9200"],
+class telegraf::plugins::inputs::elasticsearch (
+  $servers          = ['http://localhost:9200'],
   $cluster_health   = true,
   $local            = true,
 ){

diff --git a/manifests/plugins/inputs/mysql.pp b/manifests/plugins/inputs/mysql.pp
@@ -16,7 +16,7 @@
 #
 # Copyright 2015 Roman Plessl, Plessl + Burkhardt GmbH
 #
-class telegraf::plugins::mysql (
+class telegraf::plugins::inputs::mysql (
   # [mysql] section of telegraf.conf
 )
 {

diff --git a/manifests/plugins/inputs/postgresql.pp b/manifests/plugins/inputs/postgresql.pp
@@ -17,7 +17,7 @@
 #
 # Copyright 2015 Roman Plessl, Plessl + Burkhardt GmbH
 #
-class telegraf::plugins::postgresql (
+class telegraf::plugins::inputs::postgresql (
   # [postgresql] section of telegraf.conf
 ){
 

diff --git a/manifests/plugins/inputs/procstat.pp b/manifests/plugins/inputs/procstat.pp
@@ -33,7 +33,7 @@
 #
 # === Examples
 #
-#  telegraf::plugins::procstat {
+#  telegraf::plugins::inputs::procstat {
 #    'mysql':
 #      pid_file => '/var/run/mysqld/mysqld.pid';
 #  }
@@ -46,7 +46,7 @@
 #
 # Copyright 2016 Nine Internet Solutions AG
 #
-define telegraf::plugins::procstat (
+define telegraf::plugins::inputs::procstat (
   $pid_file   = undef,
   $exec_name  = undef,
   $pattern    = undef,

diff --git a/manifests/plugins/inputs/puppetagent.pp b/manifests/plugins/inputs/puppetagent.pp
@@ -16,7 +16,7 @@
 #
 # Copyright 2015 Roman Plessl, Plessl + Burkhardt GmbH
 #
-class telegraf::plugins::puppetagent (
+class telegraf::plugins::inputs::puppetagent (
   # [puppetagent] section of telegraf.conf
 ){
 

diff --git a/metadata.json b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "rplessl-telegraf",
-  "version": "0.13.1",
+  "version": "0.13.2",
   "source": "https://github.com/rplessl/puppet-telegraf",
   "author": "Roman Plessl",
   "license": "MIT",