[Pkg-nagios-changes] [SCM] UNNAMED PROJECT branch, debian/master, updated. 810edbdd3feedbfe37f4a65bee50b57b2f60fa2a

[naparuba]

The following commit has been merged in the debian/master branch:
commit 786a1dbce017d29f5c9d9ee275454bffa6e4b2f4
Merge: 728099ab59c0a278ed3ac107c0f6d9c7f150a38b e80c98c4e12b1a6a12eab159e00e1393b96c908f
Author: naparuba <naparuba at gmail.com>
Date:   Mon Jan 23 15:46:38 2012 +0100

    Merge branch 'master' of github.com:naparuba/shinken

diff --combined etc/shinken-specific.cfg
index 246091d,38845d9..c8e5a66
--- a/etc/shinken-specific.cfg
+++ b/etc/shinken-specific.cfg
@@@ -356,21 -356,55 +356,55 @@@ define module
  }
  
  # You know Livestatus? Yes, there is a Livestatus module for Shinken too :)
+ #define module{
+ #       module_name      Livestatus
+ #       module_type      livestatus
+ #       host		*	; * = listen on all configured ip addresses
+ #       port		50000   ; port to listen
+ #
+ #       # If you want to use a unix socket file, uncomment it
+ #       socket           /usr/local/shinken/var/rw/live 
+ #       modules          logsqlite 
+ #       # modules should be logsqlite or mongologs
+ #       # Only set debug if you're having problems with this module
+ #       # debug		/tmp/ls.debug
+ #       # Set to 1 if you want to dump queries/responses too
+ #       # warning : it's very verbose
+ #       # debug_queries	0
+ #}
+ 
  define module{
         module_name      Livestatus
         module_type      livestatus
-        host		*	; * = listen on all configured ip addresses
-        port		50000   ; port to listen
-        database_file    livestatus.db
- 
-        # If you want to use a unix socket file, uncomment it
-        # socket         /etc/nagios3/var/rw/live
- 
-        # Only set debug if you're having problems with this module
-        # debug		/tmp/ls.debug
-        # Set to 1 if you want to dump queries/responses too
-        # warning : it's very verbose
-        # debug_queries	0
+        host             *       ; * = listen on all configured ip addresses
+        port             6557   ; port to listen
+        socket           /usr/local/shinken/var/rw/live
+        modules          logsqlite
+ }
+ define module{
+        module_name      logsqlite
+        module_type      logstore_sqlite
+        database_file    /usr/local/shinken/var/livelogs.db
+        max_logs_age     3m ; three months. Other time intervals are d=days, w=weeks, y=years
+ }
+ define module{
+        module_name      mongologs
+        module_type      logstore_mongodb
+        mongodb_uri      mongodb://127.0.0.1:27017
+ }
+ 
+ # store logs in mongodb
+ define module{
+        module_name      mongologs
+        module_type      logstore_mongodb
+        mongodb_uri      mongodb://127.0.0.1:27017
+ }
+ # store logs in sqlite
+ define module{
+        module_name      logsqlite
+        module_type      logstore_sqlite
+        database_file    /usr/local/shinken/var/livelogs.db
+        max_logs_age     3m ; three months. Other time intervals are d=days, w=weeks, y=years
  }
  
  #Send all logs to syslog
@@@ -446,7 -480,7 +480,7 @@@ define module
  define module{
         module_name      MongodbRetention
         module_type      mongodb_retention
 -       server           localhost
 +       uri		mongodb://localhost
         database		shinken
  }
  
@@@ -497,7 -531,7 +531,7 @@@ define module
  define module{
         module_name      Mongodb
         module_type      mongodb
 -       server		localhost
 +       uri              mongodb://localhost
         database		shinken
  }
  

-- 
UNNAMED PROJECT