The change of I9ba984f804aecee5b63e5a86e699733040dee245 enables
us to specify os-user-id in CLI, but it shadows the user-id when
creating sample and alarm, this patch fixes it as what we've done
for project-id.

Change-Id: Ic3ce5dc8e1aea49b3e41fe495be4921fbf85ea5a
ref-change: I0ce2416dccd61eb50584799e6df0b8c45d44cdda
(cherry picked from commit f72dc0c38951c898fc139cee6446ef0f125fde10)

After we port to oslo-incubator.apiclient, the project_id can no
longer be specified for alarm-{,threhsold,combination}-{create,update}
and sample-create, this is because client.AuthPlugin registers a CLI
argument named --os-project-id which will shadow the project-id
argument.

Since os-project-id is used for Keystone V3 API, we should not
remove it from AuthPlugin, so this patch moves the dest of project_id
to {alarm,sample}_project_id, and adds a decorator to restore shadowed
project_id field when we call v2 client.

Change-Id: I0ce2416dccd61eb50584799e6df0b8c45d44cdda
Closes-Bug: #1393489
(cherry picked from commit 0c23c62cef6f1388d26c04d6cf0e74153db0a0b5)

Since https://review.openstack.org/#/c/163462/ and
https://review.openstack.org/#/c/162649/4 in gnocchi, all kind of aggregations
have been moved in the same URI namespace (/v1/aggregation/...)
and we can use complex query to make aggregation across multiples metrics.

This change sync the ceilometerclient alarm shell to match these
changes.

Change-Id: I5717a4604af5505dfb8c56463e2bdb86c59e41ce
(cherry picked from commit db48aa28b169fa8df01020d54a20e644c9a0b7df)

Patchset I67152c636526dad3ec27e06058ff73ad969ae2b9 broke the sample-show
and sample-create when introducing the new sample API support. This
patch fixes those.

Change-Id: I3e36df61cf672b44c376c4a18dc808d565315bf6
Closes-Bug: #1421040

Change-Id: Id1c6832c2db32c5cce0e31cd0022a86508630a7e

Now, the alarm rules are extendable with stevedore in ceilometer API,
so we should not enforce the list of supported alarm rule.

This change does that.

Change-Id: I06067bdd02cf88f6fd4cd060bdfa310ded504e65