diff --git a/ansible/install/roles/collectd-openstack/templates/compute.collectd.conf.j2 b/ansible/install/roles/collectd-openstack/templates/compute.collectd.conf.j2 index 3808cc30c..2210e1151 100644 --- a/ansible/install/roles/collectd-openstack/templates/compute.collectd.conf.j2 +++ b/ansible/install/roles/collectd-openstack/templates/compute.collectd.conf.j2 @@ -99,6 +99,7 @@ PreCacheChain "PreCache" ProcessMatch "neutron-openvswitch-agent" "python.+neutron-openvswitch-agent" # 9,10 ProcessMatch "neutron-l3-agent" "python.+neutron-l3-agent" # 10 with DVR ProcessMatch "neutron-ns-metadata-proxy" "python.+neutron-ns-metadata-proxy" # 10 with DVR + ProcessMatch "neutron-metadata-agent" "python.+neutron-metadata-agent" # 10 with DVR # Nova (OpenStack Installed) ProcessMatch "nova-compute" "python.+nova-compute" # 9,10 diff --git a/lib/Elastic.py b/lib/Elastic.py index 374b3ab72..88d46a546 100644 --- a/lib/Elastic.py +++ b/lib/Elastic.py @@ -103,7 +103,7 @@ class Elastic(object): else: self.logger.info("Pushed data to Elasticsearch to index {}" " and browbeat UUID {}" . - format(self.index, result['browbeat_uuid'])) + format(self.index, result['browbeat_uuid'])) break except Exception: self.logger.error("Error pushing data to Elasticsearch, going to retry"