Merge d1fa5f2 into 728ab15

test/cfg/cfg_default_with_modules.cfg

@@ -0,0 +1 @@
+cfg_dir=default_with_modules

test/cfg/daemons/alignak.cfg

@@ -47,17 +47,24 @@ cfg_dir=arbiter/objects/hosts
 cfg_dir=arbiter/objects/services
 cfg_dir=arbiter/objects/contacts
 
-# Alignak daemons and modules are loaded
+# -------------------------------------------------------------------------
+# Alignak framework configuration part
+# -------------------------------------------------------------------------
+
+# Alignak daemons and modules to be loaded
 cfg_dir=arbiter/daemons
 cfg_dir=arbiter/modules
 
 # You will find global MACROS into the files in those directories
 cfg_dir=arbiter/resource.d
 cfg_dir=arbiter/packs/resource.d
 
-# -------------------------------------------------------------------------
-# Alignak framework configuration part
-# -------------------------------------------------------------------------
+# Alignak instance name
+# This information is useful to get/store alignak global configuration in the Alignak backend
+# If you share the same backend between several Alignak instances, each instance must have its own
+# name. The default is to use the arbiter name as Alignak instance name. Else, you can can define
+# your own Alignak instance name in this property
+# alignak_name=my_alignak
 
 # Notifications configuration
 # ---
@@ -115,10 +122,6 @@ max_plugins_output_length=65536
 #host_check_timeout=30
 #service_check_timeout=60
 #timeout_exit_status=2
-#event_handler_timeout=30
-#notification_timeout=30
-#ocsp_timeout=15
-#ohsp_timeout=15
 
 
 # Freshness check
@@ -155,13 +158,6 @@ max_plugins_output_length=65536
 # Performance data management is enabled/disabled
 #process_performance_data=1
 
-# Performance data commands
-#host_perfdata_command=
-#service_perfdata_command=
-
-# After a timeout, launched plugins are killed
-#event_handler_timeout=30
-
 
 # Event handlers configuration
 # ---
@@ -268,8 +264,13 @@ pack_distribution_file=/usr/local/var/lib/alignak/pack_distribution.dat
 
 
 # --------------------------------------------------------------------
-## Arbiter daemon part, similar to daemon ini file
+# Arbiter daemons part, when the arbiter starts some daemons by itself
+# This may happen if some hosts are defined in a realm that do not
+# have all its daemons defined
 # --------------------------------------------------------------------
-#
-# Those parameters are defined in the arbiterd.ini file
-# 
+# Daemons arguments
+#daemons_arguments=
+# Daemons log file
+daemons_log_folder=/usr/local/var/log/alignak
+# Default is to allocate a port number incrementally starting from the value defined here
+daemons_initial_port=7800

test/cfg/daemons/arbiterd.ini

@@ -7,6 +7,10 @@ workdir=/usr/local/var/run/alignak
 logdir=/usr/local/var/log/alignak
 etcdir=/usr/local/etc/alignak
 
+#-- Note that those variables:
+# 1/ are used in this file as %(workdir)s
+# 2/ are automatically updated during the Alignak installation process
+
 # The daemon will chdir into the directory workdir when launched
 # It will create its pid file in the working dir
 pidfile=%(workdir)s/arbiterd.pid
@@ -27,7 +31,7 @@ daemon_enabled=1
 use_ssl=0
 # Paths for certificates use the 'etcdir' variable
 #ca_cert=%(etcdir)s/certs/ca.pem
-#server_cert=%(etcdir)s/certs/server.cert
+#server_cert=%(etcdir)s/certs/server.csr
 #server_key=%(etcdir)s/certs/server.key
 #server_dh=%(etcdir)s/certs/server.pem
 #hard_ssl_name_check=0

test/cfg/daemons/brokerd.ini

@@ -7,6 +7,10 @@ workdir=/usr/local/var/run/alignak
 logdir=/usr/local/var/log/alignak
 etcdir=/usr/local/etc/alignak
 
+#-- Note that those variables:
+# 1/ are used in this file as %(workdir)s
+# 2/ are automatically updated during the Alignak installation process (eg. python setup.py install)
+
 # The daemon will chdir into the directory workdir when launched
 # It will create its pid file in the working dir
 pidfile=%(workdir)s/brokerd.pid
@@ -27,7 +31,7 @@ daemon_enabled=1
 use_ssl=0
 # Paths for certificates use the 'etcdir' variable
 #ca_cert=%(etcdir)s/certs/ca.pem
-#server_cert=%(etcdir)s/certs/server.cert
+#server_cert=%(etcdir)s/certs/server.csr
 #server_key=%(etcdir)s/certs/server.key
 #server_dh=%(etcdir)s/certs/server.pem
 #hard_ssl_name_check=0

