consul-template-generator 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e83ab23ae54572356ce129668163fee3b3a757b4
-  data.tar.gz: c1e643112b7b3270156034898e22c8a935e561f3
+  metadata.gz: 8bc42e4ac6ae599136ce6b8c458d8a72bc1db9c2
+  data.tar.gz: eaa801befcdbc1196ad2bc753c7ec5e0ff3960e1
 SHA512:
-  metadata.gz: 145873bb669e90d5063a90bbb371518fc7d2f1abd1a2dfe04748110d50f5d71ff68472a1f754d6a07f7d0342dcd8296327638dc6e6d5eb58167b47a8366c6207
-  data.tar.gz: f04dcf06a852292d0f2907377034a036aa48171fb4285ca3a0d9cf4669e005d109e8b38a70b86eb4f7242cd2327dfc5f83ada5e6085e729672f0e75785ab90ba
+  metadata.gz: 5f036b92be9660f0478e4c6dd514fffa2ce65bb89f25e3ebd8818d3d4bcb5982d333d9a6fab02dc7fb8cb7dc9488278f1298c082479b72a2a1b9b1b45cb350be
+  data.tar.gz: ed9399d2f4c696d89b7e30a69dfd7280066517ea7fabf578c3b35615967116468e556aff9e8814f4d5a2c0a3ff3fad5790443b8a33c3f54412997e97405dce7e

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    consul-template-generator (0.3.1)
+    consul-template-generator (0.3.3)
       diplomat (~> 0.12.0)
       popen4 (~> 0.1.2)
 

data/bin/consul-template-generator

@@ -5,9 +5,28 @@ require 'consul/template/generator/cmd'
 include Consul::Template::Generator
 
 def verify_opts(opts)
-  !(opts[:templates].empty? || opts[:templates].any? { |k,v| v.nil? })
+  templates_supplied = !(opts[:templates].empty? || opts[:templates].any? { |k,v| v.nil? })
+  return false unless templates_supplied
+  unless opts[:graphite_host].nil?
+    return false if opts[:graphite_paths].empty?
+  end
+  templates_supplied
 end
 
+def process_templates(t_string)
+  Hash[t_string.split(',').collect do |tmpl|
+    parts = tmpl.split(':')
+    [parts[0], parts[1]]
+  end]
+end
+
+def process_graphite_paths(t_string)
+  return {} if t_string.split(',')[0].split(':').length < 3
+  Hash[t_string.split(',').collect do |tmpl|
+    parts = tmpl.split(':')
+    [parts[0], parts[2]]
+  end]
+end
 
 options = {}
 opt_parser = OptionParser.new do |opts|
@@ -27,8 +46,15 @@ EOC
   end
 
   options[:templates] = {}
-  opts.on('-t TEMPLATES', '--templates TEMPLATES', 'Comma separated list of consul-template ctmpl file and keys to monitor, tmple.ctmpl:tmple-key,tmple2.ctmpl:templ-key2  (required)') do |t|
-    options[:templates] = Hash[t.split(',').collect { |v| v.split(':') } ]
+  options[:graphite_paths] = {}
+  opts.on('-t TEMPLATES',
+          '--templates TEMPLATES',
+          'Comma separated list of consul-template ctmpl file and keys to monitor, tmple.ctmpl:tmple-key,tmple2.ctmpl:templ-key2  (required)',
+          'If \'--graphite-host\' is supplied, target graphite path must also be supplied, e.g.',
+          '    tmple.ctmpl:tmple-key:consul.template.HOSTNAME.<template name>,tmple2.ctmpl:tmple-key2:consul.template.HOSTNAME.<template name>',
+          'where \'HOSTNAME\' will be replaced as one might expect.') do |t|
+    options[:templates] = process_templates(t)
+    options[:graphite_paths] = process_graphite_paths(t)
   end
 
   options[:session_key] = 'consul-template-generator'
@@ -36,11 +62,6 @@ EOC
     options[:session_key] = l
   end
 
-  options[:proxy] = nil
-  opts.on('-p PROXY_URL', '--proxy PROXY_URL', 'Proxy URL if required (e.g. http://proxy.example.com:3128)') do |p|
-    options[:proxy] = p
-  end
-
   options[:unset_proxy] = false
   opts.on(nil, '--unset-proxy', "Use if 'http_proxy' is set in your environment, but you don't want to use it...") do |u|
     options[:unset_proxy] = true
@@ -60,13 +81,27 @@ EOC
   opts.on(nil, '--lock-sleep LOCK_SLEEP', "Sleep interval in seconds between each attempt to obtain a session lock [default: 1.0]") do |s|
     options[:cycle_sleep] = s.to_f
   end
+
+  options[:graphite_host] = nil
+  opts.on('-g GRAPHITE_HOST', '--graphite-host GRAPHITE_HOST', "Graphite host to post template update events to (optional)") do |g|
+    if g.split(':').length != 2
+      STDERR.puts "GRAPHITE_HOST must be defined as <host>:<port> pair\n\n"
+      puts opt_parser
+      exit(1)
+    end
+    options[:graphite_host] = g
+  end
 end
 
+opt_parser.version = VERSION
 opt_parser.parse!
 
-
 unless verify_opts(options)
-  STDOUT.puts "'--templates' must be provided with <template>:<key> pairs\n\n"
+  if options[:graphite_host].nil?
+    STDERR.puts "'--templates' must be provided with <template>:<key> pairs\n\n"
+  else
+    STDERR.puts "'--templates' must be provided with <template>:<key>:<graphite path> triplets\n\n"
+  end
   puts opt_parser
   exit(1)
 end
