From 5d8685175d89c75263ee9640f5302a0a4f6f67c8 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Fri, 15 Jan 2021 20:30:57 +0900
Subject: [PATCH] Update cpu meters of hardware resource

The hardware.cpu.util is deprecated and ceilometer now supports meters
to get cpu utils per usage like usr, sys and so on.
This change updates the default meters to follow the change[1] in
ceilometer.

[1] 8fd68396af595a2ba009591c9e53a1b55557b311

Change-Id: Iea1240e97e62da03ddc485602ed9099a39bff875
---
 manifests/params.pp                                 |  7 +++++++
 .../notes/hardware-cpu-meters-664cb6753d5efc81.yaml | 13 +++++++++++++
 spec/classes/ceilometer_agent_polling_spec.rb       |  7 +++++++
 3 files changed, 27 insertions(+)
 create mode 100644 releasenotes/notes/hardware-cpu-meters-664cb6753d5efc81.yaml

diff --git a/manifests/params.pp b/manifests/params.pp
index 0386c6df..9724f2da 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -31,6 +31,13 @@ class ceilometer::params {
     'volume.snapshot.size',
     'volume.backup.size',
     'hardware.cpu.util',
+    'hardware.cpu.user',
+    'hardware.cpu.nice',
+    'hardware.cpu.system',
+    'hardware.cpu.idle',
+    'hardware.cpu.wait',
+    'hardware.cpu.kernel',
+    'hardware.cpu.interrupt',
     'hardware.memory.used',
     'hardware.memory.total',
     'hardware.memory.buffer',
diff --git a/releasenotes/notes/hardware-cpu-meters-664cb6753d5efc81.yaml b/releasenotes/notes/hardware-cpu-meters-664cb6753d5efc81.yaml
new file mode 100644
index 00000000..aaf2abfe
--- /dev/null
+++ b/releasenotes/notes/hardware-cpu-meters-664cb6753d5efc81.yaml
@@ -0,0 +1,13 @@
+---
+features:
+  - |
+    The following meters are enabled by default when
+    ``ceilometer::agent::polling::manage_polling`` is ``true``.
+
+    - hardware.cpu.user
+    - hardware.cpu.nice
+    - hardware.cpu.system
+    - hardware.cpu.idle
+    - hardware.cpu.wait
+    - hardware.cpu.kernel
+    - hardware.cpu.interrupt
diff --git a/spec/classes/ceilometer_agent_polling_spec.rb b/spec/classes/ceilometer_agent_polling_spec.rb
index e5867ff3..140a39bb 100644
--- a/spec/classes/ceilometer_agent_polling_spec.rb
+++ b/spec/classes/ceilometer_agent_polling_spec.rb
@@ -123,6 +123,13 @@ sources:
         - volume.snapshot.size
         - volume.backup.size
         - hardware.cpu.util
+        - hardware.cpu.user
+        - hardware.cpu.nice
+        - hardware.cpu.system
+        - hardware.cpu.idle
+        - hardware.cpu.wait
+        - hardware.cpu.kernel
+        - hardware.cpu.interrupt
         - hardware.memory.used
         - hardware.memory.total
         - hardware.memory.buffer