diff --git a/elk_metrics_7x/roles/elastic_logstash/defaults/main.yml b/elk_metrics_7x/roles/elastic_logstash/defaults/main.yml
index 92a00fbf..3ddc4d41 100644
--- a/elk_metrics_7x/roles/elastic_logstash/defaults/main.yml
+++ b/elk_metrics_7x/roles/elastic_logstash/defaults/main.yml
@@ -102,3 +102,6 @@ logstash_collectd_buffer_size: 1452
 logstash_collectd_security_level: Sign
 # To enable security the auth file is required.
 #logstash_collectd_authfile: /etc/collectd/passwd
+
+# Set the descriptive name by which Logstash is identified
+logstash_node_name: "{{ inventory_hostname }}"
diff --git a/elk_metrics_7x/roles/elastic_logstash/templates/logstash.yml.j2 b/elk_metrics_7x/roles/elastic_logstash/templates/logstash.yml.j2
index 8642f536..9e14c7a4 100644
--- a/elk_metrics_7x/roles/elastic_logstash/templates/logstash.yml.j2
+++ b/elk_metrics_7x/roles/elastic_logstash/templates/logstash.yml.j2
@@ -16,7 +16,7 @@
 #
 # Use a descriptive name for the node:
 #
-node.name: {{ inventory_hostname }}
+node.name: {{ logstash_node_name }}
 #
 # If omitted the node name will default to the machine's host name
 #