prometheus-config-builder 0.0.28 → 0.0.33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 148c59af641af7eaccc1128932c1e355f0498ea6
-  data.tar.gz: 0b1b3f3e74395c1e1bcd0589376e9879a2091ba2
+SHA256:
+  metadata.gz: ffffe52a4d4c276bb808edb6bfdc76efac30d2e1503a6048fcb7cc2d68bd8c2c
+  data.tar.gz: 8bc6208fb0f46a981715a595816da650744c64aa11dbfb8404bfad5623b2a240
 SHA512:
-  metadata.gz: 303514e03da7c927e1eca0df89f35f6e4501326309bf435a2aac8640dc4c7cd72e9cd826407c3f7f39ba0b83762c727c5b8a4afcc69a5f31d227f1c5c87c04ed
-  data.tar.gz: a3313569ed850c158b61fa27812eb6ad85dee6b57a5b4fb82eceef6da6f15694e9e91c5d5c34c821b17e7f689067a372b671e0dc425c918de48272e4c2178f23
+  metadata.gz: 6ca2e277c6570811ce734a5589133bcdd450c52f05fb95908ff7ecf4d3c056a88142a4933a30fe6933a3831d247b7e949aa5f1cb67133bb453e5e4f3cd83c9e8
+  data.tar.gz: 5ffc5edc2adf5ad56260258354e4e7b60d4a2ef35fd5ad3b13f50067f6185bb98c47962fac6a68aae340560830c6ea4c9bcb4a027e4f78133b0334f886214dd7

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

@@ -30,18 +30,26 @@ module PrometheusConfigBuilder
 
     attr_reader :basename
     attr_reader :source
+    attr_reader :owner
+    attr_reader :runbook_url
 
     def open(filename)
       @filename = File.expand_path(filename)
       @source = "file://#{filename}"
       @basename = File.basename(filename)
       @data = YAML.load_file(filename)
+
+      @owner = @data['owner']
+      @runbook_url = @data['runbook_url']
     end
 
     def load(file)
       @source = file[:source]
       @basename = file[:filename]
       @data = YAML.load(file[:contents])
+
+      @owner = @data['owner']
+      @runbook_url = @data['runbook_url']
     end
 
     def config_rules
@@ -110,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}",
@@ -180,13 +192,20 @@ module PrometheusConfigBuilder
 
       errors = 0
       @files.each do |file|
+
+        # Build labels for the $config_file_status metric.
+        labels = {
+          file: file.source
+        }
+        labels[:owner] = file.owner if file.owner
+        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, file: file.source)
+          $config_file_status.observe(1, labels)
         rescue Exception => e
           logger.error("Unable to get scrape configs correctly from file #{file.source}. Error: #{e}")
-          $config_file_status.observe(0, file: file.source)
+          $config_file_status.observe(0, labels)
           errors += 1
         end
       end

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.28'
+  s.version       = '0.0.33'
   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.28
+  version: 0.0.33
 platform: ruby
 authors:
 - Juho Mäkinen juho.makinen@gmail.com
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-04 00:00:00.000000000 Z
+date: 2020-06-12 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