prometheus-config-builder 0.0.12 → 0.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 37a41a4e9ee37b38bd8bc7c7025c60732aa7b5f9
-  data.tar.gz: 98ccfbd194f736ff97ead53a8fc5ccf12b20f9f1
+  metadata.gz: 118617063dde0e331c4daa50346cd14d6d4b2a9e
+  data.tar.gz: 3117b906a6c14141acb26b9bc1d1a5d2e57852e9
 SHA512:
-  metadata.gz: 11c610a52b55816774141a432b0c4e527d3b076b8e6cdef200dcb3b4d0084699dbab2dcf422d497826f9f0f57b24f3e3d141168de5c9dbcf84f86982dd11e5e5
-  data.tar.gz: 7c958b3d7fce912530951fd10c6ce16cee716528666d01a6a925b2deda8179abe7055e07d1522c82c54958f65bc112e4f71131bd69060a7f132e555cdb69b0db
+  metadata.gz: eb9cd3a884df86eb1ff0946f3b7761653a1ebb523fc2704d4594096a2661b9f2417e96366e20c581b045deaf24daeee7a7c8bc5c2383dc402d889c9662f833c4
+  data.tar.gz: ac0d13daee07147c78cf29119097632dcb6461acb385b5fc12b3add3a7a86eed3df7897c48429c1a530fbb1bfb822612cfd77b7e392f54208cebaf7697846d88

data/bin/prometheus-config-builder

@@ -18,17 +18,6 @@ config[:root] ||= 'test/data'
 config[:every] = 60
 config[:pgrep] = nil
 
-server = PrometheusExporter::Server::WebServer.new port: 12345
-PrometheusExporter::Client.default = PrometheusExporter::LocalClient.new(collector: server.collector)
-server.start
-
-something_changed_count = PrometheusExporter::Client.default.register(:counter, "prometheusconfigbuilder_changes_count", "Number of times configuration has changed.")
-error_count = PrometheusExporter::Client.default.register(:counter, "prometheusconfigbuilder_errors_count", "Number of exceptions during evaluation.")
-iteration_count = PrometheusExporter::Client.default.register(:counter, "prometheusconfigbuilder_iteration_count", "Number of times configuration has changed.")
-iteration_duration = PrometheusExporter::Client.default.register(:gauge, "prometheusconfigbuilder_last_iteration_duration", "Duration (in seconds) of the last full config iteration")
-
-error_count.observe(0)
-
 # Defaults
 op = OptionParser.new do |o|
   o.banner = "Usage: #{$PROGRAM_NAME} [OPTIONS]"
@@ -50,7 +39,7 @@ op = OptionParser.new do |o|
     config[:verbose] = true
   end
   o.on('--every=[seconds]', 'Rerun every n seconds') do |seconds|
-    config[:every] = seconds
+    config[:every] = seconds.to_i
   end
   o.on('--pgrep=[string]', 'pgrep -f [string] for finding Prometheus process for SIGHUP') do |str|
     config[:pgrep] = str
@@ -63,7 +52,7 @@ if config[:verbose]
 end
 
 abort "You need to set --prometheus-src" if !config[:prometheus_src]
-abort "You need to set --dst_dir" if !config[:dst_dir]
+abort "You need to set --dst-dir" if !config[:dst_dir]
 
 log = Logger.new(STDOUT)
 log.level = config[:verbose] ? Logger::DEBUG : Logger::INFO
@@ -78,9 +67,21 @@ if !File.exist?(config[:dst_dir])
   exit!(1)
 end
 
+server = PrometheusExporter::Server::WebServer.new port: 12345
+PrometheusExporter::Client.default = PrometheusExporter::LocalClient.new(collector: server.collector)
+server.start
+
+something_changed_count = PrometheusExporter::Client.default.register(:counter, "prometheusconfigbuilder_changes_count", "Number of times configuration has changed.")
+error_count = PrometheusExporter::Client.default.register(:counter, "prometheusconfigbuilder_errors_count", "Number of exceptions during evaluation.")
+iteration_count = PrometheusExporter::Client.default.register(:counter, "prometheusconfigbuilder_iteration_count", "Number of times configuration has changed.")
+iteration_duration = PrometheusExporter::Client.default.register(:gauge, "prometheusconfigbuilder_last_iteration_duration", "Duration (in seconds) of the last full config iteration")
+
+error_count.observe(0)
+
 builder = PrometheusConfigBuilder::Builder.new(config[:prometheus_src], config[:dst_dir])
 
 config[:paths].each do |path|
+  log.info("Adding path #{path} to config discovery list")
   builder.add_path(path)
 end
 
@@ -91,7 +92,9 @@ loop do
     something_changed = builder.write_out()
   rescue Exception => e
     log.warn("Error while building config: #{e}")
+    puts e.backtrace
     error_count.increment
+    sleep(config[:every])
     next
   end
 
@@ -99,12 +102,23 @@ loop do
   iteration_count.increment
 
   # Send a SIGHUP signal to Prometheus so that it knows to reload config files
-  if something_changed && config[:pgrep] != nil
-    pid = `pgrep -f "#{config[:pgrep]}"`.split("\n").first.to_i
-    if pid
-      log.info("Sending SIGHUP signal to Prometheus at pid #{pid}.")
-      Process.kill "HUP", pid
+  begin
+    if something_changed && config[:pgrep] != nil
+      matches = `pgrep -a -f "#{config[:pgrep]}"`.split("\n")
+      match = matches.select {|e| !e.include?("prometheus-config-builder")}
+      if !match
+        log.warn("Unable to find Prometheus instance to send SIGHUP for. Matches object: #{matches}"
+      else
+        pid = match.first.split(" ").first.to_i
+        if pid
+          log.info("Sending SIGHUP signal to Prometheus at pid #{pid}.")
+          Process.kill "HUP", pid
+        end
+      end
     end
+  rescue Exception => e
+    log.warn("Unable to send SIGHUP signal to Prometheus: #{e}")
+    puts e.backtrace
   end
 
   log.info("Sleeping for #{config[:every]} second and starting then again.")

data/lib/prometheus-config-builder/prometheus-config-builder.rb

@@ -217,7 +217,7 @@ module PrometheusConfigBuilder
       files = []
       @paths.each do |path|
         found_files = @discoverer.discover(path)
-        logger.info("Found #{files.length} files from path #{path}")
+        logger.info("Found #{found_files.length} files from path #{path}")
         files.push(*found_files)
       end
 

data/prometheus-config-builder.gemspec

@@ -3,7 +3,7 @@
 
 Gem::Specification.new do |s|
   s.name          = 'prometheus-config-builder'
-  s.version       = '0.0.12'
+  s.version       = '0.0.17'
   s.date          = Time.now
 
   s.summary       = %q{Template based config generation}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prometheus-config-builder
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.17
 platform: ruby
 authors:
 - Juho Mäkinen juho.makinen@gmail.com
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-11 00:00:00.000000000 Z
+date: 2019-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -137,7 +137,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.5.2.3
 signing_key: 
 specification_version: 4
 summary: Template based config generation