fluent-plugin-azure-loganalytics 0.4.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 22b06d1614e45b6e4bd69d561fd9e1baa607aab324877c55279d68e6f95cdf89
-  data.tar.gz: 810e6437147632a77ec333e484282c320a75482c889d1cfe59d5e4410eb495e0
+  metadata.gz: dcff438369d594cf860850bf68ed2d0562a8b6949533830d3f93583b34841f2f
+  data.tar.gz: 80b0e1739deb479ba914125996e6c092dff9142ff382b7ca896faee3f2c2d8d7
 SHA512:
-  metadata.gz: b17088b54b49a51b04d15545b7e15c16cef996ec4ac7c1ff2c1739e383a15f3064a11db2d7bc763833ef325790935c89dc11ff85589b56da9f3f700e3a69ade4
-  data.tar.gz: f80ef8d11245daf1bafa759dbfd26b3b55dbe6649eaa3bf6389c8a5f78a00c2bb76d5499c94051f5b8b5b7b540dd3249d7ec63885df763382faf8b6f85c25422
+  metadata.gz: db9fb5a2345fda2cf27c1af765efea4c16b49f6e795c13447c8c7577eca5a304ac73444c0e7de9e79644e48a21843e5fb5105ef76b1cb68f7260de8116d52c7e
+  data.tar.gz: 3312bffb982fec74397a6ce3df259b669b63f5c3be3769128dbca6d57a9a3118fb7d340082c8a04efd0340eba54987e275992bf34b6c055ad174006f135b8aef

data/ChangeLog.md

