gentoo/alpha-quadrant
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

update shinken-2.4.3

Browse Source
This commit is contained in:
Micha Glave 2017-02-22 10:55:24 +01:00
parent d682132844
commit 512f5fe12c
4 changed files with 73 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
net-analyzer/shinken/Manifest
View File

@ -1,4 +1,4 @@
AUX shinken.confd 2002 SHA256 cbc7852564ca657fb4bfb3f38e05b0ff9778b914ee8709f6d40dbebc55aa931c SHA512 f9a459aeb7859429786c242c58616c7d4144f4de1a5266bcfaaff2fa117c9532d821ee80a910b7828cd2905839de8a09bec59102a0fe9a43daa0fdf848e8bac2 WHIRLPOOL 96601da8f8920a00acf2c3db9a37fe8debd48dea52dd05c00c5b4af999905aa6c40c70f7a6fc97afb3732819bda34b34f57e76b10501e9156e55c6898b259980 AUX shinken.confd 2192 SHA256 df19f603aac6f6a79f228e7982ad5e7b4fc47c001d2c0a3317e9aab80e31bb39 SHA512 45243de2da95a89aad2a615bde562b4dce133c1840ef1465e768c2a9165fe54893bc91dfd2769a928034ae1d82ea607dda98bd0d7d8aa444cb54c85342f971e0 WHIRLPOOL 93a26fd3e15ef5f95d13315d1e18fc0cba40678582d3e6b090063506f70cd9c8f90d15e4968fefefa5a9dc0fc5d7a6243d0e9147579101a62b1ce9969b424060
AUX shinken.initd 1518 SHA256 5e3e92b9d203446024ee2fe0b0b9cb19d1af5fbf68809a0fd5efd9420f46894e SHA512 9acd39443f25b6d1274e604987951ebd2718a31a078d11f48563bedfce8989f168c66f9aac8ed4bca1ae60d11930c4e93130f836e91b8c139e8317d8584e64f4 WHIRLPOOL d9db84aebcccc1d2753fd1f7e86ce84711eb10a5d83a2cb7d862bfbb515675800307405abb899368df77c1443ad010486358718d6a848a4120f126ce1d57027e AUX shinken.initd 1622 SHA256 22c739cb7a0e59920e0c9063a54e892b827f04d0dc1b0989c5a42c7edd395e0e SHA512 83e1d06852bfcd27c3932528b66cb800a1ea962f166af59d7b2b2278f43a8d70d12bd9c61115724db119021be7d606461f6d937518ff8737ab9d6a79bed0e216 WHIRLPOOL 800ba916f49a3ee4beb85cfa24561459915deb1f4ca3d0e473b12014cc85ab8b20ef11057478eff28da4735c1f5425e19979374a4c18f1ba80c756e74c18c345
DIST shinken-1.4.1.tar.gz 11102259 SHA256 18eaf6943e620f276aac60ed256615c95e21c35c5c525a34cf4cc3f44a863047 SHA512 828feaadaa575c5c964f676c3b40b0d018ea3400f7b940725458656834b1c0e545551ae94e563f89d50c0991d6c66f79fef243a034fc3d99d85f8ed44d4b0a25 WHIRLPOOL 7d43c80cf4e104b4c0041cec507fc5b7fa58e3650e0e18cf546f8eff69166314a1a92e7fc3d1ca55419945e0283ea60a63b04797c4ef91419521989e33b50823 DIST 2.4.3.tar.gz 7750138 SHA256 393f28c6887bcbacab597f78903e961fbc8ed63a62d486e4783f3bfe50c51400 SHA512 689fb811f480b84673c5e0958671cd04f3073dbc91d9b1eed7aa0ed52167c0ca3afd1efa66835b02620e515528cd30e0d7bca82989a2189215f6b17e7c24e439 WHIRLPOOL b6b4539a66b78ac2ee08e40af347eb1a59aaf97b64c2c93c02d3492208327612683f87dce49b36e900ee384940980fe87f2d2c20e808b76304c37f73a5b4688d
EBUILD shinken-1.4.1.ebuild 1290 SHA256 10b8cdb7d57f2a919efcc0396ca737cd5d84b5143cc6f72efc34b9d8609cea59 SHA512 27889941fe96c5826cf26d6baa12aefb19bab96df30f517e068134312cabe8a840a508339a7871e5406fa727fe7d944d94d73daa38812d6b5c3a2fb4a8eb05eb WHIRLPOOL 54b915a1b90cf513838f100a6779c3f704007d3314fc9b1adbc479483f4abd8fa3dee2102c7d691d3bd13b88a7c2c2b730a07514fa92f5984a94a720a1b1e504 EBUILD shinken-2.4.3.ebuild 1511 SHA256 633cd1d806e39bf8f4bee1eca127cd1333e75337bd824e91380041d30f89de25 SHA512 d77b2dcc954e44c3722686eeaec74e3ce216332a58c7c81542a63d99689d7374581deeb8bbc31e23a793d133bc183d1d019ea2687390b25b2fb17e2b6fff360d WHIRLPOOL 07173edf607cfdb8358229afd8c33f3eb5044cbebe8c7e806c03d917cf61e686513bd5b42802ccca22cc0734f1ebc46c061ba54664aa193c2cb525159e9d159e

