Use ProcessMatch to filter processnames

ProcessMatch provides more flexibility in handling process names,
especially in scenarios across platforms and openstack releases.
To do: generalize process regex across linux distros and openstack
releases.

Change-Id: I7dae9a90407134f01d5c9fbb722db62844197e47
This commit is contained in:
Jerry Zhao 2014-08-12 14:46:03 -07:00
parent 1f1b538ed6
commit be92856f20
18 changed files with 21 additions and 18 deletions

View File

@ -12,7 +12,7 @@ override_attributes(
"collectd" => {
"rhel" => {
"plugins" => {
"processes" => { "Process" => ["openstack-cinder-api"] }
"processes" => { "ProcessMatch" => ["cinder-api\" \"cinder-api"] }
}
}
}

View File

@ -12,7 +12,7 @@ override_attributes(
"collectd" => {
"rhel" => {
"plugins" => {
"processes" => { "Process" => ["openstack-cinder-scheduler"] }
"processes" => { "ProcessMatch" => ["cinder-scheduler\" \"cinder-scheduler"] }
}
}
}

View File

@ -12,7 +12,7 @@ override_attributes(
"collectd" => {
"rhel" => {
"plugins" => {
"processes" => { "Process" => ["openstack-cinder-volume", "iscsid", "multipathd"] }
"processes" => { "ProcessMatch" => ["cinder-volume\" \"cinder-volume", "iscsid\" \"iscsid", "multipathd\" \"multipathd"] }
}
}
}

View File

@ -4,7 +4,7 @@ override_attributes(
"collectd" => {
"rhel" => {
"plugins" => {
"processes" => { "Process" => ["openstack-nova-metadata-api"] }
"processes" => { "ProcessMatch" => ["nova-metadata-api\" \"nova-metadata-api"] }
}
}
}

View File

@ -12,7 +12,7 @@ override_attributes(
"collectd" => {
"rhel" => {
"plugins" => {
"processes" => { "Process" => ["openstack-nova-api"] }
"processes" => { "ProcessMatch" => ["nova-api\" \"nova-api"] }
}
}
}

View File

@ -4,7 +4,7 @@ override_attributes(
"collectd" => {
"rhel" => {
"plugins" => {
"processes" => { "Process" => ["openstack-nova-cert"] }
"processes" => { "ProcessMatch" => ["nova-cert\" \"nova-cert"] }
}
}
}

View File

@ -14,7 +14,7 @@ override_attributes(
"collectd" => {
"rhel" => {
"plugins" => {
"processes" => { "Process" => ["openstack-nova-scheduler", "openstack-nova-conductor"] }
"processes" => { "ProcessMatch" => ["nova-scheduler\" \"nova-scheduler", "nova-conductor\" \"nova-conductor"] }
}
}
}

View File

@ -4,7 +4,7 @@ override_attributes(
"collectd" => {
"rhel" => {
"plugins" => {
"processes" => { "Process" => ["openstack-nova-xvpvncproxy", "openstack-nova-novncproxy"] }
"processes" => { "ProcessMatch" => ["nova-xvpvncproxy\" \"nova-xvpvncproxy", "nova-novncproxy\" \"nova-novncproxy"] }
}
}
}

View File

@ -12,7 +12,7 @@ override_attributes(
"collectd" => {
"rhel" => {
"plugins" => {
"processes" => { "Process" => ["openstack-nova-compute"] }
"processes" => { "ProcessMatch" => ["nova-compute\" \"nova-compute"] }
}
}
}

View File

@ -4,7 +4,7 @@ override_attributes(
"collectd" => {
"rhel" => {
"plugins" => {
"processes" => { "Process" => ["httpd"]}
"processes" => { "ProcessMatch" => ["httpd\" \"httpd"]}
}
}
}

View File

@ -4,7 +4,7 @@ override_attributes(
"collectd" => {
"rhel" => {
"plugins" => {
"processes" => { "Process" => ["haproxy", "keepalived"]}
"processes" => { "ProcessMatch" => ["haproxy\" \"haproxy", "keepalived\" \"keepalived"]}
}
}
}

View File

@ -12,7 +12,7 @@ override_attributes(
"collectd" => {
"rhel" => {
"plugins" => {
"processes" => { "Process" => ["openstack-keystone"] }
"processes" => { "ProcessMatch" => ["keystone\" \"keystone"] }
}
}
}

View File

@ -12,7 +12,7 @@ override_attributes(
"collectd" => {
"rhel" => {
"plugins" => {
"processes" => { "Process" => ["openstack-glance-api"] }
"processes" => { "ProcessMatch" => ["glance-api\" \"glance-api"] }
}
}
}

View File

@ -12,7 +12,7 @@ override_attributes(
"collectd" => {
"rhel" => {
"plugins" => {
"processes" => { "Process" => ["openstack-glance-registry"] }
"processes" => { "ProcessMatch" => ["glance-registry\" \"glance-registry"] }
}
}
}

View File

@ -12,7 +12,7 @@ override_attributes(
"collectd" => {
"rhel" => {
"plugins" => {
"processes" => { "Process" => ["quantum-server"] }
"processes" => { "ProcessMatch" => ["quantum-server\" \"quantum-server"] }
}
}
}

View File

@ -16,7 +16,10 @@ override_attributes(
"collectd" => {
"rhel" => {
"plugins" => {
"processes" => { "Process" => ["quantum-dhcp-agent", "quantum-l3-agent", "quantum-openvswitch-agent", "quantum-metadata-agent"] }
"processes" => { "ProcessMatch" => ["quantum-dhcp-agent\" \"quantum-dhcp-agent",
"quantum-l3-agent\" \"quantum-l3-agent",
"quantum-openvswitch-agent\" \"quantum-openvswitch-agent",
"quantum-metadata-agent\" \"quantum-metadata-agent"] }
}
}
}

View File

@ -12,7 +12,7 @@ override_attributes(
"collectd" => {
"rhel" => {
"plugins" => {
"processes" => { "Process" => ["mysqld"] }
"processes" => { "ProcessMatch" => ["mysqld\" \"mysqld"] }
}
}
}

View File

@ -12,7 +12,7 @@ override_attributes(
"collectd" => {
"rhel" => {
"plugins" => {
"processes" => { "Process" => ["rabbitmq-server"] }
"processes" => { "ProcessMatch" => ["rabbitmq-server\" \"rabbitmq-server"] }
}
},
"included_plugins" => {"rabbitmq"=>{}}