x/browbeat
Code Issues Proposed changes

Merge "Adding Neutron L3 agent and Metadata proxy to Compute Collectd config"

Browse Source
This commit is contained in:
Jenkins 2016-09-06 17:40:46 +00:00 committed by Gerrit Code Review
commit 8301081b69
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ansible/install/roles/collectd-openstack/templates/compute.collectd.conf.j2
View File

@ -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

9
ansible/install/roles/grafana-dashboards/vars/main.yml
View File

@ -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"