From 71a8655b6d3c24012deca5536274bebebccb6f0a Mon Sep 17 00:00:00 2001 From: Shiva Prasad H S Date: Wed, 13 Jan 2021 23:56:47 +0530 Subject: [PATCH 1/3] add min_collection_interval (#2) --- templates/default/nginx.yaml.erb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/templates/default/nginx.yaml.erb b/templates/default/nginx.yaml.erb index dacd9280..4af6e29f 100644 --- a/templates/default/nginx.yaml.erb +++ b/templates/default/nginx.yaml.erb @@ -3,6 +3,8 @@ instances: <% @instances.each do |i| -%> - nginx_status_url: <%= i['nginx_status_url'] %> + <% unless i['min_collection_interval'].nil? -%> + min_collection_interval: <%= i['min_collection_interval'] %> <% unless i['ssl_validation'].nil? -%> ssl_validation: <%= i['ssl_validation'] %> <% end -%> From 8a69167358f97339e21aa54f50818cf335e3bbb9 Mon Sep 17 00:00:00 2001 From: Shiva Prasad H S Date: Fri, 15 Jan 2021 01:53:00 +0530 Subject: [PATCH 2/3] Revert "add min_collection_interval (#2)" (#4) This reverts commit 71a8655b6d3c24012deca5536274bebebccb6f0a. --- templates/default/nginx.yaml.erb | 2 -- 1 file changed, 2 deletions(-) diff --git a/templates/default/nginx.yaml.erb b/templates/default/nginx.yaml.erb index 4af6e29f..dacd9280 100644 --- a/templates/default/nginx.yaml.erb +++ b/templates/default/nginx.yaml.erb @@ -3,8 +3,6 @@ instances: <% @instances.each do |i| -%> - nginx_status_url: <%= i['nginx_status_url'] %> - <% unless i['min_collection_interval'].nil? -%> - min_collection_interval: <%= i['min_collection_interval'] %> <% unless i['ssl_validation'].nil? -%> ssl_validation: <%= i['ssl_validation'] %> <% end -%> From d111907135353accc36feea36ec5eedf98d59318 Mon Sep 17 00:00:00 2001 From: Vaibhav Pandey Date: Thu, 20 Jun 2024 11:32:55 -0400 Subject: [PATCH 3/3] Updated the datadog gpg key --- recipes/repository.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/repository.rb b/recipes/repository.rb index a1ffae0e..37a519cf 100644 --- a/recipes/repository.rb +++ b/recipes/repository.rb @@ -65,7 +65,7 @@ Chef::Log.error("agent_major_version '#{agent_major_version}' not supported.") end - other_apt_gpg_keys.each do |key| + apt_gpg_keys.each do |key| key_short = key[-8..-1] # last 8 chars, since some versions of apt-key add dashes between key sections execute "apt-key import key #{key_short}" do command "apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 #{key}"