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

[xkilian]

The following commit has been merged in the debian/master branch:
commit 020e21ddbe8fb401a2c270c92b5a572714bd9951
Author: xkilian <fmikus at acktomic.com>
Date:   Fri Feb 3 19:42:45 2012 -0500

    English style changes and small comment corrections.

diff --git a/etc/shinken-specific.cfg b/etc/shinken-specific.cfg
index d994426..f690cde 100755
--- a/etc/shinken-specific.cfg
+++ b/etc/shinken-specific.cfg
@@ -28,11 +28,11 @@ define scheduler{
        check_interval		60    ; ping it every minute
 #        modules			PickleRetention
 
-#  Interesting modules :
+#  Interesting modules that can be used :
 #    PickleRetention    :        Save data before exiting in flat file
-#    MemcacheRetention  :        Same but in a memcache server
-#    RedisRetention     :        same, but in a Redis server :)
-#    MongodbRetention   :        Same, but with a mongodb server :)
+#    MemcacheRetention  :        Same, but in a memcache server
+#    RedisRetention     :        Same, but in a Redis server :)
+#    MongodbRetention   :        Same, but in a mongodb server :)
 #    NagiosRetention    :        only READ retention info from a nagios retention file
 
        # advanced feature
@@ -61,10 +61,10 @@ define poller{
        #  advanced features
        # modules		NrpeBooster,CommandFile
        #  NRPE Boster will avoid to use the check_nrpe binary
-       #       and so can enhance your performances if you got
+       #       and so can enhance your performances if you have
        #       lot of nrpe calls
-       #  CommandFile can allow a nagios.cmd named pipe to be read by your
-       #       poller, and so use a distributed check_mk check is you want
+       #  CommandFile can allow a nagios.cmd named pipe to be read by the
+       #       poller. This permits the use of distributed check_mk checks should you desire it.
 
        # poller_tags	None
        realm		All
@@ -82,7 +82,7 @@ define module{
 }
 
 
-# Reactionner launch notifications
+# Reactionner launches notifications
 define reactionner{
        reactionner_name		reactionner-1
        address			localhost
@@ -110,7 +110,7 @@ define reactionner{
 
 
 
-# The broker manages data export (in flat file or in database)
+# The broker manages data export (to a flat file or to a database)
 # with its modules
 # Here just log files and status.dat file modules
 define broker{
@@ -124,11 +124,11 @@ define broker{
 
 
 
-#       Other interesting modules to add :
+#       Other interesting modules that can be used :
 #       PickleRetentionBroker    :  save data when quitting
 #       ToNdodb_Mysql            :  NDO database support
 #       NPCDMOD			: Use the PNP addon
-#       Graphite-Perfdata        : Use teh Graphite backend for perfdata
+#       Graphite-Perfdata        : Use a Graphite time series database for perfdata
 #       WebUI			: Shinken Web interface
 
        #  Optional
@@ -179,7 +179,7 @@ define module{
        auth_secret	CHANGE_ME
 
        #  Allow or not the html characters in plugins output
-       #  WARNING : so far, it can be a security issue
+       #  WARNING : it can be a security issue
        allow_html_output  0
 
        #  Uncomment to present a text in the login form
@@ -190,7 +190,7 @@ define module{
 
        # http_backend    auto
        #  ; can be also : wsgiref, cherrypy, paste, tornado, twisted
-       #  ; or gevent. automeans beast find in the system.
+       #  ; or gevent. auto means it tries to find the best available in the system.
 
        #  Maybe the WebUI is behind a web server which has already authentified the user
        #  So let's use the Remote_user variable
@@ -205,7 +205,7 @@ define module{
        #  ActiveDir_UI : use AD for auth and photo collect
        #  Cfg_password : use passwords in contacts configuration for auth
        #  PNP_UI : Use PNP graphs in the UI
-       #  GRAPHITE_UI : Use graphs from Graphite
+       #  GRAPHITE_UI : Use graphs from Graphite time series database
 
 }
 
@@ -259,13 +259,13 @@ define module{
        port		3306	  ; mysql port
 
        #  If you want to mix Shinken AND Nagios/icinga in the same db
-       #  enable this. It will use in database isntance_id, and not use the shinken ones
+       #  enable this. It will use in database instance_id, and not use the shinken ones
        #  override/delete other ones. It can slow a little the performance
        synchronise_database_id    0
 }
 
 
-# Here a NDO/Oracle module. For Icinga web connection
+# Here is the NDO/Oracle module. For Icinga web connection
 # Or for DBAs who don't like MySQL
 define module{
        module_name	ToNdodb_Oracle
@@ -277,7 +277,7 @@ define module{
 }
 
 
-# Here for Merlin/MySQL. For the cool Ninja connection
+# Here is the Merlin/MySQL module. For the Ninja interface connection
 define module{
        module_name      ToMerlindb_Mysql
        module_type      merlindb
@@ -290,7 +290,7 @@ define module{
 }
 
 
-# Here the Merlin/Sqlite. No one uses it for now :)
+# Here is the Merlin/Sqlite module. No one uses it now :)
 # You look at something : it's also the merlindb module, like the previous,
 # it's the same code, only the backend parameter (and path, of course ;-) has changed .
 define module{
@@ -301,11 +301,8 @@ define module{
 }
 
 
-# Here the couchdb export. Maybe use someday...
-# I should do a mangodb too some other day...
-# and casandra...
-# and voldemort...
-# and all other NoSQL databases in fact :)
+# Here is the couchdb export module. Not commonly used.
+# Other NoSQL databases may be possible, such as MongoDB, it depends on user demand. :)
 define module{
        module_name      ToCouchdb
        module_type      couchdb
@@ -338,7 +335,7 @@ define module{
 }
 
 
-#  Graphite is a Graph backend
+#  Graphite is a time series database with a rich web service interface, viewed as modern alternative to RRDtool
 #  http://graphite.wikidot.com/start
 define module{
        module_name      Graphite-Perfdata

-- 
UNNAMED PROJECT