fluent-plugin-azuremonitormetrics 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4ce92a7be444dcf1fbbd46ef511b4af1ab734a61
-  data.tar.gz: 298446f3b3e78d186f7090a7ab55a7a842f57be5
+  metadata.gz: bac133b5511787e20e2da55c91b6d982bb160ace
+  data.tar.gz: 88636285bcb39785699fcfd85f1f8ad50af2225a
 SHA512:
-  metadata.gz: 5b4686177e1a75936521c908ef05a9e38f957cdcb229d13f9d8761c46f578c6b1435412f723328b63b231b709df9d4e02e135a9a93f397c370b9cf107b7e3f66
-  data.tar.gz: 93c9305a870778695fa7669514e246dd3ac0a1c141e070d831f15b969dbfd2b00c882c12aaa6bf291a9544868f7f6856f78df3e39f85ef5a371fdcb4235f8cd0
+  metadata.gz: f0b5a48ad01d68bc34aad68f2a0b6f6f754401cdca96d302ff7d7eb53abd4a2661dc1f1af541fbf3b44cf1094ff51b85e9256dd01dae1d8f87e629ba1b141f08
+  data.tar.gz: 408903ce49dfa8a5a6f3df6730d9e727aa5ff97204786bdd2f4f84ccb49dc86e0578deb4e04d3ef180dffdcc865ac2d6fd6f02c0999d98a12597bb41162036cc

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fluent-plugin-azuremonitormetrics (0.0.2)
+    fluent-plugin-azuremonitormetrics (0.0.4)
       azure_mgmt_monitor (~> 0.11.0)
       fluentd (>= 0.10.30)
 
@@ -12,21 +12,22 @@ GEM
       ms_rest_azure (~> 0.8.0)
     concurrent-ruby (1.0.5)
     cool.io (1.5.3)
+    dig_rb (1.0.1)
     domain_name (0.5.20170404)
       unf (>= 0.0.5, < 1.0.0)
-    faraday (0.13.1)
+    faraday (0.14.0)
       multipart-post (>= 1.2, < 3)
     faraday-cookie_jar (0.0.6)
       faraday (>= 0.7.4)
       http-cookie (~> 1.0.0)
-    fluentd (0.14.23)
+    fluentd (1.1.0)
       cool.io (>= 1.4.5, < 2.0.0)
+      dig_rb (~> 1.0.0)
       http_parser.rb (>= 0.5.1, < 0.7.0)
       msgpack (>= 0.7.0, < 2.0.0)
-      ruby_dig (~> 0.0.2)
       serverengine (>= 2.0.4, < 3.0.0)
       sigdump (~> 0.2.2)
-      strptime (~> 0.1.7)
+      strptime (>= 0.2.2, < 1.0.0)
       tzinfo (~> 1.0)
       tzinfo-data (~> 1.0)
       yajl-ruby (~> 1.0)
@@ -42,26 +43,25 @@ GEM
       faraday (~> 0.9)
       faraday-cookie_jar (~> 0.0.6)
       ms_rest (~> 0.7.0)
-    msgpack (1.1.0)
+    msgpack (1.2.2)
     multipart-post (2.0.0)
     power_assert (1.1.0)
     rake (12.0.0)
-    ruby_dig (0.0.2)
-    serverengine (2.0.5)
+    serverengine (2.0.6)
       sigdump (~> 0.2.2)
     sigdump (0.2.4)
-    strptime (0.1.9)
+    strptime (0.2.3)
     test-unit (3.2.5)
       power_assert
     thread_safe (0.3.6)
     timeliness (0.3.8)
-    tzinfo (1.2.4)
+    tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    tzinfo-data (1.2017.3)
+    tzinfo-data (1.2018.3)
       tzinfo (>= 1.0.0)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.7.4)
+    unf_ext (0.0.7.5)
     yajl-ruby (1.3.1)
 
 PLATFORMS

data/README.md

@@ -25,12 +25,11 @@ $ gem install fluent-plugin-azuremonitormetrics
   client_id     [Azure_Client_Id]
   client_secret [Azure_Client_Secret]
 
