prometheus-config-builder 0.0.39 → 0.0.41

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4afb62d72eff85bf6ad281d611a0d48ae28d5c1b57e17a79ee963319eb3125cc
-  data.tar.gz: 88fdee96f062cb7ea2eee057608a7f5cef1ebbb8b5bd4e3fd7e234200b54e45d
+  metadata.gz: 3574ad59107c1c4fc456b503ff1bc457910fc03726415ac13a6e2c0758dff438
+  data.tar.gz: 46a9834fa8b808557b034494509af311492beb3b187f253fe6f6bc285e3d5058
 SHA512:
-  metadata.gz: a1db288ac0799dc74d9fda64ea237cf3824ddd25191df03103a36f8c52bef400cfc122ade29137098920daf0299efd43a12c36e47897d91ec436aaf30b8e601a
-  data.tar.gz: e63fecaf600a5280e2a114b093ef92a07932eebf3bf27c9c125b9279cbe950014ae548759b338d9fcc9c1c0b47cc02f3128cb3837ee9f272f4cce387032245bc
+  metadata.gz: 758050db5fa1ae8674fce4edeb778024f33e345240359b9ca8de5cb5b04a30b12a3c96fb6f35469425fcb22204523841e52f1d6e263531d9e6546f1f395c72b3
+  data.tar.gz: 1114ab1112acfeac569b950c939b1c9627783aeb3222380e88aa02b0fb3591d5d0dab4ef928acb4fb606d188063cdae30563403319b5f1fe915d41e8fb985096

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'
@@ -18,6 +19,7 @@ require 'prometheus-config-builder'
 
 config = {}
 config[:paths] ||= []
+config[:bucket_region] ||= ''
 config[:root] ||= 'test/data'
 config[:every] = 60
 config[:pgrep] = nil
@@ -34,6 +36,9 @@ op = OptionParser.new do |o|
   o.on('--path=[PATH]', 'Directory or S3 location for individual config yaml files. Can be set multiple times') do |arg|
     config[:paths] << arg
   end
+  o.on('--bucket_region=[BUCKET_REGION]', 'Ther region where the s3 bucket exists') do |arg|
+    config[:bucket_region] << arg
+  end
   o.on('--http PORT', Integer,
     'Port to listen on for http for Prometheus /metrics api') do |port|
     abort 'Invalid port' if port < 1 || port > 65535
@@ -48,6 +53,9 @@ 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
@@ -60,6 +68,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')
@@ -98,7 +107,7 @@ config[:paths].each do |path|
   log.info("Adding path #{path} to config discovery list")
   builder.add_path(path)
 end
-
+builder.add_bucket_region(config[:bucket_region])
 
 loop do
   starting = Time.now
@@ -133,8 +142,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

@@ -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"
@@ -103,7 +108,7 @@ module PrometheusConfigBuilder
 
   class ConfigDiscover
     include PrometheusConfigBuilderLogger
-    def discover(glob)
+    def discover(glob, bucket_region)
 
       files = []
       if m = glob.match(/s3:\/\/([^\/]+)\/(.*)/)
@@ -113,7 +118,13 @@ module PrometheusConfigBuilder
         x = $VERBOSE
         $VERBOSE = nil
         require 'aws-sdk'
-        s3 = Aws::S3::Client.new
+        s3 = nil
+        if !bucket_region.empty?
+          logger.debug("bucket_region set as >#{bucket_region}<")
+          s3 = Aws::S3::Client.new(region: bucket_region)
+        else
+          s3 = Aws::S3::Client.new
+        end
         $VERBOSE = x
         key = []
         resp = s3.list_objects_v2({
@@ -210,8 +221,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)
@@ -252,6 +266,7 @@ module PrometheusConfigBuilder
 
       @discoverer = ConfigDiscover.new
       @paths = []
+      @bucket_region = ""
       @last_hash = ""
 
       @@config_files = PrometheusExporter::Client.default.register(:gauge, "prometheusconfigbuilder_config_files", "Number of found config files")
@@ -262,12 +277,17 @@ module PrometheusConfigBuilder
       @paths << path
     end
 
+    def add_bucket_region(bucket_region)
+      @bucket_region << bucket_region
+    end
+
     def write_out
       hash = ""
       cfs = ConfigFiles.new(@prometheus_src)
+      bucket_region = @bucket_region
       files = []
       @paths.each do |path|
-        found_files = @discoverer.discover(path)
+        found_files = @discoverer.discover(path, bucket_region)
         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.39'
+  s.version       = '0.0.41'
   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.39
+  version: 0.0.41
 platform: ruby
 authors:
 - Juho Mäkinen juho.makinen@gmail.com
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-02-21 00:00:00.000000000 Z
+date: 2024-05-08 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: