From 90291923a139cb96e79b9d16120be59ea0df5253 Mon Sep 17 00:00:00 2001
From: licanwei
Date: Wed, 19 Jun 2019 11:50:15 +0800
Subject: [PATCH] Update strategy doc
Ceilometer removed cpu_util metric in [1].
Another metric compute.node.cpu.percent need to set
compute_monitors option to cpu.virt_driver in the
nova.conf, we should remind user about these.
[1]: https://review.opendev.org/#/c/580709/
Change-Id: I89306ef7c26fa2927945bd4f3ee88b670511d147
---
.../strategies/basic-server-consolidation.rst | 14 +++++++++-----
.../strategies/vm_workload_consolidation.rst | 9 +++++----
doc/source/strategies/workload-stabilization.rst | 16 ++++++++++------
doc/source/strategies/workload_balance.rst | 9 +++++----
4 files changed, 29 insertions(+), 19 deletions(-)
diff --git a/doc/source/strategies/basic-server-consolidation.rst b/doc/source/strategies/basic-server-consolidation.rst
index 4fc6fa1ee..5ea87e48f 100644
--- a/doc/source/strategies/basic-server-consolidation.rst
+++ b/doc/source/strategies/basic-server-consolidation.rst
@@ -19,12 +19,16 @@ Metrics
The *basic* strategy requires the following metrics:
-============================ ============ ======= =======
+============================ ============ ======= ===========================
metric service name plugins comment
-============================ ============ ======= =======
-``compute.node.cpu.percent`` ceilometer_ none
-``cpu_util`` ceilometer_ none
-============================ ============ ======= =======
+============================ ============ ======= ===========================
+``compute.node.cpu.percent`` ceilometer_ none need to set the
+ ``compute_monitors`` option
+ to ``cpu.virt_driver`` in
+ the nova.conf.
+``cpu_util`` ceilometer_ none cpu_util has been removed
+ since Stein.
+============================ ============ ======= ===========================
.. _ceilometer: https://docs.openstack.org/ceilometer/latest/admin/telemetry-measurements.html#openstack-compute
diff --git a/doc/source/strategies/vm_workload_consolidation.rst b/doc/source/strategies/vm_workload_consolidation.rst
index 790c25cd4..7f2bb9a2b 100644
--- a/doc/source/strategies/vm_workload_consolidation.rst
+++ b/doc/source/strategies/vm_workload_consolidation.rst
@@ -19,14 +19,15 @@ Metrics
The *vm_workload_consolidation* strategy requires the following metrics:
-============================ ============ ======= =======
+============================ ============ ======= =========================
metric service name plugins comment
-============================ ============ ======= =======
-``cpu_util`` ceilometer_ none
+============================ ============ ======= =========================
+``cpu_util`` ceilometer_ none cpu_util has been removed
+ since Stein.
``memory.resident`` ceilometer_ none
``memory`` ceilometer_ none
``disk.root.size`` ceilometer_ none
-============================ ============ ======= =======
+============================ ============ ======= =========================
.. _ceilometer: https://docs.openstack.org/ceilometer/latest/admin/telemetry-measurements.html#openstack-compute
diff --git a/doc/source/strategies/workload-stabilization.rst b/doc/source/strategies/workload-stabilization.rst
index 14a3c1625..9134d08ea 100644
--- a/doc/source/strategies/workload-stabilization.rst
+++ b/doc/source/strategies/workload-stabilization.rst
@@ -19,17 +19,21 @@ Metrics
The *workload_stabilization* strategy requires the following metrics:
-============================ ============ ======= =======
+============================ ============ ======= =============================
metric service name plugins comment
-============================ ============ ======= =======
-``compute.node.cpu.percent`` ceilometer_ none
+============================ ============ ======= =============================
+``compute.node.cpu.percent`` ceilometer_ none need to set the
+ ``compute_monitors`` option
+ to ``cpu.virt_driver`` in the
+ nova.conf.
``hardware.memory.used`` ceilometer_ SNMP_
-``cpu_util`` ceilometer_ none
+``cpu_util`` ceilometer_ none cpu_util has been removed
+ since Stein.
``memory.resident`` ceilometer_ none
-============================ ============ ======= =======
+============================ ============ ======= =============================
.. _ceilometer: https://docs.openstack.org/ceilometer/latest/admin/telemetry-measurements.html#openstack-compute
-.. _SNMP: http://docs.openstack.org/admin-guide/telemetry-measurements.html
+.. _SNMP: https://docs.openstack.org/ceilometer/latest/admin/telemetry-measurements.html#snmp-based-meters
Cluster data model
******************
diff --git a/doc/source/strategies/workload_balance.rst b/doc/source/strategies/workload_balance.rst
index 8ff5f0b2a..fac3c82ef 100644
--- a/doc/source/strategies/workload_balance.rst
+++ b/doc/source/strategies/workload_balance.rst
@@ -21,12 +21,13 @@ Metrics
The *workload_balance* strategy requires the following metrics:
-======================= ============ ======= =======
+======================= ============ ======= =========================
metric service name plugins comment
-======================= ============ ======= =======
-``cpu_util`` ceilometer_ none
+======================= ============ ======= =========================
+``cpu_util`` ceilometer_ none cpu_util has been removed
+ since Stein.
``memory.resident`` ceilometer_ none
-======================= ============ ======= =======
+======================= ============ ======= =========================
.. _ceilometer: https://docs.openstack.org/ceilometer/latest/admin/telemetry-measurements.html#openstack-compute