Browse Source

Mention Flower, not Django-Admin monitor

Ask Solem 12 years ago
parent
commit
e4b676e8cd
2 changed files with 5 additions and 4 deletions
  1. 2 2
      docs/getting-started/next-steps.rst
  2. 3 2
      docs/history/changelog-2.1.rst

+ 2 - 2
docs/getting-started/next-steps.rst

@@ -115,8 +115,8 @@ Eventlet, Gevent, and threads (see :ref:`concurrency`).
 -- *Events* is an option that when enabled causes Celery to send
 -- *Events* is an option that when enabled causes Celery to send
 monitoring messages (events) for actions occurring in the worker.
 monitoring messages (events) for actions occurring in the worker.
 These can be used by monitor programs like ``celery events``,
 These can be used by monitor programs like ``celery events``,
-celerymon and the Django-Celery admin monitor that you can read
+and Flower - the real-time Celery monitor, which you can read about in
-about in the :ref:`Monitoring and Management guide <guide-monitoring>`.
+the :ref:`Monitoring and Management guide <guide-monitoring>`.
 
 
 -- *Queues* is the list of queues that the worker will consume
 -- *Queues* is the list of queues that the worker will consume
 tasks from.  The worker can be told to consume from several queues
 tasks from.  The worker can be told to consume from several queues

+ 3 - 2
docs/history/changelog-2.1.rst

@@ -275,8 +275,9 @@ Important Notes
   if the database result backend is used.
   if the database result backend is used.
 
 
 * django-celery now comes with a monitor for the Django Admin interface.
 * django-celery now comes with a monitor for the Django Admin interface.
-  This can also be used if you're not a Django user.  See
+  This can also be used if you're not a Django user.
-  :ref:`monitoring-django-admin` and :ref:`monitoring-nodjango` for more information.
+  (Update: Django-Admin monitor has been replaced with Flower, see the
+  Monitoring guide).
 
 
 * If you get an error after upgrading saying:
 * If you get an error after upgrading saying:
   `AttributeError: 'module' object has no attribute 'system'`,
   `AttributeError: 'module' object has no attribute 'system'`,