summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Updated from global requirementskilo-eolstable/kiloOpenStack Proposal Bot2016-02-061-1/+1
| | | | Change-Id: Ib98d0a1e4245ce404d1e26c76ebd6bc482105846
* Updated from global requirements1.1.2OpenStack Proposal Bot2015-11-171-1/+1
| | | | Change-Id: Iba7f9008799dace8d6594d6d35d0049071c5ebec
* Fix to disable meter-links on resource-list CLIRohit Jaiswal2015-11-063-1/+51
| | | | | | | | | | | | | | This adds an optional param to resource-list CLI to disable meter-links. By default its False to generate meter links for backward compatibility. This is a cherry-pick from master patch that enables meter-links on resource-list CLI. Change-Id: I308b94c8a57833cf30b4815ecec2ff9a50e91af6 Closes-Bug: #1508708 (cherry picked from commit e4a62a20b1d072969e842c38b2885a46a20fc54c)
* Updated from global requirementsOpenStack Proposal Bot2015-09-171-1/+1
| | | | Change-Id: I06c9cd54f56750ea01912ad973af682a68baae6d
* do not generate meter links on resource-list1.1.1gordon chung2015-09-152-6/+7
| | | | | | | | | | meter links are not accessible via resource_list and add significant overhead to query. we shouldn't generate these anymore. this patch is slightly different from master as this does not disable meter_links by default to maintain existing functionality. Change-Id: Ib20f410a70171aa09e4ebbbb748a5ce495fc6a43 Closes-Bug: #1493400
* Updated from global requirementsOpenStack Proposal Bot2015-07-231-1/+1
| | | | Change-Id: I34a4530a495b6d323a74f0fcdd5e1eaeb98dd6dd
* Updated from global requirementsOpenStack Proposal Bot2015-07-133-14/+13
| | | | Change-Id: Iefd21a4d65ea8a92d16867a167bb5e0cf3bab810
* Fix alarm-evaluator can't start when ssl was enabledLan Qi song2015-05-131-3/+3
| | | | | | Change-Id: I8cd3f3c7e745107ad4e0cbed7ebdd247a34fbbbd Closes-Bug: #1453061 (cherry picked from commit ed8408c61f258794a0a689df10c5549753680a0a)
* Merge "support specify user-id when create sample and alarm" into stable/kilo1.0.14Jenkins2015-04-212-14/+31
|\
| * support specify user-id when create sample and alarmZhiQiang Fan2015-04-212-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 (cherry picked from commit f72dc0c38951c898fc139cee6446ef0f125fde10)
* | Merge "add in missing options" into stable/kiloJenkins2015-04-211-1/+2
|\ \ | |/
| * add in missing optionsgordon chung2015-04-211-1/+2
| | | | | | | | | | | | | | we missed a few options. this cleans up list. Change-Id: I9ba984f804aecee5b63e5a86e699733040dee245 (cherry picked from commit bdbec9721233a5cb304f0122832002b50832ae8a)
* | Add timeout for keystoneclient sessionZhiQiang Fan2015-04-203-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 (cherry picked from commit 44af2d4087815d5d451305b549f91ab6130528c0)
* | add region_name to auth plugin parametersZhiQiang Fan2015-04-202-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 (cherry picked from commit bfb6d122fa99d94a61aea4432f74cbbf3f5d03cc)
* | ceilometerclient insecure argument no longer worksMatthew Edmonds2015-04-202-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 (cherry picked from commit a5df77d8730284e278fde087e8bb3c2520c6ddb1)
* Merge "Support unicode for alarm" into stable/kiloJenkins2015-04-202-7/+14
|\
| * Support unicode for alarmZhiQiang Fan2015-04-162-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 (cherry picked from commit f1f452405a80884c7a9cd78cad4aa4d73e290745)
* | Merge "Enable specified project_id in CLI commands" into stable/kiloJenkins2015-04-202-8/+84
|\ \
| * | Enable specified project_id in CLI commandsZhiQiang Fan2015-04-162-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 (cherry picked from commit 0c23c62cef6f1388d26c04d6cf0e74153db0a0b5)
* | Merge "Fixes bug with Client function not setting up SSL params" into ↵Jenkins2015-04-202-34/+44
|\ \ | | | | | | | | | stable/kilo
| * | Fixes bug with Client function not setting up SSL paramsSrinivas Sakhamuri2015-04-162-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 (cherry picked from commit e7b8c48c60e85378e1e1d3c30bfb4cfa79f3105a)
* | Merge "update README.rst to help release process" into stable/kiloJenkins2015-04-201-4/+12
|\ \
| * | update README.rst to help release processgordon chung2015-04-161-4/+12
| |/ | | | | | | | | | | | | the release tools expect certain values to exist in README so it can update launchpad accordingly. Change-Id: I200b11bbfb192a105db661d97022433447a305bc
* | Merge "ceilometerclient fails with keystone v3 auth" into stable/kiloJenkins2015-04-201-0/+2
|\ \
| * | ceilometerclient fails with keystone v3 authMatthew Edmonds2015-04-161-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 (cherry picked from commit d6ce587e95527c2c1aaeb2ce28afdcc64b32563f)
* | Merge "Updated from global requirements" into stable/kiloJenkins2015-04-202-7/+7
|\ \
| * | Updated from global requirementsOpenStack Proposal Bot2015-04-162-7/+7
| | | | | | | | | | | | Change-Id: Ib6bd53e1798201519225c610d5838fadedf58073
* | | Merge "fix client docstring" into stable/kiloJenkins2015-04-203-6/+2
|\ \ \
| * | | fix client docstringZhiQiang Fan2015-04-163-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 (cherry picked from commit 2ea94891ea964710ea76e774a805bdff589a0b80)
* | | Set auth_plugin in __init__Chris Dent2015-04-162-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
* | Merge "alarm: Use new gnocchi aggregation API" into stable/kiloJenkins2015-04-161-15/+82
|\ \ | |/ |/|
| * alarm: Use new gnocchi aggregation APIMehdi Abaakouk2015-04-151-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 (cherry picked from commit db48aa28b169fa8df01020d54a20e644c9a0b7df)
* | update defaultbranchDoug Hellmann2015-04-151-0/+2
|/ | | | Change-Id: I07c2c3be3fe716b3b530ac58265e0fbafcceec50
* 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
* | | | Updated from global requirementsOpenStack Proposal Bot2015-02-031-1/+1
| |/ / |/| | | | | | | | Change-Id: I7ba6846e1caa7bdc2948e992ffd8d4f2d9e7e81e
* | | Add severity field to alarm CLIPradeep Kilambi2015-01-264-37/+51
| | | | | | | | | | | | | | | Change-Id: I699bea4859d4f0a5832ced5ba74ba7fb26c122ef Partially-Implements: blueprint ceilometer-alarm-level