21
net-analyzer/shinken/files/shinken.confd
View File

@ -1,11 +1,15 @@
# /etc/conf.d/shinken # /etc/conf.d/shinken
# location of the nagios configuration file # location of the nagios configuration file
ARBITERCFG="/etc/shinken/nagios.cfg"
SHINKENCFG="/etc/shinken/shinken.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) #configuration (only the shinken.cfg part)
SHINKENSPECIFICCFG="/etc/shinken/shinken-specific.cfg" #SHINKENSPECIFICCFG="/etc/shinken/shinken-specific.cfg"
ARBITERCFG="/etc/shinken/arbiters/arbiter-master.cfg"
# The command to launch # The command to launch
ARBITERDAEMON="/usr/bin/shinken-arbiter" ARBITERDAEMON="/usr/bin/shinken-arbiter"
@ -56,7 +60,7 @@ REACTIONNERDEBUGFILE="/var/log/shinken/reactionner-debug.log"
###BROKER PART ###BROKER PART
# location of the broker daemon configuration # location of the broker daemon configuration
BROKERCFG="/etc/shinken/brokerd.ini" BROKERCFG="/etc/shinken/daemons/brokerd.ini"
# The command to launch # The command to launch
BROKERDAEMON="/usr/bin/shinken-broker" BROKERDAEMON="/usr/bin/shinken-broker"
@ -69,7 +73,7 @@ BROKERDEBUGFILE="/var/log/shinken/broker-debug.log"
###RECEIVER PART ###RECEIVER PART
# location of the broker daemon configuration # location of the broker daemon configuration
RECEIVERCFG="/etc/shinken/receiverd.ini" RECEIVERCFG="/etc/shinken/daemons/receiverd.ini"
# The command to launch # The command to launch
RECEIVERDAEMON="/usr/bin/shinken-receiver" RECEIVERDAEMON="/usr/bin/shinken-receiver"
@ -79,7 +83,10 @@ RECEIVERPID="/var/run/shinken/receiverd.pid"
RECEIVERDEBUGFILE="/var/log/shinken/receiver-debug.log" RECEIVERDEBUGFILE="/var/log/shinken/receiver-debug.log"
# nicelevel to run nagios daemon with # nicelevel to run shinken daemon with
NICENESS=5 NICENESS=5
SHINKENSERVICES="" # user/group for the var/run rights
#SHINKENUSER=shinken
#SHINKENGROUP=shinken
#HOME=`grep ^$SHINKENUSER: /etc/passwd | cut -d: -f 6`

56
net-analyzer/shinken/files/shinken.initd
View File

