[Reconnoiter-devel] [reconnoiter commit] Reconnoiter branch, master, updated. b88ee0590c78df9adbd00f954e5a40f4e8ac3919

git at labs.omniti.com git at labs.omniti.com
Tue Apr 12 16:28:49 EDT 2011


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Reconnoiter".

The branch, master has been updated
       via  b88ee0590c78df9adbd00f954e5a40f4e8ac3919 (commit)
       via  665f9c63a3d4c7abe5b4c170ca51269ab7b4592f (commit)
       via  fed69fc77b778d1a12c5fab96e995d904e4ee5b3 (commit)
       via  f6f81cbbb2dcc8ba48b2ac27f768a5c9f4b63080 (commit)
      from  be54f17ae047da3057ed0aaef8b83a0ae58267a3 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit b88ee0590c78df9adbd00f954e5a40f4e8ac3919
Author: Thom May <thom at digital-science.com>
Date:   Tue Apr 12 20:34:02 2011 +0800

    Deploy a debian compliant crontab for stratcon

diff --git a/pkg/debian/rules b/pkg/debian/rules
index 36edb76..05e112e 100755
--- a/pkg/debian/rules
+++ b/pkg/debian/rules
@@ -37,6 +37,7 @@ binary-indep: install
 	dh_installdocs -i
 	dh_installchangelogs -i
 	dh_installinit  -i
+	dh_installcron -i
 	dh_compress -i
 	dh_fixperms -i
 	dh_installdeb -i
@@ -51,6 +52,7 @@ binary-arch: install
 	dh_installdocs -a
 	dh_installchangelogs -a
 	dh_installinit -a
+	dh_installcron -a
 	dh_makeshlibs -a
 	dh_shlibdeps -a
 	dh_compress -a
diff --git a/pkg/debian/stratcon.cron.d b/pkg/debian/stratcon.cron.d
new file mode 100644
index 0000000..9088703
--- /dev/null
+++ b/pkg/debian/stratcon.cron.d
@@ -0,0 +1,8 @@
+#rollup jobs
+* * * * * postgres /usr/bin/psql -d reconnoiter -U stratcon -c "select stratcon.rollup_metric_numeric(rollup) from metric_numeric_rollup_config order by seconds asc;" >/tmp/rollup.log 2>&1
+#cleanup jobs
+01 00 * * * postgres /usr/bin/psql -d reconnoiter -U reconnoiter -c "select stratcon.archive_part_maint('noit.metric_numeric_archive', 'whence', 'day', 7);" 1>/dev/null
+01 00 * * * postgres /usr/bin/psql -d reconnoiter -U reconnoiter -c "select stratcon.archive_part_maint('noit.metric_text_archive', 'whence', 'day', 7);" 1>/dev/null
+01 00 * * * postgres /usr/bin/psql -d reconnoiter -U reconnoiter -c "select stratcon.archive_part_maint('noit.check_status_archive', 'whence', 'day', 7);" 1>/dev/null
+01 00 * * * postgres /usr/bin/psql -d reconnoiter -U reconnoiter -c "select stratcon.archive_part_maint('noit.check_archive', 'whence', 'day', 7);" 1>/dev/null
+01 00 * * * postgres /usr/bin/psql -d reconnoiter -U reconnoiter -c "delete from prism.saved_graphs where saved = false and last_update<current_timestamp - '1 day' ::interval;" 1>/dev/null

commit 665f9c63a3d4c7abe5b4c170ca51269ab7b4592f
Author: Thom May <thom at digital-science.com>
Date:   Tue Apr 12 18:59:56 2011 +0800

    Rejig to move debian directory out of root

