From 48b56f5cb039ccd011241ea128bf6fdd2a987769 Mon Sep 17 00:00:00 2001 From: zhang haixia Date: Tue, 5 Jul 2016 09:51:40 +0800 Subject: [PATCH] [admin-guide] fix hypervisors cpu_util meter supports hypervisors cpu_util meter only supported by vSphere and XenAPI until mitaka. Closes-Bug: #1597621 Change-Id: Ib64335a687dd6e6f870b2c948330676c9881737d --- doc/admin-guide/source/telemetry-measurements.rst | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/doc/admin-guide/source/telemetry-measurements.rst b/doc/admin-guide/source/telemetry-measurements.rst index 55348c0280..0b9c2378ae 100644 --- a/doc/admin-guide/source/telemetry-measurements.rst +++ b/doc/admin-guide/source/telemetry-measurements.rst @@ -122,9 +122,8 @@ The following meters are collected for OpenStack Compute: | cpu | Cumu\ | ns | instance | Pollster | Libvirt,| CPU time used | | | lative| | ID | | Hyper-V | | +-----------+-------+------+----------+----------+---------+------------------+ -| cpu_util | Gauge | % | instance | Pollster | Libvirt,| Average CPU | -| | | | ID | | Hyper-V,| utilization | -| | | | | | vSphere | | +| cpu_util | Gauge | % | instance | Pollster | vSphere | Average CPU | +| | | | ID | | | utilization | +-----------+-------+------+----------+----------+---------+------------------+ | vcpus | Gauge | vcpu | instance | Notific\ | Libvirt,| Number of virtual| | | | | ID | ation | Hyper-V | CPUs allocated to| @@ -216,10 +215,8 @@ The following meters are collected for OpenStack Compute: | | | | | | | amount of its | | | | | | | | allocated memory | +-----------+-------+------+----------+----------+---------+------------------+ -| cpu_util | Gauge | % | instance | Pollster | Libvirt,| Average CPU | -| | | | ID | | Hyper-V,| utilization | -| | | | | | vSphere,| | -| | | | | | XenAPI | | +| cpu_util | Gauge | % | instance | Pollster | vSphere,| Average CPU | +| | | | ID | | XenAPI | utilization | +-----------+-------+------+----------+----------+---------+------------------+ | disk.read\| Gauge | B/s | instance | Pollster | Libvirt,| Average rate of | | .bytes.\ | | | ID | | Hyper-V,| reads |