test/cfg/daemons/pollerd.ini

@@ -7,6 +7,10 @@ workdir=/usr/local/var/run/alignak
 logdir=/usr/local/var/log/alignak
 etcdir=/usr/local/etc/alignak
 
+#-- Note that those variables:
+# 1/ are used in this file as %(workdir)s
+# 2/ are automatically updated during the Alignak installation process (eg. python setup.py install)
+
 # The daemon will chdir into the directory workdir when launched
 # It will create its pid file in the working dir
 pidfile=%(workdir)s/pollerd.pid
@@ -27,7 +31,7 @@ daemon_enabled=1
 use_ssl=0
 # Paths for certificates use the 'etcdir' variable
 #ca_cert=%(etcdir)s/certs/ca.pem
-#server_cert=%(etcdir)s/certs/server.cert
+#server_cert=%(etcdir)s/certs/server.csr
 #server_key=%(etcdir)s/certs/server.key
 #server_dh=%(etcdir)s/certs/server.pem
 #hard_ssl_name_check=0

test/cfg/daemons/reactionnerd.ini

@@ -7,6 +7,10 @@ workdir=/usr/local/var/run/alignak
 logdir=/usr/local/var/log/alignak
 etcdir=/usr/local/etc/alignak
 
+#-- Note that those variables:
+# 1/ are used in this file as %(workdir)s
+# 2/ are automatically updated during the Alignak installation process (eg. python setup.py install)
+
 # The daemon will chdir into the directory workdir when launched
 # It will create its pid file in the working dir
 pidfile=%(workdir)s/reactionnerd.pid
@@ -27,7 +31,7 @@ daemon_enabled=1
 use_ssl=0
 # Paths for certificates use the 'etcdir' variable
 #ca_cert=%(etcdir)s/certs/ca.pem
-#server_cert=%(etcdir)s/certs/server.cert
+#server_cert=%(etcdir)s/certs/server.csr
 #server_key=%(etcdir)s/certs/server.key
 #server_dh=%(etcdir)s/certs/server.pem
 #hard_ssl_name_check=0

test/cfg/daemons/receiverd.ini

@@ -7,6 +7,10 @@ workdir=/usr/local/var/run/alignak
 logdir=/usr/local/var/log/alignak
 etcdir=/usr/local/etc/alignak
 
+#-- Note that those variables:
+# 1/ are used in this file as %(workdir)s
+# 2/ are automatically updated during the Alignak installation process (eg. python setup.py install)
+
 # The daemon will chdir into the directory workdir when launched
 # It will create its pid file in the working dir
 pidfile=%(workdir)s/receiverd.pid
@@ -27,7 +31,7 @@ daemon_enabled=1
 use_ssl=0
 # Paths for certificates use the 'etcdir' variable
 #ca_cert=%(etcdir)s/certs/ca.pem
-#server_cert=%(etcdir)s/certs/server.cert
+#server_cert=%(etcdir)s/certs/server.csr
 #server_key=%(etcdir)s/certs/server.key
 #server_dh=%(etcdir)s/certs/server.pem
 #hard_ssl_name_check=0

test/cfg/daemons/schedulerd.ini

@@ -7,6 +7,10 @@ workdir=/usr/local/var/run/alignak
 logdir=/usr/local/var/log/alignak
 etcdir=/usr/local/etc/alignak
 
+#-- Note that those variables:
+# 1/ are used in this file as %(workdir)s
+# 2/ are automatically updated during the Alignak installation process (eg. python setup.py install)
+
 # The daemon will chdir into the directory workdir when launched
 # It will create its pid file in the working dir
 pidfile=%(workdir)s/schedulerd.pid
@@ -31,7 +35,7 @@ daemon_enabled=1
 use_ssl=0
 # Paths for certificates use the 'etcdir' variable
 #ca_cert=%(etcdir)s/certs/ca.pem
-#server_cert=%(etcdir)s/certs/server.cert
+#server_cert=%(etcdir)s/certs/server.csr
 #server_key=%(etcdir)s/certs/server.key
 #server_dh=%(etcdir)s/certs/server.pem
 #hard_ssl_name_check=0

test/cfg/default/daemons/arbiter-master.cfg

