prometheus-config-builder 0.0.40 → 0.0.41

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: db9d70c9130bb149fa99797f998e4b828da28cbc15fba570cdd5d8730d59548b
-  data.tar.gz: 6e9bc7caeee2dd2bc3f5f389094c55473c6c2c4df67652a10d1663035d8a2b1d
+  metadata.gz: 3574ad59107c1c4fc456b503ff1bc457910fc03726415ac13a6e2c0758dff438
+  data.tar.gz: 46a9834fa8b808557b034494509af311492beb3b187f253fe6f6bc285e3d5058
 SHA512:
-  metadata.gz: ed72434fddba4e8b45dd5053d46b019658942f995acdd12c0e9b6d5c7e3bbf8e0e2bc3e97c5dd1e7913d9e05005a2c468057dfdce68b3e4c50c89562b39becb8
-  data.tar.gz: c699d9be7b7a777f24453297368d5225380e6c499b5e32102a243afca2eac8bc395fe1f41d3202237f071c6a3d8d10b421ff82b558e99e084dbb5566c2a57b27
+  metadata.gz: 758050db5fa1ae8674fce4edeb778024f33e345240359b9ca8de5cb5b04a30b12a3c96fb6f35469425fcb22204523841e52f1d6e263531d9e6546f1f395c72b3
+  data.tar.gz: 1114ab1112acfeac569b950c939b1c9627783aeb3222380e88aa02b0fb3591d5d0dab4ef928acb4fb606d188063cdae30563403319b5f1fe915d41e8fb985096

data/bin/prometheus-config-builder

@@ -19,6 +19,7 @@ require 'prometheus-config-builder'
 
 config = {}
 config[:paths] ||= []
+config[:bucket_region] ||= ''
 config[:root] ||= 'test/data'
 config[:every] = 60
 config[:pgrep] = nil
@@ -35,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
@@ -103,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

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,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({
@@ -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.41'
   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.40
+  version: 0.0.41
 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: 2024-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk