From dd4823136c01dd0dde9d433e9a27240b71f7a566 Mon Sep 17 00:00:00 2001 From: Sai Sindhur Malleni Date: Tue, 6 Sep 2016 12:22:13 -0400 Subject: [PATCH] Adding Neutron L3 agent and Metadata proxy to Compute Collectd config This commit adds certain processes that are expected to be seen on computed when DVR(Distributed Virtual Routing) is enabled to the collectd config. Also updates compute nodes dashboard. + Fixing dashboards to show neutron-metadata-agent Change-Id: I3d55c2dafc1dcf71d70e195f5d4cadf708979aec --- .../templates/compute.collectd.conf.j2 | 2 ++ ansible/install/roles/grafana-dashboards/vars/main.yml | 9 ++++++--- 2 files changed, 8 insertions(+), 3 deletions(-) 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 0d15ccf66..f0c4ddc1a 100644 --- a/ansible/install/roles/collectd-openstack/templates/compute.collectd.conf.j2 +++ b/ansible/install/roles/collectd-openstack/templates/compute.collectd.conf.j2 @@ -93,6 +93,8 @@ PreCacheChain "PreCache" # Neutron (OpenStack Installed) 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 # Nova (OpenStack Installed) ProcessMatch "nova-compute" "python.+nova-compute" # 9,10 diff --git a/ansible/install/roles/grafana-dashboards/vars/main.yml b/ansible/install/roles/grafana-dashboards/vars/main.yml index 172d9137f..df118cef0 100644 --- a/ansible/install/roles/grafana-dashboards/vars/main.yml +++ b/ansible/install/roles/grafana-dashboards/vars/main.yml @@ -81,7 +81,7 @@ per_process_panels: - neutron-server - neutron-openvswitch-agent - neutron-ns-metadata-proxy - - neutron-metadata-proxy + - neutron-metadata-agent - neutron-l3-agent - neutron-dhcp-agent - name: "Keystone" @@ -160,7 +160,7 @@ per_process_panels: - neutron-server - neutron-openvswitch-agent - neutron-ns-metadata-proxy - - neutron-metadata-proxy + - neutron-metadata-agent - neutron-l3-agent - neutron-dhcp-agent - name: "Keystone" @@ -250,6 +250,9 @@ per_process_panels: - name: "Neutron" processes: - neutron-openvswitch-agent + - neutron-l3-agent # DVR enabled case, OSP 10 + - neutron-ns-metadata-proxy # DVR enabled case, OSP 10 + - neutron-metadata-agent # DVR enabled case, OSP 10 - name: "Ceilometer" processes: - ceilometer-agent-compute @@ -307,7 +310,7 @@ per_process_panels: - neutron-server - neutron-openvswitch-agent - neutron-ns-metadata-proxy - - neutron-metadata-proxy + - neutron-metadata-agent - neutron-l3-agent - neutron-dhcp-agent - name: "Keystone"