137 Commits

Author SHA1 Message Date
Jenkins
a34fca750f Merge "Load pipeline config files from /etc/ceilometer/ firstly" 2017-03-10 03:15:08 +00:00
liusheng
1078d2e59c Load pipeline config files from /etc/ceilometer/ firstly
We have moved the pipeline config files from etc/ceilometer/ to
ceilometer/pipeline/data/, but ceilometer don't support to load pipeline
config file from /etc/ceilometer/ and only support to load these config
files from the source code path. This is not user-friendly.

Change-Id: Iedebf6b05e123c94eb7bd200f64beb09382c3969
Closes-Bug: #1670238
2017-03-06 16:24:37 +08:00
Mehdi Abaakouk
7905ff3a30 Don't run ceilometer-upgrade on unconfigured db
When the database backend is unconfigured, we currently
try to connection to nothing, and due to the retry logic around
the database connection, the user experience is "ceilometer-upgrade is
stuck".

This change keeps the database upgrade is the database is not
configured. And don't use the connection retry logic for upgrade.

Change-Id: I3fa2a332ecac6cb52c145f437f79b2aba43a4757
2017-03-04 10:02:12 +01:00
Jenkins
bb9d962868 Merge "Deprecate event_dispatchers and meter_dispatchers options" 2017-03-01 15:57:46 +00:00
liusheng
8296d48138 Using Panko as publisher than dispatcher if enabled
Change-Id: I2a5ced0d7a06ef68b6c149c35bc1df1116fe70a0
2017-02-27 14:04:21 +08:00
Hanxi Liu
d9c11bb0ab Ship YAML file to /usr/share
Ship YAML files except for polling.yaml to /usr/share
so that users can update on upgrade.

Change-Id: I642a5f70d940e3e463d58d4a67fb02a5ff415404
2017-02-20 19:29:13 +08:00
liusheng
a1c9b80715 Deprecate event_dispatchers and meter_dispatchers options
These two config options only be used in collector service, see[1], Since
we have deprecated collector service and won't install collector service
in devstack defaultly, these two options will be silently ignored.
Instead, we need to config dispachers by publishers configuration in
pipeline.yaml and event_pipeline.yaml.

[1]
https://github.com/openstack/ceilometer/blob/master/ceilometer/collector.py#L67

Change-Id: I5bbf8f3d11defb2afefddbc756447a8e691c157a
2017-02-20 17:25:25 +08:00
Jenkins
891aa33194 Merge "cleanup devstack cache initialisation" 2017-02-18 14:17:37 +00:00
gord chung
e44ff4da48 cleanup devstack cache initialisation
devstack has issues setting multiple value options. it does not
know how to replace properly and ends up just replacing everything.
just delete all previous options if they exist to avoid unexpected
residual values.

Change-Id: I1cb1e4fdddfb9ec7dac321b9e70f688c575a7775
2017-02-09 22:30:17 +00:00
Hanxi Liu
11191a4612 Deprecate collector
To optimise performance, We have to update ceilometer architecture.
The most important step is to deprecate collector. From now on, we
can configure multiple publishers in pipeline for pushing data to
internal or external system.

Highlight using multiple dispatchers.

Change pipeline publisher and disable ceilometer-collector by default.

Co-Authored-By: gordon chung <gord@live.ca>
Change-Id: I25a6e0b9221844adb4412f1829d9e290b6e198a3
2017-02-09 10:24:43 +08:00
gord chung
8999528092 polling definition file
add support for polling specific definition file.
this splits the existing polling specific options out of
pipeline.yaml as transformations only exists on notifcation agent
and polling interval/discovery only exists on polling agents.

backward compatibility is maintained so pipeline.yaml file from
previous releases can still be passed in as polling definition file.

Change-Id: I206566349f98d6b17336cd5ea36ceb1e304dd90c
2017-02-01 01:39:56 +00:00
Roman Podoliaka
226fdab31a devstack: make sure it's possible to deploy panko only
Since Ie4c6329f7b3d1b4686555f7eea0525649d4b31f6 it's not possible to
deploy Ceilometer without backend, but with panko-api enabled, which
is a valid use case.

Split the if statement into two to make sure we do not execute the
else clause and die early.

Change-Id: Icfafc7bccd7b923707483d903bc5338921d14097
2017-01-24 17:21:45 +02:00
gord chung
6eab130464 set panko dispatcher if enabled
clear any existing on start since devstack doesn't know how to properly
iniset a single option of multiopt

Change-Id: Ie4c6329f7b3d1b4686555f7eea0525649d4b31f6
2017-01-23 14:31:33 +00:00
Mehdi Abaakouk
13aeba410b switch instance_discovery to libvirt_metadata
Since Gnocchi is the recommended backend, and other are deprecated.
We can switch instance_discovery to the libvirt_metadata.

Change-Id: Ib846b87bfb76c359fdec28d6cd258781fd201348
2017-01-16 17:35:12 +01:00
Mehdi Abaakouk
49aac3d607 fix the gnocchi resource type upgrade
This fixes the upgrade code to return -1 on exception,
and the volume updates dict.

Change-Id: I3eb2f718428082d4c637cf0f13d503737cfcf1cb
2017-01-10 10:37:13 +01:00
Jenkins
0c4ff9f912 Merge "Don't poll nova with compute agent" 2017-01-09 17:51:13 +00:00
Mehdi Abaakouk
b692d3a6a6 Don't poll nova with compute agent
This change introduces a new method to get instances
metadata on the ceilometer-compute-agent.

This switches devstack/gate to libvirt_metadata for gnocchi

Change-Id: Ice1918659be49589a45d7a406044adc0a187aa27
2017-01-09 15:41:37 +00:00
Julien Danjou
8d23f431ab Remove events storage and API
This now has been moved to Panko.

Change-Id: I179eb0d436752e3bb8abaed714664cf74f5615e6
2017-01-06 16:33:53 +01:00
Mehdi Abaakouk
407b726fc2 upgrade: fix gnocchi resource update
This fix the gnocchi upgrade code.

Also it makes devstack fail if the upgrade don't work.

Change-Id: I658adf71fb997b63daeb2a56d9a6303103ef446d
2017-01-05 09:41:10 +01:00
gord chung
49a6d6de37 always create ceilometer user
the ceilometer user is used for polling and sending to gnocchi. it
is not related to api

Change-Id: Ic0120431674a1b300adcd514464b4474b7cc9f16
2016-12-20 19:03:09 +00:00
Jenkins
e5f117b24a Merge "cleanup gnocchiclient" 2016-12-13 16:09:09 +00:00
zhangyanxian
1e581f3c29 Fix typo in plugin.sh
TrivialFix: "vitualenv" should be "virtualenv"
Change-Id: Id2fd7392ea0cebd55b4317da91aaeff1aabc6df3
2016-12-07 07:04:52 +00:00
Jenkins
0eccf068d5 Merge "devstack: allow to configure not backend" 2016-12-01 21:26:11 +00:00
gord chung
43ec7637cf cleanup gnocchiclient
we don't support url for since mitaka. it is discovered via keystone

Change-Id: Ic7ef35bf208e2a8a1c8fe3c54f8c23abd0c5c50e
2016-11-30 16:57:15 +00:00
Mehdi Abaakouk
995f93df36 devstack: allow to configure not backend
This change allows to configure ceilometer with no backend. For example
if we want to use only panko.

This also change the default backend to this one since mysql is not
recommanded.

Change-Id: Ie85d7fa5476fc68a0a867072517191ae6ed7aad7
2016-11-04 14:09:18 +00:00
xialinjuan
f7f9f836b9 Add more verbosity for gnocchi_resources.yaml
For gnocchi_resource.yaml, make it have the same behavior like
we have for notification-meters defined in meters.yaml.

Make it fallback to some default gnocchi_resources.yaml file exactly
like we do for meters.yaml.

Closes-Bug: #1542184
Change-Id: I19814c5be02871419cca8035ced3d22a0feaacbc
2016-11-02 16:12:11 +00:00
gord chung
75a11f4eab enable caching
we need to explicitly turn on caching

see: ea191cacb14818989564ffe1f3727f28be3c3a21

Change-Id: I02306629a9abe278590719fdc5a081aaccd4ca70
Closes-Bug: #1633590
2016-10-17 16:15:56 +00:00
Julien Danjou
3e95cc12fd Remove pecan_debug option
There's no need to have this option exposed to users.

