itamae-plugin-recipe-datadog 0.1.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 9ef9a99a2c6b9a9fee9f47a5c72d47e52f776dfa
-  data.tar.gz: 4fd840dd4200d60c93c2549efb108584080bd39d
+SHA256:
+  metadata.gz: 0ae9b400e6f30b6f5fe507b7e385474e31e9293c8b6d7336b2e464cd3d2cf0f7
+  data.tar.gz: 30e35ccecb871ea1b32d03879d8e4074ac2dc44a97095d9f2b7af1d6db0de3b1
 SHA512:
-  metadata.gz: dcee3fbd297421fce4f9774448b00c6200840ccc1a90075618fbd08e23c72bb6c8bc0d10e971f49f4d4611af08eb0a9d2ca06d0700f59d46b23762439330d7e0
-  data.tar.gz: d7f0eb182ec47503ff790fe33470f9c25da3dc05a70c496091d4b1e51d93cc7b0a30ea99a25b51abaa3d1156237b129737aa8115b5de5981de7dabe200b68147
+  metadata.gz: bd1e76a1884865d23d5617bab9759db252928649bed56afb928a3b59a785c95a853fb6c513ebf7e5e7d43c667f5993ebe126682981c0fbf1e09d0d809269eb7a
+  data.tar.gz: fa74c66777b61efdeeba897ba78f89860b4ac9dbb844e1c7c12991ab705af912620877493d8ed1999d7fb5351aa989a80e82545675cd26034d7e4e690a8827f4

data/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2016 takanamito
+Copyright (c) 2016 takanamito and Speee, Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -34,14 +34,19 @@ include_recipe "datadog::install"
 datadog:
   api_key: xxxxxx
   install_only: false # default: true
+  upgrade: true # default: false
 ```
 
-`node[:datadog][:api_key]` is your datadog-agent API Key.  
-`node[:datadog][:install_only]` is an install option. If you want to install agent and don't start agent, please set this option`true`.
+- `node[:datadog][:api_key]`
+  - Your datadog-agent API Key.
+- `node[:datadog][:install_only]`
+  - 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.
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/takanamito/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/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.
 
 
 ## License

data/itamae-plugin-recipe-datadog.gemspec

@@ -6,12 +6,12 @@ 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)"]
+  spec.authors       = ["Takahiro Kiso (takanamito)", "Speee, Inc."]
   spec.email         = ["t.kiso0928@gmail.com"]
 
   spec.summary       = %q{Itamae plugin to install datadog-agent.}
   spec.description   = %q{Itamae plugin to install datadog-agent.}
-  spec.homepage      = "https://github.com/takanamito/itamae-plugin-recipe-datadog"
+  spec.homepage      = "https://github.com/speee/itamae-plugin-recipe-datadog"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files -z`.split("\x0").reject do |f|

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

@@ -1,21 +1,36 @@
 node.reverse_merge!(
   datadog: {
-    install_only: true
+    install_only: true,
+    upgrade: false,
   }
 )
 
 execute 'download install script' do
-  command 'wget https://raw.githubusercontent.com/DataDog/dd-agent/master/packaging/datadog-agent/source/install_agent.sh'
+  command 'wget https://raw.githubusercontent.com/DataDog/datadog-agent/main/cmd/agent/install_script.sh -O /tmp/install_script.sh'
+
+  # If upgrade is enabled, always download the latest install_script.sh
+  # If upgrade is disabled, download only when `/tmp/install_script.sh` doesn't exist
+  unless node[:datadog][:upgrade]
+    not_if 'ls /tmp/install_script.sh'
+  end
 end
 
-execute "change install script's permission" do
-  command 'chmod 755 install_agent.sh'
+file '/tmp/install_script.sh' do
+  action :edit
+  mode '0755'
 end
 
 execute 'install datadog-agent' do
-  if node[:datadog][:install_only]
-    command "DD_API_KEY=#{node[:datadog][:api_key]} DD_INSTALL_ONLY=true ./install_agent.sh"
-  else
-    command "DD_API_KEY=#{node[:datadog][:api_key]} ./install_agent.sh"
+  options = {}
+  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]
+  option_str = options.map { |k, v| "#{k}=#{v}" }.join(' ')
+  command "#{option_str} /tmp/install_script.sh"
+
+  # If upgrade is enabled, always run `install_script.sh`
+  # If upgrade is disabled, run `install_script.sh` only when datadog isn't installed
+  unless node[:datadog][:upgrade]
+    not_if 'ls /etc/datadog-agent/datadog.yaml'
   end
 end

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

@@ -2,7 +2,7 @@ module Itamae
   module Plugin
     module Recipe
       module Datadog
-        VERSION = "0.1.0"
+        VERSION = "0.2.1"
       end
     end
   end

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: itamae-plugin-recipe-datadog
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Takahiro Kiso (takanamito)
+- Speee, Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-12-28 00:00:00.000000000 Z
+date: 2022-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -71,7 +72,7 @@ files:
 - lib/itamae/plugin/recipe/datadog.rb
 - lib/itamae/plugin/recipe/datadog/install.rb
 - lib/itamae/plugin/recipe/datadog/version.rb
-homepage: https://github.com/takanamito/itamae-plugin-recipe-datadog
+homepage: https://github.com/speee/itamae-plugin-recipe-datadog
 licenses:
 - MIT
 metadata: {}
@@ -90,8 +91,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 3.0.3.1
 signing_key: 
 specification_version: 4
 summary: Itamae plugin to install datadog-agent.