diff --git a/debian/changelog b/debian/changelog
deleted file mode 100644
index f93991a..0000000
--- a/debian/changelog
+++ /dev/null
@@ -1,11 +0,0 @@
-reconnoiter (0.0.1+20110204) lucid; urgency=low
-
-  * New svn snapshot
-
- -- Thom May <thom at debian.org>  Fri, 04 Feb 2011 03:03:38 -0800
-
-reconnoiter (0.0.1+20110125) lucid; urgency=low
-
-  * First upload.
-
- -- Thom May <thom at debian.org>  Tue, 25 Jan 2011 16:14:40 +0000
diff --git a/pkg/build-debian.sh b/pkg/build-debian.sh
new file mode 100755
index 0000000..a7df777
--- /dev/null
+++ b/pkg/build-debian.sh
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+set -e
+
+ln -sf pkg/debian debian
+
+dpkg-buildpackage -rfakeroot -tc
+
+rm debian
diff --git a/pkg/debian/changelog b/pkg/debian/changelog
new file mode 100644
index 0000000..5166e63
--- /dev/null
+++ b/pkg/debian/changelog
@@ -0,0 +1,17 @@
+reconnoiter (0.0.1+20110411) lucid; urgency=low
+
+  * New git snapshot
+
+ -- Thom May <thom at digital-science.com>  Mon, 11 Apr 2011 06:10:07 -0700
+
+reconnoiter (0.0.1+20110204) lucid; urgency=low
+
+  * New svn snapshot
+
+ -- Thom May <thom at debian.org>  Fri, 04 Feb 2011 03:03:38 -0800
+
+reconnoiter (0.0.1+20110125) lucid; urgency=low
+
+  * First upload.
+
+ -- Thom May <thom at debian.org>  Tue, 25 Jan 2011 16:14:40 +0000
diff --git a/debian/compat b/pkg/debian/compat
similarity index 100%
rename from debian/compat
rename to pkg/debian/compat
diff --git a/debian/control b/pkg/debian/control
similarity index 100%
rename from debian/control
rename to pkg/debian/control
diff --git a/debian/copyright b/pkg/debian/copyright
similarity index 100%
rename from debian/copyright
rename to pkg/debian/copyright
diff --git a/debian/noit.install b/pkg/debian/noit.install
similarity index 92%
rename from debian/noit.install
rename to pkg/debian/noit.install
index 327f4de..a2c924f 100644
--- a/debian/noit.install
+++ b/pkg/debian/noit.install
@@ -1,5 +1,5 @@
 etc/reconnoiter/config_templates.conf
-etc/reconnoiter/noit.conf.sample
+etc/reconnoiter/noit.conf
 usr/bin/noit-config
 usr/bin/noittrap
 usr/bin/jezebel
diff --git a/debian/noit.upstart b/pkg/debian/noit.upstart
similarity index 100%
rename from debian/noit.upstart
rename to pkg/debian/noit.upstart
diff --git a/debian/rules b/pkg/debian/rules
similarity index 82%
rename from debian/rules
rename to pkg/debian/rules
index 9d7be70..36edb76 100755
--- a/debian/rules
+++ b/pkg/debian/rules
@@ -23,6 +23,9 @@ install-stamp:
 	
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
 	-cp -a $(CURDIR)/ui/web $(CURDIR)/debian/tmp/usr/share/reconnoiter/www
+	-cp -a $(CURDIR)/debian/tmp/etc/reconnoiter/noit.conf.sample $(CURDIR)/debian/tmp/etc/reconnoiter/noit.conf 
+	-cp -a $(CURDIR)/debian/tmp/etc/reconnoiter/stratcon.conf.sample $(CURDIR)/debian/tmp/etc/reconnoiter/stratcon.conf 
+
 
 	touch $@
 	
diff --git a/debian/stratcon.install b/pkg/debian/stratcon.install
similarity index 93%
rename from debian/stratcon.install
rename to pkg/debian/stratcon.install
index 6b4a729..b658e50 100644
--- a/debian/stratcon.install
+++ b/pkg/debian/stratcon.install
@@ -1,4 +1,4 @@
-etc/reconnoiter/stratcon.conf.sample
+etc/reconnoiter/stratcon.conf
 usr/bin/run-iep.sh
 usr/sbin/stratcond
 usr/share/java/lib/activemq-all-5.2.0.jar
