diff --git a/ansible/install/roles/collectd-openstack/templates/controller.collectd.conf.j2 b/ansible/install/roles/collectd-openstack/templates/controller.collectd.conf.j2 index 56a40a985..a97c2907b 100644 --- a/ansible/install/roles/collectd-openstack/templates/controller.collectd.conf.j2 +++ b/ansible/install/roles/collectd-openstack/templates/controller.collectd.conf.j2 @@ -397,11 +397,13 @@ PreCacheChain "PreCache" ProcessMatch "nova-novncproxy" "python.+nova-novncproxy" # 10,11,12,13 ProcessMatch "nova-scheduler" "python.+nova-scheduler" # 10,11,12,13 ProcessMatch "placement_wsgi" "placement_wsgi.*-DFOREGROUND" # 11,12,13 + ProcessMatch "nova_metadata_w" "nova_metadata_w.*-DFOREGROUND" # 16 ProcessMatch "octavia-housekeeping" "python.+octavia-housekeeping" # 13 ProcessMatch "octavia-health-manager" "python.+octavia-health-manager" # 13 ProcessMatch "octavia-api" "python.+octavia-api" # 13 ProcessMatch "octavia-worker" "octavia-worker --config-file" # 13 + ProcessMatch "octavia_wsgi" "octavia_wsgi.*-DFOREGROUND" # 16 # OVS (OpenStack Installed) ProcessMatch "ovs-vswitchd" "ovs-vswitchd.+openvswitch" # 10,11,12,13 diff --git a/ansible/install/roles/collectd-openstack/templates/undercloud.collectd.conf.j2 b/ansible/install/roles/collectd-openstack/templates/undercloud.collectd.conf.j2 index afb18681e..dd9abd30a 100644 --- a/ansible/install/roles/collectd-openstack/templates/undercloud.collectd.conf.j2 +++ b/ansible/install/roles/collectd-openstack/templates/undercloud.collectd.conf.j2 @@ -294,6 +294,7 @@ PreCacheChain "PreCache" ProcessMatch "dnsmasq-ironic" "dnsmasq.+/etc/dnsmasq-ironic.conf" # 10,11,12,13 ProcessMatch "dnsmasq-ironicinspector" "/sbin/dnsmasq.+/etc/ironic-inspector/" # 10,11,12,13 ProcessMatch "ironic_wsgi" "ironic_wsgi.*-DFOREGROUND" # 12,13 + ProcessMatch "ironic-neutron-agent" "python.+ironic-neutron-agent" # 16 # Keystone (OpenStack Installed) ProcessMatch "keystone-admin" "keystone-admin.*-DFOREGROUND" # 10,11,12,13 diff --git a/ansible/install/roles/collectd/templates/controller.collectd.conf.j2 b/ansible/install/roles/collectd/templates/controller.collectd.conf.j2 index 5e6817e1b..ab4ce3443 100644 --- a/ansible/install/roles/collectd/templates/controller.collectd.conf.j2 +++ b/ansible/install/roles/collectd/templates/controller.collectd.conf.j2 @@ -388,11 +388,14 @@ PreCacheChain "PreCache" ProcessMatch "nova-novncproxy" "python.+nova-novncproxy" # 10,11,12,13 ProcessMatch "nova-scheduler" "python.+nova-scheduler" # 10,11,12,13 ProcessMatch "placement_wsgi" "placement_wsgi.*-DFOREGROUND" # 11,12,13 + ProcessMatch "nova_metadata_w" "nova_metadata_w.*-DFOREGROUND" # 16 + # Octavia (OpenStack Installed) ProcessMatch "octavia-housekeeping" "python.+octavia-housekeeping" # 13 ProcessMatch "octavia-health-manager" "python.+octavia-health-manager" # 13 ProcessMatch "octavia-api" "python.+octavia-api" # 13 ProcessMatch "octavia-worker" "octavia-worker --config-file" # 13 + ProcessMatch "octavia_wsgi" "octavia_wsgi.*-DFOREGROUND" # 16 # OVS (OpenStack Installed) ProcessMatch "ovs-vswitchd" "ovs-vswitchd.+openvswitch" # 10,11,12,13 diff --git a/ansible/install/roles/collectd/templates/undercloud.collectd.conf.j2 b/ansible/install/roles/collectd/templates/undercloud.collectd.conf.j2 index 4ef8510ba..5c0d65b58 100644 --- a/ansible/install/roles/collectd/templates/undercloud.collectd.conf.j2 +++ b/ansible/install/roles/collectd/templates/undercloud.collectd.conf.j2 @@ -284,6 +284,7 @@ PreCacheChain "PreCache" ProcessMatch "dnsmasq-ironic" "dnsmasq.+/etc/dnsmasq-ironic.conf" # 10,11,12,13 ProcessMatch "dnsmasq-ironicinspector" "/sbin/dnsmasq.+/etc/ironic-inspector/" # 10,11,12,13 ProcessMatch "ironic_wsgi" "ironic_wsgi.*-DFOREGROUND" # 12,13 + ProcessMatch "ironic-neutron-agent" "python.+ironic-neutron-agent" # 16 # Keystone (OpenStack Installed) ProcessMatch "keystone-admin" "keystone-admin.*-DFOREGROUND" # 10,11,12,13 diff --git a/ansible/install/roles/grafana-dashboards/vars/main.yml b/ansible/install/roles/grafana-dashboards/vars/main.yml index 144b82241..252533b4f 100644 --- a/ansible/install/roles/grafana-dashboards/vars/main.yml +++ b/ansible/install/roles/grafana-dashboards/vars/main.yml @@ -136,6 +136,7 @@ per_process_panels: - dnsmasq-ironic - dnsmasq-ironicinspector - ironic_wsgi + - ironic-neutron-agent - name: "Keystone" processes: - keystone-admin @@ -310,12 +311,14 @@ per_process_panels: - nova-novncproxy - nova-scheduler - placement_wsgi + - nova_metadata_w - name: "Octavia" processes: - octavia-worker - octavia-housekeeping - octavia-health-manager - octavia-api + - octavia_wsgi - name: "Open vSwitch" processes: - ovs-vswitchd @@ -547,6 +550,7 @@ per_process_panels: - dnsmasq-ironic - dnsmasq-ironicinspector - ironic_wsgi + - ironic-neutron-agent - name: "Keystone" processes: - keystone-admin @@ -582,13 +586,14 @@ per_process_panels: - novajoin-server - placement_wsgi - privsep-helper + - nova_metadata_w - name: "Octavia" processes: - octavia-worker - octavia-housekeeping - octavia-health-manager - octavia-api - + - octavia_wsgi - name: "Open vSwitch" processes: - ovs-vswitchd diff --git a/ansible/install/roles/grafana-prometheus-dashboards/vars/main.yaml b/ansible/install/roles/grafana-prometheus-dashboards/vars/main.yaml index cb9305f24..18010128e 100644 --- a/ansible/install/roles/grafana-prometheus-dashboards/vars/main.yaml +++ b/ansible/install/roles/grafana-prometheus-dashboards/vars/main.yaml @@ -172,6 +172,7 @@ per_process_panels: - dnsmasq-ironic - dnsmasq-ironicinspector - ironic_wsgi + - ironic-neutron-agent - name: "Keystone" processes: - keystone-admin @@ -206,12 +207,14 @@ per_process_panels: - novajoin-server - placement_wsgi - privsep-helper + - nova_metadata_w - name: "Octavia" processes: - octavia-worker - octavia-housekeeping - octavia-health-manager - octavia-api + - octavia_wsgi - name: "Open vSwitch" processes: