From dbe0f154770384ec335624a13986340e78210e69 Mon Sep 17 00:00:00 2001 From: akrzos Date: Thu, 10 Nov 2016 14:59:36 -0500 Subject: [PATCH] Updates to Ceph node collectd config * Add ovs processes for monitoring on ceph nodes * Allow nvme storage to be collected on Change-Id: I127fbfa3e3c62a6c78f961d4a8c15ce7ec41031b --- .../templates/ceph.collectd.conf.j2 | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/ansible/install/roles/collectd-openstack/templates/ceph.collectd.conf.j2 b/ansible/install/roles/collectd-openstack/templates/ceph.collectd.conf.j2 index 830ed589e..0e349e2b9 100644 --- a/ansible/install/roles/collectd-openstack/templates/ceph.collectd.conf.j2 +++ b/ansible/install/roles/collectd-openstack/templates/ceph.collectd.conf.j2 @@ -80,7 +80,7 @@ PreCacheChain "PreCache" - Disk "/^[hsv]d[a-z]+[0-9]?$/" + Disk "/^[hsv]d[a-z]+[0-9]?|nvme.+$/" IgnoreSelected false @@ -89,13 +89,15 @@ PreCacheChain "PreCache" # A Minus before the version means the process was not found in that version. (Ex -9) # Ceph (OpenStack Installed) - ProcessMatch "ceph-mon" "^/usr/bin/ceph-mon" # Unchecked - ProcessMatch "ceph-osd" "^/usr/bin/ceph-osd" # Unchecked - ProcessMatch "diamond" "python.+diamond" # Unchecked - ProcessMatch "salt-minion" "python.+salt-minion" # Unchecked + ProcessMatch "ceph-mon" "^/usr/bin/ceph-mon" # -10 + ProcessMatch "ceph-osd" "^/usr/bin/ceph-osd" # 10 # Collectd (Browbeat Installed) ProcessMatch "collectd" "/usr/sbin/collectd" + + # OVS (OpenStack Installed) + ProcessMatch "ovs-vswitchd" "ovs-vswitchd.+openvswitch" # 10 + ProcessMatch "ovsdb-server" "ovsdb-server.+openvswitch" # 10