-  timespan          [timespan in second] (default: 300)
-  interval          [time grain of the query: string] (default: PT1M)
+  timespan          [The query timespan in seconds - must be greater than 60] (default: 300)
+  interval          [timegrain of the query] (default: PT1M, allowed values are: PT1M, PT5M, PT15M, PT30M, PT1H, PT6H, PT12H, PT24H)
   resource_uri      [the identifier of the resource]
   aggregation       [list of aggregation types] (example: Average,count)
   top               [Max number of records to retrive]
-  orderby           [The aggregation to use for sorting] (example: sum asc)
   filter            [filter to reduce metric data] (example A eq 'a1' and B eq '*')
   result_type       [reduces the set of data collected]
   metrics           [The name of the metrics to retrive, sperated by commas] (example: Network Out,Percentage CPU)

data/fluent-plugin-azuremonitormetrics.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |gem|
   gem.name          = "fluent-plugin-azuremonitormetrics"
-  gem.version       = "0.0.3"
+  gem.version       = "0.0.4"
   gem.authors       = ["Ilana Kantorov"]
   gem.email         = ["ilanak@microsoft.com"]
   gem.description   = %q{Input plugin for Azure Monitor Metrics.}

data/lib/fluent/plugin/in_azuremonitormetrics.rb

@@ -25,11 +25,10 @@ class Fluent::AzureMonitorMetricsInput < Fluent::Input
   config_param :resource_uri,       :string, :default => nil
   config_param :aggregation,        :string, :default => nil
   config_param :top,                :integer, :default => nil
-  config_param :orderby,            :string, :default => nil
   config_param :filter,             :string, :default => nil
   config_param :result_type,        :string, :default => nil
   config_param :metrics,            :string, :default => nil
-  config_param :api_version,        :string, :default => "2016-09-01"
+  config_param :api_version,        :string, :default => "2017-05-01-preview"
 
   def initialize
     super
@@ -77,19 +76,20 @@ class Fluent::AzureMonitorMetricsInput < Fluent::Input
     request_headers['x-ms-client-request-id'] = SecureRandom.uuid
     request_headers['accept-language'] = @client.accept_language unless @client.accept_language.nil?
 
-    metrics_string = get_param_string(@metrics, "name.value")
-    aggregation_string =  @aggregation.empty? ? '' : get_param_string(@aggregation, "aggregationType")
+    timespanstring = "#{start_time.utc.iso8601}/#{end_time.utc.iso8601}"
+    top = @filter.nil? ? nil : @top
 
-    filter = "timeGrain eq duration'#{@interval}' #{metrics_string} #{aggregation_string} and startTime eq #{start_time.utc.iso8601} and endTime eq #{end_time.utc.iso8601}"
-    log.debug filter
     {
         middlewares: [[MsRest::RetryPolicyMiddleware, times: 3, retry: 0.02], [:cookie_jar]],
         path_params: {'resourceUri' => @resource_uri},
         query_params: {'api-version' => @api_version,
-                       '$top' => @top,
-                       '$orderby' => @orderby,
-                       '$filter' => filter,
-                       'resultType' => @result_type},
+                       '$top' => top,
+                       '$filter' => @filter,
+                       'timespan' => timespanstring,
+                       'interval' => @interval,
+                       'metric' => @metrics,
+                       'resultType' => @result_type,
+                       'aggregation'=> @aggregation},
         headers: request_headers.merge(custom_headers || {}),
         base_url: @client.base_url
     }
@@ -130,7 +130,8 @@ class Fluent::AzureMonitorMetricsInput < Fluent::Input
       response_content = http_response.body
       unless status_code == 200
         error_model = JSON.load(response_content)
-        log.error(error_model['error']['message'])
+        log.error("Error occurred while sending the request")
+        log.error(error_model)
       end
 
       result.request_id = http_response['x-ms-request-id'] unless http_response['x-ms-request-id'].nil?
@@ -140,6 +141,7 @@ class Fluent::AzureMonitorMetricsInput < Fluent::Input
           result.body = response_content.to_s.empty? ? nil : JSON.load(response_content)
         rescue Exception => e
           log.error("Error occurred in parsing the response")
+          log.error(e)
         end
       end
 

data/test/plugin/test_in_azuremonitormetrics.rb

@@ -13,14 +13,14 @@ class AzureMonitorMetricsInputTest < Test::Unit::TestCase
     client_secret test_client_secret
 
     timespan          300
