From 275d0941fb5f230c657ddd35d8b05636c3e580c4 Mon Sep 17 00:00:00 2001 From: Eoghan Glynn Date: Fri, 24 Jan 2014 14:11:26 +0000 Subject: [PATCH] Fix formating of compute-nova measurements table Fixes bug 1276554 Avoid nova meters being ommitted from the generated docs. Change-Id: I4f5871fd74bdb20c0867b5ba9300eb2fa28df632 --- doc/source/measurements.rst | 56 ++++++++++++++++++------------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/doc/source/measurements.rst b/doc/source/measurements.rst index 8ad656344..175a9bfaa 100644 --- a/doc/source/measurements.rst +++ b/doc/source/measurements.rst @@ -65,34 +65,34 @@ Compute (Nova) All meters are related to the guest machine, not the host. -============================= ========== ======== ======== ============ ================================================================== -Name Type Unit Resource Origin Note -============================= ========== ======== ======== ============ ================================================================== -instance Gauge instance inst ID both Existence of instance -instance: Gauge instance inst ID both Existence of instance (openstack types) -memory Gauge MB inst ID notification Volume of RAM in MB -cpu Cumulative ns inst ID pollster CPU time used -cpu_util Gauge % inst ID pollster Average CPU utilisation -vcpus Gauge vcpu inst ID notification Number of VCPUs -disk.read.requests Cumulative request inst ID pollster Number of read requests -disk.read.requests.rate Gauge request/s inst ID pollster Average rate of read requests per second -disk.write.requests Cumulative request inst ID pollster Number of write requests -disk.write.requests.rate Cumulative request/s inst ID pollster Average rate of write requests per second -disk.read.bytes Cumulative B inst ID pollster Volume of reads in B -disk.read.bytes.rate Cumulative B/s inst ID pollster Average rate of reads in B per second -disk.write.bytes Cumulative B inst ID pollster Volume of writes in B -disk.write.bytes.rate Cumulative B/s inst ID pollster Average volume of writes in B per second -disk.root.size Gauge GB inst ID notification Size of root disk in GB -disk.ephemeral.size Gauge GB inst ID notification Size of ephemeral disk in GB -network.incoming.bytes Cumulative B iface ID pollster Number of incoming bytes on a VM network interface -network.incoming.bytes.rate Gauge B/s iface ID pollster Average rate per sec of incoming bytes on a VM network interface -network.outgoing.bytes Cumulative B iface ID pollster Number of outgoing bytes on a VM network interface -network.outgoing.bytes.rate Gauge B/s iface ID pollster Average rate per sec of outgoing bytes on a VM network interface -network.incoming.packets Cumulative packet iface ID pollster Number of incoming packets on a VM network interface -network.incoming.packets.rate Gauge packet/s iface ID pollster Average rate per sec of incoming packets on a VM network interface -network.outgoing.packets Cumulative packet iface ID pollster Number of outgoing packets on a VM network interface -network.outgoing.packets.rate Gauge packet/s iface ID pollster Average rate per sec of outgoing packets on a VM network interface -============================= ========== ======== ======== ============ ================================================================== +============================= ========== ========= ======== ============ ================================================================== +Name Type Unit Resource Origin Note +============================= ========== ========= ======== ============ ================================================================== +instance Gauge instance inst ID both Existence of instance +instance: Gauge instance inst ID both Existence of instance (openstack types) +memory Gauge MB inst ID notification Volume of RAM in MB +cpu Cumulative ns inst ID pollster CPU time used +cpu_util Gauge % inst ID pollster Average CPU utilisation +vcpus Gauge vcpu inst ID notification Number of VCPUs +disk.read.requests Cumulative request inst ID pollster Number of read requests +disk.read.requests.rate Gauge request/s inst ID pollster Average rate of read requests per second +disk.write.requests Cumulative request inst ID pollster Number of write requests +disk.write.requests.rate Cumulative request/s inst ID pollster Average rate of write requests per second +disk.read.bytes Cumulative B inst ID pollster Volume of reads in B +disk.read.bytes.rate Cumulative B/s inst ID pollster Average rate of reads in B per second +disk.write.bytes Cumulative B inst ID pollster Volume of writes in B +disk.write.bytes.rate Cumulative B/s inst ID pollster Average volume of writes in B per second +disk.root.size Gauge GB inst ID notification Size of root disk in GB +disk.ephemeral.size Gauge GB inst ID notification Size of ephemeral disk in GB +network.incoming.bytes Cumulative B iface ID pollster Number of incoming bytes on a VM network interface +network.incoming.bytes.rate Gauge B/s iface ID pollster Average rate per sec of incoming bytes on a VM network interface +network.outgoing.bytes Cumulative B iface ID pollster Number of outgoing bytes on a VM network interface +network.outgoing.bytes.rate Gauge B/s iface ID pollster Average rate per sec of outgoing bytes on a VM network interface +network.incoming.packets Cumulative packet iface ID pollster Number of incoming packets on a VM network interface +network.incoming.packets.rate Gauge packet/s iface ID pollster Average rate per sec of incoming packets on a VM network interface +network.outgoing.packets Cumulative packet iface ID pollster Number of outgoing packets on a VM network interface +network.outgoing.packets.rate Gauge packet/s iface ID pollster Average rate per sec of outgoing packets on a VM network interface +============================= ========== ========= ======== ============ ================================================================== At present, most of the Nova meters will only work with libvirt front-end hypervisors while test coverage was mostly done based on KVM. Contributors