From 5cd38a4f1cd306a12eed43aca20f8fe81f12b4c8 Mon Sep 17 00:00:00 2001 From: Seth Cleveland Date: Fri, 9 Sep 2016 12:11:43 -0500 Subject: [PATCH] swapped order of optional vs. non-optional class parameters to address failing builds --- manifests/integrations/mysql.pp | 6 +++--- manifests/integrations/pgbouncer.pp | 6 +++--- manifests/integrations/postgres.pp | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/manifests/integrations/mysql.pp b/manifests/integrations/mysql.pp index 5046ff01..3ea45fde 100644 --- a/manifests/integrations/mysql.pp +++ b/manifests/integrations/mysql.pp @@ -3,10 +3,10 @@ # This class will install the necessary configuration for the mysql integration # # Parameters: -# $host: -# The host mysql is running on # $password # The mysql password for the datadog user +# $host: +# The host mysql is running on # $user # The mysql user for the datadog user # $sock @@ -37,8 +37,8 @@ # # class datadog_agent::integrations::mysql( - $host = 'localhost', $password, + $host = 'localhost', $user = 'datadog', $sock = undef, $tags = [], diff --git a/manifests/integrations/pgbouncer.pp b/manifests/integrations/pgbouncer.pp index 75e95153..d9889df7 100644 --- a/manifests/integrations/pgbouncer.pp +++ b/manifests/integrations/pgbouncer.pp @@ -3,14 +3,14 @@ # This class will install the necessary configuration for the pgbouncer integration # # Parameters: +# $password +# The password for the datadog user # $host: # The host pgbouncer is listening on # $port # The pgbouncer port number # $username # The username for the datadog user -# $password -# The password for the datadog user # $tags # Optional array of tags # @@ -25,10 +25,10 @@ # # class datadog_agent::integrations::pgbouncer( + $password, $host = 'localhost', $port = '6432', $username = 'datadog', - $password, $tags = [], ) inherits datadog_agent::params { diff --git a/manifests/integrations/postgres.pp b/manifests/integrations/postgres.pp index 07440d49..592280a7 100644 --- a/manifests/integrations/postgres.pp +++ b/manifests/integrations/postgres.pp @@ -3,6 +3,8 @@ # This class will install the necessary configuration for the postgres integration # # Parameters: +# $password +# The password for the datadog user # $host: # The host postgres is running on # $dbname @@ -11,8 +13,6 @@ # The postgres port number # $username # The username for the datadog user -# $password -# The password for the datadog user # $tags # Optional array of tags # $tables @@ -49,11 +49,11 @@ # # class datadog_agent::integrations::postgres( + $password, $host = 'localhost', $dbname = 'postgres', $port = '5432', $username = 'datadog', - $password, $tags = [], $tables = [], $custom_metrics = {},