@ -1,28 +1,30 @@
#!/sbin/runscript #!/sbin/openrc-run
# Copyright 1999-2011 Gentoo Foundation # Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
# $Header: $ # $Header: $
MODULE=${SVCNAME#*.} MODULE="xxMODULExx"
_MODULE=$(echo $MODULE | awk '{print toupper($0)}')
SHINKEN=${SHINKEN:-/usr/bin/shinken}
PIDPATH=${PIDPATH:-/var/run/shinken} PIDPATH=${PIDPATH:-/var/run/shinken}
PIDFILE=${PIDPATH}/${MODULE} PIDFILE=${PIDPATH}/${MODULE}
LANG=en_US.UTF8 source /etc/conf.d/shinken
SHINKENUSER=${SHINKENUSER:-shinken}
SHINKENGROUP=${SHINKENGROUP:-shinken}
export LANG=en_US.UTF8
export LC_ALL=en_US.UTF8
export PYTHONIOENCODING=utf8
export PYTHONUNBUFFERED="0"
export TZ=:/etc/localtime
# also unset http proxy, because pycurl is using it and this is bad, very bad :)
unset http_proxy
unset https_proxy
extra_commands="check" extra_commands="check"
eval DEBUGFILE="\${${_MODULE}DEBUGFILE}"
eval CONFIGFILE="\${${_MODULE}CFG}"
eval PIDFILE="\${${_MODULE}PID}"
SHINKENM="/usr/bin/shinken-${MODULE}"
if [ -r "${CONFIGFILE}" ] ; then if [ -r "${XXUMODXXCFG}" ] ; then
tmppid=`grep 'pidfile=' ${CONFIGFILE} | grep -v '#' | tail -n 1 | awk -F '=' '{print $2}'` tmppid=`grep 'pidfile=' ${XXUMODXXCFG} | grep -v '#' | tail -n 1 | awk -F '=' '{print $2}'`
PIDFILE=${tmppid:-$PIDFILE} XXUMODXXPID=${tmppid:-$XXUMODXXPID}
fi
if [ $MODULE = "arbiter" ]; then
CONFIGFILE="${CONFIGFILE} --config ${SHINKENSPECIFICCFG}"
fi fi
depend() { depend() {
@ -34,12 +36,15 @@ depend() {
start() { start() {
if [ $SVCNAME = "shinken" ]; then if [ $SVCNAME = "shinken" ]; then
ebegin "all shinken-services started" ebegin "all shinken-services started"
return 0 return 0
fi fi
ebegin "Starting shinken ${MODULE}" ebegin "Starting shinken xxMODULExx"
start-stop-daemon --start --exec ${SHINKENM} --quiet --pidfile ${PIDFILE} \
-- --config ${CONFIGFILE} --daemon ## --user ${SHINKENUSER}:${SHINKENGROUP} \
start-stop-daemon --start \
--exec /usr/bin/shinken-xxMODULExx --quiet \
--pidfile ${XXUMODXXPID} -- --config=${XXUMODXXCFG} --daemon
eend $? eend $?
} }
@ -48,15 +53,16 @@ stop() {
ebegin "all shinken-services stopped" ebegin "all shinken-services stopped"
return 0 return 0
fi fi
ebegin "Stopping shinken ${MODULE}" ebegin "Stopping shinken xxMODULExx"
start-stop-daemon --stop --exec ${SHINKENM} --quiet --pidfile ${PIDFILE} start-stop-daemon --stop --exec /usr/bin/shinken-xxMODULExx --quiet \
--pidfile ${XXUMODXXPID}
eend $? eend $?
} }
check() { check() {
"/usr/bin/shinken-arbiter" -v --config "${ARBITERCFG}" --config "${SHINKENSPECIFICCFG}" $DEBUGCMD 2>&1 /usr/bin/shinken-arbiter -v --config="${ARBITERCFG}" \
--config="${SHINKENCFG}" $DEBUGCMD 2>&1
return $? return $?
} }
# vim: filetype=gentoo-init-d sw=2 ts=2 sts=2 noet: # vim: filetype=gentoo-init-d sw=2 ts=2 sts=2 noet:

36
net-analyzer/shinken/shinken-1.4.1.ebuild → net-analyzer/shinken/shinken-2.4.3.ebuild
View File

@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation # Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/www-apps/shinken/shinken-0.12.2.ebuild,v 1.4 2011/03/15 21:34:31 xarthisius Exp $ # $Header: $
EAPI=5 EAPI=5
PYTHON_DEPEND="2:2.7" PYTHON_DEPEND="2:2.7"
@ -10,7 +10,7 @@ inherit distutils user
DESCRIPTION="Shinken is a new monitoring tool written in Python and compatible with Nagios." DESCRIPTION="Shinken is a new monitoring tool written in Python and compatible with Nagios."
HOMEPAGE="http://shinken-monitoring.org/" HOMEPAGE="http://shinken-monitoring.org/"
SRC_URI="http://shinken-monitoring.org/pub/${P}.tar.gz" SRC_URI="https://github.com/naparuba/shinken/archive/${PV}.tar.gz"
LICENSE="AGPLv3" LICENSE="AGPLv3"
SLOT="0" SLOT="0"
@ -21,9 +21,9 @@ KEYWORDS="~amd64 ~x86"
RDEPEND=" RDEPEND="
dev-python/pyro:3 dev-python/pyro:3
dev-python/pycurl dev-python/pycurl
dev-python/cherrypy
webui? ( dev-python/pymongo ) webui? ( dev-python/pymongo )
livestat? ( dev-python/simplejson livestat? ( dev-python/simplejson )
dev-python/pysqlite )
poller? ( net-analyzer/nagios-plugins ) poller? ( net-analyzer/nagios-plugins )
" "
DEPEND="${RDEPEND} DEPEND="${RDEPEND}
@ -38,15 +38,27 @@ pkg_setup() {
enewuser ${PN} -1 -1 -1 ${PN} enewuser ${PN} -1 -1 -1 ${PN}
} }
mkinitd() {
for mod in ${SHINKENMODULES}; do
if (use $mod) ; then
uMOD=$(awk '{print toupper($0)}' <<< $mod)
sed -e "s!xxMODULExx!$mod!g" \
-e "s!XXUMODXX!$uMOD!g" \
${FILESDIR}/shinken.initd > ${D}etc/init.d/shinken-$mod
fi
done
}
src_install() { src_install() {
distutils_src_install --root=${D} distutils_src_install --root=${D}
# remove windows-specific configs
rm ${D}etc/${PN}/*-windows.ini
rm ${D}etc/${PN}/*-windows.cfg
rmdir ${D}var/run/${PN}
keepdir "/var/lib/${PN}"
keepdir "/var/log/${PN}"
mv ${D}etc/default ${D}etc/conf.d rmdir ${D}var/run/${PN}
rm ${D}etc/default/shinken
newconfd "${FILESDIR}"/shinken.confd shinken
keepdir "/var/log/${PN}"
mkinitd
cp -R "${S}/etc" "${D}/etc" || die "Install failed!"
mv ${D}/etc/etc ${D}/etc/${PN}
} }