From: Takashi Kajinami <tkajinam@redhat.com>
Date: Fri, 15 Jan 2021 11:30:57 +0000 (+0900)
Subject: Update cpu meters of hardware resource
X-Git-Tag: 18.3.0~4^2
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=5d8685175d89c75263ee9640f5302a0a4f6f67c8;p=puppet-modules%2Fpuppet-ceilometer.git

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
---

diff --git a/manifests/params.pp b/manifests/params.pp
index 0386c6d..9724f2d 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 0000000..aaf2abf
--- /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 e5867ff..140a39b 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