small-ops 0.0.19 → 0.0.20

data/bin/{rsyslogstash → rsyslog2logstash}

@@ -13,19 +13,25 @@ OptionParser.new do |opts|
   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!
 
-data = http_get("#{@options[:etcd]}/v2/keys/logstash/networksettings?recursive=true")
-
-final = eflatten( data["node"] )
-logstash = "#{final["logstash_networksettings_ipaddress"]}:514"
-
-File.open("/etc/rsyslog.d/50-default.conf", 'w') { |file| file.write("*.* @@#{logstash}") }
+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"]}:514"
+end
 
-`rsyslogd`
+File.open("/etc/rsyslog.d/50-logstash.conf", 'w') { |file| file.write("*.* @@#{logstash}") }
 
 if @options[:foreground] then
   while true

metadata

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