From 10ddd7e4f8e157ec1c8a116c3e7117a0c044bc2a Mon Sep 17 00:00:00 2001 From: Chotiwat Chawannakul Date: Wed, 10 Nov 2021 17:29:17 -0800 Subject: [PATCH 1/2] support hostname placeholder --- lib/fluent/plugin/ec2_metadata.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/fluent/plugin/ec2_metadata.rb b/lib/fluent/plugin/ec2_metadata.rb index b689046..ee61c21 100644 --- a/lib/fluent/plugin/ec2_metadata.rb +++ b/lib/fluent/plugin/ec2_metadata.rb @@ -46,6 +46,7 @@ def set_metadata(ec2_metadata) ec2_metadata['account_id'] = instance_identity["accountId"] ec2_metadata['image_id'] = instance_identity["imageId"] + ec2_metadata['hostname'] = get_metadata('hostname') ec2_metadata['instance_id'] = get_metadata('instance-id') ec2_metadata['instance_type'] = get_metadata('instance-type') ec2_metadata['availability_zone'] = get_metadata('placement/availability-zone') From 299a0969b1afe7a8c158655f987881806f3b00f3 Mon Sep 17 00:00:00 2001 From: Chotiwat Chawannakul Date: Fri, 12 Nov 2021 12:37:30 -0800 Subject: [PATCH 2/2] update README --- README.md | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 3989765..0af5ed7 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,8 @@ Example: output_tag ${instance_id}.${tag} - hostname ${tagset_name} + hostname ${hostname} + instance_name ${tagset_name} instance_id ${instance_id} instance_type ${instance_type} az ${availability_zone} @@ -56,7 +57,8 @@ then output becomes as below (indented): ``` i-28b5ee77.foo.bar { - "hostname" : "web0001", + "hostname" : "ip-10-21-34-200.ec2.internal", + "instance_name" : "web0001", "instance_id" : "i-28b5ee77", "instance_type" : "m1.large", "az" : "us-west-1b", @@ -80,7 +82,8 @@ Or you can use filter version: imdsv2 true # Optional, default false - hostname ${tagset_name} + hostname ${hostname} + instance_name ${tagset_name} instance_id ${instance_id} instance_type ${instance_type} private_ip ${private_ip} @@ -97,6 +100,7 @@ The following placeholders are always available: * ${tag} input tag * ${tag_parts} input tag splitted by '.'. you can use it like `${tag_parts[0]}` or `${tag_parts[-1]}` +* ${hostname} hostname * ${instance_id} instance id * ${instance_type} instance type * ${availability_zone} availability zone