prometheus-config-builder 0.0.13 → 0.0.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 340fb2c178ee3bf0c32782ba335a46500dbdafd4
-  data.tar.gz: 327af98c341fdcdfecadfe29ac00716f12fda348
+  metadata.gz: bfa7f8b751a05fb855f1b09da6903620025d56cb
+  data.tar.gz: 6500d5cc5e0afa9ba17d9fafc629efa095214db4
 SHA512:
-  metadata.gz: d32eb0c5cf9a5c657dab7305490f1f73d2101151670da96822c1581c4de6362fca2109018d1af1cb5dbea081a41145f7aec40d62866f4b4a834201e133d7ce0d
-  data.tar.gz: bd94a8ea5f20bd18305b1e7a075484fb0287805f425df8df04f469923de74b69db6dab3778918b3aa6c599df1f5b0220780c3f0d1ec86bdb96766d0981b48afb
+  metadata.gz: 88f680b791fe6aa290e11fd23512ef5e2808728d26989cadb4c6de8131fbffe4e5f552e78ecc1cdb6b2476a44c43762c5e517fb8b4e112c9bb0622bcd1a1d0a1
+  data.tar.gz: 753b906d6d578f68020a4d83deb8e7c9d21c6f05e5f2766eedf185b8739a8480744e7be35f1bbaf364f4caf3e2b133b0382915b1626414565166fb6ff3a9632f

data/bin/prometheus-config-builder

@@ -39,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
@@ -52,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
@@ -75,12 +75,14 @@ something_changed_count = PrometheusExporter::Client.default.register(:counter,
 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")
+config_has_errors = PrometheusExporter::Client.default.register(:gauge, "prometheusconfigbuilder_config_has_errors", "This value is 0 if the config has no errors.")
 
 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
 
@@ -89,7 +91,9 @@ loop do
   starting = Time.now
   begin
     something_changed = builder.write_out()
+    config_has_errors.set(0)
   rescue Exception => e
+    config_has_errors.set(1)
     log.warn("Error while building config: #{e}")
     puts e.backtrace
     error_count.increment
@@ -101,12 +105,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.13'
+  s.version       = '0.0.19'
   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.13
+  version: 0.0.19
 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