glossary: remove collector and add publisher

Change-Id: Ied0906e4ef2c56ae884411907fa374e2e080ad76

doc/source/glossary.rst

@@ -22,7 +22,8 @@
 
    agent
      Software service running on the OpenStack infrastructure
-     measuring usage and sending the results to the :term:`collector`.
+     measuring usage and sending the results to any number of
+     target using the :term:`publisher`.
 
    API server
      HTTP REST API service for ceilometer.
@@ -45,13 +46,7 @@
    polling agent
      Software service running either on a central management node within the
      OpenStack infrastructure or compute node measuring usage and sending the
-     results to the :term:`collector`.
-
-   collector
-     Software service running on the OpenStack infrastructure
-     monitoring notifications from other OpenStack components and
-     samples from the ceilometer agent and recording the results
-     in the database.
+     results to a queue.
 
    notification agent
      The different OpenStack services emit several notifications about the
@@ -101,6 +96,9 @@
      The polling agent is collecting measurements by polling some API or other
      tool at a regular interval.
 
+   publisher
+     The publisher is publishing samples to a specific target.
+
    push agents
      The push agent is the only solution to fetch data within projects,
      which do not expose the required data in a remotely usable way. This

doc/source/install/development.rst

@@ -20,8 +20,8 @@
 
 Ceilometer has several daemons. The basic are: :term:`polling agent` running
 either on the Nova compute node(s) or :term:`polling agent` running on the
-central management node(s), :term:`collector` and :term:`notification agent`
-running on the cloud's management node(s).
+central management node(s), :term:`notification agent` running on the cloud's
+management node(s).
 
 In a development environment created by devstack_, these services are
 typically running on the same server.