--- /dev/null
+In order to configure both the agents and collector you have to put notification_topics 'notifications,glance_notifications'
+in your /etc/nova/nova.conf.
--- /dev/null
+usr/bin/ceilometer-agent-central
--- /dev/null
+#!/bin/sh -e
+
+if [ "$1" = purge ]; then
+ update-rc.d ceilometer-agent-central remove
+fi
+
+#DEBHELPER#
--- /dev/null
+description "ceilometer-agent-compute"
+author "Chuck Short <zulcss@ubuntu.com>"
+
+start on runlevel [2345]
+stop on runlelvel [!2345]
+
+chdir /var/run
+
+pre-start script
+ mkdir -p /var/run/ceilometer
+ chown ceilometer:ceilometer /var/run/ceilometer
+
+ mkdir -p /var/lock/ceilometer
+ chown ceilometer:ceilometer /var/lock/ceilometer
+end script
+
+exec start-stop-daemon --start --chuid ceilometer --exec /usr/bin/ceilometer-agent-central
--- /dev/null
+usr/bin/ceilometer-agent-compute
--- /dev/null
+#!/bin/sh -e
+
+if [ "$1" = purge ]; then
+ update-rc.d ceilometer-agent-compute remove
+fi
+
+#DEBHELPER#
--- /dev/null
+description "ceilometer-agent-compute"
+author "Chuck Short <zulcss@ubuntu.com>"
+
+start on runlevel [2345]
+stop on runlelvel [!2345]
+
+chdir /var/run
+
+pre-start script
+ mkdir -p /var/run/ceilometer
+ chown ceilometer:ceilometer /var/run/ceilometer
+
+ mkdir -p /var/lock/ceilometer
+ chown ceilometer:ceilometer /var/lock/ceilometer
+end script
+
+exec start-stop-daemon --start --chuid ceilometer --exec /usr/bin/ceilometer-agent-compute
--- /dev/null
+usr/bin/ceilometer-api
--- /dev/null
+#!/bin/sh -e
+
+if [ "$1" = purge ]; then
+ update-rc.d ceilometer-api remove
+fi
+
+#DEBHELPER#
--- /dev/null
+description "ceilometer-agent-compute"
+author "Chuck Short <zulcss@ubuntu.com>"
+
+start on runlevel [2345]
+stop on runlelvel [016]
+
+chdir /var/run
+
+pre-start script
+ mkdir -p /var/run/ceilometer
+ chown ceilometer:ceilometer /var/run/ceilometer
+
+ mkdir -p /var/lock/ceilometer
+ chown ceilometer:ceilometer /var/lock/ceilometer
+end script
+
+exec start-stop-daemon --start --chuid ceilometer --exec /usr/bin/ceilometer-api -- --log-dir=/var/log/ceilometer
--- /dev/null
+usr/bin/ceilometer-collector
--- /dev/null
+#!/bin/sh -e
+
+if [ "$1" = purge ]; then
+ update-rc.d ceilometer-collector remove
+fi
+
+#DEBHELPER#
--- /dev/null
+description "ceilometer-agent-compute"
+author "Chuck Short <zulcss@ubuntu.com>"
+
+start on runlevel [2345]
+stop on runlelvel [!2345]
+
+chdir /var/run
+
+pre-start script
+ mkdir -p /var/run/ceilometer
+ chown ceilometer:ceilometer /var/run/ceilometer
+
+ mkdir -p /var/lock/ceilometer
+ chown ceilometer:ceilometer /var/lock/ceilometer
+end script
+
+exec start-stop-daemon --start --chuid ceilometer --exec /usr/bin/ceilometer-collector
--- /dev/null
+etc/ceilometer
+var/lib/ceilometer
+var/log/ceilometer
--- /dev/null
+tools/show_data.py usr/share/doc/ceilometer
+etc/ceilometer/ceilometer.conf etc/ceilometer
+etc/ceilometer/policy.json etc/ceilometer
+etc/ceilometer/sources.json etc/ceilometer
+etc/ceilometer/pipeline.yaml etc/ceilometer
+usr/bin/ceilometer-dbsync
--- /dev/null
+#!/bin/sh -e
+
+if [ "$1" = "configure" ]; then
+ if ! getent group ceilometer > /dev/null 2>&1; then
+ addgroup --system ceilometer >/dev/null
+ fi
+
+ if ! getent passwd ceilometer > /dev/null 2>&1; then
+ adduser --system --home /var/lib/ceilometer --ingroup ceilometer --no-create-home --shell /bin/false ceilometer
+ fi
+
+ chown -R ceilometer:adm /var/log/ceilometer
+ chmod 0750 /var/log/ceilometer
+ chown -R ceilometer:ceilometer /var/lib/ceilometer /etc/ceilometer
+
+ su -s /bin/sh -c '/usr/bin/ceilometer-dbsync' ceilometer
+
+ if [ -e /var/lib/ceilometer/ceilometer.sqlite ]; then
+ chown ceilometer:ceilometer /var/lib/ceilometer/ceilometer.sqlite
+ chmod 0600 /var/lib/ceilometer/ceilometer.sqlite
+ fi
+fi
+#DEBHELPER#
--- /dev/null
+ceilometer (2013.1-0ubuntu1~cloud0) precise-grizzly; urgency=low
+
+ * New upstream release for the Ubuntu Cloud Archive.
+
+ -- Chuck Short <zulcss@ubuntu.com> Mon, 08 Apr 2013 07:50:35 -0500
+
+ceilometer (2013.1-0ubuntu1) raring; urgency=low
+
+ * New upstream release.
+
+ -- Chuck Short <zulcss@ubuntu.com> Fri, 05 Apr 2013 14:34:37 -0500
+
+ceilometer (2013.1~rc1-0ubuntu1) raring; urgency=low
+
+ [ Chuck Short ]
+ * New upstream release.
+ * debian/watch: point to the right releases.
+ * debian/rules: Enable testsuite.
+ * debian/ceilometer-agent-compute.postinst: Add smarts to
+ configure users after install.
+ * debian/ceilometer-common.postinst: Configure ceilometer db.
+ * debian/ceilometer-common.install: Install configuration files.
+ * debian/*.upstart: Update and use start-stop-daemon.
+
+ [ James Page ]
+ * Added watch file.
+ * d/rules: Fixup test suite execution as much as possible:
+ - Set PYTHONPATH to CURDIR during execution.
+ - Provide HOME directory for keystone tests.
+ - Override clean to tidy up after execution.
+ * d/control: Tidied BD's:
+ - Drop python-ming (not the right ming).
+ - python-oslo-config -> python-oslo.config.
+ - Dropped misc other surplus/duplicate dependencies.
+ - Wrapped and sorted.
+ * d/p/request-dep.patch: Remove upper bound on python-requests inline with
+ the rest of OpenStack.
+ * d/p/remove-hbase-support.patch: Remove happybase dependency.
+ * d/control: Bumped Standards-Version, no changes.
+
+ [ Yolanda Robla ]
+ * d/rules: Copy ceilometer.conf.sample to ceilometer.conf.
+ * d/ceilometer-common.install: Install ceilometer.conf and ceilometer-dbsync.
+ * d/ceilometer-common.postinst: fixing user/group creation.
+ * d/*.upstart: Fix upstart jobs.
+ * d/pydist-overrides: Correct pymongo and wsme package names.
+ * d/control: modified mongodb recommends to suggests (LP: #1131627).
+ * d/files: copying pipeline.yaml.
+ * d/control: fixed typo (LP: #1140309).
+ * d/patches/default-dbconnection-sqlite.patch: default db to sqlite
+
+ -- Chuck Short <zulcss@ubuntu.com> Tue, 26 Mar 2013 11:23:03 -0500
+
+ceilometer (0.1-0ubuntu2) raring; urgency=low
+
+ * Fix typo in debian/control (ceioleter -> ceilometer) (LP: #1140309)
+
+ -- Hans Joachim Desserud <ubuntu@desserud.org> Sun, 03 Mar 2013 20:08:39 +0100
+
+ceilometer (0.1-0ubuntu1) quantal; urgency=low
+
+ * New upstream release.
+
+ -- Chuck Short <zulcss@ubuntu.com> Fri, 12 Oct 2012 09:34:05 -0500
+
+ceilometer (0~20121002-0ubuntu2) quantal; urgency=low
+
+ * Fix two typos in dependencies in debian/control (LP: #1063244)
+
+ -- Adam Conrad <adconrad@ubuntu.com> Sun, 07 Oct 2012 07:49:55 -0600
+
+ceilometer (0~20121002-0ubuntu1) quantal; urgency=low
+
+ * Initial release.
+
+ -- Chuck Short <zulcss@ubuntu.com> Wed, 03 Oct 2012 13:00:29 -0500
--- /dev/null
+Source: ceilometer
+Section: python
+Priority: optional
+Maintainer: Chuck Short <zulcss@ubuntu.com>
+Build-Depends:
+ debhelper (>= 8.0.0),
+ python-all (>= 2.6),
+ python-nose,
+ python-anyjson (>= 0.2.4),
+ python-argparse,
+ python-babel (>= 0.9.6),
+ python-coverage,
+ python-docutils,
+ python-eventlet,
+ python-extras,
+ python-flask (>= 0.9),
+ python-glanceclient,
+ python-iso8601,
+ python-keystoneclient (<< 1:0.3),
+ python-kombu,
+ python-lockfile,
+ python-lxml,
+ python-migrate,
+ python-mock,
+ python-mox,
+ python-netaddr,
+ python-netifaces,
+ python-novaclient (>= 2.6.10),
+ python-oslo.config,
+ python-pecan (>= 0.2.0),
+ python-pymongo (>= 2.2),
+ python-requests,
+ python-setuptools-git (>= 0.4),
+ python-sphinx,
+ python-sqlalchemy,
+ python-stevedore (>= 0.6),
+ python-swift,
+ python-swiftclient,
+ python-unittest2,
+ python-webob (>= 1.2),
+ python-wsme (>= 0.5b1),
+ python-yaml
+Standards-Version: 3.9.4
+
+Package: python-ceilometer
+Architecture: all
+Depends: ${misc:Depends}, ${python:Depends}
+Description: ceilometer python libraries
+ Ceilometer aims to deliver a unique point of contact for billing systems to
+ aquire all counters they need to establish customer billing, accross all
+ current and future OpenStack components. The delivery of counters must
+ be tracable and auditable, the counters must be easily extensible to support
+ new projects, and agents doing data collections should be
+ independent of the overall system.
+ .
+ (A ceilometer is an instrument that measures cloud coverage.)
+ .
+ This package contains the python libraries that are needed for all parts
+ of ceilometer
+
+Package: ceilometer-common
+Architecture: all
+Depends:
+ adduser,
+ python-ceilometer (= ${binary:Version}),
+ ${misc:Depends},
+ ${python:Depends}
+Provides: ${python:Provides}
+Description: ceilometer common files
+ Ceilometer aims to deliver a unique point of contact for billing systems to
+ aquire all counters they need to establish customer billing, accross all
+ current and future OpenStack components. The delivery of counters must
+ be tracable and auditable, the counters must be easily extensible to support
+ new projects, and agents doing data collections should be
+ independent of the overall system.
+ .
+ (A ceilometer is an instrument that measures cloud coverage.)
+ .
+ This package contains files that are needed for all parts of ceilometer
+
+Package: ceilometer-collector
+Architecture: all
+Depends:
+ ceilometer-common (= ${binary:Version}),
+ ${misc:Depends},
+ ${python:Depends}
+Suggests: mongodb
+Description: ceilometer collector service
+ Ceilometer aims to deliver a unique point of contact for billing systems to
+ aquire all counters they need to establish customer billing, accross all
+ current and future OpenStack components. The delivery of counters must
+ be tracable and auditable, the counters must be easily extensible to support
+ new projects, and agents doing data collections should be
+ independent of the overall system.
+ .
+ (A ceilometer is an instrument that measures cloud coverage.)
+ .
+ This package contains the collector service
+
+Package: ceilometer-api
+Architecture: all
+Depends:
+ ceilometer-common (= ${binary:Version}),
+ ${misc:Depends},
+ ${python:Depends}
+Suggests: mongodb
+Description: ceilometer api service
+ Ceilometer aims to deliver a unique point of contact for billing systems to
+ aquire all counters they need to establish customer billing, accross all
+ current and future OpenStack components. The delivery of counters must
+ be tracable and auditable, the counters must be easily extensible to support
+ new projects, and agents doing data collections should be
+ independent of the overall system.
+ .
+ This package contains the api service
+
+Package: ceilometer-agent-compute
+Architecture: all
+Depends:
+ ceilometer-common (= ${binary:Version}),
+ ${misc:Depends},
+ ${python:Depends}
+Description: ceilometer compute agent
+ Ceilometer aims to deliver a unique point of contact for billing systems to
+ aquire all counters they need to establish customer billing, accross all
+ current and future OpenStack components. The delivery of counters must
+ be tracable and auditable, the counters must be easily extensible to support
+ new projects, and agents doing data collections should be
+ independent of the overall system.
+ .
+ (A ceilometer is an instrument that measures cloud coverage.)
+ .
+ This package contains the compute agent
+
+Package: ceilometer-agent-central
+Architecture: all
+Depends:
+ ceilometer-common (= ${binary:Version}),
+ ${misc:Depends},
+ ${python:Depends}
+Description: ceilometer central agent
+ Ceilometer aims to deliver a unique point of contact for billing systems to
+ aquire all counters they need to establish customer billing, accross all
+ current and future OpenStack components. The delivery of counters must
+ be tracable and auditable, the counters must be easily extensible to support
+ new projects, and agents doing data collections should be
+ independent of the overall system.
+ .
+ (A ceilometer is an instrument that measures cloud coverage.)
+ .
+ This package contains the central agent.
--- /dev/null
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: ceilometer
+Source: https://github.com/stackforge/ceilometer
+
+Files: *
+Copyright: 2012 New Dream Network, LLC (DreamHost)
+ 2012 eNovance
+ 2012 Red Hat Inc.
+ 2010 United States Government
+ 2011 Cloudscaling Group, Inc
+ 2011 OpenStack LLC.
+ 2012 Nicolas Barcet for Canonical
+License: Apache-2
+ 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.
+ .
+ On Debian-based systems the full text of the Apache version 2.0 license
+ can be found in `/usr/share/common-licenses/Apache-2.0'.
+
+Files: debian/*
+Copyright: 2012 Canonical Ltd
+License: Apache-2
+ 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.
+ .
+ On Debian-based systems the full text of the Apache version 2.0 license
+ can be found in `/usr/share/common-licenses/Apache-2.0'.
+
--- /dev/null
+--- a/etc/ceilometer/ceilometer.conf.sample
++++ b/etc/ceilometer/ceilometer.conf.sample
+@@ -262,7 +262,7 @@
+
+ ######## defined in ceilometer.storage ########
+
+-# database_connection=mongodb://localhost:27017/ceilometer
++database_connection=sqlite:////var/lib/ceilometer/ceilometer.sqlite
+ #### (StrOpt) Database connection string
+
+
--- /dev/null
+Description: Drop unpackaged happybase from dependencies
+ This avoids breaking stevedore extensions via endpoints.
+Author: James Page <james.page@ubuntu.com>
+Forwarded: not-needed
+
+--- a/tools/pip-requires
++++ b/tools/pip-requires
+@@ -20,4 +20,3 @@ extras
+ wsme>=0.5b1
+ pyyaml
+ oslo.config>=1.1.0
+-happybase>=0.4
--- /dev/null
+Description: Remove upper bound on requests
+Author: James Page <james.page@ubuntu.com>
+Forwarded: no
+
+--- a/tools/pip-requires
++++ b/tools/pip-requires
+@@ -15,7 +15,7 @@ python-novaclient>=2.6.10
+ python-keystoneclient>=0.2.3
+ python-swiftclient
+ lxml
+-requests<1.0
++requests
+ extras
+ wsme>=0.5b1
+ pyyaml
--- /dev/null
+remove-hbase-support.patch
+requests-dep.patch
+default-dbconnection-sqlite.patch
--- /dev/null
+pymongo python-pymongo
--- /dev/null
+usr/lib/python*/dist-packages/*
--- /dev/null
+#!/usr/bin/make -f
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+export HOME="$(CURDIR)/debian/test"
+
+%:
+ dh $@ --with python2
+
+get-orig-source:
+ uscan --verbose --force-download --rename --destdir=../build-area
+
+ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
+override_dh_auto_test:
+ mkdir -p ${HOME}
+ PYTHONPATH=$(CURDIR) nosetests || true
+endif
+
+override_dh_install:
+ cp etc/ceilometer/ceilometer.conf.sample etc/ceilometer/ceilometer.conf
+ dh_install
+
+override_dh_auto_clean:
+ rm -f etc/ceilometer/ceilometer.conf
+ rm -f ${HOME}
+ dh_auto_clean
--- /dev/null
+3.0 (quilt)
--- /dev/null
+version=3
+opts="uversionmangle=s/\.([a-zA-Z])/~$1/;s/%7E/~/" \
+ https://launchpad.net/ceilometer/+download https://launchpad.net/ceilometer/.*/.*/.*/ceilometer-(.*)\.tar\.gz
Code Review / openstack-build / ceilometer-build.git / commitdiff