diff --git a/debian/stratcon.upstart b/pkg/debian/stratcon.upstart
similarity index 100%
rename from debian/stratcon.upstart
rename to pkg/debian/stratcon.upstart

commit fed69fc77b778d1a12c5fab96e995d904e4ee5b3
Author: Thom May <thom at digital-science.com>
Date:   Tue Apr 12 20:19:41 2011 +0800

    Debian packaging
    
    Not entirely standards compliant, since we ship a bunch of jars that
    probably ought to come from packages, but it works well

diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 0000000..f93991a
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,11 @@
+reconnoiter (0.0.1+20110204) lucid; urgency=low
+
+  * New svn snapshot
+
+ -- Thom May <thom at debian.org>  Fri, 04 Feb 2011 03:03:38 -0800
+
+reconnoiter (0.0.1+20110125) lucid; urgency=low
+
+  * First upload.
+
+ -- Thom May <thom at debian.org>  Tue, 25 Jan 2011 16:14:40 +0000
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..7f8f011
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+7
diff --git a/debian/control b/debian/control
new file mode 100644
index 0000000..643fb86
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,21 @@
+Source: reconnoiter
+Section: admin
+Priority: optional
+Maintainer: Thom May <thom at debian.org>
+Build-Depends: debhelper (>=4.1.16), autoconf, libtool, gettext, zlib1g-dev, uuid-dev, libpcre3-dev, libssl-dev, libpq-dev,  libxml2-dev, libxslt-dev, libapr1-dev, libaprutil1-dev, xsltproc,  libncurses5-dev, libssh2-1-dev, libsnmp-dev, libmysqlclient-dev, subversion, default-jdk, libevent-dev
+Standards-Version: 3.6.1.0
+
+Package: noit
+Architecture: any
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Recommends: uuid-runtime
+Description: Reconnoiter Scout Daemon
+ Noit is the monitoring daemon for Reconnoiter. 
+
+Package: stratcon
+Architecture: any
+Depends: ${misc:Depends}, ${shlibs:Depends}, noit (= ${source:Version})
+Recommends: postgresql, postgresql-client, rabbitmq-server, php5-pgsql
+Description: Reconnoiter Stratcon Daemon
+ Stratcon is the central management daemon for Reconnoiter. 
+
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 0000000..ea01749
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,12 @@
+This package was debianized by Thom May <thom at debian.org> on
+Tue, 25 Jan 2011 16:14:40 +0000.
+
+It was downloaded from <ftp site>
+
+Copyright:
+
+Upstream Author:
+
+License:
+
+
diff --git a/debian/noit.install b/debian/noit.install
new file mode 100644
index 0000000..327f4de
--- /dev/null
+++ b/debian/noit.install
@@ -0,0 +1,15 @@
+etc/reconnoiter/config_templates.conf
+etc/reconnoiter/noit.conf.sample
+usr/bin/noit-config
+usr/bin/noittrap
+usr/bin/jezebel
+usr/lib/noit/
+usr/sbin/noitd
+usr/share/java/jezebel.jar
+usr/share/java/lib/log4j-1.2.15.jar
+usr/share/java/lib/jetty-6.1.20.jar
+usr/share/java/lib/servlet-api-2.5-20081211.jar
+usr/share/java/lib/jetty-util-6.1.20.jar
+usr/share/java/lib/commons-cli-1.1.jar
+usr/share/java/lib/commons-logging-1.1.1.jar
+usr/share/man/man8/noitd.8
diff --git a/debian/noit.upstart b/debian/noit.upstart
new file mode 100644
index 0000000..f68d248
--- /dev/null
+++ b/debian/noit.upstart
@@ -0,0 +1,18 @@
+description "Noitd Monitoring Scout Server"
+
+start on filesystem
+stop on runlevel S
+
+respawn
+respawn limit 10 5
+expect daemon
+
+oom never
+
+pre-start script
+	test -x /usr/sbin/noitd || {stop; exit 0; }
+	test -s /etc/reconnoiter/noit.conf || {stop; exit 0; }
+end script
+
+exec /usr/sbin/noitd -c /etc/reconnoiter/noit.conf
+
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 0000000..9d7be70
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,60 @@
+#! /usr/bin/make -f 
+
+clean: 
+	dh_testdir
+	dh_clean
+	-$(MAKE) clean
+	-rm build-stamp install-stamp
+
+build: build-stamp
+
+build-stamp:
+	autoconf
+	./configure --prefix=/usr --libexecdir=/usr/lib --sysconfdir=/etc/reconnoiter --localstatedir=/var/lib/reconnoiter --datarootdir=/usr/share
+	$(MAKE)
+	touch $@
+
+install: build install-stamp
+install-stamp: 
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
+	
+	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
+	-cp -a $(CURDIR)/ui/web $(CURDIR)/debian/tmp/usr/share/reconnoiter/www
+
+	touch $@
+	
+	
+binary-indep: install
+	dh_testdir
+	dh_testroot
+	dh_install -i
+	dh_installdocs -i
+	dh_installchangelogs -i
+	dh_installinit  -i
+	dh_compress -i
+	dh_fixperms -i
+	dh_installdeb -i
+	dh_gencontrol -i
+	dh_md5sums -i
+	dh_builddeb -i
+
+binary-arch: install
+	dh_testdir
+	dh_testroot
+	dh_install -a --autodest
+	dh_installdocs -a
+	dh_installchangelogs -a
+	dh_installinit -a
+	dh_makeshlibs -a
+	dh_shlibdeps -a
+	dh_compress -a
+	dh_fixperms -a
+	dh_installdeb -a
+	dh_gencontrol -a
+	dh_md5sums -a
+	dh_builddeb -a
+
+binary: binary-arch 
diff --git a/debian/stratcon.install b/debian/stratcon.install
new file mode 100644
index 0000000..6b4a729
--- /dev/null
+++ b/debian/stratcon.install
@@ -0,0 +1,18 @@
+etc/reconnoiter/stratcon.conf.sample
+usr/bin/run-iep.sh
+usr/sbin/stratcond
+usr/share/java/lib/activemq-all-5.2.0.jar
+usr/share/java/lib/antlr-runtime-3.1.1.jar
+usr/share/java/lib/cglib-nodep-2.2.jar
+usr/share/java/lib/commons-dbcp-1.2.2.jar
+usr/share/java/lib/commons-io-1.2.jar
+usr/share/java/lib/commons-pool-1.4.jar
+usr/share/java/lib/esper-3.5.0.jar
+usr/share/java/lib/postgresql-8.3-604.jdbc3.jar
+usr/share/java/lib/rabbitmq-client.jar
+usr/share/java/lib/spring-beans-2.5.5.jar
+usr/share/java/lib/spring-context-2.5.5.jar
+usr/share/java/reconnoiter.jar
+usr/share/man/man8/stratcond.8
+usr/share/reconnoiter/
+
diff --git a/debian/stratcon.upstart b/debian/stratcon.upstart
new file mode 100644
index 0000000..13f46bc
--- /dev/null
+++ b/debian/stratcon.upstart
@@ -0,0 +1,19 @@
+
+description "Noitd Monitoring Scout Server"
+
+start on filesystem
+stop on runlevel S
+
+respawn
+respawn limit 10 5
+expect daemon
+
+oom never
+
+pre-start script
+	test -x /usr/sbin/stratcond || {stop; exit 0; }
+	test -s /etc/reconnoiter/stratcon.conf || {stop; exit 0; }
+end script
+
+exec /usr/sbin/stratcond -c /etc/reconnoiter/stratcon.conf
+

