prometheus-config-builder 0.0.11 → 0.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7b091e64ec338a673b726872bf72db278470f2dc
-  data.tar.gz: 3b2ec91cd1437b01b04cc4f221bacfd6a01f953c
+  metadata.gz: 79736d31f0e67d9f52e5984c2f887d38325d1af2
+  data.tar.gz: 541b8ee3704b00ff4c6a2a4762ac92002947b2dd
 SHA512:
-  metadata.gz: 9d77a5e66080e86f60637b161a4aa5ef8c5880a1af2f43eedce67418ab95cb4d941e675148856510e95f6164217df1567a6ad3eb3bd1f1af55e38822f60a7145
-  data.tar.gz: 9e862045c6aa38b43a8312715b8d6f4abc064e36a6f59af19ddbd64b23faffadee9f409b376b43ad2fd92dd68fdf490b3577ca21aec349704d5652bf1e6d08e6
+  metadata.gz: 48b24013a8f292a47502785712d1eedba4fbde8dc0b14cf6815a22b9bafea04a31e05237a6495362a3c75b6e46c96368e9c140e90a0ff323ea0e351a63896b2b
+  data.tar.gz: 1d89de2b684488ec8aebe7e585998a72f3a6664417f4c0e1d534dd9d1e8c27edc219736f5f570dfacb2e153c1a8b203530e571a341c13dcb669e45fbf1239e11

data/bin/prometheus-config-builder

@@ -8,6 +8,9 @@ require 'prometheus-config-builder'
 require 'pp'
 require 'yaml'
 require 'json'
+require 'prometheus_exporter'
+require 'prometheus_exporter/client'
+require 'prometheus_exporter/server'
 
 config = {}
 config[:paths] ||= []
@@ -49,7 +52,7 @@ if config[:verbose]
 end
 
 abort "You need to set --prometheus-src" if !config[:prometheus_src]
-abort "You need to set --dst_dir" if !config[:dst_dir]
+abort "You need to set --dst-dir" if !config[:dst_dir]
 
 log = Logger.new(STDOUT)
 log.level = config[:verbose] ? Logger::DEBUG : Logger::INFO
@@ -64,23 +67,54 @@ 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.")
+error_count = PrometheusExporter::Client.default.register(:counter, "prometheusconfigbuilder_errors_count", "Number of exceptions during evaluation.")
+iteration_count = PrometheusExporter::Client.default.register(:counter, "prometheusconfigbuilder_iteration_count", "Number of times configuration has changed.")
+iteration_duration = PrometheusExporter::Client.default.register(:gauge, "prometheusconfigbuilder_last_iteration_duration", "Duration (in seconds) of the last full config iteration")
+
+error_count.observe(0)
+
 builder = PrometheusConfigBuilder::Builder.new(config[:prometheus_src], config[:dst_dir])
 
 config[:paths].each do |path|
+  log.info("Adding path #{path} to config discovery list")
   builder.add_path(path)
 end
 
 
 loop do
-  something_changed = builder.write_out()
+  starting = Time.now
+  begin
+    something_changed = builder.write_out()
+  rescue Exception => e
+    log.warn("Error while building config: #{e}")
+    puts e.backtrace
+    error_count.increment
+    sleep(config[:every])
+    next
+  end
+
+  something_changed_count.increment if something_changed
+  iteration_count.increment
 
   # Send a SIGHUP signal to Prometheus so that it knows to reload config files
-  if something_changed && config[:pgrep] != nil
-    pid = `pgrep -f "#{config[:pgrep]}"`.split("\n").first.to_i
-    if pid
-      log.info("Sending SIGHUP signal to Prometheus at pid #{pid}.")
-      Process.kill "HUP", pid
+  begin
+    if something_changed && config[:pgrep] != nil
+      matches = `pgrep -a -f "#{config[:pgrep]}"`.split("\n")
+      match = matches.select {|e| !e.include?("prometheus-config-builder")}
+      pid = match.first.split(" ").first.to_i
+      if pid
+        log.info("Sending SIGHUP signal to Prometheus at pid #{pid}.")
+        Process.kill "HUP", pid
+      end
     end
+  rescue Exception => e
+    log.warn("Unable to send SIGHUP signal to Prometheus: #{e}")
+    puts e.backtrace
   end
 
   log.info("Sleeping for #{config[:every]} second and starting then again.")
@@ -89,5 +123,8 @@ loop do
     log.level = Logger::WARN
   end
 
+  ending = Time.now
+  iteration_duration.observe(ending-starting)
+
   sleep(config[:every])
 end

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

@@ -14,8 +14,8 @@ require 'logger'
 require_relative './logger.rb'
 require_relative './scrape_passthrough.rb'
 require_relative './scrape_ecs.rb'
-
-
+require 'prometheus_exporter'
+require 'prometheus_exporter/client'
 
 module PrometheusConfigBuilder
 
@@ -202,6 +202,9 @@ module PrometheusConfigBuilder
       @discoverer = ConfigDiscover.new
       @paths = []
       @last_hash = ""
+
+      @@config_files = PrometheusExporter::Client.default.register(:gauge, "prometheusconfigbuilder_config_files", "Number of found config files")
+
     end
 
     def add_path(path)
@@ -214,7 +217,7 @@ module PrometheusConfigBuilder
       files = []
       @paths.each do |path|
         found_files = @discoverer.discover(path)
-        logger.info("Found #{files.length} files from path #{path}")
+        logger.info("Found #{found_files.length} files from path #{path}")
         files.push(*found_files)
       end
 
@@ -224,6 +227,8 @@ module PrometheusConfigBuilder
         cfs.add(cf)
       end
 
+      @@config_files.observe(files.length)
+
       rules_dir = @dst_dir + "/rules"
       scrape_files_dir = @dst_dir + "/scrape_files"
       cfs.set_rules_dir(rules_dir)

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

@@ -23,23 +23,7 @@ module PrometheusConfigBuilder
       })
       $VERBOSE = x
       tasks = get_tasks(config["cluster"], config["service"])
-      ips = get_task_ips(config["cluster"], tasks)
-
-      targets = []
-      ips.each do |ip|
-        if config["metrics_port"]
-          targets << ip + ":" + config["metrics_port"].to_s
-        else
-          targets << ip
-        end
-      end
-
-      data = [
-        {
-          "targets" => targets,
-          "labels" => config["labels"]
-        }
-      ]
+      endpoints = get_task_endpoints(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!")
@@ -48,7 +32,7 @@ module PrometheusConfigBuilder
 
       file = File.expand_path(dst_prefix + "_" + config["job_name"] + ".json")
       File.open(file, "w") do |file|
-        file.write(data.to_json)
+        file.write(endpoints.to_json)
       end
 
       # Make copy of the settings and remove our custom properties from it.
@@ -96,8 +80,8 @@ module PrometheusConfigBuilder
       return tasks
     end
 
-    def self.get_task_ips(cluster, tasks)
-      ips = []
+    def self.get_task_endpoints(cluster, tasks, common_labels, metrics_port)
+      endpoints = []
       task_chunk = tasks.pop(100)
       loop do
         begin
@@ -110,7 +94,16 @@ module PrometheusConfigBuilder
             result.tasks.each do |task|
               # FIXME: This assumes somewhat on the ip structure.
               ip = task.containers[0].network_interfaces[0].private_ipv_4_address
-              ips << ip
+
+              if metrics_port
+                ip = ip + ":" + metrics_port.to_s
+              end
+              labels = common_labels.clone
+              labels["ecs_arn"] = task.task_arn
+              endpoints << {
+                "targets" => [ip],
+                "labels" => labels
+              }
             end
           end
         rescue Aws::ECS::Errors::ServiceError => e
@@ -121,7 +114,7 @@ module PrometheusConfigBuilder
         break if tasks.length == 0
         task_chunk = tasks.pop(100)
       end
-      return ips
+      return endpoints
     end
 
 

data/prometheus-config-builder.gemspec

@@ -3,7 +3,7 @@
 
 Gem::Specification.new do |s|
   s.name          = 'prometheus-config-builder'
-  s.version       = '0.0.11'
+  s.version       = '0.0.16'
   s.date          = Time.now
 
   s.summary       = %q{Template based config generation}
@@ -16,6 +16,7 @@ Gem::Specification.new do |s|
   s.required_ruby_version = '>= 2.0.0'
 
   s.add_dependency 'aws-sdk', '~> 3'
+  s.add_dependency 'prometheus_exporter', '>= 0.4.13'
 
   s.add_development_dependency 'rubygems-tasks', '~> 0.2'
   s.add_development_dependency 'minitest', '~> 5.4'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prometheus-config-builder
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.16
 platform: ruby
 authors:
 - Juho Mäkinen juho.makinen@gmail.com
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-10 00:00:00.000000000 Z
+date: 2019-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3'
+- !ruby/object:Gem::Dependency
+  name: prometheus_exporter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.4.13
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.4.13
 - !ruby/object:Gem::Dependency
   name: rubygems-tasks
   requirement: !ruby/object:Gem::Requirement
@@ -123,7 +137,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.5.2.3
 signing_key: 
 specification_version: 4
 summary: Template based config generation