Updated for functional agent .deb (initial push)
This commit is contained in:
parent
932aee781d
commit
9df381b272
|
@ -12,6 +12,6 @@ Package: mon-agent
|
|||
Priority: extra
|
||||
Section: default
|
||||
Architecture: all
|
||||
Depends: python (>= 2.6), python-tornado (>= 2.3), supervisor (>= 3.0), adduser, sysstat, python-pexpect
|
||||
Depends: python (>= 2.6), python-tornado (>= 2.3), supervisor (>= 3.0), adduser, sysstat, python-pexpect, python-requests (>= 0.8.2)
|
||||
Description: Monitoring Agent
|
||||
Used to send metrics from the host system to a centralized collection point.
|
||||
|
|
|
@ -1 +1,3 @@
|
|||
etc/mon-agent/supervisor.conf etc/mon-agent
|
||||
monagent/conf.d/*.example etc/mon-agent/conf.d
|
||||
monagent/checks.d/*.py etc/mon-agent/checks.d
|
||||
|
|
|
@ -48,7 +48,7 @@ check_status() {
|
|||
grep $NAME |
|
||||
grep -c RUNNING)
|
||||
supervisor_config_programs=$(grep -v pup $SUPERVISOR_FILE |
|
||||
grep -c '\[program:')
|
||||
grep -c '^\[program:')
|
||||
|
||||
if [ "$datadog_supervisor_processes" -ne "$supervisor_config_programs" ]; then
|
||||
echo "$supervisor_processes"
|
||||
|
|
|
@ -7,13 +7,20 @@ case "$1" in
|
|||
update-rc.d mon-agent defaults
|
||||
adduser --system mon-agent --disabled-login --shell /bin/sh --no-create-home --quiet
|
||||
usermod -d /usr/share/datadog/agent mon-agent
|
||||
mkdir -p /var/log/mon-agent
|
||||
[ ! -e /usr/bin/mon-agent ] && ln -s /usr/share/pyshared/monagent/agent.py /usr/bin/mon-agent
|
||||
[ ! -e /etc/mon-agent/config.py ] && ln -s /usr/share/pyshared/monagent/config.py /etc/mon-agent/config.py
|
||||
[ ! -e /usr/bin/dogstatsd ] && ln -s /usr/share/pyshared/tests/test_dogstatsd.py /usr/bin/dogstatsd
|
||||
[ ! -d /etc/dd-agent ] && ln -s /etc/monagent /etc/dd-agent
|
||||
chmod +x /usr/share/pyshared/monagent/agent.py
|
||||
chmod +x /usr/share/pyshared/tests/test_dogstatsd.py
|
||||
chown root:root /etc/init.d/mon-agent
|
||||
chown -R mon-agent:root /etc/mon-agent
|
||||
chown -R mon-agent:root /var/log/mon-agent
|
||||
chown -R root:root /usr/share/pyshared/monagent/
|
||||
chown -h root:root /usr/bin/dogstatsd
|
||||
chown -h root:root /usr/bin/mon-agent
|
||||
chown -h root:root /usr/bin/dd-forwarder
|
||||
# chown -h root:root /usr/bin/dd-forwarder
|
||||
|
||||
set +e
|
||||
|
||||
|
|
|
@ -4,6 +4,10 @@ set -e
|
|||
if [ "$1" = purge ]; then
|
||||
update-rc.d mon-agent remove
|
||||
deluser mon-agent
|
||||
[ -h /usr/bin/mon-agent ] && rm /usr/bin/mon-agent
|
||||
[ -h /etc/mon-agent/config.py ] && rm /etc/mon-agent/config.py
|
||||
[ -h /usr/bin/dogstatsd ] && rm /usr/bin/dogstatsd
|
||||
|
||||
fi
|
||||
|
||||
exit 0
|
||||
|
|
|
@ -27,31 +27,32 @@ startsecs=2
|
|||
user=mon-agent
|
||||
environment=LC_ALL=POSIX,PYTHONPATH='/usr/share/datadog/agent/checks/libs:$PYTHONPATH'
|
||||
|
||||
[program:forwarder]
|
||||
command=/usr/bin/dd-forwarder
|
||||
stdout_logfile=NONE
|
||||
stderr_logfile=NONE
|
||||
startsecs=3
|
||||
priority=998
|
||||
user=mon-agent
|
||||
#[program:forwarder]
|
||||
#command=/usr/bin/dd-forwarder
|
||||
#stdout_logfile=NONE
|
||||
#stderr_logfile=NONE
|
||||
#startsecs=3
|
||||
#priority=998
|
||||
#user=mon-agent
|
||||
|
||||
[program:dogstatsd]
|
||||
command=/usr/bin/dogstatsd --use-local-forwarder
|
||||
stdout_logfile=NONE
|
||||
stderr_logfile=NONE
|
||||
startsecs=3
|
||||
priority=998
|
||||
user=mon-agent
|
||||
#[program:dogstatsd]
|
||||
#command=/usr/bin/dogstatsd --use-local-forwarder
|
||||
#stdout_logfile=NONE
|
||||
#stderr_logfile=NONE
|
||||
#startsecs=3
|
||||
#priority=998
|
||||
#user=mon-agent
|
||||
|
||||
[program:pup]
|
||||
command=python /usr/share/datadog/agent/pup/pup.py
|
||||
stdout_logfile=NONE
|
||||
stderr_logfile=NONE
|
||||
startsecs=1
|
||||
priority=998
|
||||
user=dd-agent
|
||||
exitcodes=0
|
||||
environment=PYTHONPATH="/usr/share/datadog/agent:$PYTHONPATH",
|
||||
#[program:pup]
|
||||
#command=python /usr/share/datadog/agent/pup/pup.py
|
||||
#stdout_logfile=NONE
|
||||
#stderr_logfile=NONE
|
||||
#startsecs=1
|
||||
#priority=998
|
||||
#user=dd-agent
|
||||
#exitcodes=0
|
||||
#environment=PYTHONPATH="/usr/share/datadog/agent:$PYTHONPATH",
|
||||
|
||||
[group:mon-agent]
|
||||
programs=forwarder,collector,dogstatsd,pup
|
||||
#programs=forwarder,collector,dogstatsd,pup
|
||||
programs=collector
|
||||
|
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
2
setup.py
2
setup.py
|
@ -4,7 +4,7 @@ setup(
|
|||
name="Monitoring Agent",
|
||||
version="0.1",
|
||||
packages=find_packages(),
|
||||
install_requires = [ 'python-memcache', 'python-yaml', 'python-simplejson', 'python-psutil'],
|
||||
install_requires = [ 'python-memcache', 'python-yaml', 'python-simplejson', 'python-psutil', 'python-tornado' ],
|
||||
entry_points={
|
||||
'console_scripts': [
|
||||
'monagent = monagent.agent:main'
|
||||
|
|
Loading…
Reference in New Issue