commit f6f81cbbb2dcc8ba48b2ac27f768a5c9f4b63080
Author: Thom May <thom at digital-science.com>
Date:   Tue Apr 12 20:17:31 2011 +0800

    Move java files into the datarootdir
    
    This makes controlling the installation a little more fine grained, and
    easier to make standards compliant.

diff --git a/src/java/Makefile.in b/src/java/Makefile.in
index aba107b..7bb5ffc 100644
--- a/src/java/Makefile.in
+++ b/src/java/Makefile.in
@@ -10,7 +10,7 @@ exec_prefix=@exec_prefix@
 bindir=@bindir@
 sbindir=@sbindir@
 libdir=@libdir@
-javalibdir=@prefix@/java
+javalibdir=@datarootdir@/java
 includedir=${prefix}/include
 libexecdir=@libexecdir@
 localstatedir=@localstatedir@
diff --git a/src/java/jezebel.in b/src/java/jezebel.in
index 260effa..6fb9ab2 100755
--- a/src/java/jezebel.in
+++ b/src/java/jezebel.in
@@ -8,7 +8,7 @@ if [ ! -x $JAVA ]; then
 fi
 JPARAMS="-Xms32m -Xmx64m -XX:+UseConcMarkSweepGC -XX:+UseParNewGC"
 JARS=
