From 2aeb691d12e2cc1dbbcc48f6360e773a2dac2004 Mon Sep 17 00:00:00 2001 From: Charles Carpenter Date: Sat, 22 Apr 2023 09:51:01 -0400 Subject: [PATCH] Changed _meas_node to meas-node. --- instrumentize/elk/fabric_deploy.yml | 12 ++++++------ .../timestamp/service_files/timestampservice.py | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/instrumentize/elk/fabric_deploy.yml b/instrumentize/elk/fabric_deploy.yml index b4e25488..10611806 100644 --- a/instrumentize/elk/fabric_deploy.yml +++ b/instrumentize/elk/fabric_deploy.yml @@ -18,16 +18,16 @@ vars: filebeat_version: 7.13.2 filebeat_template_file: filebeat.yml.j2 - filebeat_output_elasticsearch_hosts: "{{ hostvars['_meas_node'].ansible_host }}" - filebeat_setup_kibana_host: "{{ hostvars['_meas_node'].ansible_host }}" + filebeat_output_elasticsearch_hosts: "{{ hostvars['meas-node'].ansible_host }}" + filebeat_setup_kibana_host: "{{ hostvars['meas-node'].ansible_host }}" metricbeat_version: 7.13.2 metricbeat_template_file: metricbeat.yml.j2 - metricbeat_output_elasticsearch_hosts: "{{ hostvars['_meas_node'].ansible_host }}" - metricbeat_setup_kibana_host: "{{ hostvars['_meas_node'].ansible_host }}" + metricbeat_output_elasticsearch_hosts: "{{ hostvars['meas-node'].ansible_host }}" + metricbeat_setup_kibana_host: "{{ hostvars['meas-node'].ansible_host }}" packetbeat_version: 7.13.2 packetbeat_template_file: packetbeat.yml.j2 - packetbeat_output_elasticsearch_hosts: "{{ hostvars['_meas_node'].ansible_host }}" - packetbeat_setup_kibana_host: "{{ hostvars['_meas_node'].ansible_host }}" + packetbeat_output_elasticsearch_hosts: "{{ hostvars['meas-node'].ansible_host }}" + packetbeat_setup_kibana_host: "{{ hostvars['meas-node'].ansible_host }}" roles: - worker diff --git a/user_services/timestamp/timestamp/service_files/timestampservice.py b/user_services/timestamp/timestamp/service_files/timestampservice.py index c1a5aeb3..33d08786 100644 --- a/user_services/timestamp/timestamp/service_files/timestampservice.py +++ b/user_services/timestamp/timestamp/service_files/timestampservice.py @@ -46,12 +46,12 @@ def get_hostname(self): return (name) def get_meas_node_ip(self): - # Find the line with _meas_node + # Find the line with meas-node meas_ip="" with open("/etc/hosts", "r") as f: lines = f.readlines() for line in lines: - if ("_meas_node" in line): + if ("meas-node" in line): meas_ip = line.split()[0] return (meas_ip)