mackerel-client 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 176593e33e5352c3d08929deccb4b9057444c94a
-  data.tar.gz: 29c015261d264cd3c009e22ae82891ec21a50986
+  metadata.gz: 3069a1328fe22ade45d038f43f84e0d284d31147
+  data.tar.gz: 358f4acb097b4bf6184ed740555916f4875b5aee
 SHA512:
-  metadata.gz: 0fb8fb582562ffe056601ffd24841e7e38d03b84ce1dc0b2790cade417d5c73179de2f4a659870288751dd25eb4c26e44d8e4015bddf73eda02e1817a57f7232
-  data.tar.gz: b45742f7555629d72650ee922921ae5a9abee7144e454570935e7e1acd37f36df95701aad9df623cdeef31ffa635a570313228e0914e6dd7a9a225e154a5f46b
+  metadata.gz: 22f6985dd1027bb676ae5ef310a32d35f619b2624d95069b411d051952e3410c109a19415ab65b09964a38fe83996ee3944b451540d5f4e169dd3ca2bbac67fd
+  data.tar.gz: 673b03abd2573c2aecc583412c3c89678974bf1d0436fda32ac5101b3c02710d93e7c4d8bd131899f967e4dbfd0e87f9e8b1906467cefd2c46a7eaac1609b7fd

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.3.0

data/lib/mackerel/client.rb

@@ -11,7 +11,7 @@ module Mackerel
     ERROR_MESSAGE_FOR_API_KEY_ABSENCE = "API key is absent. Set your API key in a environment variable called MACKEREL_APIKEY."
 
     def initialize(args = {})
-      @origin       = args[:mackerel_origin]  || 'https://mackerel.io'
+      @origin       = args[:mackerel_origin]  || 'https://api.mackerelio.com'
       @api_key      = args[:mackerel_api_key] || raise(ERROR_MESSAGE_FOR_API_KEY_ABSENCE)
       @timeout      = args[:timeout]          || 30 # Ref: apiRequestTimeout at mackerel-agent
       @open_timeout = args[:open_timeout]     || 30 # Ref: apiRequestTimeout at mackerel-agent
@@ -137,10 +137,11 @@ module Mackerel
     def get_hosts(opts = {})
       response = client.get '/api/v0/hosts' do |req|
         req.headers['X-Api-Key'] = @api_key
-        req.params['service']    = opts[:service] if opts[:service]
-        req.params['role']       = opts[:roles]   if opts[:roles]
-        req.params['name']       = opts[:name]    if opts[:name]
-        req.params['status']     = opts[:status]  if opts[:status]
+        req.params['service']          = opts[:service]          if opts[:service]
+        req.params['role']             = opts[:roles]            if opts[:roles]
+        req.params['name']             = opts[:name]             if opts[:name]
+        req.params['status']           = opts[:status]           if opts[:status]
+        req.params['customIdentifier'] = opts[:customIdentifier] if opts[:customIdentifier]
       end
 
       unless response.success?

data/lib/mackerel/host.rb

@@ -3,20 +3,21 @@ module Mackerel
   class Host
 
     MACKEREL_INTERFACE_NAME_PATTERN = /^eth\d/
-    attr_accessor :name, :type, :status, :memo, :isRetired, :id, :createdAt, :roles, :interfaces
+    attr_accessor :name, :type, :status, :memo, :isRetired, :id, :createdAt, :roles, :interfaces, :customIdentifier
 
     def initialize(args = {})
-      @hash       = args
-      @name       = args["name"]
-      @meta       = args["meta"]
-      @type       = args["type"]
-      @status     = args["status"]
-      @memo       = args["memo"]
-      @isRetired  = args["isRetired"]
-      @id         = args["id"]
-      @createdAt  = args["createdAt"]
-      @roles      = args["roles"]
-      @interfaces = args["interfaces"]
+      @hash             = args
+      @name             = args["name"]
+      @meta             = args["meta"]
+      @type             = args["type"]
+      @status           = args["status"]
+      @memo             = args["memo"]
+      @isRetired        = args["isRetired"]
+      @id               = args["id"]
+      @createdAt        = args["createdAt"]
+      @roles            = args["roles"]
+      @interfaces       = args["interfaces"]
+      @customIdentifier = args["customIdentifier"]
     end
 
     def ip_addr

data/lib/mackerel/metadata.rb

@@ -0,0 +1,58 @@
+module Mackerel
+
+  class Client
+
+    def list_metadata(host_id)
+      response = client.get "/api/v0/hosts/#{host_id}/metadata" do |req|
+        req.headers['X-Api-Key'] = @api_key
+      end
+
+      unless response.success?
+        raise "GET /api/v0/hosts/#{host_id}/metadata failed: #{response.status} #{response.body}"
+      end
+
+      JSON.parse(response.body)
+    end
+
+    def get_metadata(host_id, namespace)
+      response = client.get "/api/v0/hosts/#{host_id}/metadata/#{namespace}" do |req|
+        req.headers['X-Api-Key'] = @api_key
+      end
+
+      unless response.success?
+        raise "GET /api/v0/hosts/#{host_id}/metadata/#{namespace} failed: #{response.status} #{response.body}"
+      end
+
+      JSON.parse(response.body)
+    end
+
+    def update_metadata(host_id, namespace, data)
+      response = client.put "/api/v0/hosts/#{host_id}/metadata/#{namespace}" do |req|
+        req.headers['X-Api-Key'] = @api_key
+        req.headers['Content-Type'] = 'application/json'
+        req.body = data.to_json
+      end
+
+      unless response.success?
+        raise "PUT /api/v0/hosts/#{host_id}/metadata/#{namespace} failed: #{response.status} #{response.body}"
+      end
+
+      JSON.parse(response.body)
+    end
+
+    def delete_metadata(host_id, namespace)
+      response = client.delete "/api/v0/hosts/#{host_id}/metadata/#{namespace}" do |req|
+        req.headers['X-Api-Key'] = @api_key
+        req.headers['Content-Type'] = 'application/json'
+      end
+
+      unless response.success?
+        raise "DELETE /api/v0/hosts/#{host_id}/metadata/#{namespace} failed: #{response.status} #{response.body}"
+      end
+
+      JSON.parse(response.body)
+    end
+
+  end
+
+end

data/lib/mackerel/runner.rb

@@ -88,6 +88,7 @@ module Mackerel
         opt.on('--role ROLE')      {|v| params[:roles] = v }
         opt.on('--name NAME')      {|v| params[:name] = v }
         opt.on('--host-id HOSTID') {|v| params[:hostId] = v }
+        opt.on('--custom-identifier IDENTIFIER') {|v| params[:customIdentifier] = v }
         opt.parse!(args)
         begin
           if params[:hostid]

data/lib/mackerel.rb

@@ -1,4 +1,5 @@
 require 'mackerel/client'
 require 'mackerel/monitor'
+require 'mackerel/metadata'
 require 'mackerel/runner'
 

data/spec/mackerel/client_spec.rb

