itamae-plugin-recipe-datadog 0.2.1 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0ae9b400e6f30b6f5fe507b7e385474e31e9293c8b6d7336b2e464cd3d2cf0f7
-  data.tar.gz: 30e35ccecb871ea1b32d03879d8e4074ac2dc44a97095d9f2b7af1d6db0de3b1
+  metadata.gz: 819762a5f68d658d9b7ec465304511c57f5cfac0d41989a5148166a8a25aeb3a
+  data.tar.gz: 371bf73f255954542fc95fa17d5d1166163614e7512566ecb29a67c1defaff28
 SHA512:
-  metadata.gz: bd1e76a1884865d23d5617bab9759db252928649bed56afb928a3b59a785c95a853fb6c513ebf7e5e7d43c667f5993ebe126682981c0fbf1e09d0d809269eb7a
-  data.tar.gz: fa74c66777b61efdeeba897ba78f89860b4ac9dbb844e1c7c12991ab705af912620877493d8ed1999d7fb5351aa989a80e82545675cd26034d7e4e690a8827f4
+  metadata.gz: b6507f9b5615ccaa094da683ef6891f9644236667bd8b30537cb52c1f1f6463b6f1c309ad7e688880687fcdf0051a02c0679e1fbc21514fa83a428249e2d940e
+  data.tar.gz: a4eee6bd8f7b67f087483aefbb8140de3221cb3d6033c56a6623964418101d74077c2c6dd16b512a96fffa7bb3ff5d4b94cd0b61a8f6d3a3212ac594e0d2378c

data/.github/workflows/test.yml

@@ -0,0 +1,107 @@
+name: test
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    types:
+      - opened
+      - synchronize
+      - reopened
+  schedule:
+    - cron: "0 10 * * 5" # JST 19:00 (Fri)
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: false
+
+      matrix:
+        ruby:
+          - 2.3
+        image:
+          - debian:buster
+          - amazonlinux:2
+          - ubuntu:focal
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+          rubygems: latest
+
+      - name: Cache vendor/bundle
+        uses: actions/cache@v1
+        id: cache_gem
+        with:
+          path: vendor/bundle
+          key: v1-gem-${{ runner.os }}-${{ matrix.ruby }}-${{ github.sha }}
+          restore-keys: |
+            v1-gem-${{ runner.os }}-${{ matrix.ruby }}-
+
+      - name: bundle update
+        run: |
+          set -xe
+          bundle config --local path $PWD/vendor/bundle
+          bundle config --local jobs $(nproc)
+          bundle update --retry 3
+
+      - name: Run test (1st installation)
+        run: bundle exec rake test
+        env:
+          IMAGE: ${{ matrix.image }}
+
+      - name: Run test (installation is skipped)
+        run: bundle exec rake test
+        env:
+          IMAGE: itamae-plugin:latest
+          DATADOG_UPGRADE: "false"
+          DD_API_KEY: api_key_2
+
+      - name: Run test (datadog-agent is upgraded)
+        run: bundle exec rake test
+        env:
+          IMAGE: itamae-plugin:latest
+          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()"
+        continue-on-error: true
+        with:
+          job_name: ${{ format('*build* ({0}, {1})', matrix.ruby, matrix.image) }}
+          type: ${{ job.status }}
+          icon_emoji: ":octocat:"
+          url: ${{ secrets.SLACK_WEBHOOK }}
+          token: ${{ secrets.GITHUB_TOKEN }}
+
+  notify:
+    needs:
+      - test
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Slack Notification (success)
+        uses: lazy-actions/slatify@master
+        if: always()
+        continue-on-error: true
+        with:
+          job_name: '*build*'
+          type: ${{ job.status }}
+          icon_emoji: ":octocat:"
+          url: ${{ secrets.SLACK_WEBHOOK }}
+          token: ${{ secrets.GITHUB_TOKEN }}

data/.rspec

@@ -0,0 +1 @@
+--require spec_helper

data/CHANGELOG.md

