Merge pull request #20 from Dan33l/initialread

04-1_alignak_configuration/arbiter.rst was not speaking about arbiter…
Alignak-monitoring · Dec 21, 2016 · e336976 · e336976
2 parents 6a3faee + 3cca6ec
commit e336976
Show file tree

Hide file tree

Showing 8 changed files with 280 additions and 312 deletions.
diff --git a/...ce/04-1_alignak_configuration/arbiter.rst → ...gnak_configuration/core_configuration.rst b/...ce/04-1_alignak_configuration/arbiter.rst → ...gnak_configuration/core_configuration.rst
diff --git a/...configuration/main_configuration_file.rst → ...configuration/core_configuration_tips.rst b/...configuration/main_configuration_file.rst → ...configuration/core_configuration_tips.rst
diff --git a/source/04-1_alignak_configuration/daemons.rst b/source/04-1_alignak_configuration/daemons.rst
diff --git a/source/04-1_alignak_configuration/index.rst b/source/04-1_alignak_configuration/index.rst
@@ -12,23 +12,20 @@ Alignak framework configuration
     \newpage
 
 
-The Alignak framework configuration is splitted in three main parts:
+The Alignak framework configuration is splitted in two main parts:
 
-   - arbiter configuration,
-   - daemons configuration,
-   - external modules configuration.
+   - the core configuration
+   - the modules configuration.
 
-The arbiter configuration part describes the Alignak framework infrastructure (which daemons are used and how they are) and the monitoring objects (what is monitored and how it is).
+All the configurations are stored in the folder */usr/local/etc/alignak/* (or */etc/alignak/*), even the monitoring objects (what is monitored and how it is). Monitoring objects configuration, probably the most important for Alignak's users, is described in  :ref:`the monitored objects dedicated chapter <monitoring_configuration/index>`.
 
-All the configuration is stored in the folder */usr/local/etc/alignak/* (or */etc/alignak/*).
-Each main part of the configuration is described in the following chapters:
+Each main part of the Alignak framework configuration is described in the following chapters :
 
 .. toctree::
    :maxdepth: 1
 
-   arbiter
-   daemons
-   modules
+   core_configuration
+   modules_configuration
 
 This chapter gives information about configuring the inter-deamon communication with SSL.
 
@@ -43,4 +40,4 @@ The last chapters give more information about the default installed configuratio
    :maxdepth: 1
 
    default_configuration
-   main_configuration_file
+   core_configuration_tips.rst
diff --git a/...ce/04-1_alignak_configuration/modules.rst → ...k_configuration/modules_configuration.rst b/...ce/04-1_alignak_configuration/modules.rst → ...k_configuration/modules_configuration.rst
@@ -17,6 +17,9 @@ The configuration file of the installed module will be installed in the folder::
 
     etc/alignak/arbiter/modules
 
+Each module installed on Alignak stores its configuration file in this part of the configuration.
+
+
 .. _Pypi: https://pypi.python.org/pypi
 
 

diff --git a/source/04-2_monitoring_configuration/objects_configuration.rst b/source/04-2_monitoring_configuration/objects_configuration.rst
@@ -16,7 +16,7 @@ Monitored objects are all the elements that are involved in the monitoring and n
   * Execution Dependencies
   * Modulations
 
-The monitored objects can be defined in one or more configuration files and/or directories that are specified using the :ref:`main configuration file<configuration/main#cfg_file>` and/or :ref:`cfg_dir <configuration/main#cfg_dir>` properties in the :ref:`main configuration file<configuration/main>`.
+The monitored objects can be defined in one or more configuration files and/or directories that are specified using the :ref:`cfg_file <configuration/core#cfg_file>` and/or :ref:`cfg_dir <configuration/core#cfg_dir>` properties in the :ref:`core configuration <configuration/core>`.
 
 .. note: defining the monitored objects in some configuration flat files is the plain old Nagios/Shinken way of defining the configuration. Alignak introduces a brand new solution thanks to its backend. For more information, see :ref:̀̀`extending/alignak_backend`.