fluent-plugin-azure-loganalytics 0.4.2 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d32a5fb1127fb212e6ff5ea84b711d62d5e9b2903b694848e31555460caf8677
-  data.tar.gz: beb8e34f1b20be3f9cdbd0486a8d4652178436ee0f7955a3ff680f5a159573ed
+  metadata.gz: 1c9095b0314ef02f761c5dc0251db3adc97d767e95989fb52c01579d1ba0c862
+  data.tar.gz: 1f0a64828d9d6b699d8d7b26e57a3e20fcc2a3dc1716c5e81949e88a026f66d8
 SHA512:
-  metadata.gz: 92e48813d8dd4fc864f24cbfa13fdc7a9f15d15a3b9a2f48aa55db3e720b67ef1532bb6955e925d5283eff5265a94a304316113d92607f06792342b46cfb1ed0
-  data.tar.gz: 93f94c25dc78fc1b27e76226298b8b6f8200ff73c66d7999d08a557097b8e637cb542006c81aa5e77620553102bcb1f57bd4efd0d81b2aa722ee25de8d364277
+  metadata.gz: 5beb42798957400b90a474140c07da6ba29eb40ad93b8a4741d6c80b6eb9c53c1010c0581599337954617172f60a2b2a7fc67de380d1283274211da7602d3521
+  data.tar.gz: ca6fc19bc5bf43e6d7f8c3f13a3a29566afa02379d3705f47b4b27d973852bd054ca291d7e6b09d02e06cd0f805dc07fb22ba57bd617d04a9fc38bc6c440f845

data/ChangeLog.md

@@ -1,3 +1,7 @@
+## 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)
 

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.2
+0.5.0

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

@@ -20,7 +20,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency "fluentd", [">= 0.14.15", "< 2"]
   gem.add_dependency "rest-client"
   gem.add_dependency "yajl-ruby"
-  gem.add_dependency "azure-loganalytics-datacollector-api", [">= 0.1.5"]
+  gem.add_dependency "azure-loganalytics-datacollector-api", [">= 0.2.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,7 +95,7 @@ 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=>" + Yajl.dump(records)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-azure-loganalytics
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.5.0
 platform: ruby
 authors:
 - Yoichi Kawasaki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-18 00:00:00.000000000 Z
+date: 2020-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -64,14 +64,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.5
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.5
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: rake
   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.6
+rubygems_version: 3.1.3
 signing_key: 
 specification_version: 4
 summary: Azure Log Analytics output plugin for Fluentd