summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Uncap library requirements for liberty"1.2.0Jenkins2015-04-172-5/+5
|\
| * Uncap library requirements for libertyDoug Hellmann2015-04-162-5/+5
| | | | | | | | | | Change-Id: Ia4add1c625074586380e756699dbdc0c820aed54 Depends-On: Ib948b756b8e6ca47a4c9c44c48031e54b7386a06
* | Merge "print user friendly error message for alarm update time constraints"Jenkins2015-04-162-2/+20
|\ \ | |/ |/|
| * print user friendly error message for alarm update time constraintsZhiQiang Fan2015-04-022-2/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, if we update an alarm with wrong time constraint which doesn't get name defined, then the shell only prints a very simple string 'name'. This is because our code assume name field has always been specified, however it is not true, then KeyError exception will be raised but not handled well, finally user only gets an implicit message. This patch uses dict.get() for name field, and sends request (may be broken) to ceilometer api, then extracts error message from response. Change-Id: I086c4ec790acc22767ba7f5e43dbcf73f3af5dff Closes-Bug: #1439207
* | Merge "Add CLI for Capabilities REST API"1.1.0Jenkins2015-04-165-0/+145
|\ \
| * | Add CLI for Capabilities REST APIZhiQiang Fan2015-04-045-0/+145
| |/ | | | | | | | | | | Implements blueprint capability-cli Change-Id: I23fe9c0bc9c27e04e3e0133fc84da7cf1f87321f
* | Add timeout for keystoneclient sessionZhiQiang Fan2015-04-143-3/+29
| | | | | | | | | | | | | | | | | | | | | | Currently, we only apply timeout on ceilometer api, but not on keystone api as well, this is not consistent. Keystone api may be slow, or worse, stuck, then ceilometerclient will not return timely. This issue has caused availability problem in our environment when ceilometer alarm service has been running for a long time. Change-Id: I0d5f82ff9cf4132a1de2f0b649908483326e116e Closes-Bug: #1436249
* | add region_name to auth plugin parametersZhiQiang Fan2015-04-142-0/+3
| | | | | | | | | | | | | | | | | | If endpoint is not specified, then auth plugin will request to keystone to get target endpoint, however, we don't provide region name for it, this will cause critical issue in multiple region scenario. Change-Id: I99ceafec25072988435018ca1affbd778ca9b22f Closes-Bug: #1439553
* | Merge "ceilometerclient insecure argument no longer works"Jenkins2015-04-142-1/+12
|\ \
| * | ceilometerclient insecure argument no longer worksMatthew Edmonds2015-04-072-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | The os_insecure argument needs to be parsed and passed to the auth plugin for non-shell usage. Change-Id: Id45a680396a9b646b273d971a0f6c274e95019a6 Closes-Bug: #1438750
* | | Merge "fix client docstring"Jenkins2015-04-093-6/+2
|\ \ \ | |/ / |/| |
| * | fix client docstringZhiQiang Fan2015-04-063-6/+2
| |/ | | | | | | | | | | | | | | | | * fix broken docstring in ceilometerclient.client * remove non-existent `release` index * remove duplicated reference generation in ext/gen_ref.py Change-Id: Iad8c527e61628a406d5dd84adac875190b994fac Closes-Bug: #1440629
* | ceilometerclient fails with keystone v3 authMatthew Edmonds2015-03-311-0/+2
|/ | | | | | | | | | When attempting to use keystone v3 Password authentication, ceilometerclient is failing to pass the project information to keystoneclient, which results in an unscoped token that lacks the service catalog. Change-Id: I980ba19f4b6b85ffc54d044184970c4902e62af4 Closes-Bug: #1438753
* Merge "alarm: Use new gnocchi aggregation API"Jenkins2015-03-251-15/+82
|\
| * alarm: Use new gnocchi aggregation APIMehdi Abaakouk2015-03-131-15/+82
| | | | | | | | | | | | | | | | | | | | | | | | 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
* | Merge "Set auth_plugin in __init__"Jenkins2015-03-232-1/+8
|\ \
| * | Set auth_plugin in __init__Chris Dent2015-03-202-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | This avoids auth_plugin being undefined when calling self.get_base_parser without self.main having been called. Closes-Bug: #1434264 Change-Id: Ic3a898ccecb865ff4e88d82538bcb04001d623db
* | | Updated from global requirementsOpenStack Proposal Bot2015-03-212-6/+6
|/ / | | | | | | Change-Id: Ie7a2a85a653b9d2cbe76b27f0d3ca119af10cef9
* | Merge "support specify user-id when create sample and alarm"Jenkins2015-03-202-14/+31
|\ \
| * | support specify user-id when create sample and alarmZhiQiang Fan2015-03-202-14/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Merge "Add a post_test_hook for gate-run functional tests"Jenkins2015-03-201-0/+50
|\ \ \
| * | | Add a post_test_hook for gate-run functional testsChris Dent2015-03-181-0/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This does the necessary to gather up the results and publish them properly for the gate job. Based on similar changes done for python-novaclient. Change-Id: Ib1f63aed9425fc8418fb9ddfe32f2d53f4b7c2b2
* | | | Merge "Add cli functional tests from tempest"Jenkins2015-03-205-0/+76
|\ \ \ \ | |/ / / | | / / | |/ / |/| |
| * | Add cli functional tests from tempestChris Dent2015-03-165-0/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | test_readonly_ceilometer is migrated from ./tempest/cli/simple_read_only/telemetry A new 'functional' target is available in tox. In order for these tests to pass OS_PASSWORD, OS_AUTH_URL, OS_USERNAME and OS_TENANT_NAME need to be set in the environment before running the tests, e.g: source src/devstack/openrc demo demo && tox -efunctional Subsequent patches will remove tests from tempest and add thes tests to project-config for gate checks. Change-Id: I3ce5ddbe471d70e8775ec5a1cc908a95a335b5e7
* | | add in missing optionsgordon chung2015-03-191-1/+2
|/ / | | | | | | | | | | we missed a few options. this cleans up list. Change-Id: I9ba984f804aecee5b63e5a86e699733040dee245
* | Merge "Move unit tests into their own subdirectory"Jenkins2015-03-1628-24/+24
|\ \
| * | Move unit tests into their own subdirectoryChris Dent2015-03-1328-24/+24
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | This is in preparation of moving functional tests currently in tempest in-tree. No surprises in this change: * move files * update the local imports Same number of tests run, all still pass. Change-Id: Ibfeac44421c5f36740b1377868f5ec469b2893f5
* | Merge "Add a py34 target for tox"Jenkins2015-03-131-1/+1
|\ \ | |/ |/|
| * Add a py34 target for toxChris Dent2015-03-121-1/+1
| | | | | | | | | | | | | | This helps signal that yes you can (and perhaps should) test this code in Python 3 Change-Id: Ie8facad164a89f631ea849f483fb7a71351f5af2
* | Merge "Fixes bug with Client function not setting up SSL params"Jenkins2015-03-132-34/+44
|\ \ | |/ |/|
| * Fixes bug with Client function not setting up SSL paramsSrinivas Sakhamuri2015-03-122-34/+44
| | | | | | | | | | | | | | | | | | | | There are instances where some applications (heat, rally) instantiate ceilometer client using Client function (instead of get_client) which doesn't use the insecure and verify params properly. This fix will address that. Change-Id: I2f6346496e6ee36b5cd97ec6d9a732431532ff96 Closes-Bug: #1428370
* | Updated from global requirementsOpenStack Proposal Bot2015-03-111-1/+1
| | | | | | | | Change-Id: I5e77ff3c499a610748c86832366e403f85be0b4f
* | Merge "Support unicode for alarm"Jenkins2015-03-112-7/+14
|\ \ | |/ |/|
| * Support unicode for alarmZhiQiang Fan2015-02-062-7/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | We're using ceilometer.common.utils.print_dict() for displaying alarm, but assume only contain ascii characters, which will cause UnicodeEncodeError when alarm's name or description has unicode characters. The oslo-incubator.cliutils.print_dict() is more friendly to unicode, but it has no sort option, and has different line wrap strategy. Since the upstream improvement can be low progress, this patch adds unicode support based on current code. Change-Id: Ia58d5813c6f80cb8b44bf7636e1efc0cdd6e6d5b Closes-Bug: #1412300
* | Enable specified project_id in CLI commandsZhiQiang Fan2015-02-252-8/+84
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | Merge "Corrected the errors in sample-show and sample-create"1.0.13Jenkins2015-02-152-5/+9
|\ \
| * | Corrected the errors in sample-show and sample-createLianhao Lu2015-02-122-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Updated from global requirementsOpenStack Proposal Bot2015-02-131-1/+1
|/ / | | | | | | Change-Id: I87ca9c60ba1d636b2a136bedaaac70ad6de7b290
* | Merge "Allow create/update gnocchi alarm rule"Jenkins2015-02-091-0/+146
|\ \
| * | Allow create/update gnocchi alarm ruleMehdi Abaakouk2015-02-061-0/+146
| | | | | | | | | | | | Change-Id: Id1c6832c2db32c5cce0e31cd0022a86508630a7e
* | | Merge "Don't enforce a kind of alarm rules"Jenkins2015-02-091-4/+4
|\ \ \ | |/ / | | / | |/ |/|
| * Don't enforce a kind of alarm rulesMehdi Abaakouk2015-02-061-4/+4
| | | | | | | | | | | | | | | | | | 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
* | Merge "Update get_client() parameters with correct variable names"Jenkins2015-02-051-1/+1
|\ \
| * | Update get_client() parameters with correct variable namesJake Yip2015-02-051-1/+1
| | | | | | | | | | | | Change-Id: I750527b36f768160ae50249464268d479f58d59a
* | | Merge "add --no-traits for event-list"Jenkins2015-02-052-6/+60
|\ \ \
| * | | add --no-traits for event-listZhiQiang Fan2015-02-052-6/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently we print traits list for each event when run event-list command, but that is a lot of information. After system run for a few days, the event-list command prints so much that it is not convenient to know the whole event-list even with less command. This patch adds a simple argument called --no-traits, it is False by default, event-list will not print traits if this argument is specified. Since this argument is boolean type, no need to assign a value, if it is specified, then it is actived. Change-Id: Ib69209fef5967a18f094f2d4665fa189e4ca3e6a
* | | | Merge "Add Sample API support"Jenkins2015-02-057-73/+338
|\ \ \ \ | |_|/ / |/| | |
| * | | Add Sample API supportZhiQiang Fan2015-02-057-73/+338
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | Sample API has been implemented in Ceilometer for a long time, but CLI is lack of such support, this patch implements Sample CLI. Implements blueprint cli-samples-api Change-Id: I67152c636526dad3ec27e06058ff73ad969ae2b9 DocImpact
* | | Merge "Remove trailing space before , in the help string of --time-constraint"Jenkins2015-02-051-1/+1
|\ \ \
| * | | Remove trailing space before , in the help string of --time-constraintChristian Berendt2015-01-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of 'with a cron expression , whereas its duration' it should be 'with a cron expression, whereas its duration'. Change-Id: Id545045dd4b25b5cbd2d79933851adab4963dada