@@ -0,0 +1,55 @@
+## Unreleased
+[full changelog](https://github.com/itamae-plugins/itamae-plugin-recipe-datadog/compare/v0.3.1...master)
+
+## v0.3.1
+[full changelog](https://github.com/itamae-plugins/itamae-plugin-recipe-datadog/compare/v0.3.0...v0.3.1)
+
+* Support mitamae
+  * https://github.com/itamae-plugins/itamae-plugin-recipe-datadog/pull/25
+
+## 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)
+
+* Transferred to itamae-plugins org
+  * https://github.com/itamae-plugins/itamae-plugin-recipe-datadog/pull/11
+* Setup CI. Install wget if not installed. Add itamae to runtime dependency
+  * https://github.com/itamae-plugins/itamae-plugin-recipe-datadog/pull/12
+* Add `spec.metadata`
+  * https://github.com/itamae-plugins/itamae-plugin-recipe-datadog/pull/13
+
+## v0.2.1
+[full changelog](https://github.com/itamae-plugins/itamae-plugin-recipe-datadog/compare/v0.2.0...v0.2.1)
+
+* Don't re-install datadog-agent if installed
+  * https://github.com/itamae-plugins/itamae-plugin-recipe-datadog/pull/9
+
+## v0.2.0
+[full changelog](https://github.com/itamae-plugins/itamae-plugin-recipe-datadog/compare/v0.1.1...v0.2.0)
+
+* update README
+  * https://github.com/itamae-plugins/itamae-plugin-recipe-datadog/pull/2
+* Upgrade install process to install V6 agent.
+  * https://github.com/itamae-plugins/itamae-plugin-recipe-datadog/pull/6
+* Overwrite install script
+  * https://github.com/itamae-plugins/itamae-plugin-recipe-datadog/pull/7
+* Add upgrade option to README
+  * https://github.com/itamae-plugins/itamae-plugin-recipe-datadog/pull/8
+
+## v0.1.1
+[full changelog](https://github.com/itamae-plugins/itamae-plugin-recipe-datadog/compare/v0.1.0...v0.1.1)
+
+* Fix repo url
+  * https://github.com/itamae-plugins/itamae-plugin-recipe-datadog/pull/1
+
+## v0.1.0
+Initial release

data/README.md

@@ -1,6 +1,9 @@
 # Itamae::Plugin::Recipe::Datadog
 
-[Itamae](https://github.com/ryotarai/itamae) plugin to install Datadog Agent.
+[Itamae](https://github.com/itamae-kitchen/itamae) plugin to install Datadog Agent.
+
+[![Gem Version](https://badge.fury.io/rb/itamae-plugin-recipe-datadog.svg)](https://badge.fury.io/rb/itamae-plugin-recipe-datadog)
+[![test](https://github.com/itamae-plugins/itamae-plugin-recipe-datadog/actions/workflows/test.yml/badge.svg)](https://github.com/itamae-plugins/itamae-plugin-recipe-datadog/actions/workflows/test.yml)
 
 ## Installation
 
@@ -21,7 +24,7 @@ Or install it yourself as:
 ## Usage
 
 ### Recipe
-```
+```ruby
 # In your recipe
 include_recipe "datadog::install"
 ```
@@ -29,12 +32,17 @@ include_recipe "datadog::install"
 ### Node
 `$ itamae -y node.yml`
 
-```
+```yaml
 # node.yml
 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]`
@@ -43,10 +51,37 @@ 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
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/speee/itamae-plugin-recipe-datadog. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
+Bug reports and pull requests are welcome on GitHub at https://github.com/itamae-plugins/itamae-plugin-recipe-datadog. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
 
 
 ## License

data/Rakefile

@@ -1,6 +1,17 @@
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
 
-RSpec::Core::RakeTask.new(:spec)
+RSpec::Core::RakeTask.new(:serverspec)
 
-task :default => :spec
+ENV["DOCKER_IMAGE"] = "itamae-plugin:latest"
+ENV["IMAGE"] ||= "debian:buster"
+
+desc "Run itamae"
+task :itamae do
+  sh "itamae docker --node-yaml=spec/recipes/node.yml spec/recipes/install.rb --image=#{ENV["IMAGE"]} --tag #{ENV["DOCKER_IMAGE"]}"
+end
+
+desc "Run test"
+task :test => %i(itamae serverspec)
+
+task default: :test

data/itamae-plugin-recipe-datadog.gemspec

@@ -6,14 +6,19 @@ require 'itamae/plugin/recipe/datadog/version'
 Gem::Specification.new do |spec|
   spec.name          = "itamae-plugin-recipe-datadog"
   spec.version       = Itamae::Plugin::Recipe::Datadog::VERSION
-  spec.authors       = ["Takahiro Kiso (takanamito)", "Speee, Inc."]
-  spec.email         = ["t.kiso0928@gmail.com"]
+  spec.authors       = ["Takahiro Kiso (takanamito)", "sue445", "Speee, Inc."]
+  spec.email         = ["t.kiso0928@gmail.com", "sue445@sue445.net"]
 
   spec.summary       = %q{Itamae plugin to install datadog-agent.}
   spec.description   = %q{Itamae plugin to install datadog-agent.}
-  spec.homepage      = "https://github.com/speee/itamae-plugin-recipe-datadog"
+  spec.homepage      = "https://github.com/itamae-plugins/itamae-plugin-recipe-datadog"
   spec.license       = "MIT"
 
+  spec.metadata["homepage_uri"] = spec.homepage
+  spec.metadata["source_code_uri"] = spec.homepage
+  spec.metadata["changelog_uri"] = "#{spec.homepage}/blob/master/CHANGELOG.md"
+  spec.metadata["rubygems_mfa_required"] = "true"
+
   spec.files         = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features)/})
   end
@@ -21,7 +26,11 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.13"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_dependency "itamae"
+
+  spec.add_development_dependency "bundler"
+  spec.add_development_dependency "docker-api"
+  spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency "serverspec"
 end

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

@@ -1,10 +1,15 @@
+include_recipe "datadog::install_datadog_agent_integration"
+
 node.reverse_merge!(
   datadog: {
     install_only: true,
     upgrade: false,
+    integration: {},
   }
 )
 
+package 'wget'
+
 execute 'download install script' do
   command 'wget https://raw.githubusercontent.com/DataDog/datadog-agent/main/cmd/agent/install_script.sh -O /tmp/install_script.sh'
 
@@ -25,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"
 
@@ -34,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.1"
+        VERSION = "0.3.1"
       end
     end
   end

data/mrblib

@@ -0,0 +1 @@
+lib

metadata

@@ -1,44 +1,73 @@
 --- !ruby/object:Gem::Specification
 name: itamae-plugin-recipe-datadog
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.1
 platform: ruby
 authors:
 - Takahiro Kiso (takanamito)
+- sue445
 - Speee, Inc.
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-03-19 00:00:00.000000000 Z
+date: 2022-04-02 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: itamae
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: docker-api
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -53,14 +82,32 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: serverspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Itamae plugin to install datadog-agent.
 email:
 - t.kiso0928@gmail.com
+- sue445@sue445.net
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/test.yml"
 - ".gitignore"
+- ".rspec"
+- CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt
@@ -71,12 +118,18 @@ 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/speee/itamae-plugin-recipe-datadog
+- mrblib
+homepage: https://github.com/itamae-plugins/itamae-plugin-recipe-datadog
 licenses:
 - MIT
-metadata: {}
-post_install_message: 
+metadata:
+  homepage_uri: https://github.com/itamae-plugins/itamae-plugin-recipe-datadog
+  source_code_uri: https://github.com/itamae-plugins/itamae-plugin-recipe-datadog
+  changelog_uri: https://github.com/itamae-plugins/itamae-plugin-recipe-datadog/blob/master/CHANGELOG.md
+  rubygems_mfa_required: 'true'
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -91,8 +144,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3.1
-signing_key: 
+rubygems_version: 3.2.22
+signing_key:
 specification_version: 4
 summary: Itamae plugin to install datadog-agent.
 test_files: []