diplomat 2.2.2 → 2.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8f59497c078200136ba585049f9182453f0c3ee359a4af6abaf1f99f3387c3a8
-  data.tar.gz: 5b403009daf7a462efaf2056a4cc21b255d4baf832c784f9d3ea3eff86214946
+  metadata.gz: d677dfbfe3aef16d16366943f4b664181fbaef9c40cc00161e446bee7b4bf426
+  data.tar.gz: 835d978f094d95de09159ec6145f368fa40d8fa9e21ac23d43ce4c3378782663
 SHA512:
-  metadata.gz: 3de2930fb3ca89ece1d973aeb584f904cb023ff4dfaa96804e461c6d7b24b14f43726adda01a92bbc6227d49d5871750b393b0c5ac6c47a94f334ff7ab6c72d6
-  data.tar.gz: 6555bf2a8687443e7db4b2802b71b4c06fc72d33e936914961dbb0fd93ba0c6acfb35985d69d86fee2a628765f2678e603d1039d11e29d1d3113cd8f2ba7b094
+  metadata.gz: 375f689771a43ba6c363221a52db02c7ca0672797b924cc962c6d091d601b90fbb880c823ff8b123e15670ed9d5627dfc5a37093c62169ab22c2af023f266820
+  data.tar.gz: a9fc13759380a6f97730a1d7030c732a2f6e6f8b1cbdb8fb012be6c7156f94bd3b2e29342ac7926c4e4e268e6f113881fa9f26b09862d703e9ba92972710af01

data/lib/diplomat/version.rb

@@ -1,3 +1,3 @@
 module Diplomat
-  VERSION = '2.2.2'.freeze
+  VERSION = '2.2.3'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: diplomat
 version: !ruby/object:Gem::Version
-  version: 2.2.2
+  version: 2.2.3
 platform: ruby
 authors:
 - John Hamelink
@@ -239,12 +239,6 @@ files:
 - lib/diplomat/session.rb
 - lib/diplomat/status.rb
 - lib/diplomat/version.rb
-- lib/diplomatic_bag.rb
-- lib/diplomatic_bag/datacenters.rb
-- lib/diplomatic_bag/info.rb
-- lib/diplomatic_bag/nodes.rb
-- lib/diplomatic_bag/service.rb
-- lib/diplomatic_bag/services.rb
 homepage: https://github.com/WeAreFarmGeek/diplomat
 licenses:
 - BSD-3-Clause

data/lib/diplomatic_bag.rb

@@ -1,7 +0,0 @@
-require 'diplomat'
-
-# Usefull usage of Diplomat lib.
-module DiplomaticBag
-  # Load all module files
-  Dir[File.join(__dir__, 'diplomatic_bag', '*.rb')].each { |file| require file }
-end

data/lib/diplomatic_bag/datacenters.rb

