summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2014-09-27 23:02:02 +0000
committerGerrit Code Review <review@openstack.org>2014-09-27 23:02:02 +0000
commitfb34fcbdaf2baff55f41744ac560bd6c725e6407 (patch)
treea3763f734595555faeb97ffd1ea33917fb68e6ac
parentf7e2698b173c0f8275177f77661fd949f27979cc (diff)
parent269c9046cbb54ff019308edf8d09e9394f8523aa (diff)
downloadceilometer-fb34fcbdaf2baff55f41744ac560bd6c725e6407.tar.gz
Merge "Fix bug in the documentation"
-rw-r--r--doc/source/glossary.rst5
-rw-r--r--doc/source/install/development.rst16
2 files changed, 14 insertions, 7 deletions
diff --git a/doc/source/glossary.rst b/doc/source/glossary.rst
index 20025bf1..f630d91f 100644
--- a/doc/source/glossary.rst
+++ b/doc/source/glossary.rst
@@ -61,6 +61,11 @@
infrastructure measuring usage and sending the results to the
:term:`collector`.
+ notification agent
+ The different OpenStack services emit several notifications about the
+ various types of events. The notification agent consumes them from
+ respective queues and filters them by the event_type.
+
data store
Storage system for recording data collected by ceilometer.
diff --git a/doc/source/install/development.rst b/doc/source/install/development.rst
index 5addf61d..7bbf9528 100644
--- a/doc/source/install/development.rst
+++ b/doc/source/install/development.rst
@@ -18,13 +18,12 @@
Installing and Running the Development Version
================================================
-Ceilometer has four daemons. The :term:`compute agent` runs on the
-Nova compute node(s) while the :term:`central agent` and
-:term:`collector` run on the cloud's management node(s). In a
-development environment created by devstack_, these two are typically
-the same server. They do not have to be, though, so some of the
-instructions below are duplicated. Skip the steps you have already
-done.
+Ceilometer has several daemons. The basic are: :term:`compute agent` runs on
+the Nova compute node(s) while the :term:`central agent`, :term:`collector`
+and :term:`notification agent` run on the cloud's management node(s).
+In a development environment created by devstack_, these services are
+typically running on the same server. They do not have to be, though, so some
+of the instructions below are duplicated. Skip the steps you have already done.
.. _devstack: http://www.devstack.org/
@@ -74,5 +73,8 @@ Configuring Devstack
# Enable the ceilometer api services
enable_service ceilometer-api
+The first group of daemons are necessary for core ceilometer functionality:
+polling, event listening, and data collection.
+
6. If you use Data Processing (Sahara) service at your DevStack, it will
generate notifications by default.