Remove snmp metrics from polling.yaml

These metrics are no longer supported by ceilometer since
GenericHardwareDeclarativePollster was removed.

Closes-Bug: #2007108
Depends-on: https://review.opendev.org/c/openstack/ceilometer/+/840808
Change-Id: I0b5d6b360e8912a78f041806323d6b5bc8d87258
(cherry picked from commit 704a6ea58c145718ff299434956909dce724a1bf)

diff --git a/manifests/params.pp b/manifests/params.pp
index 600c24cbb1d679dcb89845c22cb2fa0c59aca3db..d1737571756890ff6acb2e393446d64915ffd251 100644 (file)
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -30,24 +30,6 @@ class ceilometer::params {
     'volume.size',
     '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',
-    'hardware.memory.cached',
-    'hardware.memory.swap.avail',
-    'hardware.memory.swap.total',
-    'hardware.system_stats.io.outgoing.blocks',
-    'hardware.system_stats.io.incoming.blocks',
-    'hardware.network.ip.incoming.datagrams',
-    'hardware.network.ip.outgoing.datagrams',
   ]
 
   case $::osfamily {

diff --git a/spec/classes/ceilometer_agent_polling_spec.rb b/spec/classes/ceilometer_agent_polling_spec.rb
index e1c5fc13ccbadf0744aaf9eef70a88441daf2061..72340427d3630eea0025aca7f71ddf6bb299f6a0 100644 (file)
--- a/spec/classes/ceilometer_agent_polling_spec.rb
+++ b/spec/classes/ceilometer_agent_polling_spec.rb
@@ -204,24 +204,6 @@ sources:
         - volume.size
         - 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
-        - hardware.memory.cached
-        - hardware.memory.swap.avail
-        - hardware.memory.swap.total
-        - hardware.system_stats.io.outgoing.blocks
-        - hardware.system_stats.io.incoming.blocks
-        - hardware.network.ip.incoming.datagrams
-        - hardware.network.ip.outgoing.datagrams
 ',
         :selinux_ignore_defaults => true,
         :tag                     => 'ceilometer-yamls',