prometheus-config-builder 0.0.15 → 0.0.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8afb279bd7ee0d2f9e233c0224bef803b9694054
-  data.tar.gz: 4af2db65c94a80667f8125fd425d5132e627c550
+  metadata.gz: 4d84c84caac7f0380510bf269507555f04be391e
+  data.tar.gz: b9220355ba8986d22711ec49365f885cb374c8ae
 SHA512:
-  metadata.gz: 87e8783a009b784505acaebbacc977b95d70b9785fa603e1d6acb9274743d1a07b1c166ae016863d13094b13e2fbe7f963cb21d8e2debfc3ae237ea53bd595eb
-  data.tar.gz: c154ff88582bd2270e2f7bb7cbf91fea11c36e5383168580fd87d26d06d9127cfa1445b8889e25f6bf8744724dc735ef8380a069dc45360d20f3cfa8cdafc935
+  metadata.gz: 36fbaf95d4db081453a29f6aac99a26ece35e66501297664843bc4d9a88a697ab736da051d5ba4763d95d43515dc5bac74bf67b28906c39f9bb80b1cbefc795c
+  data.tar.gz: f599a9aebffb8d5ac632824590824abc812fb522640a6cb196e31a166bc8a6c49e89ddbe5427d1e3f27dcab5213588336efaee50d03b7a80cba44e9d6ef9fd0d

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,6 +75,7 @@ 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)
 
@@ -90,7 +91,9 @@ loop do
   starting = Time.now
   begin
     something_changed = builder.write_out()
+    config_has_errors.observe(0)
   rescue Exception => e
+    config_has_errors.observe(1)
     log.warn("Error while building config: #{e}")
     puts e.backtrace
     error_count.increment
@@ -104,10 +107,16 @@ loop do
   # Send a SIGHUP signal to Prometheus so that it knows to reload config files
   begin
     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
+      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

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/lib/prometheus-config-builder/scrape_ecs.rb

@@ -70,7 +70,7 @@ module PrometheusConfigBuilder
             tasks.push(*last_result.task_arns)
           end
         rescue Aws::ECS::Errors::ServiceError => e
-          print "Error listing ecs tasks: #{e}"
+          print "Error listing ecs tasks for service #{service_name} in cluster #{cluster}: #{e}"
           sleep(1)
           next
         end

data/prometheus-config-builder.gemspec

@@ -3,7 +3,7 @@
 
 Gem::Specification.new do |s|
   s.name          = 'prometheus-config-builder'
-  s.version       = '0.0.15'
+  s.version       = '0.0.21'
   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.15
+  version: 0.0.21
 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-11-04 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