-    aggregation       Average,count
     interval          PT1M
     resource_uri      /subscriptions/b324c52b-4073-4807-93af-e07d289c093e/resourceGroups/test/providers/Microsoft.Storage/storageAccounts/larryshoebox/blobServices/default/providers/Microsoft.Insights/metrics/BlobCapacity
+    aggregation       Average,count
     top               20
-    orderby           sum asc
-    filter            timeGrain eq duration'PT1M' and (name.value eq 'Network Out' or name.value eq 'Percentage CPU') and (aggregationType eq 'Average' or aggregationType eq 'Count') and startTime eq 2017-10-11T23:00:00Z and endTime eq 2017-11-22T15:00:00Z
+    filter            A eq 'a1' and B eq '*'
     result_type       Success
-    api_version       2016-09-01
+    metrics           Percentage CPU
+    api_version       2017-05-01-preview
   ]
 
   def create_driver_monitor_metrics(conf = CONFIG_MONITOR_METRICS)
@@ -33,12 +33,14 @@ class AzureMonitorMetricsInputTest < Test::Unit::TestCase
     assert_equal 'test_tenant_id', d.instance.tenant_id
     assert_equal 'test_client_id', d.instance.client_id
     assert_equal 300, d.instance.timespan
+    assert_equal 'PT1M', d.instance.interval
     assert_equal '/subscriptions/b324c52b-4073-4807-93af-e07d289c093e/resourceGroups/test/providers/Microsoft.Storage/storageAccounts/larryshoebox/blobServices/default/providers/Microsoft.Insights/metrics/BlobCapacity', d.instance.resource_uri
+    assert_equal 'Average,count', d.instance.aggregation
     assert_equal 20, d.instance.top
-    assert_equal 'sum asc', d.instance.orderby
-    assert_equal "timeGrain eq duration'PT1M' and (name.value eq 'Network Out' or name.value eq 'Percentage CPU') and (aggregationType eq 'Average' or aggregationType eq 'Count') and startTime eq 2017-10-11T23:00:00Z and endTime eq 2017-11-22T15:00:00Z", d.instance.filter
+    assert_equal 'A eq \'a1\' and B eq \'*\'', d.instance.filter
     assert_equal 'Success', d.instance.result_type
-    assert_equal '2016-09-01', d.instance.api_version
+    assert_equal 'Percentage CPU', d.instance.metrics
+    assert_equal '2017-05-01-preview', d.instance.api_version
   end
 
   def test_set_query_options
@@ -46,11 +48,13 @@ class AzureMonitorMetricsInputTest < Test::Unit::TestCase
     start_time = Time.now - 1000
     end_time = Time.now
     query_options = d.instance.set_path_options(start_time, end_time, {})
-    assert_equal '2016-09-01', query_options[:query_params]['api-version']
-    assert_equal "timeGrain eq duration'PT1M' and (name.value eq 'Network Out' or name.value eq 'Percentage CPU') and (aggregationType eq 'Average' or aggregationType eq 'Count') and startTime eq #{start_time.utc.iso8601} and endTime eq #{end_time.utc.iso8601}", query_options[:query_params]['$filter']
+    assert_equal '2017-05-01-preview', query_options[:query_params]['api-version']
+    assert_equal 'A eq \'a1\' and B eq \'*\'', query_options[:query_params]['$filter']
+    assert_equal 'Average,count', query_options[:query_params]['aggregation']
+    assert_equal 'PT1M', query_options[:query_params]['interval']
     assert_equal 20, query_options[:query_params]['$top']
-    assert_equal 'sum asc', query_options[:query_params]['$orderby']
     assert_equal 'Success', query_options[:query_params]['resultType']
+    assert_equal 'Percentage CPU', query_options[:query_params]['metric']
     assert_equal '/subscriptions/b324c52b-4073-4807-93af-e07d289c093e/resourceGroups/test/providers/Microsoft.Storage/storageAccounts/larryshoebox/blobServices/default/providers/Microsoft.Insights/metrics/BlobCapacity', query_options[:path_params]['resourceUri']
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-azuremonitormetrics
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Ilana Kantorov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-25 00:00:00.000000000 Z
+date: 2018-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd