prometheus-config-builder 0.0.40 → 0.0.42

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: db9d70c9130bb149fa99797f998e4b828da28cbc15fba570cdd5d8730d59548b
-  data.tar.gz: 6e9bc7caeee2dd2bc3f5f389094c55473c6c2c4df67652a10d1663035d8a2b1d
+  metadata.gz: 7f24f728c3588f20881943ddc565d4ffd3c59e5773f707438b334f53f7c7c153
+  data.tar.gz: adba59f9d0c76f21c2f24adfe5b6bfcd70910626efbf72a0a25d26a27179847c
 SHA512:
-  metadata.gz: ed72434fddba4e8b45dd5053d46b019658942f995acdd12c0e9b6d5c7e3bbf8e0e2bc3e97c5dd1e7913d9e05005a2c468057dfdce68b3e4c50c89562b39becb8
-  data.tar.gz: c699d9be7b7a777f24453297368d5225380e6c499b5e32102a243afca2eac8bc395fe1f41d3202237f071c6a3d8d10b421ff82b558e99e084dbb5566c2a57b27
+  metadata.gz: 37cdc8c31df3dab1e7539c0b4998df7f49a481479c20f06dffecb9fb3d3bf129b34eb8180bba711dbd384c85d8d522cda719c3e7887d4550fcf8e7f40a2b7246
+  data.tar.gz: 577987e98216ea21770683000a3b7cc8943831a8fee83dd7cfe8d20792ba5376d18265f0af0e7b3d5d80a20b14c64bbb31c96db4c7d4eb0127837129255db8c8

data/bin/prometheus-config-builder

@@ -19,9 +19,11 @@ require 'prometheus-config-builder'
 
 config = {}
 config[:paths] ||= []
+config[:bucket_region] ||= ''
 config[:root] ||= 'test/data'
 config[:every] = 60
 config[:pgrep] = nil
+config[:sync] = false
 
 # Defaults
 op = OptionParser.new do |o|
@@ -35,6 +37,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
@@ -46,6 +51,9 @@ op = OptionParser.new do |o|
   o.on('--every=[seconds]', 'Rerun every n seconds') do |seconds|
     config[:every] = seconds.to_i
   end
+  o.on('--sync', 'Write configuration once, then exit') do
+    config[:sync] = true
+  end
   o.on('--pgrep=[string]', 'pgrep -f [string] for finding Prometheus process for SIGHUP') do |str|
     config[:pgrep] = str
   end
@@ -103,7 +111,18 @@ 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])
 
+if config[:sync] == true
+  begin
+    builder.write_out
+  rescue Exception => e
+    log.warn("Error while building config: #{e}")
+    puts e.backtrace
+    exit(1)
+  end
+  exit(0)
+end
 
 loop do
   starting = Time.now

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

@@ -108,7 +108,7 @@ module PrometheusConfigBuilder
 
   class ConfigDiscover
     include PrometheusConfigBuilderLogger
-    def discover(glob)
+    def discover(glob, bucket_region)
 
       files = []
       if m = glob.match(/s3:\/\/([^\/]+)\/(.*)/)
@@ -118,9 +118,15 @@ 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({
           bucket: bucket_name,
           prefix: prefix
@@ -260,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")
@@ -270,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.40'
+  s.version       = '0.0.42'
   s.date          = Time.now
 
   s.summary       = %q{Template based config generation}

data/test/configdiscovery.rb

@@ -90,7 +90,7 @@ class ConfigDiscoveryTest < Minitest::Test
   def test_discover_config_files
     x = PrometheusConfigBuilder::ConfigDiscover.new
 
-    files = x.discover("./test/data/test*.yaml")
+    files = x.discover("./test/data/test*.yaml", "")
     assert_equal 2, files.length
 
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prometheus-config-builder
 version: !ruby/object:Gem::Version
-  version: 0.0.40
+  version: 0.0.42
 platform: ruby
 authors:
 - Juho Mäkinen juho.makinen@gmail.com
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-11-07 00:00:00.000000000 Z
+date: 2025-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk