prometheus-config-builder 0.0.26 → 0.0.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 56758de8c42a6bf76d657342fd895e8d5f0bf133
-  data.tar.gz: 8fb4d608391a6c4bc60c6abea868bf0629845a75
+  metadata.gz: f97c7ca0818df250a1b5223d220c6e0b9c9f5ec9
+  data.tar.gz: 9d04ee4fe93d7b7b8dcb0927532993fa22b5c299
 SHA512:
-  metadata.gz: 6f6597d9affe7f361a35e9d8b8f4701acb895147b5d790de81b624862d42c988b523ae81c0ee8b4854dea41530f0a201a8f22bf2b6ca8e699d1647fa29db7349
-  data.tar.gz: 5080a4ff7a7ba2d1c87abaa095c65cc4e84a41c118e1801504f470f3d0c3c5165071cdd85f7361a87202d4a3415ef83df4e1e75c64c056dcd39e488fe610139d
+  metadata.gz: 9ea3df55d69a1ec404b11e475f84293f3512b2439baf71da01a539d22a91ea55d7621428972e7959a88ccfa1e04f8c56bec21dd7af3a46eb8a65b06314305a79
+  data.tar.gz: e47ffab6e099d533b00a35cd2868e9fc4007305c27f2745e83ba1e1cc7b9141bfaa6653375721de5c8fee96b75d4f145b20f10b07ce6a2eaa813670fbc63ff95

data/bin/prometheus-config-builder

@@ -4,7 +4,6 @@ $LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', 'lib')
 
 require 'logger'
 require 'optparse'
-require 'prometheus-config-builder'
 require 'pp'
 require 'yaml'
 require 'json'
@@ -12,6 +11,11 @@ require 'prometheus_exporter'
 require 'prometheus_exporter/client'
 require 'prometheus_exporter/server'
 
+server = PrometheusExporter::Server::WebServer.new port: 12345
+PrometheusExporter::Client.default = PrometheusExporter::LocalClient.new(collector: server.collector)
+
+require 'prometheus-config-builder'
+
 config = {}
 config[:paths] ||= []
 config[:root] ||= 'test/data'
@@ -67,8 +71,6 @@ if !File.exist?(config[:dst_dir])
   exit!(1)
 end
 
-server = PrometheusExporter::Server::WebServer.new port: 12345
-PrometheusExporter::Client.default = PrometheusExporter::LocalClient.new(collector: server.collector)
 server.start
 
 something_changed_count = PrometheusExporter::Client.default.register(:counter, "prometheusconfigbuilder_changes_count", "Number of times configuration has changed.")

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

@@ -17,6 +17,9 @@ require_relative './scrape_ecs.rb'
 require 'prometheus_exporter'
 require 'prometheus_exporter/client'
 
+$config_file_status = PrometheusExporter::Client.default.register(:gauge, "prometheusconfigbuilder_config_file_status", ".")
+
+
 module PrometheusConfigBuilder
 
 
@@ -25,16 +28,17 @@ module PrometheusConfigBuilder
     @data = {}
 
     attr_reader :basename
+    attr_reader :source
 
     def open(filename)
-      filename = File.expand_path(filename)
+      @filename = File.expand_path(filename)
       @source = "file://#{filename}"
       @basename = File.basename(filename)
       @data = YAML.load_file(filename)
     end
 
     def load(file)
-      @source = "file://#{file[:filename]}"
+      @source = file[:source]
       @basename = file[:filename]
       @data = YAML.load(file[:contents])
     end
@@ -57,7 +61,7 @@ module PrometheusConfigBuilder
         when "ecs-tasks"
           configs << ScrapeConfigECS::handle(@basename, config, dst_prefix)
         else
-          raise "Unknown scrape_config type #{config["type"]}"
+          raise "Unknown scrape_config type #{config["type"]} in file #{@basename}"
         end
       end
 
@@ -107,13 +111,20 @@ module PrometheusConfigBuilder
 
           logger.debug("Found file \"#{file.key}\" from S3 bucket #{bucket_name}")
           files << {
+            source: "s3://#{bucket_name}/#{file.key}",
             filename: File.basename(file.key),
             contents: contents.body.string,
           }
         end
       else
+        if glob[-1] == '/'
+          logger.warn("The file path #{glob} is not a glob. Adding a wilcard so that the path will be #{glob}*.yaml")
+          glob += "*.yaml"
+        end
         Dir.glob(glob).each do |file|
