Permalink
Browse files

docs only - make install docs less misleading

  • Loading branch information...
1 parent bb5c0a4 commit e1d39d21864fcaefbb2f8e20d15b70fd567d3fb2 @rhelmer rhelmer committed Mar 8, 2012
Showing with 20 additions and 3 deletions.
  1. +20 −1 docs/installation.rst
  2. +0 −2 docs/monitor.rst
View
@@ -119,17 +119,36 @@ From inside the Socorro checkout, as the *socorro* user:
::
make install
+Crash Flow
+````````````
+
+The basic flow of an incoming crash is:
+
+(breakpad client) -> (collector) -> (local file system) -> (newCrashMover.py) -> (hbase)
+
+A single machine will need to run the Monitor service, which watches
+hbase for incoming crashes and queues them up for the Processor service
+(which can run on one or more servers). Monitor and Processor use PostgreSQL
+to coordinate.
+
+Finally, processed jobs are inserted into both hbase and PostgreSQL
+
Configure Socorro
````````````
+
+These pages show how to start the services manually, please also see the
+next section "Install startup scripts":
+
* Start configuration with :ref:`commonconfig-chapter`
* On the machine(s) to run collector, setup :ref:`collector-chapter`
+* On the machine(s) to run collector setup :ref:`crashmover-chapter`
* On the machine to run monitor, setup :ref:`monitor-chapter`
* On same machine that runs monitor, setup :ref:`deferredcleanup-chapter`
* On the machine(s) to run processor, setup :ref:`processor-chapter`
Install startup scripts
````````````
-RHEL/CentOS only (Ubuntu TODO - see vagrant/ for supervisord example)
+RHEL/CentOS only (Ubuntu TODO - see https://github.com/rhelmer/socorro-vagrant/tree/master/files/etc_supervisor for supervisord example)
As *root*:
::
ln -s /data/socorro/application/scripts/init.d/socorro-{monitor,processor,crashmover} /etc/init.d/
View
@@ -8,8 +8,6 @@ Monitor
.. raw:: html
- <font color="red">As of version 1.8, this app is DEPRECATED.</font>
-
Monitor is a multithreaded application with several mandates. It's
main job is to find new JSON/dump pairs and queue them for further
processing. It looks for new JSON/dump pairs in the file system

0 comments on commit e1d39d2

Please sign in to comment.