Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
59 commits
Select commit Hold shift + click to select a range
3f513e9
fix sudo
Nov 23, 2015
03518a6
Fix valid data on next execution
Nov 24, 2015
07752ae
Cron check from 5 minutes to 2 minutes
Nov 24, 2015
a413597
Delete ecmanaged-ecagent-init
Nov 24, 2015
05a203a
Delete ecmanaged-ecagent-systemd
Nov 24, 2015
06da64d
Update setup.py
Nov 24, 2015
a4b5135
new debian build
Nov 30, 2015
0216232
new debian build
Nov 30, 2015
5d3d24b
add conf
arindamchoudhury Nov 30, 2015
01b4584
changed version
arindamchoudhury Nov 30, 2015
9640af4
service can be hosted on different server so dont check using which
arindamchoudhury Nov 30, 2015
804d8f6
logging
arindamchoudhury Dec 4, 2015
5676053
send roster request
arindamchoudhury Dec 7, 2015
ed40d65
keepalived refactor
Dec 11, 2015
7765443
keepalived refactor
Dec 11, 2015
7c74fba
keepalived refactor
Dec 11, 2015
485846f
minor change
Dec 11, 2015
58f2603
refactor observers
arindamchoudhury Dec 11, 2015
3e91cb7
Clean plugins
Dec 13, 2015
4de1881
timeout refactor
arindamchoudhury Dec 14, 2015
e27738f
type error
arindamchoudhury Dec 14, 2015
33263d1
enable logging
arindamchoudhury Dec 14, 2015
b5c3ad1
timeout without using time()
arindamchoudhury Dec 14, 2015
597ca2c
clean memory only in _check_memory
arindamchoudhury Dec 14, 2015
83de55b
mem clean refactored
arindamchoudhury Dec 14, 2015
117e50c
AGENT GROUPS CONFIG (configure.py --groups)
arindamchoudhury Dec 15, 2015
ec158c9
the error message in stream end in log make it look like something we…
arindamchoudhury Dec 15, 2015
52fd837
refactor timeout
arindamchoudhury Dec 16, 2015
7985a36
Merge remote-tracking branch 'origin/master'
arindamchoudhury Dec 16, 2015
2b96df4
fallback
arindamchoudhury Dec 16, 2015
e9264f5
changes for windows
arindamchoudhury Jan 4, 2016
efc6d83
fix for windows
arindamchoudhury Jan 11, 2016
cdad12f
get inode uses from df -i
arindamchoudhury Jan 13, 2016
a3c3883
inodes done
arindamchoudhury Jan 13, 2016
aef63d9
inodes code refactored
arindamchoudhury Jan 14, 2016
3384532
the percentage is -5% than what shown by df due to reserved blocks
arindamchoudhury Mar 7, 2016
fbff42b
Remove python-dbus dependency
Mar 9, 2016
e5112c2
remove python-dbus dependency from fedora rpm
arindamchoudhury Mar 9, 2016
5fa6590
retain config file while updating
arindamchoudhury Mar 9, 2016
a47d74e
retain config file while updating
arindamchoudhury Mar 9, 2016
031abc8
retain config file while updating
arindamchoudhury Mar 9, 2016
f16fca4
Update agent.py
Mar 10, 2016
f908d26
add support for configu_file_init
Mar 12, 2016
6c27385
configure.py changes
juancarlosm Mar 12, 2016
31a597e
configure.py changes
juancarlosm Mar 12, 2016
c892cc4
run as sudo
arindamchoudhury Mar 23, 2016
0aa041b
Update __base__.py
arindamchoudhury Jul 28, 2016
b9d81b3
Update plugin_monitor.py
arindamchoudhury Sep 7, 2016
2275b20
Update __helper.py
arindamchoudhury Sep 7, 2016
7783a56
Update __base__.py
arindamchoudhury Sep 9, 2016
1738a7e
Pool(20) only on windows
Sep 13, 2016
d308194
refactor get_inodes
Sep 13, 2016
93f9675
Update __mplugin.py
Sep 20, 2016
7d95ae0
Update __helper.py
Sep 20, 2016
c519675
Update init
arindamchoudhury Feb 10, 2017
6c12110
change version
arindamchoudhury Jun 23, 2017
a66c588
Merge branch 'master' of https://github.com/ecmanaged/ecm-agent
arindamchoudhury Jun 23, 2017
acbcb06
build for debian
arindamchoudhury Jun 23, 2017
8e7769f
fix identation
arindamchoudhury Jun 26, 2017
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
log
monitor/mplugin/__base__/data.json
*/*.pyc
config/ecagent.cfg
monitor/.cache/*
monitor/mplugin/__base__/.counter.dat
monitor/mplugin/__base__/.touch
Expand Down
19 changes: 19 additions & 0 deletions build/build.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# Debian

change build/debian/changelog and push to repo

sudo apt-get update

sudo apt-get upgrade

sudo apt-get install build-essential git devscripts debhelper dh-python python-all python-setuptools

git clone https://github.com/ecmanaged/ecm-agent.git

cd ecm-agent

cp -r build/debian .

rm -rf build

dpkg-buildpackage
5 changes: 5 additions & 0 deletions build/debian.old/changelog
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
ecmanaged-ecagent (3.0.0-1) stable; urgency=low

* version 3.0

-- Juan Carlos Moreno (ECMANAGED) <juancarlos.moreno@ackstorm.es> Tue, 05 May 2015 17:42:25 +0200
1 change: 1 addition & 0 deletions build/debian.old/compat
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
5
File renamed without changes.
13 changes: 13 additions & 0 deletions build/debian.old/control
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
Source: ecmanaged-ecagent
Section: admin
Priority: optional
Maintainer: Juan Carlos Moreno <juancarlos.moreno@ecmanaged.com>
Build-Depends: cdbs, debhelper (>= 7.0.50)
Standards-Version: 3.9.2
Homepage: http://www.ecmanaged.com

Package: ecmanaged-ecagent
Architecture: all
Depends: ${misc:Depends}, ${python:Depends}, lsb-base (>= 3.2-13), python, python-crypto, debconf, python-twisted-core, python-protocols, python-twisted-web, python-configobj, python-twisted-words, python-psutil, python-libxml2, python-simplejson, python-apt, python-httplib2
Description: ecmanaged-ecagent
ECM Agent - ECMANAGED Monitor and deploy agent
18 changes: 18 additions & 0 deletions build/debian.old/copyright
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=166
Upstream-Name: ecmanaged-ecagent

Files: *
Copyright: 2012 Juan Carlos Moreno <juancarlos.moreno at ecmanaged.com>
License: Apache License, Version 2.0

Licensed under the Apache License, Version 2.0 (the "License"); you may
not use this file except in compliance with the License. You may obtain
a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
License for the specific language governing permissions and limitations
under the License.
File renamed without changes.
File renamed without changes.
1 change: 1 addition & 0 deletions build/debian.old/ecmanaged-ecagent.dirs
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
opt/ecmanaged/ecagent
File renamed without changes.
10 changes: 10 additions & 0 deletions build/debian.old/postinst
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
#! /bin/bash
# postinst script for ecmanaged-ecagent
#
# see: dh_installdeb(1)

# Stop ecagent
INIT=/opt/ecmanaged/ecagent/init
if [ -x ${INIT} ]; then
${INIT} start
fi
9 changes: 5 additions & 4 deletions build/debian/prerm → build/debian.old/prerm
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,14 @@

set -e

CONF=/opt/ecmanaged/ecagent/config/ecagent.cfg
# Stop ecagent
INIT=/opt/ecmanaged/ecagent/init
if [ -x ${INIT} ]; then
${INIT} stop
fi

case "$1" in
remove)
if test ! -f "$CONF"; then
rm -f $CONF
fi
;;
upgrade|deconfigure)
;;
Expand Down
13 changes: 13 additions & 0 deletions build/debian.old/rules
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
#!/usr/bin/make -f

# Exclude git directory
export DH_ALWAYS_EXCLUDE=GIT:ecagent/.git

%:
dh $@

override_dh_fixperms:
dh_fixperms
chmod 0700 debian/ecmanaged-ecagent/opt/ecmanaged/ecagent/config
chmod 0400 debian/ecmanaged-ecagent/opt/ecmanaged/ecagent/config/ecagent.cfg
chmod 0755 debian/ecmanaged-ecagent/opt/ecmanaged/ecagent
Empty file added build/debian.old/templates
Empty file.
17 changes: 17 additions & 0 deletions build/debian/changelog
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
ecmanaged-ecagent (3.3-1) stable; urgency=low

* version 3.3

-- Juan Carlos Moreno (ECMANAGED) <juancarlos.moreno@ackstorm.es> Fri, 23 May 2017 14:48:25 +0200

ecmanaged-ecagent (3.2-2) stable; urgency=low

* version 3.2

-- Juan Carlos Moreno (ECMANAGED) <juancarlos.moreno@ackstorm.es> Tue, 05 May 2015 17:42:25 +0200

ecmanaged-ecagent (3.2-1) stable; urgency=low

* version 3.2

-- Juan Carlos Moreno (ECMANAGED) <juancarlos.moreno@ackstorm.es> Tue, 05 May 2015 17:42:25 +0200
2 changes: 1 addition & 1 deletion build/debian/compat
Original file line number Diff line number Diff line change
@@ -1 +1 @@
5
9
1 change: 0 additions & 1 deletion build/debian/conffiles

This file was deleted.

12 changes: 6 additions & 6 deletions build/debian/control
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
Source: ecmanaged-ecagent
Maintainer: Arindam Choudhury <arindam@live.com>
Section: admin
Priority: optional
Maintainer: Juan Carlos Moreno <juancarlos.moreno@ecmanaged.com>
Build-Depends: cdbs, debhelper (>= 7.0.50)
Standards-Version: 3.9.2
Build-Depends: dh-python, python (>= 2.6.6-3), debhelper (>= 9)
Standards-Version: 3.9.6
Homepage: http://www.ecmanaged.com

Package: ecmanaged-ecagent
Architecture: all
Depends: ${misc:Depends}, ${python:Depends}, lsb-base (>= 3.2-13), python, python-crypto, debconf, python-twisted-core, python-protocols, python-twisted-web, python-configobj, python-twisted-words, python-psutil, python-libxml2, python-simplejson, python-apt, python-httplib2
Description: ecmanaged-ecagent
ECM Agent - ECMANAGED Monitor and deploy agent
Depends: ${misc:Depends}, ${python:Depends}, lsb-base (>= 3.2-13), python, python-crypto, debconf, python-twisted-core, python-protocols, python-twisted-web, python-configobj, python-twisted-words, python-psutil, python-libxml2, python-simplejson, python-httplib2, sudo
Description: ECM Agent - ECMANAGED Monitor and deploy agent
Deploy and monitor agent for ECmanaged cloud management tool, based on XMPP protocol.
55 changes: 41 additions & 14 deletions build/debian/copyright
Original file line number Diff line number Diff line change
@@ -1,18 +1,45 @@
Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=166
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: ecmanaged-ecagent
Upstream-Contact: Juan Carlos Moreno <juancarlos.moreno@ecmanaged.com>
Source: http://www.ecmanaged.com

Files: *
Copyright: 2012 Juan Carlos Moreno <juancarlos.moreno at ecmanaged.com>
License: Apache License, Version 2.0
Copyright: 2012, ACKSTORM, S.L. All rights reserved.
License: GPL-3+
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or (at
your option) any later version.
.
In addition, as a special exception, the copyright holders give
permission to link the code of portions of this program with the
OpenSSL library under certain conditions as described in each
individual source file, and distribute linked combinations including
the two.
.
You must obey the GNU General Public License in all respects for all
of the code used other than OpenSSL. If you modify file(s) with this
exception, you may extend this exception to your version of the
file(s), but you are not obligated to do so. If you do not wish to do
so, delete this exception statement from your version. If you delete
this exception statement from all source files in the program, then
also delete it here.
.
This program is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
.
On Debian GNU/Linux systems, the complete text of the GNU General
Public License (GPL) version 3 can be found at
/usr/share/common-licenses/GPL-3.

Licensed under the Apache License, Version 2.0 (the "License"); you may
not use this file except in compliance with the License. You may obtain
a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
License for the specific language governing permissions and limitations
under the License.
Files: debian/*
Copyright: 2010-2012, ACK STORM, S.L. <ackstorm@ackstorm.es>
License: GPL-3+
On Debian GNU/Linux systems, the complete text of the GNU General
Public License (GPL) version 3 can be found at
/usr/share/common-licenses/GPL-3
2 changes: 0 additions & 2 deletions build/debian/ecmanaged-ecagent.dirs

This file was deleted.

124 changes: 0 additions & 124 deletions build/debian/ecmanaged-ecagent.init

This file was deleted.

19 changes: 15 additions & 4 deletions build/debian/postinst
Original file line number Diff line number Diff line change
@@ -1,5 +1,16 @@
#! /bin/bash
# postinst script for ecmanaged-ecagent
#
# see: dh_installdeb(1)
#!/bin/sh

set -e

if getent passwd ecmanaged >/dev/null 2>&1; then
chown -R ecmanaged:ecmanaged /opt/ecmanaged
mkdir -p /etc/ecmanaged
chown -R ecmanaged:ecmanaged /etc/ecmanaged
fi

case "$1" in
configure)
if [ -f /opt/ecmanaged/ecagent/init ]; then
/opt/ecmanaged/ecagent/init start > /dev/null 2>&1
fi
esac
File renamed without changes.
22 changes: 10 additions & 12 deletions build/debian/rules
Original file line number Diff line number Diff line change
@@ -1,17 +1,15 @@
#!/usr/bin/make -f

# Exclude git directory
export DH_ALWAYS_EXCLUDE=GIT:ecagent/.git

DH_VERBOSE = 1
export DH_OPTIONS=-v
# This file was automatically generated by stdeb 0.8.2 at
# Thu, 30 Jul 2015 08:59:04 +0000
export PYBUILD_NAME=ecmanaged-ecagent
%:
dh $@
dh $@ --with python2 --buildsystem=pybuild

override_dh_auto_install:
python setup.py install --root=debian/ecmanaged-ecagent --install-layout=deb --no-compile

override_dh_installinit:
dh_installinit --init-script=ecagentd -- "start 90 2 3 4 5 . stop 10 0 1 6 ."
override_dh_auto_build:

override_dh_fixperms:
dh_fixperms
chmod 0700 debian/ecmanaged-ecagent/opt/ecmanaged/ecagent/config
chmod 0400 debian/ecmanaged-ecagent/opt/ecmanaged/ecagent/config/ecagent.cfg
chmod 0755 debian/ecmanaged-ecagent/opt/ecmanaged/ecagent

Loading