Merge "Remove GenericHardwareDeclarativePollster"

3 files changed, 4 insertions, 117 deletions

diff --git a/doc/source/admin/telemetry-data-collection.rst b/doc/source/admin/telemetry-data-collection.rst
index 618c8f1f..559d0396 100644
--- a/doc/source/admin/telemetry-data-collection.rst
+++ b/doc/source/admin/telemetry-data-collection.rst
@@ -19,9 +19,8 @@ Notifications
     messages from the configured message queue system.
 
 Polling
-    Retrieve information directly from the hypervisor or from the host
-    machine using SNMP, or by using the APIs of other OpenStack
-    services.
+    Retrieve information directly from the hypervisor or by using the APIs of
+    other OpenStack services.
 
 Notifications
 =============
@@ -281,15 +280,13 @@ Central agent
 ~~~~~~~~~~~~~
 
 This agent is responsible for polling public REST APIs to retrieve additional
-information on OpenStack resources not already surfaced via notifications,
-and also for polling hardware resources over SNMP.
+information on OpenStack resources not already surfaced via notifications.
 
 Some of the services polled with this agent are:
 
 -  OpenStack Networking
 -  OpenStack Object Storage
 -  OpenStack Block Storage
--  Hardware resources via SNMP
 
 To install and configure this service use the :ref:`install_rdo`
 section in the Installation Tutorials and Guides.
diff --git a/doc/source/admin/telemetry-measurements.rst b/doc/source/admin/telemetry-measurements.rst
index 346fcc7e..faa7c98a 100644
--- a/doc/source/admin/telemetry-measurements.rst
+++ b/doc/source/admin/telemetry-measurements.rst
@@ -398,116 +398,6 @@ meters are recorded from capable platform:
 |                     |       |      |          |          | the system       |
 +---------------------+-------+------+----------+----------+------------------+
 
-SNMP based meters
-~~~~~~~~~~~~~~~~~
-
-Telemetry supports gathering SNMP based generic host meters. In order to
-be able to collect this data you need to run snmpd on each target host.
-
-The following meters are available about the host machines by using
-SNMP:
-
-+---------------------+-------+------+----------+----------+------------------+
-| Name                | Type  | Unit | Resource | Origin   | Note             |
-+=====================+=======+======+==========+==========+==================+
-| **Meters added in the Mitaka release or earlier**                           |
-+---------------------+-------+------+----------+----------+------------------+
-| hardware.cpu.load.\ | Gauge | proc\| host ID  | Pollster | CPU load in the  |
-| 1min                |       | ess  |          |          | past 1 minute    |
-+---------------------+-------+------+----------+----------+------------------+
-| hardware.cpu.load.\ | Gauge | proc\| host ID  | Pollster | CPU load in the  |
-| 5min                |       | ess  |          |          | past 5 minutes   |
-+---------------------+-------+------+----------+----------+------------------+
-| hardware.cpu.load.\ | Gauge | proc\| host ID  | Pollster | CPU load in the  |
-| 15min               |       | ess  |          |          | past 15 minutes  |
-+---------------------+-------+------+----------+----------+------------------+
-| hardware.disk.size\ | Gauge | KB   | disk ID  | Pollster | Total disk size  |
-| .total              |       |      |          |          |                  |
-+---------------------+-------+------+----------+----------+------------------+
-| hardware.disk.size\ | Gauge | KB   | disk ID  | Pollster | Used disk size   |
-| .used               |       |      |          |          |                  |
-+---------------------+-------+------+----------+----------+------------------+
-| hardware.memory.to\ | Gauge | KB   | host ID  | Pollster | Total physical   |
-| tal                 |       |      |          |          | memory size      |
-+---------------------+-------+------+----------+----------+------------------+
-| hardware.memory.us\ | Gauge | KB   | host ID  | Pollster | Used physical m\ |
-| ed                  |       |      |          |          | emory size       |
-+---------------------+-------+------+----------+----------+------------------+
-| hardware.memory.bu\ | Gauge | KB   | host ID  | Pollster | Physical memory  |
-| ffer                |       |      |          |          | buffer size      |
-+---------------------+-------+------+----------+----------+------------------+
-| hardware.memory.ca\ | Gauge | KB   | host ID  | Pollster | Cached physical  |
-| ched                |       |      |          |          | memory size      |
-+---------------------+-------+------+----------+----------+------------------+
-| hardware.memory.sw\ | Gauge | KB   | host ID  | Pollster | Total swap space |
-| ap.total            |       |      |          |          | size             |
-+---------------------+-------+------+----------+----------+------------------+
-| hardware.memory.sw\ | Gauge | KB   | host ID  | Pollster | Available swap   |
-| ap.avail            |       |      |          |          | space size       |
-+---------------------+-------+------+----------+----------+------------------+
-| hardware.network.i\ | Cumul\| B    | interface| Pollster | Bytes received   |
-| ncoming.bytes       | ative |      | ID       |          | by network inte\ |
-|                     |       |      |          |          | rface            |
-+---------------------+-------+------+----------+----------+------------------+
-| hardware.network.o\ | Cumul\| B    | interface| Pollster | Bytes sent by n\ |
-| utgoing.bytes       | ative |      | ID       |          | etwork interface |
-+---------------------+-------+------+----------+----------+------------------+
-| hardware.network.o\ | Cumul\| pack\| interface| Pollster | Sending error o\ |
-| utgoing.errors      | ative | et   | ID       |          | f network inter\ |
-|                     |       |      |          |          | face             |
-+---------------------+-------+------+----------+----------+------------------+
-| hardware.network.i\ | Cumul\| data\| host ID  | Pollster | Number of recei\ |
-| p.incoming.datagra\ | ative | grams|          |          | ved datagrams    |
-| ms                  |       |      |          |          |                  |
-+---------------------+-------+------+----------+----------+------------------+
-| hardware.network.i\ | Cumul\| data\| host ID  | Pollster | Number of sent   |
-| p.outgoing.datagra\ | ative | grams|          |          | datagrams        |
-| ms                  |       |      |          |          |                  |
-+---------------------+-------+------+----------+----------+------------------+
-| hardware.system_st\ | Cumul\| bloc\| host ID  | Pollster | Aggregated numb\ |
-| ats.io.incoming.bl\ | ative | ks   |          |          | er of blocks re\ |
-| ocks                |       |      |          |          | ceived to block  |
-|                     |       |      |          |          | device           |
-+---------------------+-------+------+----------+----------+------------------+
-| hardware.system_st\ | Cumul\| bloc\| host ID  | Pollster | Aggregated numb\ |
-| ats.io.outgoing.bl\ | ative | ks   |          |          | er of blocks se\ |
-| ocks                |       |      |          |          | nt to block dev\ |
-|                     |       |      |          |          | ice              |
-+---------------------+-------+------+----------+----------+------------------+
-| **Meters added in the Queens release**                                      |
-+---------------------+-------+------+----------+----------+------------------+
-| hardware.disk.read.\| Gauge | B    | disk ID  | Pollster | Bytes read from  |
-| bytes               |       |      |          |          | device since boot|
-+---------------------+-------+------+----------+----------+------------------+
-| hardware.disk.write\| Gauge | B    | disk ID  | Pollster | Bytes written to |
-| .bytes              |       |      |          |          | device since boot|
-+---------------------+-------+------+----------+----------+------------------+
-| hardware.disk.read.\| Gauge | requ\| disk ID  | Pollster | Read requests to |
-| requests            |       | ests |          |          | device since boot|
-+---------------------+-------+------+----------+----------+------------------+
-| hardware.disk.write\| Gauge | requ\| disk ID  | Pollster | Write requests to|
-| .requests           |       | ests |          |          | device since boot|
-+---------------------+-------+------+----------+----------+------------------+
-| **Meters added in the Stein release**                                       |
-+---------------------+-------+------+----------+----------+------------------+
-| hardware.cpu.user   | Gauge | tick | host ID  | Pollster | CPU user in tick |
-+---------------------+-------+------+----------+----------+------------------+
-| hardware.cpu.system | Gauge | tick | host ID  | Pollster | CPU system in t\ |
-|                     |       |      |          |          | ick              |
-+---------------------+-------+------+----------+----------+------------------+
-| hardware.cpu.nice   | Gauge | tick | host ID  | Pollster | CPU nice in tick |
-+---------------------+-------+------+----------+----------+------------------+
-| hardware.cpu.idle   | Gauge | tick | host ID  | Pollster | CPU idle in tick |
-+---------------------+-------+------+----------+----------+------------------+
-| hardware.cpu.wait   | Gauge | tick | host ID  | Pollster | CPU wait in tick |
-+---------------------+-------+------+----------+----------+------------------+
-| hardware.cpu.kernel | Gauge | tick | host ID  | Pollster | CPU kernel in t\ |
-|                     |       |      |          |          | ick              |
-+---------------------+-------+------+----------+----------+------------------+
-| hardware.cpu.inter\ | Gauge | tick | host ID  | Pollster | CPU interrupt i\ |
-| rupt                |       |      |          |          | n tick           |
-+---------------------+-------+------+----------+----------+------------------+
-
 OpenStack Image service
 ~~~~~~~~~~~~~~~~~~~~~~~
 
diff --git a/doc/source/contributor/architecture.rst b/doc/source/contributor/architecture.rst
index 896e517d..736b03fa 100644
--- a/doc/source/contributor/architecture.rst
+++ b/doc/source/contributor/architecture.rst
@@ -69,7 +69,7 @@ The Ceilometer project created 2 methods to collect data:
 The first method is supported by the ceilometer-notification agent, which
 monitors the message queues for notifications. Polling agents can be configured
 either to poll the local hypervisor or remote APIs (public REST APIs exposed by
-services and host-level SNMP/IPMI daemons).
+services and host-level IPMI daemons).
 
 Notification Agent: Listening for data
 ---------------------------------------