@@ -1,4 +1,30 @@
+# ChangeLog
+
+## 0.7.0
+
+* Change base [azure-loganalytics-datacollector-api](https://github.com/yokawasa/azure-log-analytics-data-collector) to ">= 0.5.0"
+    * [azure-log-analytics-data-collector-0.5.0](https://github.com/yokawasa/azure-log-analytics-data-collector/releases/tag/v0.5.0) added check body size not to exceed data limit of 30MB in Azure Monitor Data Collection API
+    * relevant issues: [issue #16](https://github.com/yokawasa/fluent-plugin-azure-loganalytics/issues/16)
+
+## 0.6.0
+
+* Change base [azure-loganalytics-datacollector-api](https://github.com/yokawasa/azure-log-analytics-data-collector) to ">= 0.4.0"
+    * In [azure-log-analytics-data-collector-0.4.0](https://github.com/yokawasa/azure-log-analytics-data-collector/releases/tag/v0.4.0), restclient retries request on the status code 429(Too Many Requests), 500 (Internal Server Error), 503(Service Unavailable)
+
+## 0.5.0
+
+* Support setting the [x-ms-AzureResourceId](https://docs.microsoft.com/en-us/azure/azure-monitor/platform/data-collector-api#request-headers) Header - [issue #17](https://github.com/yokawasa/fluent-plugin-azure-loganalytics/issues/17)
+
+## 0.4.2
+
+* fix CVE-2020-8130 - [issue #13](https://github.com/yokawasa/fluent-plugin-azure-loganalytics/issues/13)
+
+## 0.4.1
+
+* Use `yajl` instead of default JSON encoder to fix logging exceptions - [PR#10](https://github.com/yokawasa/fluent-plugin-azure-loganalytics/pull/10)
+
 ## 0.4.0
+
 * Add endpoint parameter for sovereign cloud - [PR#8](https://github.com/yokawasa/fluent-plugin-azure-loganalytics/pull/8)
 * Changed dependency for azure-loganalytics-datacollector-api to `>= 0.1.5` - [PR#8](https://github.com/yokawasa/fluent-plugin-azure-loganalytics/pull/8)
 

data/README.md

@@ -58,6 +58,8 @@ Once you have the workspace, get Workspace ID and Shared Key (either Primary Key
  * **log\_type (required)** - The name of the event type that is being submitted to Log Analytics. log_type only supports alpha characters
  * **endpoint (optional)** - Default:'ods.opinsights.azure.com'. The service endpoint. You may want to use this param in case of sovereign cloud that has a different endpoint from the public cloud
  * **time\_generated\_field (optional)** - Default:''(empty string) The name of the time generated field. Be carefule that the value of field should strictly follow the ISO 8601 format (YYYY-MM-DDThh:mm:ssZ). See also [this](https://docs.microsoft.com/en-us/azure/log-analytics/log-analytics-data-collector-api#create-a-request) for more details
+ * **azure\_resource\_id (optional)** - Default:''(empty string) The resource ID of the Azure resource the data should be associated with. This populates the [_ResourceId](https://docs.microsoft.com/en-us/azure/azure-monitor/platform/log-standard-properties#_resourceid) property and allows the data to be included in [resource-context](https://docs.microsoft.com/en-us/azure/azure-monitor/platform/design-logs-deployment#access-mode) queries in Azure Log Analytics (Azure Monitor). If this field isn't specified, the data will not be included in resource-context queries. The format should be like /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}. Please see [this](https://docs.microsoft.com/en-us/azure/azure-resource-manager/templates/template-functions-resource#resourceid) for more detail on the resource ID format.
+
  * **add\_time\_field (optional)** - Default:true. This option allows to insert a time field to record
  * **time\_field\_name (optional)** - Default:time. This is required only when add_time_field is true
  * **localtime (optional)** - Default:false. Time record is inserted with UTC (Coordinated Universal Time) by default. This option allows to use local time if you set localtime true. This is valid only when add_time_field is true
@@ -105,6 +107,7 @@ fluent-plugin-azure-loganalytics adds **time** and **tag** attributes by default
     customer_id 818f7bbc-8034-4cc3-b97d-f068dd4cd658
     shared_key ppC5500KzCcDsOKwM1yWUvZydCuC3m+ds/2xci0byeQr1G3E0Jkygn1N0Rxx/yVBUrDE2ok3vf4ksCzvBmQXHw==(dummy)
     log_type ApacheAccessLog
+    azure_resource_id /subscriptions/11111111-1111-1111-1111-111111111111/resourceGroups/otherResourceGroup/providers/Microsoft.Storage/storageAccounts/examplestorage
     add_time_field true
     time_field_name mytime
     time_format %s

data/VERSION

@@ -1 +1 @@
-0.4.0
+0.7.0

data/docs/install-tdagent-and-the-plugin-on-rhel.md

@@ -1,4 +1,4 @@
-# How to install td-agent and luent-plugin-azure-loganalytics plugin on RHEL
+# How to install td-agent and fluent-plugin-azure-loganalytics plugin on RHEL
 
 This is a quick installation procedure of td-agent and the custom plugin (fluent-plugin-azure-loganalytics) on Red Hat Enterprise Linux (7.4) 
 
@@ -65,4 +65,4 @@ $ sudo /usr/sbin/td-agent-gem install fluent-plugin-azure-loganalytics
 $ git clone https://github.com/yokawasa/fluent-plugin-azure-loganalytics.git
 $ cd fluent-plugin-azure-loganalytics
 $ /opt/td-agent/embedded/bin/rake test
-```
+```

data/examples/fluent_2.conf

@@ -11,6 +11,7 @@
     customer_id CUSTOMER_ID   # Customer ID aka WorkspaceID String
     shared_key KEY_STRING     # The primary or the secondary Connected Sources client authentication key
     log_type EVENT_TYPE_NAME  # The name of the event type. ex) ApacheAccessLog
+    azure_resource_id RESOURCE_ID  # format: /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}
     add_time_field true
     time_field_name mytime
     time_format %s

data/fluent-plugin-azure-loganalytics.gemspec

@@ -11,7 +11,6 @@ Gem::Specification.new do |gem|
   gem.description   = gem.summary
   gem.homepage      = "http://github.com/yokawasa/fluent-plugin-azure-loganalytics"
   gem.license       = "Apache-2.0"
-  gem.has_rdoc       = false
 
   gem.files         = `git ls-files`.split("\n")
   gem.executables   = gem.files.grep(%r{^bin/}) { |f| File.basename(f) }
@@ -20,8 +19,8 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency "fluentd", [">= 0.14.15", "< 2"]
   gem.add_dependency "rest-client"
-  gem.add_dependency "azure-loganalytics-datacollector-api", [">= 0.1.5"]
-  gem.add_development_dependency "bundler", "~> 1.11"
-  gem.add_development_dependency "rake", "~> 10.0"
+  gem.add_dependency "yajl-ruby"
+  gem.add_dependency "azure-loganalytics-datacollector-api", [">= 0.5.0"]
+  gem.add_development_dependency "rake", ">= 12.3.3"
   gem.add_development_dependency "test-unit"
 end

data/lib/fluent/plugin/out_azure-loganalytics.rb

@@ -22,6 +22,8 @@ module Fluent::Plugin
                  :desc => "The name of the event type that is being submitted to Log Analytics. log_type only alpha characters"
     config_param :time_generated_field, :string, :default => '',
                  :desc => "The name of the time generated field. Be carefule that the value of field should strictly follow the ISO 8601 format (YYYY-MM-DDThh:mm:ssZ)"
+    config_param :azure_resource_id, :string, :default => '',
+                 :desc => "Resource ID of the Azure resource the data should be associated with. This populates the _ResourceId property and allows the data to be included in resource-context queries in Azure Log Analytics (Azure Monitor). If this field isn't specified, the data will not be included in resource-context queries. The format should be like /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}"
     config_param :add_time_field, :bool, :default => true,
                  :desc => "This option allows to insert a time field to record"
     config_param :time_field_name, :string, :default => "time",
@@ -93,14 +95,14 @@ module Fluent::Plugin
         records.push(record)
       }
       begin
-        res = @client.post_data(@log_type, records, @time_generated_field)
+        res = @client.post_data(@log_type, records, @time_generated_field, @azure_resource_id)
         if not Azure::Loganalytics::Datacollectorapi::Client.is_success(res)
-          log.fatal "DataCollector API request failure: error code: "
-                  + "#{res.code}, data=>" + records.to_json
+          log.fatal "DataCollector API request failure: error code: " +
+                  "#{res.code}, data=>" + Yajl.dump(records)
         end
       rescue Exception => ex
-        log.fatal "Exception occured in posting to DataCollector API: "
-                  + "'#{ex}', data=>" + records.to_json
+        log.fatal "Exception occured in posting to DataCollector API: " +
+                  "'#{ex}', data=>" + Yajl.dump(records)
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-azure-loganalytics
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Yoichi Kawasaki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-06 00:00:00.000000000 Z
+date: 2020-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -45,47 +45,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: azure-loganalytics-datacollector-api
+  name: yajl-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.5
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.5
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: azure-loganalytics-datacollector-api
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.11'
-  type: :development
+        version: 0.5.0
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
@@ -144,7 +144,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Azure Log Analytics output plugin for Fluentd