prometheus_exporter 0.4.4 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b60596255e84ca5aedae095d4ae7dda21f1c324e49a495e73e5f8e8a6adb3472
-  data.tar.gz: 990f03708492b5a2b5d13cf6a9bf67e091bdf62c819b1a559a0a240e6d9660bc
+  metadata.gz: 82048f57a2ee65b704b92d2e74c2e8033215e0331c8604c1e45a63d16f8c3a1d
+  data.tar.gz: fc18bcc997f15bbdb182d5199543cd11e6ccad6a774ee838586b313eaa2a6de6
 SHA512:
-  metadata.gz: d914be65e9857dcf5173e03a8fd230d0a2004aea8cf454fd1671229c856730ee72a9793624eddcf01ee561768d228e9e2e06eddd1a72629726d1dc994f34614b
-  data.tar.gz: 6a05a048eaa75641b749761ed823be1aa694e83d3c2f0d35e860e9237dd0f82569dc31c4c3d0e24293b10d1dcd5d36f16d893348c620f21efae9c16596b29b3c
+  metadata.gz: ec6a0e811258775d28e2de42713481ddde3bbd40a7c6ec9773aaf1f0a557facf5b85a6ca00646b17747381c9b39481d5f3cb6b53a66db676b0bc30e74549990f
+  data.tar.gz: c15fb3209e8045e113169aaa884de7bc7bfe96d2cb20dcc6a1c57e3a82b68b828e4b513c0fc96e7b156f1dcc721055f036a37fe747a684f70a2b01f6eb238061

data/CHANGELOG

@@ -1,3 +1,8 @@
+0.4.4 - 14-02-2019
+
+- Feature: Allow process collector to ship custom labels for all process metrics
+- Fix: Always scope process metrics on hostname in collector
+
 0.4.3 - 11-02-2019
 
 - Feature: Add alias for Gauge #observe called #set, this makes it a bit easier to migrate from prom

data/README.md

@@ -68,7 +68,7 @@ server.start
 PrometheusExporter::Client.default = PrometheusExporter::LocalClient.new(collector: server.collector)
 
 # this ensures basic process instrumentation metrics are added such as RSS and Ruby metrics
-PrometheusExporter::Instrumentation::Process.start
+PrometheusExporter::Instrumentation::Process.start(type: "my program", labels: {my_custom: "label for all process metrics"})
 
 gauge = PrometheusExporter::Metric::Gauge.new("rss", "used RSS for process")
 counter = PrometheusExporter::Metric::Counter.new("web_requests", "number of web requests")

data/lib/prometheus_exporter/instrumentation/process.rb

@@ -3,8 +3,18 @@
 # collects stats from currently running process
 module PrometheusExporter::Instrumentation
   class Process
-    def self.start(client: nil, type: "ruby", frequency: 30)
-      process_collector = new(type)
+    def self.start(client: nil, type: "ruby", frequency: 30, labels: nil)
+
+      metric_labels =
+        if labels && type
+          labels.merge(type: type)
+        elsif labels
+          labels
+        else
+          { type: type }
+        end
+
+      process_collector = new(metric_labels)
       client ||= PrometheusExporter::Client.default
 
       stop if @thread
@@ -30,14 +40,26 @@ module PrometheusExporter::Instrumentation
       end
     end
 
-    def initialize(type)
-      @type = type
+    def initialize(metric_labels)
+      @metric_labels = metric_labels
+      @hostname = nil
+    end
+
+    def hostname
+      @hostname ||=
+        begin
+          `hostname`.strip
+        rescue => e
+          STDERR.puts "Unable to lookup hostname #{e}"
+          "unknown-host"
+        end
     end
 
     def collect
       metric = {}
       metric[:type] = "process"
-      metric[:process_type] = @type
+      metric[:metric_labels] = @metric_labels
+      metric[:hostname] = hostname
       collect_gc_stats(metric)
       collect_v8_stats(metric)
       collect_process_stats(metric)

data/lib/prometheus_exporter/server/process_collector.rb

@@ -34,7 +34,7 @@ module PrometheusExporter::Server
       metrics = {}
 
       @process_metrics.map do |m|
-        metric_key = { pid: m["pid"], type: m["process_type"] }
+        metric_key = m["metric_labels"].merge("pid" => m["pid"])
 
         PROCESS_GAUGES.map do |k, help|
           k = k.to_s
@@ -62,8 +62,10 @@ module PrometheusExporter::Server
       obj["created_at"] = now
 
       @process_metrics.delete_if do |current|
-        obj["pid"] == current["pid"] || (current["created_at"] + MAX_PROCESS_METRIC_AGE < now)
+        (obj["pid"] == current["pid"] && obj["hostname"] == current["hostname"]) ||
+          (current["created_at"] + MAX_PROCESS_METRIC_AGE < now)
       end
+
       @process_metrics << obj
     end
   end

data/lib/prometheus_exporter/version.rb

@@ -1,3 +1,3 @@
 module PrometheusExporter
-  VERSION = "0.4.4"
+  VERSION = "0.4.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: prometheus_exporter
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.5
 platform: ruby
 authors:
 - Sam Saffron