+          logger.debug("Found file from local filesystem: #{file}")
           files << {
+            source: "file://#{file}",
             filename: File.basename(file),
             contents: File.read(file)
           }
@@ -127,7 +138,7 @@ module PrometheusConfigBuilder
 
 
   class ConfigFiles
-
+    include PrometheusConfigBuilderLogger
     def initialize(prometheus_yaml_filename)
       @files = []
       @prometheus_yaml_filename = prometheus_yaml_filename
@@ -167,8 +178,14 @@ module PrometheusConfigBuilder
       FileUtils.mkdir_p(scrape_files_dir) if !File.exist?(scrape_files_dir)
 
       @files.each do |file|
-        configs = file.get_scrape_configs(scrape_files_dir + "/" + File.basename(file.basename, ".*"))
-        data["scrape_configs"].push(*configs)
+        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)
+        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)
+        end
       end
 
       if !data["rule_files"] or data["rule_files"].class != Array
@@ -242,8 +259,10 @@ module PrometheusConfigBuilder
       # Determine if something had changed since the last write_out based on the generated hashes
       if hash != @last_hash
         @last_hash = hash
+        logger.debug("Wrote new #{@prometheus_src} file for Prometheus.")
         return true
       else
+        logger.debug("The Prometheus #{@prometheus_src} config file did not change.")
         return false
       end
     end

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

@@ -1,5 +1,6 @@
 require 'pp'
 require_relative './logger.rb'
+require 'tempfile'
 
 module PrometheusConfigBuilder
 
@@ -32,18 +33,20 @@ module PrometheusConfigBuilder
       role_session_name = (assume_role["role_session_name"] or "prometheus-scrape-ecs")
 
       name = region + "/" + role_arn + "/" + role_session_name
+      client = @@ecs[name]
+      if client == nil
+        logger.info("Using sts:AssumeRole on #{role_arn} as client #{name}")
+        role_credentials = Aws::AssumeRoleCredentials.new(
+          client: Aws::STS::Client.new({
+            region: region
+          }),
+          role_arn: role_arn,
+          role_session_name: role_session_name
+        )
 
-      logger.info("Using sts:AssumeRole on #{role_arn}")
-      role_credentials = Aws::AssumeRoleCredentials.new(
-        client: Aws::STS::Client.new({
-          region: region
-        }),
-        role_arn: role_arn,
-        role_session_name: role_session_name
-      )
-
-      client = Aws::ECS::Client.new(credentials: role_credentials)
-      @@ecs[name] = client
+        client = Aws::ECS::Client.new(credentials: role_credentials)
+        @@ecs[name] = client
+      end
       return client
     end
 
@@ -77,10 +80,15 @@ module PrometheusConfigBuilder
         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.
       file = File.expand_path(dst_prefix + "_" + config["job_name"] + ".json")
-      File.open(file, "w") do |f|
+      tmpfile = Tempfile.new().path
+      File.open(tmpfile, "w") do |f|
         f.write(endpoints.to_json)
       end
+      File.rename(tmpfile, file)
+
 
       # Make copy of the settings and remove our custom properties from it.
       # The rest user can set just as he wants according to the Prometheus schema.
@@ -106,6 +114,7 @@ module PrometheusConfigBuilder
       tasks = []
       last_result = Aws::ECS::Types::ListTasksResponse.new
       last_result.next_token = nil
+      retries = 3
       loop do
         begin
           options = {
@@ -119,6 +128,10 @@ module PrometheusConfigBuilder
           end
         rescue Aws::ECS::Errors::ServiceError => e
           logger.warn("Error listing ecs tasks for service #{service_name} in cluster #{cluster}: #{e}")
+          retries -= 1
+          if retries < 0
+            raise IOError.new("Unable to get ecs tasks for service #{service_name} in cluster #{cluster}: #{e}")
+          end
           sleep(1)
           next
         end

data/prometheus-config-builder.gemspec

@@ -3,7 +3,7 @@
 
 Gem::Specification.new do |s|
   s.name          = 'prometheus-config-builder'
-  s.version       = '0.0.26'
+  s.version       = '0.0.27'
   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.26
+  version: 0.0.27
 platform: ruby
 authors:
 - Juho Mäkinen juho.makinen@gmail.com
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-28 00:00:00.000000000 Z
+date: 2020-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk