17 Commits

Author SHA1 Message Date
Jenkins
2fc2bfb42e Merge "polling: remove deprecated agents" 2015-09-08 20:05:06 +00:00
Julien Danjou
43e07a393d polling: remove deprecated agents
We have deprecated the agents for a while now in favor of the
ceilometer-polling tool, let's update the doc for good and remove them.

Depends-On: I4a2a982d4153a31971a5f1a1b504b96ce29236f9
Change-Id: I7447ba4f408c95b0acf1b809504ce16fff1c6e21
2015-09-07 10:20:29 +02:00
Chris Dent
f24d1f43cc Sync devstack plugin with devstack:lib/ceilometer
This removes the cp of the meters.yaml file to /etc/ceilometer. It
is not needed.

This is part of a regular process of keeping the plugin and the
devstack version functionally equivalent until the devstack version
finally goes away.

Change-Id: I1261f054f077b73d3d64529ca9c59678ecbf15de
2015-09-03 09:25:20 +01:00
Chris Dent
788a8341db Create conf directory during devstack install phase
Otherwise other plugins which depend on ceilometer and want to set
configuration items may have issues with the configuration directory not
being there.

Change-Id: Id8d10c9fcdd85e2840a74dcff5245b6f44f7424b
2015-08-26 10:21:33 +00:00
Jenkins
6978e301b3 Merge "Revert "Remove version from os_auth_url in service_credentials"" 2015-08-14 12:19:29 +00:00
Chris Dent
055ebb9d21 Revert "Remove version from os_auth_url in service_credentials"
This reverts commit 33f133ab0cd37da5366769603ece67877505e7c9.

Apparently the way keystone info is used in aodh is different from how
ceilometer uses it. With the change to be reverted in place, none of the
agents can talk to services.

Change-Id: I462f7c4977f14e45069e2c826abd7944252bd9d9
2015-08-14 10:18:47 +00:00
Jenkins
56416fec25 Merge "Grenade plugin using devstack plugin for ceilometer" 2015-08-13 15:37:27 +00:00
Chris Dent
33f133ab0c Remove version from os_auth_url in service_credentials
In these modern times it appears to be redundant, confusing, and
inflexible.

Change-Id: Ice84fc6042e7ee344f86ac675c5f833f9984db8c
2015-08-13 10:33:59 +00:00
Chris Dent
c71c5ddf43 Grenade plugin using devstack plugin for ceilometer
This is barebones for now, simply doing the upgrade and checking
services are still running. There is no checking of resources.
Being able to easily add those resources checks is part of the
reason for making this change.

The other reason is to explore and resolve conflicts when extracting
an existing integrated project from both devstack and grenade.

Note that grenade's ensure_services_started and _stopped struggles to
work with processes that contain spaces so distinguishing amongst
ceilometer-polling processes with different namespaces is hard, so
we'll just use the older agent names.

Change-Id: If7bb809743ab0c475a1844c79e552d8b6892a18f
2015-08-12 21:24:20 +00:00
Pradeep Kilambi
94b3d40cea Enable entry points for new declarative meters
Include the new entry point for meters notifications
and deprecate the migrated ones. Also add the exchange
controls to the notification agent directly.

As a first step, this commit converts glance, magnetodb
and orchestration meters.

Partially Implements: blueprint declarative-notifications

Depends-On: I9de94c5ac6349c3b46adbacb77fc877b5201285c

Change-Id: I45ea9ab20bbed1ec12b91a20977e8adb52bf59da
2015-08-07 08:28:00 +00:00
Chris Dent
7b2376068f Sync devstack plugin with devstack:lib/ceilometer
While the removal of ceilometer from core devstack is still pending
we need to make sure that change in lib/ceilometer are reflected in
the plugin. This synchronizes the small number of recent changes.
We're nearly there on the extractions so there shouldn't be too much
more of this.

Change-Id: I8c99d57ba5183d3c63b4814ca0664d5bf3420832
2015-08-06 09:27:32 +00:00
Mehdi Abaakouk
2f3d9a8c55 Move gnocchi resources definition in yaml file
Transformation of samples to gnocchi resources/metrics is
just json2json think, so do it in a declarative ways like we do
for event and declarative notification.

Implements blueprint gnocchi-declarative-resources

Change-Id: I5a202c30614d06821063e243d4e2330736aba5fd
2015-07-21 16:05:44 +02:00
Jenkins
527e7b4783 Merge "Store and restore the xtrace option in devstack plugin" 2015-07-17 20:06:47 +00:00
Chris Dent
6d7c7cb00a Store and restore the xtrace option in devstack plugin
Otherwise we might upset the xtrace setting in other files.

Change-Id: I93e7654fb67f455d3cbedb1e6cd010651d8d67dd
2015-07-16 13:17:06 +00:00
Chris Dent
33de8f9904 Delay the start of the collector until after apache restart
Otherwise when using the gnocchi plugin keystone can drop out of
sight at exactly the wrong time.

Change-Id: If0d5faaadd297cbb6c25dd66da07e83a4bce71bd
2015-07-15 17:02:09 +00:00
Chris Dent
8f00ad5eff Namespace functions in devstack plugin
Otherwise there can be collisions with other plugins.

Also change how mongodb is installed, slightly, to insure that it is
actually running. Otherwise calls to drop database during the
cleanup function can fail because mongo is not actually there.

Change-Id: Id6ecb21614f7091e522d99bcadd3b5e237dd6723
2015-07-10 13:41:24 +00:00
Chris Dent
db92d31f16 Create a devstack plugin for ceilometer
This is mostly a straight port of devstack:lib/ceilometer with some
minor cleanups in the code. Notable changes include:

* default values are moved to devstack/settings
* all services provided by ceilometer are turned on by default, use
  disable_service to turn them off
* mongod smallfiles is no longer used as it is not (apparently) used
  with deb-based installs and there's a lot of water under the
  bridge since then, so let's remove the complexity
* config handling is broken down into smaller sub-functions
* explicitly require python redis driver if needed, otherwise it
  will not be available in a virtualenv
* install_ceilometermiddleware is not included, it is moved to
  lib/swift

Change-Id: If36faa72b8c8d0f58a4ab5d02ed9cf92de3583b7
2015-06-29 09:38:53 +00:00