prometheus-config-builder 0.0.23 → 0.0.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c60c04c326422c8352434d8b77a6c40db28284a1
-  data.tar.gz: 383f164b44193d4750dd5dff3b9b0b4fcfba7a1d
+  metadata.gz: d2392214707785f6cec2a5975bb50bb8e24aba5e
+  data.tar.gz: c29b371d512400b7fd46b15380661644086d3240
 SHA512:
-  metadata.gz: 368d6192da10887252e7db19edc66b7fa630490e4b541726a6bab39d54b7bf47d62f64c1acf9d8b7e84279f6f2a34b6723d151e9c22a428bbc3829013010ba01
-  data.tar.gz: 9f2aae757f81094581598c86bc71582ccd669236b7595d4f5982a0ce0b46e773384bcd704b4f0de0f9813b39b96010bbf0f830ffc2cce294eae033aabef660e8
+  metadata.gz: 6faeb1c97c1957c54a9c6e7c549d6dd57bc88e4c306c6a750e39f77c2948e7e62672996a6d41343576e2cf4d158954e05ded3f1ac92e51e64c12dd74080613ef
+  data.tar.gz: df4322978d2d8bf3bb7563e6f8e9603fe92f771bf31777aa59aa032a0269e173fb6cb9d411ea53328991145b8180f68197398ff6e65fc0c38226cc706a222b8a

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

@@ -6,6 +6,46 @@ module PrometheusConfigBuilder
   class ScrapeConfigECS
     extend PrometheusConfigBuilderLogger
 
+    # Map of different roles to ecs clients. use get_client() to obtain them
+    @@ecs = {}
+
+    def self.get_client(region, assume_role=nil)
+
+      name = "default"
+
+      if assume_role == nil
+        client = @@ecs[name]
+        if client == nil
+          client = Aws::ECS::Client.new({
+            region: region
+          })
+          @@ecs[name] = client
+        end
+        return client
+      end
+
+      role_arn = assume_role["role_arn"]
+      if !role_arn
+        raise ArgumentError.new("role_arn not found inside assume_role config structure")
+      end
+      role_session_name = (assume_role["role_session_name"] or "prometheus-scrape-ecs")
+
+      name = region + "/" + role_arn + "/" + 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
+      return client
+    end
+
     def self.handle(basename, config, dst_prefix)
 
       x = $VERBOSE
@@ -15,15 +55,21 @@ module PrometheusConfigBuilder
       if !config["region"]
         logger.warn("File #{basename}: the scrape_configs of type:ecs-tasks doesn't have \"region\" field set. Ignoring!")
         return nil
+      end
+
+      region = (config["region"] or "us-east-1")
+      assume_role = config["assume_role"]
 
+      begin
+        client = get_client(region, assume_role)
+      rescue ArgumentError => e
+        logger.warn("File #{basename}: the scrape_configs of type:ecs-tasks had invalid arguments: #{e}")
+        return nil
       end
 
-      @@ecs = Aws::ECS::Client.new({
-        region:config["region"]
-      })
       $VERBOSE = x
-      tasks = get_tasks(config["cluster"], config["service"])
-      endpoints = get_task_endpoints(config["cluster"], tasks, config["labels"], config["metrics_port"])
+      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!")
@@ -31,8 +77,8 @@ module PrometheusConfigBuilder
       end
 
       file = File.expand_path(dst_prefix + "_" + config["job_name"] + ".json")
-      File.open(file, "w") do |file|
-        file.write(endpoints.to_json)
+      File.open(file, "w") do |f|
+        f.write(endpoints.to_json)
       end
 
       # Make copy of the settings and remove our custom properties from it.
@@ -54,7 +100,7 @@ module PrometheusConfigBuilder
       return settings
     end
 
-    def self.get_tasks(cluster, service_name)
+    def self.get_tasks(client, cluster, service_name)
       tasks = []
       last_result = Aws::ECS::Types::ListTasksResponse.new
       last_result.next_token = nil
@@ -65,7 +111,7 @@ module PrometheusConfigBuilder
             service_name: service_name,
             next_token: last_result.next_token
           }
-          last_result = @@ecs.list_tasks(options)
+          last_result = client.list_tasks(options)
           if last_result && last_result.task_arns
             tasks.push(*last_result.task_arns)
           end
@@ -80,7 +126,7 @@ module PrometheusConfigBuilder
       return tasks
     end
 
-    def self.get_task_endpoints(cluster, tasks, common_labels, metrics_port)
+    def self.get_task_endpoints(client, cluster, tasks, common_labels, metrics_port)
       endpoints = []
       if tasks.length == 0
         return []
@@ -93,7 +139,7 @@ module PrometheusConfigBuilder
             cluster: cluster,
             tasks: task_chunk,
           }
-          result = @@ecs.describe_tasks(options)
+          result = client.describe_tasks(options)
           if result && result.tasks
             result.tasks.each do |task|
               # FIXME: This assumes somewhat on the ip structure.
@@ -126,7 +172,5 @@ module PrometheusConfigBuilder
       return endpoints
     end
 
-
-
   end
 end

data/prometheus-config-builder.gemspec

@@ -3,7 +3,7 @@
 
 Gem::Specification.new do |s|
   s.name          = 'prometheus-config-builder'
-  s.version       = '0.0.23'
+  s.version       = '0.0.24'
   s.date          = Time.now
 
   s.summary       = %q{Template based config generation}

data/test/configdiscovery.rb

@@ -118,4 +118,10 @@ class ConfigDiscoveryTest < Minitest::Test
 
   end
 
+  def test_ecs_scraping
+    x = PrometheusConfigBuilder::Builder.new("./test/data/prometheus.yaml", "tmp/")
+    x.add_path("./test/data/ecs*.yaml")
+    x.write_out()
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prometheus-config-builder
 version: !ruby/object:Gem::Version
-  version: 0.0.23
+  version: 0.0.24
 platform: ruby
 authors:
 - Juho Mäkinen juho.makinen@gmail.com
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-02 00:00:00.000000000 Z
+date: 2020-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk