summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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
* | | Merge "Upgrade to hacking 0.10"Jenkins2015-01-230-0/+0
|\ \ \
| * | | Upgrade to hacking 0.10Julien Danjou2015-01-135-9/+1
| | | | | | | | | | | | | | | | Change-Id: I66f42d7bd1342f236ddd00f6d56e79d6136eecde
* | | | Updated from global requirementsOpenStack Proposal Bot2015-01-231-1/+1
| |_|/ |/| | | | | | | | Change-Id: I62da558578ebd2687ef95e188c3542ab8b7e31a3
* | | Merge "Triple double-quoted strings should be used for docstrings"Jenkins2015-01-202-28/+28
|\ \ \
| * | | Triple double-quoted strings should be used for docstringsLena Novokshonova2015-01-122-28/+28
| | | | | | | | | | | | | | | | Change-Id: Ib563a9817f6f24ce0d72fe7a8ba96cb6e35c4e46
* | | | Merge "Allow all pep8 checks"Jenkins2015-01-206-34/+33
|\ \ \ \ | |/ / /
| * | | Allow all pep8 checksDina Belova2015-01-126-34/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix H405 pep8 issue. H904 issue check was ignored, although there were no places in client code violating this rule. Change-Id: If3b84eb8abb03511d7f77cabfa2955f472a60f23
* | | | Merge "Fix H105 pep8 error"Jenkins2015-01-205-10/+1
|\ \ \ \ | |/ / / | | | / | |_|/ |/| |
| * | Fix H105 pep8 errorDina Belova2015-01-125-10/+1
| | | | | | | | | | | | Change-Id: I4587bc2d57c35eef772fbaf3483dfb58c3ae9309
* | | Merge "Fix improper parameter setup for cacert and client certs"Jenkins2015-01-165-20/+46
|\ \ \
| * | | Fix improper parameter setup for cacert and client certsSrinivas Sakhamuri2015-01-155-20/+46
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The client passes cacert incorrectly, CA cert need to be passed in verify parameter to requests library. Also at present, key file is not being used, which if it is supplied need to be passed as a tuple in cert parameter Python requests library relevant doc link http://docs.python-requests.org/en/latest/user/advanced/#ssl-cert-verification Change-Id: Ie71e760bce6a78ed1444373adfa0a133e82ec434 Closes-Bug: 1408372
* | | Merge "Update hacking to global requirements"Jenkins2015-01-132-2/+3
|\ \ \ | | |/ | |/|
| * | Update hacking to global requirementsDina Belova2015-01-122-2/+3
| |/ | | | | | | Change-Id: I70ac868c35b2e8f07917657a05e0cd1141e687ab
* | Merge "Remove redundant parentheses (except openstack.common)"Jenkins2015-01-133-9/+9
|\ \
| * | Remove redundant parentheses (except openstack.common)Dina Belova2014-12-103-9/+9
| | | | | | | | | | | | Change-Id: I594234648a37d283559a0365969a7fe3609079f8
* | | event-list should sort by timestamp, not idZhiQiang Fan2015-01-132-1/+48
| |/ |/| | | | | | | | | | | | | | | | | Currently, event-list output will be sorted by message id, that is because table field 0 is the default sort field. But sort by id makes no sense, and REST API returns events by timestamp order, so let's keep consistent with upstream. Change-Id: I524b05ed5ff9db34430afd722991d02545c263cb Closes-Bug: #1406622
* | Updated from global requirementsOpenStack Proposal Bot2015-01-091-1/+1
| | | | | | | | Change-Id: Ia62d0716800d753504d29a687471712b303a8a1a
* | Merge "Support ceilometer-url and os-endpoint"Jenkins2015-01-094-25/+50
|\ \
| * | Support ceilometer-url and os-endpointZhiQiang Fan2015-01-084-25/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | Ceilometerclient has messed up with (ceilometer-url and os-endpoint) and (os-auth-token and token). This patch marks ceilometer-url and auth-token as deprecated, and unifies the two pairs arguments. Change-Id: Id55e5b603d8075018cf45b9833d397173439b3ce Closes-Bug: #1396811
* | | Merge "sync to latest oslo-incubator code"Jenkins2015-01-088-90/+195
|\ \ \
| * | | sync to latest oslo-incubator codeZhiQiang Fan2014-12-268-90/+195
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch also syncs with latest oslo-incubator, to solve bug 1354470 and safe log auth token when --debug is enabled, see https://github.com/openstack/oslo-incubator/blob/master/openstack/common/apiclient/client.py#L128 Note, this patch also removes importutils.py since it is no longer used. Change-Id: I4f2d18ef05c3be27cf2ee3474761408e3f5ccbcd Closes-Bug: #1354470
* | | | Merge "Add apiclient to openstack-common.conf"Jenkins2015-01-081-0/+1
|\ \ \ \ | |/ / / | | / / | |/ / |/| |
| * | Add apiclient to openstack-common.confZhiQiang Fan2014-12-261-0/+1
| | | | | | | | | | | | | | | | | | | | | No matter what we do with apiclient in future, we should include it in openstack-common.conf file since we're using it. Change-Id: Ibcf90a394c78bdd38235a0214ac07cfd4f38f927
* | | Merge "Add client property for common.base.Manager"Jenkins2015-01-081-0/+5
|\ \ \ | |/ /
| * | Add client property for common.base.ManagerZhiQiang Fan2014-12-191-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The latest oslo-incubator.apiclient code assumes resource manager has property named client, but ceilometerclient has named that property to api, which will cause problem when we sync with oslo-incubator. This patch simply uses client as an alias of api. Change-Id: I90c5ff10309ff7ad3fb634274e16c26ec8e6a1a2
* | | Merge "Enable --os-insecure CLI option"Jenkins2015-01-074-3/+46
|\ \ \ | |/ / |/| |
| * | Enable --os-insecure CLI optionZhiQiang Fan2014-12-064-3/+46
| |/ | | | | | | | | | | | | | | | | | | | | | | | | --os-insecure is not correctly passed to Keystoneclient because it expects a bool type but we assgin a string value to the insecure parameter, this patch fixes it by using oslo.utils.strutils.bool_from_string. --os-insecure is ignored by Ceilometerclient.v2.client because it expects parameter verify rather than insecure, this patch fixes it by converting insecure to verify if that field is not set. Change-Id: I545de167cdf8cfec6b5c67984b74327fb76c513a Closes-Bug: #1394449
* | Merge "Allow graceful shutdown on Ctrl+C"Jenkins2014-12-121-0/+3
|\ \
| * | Allow graceful shutdown on Ctrl+Cliu-sheng2014-12-121-0/+3
| | | | | | | | | | | | Change-Id: If02a849af2b0dd471ffa078a53864b3cf751b9bb
* | | Updated from global requirementsOpenStack Proposal Bot2014-12-111-1/+1
|/ / | | | | | | Change-Id: Ie3dd873d681b85749d48a3bb1abc90a8e8fa92c7
* | Make methods static where it's possibleDina Belova2014-12-104-5/+10
| | | | | | | | Change-Id: If6c1fa05044e65ec1e72a3e5f63e6db826469a2d
* | Merge "Fix old-style classes declaration"Jenkins2014-12-102-5/+5
|\ \
| * | Fix old-style classes declarationDina Belova2014-12-102-5/+5
| |/ | | | | | | Change-Id: I8759dd64637e5150f6744d0989eaa5e584487f5e
View Lorry Controller Status