Merge "changes to telemetry-measurements file in admin guide cloud"

This commit is contained in:
Jenkins 2015-11-12 08:01:31 +00:00 committed by Gerrit Code Review
commit 3de94056cb

View File

@ -120,7 +120,7 @@ The following meters are collected for OpenStack Compute:
| | lative| | ID | | Hyper-V | | | | lative| | ID | | Hyper-V | |
+-----------+-------+------+----------+----------+---------+------------------+ +-----------+-------+------+----------+----------+---------+------------------+
| cpu_util | Gauge | % | instance | Pollster | Libvirt,| Average CPU | | cpu_util | Gauge | % | instance | Pollster | Libvirt,| Average CPU |
| | | | ID | | Hyper-V,| utilisation | | | | | ID | | Hyper-V,| utilization |
| | | | | | vSphere | | | | | | | | vSphere | |
+-----------+-------+------+----------+----------+---------+------------------+ +-----------+-------+------+----------+----------+---------+------------------+
| vcpus | Gauge | vcpu | instance | Notific\ | Libvirt,| Number of virtual| | vcpus | Gauge | vcpu | instance | Notific\ | Libvirt,| Number of virtual|
@ -214,7 +214,7 @@ The following meters are collected for OpenStack Compute:
| | | | | | | allocated memory | | | | | | | | allocated memory |
+-----------+-------+------+----------+----------+---------+------------------+ +-----------+-------+------+----------+----------+---------+------------------+
| cpu_util | Gauge | % | instance | Pollster | Libvirt,| Average CPU | | cpu_util | Gauge | % | instance | Pollster | Libvirt,| Average CPU |
| | | | ID | | Hyper-V,| utilisation | | | | | ID | | Hyper-V,| utilization |
| | | | | | vSphere,| | | | | | | | vSphere,| |
| | | | | | XenAPI | | | | | | | | XenAPI | |
+-----------+-------+------+----------+----------+---------+------------------+ +-----------+-------+------+----------+----------+---------+------------------+
@ -459,7 +459,7 @@ Compute:
| iowait.percent | | | | | percentage | | iowait.percent | | | | | percentage |
+---------------------+-------+------+----------+-------------+---------------+ +---------------------+-------+------+----------+-------------+---------------+
| compute.node.cpu.\ | Gauge | % | host ID | Notification| CPU | | compute.node.cpu.\ | Gauge | % | host ID | Notification| CPU |
| percent | | | | | utilisation | | percent | | | | | utilization |
+---------------------+-------+------+----------+-------------+---------------+ +---------------------+-------+------+----------+-------------+---------------+
.. _telemetry-bare-metal-service: .. _telemetry-bare-metal-service:
@ -1182,7 +1182,7 @@ The following meters are collected for VPNaaS:
| ecpolicy | | | | llster | | | ecpolicy | | | | llster | |
+---------------+-------+---------+------------+-----------+------------------+ +---------------+-------+---------+------------+-----------+------------------+
| network.serv\ | Delta | ipsecp\ | ipsecpolicy| Notifica\ | IPSec policy was | | network.serv\ | Delta | ipsecp\ | ipsecpolicy| Notifica\ | IPSec policy was |
| ices.vpn.ips\ | | olicy | ID | tion | reated | | ices.vpn.ips\ | | olicy | ID | tion | created |
| ecpolicy.cre\ | | | | | | | ecpolicy.cre\ | | | | | |
| ate | | | | | | | ate | | | | | |
+---------------+-------+---------+------------+-----------+------------------+ +---------------+-------+---------+------------+-----------+------------------+