Merge pull request DataDog#202 from pabrahamsson/elasticsearch_shield

Add Elasticsearch shield support

Author: truthbk

manifests/integrations/elasticsearch.pp

@@ -13,10 +13,31 @@
 #   }
 #
 class datadog_agent::integrations::elasticsearch(
-  $url = 'http://localhost:9200'
+  $cluster_stats      = false,
+  $password           = undef,
+  $pending_task_stats = true,
+  $pshard_stats       = false,
+  $ssl_cert           = undef,
+  $ssl_key            = undef,
+  $ssl_verify         = true,
+  $tags               = [],
+  $url                = 'http://localhost:9200',
+  $username           = undef,
 ) inherits datadog_agent::params {
   include datadog_agent
 
+  validate_array($tags)
+  # $ssl_verify can be a bool or a string
+  # https://github.com/DataDog/dd-agent/blob/master/checks.d/elastic.py#L454-L455
+  if is_bool($ssl_verify) {
+    validate_bool($ssl_verify)
+  } elsif $ssl_verify != undef {
+    validate_string($ssl_verify)
+    validate_absolute_path($ssl_verify)
+  }
+  validate_bool($cluster_stats, $pending_task_stats, $pshard_stats)
+  validate_string($password, $ssl_cert, $ssl_key, $url, $username)
+
   file { "${datadog_agent::params::conf_dir}/elastic.yaml":
     ensure  => file,
     owner   => $datadog_agent::params::dd_user,

spec/classes/datadog_agent_integrations_elasticsearch_spec.rb

@@ -22,14 +22,36 @@
   it { should contain_file(conf_file).that_notifies("Service[#{dd_service}]") }
 
   context 'with default parameters' do
-    it { should contain_file(conf_file).with_content(%r{url: http://localhost:9200}) }
+    it { should contain_file(conf_file).with_content(%r{    - url: http://localhost:9200}) }
+    it { should contain_file(conf_file).with_content(%r{      cluster_stats: false}) }
+    it { should contain_file(conf_file).with_content(%r{      pending_task_stats: true}) }
+    it { should contain_file(conf_file).with_content(%r{      pshard_stats: false}) }
+    it { should_not contain_file(conf_file).with_content(%r{      username}) }
+    it { should_not contain_file(conf_file).with_content(%r{      password}) }
+    it { should_not contain_file(conf_file).with_content(%r{      ssl_verify}) }
+    it { should_not contain_file(conf_file).with_content(%r{      ssl_cert}) }
+    it { should_not contain_file(conf_file).with_content(%r{      ssl_key}) }
+    it { should_not contain_file(conf_file).with_content(%r{      tags:}) }
   end
-
-  context 'with parameters set' do
+context 'with parameters set' do
     let(:params) {{
-      url: 'http://foo:4242',
+      password:           'password',
+      pending_task_stats: false,
+      url:                'https://foo:4242',
+      username:           'username',
+      ssl_cert:           '/etc/ssl/certs/client.pem',
+      ssl_key:            '/etc/ssl/private/client.key',
+      tags:               ['tag1:key1'],
     }}
-    it { should contain_file(conf_file).with_content(%r{http://foo:4242}) }
+    it { should contain_file(conf_file).with_content(%r{    - url: https://foo:4242}) }
+    it { should contain_file(conf_file).with_content(%r{      pending_task_stats: false}) }
+    it { should contain_file(conf_file).with_content(%r{      username: username}) }
+    it { should contain_file(conf_file).with_content(%r{      password: password}) }
+    it { should contain_file(conf_file).with_content(%r{      ssl_verify: true}) }
+    it { should contain_file(conf_file).with_content(%r{      ssl_cert: /etc/ssl/certs/client.pem}) }
+    it { should contain_file(conf_file).with_content(%r{      ssl_key: /etc/ssl/private/client.key}) }
+    it { should contain_file(conf_file).with_content(%r{      tags:}) }
+    it { should contain_file(conf_file).with_content(%r{        - tag1:key1}) }
   end
 
 end

templates/agent-conf.d/elastic.yaml.erb

@@ -6,3 +6,27 @@ init_config:
 
 instances:
     - url: <%= @url %>
+<%- if @username -%>
+      username: <%= @username %>
+<%- end -%>
+<%- if @password -%>
+      password: <%= @password %>
+<%- end -%>
+      cluster_stats: <%= @cluster_stats %>
+      pshard_stats: <%= @pshard_stats %>
+      pending_task_stats: <%= @pending_task_stats %>
+<%- if @url.match(/^https/) -%>
+      ssl_verify: <%= @ssl_verify %>
+<%- end -%>
+<%- if @ssl_cert -%>
+      ssl_cert: <%= @ssl_cert %>
+<%- end -%>
+<%- if @ssl_key -%>
+      ssl_key: <%= @ssl_key %>
+<%- end -%>
+<%- unless @tags.empty? -%>
+      tags:
+  <%- @tags.each do |tag| -%>
+        - <%= tag %>
+  <%- end -%>
+<%- end -%>