small-ops 0.0.21 → 0.0.22

data/bin/etcd2conf

@@ -21,12 +21,15 @@ OptionParser.new do |opts|
   opts.on("-i","--input file","Input file") do |o|
     @options[:input]=o
   end
+  opts.on("-s","--string template","Template as string") do |s|
+    @options[:template] = s
+  end
   opts.on("-c","--command cmd","A command to execute after each run") do |c|
     @options[:cmd]=c
   end
 end.parse!
 
-if !@options[:input] || !@options[:output] then
+if ( !@options[:input] && !@options[:template] ) || !@options[:output] then
   raise "Need input and output!"
 end
 
@@ -49,7 +52,12 @@ while run do
 
   data = nodes2obj(r["node"]["nodes"],"/")
 
-  template = File.read(@options[:input])
+  template = ""
+  if @options[:input] then
+    template = File.read(@options[:input])
+  elsif @options[:template]
+    template = @options[:template]
+  end
 
   ns = Namespace.new(data,{"host"=>@options[:host]})
   result=ERB.new(template).result(ns.get_binding)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: small-ops
 version: !ruby/object:Gem::Version
-  version: 0.0.21
+  version: 0.0.22
   prerelease: 
 platform: ruby
 authors:
@@ -18,7 +18,6 @@ executables:
 - etcd2env
 - etcd2conf
 - fige
-- rsyslog2logstash
 extensions: []
 extra_rdoc_files: []
 files:
@@ -27,7 +26,6 @@ files:
 - bin/etcd2env
 - bin/etcd2conf
 - bin/fige
-- bin/rsyslog2logstash
 homepage: https://github.com/
 licenses:
 - MIT

data/bin/rsyslog2logstash

@@ -1,41 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'small-setup'
-
-OptionParser.new do |opts|
-  opts.banner = "Usage: command [options]"
-  opts.on("-h", "--host host", "Set host IP/domain") do |h|
-    @options[:host] = h
-  end
-  opts.on("-e", "--etcd host:port", "Set etcd host and port") do |e|
-    @options[:etcd] = e
-  end
-  opts.on("-t", "--target container", "Set container to use with logstash") do |t|
-    @options[:target] = t
-  end
-  opts.on("-l", "--logstash host:port", "Set host:port where is logstash") do |l|
-    @options[:logstash] = l
-  end
-  opts.on("-f","--foreground","Keep running on foregroud. Default is run once and exit.") do |f|
-    @options[:foreground]=f
-  end
-end.parse!
-
-logstash=""
-if @options[:logstash] then
-  logstash=@options[:logstash]
-else
-  target=@options[:target] || "logstash"
-  data = http_get("#{@options[:etcd]}/v2/keys/#{target}/networksettings?recursive=true")
-  final = eflatten( data["node"] )
-  logstash = "#{final["#{target}_networksettings_ipaddress"]}:9514"
-end
-
-File.open("/etc/rsyslog.d/50-logstash.conf", 'w') { |file| file.write("*.* @@#{logstash}") }
-
-if @options[:foreground] then
-  while true
-    sleep 100
-  end
-end
-