itamae-plugin-recipe-mackerel-agent 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 78c648f860e2aa4a33f542635c81e588f6bc40c5
-  data.tar.gz: 478c6b3379733232105d516f96c7c6d4e27b7b2f
+SHA256:
+  metadata.gz: 32b8878125789889b3ffcace544aa5e6c617e9c74d4166fc7b73a5ace6c6dae6
+  data.tar.gz: 2d624ace112e40ff87ac4920fc949e0f3926a907544ebc344a9aa332f7cd82ee
 SHA512:
-  metadata.gz: 861fb92d9cfaf19d759b43a04e47de49ddfaca85b7572e158062c4031c5ec6853ed6607a068358112ba4c5a778afe809bbdd2e1224ab3487157c036a0adb0a6d
-  data.tar.gz: 7112f81cab5bae099d8148f3348974181c141d9e58e4e893a94540f9f27076ec229c5170ad669a0cab6cd34eed0dbbecd4e378cb81cc20c7bba75c309947083c
+  metadata.gz: 281b369eebfd0e7fef9c080a21c3a28eaad3dc6dd49d0693edeb74bc6e4fa7254f7cf45e18a99a09f09853a369a8b5b5acc50ab36b2dee6b278bef5feccc20ca
+  data.tar.gz: 20e16bbce15e60455c2606155b91546845cbecdaff929556d23b1a85157f3043ae6e8fb6f32d1c29f9af397a519b82072a77aa506fd3e4419b52e0ce0c6fca91

data/CHANGELOG.md

@@ -0,0 +1,19 @@
+mackerel-agent recipe CHANGELOG
+=================================
+
+This file is used to list changes made in each version of the mackerel-agent recipe.
+
+v0.0.3
+------
+- Support v2 packages #9 (by hayajo)
+- New URL for GPG-KEY-mackerel #8 (by astj)
+- Improve readme #7 (by shogo82148)
+
+v0.0.2
+------
+- Require node['mackerel-agent']['conf']['apikey'] attribute #6 (by unasuke)
+- Set metadata gemspec.homepage to github repository #5 (by unasuke)
+
+v0.0.1
+------
+- Development release

data/README.md

@@ -1,6 +1,8 @@
 # Itamae::Plugin::Recipe::Mackerel::Agent
 