-DIRS="/ . lib @prefix@/java/lib @prefix@/java"
+DIRS="/ . lib @datarootdir@/java/lib @datarootdir@/java"
 LOGFILE=/dev/null
 
 for i in $*
diff --git a/src/java/run-iep.sh.in b/src/java/run-iep.sh.in
index 43261f7..b92e69b 100755
--- a/src/java/run-iep.sh.in
+++ b/src/java/run-iep.sh.in
@@ -17,7 +17,7 @@ JARS="reconnoiter.jar activemq-all-5.2.0.jar antlr-runtime-3.1.1.jar \
 	postgresql-8.3-604.jdbc3.jar rabbitmq-client.jar commons-io-1.2.jar \
 	commons-cli-1.1.jar commons-logging-1.1.1.jar"
 
-DIRS=". lib @prefix@/java/lib @prefix@/java"
+DIRS=". lib @datarootdir@/java/lib @datarootdir@/java"
 CP=
 
 for jar in $JARS

-----------------------------------------------------------------------

Summary of changes:
 pkg/build-debian.sh                       |    9 ++++
 pkg/debian/changelog                      |   17 ++++++++
 pkg/debian/compat                         |    1 +
 pkg/debian/control                        |   21 +++++++++
 pkg/debian/copyright                      |   12 +++++
 pkg/debian/noit.install                   |   15 +++++++
 pkg/debian/noit.upstart                   |   18 ++++++++
 pkg/debian/rules                          |   65 +++++++++++++++++++++++++++++
 sql/crontab => pkg/debian/stratcon.cron.d |   12 +++---
 pkg/debian/stratcon.install               |   18 ++++++++
 pkg/debian/stratcon.upstart               |   19 ++++++++
 src/java/Makefile.in                      |    2 +-
 src/java/jezebel.in                       |    2 +-
 src/java/run-iep.sh.in                    |    2 +-
 14 files changed, 204 insertions(+), 9 deletions(-)
 create mode 100755 pkg/build-debian.sh
 create mode 100644 pkg/debian/changelog
 create mode 100644 pkg/debian/compat
 create mode 100644 pkg/debian/control
 create mode 100644 pkg/debian/copyright
 create mode 100644 pkg/debian/noit.install
 create mode 100644 pkg/debian/noit.upstart
 create mode 100755 pkg/debian/rules
 copy sql/crontab => pkg/debian/stratcon.cron.d (64%)
 create mode 100644 pkg/debian/stratcon.install
 create mode 100644 pkg/debian/stratcon.upstart


hooks/post-receive
-- 
Reconnoiter


More information about the Reconnoiter-devel mailing list