Change-Id: Ie4a3dd2466542f198564e40d5834a906019f3f63
2016-10-12 19:07:36 +02:00
Julien Danjou
8902dd1027 collector: do not set any dispatcher by default
This changes remove database as the default dispatcher so we stop
shipping a default that we don't recommend.

Change-Id: Idf2f171c4dabbee78308b0fbabeeaa541b782b66
2016-10-04 17:46:38 +02:00
Xiang Li
580c2a234b Modify startup parameters of ceilometer-api in devstack script
Since the ceilometer-api binary was generated by pbr, its startup
parameters are different from previous. The difference must be
applied to devstack plugin script or ceilometer-api can’t start
after devstack has run if the "enable_httpd_mod_wsgi_services" is
set to false in local.conf.

Change-Id: Ie1aa11cc167251ca750041b3333e1c9c31227ad1
Closes-Bug: #1626531
2016-09-27 14:01:32 +00:00
Julien Danjou
a1fae3f1c0 gnocchi: enable event_dispatcher in devstack and doc
Change-Id: I38296daea516a57d4eb2ec905d271bdd8b9fb047
2016-09-14 16:58:38 +02:00
Julien Danjou
7f8f6cccd6 Remove store_events options
The current option is misnamed, as it does not enable any storing but
just the processing of events from the notification agent to the
collector.

This means that even if you set event_dispatchers=panko and forget to
set store_events=true, nothing will happen.

This patch enable the event processing as soon as something is
configured in the pipeline.

Change-Id: I5a906684f6371b0548ac08cacc13aa238f780f78
2016-09-13 11:29:19 +02:00
Mehdi Abaakouk
9709608bb1 gnocchi: Create resource-types on upgrades
Change-Id: Ibc7ce7daf598a5d5702655d50e116cefcc8267bc
2016-09-06 15:33:33 +02:00
Mehdi Abaakouk
18c181f0b3 Rename ceilometer-dbsync in ceilometer-upgrade
Change-Id: I9adcc6c2180bae1d0e17a7d03fe2df9fca096487
2016-09-05 10:07:02 +02:00
Jenkins
09e92e68d0 Merge "devstack: allow ceilometer-api and keystone to run on different hosts" 2016-07-06 04:20:34 +00:00
Julien Danjou
c8538776d4 devstack: prefix _drop_database
This avoids any possible conflict with another function named the same.

Change-Id: Ib3ad175d1150e54676f0f0ea7381ec96cf5e8ab4
2016-06-30 15:48:55 +02:00
ZhiQiang Fan
cd2e0418c7 devstack: disable workload_partition for compute polling
I7adef87b03129f4f8b38109bf547c7403cc6adad introduces a very good
feature to partition workload for central polling agent, but it
seems not so much value for compute polling agent, which is
natrually workload distributed. There are efforts to reduce the
load of nova-api by adding instance cache in compute polling
agent side, if we increase the compute polling process in the
same node, pollsters may be a bit quicker than before, but things
will get worse for nova-api. And if we want to accelerate the
pollsters, we can search for a better solution instead of increasing
state shared workers.

For most case, I cannot see there is a need to partition workload
on a single node, especially when we running a devstack.

This patch removes the workload_partition setting in devstack
installation for compute polling agent even when there is a
coordinate backend configured. If an user does want this, he can
edit the /etc/ceilometer/ceilometer.conf and restart the compute
polling agent in screen -x, as the usual way.

Change-Id: If4dbcf1d02f5f8bdc189b272fb350a800e23d760
2016-06-30 07:08:15 +00:00
Julien Danjou
913880bafb devstack: do not wait for service to start
There's no reason to wait for ceilometer-api to start, as everything
should be resilient anyway.

(and currently that breaks the gate)

Change-Id: I3c381a43bb7ddc5f873d60bb13e27bc029ccca10
2016-06-28 16:16:30 +02:00
Julien Danjou
f3817aa027 devstack: remove useless policy_file setting
Change-Id: I55643425e3d6070dee0e947bc234bfc6326d1c82
2016-05-02 22:43:19 +02:00
ZhiQiang Fan
54887ff59e [Trivial] Remove CEILOMETER_API_LOG_DIR option for devstack
This option is used for ceilometer-api when
CEILOMETER_USE_MOD_WSGI=False, and create a dedicate directory for
ceilometer-api log.