@@ -438,7 +438,7 @@ describe Mackerel::Client do
       {
         'id' => 'XXX',
         'service' => 'myService',
-        'role' => ['role1', 'role2'],
+        'roles' => ['role1', 'role2'],
         'from' => 123456,
         'to' => 123457,
         'title' => 'Some event',
@@ -449,7 +449,7 @@ describe Mackerel::Client do
     let(:annotation) {
       {
         service: 'myService',
-        role: ['role1', 'role2'],
+        roles: ['role1', 'role2'],
         from: 123456,
         to: 123457,
         title: 'Some event',
@@ -465,4 +465,141 @@ describe Mackerel::Client do
       expect(client.post_graph_annotation(annotation)).to eq(response_object)
     end
   end
+
+  describe '#list_metadata' do
+    let(:stubbed_response) { [200, {}, JSON.dump(response_object)] }
+
+    let(:test_client) {
+      Faraday.new do |builder|
+        builder.adapter :test do |stubs|
+          stubs.get(api_path) { stubbed_response }
+        end
+      end
+    }
+
+    let(:host_id) { '21obeF4PhZN' }
+
+    let(:api_path) { "/api/v0/hosts/#{host_id}/metadata" }
+
+    let(:response_object) {
+      {
+        'metadata' => [
+          { 'namespace' => 'namespace1' },
+          { 'namespace' => 'namespace2' }
+        ]
+      }
+    }
+
+    before do
+      allow(client).to receive(:http_client).and_return(test_client)
+    end
+
+    it 'successfully gets metadata namespaces' do
+      expect(client.list_metadata(host_id)).to eq(response_object)
+    end
+  end
+
+  describe '#get_metadata' do
+    let(:stubbed_response) { [200, {}, JSON.dump(response_object)] }
+
+    let(:test_client) {
+      Faraday.new do |builder|
+        builder.adapter :test do |stubs|
+          stubs.get(api_path) { stubbed_response }
+        end
+      end
+    }
+
+    let(:host_id) { '21obeF4PhZN' }
+
+    let(:namespace) { 'namespace' }
+
+    let(:api_path) { "/api/v0/hosts/#{host_id}/metadata/#{namespace}" }
+
+    let(:response_object) {
+      {
+        'type' => 12345,
+        'region' => 'jp',
+        'env' => 'staging',
+        'instance_type' => 'c4.xlarge'
+      }
+    }
+
+    before do
+      allow(client).to receive(:http_client).and_return(test_client)
+    end
+
+    it 'successfully gets metadata' do
+      expect(client.get_metadata(host_id, namespace)).to eq(response_object)
+    end
+  end
+
+  describe '#update_metadata' do
+    let(:stubbed_response) { [200, {}, JSON.dump(response_object)] }
+
+    let(:test_client) {
+      Faraday.new do |builder|
+        builder.adapter :test do |stubs|
+          stubs.put(api_path) { stubbed_response }
+        end
+      end
+    }
+
+    let(:host_id) { '21obeF4PhZN' }
+
+    let(:namespace) { 'namespace' }
+
+    let(:api_path) { "/api/v0/hosts/#{host_id}/metadata/#{namespace}" }
+
+    let(:response_object) {
+      { 'success' => true }
+    }
+
+    let(:metadata) {
+      {
+        'type' => 12345,
+        'region' => 'jp',
+        'env' => 'staging',
+        'instance_type' => 'c4.xlarge'
+      }
+    }
+
+    before do
+      allow(client).to receive(:http_client).and_return(test_client)
+    end
+
+    it 'successfully updates metadata' do
+      expect(client.update_metadata(host_id, namespace, metadata)).to eq(response_object)
+    end
+  end
+
+  describe '#delete_metadata' do
+    let(:stubbed_response) { [200, {}, JSON.dump(response_object)] }
+
+    let(:test_client) {
+      Faraday.new do |builder|
+        builder.adapter :test do |stubs|
+          stubs.delete(api_path) { stubbed_response }
+        end
+      end
+    }
+
+    let(:host_id) { '21obeF4PhZN' }
+
+    let(:namespace) { 'namespace' }
+
+    let(:api_path) { "/api/v0/hosts/#{host_id}/metadata/#{namespace}" }
+
+    let(:response_object) {
+      { 'success' => true }
+    }
+
+    before do
+      allow(client).to receive(:http_client).and_return(test_client)
+    end
+
+    it 'successfully updates metadata' do
+      expect(client.delete_metadata(host_id, namespace)).to eq(response_object)
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mackerel-client
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Mackerel developer team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-24 00:00:00.000000000 Z
+date: 2017-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -90,6 +90,7 @@ files:
 - lib/mackerel/client.rb
 - lib/mackerel/client/helper.rb
 - lib/mackerel/host.rb
+- lib/mackerel/metadata.rb
 - lib/mackerel/monitor.rb
 - lib/mackerel/runner.rb
 - mackerel-client.gemspec
@@ -117,7 +118,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Mackerel client implemented by Ruby.