@@ -1,11 +0,0 @@
-# Usefull usage of Diplomat lib: Datacenter functions
-module DiplomaticBag
-  def self.get_datacenters_list(dc, options = {})
-    dcs = []
-    datacenters = Diplomat::Datacenter.get(nil, options)
-    dc.each do |c|
-      dcs.concat(datacenters.select { |d| d[/#{c}/] })
-    end
-    dcs.uniq
-  end
-end

data/lib/diplomatic_bag/info.rb

@@ -1,32 +0,0 @@
-# Usefull usage of Diplomat lib: Info functions
-module DiplomaticBag
-  # rubocop:disable AbcSize
-  def self.consul_info(options = {})
-    consul_self = Diplomat::Agent.self(options)
-    puts 'Server: ' + consul_self['Config']['NodeName']
-    puts 'Datacenter: ' + consul_self['Config']['Datacenter']
-    puts 'Consul Version: ' + consul_self['Config']['Version']
-    if consul_self['Stats']['consul']['leader_addr']
-      puts 'Leader Address: ' + consul_self['Stats']['consul']['leader_addr']
-      puts 'applied_index: ' + consul_self['Stats']['raft']['applied_index']
-      puts 'commit_index: ' + consul_self['Stats']['raft']['commit_index']
-    end
-    members = Diplomat::Members.get(options)
-    servers = members.select { |member| member['Tags']['role'] == 'consul' }.sort_by { |n| n['Name'] }
-    nodes = members.select { |member| member['Tags']['role'] == 'node' }
-    leader = Diplomat::Status.leader(options).split(':')[0]
-    puts 'Servers Count: ' + servers.count.to_s
-    puts 'Nodes Count: ' + nodes.count.to_s
-    puts 'Servers:'
-    servers.map do |s|
-      if s['Tags']['role'] == 'consul'
-        if s['Addr'] == leader
-          puts '  ' + s['Name'] + ' ' + s['Addr'] + ' *Leader*'
-        else
-          puts '  ' + s['Name'] + ' ' + s['Addr']
-        end
-      end
-    end
-  end
-  # rubocop:enable AbcSize
-end

data/lib/diplomatic_bag/nodes.rb

@@ -1,28 +0,0 @@
-# Usefull usage of Diplomat lib: Nodes functions
-module DiplomaticBag
-  def self.get_duplicate_node_id(options = {})
-    status = {
-      1 => 'Alive',
-      2 => '?',
-      3 => 'Left',
-      4 => 'Failed'
-    }
-    result = []
-    members = Diplomat::Members.get(options)
-    grouped = members.group_by do |row|
-      [row['Tags']['id']]
-    end
-    filtered = grouped.values.select { |a| a.size > 1 }
-    filtered.each do |dup|
-      instance = {}
-      instance[:node_id] = dup[0]['Tags']['id']
-      nodes = []
-      dup.each do |inst|
-        nodes << { name: inst['Name'], status: status[inst['Status']] }
-      end
-      instance[:nodes] = nodes
-      result << instance
-    end
-    result
-  end
-end

data/lib/diplomatic_bag/service.rb

@@ -1,20 +0,0 @@
-# Usefull usage of Diplomat lib: Service functions
-module DiplomaticBag
-  def self.get_service_info(service, options = {})
-    result = {}
-    health = Diplomat::Health.service(service, options)
-    result[service] = {}
-    health.each do |h|
-      result[service][h['Node']['Node']] = {
-        'Address': h['Node']['Address'],
-        'Port': h['Service']['Port']
-      }
-      checks = {}
-      h['Checks'].each do |c|
-        checks[c['Name']] = { 'status': c['Status'], 'output': c['Output'] }
-      end
-      result[service][h['Node']['Node']]['Checks'] = checks
-    end
-    result
-  end
-end

data/lib/diplomatic_bag/services.rb

@@ -1,38 +0,0 @@
-# Usefull usage of Diplomat lib: Services functions
-module DiplomaticBag
-  def self.compute_service_name(s)
-    return '/node::health/' if s.nil? || s == ''
-
-    s
-  end
-
-  def self.get_all_services_status(options = {})
-    result = {}
-    services = Diplomat::Health.state('any', options)
-    grouped_by_service = services.group_by { |h| compute_service_name(h['ServiceName']) }.values
-    grouped_by_service.each do |s|
-      grouped_by_status = s.group_by { |h| h['Status'] }.values
-      status = {}
-      grouped_by_status.each do |state|
-        status[state[0]['Status']] = state.count
-      end
-      service_name = compute_service_name(s[0]['ServiceName'])
-      result[service_name] = status
-    end
-    result
-  end
-
-  def self.get_services_list(service, options = {})
-    services = Diplomat::Service.get_all(options)
-    services.to_h.keys.grep(/#{service}/)
-  end
-
-  def self.get_services_info(service, options = {})
-    result = []
-    services = get_services_list(service, options)
-    services.each do |s|
-      result << get_service_info(s.to_s, options)
-    end
-    result
-  end
-end