Skip to content

[mysql] fix broken parameters #411

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
truthbk merged 1 commit into from
Mar 14, 2018
Merged

[mysql] fix broken parameters #411

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 19 additions & 14 deletions manifests/integrations/mysql.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,26 +54,31 @@
#
#
class datadog_agent::integrations::mysql(
String $password,
String $host = 'localhost',
String $user = 'datadog',
Variant[String, Integer] $port = 3306,
Optional[String] $sock = undef,
Array $tags = [],
$replication = '0',
$galera_cluster = '0',
Boolean $extra_status_metrics = false,
Boolean $extra_innodb_metrics = false,
Boolean $extra_performance_metrics = false,
Boolean $schema_size_metrics = false,
Boolean $disable_innodb_metrics = false,
Optional[Array] $instances = undef,
String $host = 'localhost',
Optional[String] $user = 'datadog',
Optional[Variant[String, Integer]] $port = 3306,
Optional[String] $password = undef,
Optional[String] $sock = undef,
Array $tags = [],
$replication = '0',
$galera_cluster = '0',
Boolean $extra_status_metrics = false,
Boolean $extra_innodb_metrics = false,
Boolean $extra_performance_metrics = false,
Boolean $schema_size_metrics = false,
Boolean $disable_innodb_metrics = false,
Optional[Array] $instances = undef,
) inherits datadog_agent::params {
include datadog_agent

validate_legacy('Optional[String]', 'validate_string', $sock)
validate_legacy('Array', 'validate_array', $tags)

if ($host == undef and $sock == undef) or
($host != undef and $port == undef and $sock == undef) {
fail('invalid MySQL configuration')
}

if !$instances and $host {
$_instances = [{
'host' => $host,
Expand Down
2 changes: 1 addition & 1 deletion spec/classes/datadog_agent_integrations_mysql_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
let(:conf_file) { "#{conf_dir}/mysql.yaml" }

context 'with default parameters' do
it { should_not compile }
it { should compile }
end

context 'with password set' do
Expand Down
6 changes: 5 additions & 1 deletion templates/agent-conf.d/mysql.yaml.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,14 @@ init_config:
instances:
<%- (Array(@_instances)).each do |instance| -%>
- server: <%= instance['host'] %>
<% if instance['user'] and instance['user'] != :undef -%>
user: <%= instance['user'] %>
<% end -%>
<% if instance['password'] and instance['password'] != :undef -%>
pass: <%= instance['password'] %>
<% end -%>
<% if instance['port'] -%>
port: <%= instance['port'] %>
port: <%= instance['port'] and instance['port'] != :undef %>
<% end -%>
<% if instance['sock'] and instance['sock'] != :undef -%>
sock: <%= instance['sock'] %>
Expand Down
⚡