@@ -75,7 +110,7 @@ if options[:unset_proxy]
   ENV['http_proxy'] = nil
 end
 
-CMD.configure(options[:consul], options[:templates], options[:session_key], options[:log_level], options[:proxy])
+CMD.configure(options[:consul], options[:templates], options[:session_key], options[:log_level], options[:graphite_host], options[:graphite_paths])
 
 ec = 1
 cmd = ARGV[0]

data/lib/consul/template/generator.rb

@@ -2,6 +2,7 @@ require_relative 'generator/cmd'
 require_relative 'generator/ct'
 require_relative 'generator/configuration'
 require_relative 'generator/error'
+require_relative 'generator/graphite'
 require_relative 'generator/init'
 require_relative 'generator/key_value'
 require_relative 'generator/run'

data/lib/consul/template/generator/cmd.rb

@@ -7,12 +7,14 @@ module Consul
         include Consul::Template::Generator
         class << self
 
-          def configure(consul_host, templates, session_key, log_level, proxy = nil)
+          def configure(consul_host, templates, session_key, log_level, graphite_host = nil, graphite_paths = nil)
             Consul::Template::Generator.configure do |config|
               config.log_level = log_level
               config.templates = templates
               config.session_key = session_key
               config.consul_host = consul_host
+              config.graphite_host = graphite_host
+              config.graphite_paths = graphite_paths || {}
             end
             @config = Consul::Template::Generator.config
           end
@@ -20,6 +22,7 @@ module Consul
           def configure_signal_handlers
             Signal.trap("INT") do
               @config.logger.error "Received INT signal..."
+              @terminated = true
               @interrupted = true
             end
             Signal.trap("TERM") do
@@ -43,7 +46,13 @@ module Consul
                 @config.logger.info "Session lock acquired..."
                 begin
                   @config.templates.each do |template,template_key|
-                    uploaded_hashes[template] = runner.run(template, template_key, uploaded_hashes[template]) || uploaded_hashes[template]
+                    new_hash = runner.run(template, template_key, uploaded_hashes[template])
+                    unless new_hash.nil?
+                      uploaded_hashes[template] =  new_hash
+                      if @config.graphite_paths.include? template
+                        runner.post_graphite_event @config.graphite_paths[template]
+                      end
+                    end
                     sleep cycle_sleep
                   end
                 rescue ConsulSessionExpired
@@ -70,7 +79,12 @@ module Consul
             begin
               @config.templates.each do |template,template_key|
                 runner = CTRunner.new
-                result = runner.run template, template_key
+                result = runner.run(template, template_key)
+                unless result.nil?
+                  if @config.graphite_paths.include? template
+                    runner.post_graphite_event @config.graphite_paths[template]
+                  end
+                end
               end
             rescue Exception => e
               @config.logger.error "An unexpected error occurred, unable to process template: #{e.message}"

data/lib/consul/template/generator/configuration.rb

@@ -39,7 +39,7 @@ module Consul
       end
 
       class Configuration
-        attr_accessor :templates, :session_key, :consul_template_binary, :logger, :log_level
+        attr_accessor :templates, :session_key, :consul_template_binary, :logger, :log_level, :graphite_host, :graphite_paths
         attr_accessor :consul_host, :node, :client_options
 
         def initialize
@@ -47,9 +47,11 @@ module Consul
           @node = nil
           @consul_host = nil
           @templates = {}
+          @graphite_paths = {}
           @session_key = 'consul-template-generator'
           @client_options = {}
           @logger = Consul::Template::Generator::STDLogger
+          @graphite_host = nil
         end
 
         def lock_key(key)

data/lib/consul/template/generator/graphite.rb

@@ -0,0 +1,21 @@
+require 'socket'
+
+module Consul
+  module Template
+    module Generator
+      class CTRunner
+        def post_graphite_event(path)
+          @config.logger.debug "Posting event to graphite. Server: #{@config.graphite_host}, Path: #{path}"
+          host, port = @config.graphite_host.split(':')
+          begin
+            s = TCPSocket.open(host, port)
+            s.write("#{path} 1 #{Time.new.to_i}\n")
+            s.close
+          rescue Exception => e
+            @config.logger.error "An unknown error occurred while posting data to graphite: #{e.message}"
+          end
+        end
+      end
+    end
+  end
+end

data/lib/consul/template/generator/version.rb

@@ -1,7 +1,7 @@
 module Consul
   module Template
     module Generator
-      VERSION = '0.3.2'
+      VERSION = '0.3.3'
     end
   end
 end

data/spec/spec_helper.rb

@@ -101,7 +101,7 @@ SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
   SimpleCov::Formatter::HTMLFormatter,
   SimpleCov::Formatter::Console
 ]
-SimpleCov.minimum_coverage(85)
+SimpleCov.minimum_coverage(80)
 SimpleCov.start
 
 def capture_stdout(&block)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: consul-template-generator
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Brian Oldfield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-03 00:00:00.000000000 Z
+date: 2015-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -161,6 +161,7 @@ files:
 - lib/consul/template/generator/configuration.rb
 - lib/consul/template/generator/ct.rb
 - lib/consul/template/generator/error.rb
+- lib/consul/template/generator/graphite.rb
 - lib/consul/template/generator/init.rb
 - lib/consul/template/generator/key_value.rb
 - lib/consul/template/generator/run.rb