topological_inventory-providers-common 2.1.3 → 2.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9848e297a81db270e52355b3caf500b38391f1c35e118ca31cadbec35c3f0c5e
-  data.tar.gz: ad23c8d4f9a46b6824b20e2d870611d4b3a9c570da00f00a262513934b2349ab
+  metadata.gz: 9c17638d4fd82db196de0019069a765bf1c6becdb20498765507ae35a02727eb
+  data.tar.gz: a395cd7243591bc3dab9f841e491bb978a2502d2ba1cfec3fdb004de784523dd
 SHA512:
-  metadata.gz: b9e92c54114310f529eb78c8faa1ec64fd56350c82086ea2fbe126594afa596757e3a39e6f068929c093b0a607e60cf6ca46f2671dea867a5c87b1f59cae6de7
-  data.tar.gz: 567e5f95a9138dbc8ac7dd52e26a7fe923075552c89d24c3c4e6111f072c0b1b0fb61c5a1fd463bec86d87f00e359b9ca55cbe728fff5b4a0a2fc7a07e4853ba
+  metadata.gz: ba2b33ec9748ef58b4ca7dc30f14d34443c17026e7915fb2bd9aef2a4ec95c4c287a8149a371b91cab88974a0341f7dfd362a987ca55ea644a5b67646adafde6
+  data.tar.gz: 41edf911fa71ef7dcdaa220a417a236e8a593a01e227ab4f0f88e70318141f8736ad8bd9bff7e642d6cef1134d017baa8aea0c1c194987b08770a721a7a2ff00

data/CHANGELOG.md

@@ -3,6 +3,8 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+## [2.1.4] - 2020-12-14
+Common Counter metrics init #71
 
 ## [2.1.3] - 2020-12-14
 Update travis URL in README file #67

data/lib/topological_inventory/providers/common/metrics.rb

@@ -3,18 +3,25 @@ require "prometheus_exporter"
 require "prometheus_exporter/server"
 require "prometheus_exporter/client"
 require "prometheus_exporter/instrumentation"
+require "topological_inventory/providers/common/mixins/statuses"
 
 module TopologicalInventory
   module Providers
     module Common
       class Metrics
+        include TopologicalInventory::Providers::Common::Mixins::Statuses
+
         ERROR_COUNTER_MESSAGE = "total number of errors".freeze
+        ERROR_TYPES = %i[general].freeze
+        OPERATIONS  = %w[].freeze
 
         def initialize(port = 9394)
           return if port == 0
 
           configure_server(port)
           configure_metrics
+
+          init_counters
         end
 
         def stop_server
@@ -25,6 +32,10 @@ module TopologicalInventory
           @error_counter&.observe(1, :type => type.to_s)
         end
 
+        def record_refresh_timing(labels = {}, &block)
+          record_time(@refresh_timer, labels, &block)
+        end
+
         def record_operation(name, labels = {})
           @status_counter&.observe(1, (labels || {}).merge(:name => name))
         end
@@ -55,6 +66,19 @@ module TopologicalInventory
 
         private
 
+        # Set all values to 0 (otherwise the counter is undefined)
+        def init_counters
+          self.class::ERROR_TYPES.each do |err_type|
+            @error_counter&.observe(0, :type => err_type)
+          end
+
+          self.class::OPERATIONS.each do |op|
+            operation_status.each_key do |status|
+              @status_counter&.observe(0, :name => op, :status => status.to_s)
+            end
+          end
+        end
+
         def configure_server(port)
           @server = PrometheusExporter::Server::WebServer.new(:port => port)
           @server.start
@@ -67,10 +91,11 @@ module TopologicalInventory
           PrometheusExporter::Metric::Base.default_prefix = default_prefix
 
           @duration_seconds = PrometheusExporter::Metric::Histogram.new('duration_seconds', 'Duration of processed operation')
+          @refresh_timer = PrometheusExporter::Metric::Histogram.new('refresh_time', 'Duration of full refresh')
           @error_counter = PrometheusExporter::Metric::Counter.new('errors_total', ERROR_COUNTER_MESSAGE)
           @status_counter = PrometheusExporter::Metric::Counter.new('status_counter', 'number of processed operations')
 
-          [@duration_seconds, @error_counter, @status_counter].each do |metric|
+          [@duration_seconds, @refresh_timer, @error_counter, @status_counter].each do |metric|
             @server.collector.register_metric(metric)
           end
         end

data/lib/topological_inventory/providers/common/version.rb

@@ -1,7 +1,7 @@
 module TopologicalInventory
   module Providers
     module Common
-      VERSION = "2.1.3".freeze
+      VERSION = "2.1.4".freeze
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: topological_inventory-providers-common
 version: !ruby/object:Gem::Version
-  version: 2.1.3
+  version: 2.1.4
 platform: ruby
 authors:
 - Martin Slemr