prometheus-config-builder 0.0.29 → 0.0.34

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: c5479f4f3a49813922c49efad5986d4f9932080d
-  data.tar.gz: bbfea8a1359a32d499a216eedeea8ff9fc3b04b4
+SHA256:
+  metadata.gz: 796ca58360817b4b4c3118a72aac48c533ebb6c085f177d3bc16011b07af17f5
+  data.tar.gz: c825cf04a1a7ef5cf737cdc34755d6585ddcb0c7ba1963f85d5c13e5d339376e
 SHA512:
-  metadata.gz: 8a3069e0e80021030c0e24f0afd3d733745aad90f6a03b8482693091ee3acdebff1fdbe5f7fbcb453b652e9e6eb3289e139729ab898f63bfd89e7eab98d9ac4e
-  data.tar.gz: dc2a61df16d426f1e04880a4871af80f625065859878de5f35031b7cc2564765280e0dc649ab3f2dbe52fa78c37659648349e667ab0800ecc632d749c6691968
+  metadata.gz: b5aae7a6756ea7d5ceb8884e15adf8eaae3b0b81df6137b9c59a57e0a46643eb144a03e1f390835fd143e5daed390026050fab19981cc4c3841c72ceccd0920c
+  data.tar.gz: fe1a6117a005c7fed0400fd0966280ea582ecfc40600d45c54eec3c215564c83beaa905e9295001ec5523539650a92b46ee0e0ea3e7b7e03e4280bab265cedda

data/bin/prometheus-config-builder

@@ -11,7 +11,7 @@ require 'prometheus_exporter'
 require 'prometheus_exporter/client'
 require 'prometheus_exporter/server'
 
-server = PrometheusExporter::Server::WebServer.new port: 12345
+server = PrometheusExporter::Server::WebServer.new port: 12345, bind: "0.0.0.0"
 PrometheusExporter::Client.default = PrometheusExporter::LocalClient.new(collector: server.collector)
 
 require 'prometheus-config-builder'

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

@@ -118,6 +118,10 @@ module PrometheusConfigBuilder
             bucket: bucket_name
           })
 
+          if !file.key.end_with?(".yaml")
+            next
+          end
+
           logger.debug("Found file \"#{file.key}\" from S3 bucket #{bucket_name}")
           files << {
             source: "s3://#{bucket_name}/#{file.key}",

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

@@ -19,7 +19,9 @@ module PrometheusConfigBuilder
         if client == nil
           logger.info("Creating default client: #{name} with region: #{region}")
           client = Aws::ECS::Client.new({
-            region: region
+            region: region,
+            instance_profile_credentials_retries: 4,
+            instance_profile_credentials_timeout: 2,
           })
           @@ecs[name] = client
         end
@@ -64,21 +66,33 @@ module PrometheusConfigBuilder
       region = (config["region"] or "us-east-1")
       assume_role = config["assume_role"]
 
+      retries = 5
       begin
         client = get_client(region, assume_role)
+
+        $VERBOSE = x
+        tasks = get_tasks(client, config["cluster"], config["service"])
+        endpoints = get_task_endpoints(client, config["cluster"], tasks, config["labels"], config["metrics_port"])
+
+        if !config["job_name"]
+          logger.warn("File #{basename}: the scrape_configs of type:ecs-tasks doesn't have \"job_name\" field set. Ignoring!")
+          return nil
+        end
+
+      rescue Aws::Errors::MissingCredentialsError => e
+        logger.warn("Got a Aws::Errors::MissingCredentialsError: #{e}")
+        if retries > 0
+          retries = retries - 1
+          logger.warn("Will try to retry")
+          sleep(5)
+          retry
+        end
+        raise e
       rescue ArgumentError => e
         logger.warn("File #{basename}: the scrape_configs of type:ecs-tasks had invalid arguments: #{e}")
         return nil
       end
 
-      $VERBOSE = x
-      tasks = get_tasks(client, config["cluster"], config["service"])
-      endpoints = get_task_endpoints(client, config["cluster"], tasks, config["labels"], config["metrics_port"])
-
-      if !config["job_name"]
-        logger.warn("File #{basename}: the scrape_configs of type:ecs-tasks doesn't have \"job_name\" field set. Ignoring!")
-        return nil
-      end
 
       # Prometheus might notice that the scrape file is changed in the middle of the write. That's why we'll
       # first write the new contents into a temp file and atomically replace the file with the temp file.

data/prometheus-config-builder.gemspec

@@ -3,7 +3,7 @@
 
 Gem::Specification.new do |s|
   s.name          = 'prometheus-config-builder'
-  s.version       = '0.0.29'
+  s.version       = '0.0.34'
   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.29
+  version: 0.0.34
 platform: ruby
 authors:
 - Juho Mäkinen juho.makinen@gmail.com
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-06 00:00:00.000000000 Z
+date: 2020-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -136,8 +136,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2.3
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Template based config generation