itamae-plugin-recipe-datadog 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 102c6593fcfa07616474fea986ab3cea337bb9fc4778983f70282bb465dbbb31
-  data.tar.gz: 3a80383142aad9bd528958903c9676b3e6f901eb264bb9ef70e95944427978e9
+  metadata.gz: 270aa0439537a833f4a965cfbe7408436ee6ded43ba9672e19796e8a4f5bae24
+  data.tar.gz: 22652f8ec2046564635eae3986a168b1457746e848d62aaf28f2e304a124ed7c
 SHA512:
-  metadata.gz: f23f1ebf2d583646765abca4a96085bf655b9a98066d65e57b83690efc2d893440d73b43730f937e897bf6709424523b0e782f657ed2032ea31ea6efc1745b6f
-  data.tar.gz: 33a7ea4f01b0d756dfe626319c18ad2ca084f03a7738d95f237f82dbac684cce27ec5b5a620925a04e767d55a13bf6d4b221decce2fa3b33181f39674be91025
+  metadata.gz: '048258f6743632da7b2f03c1f49b864663481e10bed25d50afe7acd87d230c18706e4ce915777ef0d0710907faae58f7b7b4148d9b666efed02a114c0136ce72'
+  data.tar.gz: 2c68f7f58e89053240926b461e2f5a110c87ae86e955d4efa66371b2c420d47253d09866bcce863f83ee82f59857d477d57391c386572bfdaf02282fa8878c83

data/.github/workflows/test.yml

@@ -25,6 +25,7 @@ jobs:
         image:
           - debian:buster
           - amazonlinux:2
+          - ubuntu:focal
 
     steps:
       - uses: actions/checkout@v2
@@ -70,6 +71,12 @@ jobs:
           DATADOG_UPGRADE: "true"
           DD_API_KEY: api_key_3
 
+      - name: Run test (DD_AGENT_MAJOR_VERSION is specified)
+        run: bundle exec rake test
+        env:
+          IMAGE: ${{ matrix.image }}
+          DD_AGENT_MAJOR_VERSION: 7
+
       - name: Slack Notification (not success)
         uses: lazy-actions/slatify@master
         if: "! success()"

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 ## Unreleased
-[full changelog](https://github.com/itamae-plugins/itamae-plugin-recipe-datadog/compare/v0.2.2...master)
+[full changelog](https://github.com/itamae-plugins/itamae-plugin-recipe-datadog/compare/v0.3.0...master)
+
+## v0.3.0
+[full changelog](https://github.com/itamae-plugins/itamae-plugin-recipe-datadog/compare/v0.2.2...v0.3.0)
+
+* Add `node[:datadog][:agent_major_version]`
+  * https://github.com/itamae-plugins/itamae-plugin-recipe-datadog/pull/22
+* Add `node[:datadog][:integrations]` and `install_datadog_agent_integration`
+  * https://github.com/itamae-plugins/itamae-plugin-recipe-datadog/pull/23
+* Support Ubuntu Focal
+  * https://github.com/itamae-plugins/itamae-plugin-recipe-datadog/pull/24
 
 ## v0.2.2
 [full changelog](https://github.com/itamae-plugins/itamae-plugin-recipe-datadog/compare/v0.2.1...v0.2.2)

data/README.md

@@ -38,6 +38,11 @@ datadog:
   api_key: xxxxxx
   install_only: false # default: true
   upgrade: true # default: false
+  agent_major_version: 7 # default: none
+
+  integrations: # default: {}
+    datadog-puma: 1.1.0 # Install specified version (recommended)
+    datadog-vsphere: # Install latest version
 ```
 
 - `node[:datadog][:api_key]`
@@ -46,6 +51,33 @@ datadog:
   - An install option. If you want to install agent and don't start agent, please set this option`true`.
 - `node[:datadog][:upgrade]`
   - An install option. Upgrade datadog-agent version automatically.
+- `node[:datadog][:agent_major_version]`
+  - Whether to install any major version of the agent. (e.g. `7`)
+  - default is none. installed with datadog-agent v6
+  - see https://docs.datadoghq.com/agent/versions/upgrade_to_agent_v7
+- `node[:datadog][:integrations]`
+  - Install integrations
+  - see https://docs.datadoghq.com/agent/guide/integration-management/
+  - key: integration name (e.g. `datadog-puma`)
+  - value: integration version (e.g. `1.1.0`)
+
+## Definitions
+### install_datadog_agent_integration
+Install datadog-agent integration
+
+Usage
+
+```ruby
+include_recipe "datadog::install_datadog_agent_integration"
+
+# Install specified version (recommended)
+install_datadog_agent_integration "datadog-puma" do
+  version "1.1.0"
+end
+
+# Install latest version
+install_datadog_agent_integration "datadog-puma"
+```
 
 ## Contributing
 

data/lib/itamae/plugin/recipe/datadog/install.rb

@@ -1,7 +1,10 @@
+include_recipe "datadog::install_datadog_agent_integration"
+
 node.reverse_merge!(
   datadog: {
     install_only: true,
     upgrade: false,
+    integration: {},
   }
 )
 
@@ -27,6 +30,7 @@ execute 'install datadog-agent' do
   options['DD_API_KEY'] = node[:datadog][:api_key]
   options['DD_INSTALL_ONLY'] = 'true' if node[:datadog][:install_only]
   options['DD_UPGRADE'] = 'true' if node[:datadog][:upgrade]
+  options['DD_AGENT_MAJOR_VERSION'] = node[:datadog][:agent_major_version] if node[:datadog][:agent_major_version]
   option_str = options.map { |k, v| "#{k}=#{v}" }.join(' ')
   command "#{option_str} /tmp/install_script.sh"
 
@@ -36,3 +40,9 @@ execute 'install datadog-agent' do
     not_if 'ls /etc/datadog-agent/datadog.yaml'
   end
 end
+
+node[:datadog][:integrations].each do |integration_name, integration_version|
+  install_datadog_agent_integration integration_name do
+    version integration_version
+  end
+end

data/lib/itamae/plugin/recipe/datadog/install_datadog_agent_integration.rb

@@ -0,0 +1,14 @@
+define :install_datadog_agent_integration, version: nil do
+  version = params[:version]
+  name = params[:name]
+
+  if version
+    execute "datadog-agent integration install -t #{name}==#{version} --allow-root" do
+      not_if "datadog-agent integration show #{name} | grep #{version}"
+    end
+  else
+    execute "datadog-agent integration install -t #{name} --allow-root" do
+      not_if "datadog-agent integration show #{name}"
+    end
+  end
+end

data/lib/itamae/plugin/recipe/datadog/version.rb

@@ -2,7 +2,7 @@ module Itamae
   module Plugin
     module Recipe
       module Datadog
-        VERSION = "0.2.2"
+        VERSION = "0.3.0"
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: itamae-plugin-recipe-datadog
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Takahiro Kiso (takanamito)
@@ -118,6 +118,7 @@ files:
 - itamae-plugin-recipe-datadog.gemspec
 - lib/itamae/plugin/recipe/datadog.rb
 - lib/itamae/plugin/recipe/datadog/install.rb
+- lib/itamae/plugin/recipe/datadog/install_datadog_agent_integration.rb
 - lib/itamae/plugin/recipe/datadog/version.rb
 homepage: https://github.com/itamae-plugins/itamae-plugin-recipe-datadog
 licenses: