prometheus-config-builder 0.0.38 → 0.0.40

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d6c663a09275931574414b4ced5eb6f34f1e8d73e4deefabbfd13234d6b02a92
-  data.tar.gz: 9d64b391e59eb2319042afe174001ca63605cae9c33e7b54dd865dfb1f9f68bc
+  metadata.gz: db9d70c9130bb149fa99797f998e4b828da28cbc15fba570cdd5d8730d59548b
+  data.tar.gz: 6e9bc7caeee2dd2bc3f5f389094c55473c6c2c4df67652a10d1663035d8a2b1d
 SHA512:
-  metadata.gz: 924e57d5e492a4ccc16d8e8ea9b7deaa7d0cde878f70635fe568b1253dbce8e199c131160a4681aed62f4982304c3a539584b3c3734f9d812aa26b5742ad1900
-  data.tar.gz: fba70064e2dea0298c58f0d4e700ca9c822b7028438f018da7abf118368c507c93f22a2256c4cacb114373f2958a67da30897d7922289fa260f95d58bb8e8095
+  metadata.gz: ed72434fddba4e8b45dd5053d46b019658942f995acdd12c0e9b6d5c7e3bbf8e0e2bc3e97c5dd1e7913d9e05005a2c468057dfdce68b3e4c50c89562b39becb8
+  data.tar.gz: c699d9be7b7a777f24453297368d5225380e6c499b5e32102a243afca2eac8bc395fe1f41d3202237f071c6a3d8d10b421ff82b558e99e084dbb5566c2a57b27

data/README.md

@@ -1,3 +1,9 @@
+## Making changes.
+
+The `master` banch lives in git.supercell.com/services/prometheus-config-builder and is mirrored as read-only branch to github.com/supercell/prometheus-config-builder
+
+The releases must be done by juho.arenius as the public gem is under his account.
+
 
 ## Description
 

data/bin/prometheus-config-builder

@@ -7,6 +7,7 @@ require 'optparse'
 require 'pp'
 require 'yaml'
 require 'json'
+require 'httparty'
 require 'prometheus_exporter'
 require 'prometheus_exporter/client'
 require 'prometheus_exporter/server'
@@ -48,10 +49,12 @@ op = OptionParser.new do |o|
   o.on('--pgrep=[string]', 'pgrep -f [string] for finding Prometheus process for SIGHUP') do |str|
     config[:pgrep] = str
   end
+  o.on('--reload-url=[string]', 'Prometheus config reload endpoint') do |str|
+    config[:reload_url] = str
+  end
   o.on('--addlog=[FILE]', 'addlog -f [FILE] Log additionally to this file') do |str|
     config[:addlog] = str
   end
-  
 end
 op.parse!
 
@@ -61,6 +64,7 @@ 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 either --pgrep or --reload-url, not both" if config[:pgrep] && config[:reload_url]
 
 if config[:addlog]
   filelog = File.open(config[:addlog], 'w')
@@ -134,8 +138,25 @@ loop do
   rescue Exception => e
     log.warn("Unable to send SIGHUP signal to Prometheus: #{e}")
     puts e.backtrace
+    error_count.increment
   end
 
+  begin
+    if something_changed && config[:reload_url] != nil
+      log.info("Sending reload request to Prometheus at #{config[:reload_url]}")
+      response = HTTParty.post(config[:reload_url])
+
+      if response.code != 200
+        log.warn("Prometheus returned #{response.code} when reloading config. Response body: #{response.body}")
+        error_count.increment
+      end
+    end
+  rescue HTTParty::Error => e
+    log.warn("Unable to send reload request to Prometheus: #{e}")
+    puts e.backtrace
+    error_count.increment
+  end 
+
   log.info("Sleeping for #{config[:every]} second and starting then again.")
   if log.level == Logger::INFO
     log.info("Setting log level to WARN for the rest of the program execution. Use -v to overwrite this.")

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

@@ -53,7 +53,7 @@ module PrometheusConfigBuilder
         if match = e.message.match(/mapping values are not allowed in this context at line ([0-9]+)/i)
           linenumber = match.captures[0]
           logger.error("This error is most often because your intentation is at the wrong level. Check the file #{file[:filename]} around line #{linenumber}")
-        end        
+        end
         raise e
       end
 
@@ -72,6 +72,11 @@ module PrometheusConfigBuilder
     def get_scrape_configs(dst_prefix)
       configs = []
 
+      if !@data.key?('scrape_configs')
+        logger.debug("File #{dst_prefix} does not contain any scrape configs.")
+        return []
+      end
+
       @data['scrape_configs'].each do |config|
         case config["type"]
         when "passthrough"
@@ -210,8 +215,11 @@ module PrometheusConfigBuilder
         labels[:runbook_url] = file.runbook_url if file.runbook_url
         begin
           configs = file.get_scrape_configs(scrape_files_dir + "/" + File.basename(file.basename, ".*"))
-          data["scrape_configs"].push(*configs)
-          $config_file_status.observe(1, labels)
+          if configs.length > 0
+            puts "Generated data for file #{scrape_files_dir + "/" + File.basename(file.basename, ".*")}"
+            data["scrape_configs"].push(*configs)
+            $config_file_status.observe(1, labels)
+          end
         rescue Exception => e
           logger.error("Unable to get scrape configs correctly from file #{file.source}. Error: #{e}")
           $config_file_status.observe(0, labels)

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

@@ -176,7 +176,7 @@ module PrometheusConfigBuilder
                 ip = task.containers[0].network_interfaces[0].private_ipv_4_address
               else
                 logger.warn("WARNING: Unable to obtain ipv4 address from task #{task}")
-                return
+                next
               end
 
               if metrics_port

data/prometheus-config-builder.gemspec

@@ -3,7 +3,7 @@
 
 Gem::Specification.new do |s|
   s.name          = 'prometheus-config-builder'
-  s.version       = '0.0.38'
+  s.version       = '0.0.40'
   s.date          = Time.now
 
   s.summary       = %q{Template based config generation}
@@ -16,11 +16,13 @@ Gem::Specification.new do |s|
   s.required_ruby_version = '>= 2.0.0'
 
   s.add_dependency 'aws-sdk', '~> 3'
+  s.add_dependency 'httparty', '~> 0.17.3'
   s.add_dependency 'prometheus_exporter', '>= 0.4.13'
 
   s.add_development_dependency 'rubygems-tasks', '~> 0.2'
   s.add_development_dependency 'minitest', '~> 5.4'
   s.add_development_dependency 'minitest-reporters'
   s.add_development_dependency 'rake', '~> 12.3.3'
+  s.add_development_dependency 'yard', '~> 0.9.5'
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prometheus-config-builder
 version: !ruby/object:Gem::Version
-  version: 0.0.38
+  version: 0.0.40
 platform: ruby
 authors:
 - Juho Mäkinen juho.makinen@gmail.com
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-02-01 00:00:00.000000000 Z
+date: 2023-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3'
+- !ruby/object:Gem::Dependency
+  name: httparty
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.17.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.17.3
 - !ruby/object:Gem::Dependency
   name: prometheus_exporter
   requirement: !ruby/object:Gem::Requirement
@@ -94,8 +108,22 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 12.3.3
-description:
-email:
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.5
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.5
+description: 
+email: 
 executables:
 - prometheus-config-builder
 extensions: []
@@ -118,10 +146,10 @@ files:
 - test/data/test1.yaml
 - test/data/test2.yaml
 - test/test_helper.rb
-homepage:
+homepage: 
 licenses: []
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -136,8 +164,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
-signing_key:
+rubygems_version: 3.0.3.1
+signing_key: 
 specification_version: 4
 summary: Template based config generation
 test_files: