diff --git a/doc/source/install/development.rst b/doc/source/install/development.rst index 690258de7..853adcd33 100644 --- a/doc/source/install/development.rst +++ b/doc/source/install/development.rst @@ -55,5 +55,11 @@ Configuring Devstack This example ``localrc`` file shows all of the settings required for ceilometer:: - # Enable the ceilometer services - enable_service ceilometer-acompute,ceilometer-acentral,ceilometer-collector,ceilometer-api + # Enable the ceilometer metering services + enable_service ceilometer-acompute,ceilometer-acentral,ceilometer-collector + + # Enable the ceilometer alarming services + enable_service ceilometer-alarm-singleton,ceilometer-alarm-notifier + + # Enable the ceilometer api services + enable_service ceilometer-api diff --git a/doc/source/webapi/v2.rst b/doc/source/webapi/v2.rst index d09fbe876..3ecd26aa6 100644 --- a/doc/source/webapi/v2.rst +++ b/doc/source/webapi/v2.rst @@ -32,6 +32,16 @@ Samples and Statistics .. autotype:: ceilometer.api.controllers.v2.Statistics :members: +Alarms +====== + +.. rest-controller:: ceilometer.api.controllers.v2:AlarmsController + :webprefix: /v2/alarms + +.. autotype:: ceilometer.api.controllers.v2.Alarm + :members: + + Filtering Queries =================