However, there is no such need, because for such case, ceilometer-api
is just a normal process like ceilometer-polling. We should let
oslo.log decide where to store the log, image that user configures
a path and we override in installation process, then he needs to hack
into screenrc to adjust the path, it is not friendly.

Here I propose to put the api log files in same directory as
ceilometer-polling, by default, it will be /opt/stack/logs.

Change-Id: Icca16dbef53929686950a72b40b2544f45f4afdd
2016-04-28 01:43:53 +08:00
Drew Thorstensen
4c491b52e2 Disable ceilometer-aipmi by default for devstack
Due to change https://review.openstack.org/#/c/295011/ the
ceiloemter-polling --polling-namespaces ipmi polling agent no
longer works by default.  This change set updates Ceilometer's
devstack plugin to disable that for standard stacks.

Change-Id: If445953e7ce2090632fe428c0ddd03f9cc6dedc6
Closes-Bug: 1564176
2016-03-31 22:22:04 +00:00
Lianhao Lu
59f90f5194 devstack: allow ceilometer-api and keystone to run on different hosts
User now can specify CEILOMETER_SERVICE_HOST to a different host so
ceilometer-api and keystone can run on different machines. Also create
keystone accounts in post-config phase, by following gnocchi convention.

Change-Id: Ide55f9e07d4d94e900a3596922da4c40eca8ec3c
2016-03-23 05:56:01 +00:00
Lianhao Lu
49a204e41a Devstack: install coordination backend for compute agent
Since compute agent now supports coordination, we need to install
the corresponding backend too.

Change-Id: I680a25ba089504e62930f61615f5a509480fe432
2016-03-23 03:29:30 +00:00
Jenkins
001d706b5c Merge "clean devstack plugin" 2016-03-21 19:25:02 +00:00
ZhiQiang Fan
337cd3c41b remove SERVICE_TENANT_NAME from devstack plugin
Previously we have to set this option to enable Aodh integration test
because there is circle dependency, but now since Aodh can parse
SERVICE_PROJECT_NAME properly, this is safe to remove.

Change-Id: I014ec7d62edfcc433b84e9237a63e37c427747ec
2016-03-19 04:23:52 +08:00
ZhiQiang Fan
7cae72527e clean devstack plugin
* remove verbose option: it is deprecated and True is its default value
* change [DEFAULT]notification_topics to [oslo_messaging_notifications]topics,
  the old style is deprecated
* remove uncleaned ceilometer-alarm-evaluator condition

Change-Id: If2d0592612c389e08826717fdf38d2e0086cec38
2016-03-17 08:55:54 +08:00
liusheng
8d7def1f7a Change the SERVICE_TENANT_NAME to SERVICE_PROJECT_NAME
The intergation test job has been broken, it seems because the replace
TENANT => PROJECT change in devstack scrpts, see[1]. This patch change the
SERVICE_TENANT_NAME to SERVICE_PROJECT_NAME in devstack plugin.

And to avoid with aodh change, this change temporarily skip the
gabbits-live test.

[1] https://review.openstack.org/#/c/281779/

Closes-Bug: #1548634
Change-Id: Ibb1f78d47311117f6718707c5961bc2841473924
2016-02-23 19:40:10 +08:00
Jenkins
7259b77565 Merge "KEYSTONE_CATALOG_BACKEND is deprecated" 2016-02-11 12:10:34 +00:00
gordon chung
7b23b3f185 KEYSTONE_CATALOG_BACKEND is deprecated
this removes it
see: http://lists.openstack.org/pipermail/openstack-dev/2016-February/086272.htm

Change-Id: Ic1ba628e00db114b4e2b219d094ab7db7e6e622b
2016-02-10 17:31:26 -05:00
Mehdi Abaakouk
b7d2c8eb43 devstack: Fix Keystone v3 configuration typo
When Keystone v3 is enabled, 'default' is the id, not the name,
of the domain created by devstack.

Change-Id: I244db7023cb3215dc6fe26d783c6338c8391a0f4
2016-02-10 10:14:03 +01:00