-TODO: Write a gem description
+[![Gem Version](https://badge.fury.io/rb/itamae-plugin-recipe-mackerel-agent.svg)](https://badge.fury.io/rb/itamae-plugin-recipe-mackerel-agent)
+
+[Itamae](https://github.com/itamae-kitchen/itamae) recipe plugin for [mackerel-agent](https://github.com/mackerelio/mackerel-agent)
 
 ## Installation
 
@@ -20,11 +22,33 @@ Or install it yourself as:
 
 ## Usage
 
-TODO: Write usage instructions here
+Load the recipe file in gems by `include_recipe`.
+
+```ruby
+include_recipe "mackerel-agent"
+```
+
+## Attributes
+
+```ruby
+# API key (REQUIRED)
+node['mackerel-agent']['conf']['apikey'] = 'YOUR API KEY'
+
+# Roles (optional)
+node['mackerel-agent']['conf']['roles'] = ["My-Service:app", "Another-Service:db"]
+
+# Install official plugins (optional)
+node['plugins'] = ['mackerel-agent-plugins', 'mackerel-check-plugins']
+
+# Enable plugins (optional)
+node['mackerel-agent']['conf']['plugin.metrics.vmstat'] = {
+  'command' => 'ruby /etc/sensu/plugins/system/vmstat-metrics.rb',
+}
+```
 
 ## Contributing
 
-1. Fork it ( https://github.com/[my-github-username]/itamae-plugin-recipe-mackerel-agent/fork )
+1. Fork it ( https://github.com/mackerelio/itamae-plugin-recipe-mackerel-agent/fork )
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)

data/RELEASE.md

@@ -0,0 +1,10 @@
+RELEASE
+=======
+
+1. Create release branch. (`git checkout -b version-<VERSION>`)
+1. Bump version `lib/itamae/plugin/recipe/mackerel-agent/version.rb` file.
+1. Push release branch to upstream(GitHub). (`git push -u origin version-<VERSION>`)
+1. Create Pull-Request on Github.
+1. Merge Pull-Request to master branch on Github.
+1. Tagging and Release. (`rake release`)
+

data/lib/itamae/plugin/recipe/mackerel-agent/default.rb

@@ -7,24 +7,55 @@ node['mackerel-agent']['start_on_setup'] = node['mackerel-agent'].fetch('start_o
 node['mackerel-agent']['package-action'] = node['mackerel-agent'].fetch('package-action', :install)
 node['mackerel-agent']['plugins'] = node['mackerel-agent'].fetch('plugins', [])
 
+def platform_version_satisfy?(op)
+  Gem::Requirement.create(op).satisfied_by?(Gem::Version.create(node[:platform_version]))
+end
+
 case node[:platform]
 when "debian", "ubuntu"
-  remote_file "/etc/apt/sources.list.d/mackerel.list"
-  execute "import mackerel GPG key" do
-    command "curl -fsS https://mackerel.io/assets/files/GPG-KEY-mackerel | apt-key add -"
+  if (node[:platform] == "debian" and platform_version_satisfy?('>= 8')) or (node[:platform] == "ubuntu" and platform_version_satisfy?('>= 16.04'))
+    execute "import mackerel GPG key v2" do
+      command "curl -fsSL https://mackerel.io/file/cert/GPG-KEY-mackerel-v2 | apt-key add -"
+    end
+    remote_file "/etc/apt/sources.list.d/mackerel.list" do
+      source "./files/etc/apt/sources.list.d/mackerel-v2.list"
+    end
+  else
+    execute "import mackerel GPG key" do
+      command "curl -fsSL https://mackerel.io/file/cert/GPG-KEY-mackerel | apt-key add -"
+    end
+    remote_file "/etc/apt/sources.list.d/mackerel.list"
   end
   execute "apt-get update -qq"
 when "redhat", "fedora"
-  execute "import mackerel GPG key" do
-    command "rpm --import https://mackerel.io/assets/files/GPG-KEY-mackerel"
+  if node[:platform] == "redhat" and platform_version_satisfy?('>= 7')
+    execute "import mackerel GPG key v2" do
+      command "rpm --import https://mackerel.io/file/cert/GPG-KEY-mackerel-v2"
+    end
+    remote_file "/etc/yum.repos.d/mackerel.repo" do
+      source "./files/etc/yum.repos.d/mackerel-v2.repo"
+    end
+  else
+    execute "import mackerel GPG key" do
+      command "rpm --import https://mackerel.io/file/cert/GPG-KEY-mackerel"
+    end
+    remote_file "/etc/yum.repos.d/mackerel.repo"
   end
-  remote_file "/etc/yum.repos.d/mackerel.repo"
 when "amazon"
-  execute "import mackerel GPG key" do
-    command "rpm --import https://mackerel.io/assets/files/GPG-KEY-mackerel"
-  end
-  remote_file "/etc/yum.repos.d/mackerel.repo" do
-    source "./files/etc/yum.repos.d/mackerel-amznlinux.repo"
+  if platform_version_satisfy?('~> 2.0')
+    execute "import mackerel GPG key v2" do
+      command "rpm --import https://mackerel.io/file/cert/GPG-KEY-mackerel-v2"
+    end
+    remote_file "/etc/yum.repos.d/mackerel.repo" do
+      source "./files/etc/yum.repos.d/mackerel-amznlinux-v2.repo"
+    end
+  else
+    execute "import mackerel GPG key" do
+      command "rpm --import https://mackerel.io/file/cert/GPG-KEY-mackerel"
+    end
+    remote_file "/etc/yum.repos.d/mackerel.repo" do
+      source "./files/etc/yum.repos.d/mackerel-amznlinux.repo"
+    end
   end
 else
   raise "not supported this platform: " + node[:platform]

data/lib/itamae/plugin/recipe/mackerel-agent/files/etc/apt/sources.list.d/mackerel-v2.list

@@ -0,0 +1 @@
+deb http://apt.mackerel.io/v2/ mackerel contrib

data/lib/itamae/plugin/recipe/mackerel-agent/files/etc/yum.repos.d/mackerel-amznlinux-v2.repo

@@ -0,0 +1,5 @@
+[mackerel]
+name=mackerel-agent
+baseurl=http://yum.mackerel.io/amznlinux/v2/$releasever/$basearch
+gpgcheck=1
+enabled=1

data/lib/itamae/plugin/recipe/mackerel-agent/files/etc/yum.repos.d/mackerel-v2.repo

@@ -0,0 +1,5 @@
+[mackerel]
+name=mackerel-agent
+baseurl=http://yum.mackerel.io/v2/$basearch
+gpgcheck=1
+enabled=1

data/lib/itamae/plugin/recipe/mackerel-agent/version.rb

@@ -3,7 +3,7 @@ module Itamae
     module Recipe
       module Mackerel
         module Agent
-          VERSION = "0.0.2"
+          VERSION = "0.0.3"
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: itamae-plugin-recipe-mackerel-agent
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - mackerel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-05 00:00:00.000000000 Z
+date: 2018-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: toml
@@ -60,15 +60,20 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
+- RELEASE.md
 - Rakefile
 - itamae-plugin-recipe-mackerel-agent.gemspec
 - lib/itamae-plugin-recipe-mackerel-agent.rb
 - lib/itamae/plugin/recipe/mackerel-agent/default.rb
+- lib/itamae/plugin/recipe/mackerel-agent/files/etc/apt/sources.list.d/mackerel-v2.list
 - lib/itamae/plugin/recipe/mackerel-agent/files/etc/apt/sources.list.d/mackerel.list
+- lib/itamae/plugin/recipe/mackerel-agent/files/etc/yum.repos.d/mackerel-amznlinux-v2.repo
 - lib/itamae/plugin/recipe/mackerel-agent/files/etc/yum.repos.d/mackerel-amznlinux.repo
+- lib/itamae/plugin/recipe/mackerel-agent/files/etc/yum.repos.d/mackerel-v2.repo
 - lib/itamae/plugin/recipe/mackerel-agent/files/etc/yum.repos.d/mackerel.repo
 - lib/itamae/plugin/recipe/mackerel-agent/version.rb
 homepage: https://github.com/mackerelio/itamae-plugin-recipe-mackerel-agent
@@ -91,7 +96,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Itamae mackerel-agent recipe plugin