Permalink
Browse files

Clean-up (issue #99): Remove trailing white-spaces in all text files.

Only .pem files are left unchanged since they are generated.
  • Loading branch information...
1 parent 9ae31e0 commit e976779aa9ec53e06f67cee91b2dbdbf58cef1d8 @htgoebel htgoebel committed Jul 6, 2012
Showing 608 changed files with 5,073 additions and 5,073 deletions.
View
@@ -19,7 +19,7 @@ Shinken ChangeLog
MODULES ENHANCEMENTS
* Add : lof of GLPI module enhancements, with new properties managed
-
+
MODULES FIXES
* Fix : check_esx3 install under ubuntu 32bits edition
* Fix : multisite layout, add custom links
@@ -33,8 +33,8 @@ Shinken ChangeLog
UI FIXES
* Fix : Sort alphabeticaly in WebUI
-
-
+
+
1.0 - 28/02/2012
------------------
CORE ENHANCEMENTS
@@ -54,7 +54,7 @@ Shinken ChangeLog
* Add : $$ are now interpreted as $ in macro solving
* Add : (reported by : sduchesneau) check_shinken.py now has a timeout. It is set by default at 10s
* Add : business rules now support the NOT operand
- * Add : send broks in external modules as a biglist instead of n broks. It's more efficient (X3 perf for this, can be huge time for huge conf)
+ * Add : send broks in external modules as a biglist instead of n broks. It's more efficient (X3 perf for this, can be huge time for huge conf)
* Add : templates for monitoring common devices and services are now included
* Add : manage \; to be changed in ; without cutting the rest of the line to be removed as a comment
* Add : (reported by : foobar1111) arbiter only matched hostname, and not fqdn. Now it will try fqdn and then the hostname.
@@ -67,11 +67,11 @@ Shinken ChangeLog
* Add : xkilian reviewed and corrected many many pages of the wiki documentation and a few english fixes in the distribution :)
* Add : skonf daemon preview. It is not yet meant for production, but is included to get feedback
* Add : mongodb insert capabilities for the discovery
- * Add : TIMEPERIOD TRANSITION logs from the Arbiter to get timeperiods transition output
+ * Add : TIMEPERIOD TRANSITION logs from the Arbiter to get timeperiods transition output
* Add : is_admin property is now available for contacts
* Add : make the nmap discovery do tcp and udp scan
* Add : (Victor Igumnov) installation for Solaris
-
+
CORE FIXES
* Fix : use StringIO to read configuration files into a string (much faster with lots of config files)
* Fix : (reported by : lminoza) bug in inheritance if templates give only a + elements, should continue to loop and not stop here.
@@ -102,10 +102,10 @@ Shinken ChangeLog
* Fix : (reported by : denetariko) manage spaces before and after type name in define line
* Fix : (reported by: Steve Kieu) missing get_name() method for config
* Fix : (reported by : Mihai Efrim) flapping notifications
-
-
-
+
+
+
MODULE ENHANCEMENTS
* Add : rewrite the LiveStatus module, performance boost and simpler. Thanks Gerhard for this huge undertaking!
* Add : two new modules for storing livestatus logs. sqlite and mongodb
@@ -120,7 +120,7 @@ Shinken ChangeLog
* Add : port option for the mysql connexion with NDO
* Add : ip_tag module that can change configuration properties based on the host IP address or IP address range.
* Add : simulation mode for the nmap disco wrapper, so we can ask for xml output from users, and then simulate it easily.
- * Add : new process for nmap discovery output. There is no longer a big mapping pass. It will output what it can, and it's for the discovery_rule to do this job now,
+ * Add : new process for nmap discovery output. There is no longer a big mapping pass. It will output what it can, and it's for the discovery_rule to do this job now,
it's far more a BIG thanks to all folks that send me sample xml output :)
* Add : enhanced capabilities for the mysql import module (OlivierHa)
@@ -155,9 +155,9 @@ Shinken ChangeLog
* Add : perfometer image hovering with the graph module like PNP
* Add : password iphone like in the login screen
* Add : an orange outline to see where the focus is on input
-
-
-
+
+
+
0.8 - 17/10/2011
------------------
CORE ENHANCEMENTS
@@ -177,7 +177,7 @@ Shinken ChangeLog
* Add : new tests for A,B,Cof: rules and a fix for the default return logic.
* Add : arbiter ask one a check_interval the managed conf for satellites. Makes for smoother decisions.
-
+
CORE FIXES
* Fix : BugFix Pyro4 compatibility
* fix : try to fix bad notification output make scehduler crash.
@@ -192,23 +192,23 @@ Shinken ChangeLog
* Fix : (reported by : obiouane) missing object value is now reported correctly.
* Fix : (Etienne Obriot) multiple = in macos values
* Fix : a bug in config.py where resource macros containing a "=" were not correctly processed. Thanks Etienne
- * Fix : (reported by Seb-Solon) custome macros get problems in notifications.
+ * Fix : (reported by Seb-Solon) custome macros get problems in notifications.
* Fix : (reported by : Michael Grundmann) a service for a void hostgroup and a host exclusion was reporting a bad conf instead if forgot this service.
* Fix : (Reported by : Dirk Hallanzy) was not launching under XP due to some pid file creation bad mode.
* Fix : (reported by : Vincent Riquer) now a spare broker can be send to sleep again by the arbiter. It will clean its queues and stop modules.
* Fix : arbiter crash with a spare and the new smoothing wat i managed behavior.
* Fix : Change default check/eventhandler/notification timeouts and flap thresholds to make nagios more compatible to shinken.
* fix : Better handling of check timeouts (there was an empty output)
* fix : Log notification and eventhandler timeouts
- * Fix : (reported by : Denis GERMAIN) service with no description cause an host problem in linking phase.
+ * Fix : (reported by : Denis GERMAIN) service with no description cause an host problem in linking phase.
* Fix : (reported by : Seb-Solon) manage utf8 in host and service perfdata.
* Fix : protect broker agains module taht ask for full instance init about unknown scheduler.
* Fix : (reported by Markus Elger) add next schedule date in the retention data.
* Fix : (reported by : Olivier Hanesse) bad realm configuration was not detected for satellites.
* Fix : (reported by :Markus Elger) bad host count in realms.
* Fix : (reported by :Markus Elger) bad host reaml conf were not detected.
-
+
MODULES ENHANCEMENTS
* Add : module for autotagging poller_tag from a custom macro.
* Add : create the simple-log archive dir automatically if it doesn't exist
@@ -231,7 +231,7 @@ Shinken ChangeLog
* Add : the REUSEADDR flag to livestatus's socket. Thanks Olivier Hanesse
* Add : performance improvement for livestatus queries with Limit:
-
+
MODULES FIXES
* Fix : important bugfix in ncpdmod
@@ -246,7 +246,7 @@ Shinken ChangeLog
* Fix : (reported by : Ronny Lindner & Markus Elger) LiveStatus crash in log parsing.
* Fix : (reported by : Ronny Lindner) fix status.dat module with utf8 characters
* Fix : (reported by : Olivier Hanesse) nrpe module did not tag the check_time value for checks, and so pnp and other tools were not happy. BP rules were alike.
- * Fix : (reported by Markus Elger) LiveStatus module did not clean previously added elements before recreating them.
+ * Fix : (reported by Markus Elger) LiveStatus module did not clean previously added elements before recreating them.
UI
@@ -270,7 +270,7 @@ Shinken ChangeLog
-
+
0.6 - 03/05/2011
------------------
ENHANCEMENTS
@@ -377,7 +377,7 @@ FIXES
*Fix : testing with multisite and thruk
*Clean: factorized .is_correct() call for all object types & added log to see more clearly wherer the error is.
*Clean: factorization/simplification of code in action.py (and related) for spawning checks processes.+ clean of old deprecated commented code (& "related" too).
- *Fix : downtime and comment are now pickle in a dict, not a list.
+ *Fix : downtime and comment are now pickle in a dict, not a list.
*Fix : pickle pass for look at tyype, so downtime and comment from 0.4 still ok.
*Fix : acknoledge got too much information in the pickle pass, making the pickle save very very huge. Now fit from 100Mo to..2Mo :)
*Clean : big clean of hasattr->getattr with default value
@@ -465,8 +465,8 @@ FIXES
*Fix : From Nicolas Dupeux : error in livestatus split.
*Fix : From Nicolas Dupeux : fix typos in host code
-
-
+
+
0.3 - 06/10/2010
------------------
View
@@ -1,5 +1,5 @@
-recursive-include shinken *.*
-recursive-include shinken/webui *.*
+recursive-include shinken *.*
+recursive-include shinken/webui *.*
recursive-include etc *.cfg *.ini *.pem
recursive-include windows .bat .reg
recursive-include bin *.* *-* shinken
View
@@ -60,7 +60,7 @@ need the following Python packages.
* `pysqlite`__
__ http://pypi.python.org/pypi/simplejson/
-__ http://pypi.python.org/pypi/ujson/
+__ http://pypi.python.org/pypi/ujson/
__ http://code.google.com/p/pysqlite/
Installing/Checking Common Requirements on Windows
@@ -128,16 +128,16 @@ see install.d/README file for further information.
Update
------
-1 - grab the latest shinken archive and extract its content
+1 - grab the latest shinken archive and extract its content
2 - cd into the resulting folder
3 - backup shinken configuration plugins and addons and copy the backup id::
-
+
./install -b
4 - remove shinken (if you installed addons with the installer say no to the question about removing the addons)::
-
+
./install -u
5 - install the new version::
@@ -156,7 +156,7 @@ cd into shinken source folder and run::
Running
-------
-The install script also installs some `init.d` scripts, enables them at boot time and starts them right after the install process ends.
+The install script also installs some `init.d` scripts, enables them at boot time and starts them right after the install process ends.
View
2 THANKS
@@ -37,7 +37,7 @@ To Ronny Lindner for the bug report about non host expressions for services
To Olivier Hanesse for his bug report about fixed 60s interval in checks
To Markus Elger for this bug report about no schedule retention data
To Vincent Riquer for his bug report about HA installation and sapre broker that stay alive
-To Michael Grundmann for his bug report about service host exclusion and void hostgroup
+To Michael Grundmann for his bug report about service host exclusion and void hostgroup
To Jan Kaliszewski for his implementation of sorted dicts
To Claneys Skyne for his typo report
To Etienne Obriot for his patch about multiple = in macos values
View
@@ -41,7 +41,7 @@ LOG=$LOG$
# Please update $ETC$ instead of this one.
SHINKENCFG="$ETC/nagios.cfg"
-# We got 2 configs because tools like Centreon don't generate all
+# We got 2 configs because tools like Centreon don't generate all
# configuration (only the shinken.cfg part)
SHINKENSPECIFICCFG="$ETC/shinken-specific.cfg"
View
@@ -33,11 +33,11 @@
# - scheduler : receives checks/actions from arbiter. Schedules & forwards them to pollers.
# - poller : receives the checks from a scheduler. Launch them and returns results
# - broker : manage results by looking at scheduler. Like export to flat file or db.
-# - reactionner : manage the failed checks by looking at scheduler.
+# - reactionner : manage the failed checks by looking at scheduler.
# - receiver : manage all passive data
### END INIT INFO
-# Deadlink :(
+# Deadlink :(
# http://refspecs.freestandards.org/LSB_3.1.1/LSB-Core-generic/LSB-Core-generic/iniscrptact.html
@@ -63,7 +63,7 @@ test "$ETC" || ETC=$(cd $curpath/../../etc && pwd)
export PATH="${PATH:+$PATH:}/usr/sbin:/bin:/sbin"
export LANG=en_US.UTF8
-export PYTHONIOENCODING=utf8
+export PYTHONIOENCODING=utf8
# We try to find the LAST possible Python VERSION
pythonver() {
@@ -108,8 +108,8 @@ DEBUG=false
CMD=""
SUBMODULES=""
-## This permits to overhidde the default "default shinken cfg file" :
-[ -z "$SHINKEN_DEFAULT_FILE" ] && SHINKEN_DEFAULT_FILE="/etc/default/$NAME"
+## This permits to overhidde the default "default shinken cfg file" :
+[ -z "$SHINKEN_DEFAULT_FILE" ] && SHINKEN_DEFAULT_FILE="/etc/default/$NAME"
## so you can now do:
## bash -c "SHINKEN_DEFAULT_FILE=$your_own_default_file $init_path/shinken $action $args"
## to easily use your own config
@@ -183,7 +183,7 @@ cd $VAR
#set -xv
-
+
echo_success() {
log_end_msg 0 $*
}
@@ -356,7 +356,7 @@ do_stop() {
echo "FAILED: one or more process for $mod are still running after kill -9 !"
echo "Remaining processes are (pids="$allpids"):"
ps -lf $(for p in $allpids ; do echo -n "-p$p " ; done)
- echo "You should check this."
+ echo "You should check this."
return 1
fi
echo "OK"
@@ -388,11 +388,11 @@ do_start_() {
fi
if test "$1" = "arbiter"
then
- # arbiter is special :
+ # arbiter is special :
# it doesn't actually declare a "workdir" properties in its config
# so we have explicitely to cd to the "VAR" directory.
# so that the default pidfile ( == nagios lock_file) which is now "arbiterd.pid"
- # will be created at the correct place.
+ # will be created at the correct place.
cd "$VAR"
# TODO: check if other possibility wouldn't be better:
# declare a "workdir" properties for the arbiter module definition.. in shinken-specific.cfg.
@@ -401,9 +401,9 @@ do_start_() {
startoutput=$(do_start "$1")
rc=$?
if [ $rc -eq 0 ]; then
- echo_success
+ echo_success
else
- echo "$startoutput"
+ echo "$startoutput"
echo_failure
fi
return $rc
@@ -438,7 +438,7 @@ do_restart_() {
if [ $checkrc -ne 0 ]; then
return 1
fi
- fi
+ fi
stopoutput=$(do_stop "$mod")
startoutput=$(do_start "$mod")
rc=$?
@@ -47,4 +47,4 @@ export SHINKEN_MODULE_FILE="$NAME" ## for 'shinken' init script to see that it'
"$curdir/shinken" $@ arbiter
exit $?
-
+
@@ -53,4 +53,4 @@ export SHINKEN_MODULE_FILE="$NAME" ## for 'shinken' init script to see that it'
"$curdir/shinken" $@ broker
-exit $?
+exit $?
@@ -30,7 +30,7 @@
# Short-Description: Shinken poller daemon
# Description: Shinken is a monitoring tool and the Poller
# is one of its daemon. This one gets the configuration from the arbiter
-# His purpose is to actually do the checks ordered by the schedulers,
+# His purpose is to actually do the checks ordered by the schedulers,
# and then sends the results to the schedulers specified in the
# configuration
### END INIT INFO
@@ -53,4 +53,4 @@ export SHINKEN_MODULE_FILE="$NAME" ## for 'shinken' init script to see that it'
"$curdir/shinken" $@ receiver
-exit $?
+exit $?
View
@@ -27,7 +27,7 @@
DIR=`/usr/bin/dirname $0`
-# search for an argument -v so i konw if we want to do a config check
+# search for an argument -v so i konw if we want to do a config check
function pythonver(){
versions="2.4 2.5 2.6 2.7"
@@ -54,7 +54,7 @@ function pythonver(){
LASTFOUND=$(which python)
fi
fi
- PY=$LASTFOUND
+ PY=$LASTFOUND
}
@@ -71,15 +71,15 @@ function usage(){
echo " -s, --test-scheduling Not used "
echo " -x, --dont-verify-paths Not used"
echo " -p, --precache-objects Not used"
- echo " -u, --use-precached-objects Not used"
+ echo " -u, --use-precached-objects Not used"
echo " -d, --daemon Not used"
}
if [ -z "$1" ]
then
usage
exit 0
-fi
+fi
while getopts "v:sxpud" opt; do
echo "$opt $OPTARG"
@@ -94,7 +94,7 @@ while getopts "v:sxpud" opt; do
else
# well shinken arbiter does not act really as nagios so we need to provide at least a -c argument for configfile
$PY $DIR/shinken-arbiter.py -v -c $OPTARG
- exit $?
+ exit $?
fi
;;
s)
Oops, something went wrong.

0 comments on commit e976779

Please sign in to comment.