Permalink
Browse files

Clean-up spelling (issue #99): Remove spaces in front of colons, `!` …

…and `?`.

* This changeset is for the remaining files.
* I double-checked to ensure no code or strings which may be required
  by some syntax (e.g. Nagios result protocol) are changed. I
  apologize for the case I changed one which should not have been
  changed.
* In accordance with English typing rules.
* Special cases (e.g. table-like text, code snippets) have been left
  unchanged.
  • Loading branch information...
1 parent 8de26f0 commit 9bf1975246caabd7a0b8ebcf2fc11f0fa3f18c61 @htgoebel htgoebel committed Jul 7, 2012
View
858 Changelog

Large diffs are not rendered by default.

Oops, something went wrong.
View
@@ -1,7 +1,7 @@
=== THANKS :) ====
Hi,
-First of all : THANKS for trying to make a package of Shinken :)
+First of all: THANKS for trying to make a package of Shinken :)
I try to make the setup.py useful to you. It will install the shinken
library to the classic python way (in site-package).
@@ -17,9 +17,9 @@ You will need the pyro lib too. It must already have a package. If not, take if
You can change the place you want to put etc and var in the file setup_parameters.cfg. You can also change
the owner of theses dir (and ALL files in them) in this file.
-But WARNING (bis) : if you set a --root (example =/tmp/something) it will not update the owner of the /etc and /var directory (calling with a --root is for having all files to create a package, so you don't need changing owners).
+But WARNING (bis): if you set a --root (example =/tmp/something) it will not update the owner of the /etc and /var directory (calling with a --root is for having all files to create a package, so you don't need changing owners).
-Example when you call :
+Example when you call:
python setup.py install --root=/tmp/something --record=INSTALLED_FILES --install-scripts=/usr/bin
(no trailing / for install_scripts)
You get all files to package in the file INSTALLED_FILES (and only the /tmp/moncul is changed, so it's ok for your system ;)).
@@ -33,9 +33,9 @@ With the python lib + etc + var it should be ok :)
I don't know what more you need exactly, so please ask in the mailing list at
https://lists.sourceforge.net/lists/listinfo/shinken-devel
-or directly via my email : naparuba@gmail.com
+or directly via my email: naparuba@gmail.com
-And again : thanks a lot, a tool without package is nothing :)
+And again: thanks a lot, a tool without package is nothing :)
Jean
View
@@ -1,13 +1,13 @@
== Fully compatible? ==
-Not 100%, and it will never be. Some Nagios features are just useless in a Shiken architecture. For theses differences, you can look at the Shinken website :
+Not 100%, and it will never be. Some Nagios features are just useless in a Shiken architecture. For theses differences, you can look at the Shinken website:
http://www.shinken-monitoring.org/what-is-in-shinken-not-in-nagios-and-vice-versa/
-== Do I need to change something ? ==
+== Do I need to change something? ==
No.
-There are differences between some nagios parameters and the shinken way of doing things :
+There are differences between some nagios parameters and the shinken way of doing things:
status_file and log_file parameters are no longer required in the nagios.cfg file for Shinken. External data interfaces are now managed as "modules" by the Brokers, and are in the shinken-specific.cfg file (look at Simple-log and Status-Dat modules, and put your paths on it).
Shinken will try to detect this and will autogenerate the modules for you. (But if you can move the configuration to the shinken-specific.cfg file, it's better...)
@@ -16,7 +16,7 @@ Shinken will try to detect this and will autogenerate the modules for you. (But
== Now, how do I launch Shinken with my nagios.cfg? ==
It's simple, after launching scheduler, poller, reactionner and broker daemons (see README), you just need
-to launch the Arbiter daemon with your Nagios configuration :
+to launch the Arbiter daemon with your Nagios configuration:
$ /usr/local/shinken/src/shinken-arbiter.py -c /usr/local/nagios/etc/nagios.cfg -c /usr/local/shinken/src/etc/shinken-specific.cfg
View
@@ -249,5 +249,5 @@ __ http://www.shinken-monitoring.org/wiki/
Known bugs
================================
-You can consult the open issues list or submit a new issue at :
+You can consult the open issues list or submit a new issue at:
https://github.com/naparuba/shinken/issues
View
2 THANKS
@@ -68,5 +68,5 @@ To Michael COQUARD for this patch about setup.py and build path
To Akiooutori for his bug report about pyro missing SOCK_REUSE parameter in some os
To Timo Veith for this work on the Wiki refactoring!
To Lars Hansson for this patches about cfg password module and Apache one
-To the webui mobile guys : Mael VINCENT, julien Pilou, Gael Millet, Damien Mathieu and hugo Viricel for their new webui mobile ui.
+To the webui mobile guys: Mael VINCENT, julien Pilou, Gael Millet, Damien Mathieu and hugo Viricel for their new webui mobile ui.
To Mathias Fussenegger for his large patch about configuration tab/space resolution.
@@ -24,7 +24,7 @@ public static void main(String[] args) throws Exception {
try
{
- // Initialise Thrift :
+ // Initialise Thrift:
TTransport transport;
transport = new TSocket("localhost", 9090);
transport.open();
View
@@ -1,9 +1,9 @@
This is a first attempt to make nconf working with shinken
The patch is about shinken engine recognition by nconf 1.3.0-0
-first install nconf the classical way and then :
+first install nconf the classical way and then:
cd /var/www/nconf/include/ajax
patch -p0 < /path/to/patch/exec_generate_config.php.patch
-Do not forget to edit/replace the deployment.ini file located in config folder !
+Do not forget to edit/replace the deployment.ini file located in config folder!
View
@@ -1,5 +1,5 @@
#!/bin/bash
-#Copyright (C) 2009-2010 :
+#Copyright (C) 2009-2010:
# Gabes Jean, naparuba@gmail.com
# Gerhard Lausser, Gerhard.Lausser@consol.de
#
@@ -50,7 +50,7 @@ function launch_and_assert {
fi
if [ $? != 0 ]
then
- echo "Error : the test $SCRIPT failed"
+ echo "Error: the test $SCRIPT failed"
exit 2
else
echo "test $SCRIPT succeeded, next one"
@@ -1,4 +1,4 @@
-:: Copyright (C) 2009-2011 :
+:: Copyright (C) 2009-2011:
:: Gabes Jean, naparuba@gmail.com
:: Gerhard Lausser, Gerhard.Lausser@consol.de
::
View
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright (C) 2009-2011 :
+# Copyright (C) 2009-2011:
# Gabes Jean, naparuba@gmail.com
# Gerhard Lausser, Gerhard.Lausser@consol.de
# Gregory Starck, g.starck@gmail.com
View
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright (C) 2009-2011 :
+# Copyright (C) 2009-2011:
# Gabes Jean, naparuba@gmail.com
# Gerhard Lausser, Gerhard.Lausser@consol.de
# Gregory Starck, g.starck@gmail.com
View
@@ -1,5 +1,5 @@
#!/bin/bash
-# Copyright (C) 2009-2010 :
+# Copyright (C) 2009-2010:
# Gabes Jean, naparuba@gmail.com
# Gerhard Lausser, Gerhard.Lausser@consol.de
#
@@ -34,7 +34,7 @@ function launch_and_assert {
python ./$SCRIPT
if [ $? != 0 ]
then
- echo "Error : the test $SCRIPT failed"
+ echo "Error: the test $SCRIPT failed"
exit 2
fi
}
View
@@ -30,15 +30,15 @@ cd $DIR/..
NB_CPUS=`cat /proc/cpuinfo | grep 'processor' | wc -l` || 4
-echo "NB CPUS : " $NB_CPUS
+echo "NB CPUS: " $NB_CPUS
# check for a process existance with good number
function check_process_nb {
NB=`ps -ef | grep python | grep -v grep | grep "shinken-"$1 | wc -l`
if [ $NB != "$2" ]
then
- echo "Error : There is not enouth $1 launched (only $NB)."
+ echo "Error: There is not enough $1 launched (only $NB)."
exit 2
else
echo "Ok, got $NB $1"
@@ -50,7 +50,7 @@ function is_file_present {
then
echo "File $1 is present."
else
- echo "Error : File $1 is missing!"
+ echo "Error: File $1 is missing!"
exit 2
fi
}
@@ -59,7 +59,7 @@ function string_in_file {
grep "$1" $2
if [ $? != 0 ]
then
- echo "Error : the file $2 is missing string $1 !"
+ echo "Error: the file $2 is missing string $1!"
exit 2
else
echo "The string $1 is in $2"
@@ -136,7 +136,7 @@ NB_POLLERS=$((2 + $NB_CPUS))
NB_REACTIONNERS=3
NB_BROKERS=4
NB_RECEIVERS=2
-NB_ARBITERS=3 # master itself & namedpipe-autogenerated !
+NB_ARBITERS=3 # master itself & namedpipe-autogenerated!
@@ -183,7 +183,7 @@ python setup.py install --root=/tmp/moncul --record=INSTALLED_FILES --install-sc
if [ $? != '0' ]
then
- echo "Error : the dummy install failed."
+ echo "Error: the dummy install failed."
exit 2
fi
echo "Dummy install OK"
@@ -202,7 +202,7 @@ echo "Now a REAL install"
sudo python setup.py install --install-scripts=/usr/bin
if [ $? != '0' ]
then
- echo "Error : the real install failed."
+ echo "Error: the real install failed."
exit 2
fi
echo "Real install OK"
@@ -304,7 +304,7 @@ echo "All launch of HA daemons is OK"
#> $VAR/nagios.log
-# We kill the most important thing first : the scheduler-Master
+# We kill the most important thing first: the scheduler-Master
bin/stop_scheduler.sh
# We sleep to be sruethe scheduler see us
@@ -314,7 +314,7 @@ print_date
# First we look is the arbiter saw the scheduler as dead
-string_in_file "Warning : Scheduler scheduler-Master had the configuration 0 but is dead, I am not happy." $VAR/nagios.log
+string_in_file "Warning: Scheduler scheduler-Master had the configuration 0 but is dead, I am not happy." $VAR/nagios.log
# Then we look if the scheduler-spare got a conf from arbiter (here, view from the arbiter)
string_in_file "Dispatch OK of conf in scheduler scheduler-Spare" $VAR/nagios.log
@@ -330,7 +330,7 @@ sleep 10
print_date
# The master should be look dead
-string_in_file "Warning : \[All\] The poller poller-Master seems to be down, I must re-dispatch its role to someone else." $VAR/nagios.log
+string_in_file "Warning: \[All\] The poller poller-Master seems to be down, I must re-dispatch its role to someone else." $VAR/nagios.log
# The spare should got the conf
string_in_file "\[All\] Dispatch OK of configuration 0 to poller poller-Slave" $VAR/nagios.log
# And he should got the scheduler link (the sapre one)
@@ -345,7 +345,7 @@ sleep 10
print_date
# The master should be look dead
-string_in_file "Warning : \[All\] The reactionner reactionner-Master seems to be down, I must re-dispatch its role to someone else." $VAR/nagios.log
+string_in_file "Warning: \[All\] The reactionner reactionner-Master seems to be down, I must re-dispatch its role to someone else." $VAR/nagios.log
# The spare should got the conf
string_in_file "\[All\] Dispatch OK of configuration 0 to reactionner reactionner-Spare" $VAR/nagios.log
# And he should got the scheduler link (the sapre one)
@@ -360,7 +360,7 @@ sleep 10
print_date
# The master should be look dead
-string_in_file "Warning : \[All\] The broker broker-Master seems to be down, I must re-dispatch its role to someone else." $VAR/nagios.log
+string_in_file "Warning: \[All\] The broker broker-Master seems to be down, I must re-dispatch its role to someone else." $VAR/nagios.log
# The spare should got the conf
string_in_file "\[All\] Dispatch OK of configuration 0 to broker broker-Slave" $VAR/nagios.log
# And he should got the scheduler link (the spare one)
@@ -369,7 +369,7 @@ string_in_file "\[broker-Slave\] Connection OK to the scheduler scheduler-Spare"
string_in_file "\[broker-Slave\] Connection OK to the reactionner reactionner-Spare" $VAR/nagios.log
string_in_file "\[broker-Slave\] Connection problem to the poller poller-Master" $VAR/nagios.log
# And should have load the modules
-string_in_file "\[broker-Slave\] I correctly loaded the modules : \[Simple-log,Livestatus\]" $VAR/nagios.log
+string_in_file "\[broker-Slave\] I correctly loaded the modules: \[Simple-log,Livestatus\]" $VAR/nagios.log
echo "Now we clean it"
@@ -432,7 +432,7 @@ kill $POLLER1_PID
echo "sleep some few seconds to see the arbiter react"
sleep 5
# And we look if the arbiter find that the other poller do not need another configuration send
-string_in_file "Skipping configuration 0 send to the poller poller-Master-2 : it already got it" $VAR/nagios.log
+string_in_file "Skipping configuration 0 send to the poller poller-Master-2: it already got it" $VAR/nagios.log
echo "Now we clean it"
@@ -525,7 +525,7 @@ NB_POLLERS=$((2 + $NB_CPUS))
NB_REACTIONNERS=3
NB_BROKERS=4
NB_RECEIVERS=2
-NB_ARBITERS=3 # master itself & namedpipe-autogenerated !
+NB_ARBITERS=3 # master itself & namedpipe-autogenerated!
# Now check if the run looks good with var in the direct directory
check_good_run var var var
@@ -550,7 +550,7 @@ sleep 120
-string_in_file "Warning : Scheduler scheduler-1 did not managed its configuration 0,I am not happy." $VAR/nagios.log
+string_in_file "Warning: Scheduler scheduler-1 did not managed its configuration 0,I am not happy." $VAR/nagios.log
string_in_file "Dispatch OK of conf in scheduler scheduler-1" $VAR/nagios.log
string_in_file "We already got the conf 0 (scheduler-1)" $VAR/nagios.log
@@ -1,5 +1,5 @@
#!/usr/bin/env python2.6
-#Copyright (C) 2009-2010 :
+#Copyright (C) 2009-2010:
# Gabes Jean, naparuba@gmail.com
# Gerhard Lausser, Gerhard.Lausser@consol.de
#
View
@@ -1,12 +1,12 @@
/**
* This file described the TSCA interface for shinken
* TSCA stand for Thrift Service Check Acceptor
- * It implement the same interface than NSCA with the following improvements :
+ * It implement the same interface than NSCA with the following improvements:
* - No more limits on plugin output
* - multi languages clients
* - send severals results at once
*
- * Support languages are :
+ * Support languages are:
* C++, Java, Python, PHP, Ruby, Erlang, Perl, Haskell,
* C#, Cocoa, JavaScript, Node.js, Smalltalk, and OCaml
*
View
@@ -7,7 +7,7 @@ REM
REM
REM V 0.1
REM
-REM Copyright (C) 2011 :
+REM Copyright (C) 2011:
REM * E. Beaulieu - Shinken_install_batch@zebux.org
REM
REM Shinken installationscript for Windows is free software: you can redistribute it and/or modify
@@ -40,7 +40,7 @@ if not *%CONT:~0,1% == *I if not *%CONT:~0,1% == *i goto remove
:: Check needed programs
if exist %PATH_INSTSRV%\instsrv.exe goto main
-echo You need to install %PATH_INSTSRV%\instsrv.exe and %PATH_INSTSRV%\srvany.exe from Microsoft Website !!!
+echo You need to install %PATH_INSTSRV%\instsrv.exe and %PATH_INSTSRV%\srvany.exe from Microsoft Website!!!
echo http://www.microsoft.com/downloads/details.aspx?FamilyID=9D467A69-57FF-4AE7-96EE-B18C4790CFFD
pause
exit
@@ -64,7 +64,7 @@ echo
:: Check path installation
if exist %PATH_ROOT% goto begin
-echo The Shinken directory : %PATH_ROOT% does not exist ! Please create it and reinstall Shinken.
+echo The Shinken directory: %PATH_ROOT% does not exist! Please create it and reinstall Shinken.
pause
goto end
@@ -140,7 +140,7 @@ echo
%PATH_INSTSRV%\instsrv.exe "Shinken-Broker" remove
%PATH_INSTSRV%\instsrv.exe "Shinken-Receiver" remove
-echo Please remove the Shinken directory : %PATH_ROOT%
+echo Please remove the Shinken directory: %PATH_ROOT%
pause
exit

0 comments on commit 9bf1975

Please sign in to comment.