Skip to content

Enable log collection for nginx integration #519

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 6 commits into from
May 14, 2019
Merged

Enable log collection for nginx integration #519

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
109d5b5
Enable log collection for nginx integration
jadams-av May 6, 2019
32cd8c1
Fix value of path test
jadams-av May 6, 2019
4ec317a
Update nginx_integration test
jadams-av May 13, 2019
d095ae8
Specify type of log variable
jadams-av May 14, 2019
b80e722
Fix data type syntax error
jadams-av May 14, 2019
0fff8f8
Fix date type syntax error
jadams-av May 14, 2019
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
1 change: 1 addition & 0 deletions manifests/integrations/nginx.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
#
class datadog_agent::integrations::nginx(
Array $instances = [],
$logs = undef,
Comment thread
jadams-av marked this conversation as resolved.
Outdated
) inherits datadog_agent::params {
include datadog_agent

Expand Down
14 changes: 14 additions & 0 deletions spec/classes/datadog_agent_integrations_nginx_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,25 @@
'nginx_status_url' => 'http://foo.bar:1941/check',
'tags' => %w{foo bar baz}
}
],
logs: [
{
'type' => 'file',
'path' => '/var/log/nginx/access.log',
'service' => 'my.nginx.service',
Comment thread
jadams-av marked this conversation as resolved.
Outdated
'source' => 'nginx',
'sourcecategory' => 'http_web_access'
}
Comment thread
jadams-av marked this conversation as resolved.
]
}}

it { should contain_file(conf_file).with_content(%r{nginx_status_url:.*http://foo.bar:1941/check}m) }
it { should contain_file(conf_file).with_content(%r{tags:.*foo.*bar.*baz}m) }
it { should contain_file(conf_file).with_content(%r{type:.*file}m) }
it { should contain_file(conf_file).with_content(%r{path:.*/var/log/nginx/access.log}m) }
it { should contain_file(conf_file).with_content(%r{service:.*my.nginx.service}m) }
Comment thread
jadams-av marked this conversation as resolved.
Outdated
it { should contain_file(conf_file).with_content(%r{source:.*nginx}m) }
it { should contain_file(conf_file).with_content(%r{sourcecategory:.*http_web_access}m) }
end
end
end
Expand Down
4 changes: 4 additions & 0 deletions templates/agent-conf.d/nginx.yaml.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,8 @@
require 'yaml'
%>

<% if @logs %>
<%= {'init_config'=>nil, 'instances'=>@instances, 'logs'=>@logs}.to_yaml %>
<% else %>
<%= {'init_config'=>nil, 'instances'=>@instances}.to_yaml %>
<% end %>
⚡