@@ -11,41 +11,33 @@
 # servers to its real DNS name ('hostname' command).
 #===============================================================================
 define arbiter {
-    arbiter_name    arbiter-master
-    #host_name       node1       ; CHANGE THIS if you have several Arbiters (like with a spare)
-    address         localhost   ; DNS name or IP
-    port            7770
-    spare           0           ; 1 = is a spare, 0 = is not a spare
+    arbiter_name            arbiter-master
+    #host_name              node1           ; CHANGE THIS if you have several Arbiters (like with a spare)
+    address                 127.0.0.1
+    port                    7770
 
+    ## Realm
+    #realm                   All
+
+    ## Modules
+    # Default: None
     ## Interesting modules:
-    # - named-pipe               = Open the named pipe nagios.cmd
-    # - mongodb                  = Load hosts from a mongodb database
-    # - pickle-retention-arbiter = Save data before exiting
-    # - nsca                     = NSCA server
-    # - vmware-auto-linking      = Lookup at Vphere server for dependencies
-    # - import-glpi              = Import configuration from GLPI (need plugin monitoring for GLPI in server side)
-    # - tsca                     = TSCA server
-    # - mysql-mport              = Load configuration from a MySQL database
-    # - ws-arbiter               = WebService for pushing results to the arbiter
-    # - collectd                 = Receive collectd perfdata
-    # - snmp-booster             = Snmp bulk polling module, configuration linker
-    # - import-landscape    	 = Import hosts from Landscape (Ubuntu/Canonical management tool)
-    # - aws			= Import hosts from Amazon AWS (here EC2)
-    # - ip-tag			= Tag a host based on it's IP range
-    # - file-tag			= Tag a host if it's on a flat file
-    # - csv-tag			= Tag a host from the content of a CSV file
-
-    modules    	 
-
-    # Enable https or not
-    use_ssl	          0
-    # enable certificate/hostname check, will avoid man in the middle attacks
-    hard_ssl_name_check   0
+    # - backend_arbiter     = get the monitored objects configuration from the Alignak backend
+    #modules                 backend_arbiter
 
+    ## Optional parameters:
     ## Uncomment these lines in a HA architecture so the master and slaves know
     ## how long they may wait for each other.
-    #timeout              3   ; Ping timeout
-    #data_timeout         120 ; Data send timeout
-    #max_check_attempts   3   ; If ping fails N or more, then the node is dead
-    #check_interval       60  ; Ping node every N seconds
+    #timeout                 3   ; Ping timeout
+    #data_timeout            120 ; Data send timeout
+    #max_check_attempts      3   ; If ping fails N or more, then the node is dead
+    #check_interval          60  ; Ping node every N seconds
+
+    # In a HA architecture this daemon can be a spare
+    spare                   0   ; 1 = is a spare, 0 = is not a spare
+
+    # Enable https or not
+    use_ssl	                0
+    # enable certificate/hostname check, will avoid man in the middle attacks
+    hard_ssl_name_check     0
 }

test/cfg/default/daemons/broker-master.cfg

@@ -13,37 +13,36 @@
 # https://alignak.readthedocs.org/en/latest/08_configobjects/broker.html
 #===============================================================================
 define broker {
-    broker_name     broker-master
-    address         localhost
-    port            7772
-    spare           0
+    broker_name             broker-master
+    address                 127.0.0.1
+    port                    7772
 
-    ## Optional
-    manage_arbiters     1   ; Take data from Arbiter. There should be only one
-                            ; broker for the arbiter.
-    manage_sub_realms   1   ; Does it take jobs from schedulers of sub-Realms?
-    timeout             3   ; Ping timeout
-    data_timeout        120 ; Data send timeout
-    max_check_attempts  3   ; If ping fails N or more, then the node is dead
-    check_interval      60  ; Ping node every N seconds
+    ## Realm
+    #realm                   All
 
     ## Modules
     # Default: None
     # Interesting modules that can be used:
-    # - simple-log              = just all logs into one file
-    # - livestatus              = livestatus listener
-    # - tondodb-mysql           = NDO DB support (deprecated)
-    # - npcdmod                 = Use the PNP addon
-    # - graphite                = Use a Graphite time series DB for perfdata
-    # - webui                   = Alignak Web interface
-    # - glpidb                  = Save data in GLPI MySQL database
-    modules     Example
+    # - backend_broker      = update the live state in the Alignak backend
+    # - logs                = collect monitoring logs and send them to a Python logger
+    #modules                 backend_broker, logs
+
+    ## Optional parameters:
+    timeout                 3   ; Ping timeout
+    data_timeout            120 ; Data send timeout
+    max_check_attempts      3   ; If ping fails N or more, then the node is dead
+    check_interval          60  ; Ping node every N seconds
+
+    # In a HA architecture this daemon can be a spare
+    spare                   0   ; 1 = is a spare, 0 = is not a spare
 
     # Enable https or not
-    use_ssl	          0
+    use_ssl	                0
     # enable certificate/hostname check, will avoid man in the middle attacks
-    hard_ssl_name_check   0
-
-    ## Advanced
-    realm   All
+    hard_ssl_name_check     0
+
+    ## Advanced parameters:
+    manage_arbiters         1   ; Take data from Arbiter. There should be only one
+                                ; broker for the arbiter.
+    manage_sub_realms       1   ; Does it take jobs from schedulers of sub-Realms?
 }