Merge "Change Monasca Port"

This commit is contained in:
Jenkins 2016-07-26 21:31:24 +00:00 committed by Gerrit Code Review
commit 8c5dc5620d
5 changed files with 81 additions and 81 deletions

View File

@ -383,7 +383,7 @@ A measurement is a value with a timestamp for a specific Metric. The value is re
### Value Meta
Optionally, a measurement may also contain extra data about the value which is known as value meta. Value meta is a set of name/value pairs that add textual data to the value of the measurement. The value meta will be returned from the API when the measurement is read. Only measurements that were written with value meta will have the key value pairs when read from the API. The value meta is ignored when computing statistics such as average on measurements.
For an example of how value meta is used, imagine this metric: http_status{url: http://localhost:8080/healthcheck, hostname=devstack, service=object-storage}. The measurements for this metric have a value of either 1 or 0 depending if the status check succeeded. If the check fails, it would be helpful to have the actual http status code and error message if possible. So instead of just a value, the measurement will be something like:
For an example of how value meta is used, imagine this metric: http_status{url: http://localhost:8070/healthcheck, hostname=devstack, service=object-storage}. The measurements for this metric have a value of either 1 or 0 depending if the status check succeeded. If the check fails, it would be helpful to have the actual http status code and error message if possible. So instead of just a value, the measurement will be something like:
{Timestamp=now(), value=1, value_meta{http_rc=500, error=“Error accessing MySQL”}}
Up to 16 separate key/value pairs of value meta are allowed per measurement. The keys are required and are trimmed of leading and trailing whitespace and have a maximum length of 255 characters. The value is a string and value meta (with key, value and '{"":""}' combined) has a maximum length of 2048 characters. The value can be an empty string. Whitespace is not trimmed from the values.
@ -746,7 +746,7 @@ The Monasca API implements a paging mechanism to allow users to 'page' through r
For example:
```
"http://192.168.10.4:8080/v2.0/metrics/measurements?offset=2015-03-03T05%3A21%3A55Z&limit=1000&name=cpu.system_perc&dimensions=hostname%3Adevstack&start_time=2014-07-18T03%3A00%3A00Z"
"http://192.168.10.4:8070/v2.0/metrics/measurements?offset=2015-03-03T05%3A21%3A55Z&limit=1000&name=cpu.system_perc&dimensions=hostname%3Adevstack&start_time=2014-07-18T03%3A00%3A00Z"
```
@ -822,11 +822,11 @@ For example:
"links": [
{
"rel": "self",
"href": "http://192.168.10.4:8080/v2.0/metrics&limit=2"
"href": "http://192.168.10.4:8070/v2.0/metrics&limit=2"
},
{
"rel": "next",
"href": "http://192.168.10.4:8080/v2.0/metrics?offset=1&limit=2"
"href": "http://192.168.10.4:8070/v2.0/metrics?offset=1&limit=2"
}
],
"elements": [
@ -872,7 +872,7 @@ None.
#### Request Examples
```
GET / HTTP/1.1
Host: 192.168.10.4:8080
Host: 192.168.10.4:8070
X-Auth-Token: 2b8882ba2ec44295bf300aecb2caa4f7
Accept: application/json
Cache-Control: no-cache
@ -891,7 +891,7 @@ Returns a JSON object with a 'links' array of links and an 'elements' array of s
"links": [
{
"rel": "self",
"href": "http://192.168.10.4:8080/"
"href": "http://192.168.10.4:8070/"
}
],
"elements": [
@ -900,7 +900,7 @@ Returns a JSON object with a 'links' array of links and an 'elements' array of s
"links": [
{
"rel": "self",
"href": "http://192.168.10.4:8080/v2.0"
"href": "http://192.168.10.4:8070/v2.0"
}
],
"status": "CURRENT",
@ -932,7 +932,7 @@ None.
#### Request Examples
```
GET /v2.0/ HTTP/1.1
Host: 192.168.10.4:8080
Host: 192.168.10.4:8070
Content-Type: application/json
X-Auth-Token: 2b8882ba2ec44295bf300aecb2caa4f7
Cache-Control: no-cache
@ -952,7 +952,7 @@ Returns a JSON version object with details about the specified version.
"links":[
{
"rel":"self",
"href":"http://192.168.10.4:8080/v2.0/"
"href":"http://192.168.10.4:8070/v2.0/"
}
],
"status":"CURRENT",
@ -997,7 +997,7 @@ POST a single metric.
```
POST /v2.0/metrics HTTP/1.1
Host: 192.168.10.4:8080
Host: 192.168.10.4:8070
Content-Type: application/json
X-Auth-Token: 27feed73a0ce4138934e30d619b415b0
Cache-Control: no-cache
@ -1018,7 +1018,7 @@ POST a single metric with value_meta.
```
POST /v2.0/metrics HTTP/1.1
Host: 192.168.10.4:8080
Host: 192.168.10.4:8070
Content-Type: application/json
X-Auth-Token: 27feed73a0ce4138934e30d619b415b0
Cache-Control: no-cache
@ -1043,7 +1043,7 @@ POST an array of metrics.
```
POST /v2.0/metrics HTTP/1.1
Host: 192.168.10.4:8080
Host: 192.168.10.4:8070
Content-Type: application/json
X-Auth-Token: 27feed73a0ce4138934e30d619b415b0
Cache-Control: no-cache
@ -1109,7 +1109,7 @@ None.
#### Request Examples
```
GET /v2.0/metrics?name=metric1&dimensions=key1:value1 HTTP/1.1
Host: 192.168.10.4:8080
Host: 192.168.10.4:8070
Content-Type: application/json
X-Auth-Token: 27feed73a0ce4138934e30d619b415b0
Cache-Control: no-cache
@ -1131,11 +1131,11 @@ Returns a JSON object with a 'links' array of links and an 'elements' array of m
"links": [
{
"rel": "self",
"href": "http://192.168.10.4:8080/v2.0/metrics"
"href": "http://192.168.10.4:8070/v2.0/metrics"
},
{
"rel": "next",
"href": "http://192.168.10.4:8080/v2.0/metrics?offset=1"
"href": "http://192.168.10.4:8070/v2.0/metrics?offset=1"
}
],
"elements": [
@ -1264,7 +1264,7 @@ None.
#### Request Examples
```
GET /v2.0/metrics/measurements?name=cpu.system_perc&dimensions=hostname:devstack&start_time=2015-03-00T00:00:01Z HTTP/1.1
Host: 192.168.10.4:8080
Host: 192.168.10.4:8070
Content-Type: application/json
X-Auth-Token: 2b8882ba2ec44295bf300aecb2caa4f7
Cache-Control: no-cache
@ -1288,11 +1288,11 @@ Returns a JSON object with a 'links' array of links and an 'elements' array of m
"links": [
{
"rel": "self",
"href": "http://192.168.10.4:8080/v2.0/metrics/measurements?start_time=2015-03-00T00%3A00%3A00Z&name=cpu.system_perc&dimensions=hostname%3Adevstack"
"href": "http://192.168.10.4:8070/v2.0/metrics/measurements?start_time=2015-03-00T00%3A00%3A00Z&name=cpu.system_perc&dimensions=hostname%3Adevstack"
},
{
"rel": "next",
"href": "http://192.168.10.4:8080/v2.0/metrics/measurements?offset=2015-03-03T05%3A24%3A55Z&name=cpu.system_perc&dimensions=hostname%3Adevstack&start_time=2015-03-00T00%3A00%3A00Z"
"href": "http://192.168.10.4:8070/v2.0/metrics/measurements?offset=2015-03-03T05%3A24%3A55Z&name=cpu.system_perc&dimensions=hostname%3Adevstack&start_time=2015-03-00T00%3A00%3A00Z"
}
],
"elements": [
@ -1362,7 +1362,7 @@ None.
#### Request Examples
```
GET /v2.0/metrics/names HTTP/1.1
Host: 192.168.10.4:8080
Host: 192.168.10.4:8070
Content-Type: application/json
X-Auth-Token: 2b8882ba2ec44295bf300aecb2caa4f7
Cache-Control: no-cache
@ -1391,11 +1391,11 @@ Returns a JSON object with a 'links' array of links and an 'elements' array of m
"links": [
{
"rel": "self",
"href": "http://192.168.10.4:8080/v2.0/metrics/names?offset=tenantId%3region%26name1%26dimensionKey1%3DdimensionValue1%26dimensionKey2%3DdimensionValue2"
"href": "http://192.168.10.4:8070/v2.0/metrics/names?offset=tenantId%3region%26name1%26dimensionKey1%3DdimensionValue1%26dimensionKey2%3DdimensionValue2"
},
{
"rel": "next"
"href": http://192.168.10.4:8080/v2.0/metrics/names?offset=tenantId%3region%26name3%26dimensionKey1%3DdimensionValue1%26dimensionKey2%3DdimensionValue2
"href": http://192.168.10.4:8070/v2.0/metrics/names?offset=tenantId%3region%26name3%26dimensionKey1%3DdimensionValue1%26dimensionKey2%3DdimensionValue2
}
]
}
@ -1440,7 +1440,7 @@ None.
#### Request Examples
```
GET /v2.0/metrics/statistics?name=cpu.system_perc&dimensions=hostname:devstack&start_time=2014-07-18T03:00:00Z&statistics=avg,min,max,sum,count HTTP/1.1
Host: 192.168.10.4:8080
Host: 192.168.10.4:8070
X-Auth-Token: 2b8882ba2ec44295bf300aecb2caa4f7
Content-Type: application/json
Cache-Control: no-cache
@ -1465,11 +1465,11 @@ Returns a JSON object with a 'links' array of links and an 'elements' array of s
"links": [
{
"rel": "self",
"href": "http://192.168.10.4:8080/v2.0/metrics/statistics?start_time=2014-07-18T03%3A00%3A00Z&name=cpu.system_perc&dimensions=hostname%3Adevstack&statistics=avg%2Cmin%2Cmax%2Csum%2Ccount"
"href": "http://192.168.10.4:8070/v2.0/metrics/statistics?start_time=2014-07-18T03%3A00%3A00Z&name=cpu.system_perc&dimensions=hostname%3Adevstack&statistics=avg%2Cmin%2Cmax%2Csum%2Ccount"
},
{
"rel": "next",
"href": "http://192.168.10.4:8080/v2.0/metrics/statistics?offset=2014-07-18T03%3A22%3A00Z&name=cpu.system_perc&dimensions=hostname%3Adevstack&start_time=2014-07-18T03%3A00%3A00Z&statistics=avg%2Cmin%2Cmax%2Csum%2Ccount"
"href": "http://192.168.10.4:8070/v2.0/metrics/statistics?offset=2014-07-18T03%3A22%3A00Z&name=cpu.system_perc&dimensions=hostname%3Adevstack&start_time=2014-07-18T03%3A00%3A00Z&statistics=avg%2Cmin%2Cmax%2Csum%2Ccount"
}
],
"elements": [
@ -1547,7 +1547,7 @@ None.
#### Request Examples
```
POST /v2.0/notification-methods HTTP/1.1
Host: 192.168.10.4:8080
Host: 192.168.10.4:8070
Content-Type: application/json
X-Auth-Token: 2b8882ba2ec44295bf300aecb2caa4f7
Cache-Control: no-cache
@ -1581,7 +1581,7 @@ Returns a JSON notification method object with the following fields:
"links":[
{
"rel":"self",
"href":"http://192.168.10.4:8080/v2.0/notification-methods/35cc6f1c-3a29-49fb-a6fc-d9d97d190508"
"href":"http://192.168.10.4:8070/v2.0/notification-methods/35cc6f1c-3a29-49fb-a6fc-d9d97d190508"
}
],
"name":"Name of notification method",
@ -1616,7 +1616,7 @@ None.
#### Request Examples
```
GET /v2.0/notification-methods HTTP/1.1
Host: 192.168.10.4:8080
Host: 192.168.10.4:8070
Content-Type: application/json
X-Auth-Token: 2b8882ba2ec44295bf300aecb2caa4f7
Cache-Control: no-cache
@ -1643,11 +1643,11 @@ Returns a JSON object with a 'links' array of links and an 'elements' array of n
"links": [
{
"rel": "self",
"href": "http://192.168.10.4:8080/v2.0/notification-methods"
"href": "http://192.168.10.4:8070/v2.0/notification-methods"
},
{
"rel": "next",
"href": "http://192.168.10.4:8080/v2.0/notification-methods?offset=c60ec47e-5038-4bf1-9f95-4046c6e9a759"
"href": "http://192.168.10.4:8070/v2.0/notification-methods?offset=c60ec47e-5038-4bf1-9f95-4046c6e9a759"
}
],
"elements": [
@ -1656,7 +1656,7 @@ Returns a JSON object with a 'links' array of links and an 'elements' array of n
"links": [
{
"rel": "self",
"href": "http://192.168.10.4:8080/v2.0/notification-methods/35cc6f1c-3a29-49fb-a6fc-d9d97d190508"
"href": "http://192.168.10.4:8070/v2.0/notification-methods/35cc6f1c-3a29-49fb-a6fc-d9d97d190508"
}
],
"name": "Name of notification method",
@ -1669,7 +1669,7 @@ Returns a JSON object with a 'links' array of links and an 'elements' array of n
"links": [
{
"rel": "self",
"href": "http://192.168.10.4:8080/v2.0/notification-methods/c60ec47e-5038-4bf1-9f95-4046c6e9a759"
"href": "http://192.168.10.4:8070/v2.0/notification-methods/c60ec47e-5038-4bf1-9f95-4046c6e9a759"
}
],
"name": "Name of notification method",
@ -1702,7 +1702,7 @@ None.
#### Request Examples
```
GET http://192.168.10.4:8080/v2.0/notification-methods/35cc6f1c-3a29-49fb-a6fc-d9d97d190508
GET http://192.168.10.4:8070/v2.0/notification-methods/35cc6f1c-3a29-49fb-a6fc-d9d97d190508
```
### Response
@ -1727,7 +1727,7 @@ Returns a JSON notification method object with the following fields:
"links":[
{
"rel":"self",
"href":"http://192.168.10.4:8080/v2.0/notification-methods/35cc6f1c-3a29-49fb-a6fc-d9d97d190508"
"href":"http://192.168.10.4:8070/v2.0/notification-methods/35cc6f1c-3a29-49fb-a6fc-d9d97d190508"
}
],
"name":"Name of notification method",
@ -1763,7 +1763,7 @@ None.
#### Request Examples
````
PUT /v2.0/notification-methods/35cc6f1c-3a29-49fb-a6fc-d9d97d190508 HTTP/1.1
Host: 192.168.10.4:8080
Host: 192.168.10.4:8070
Content-Type: application/json
X-Auth-Token: 2b8882ba2ec44295bf300aecb2caa4f7
Cache-Control: no-cache
@ -1798,7 +1798,7 @@ Returns a JSON notification method object with the following fields:
"links":[
{
"rel":"self",
"href":"http://192.168.10.4:8080/v2.0/notification-methods/35cc6f1c-3a29-49fb-a6fc-d9d97d190508"
"href":"http://192.168.10.4:8070/v2.0/notification-methods/35cc6f1c-3a29-49fb-a6fc-d9d97d190508"
}
],
"name":"New name of notification method",
@ -1834,7 +1834,7 @@ None.
#### Request Examples
````
PATCH /v2.0/notification-methods/35cc6f1c-3a29-49fb-a6fc-d9d97d190508 HTTP/1.1
Host: 192.168.10.4:8080
Host: 192.168.10.4:8070
Content-Type: application/json
X-Auth-Token: 2b8882ba2ec44295bf300aecb2caa4f7
Cache-Control: no-cache
@ -1869,7 +1869,7 @@ Returns a JSON notification method object with the following fields:
"links":[
{
"rel":"self",
"href":"http://192.168.10.4:8080/v2.0/notification-methods/35cc6f1c-3a29-49fb-a6fc-d9d97d190508"
"href":"http://192.168.10.4:8070/v2.0/notification-methods/35cc6f1c-3a29-49fb-a6fc-d9d97d190508"
}
],
"name":"New name of notification method",
@ -1900,7 +1900,7 @@ None.
#### Request Examples
```
DELETE /v2.0/notification-methods/35cc6f1c-3a29-49fb-a6fc-d9d97d190508 HTTP/1.1
Host: 192.168.10.4:8080
Host: 192.168.10.4:8070
Content-Type: application/json
X-Auth-Token: 2b8882ba2ec44295bf300aecb2caa4f7
Cache-Control: no-cache
@ -1948,7 +1948,7 @@ Consists of an alarm definition. An alarm has the following properties:
#### Request Examples
```
POST /v2.0/alarm-definitions HTTP/1.1
Host: 192.168.10.4:8080
Host: 192.168.10.4:8070
Content-Type: application/json
X-Auth-Token: 2b8882ba2ec44295bf300aecb2caa4f7
Cache-Control: no-cache
@ -1976,7 +1976,7 @@ Cache-Control: no-cache
To create deterministic definition following request should be sent:
```
POST /v2.0/alarm-definitions HTTP/1.1
Host: 192.168.10.4:8080
Host: 192.168.10.4:8070
Content-Type: application/json
X-Auth-Token: 2b8882ba2ec44295bf300aecb2caa4f7
Cache-Control: no-cache
@ -2029,7 +2029,7 @@ Returns a JSON object of alarm definition objects with the following fields:
"links":[
{
"rel":"self",
"href":"http://192.168.10.4:8080/v2.0/alarm-definitions/b461d659-577b-4d63-9782-a99194d4a472"
"href":"http://192.168.10.4:8070/v2.0/alarm-definitions/b461d659-577b-4d63-9782-a99194d4a472"
}
],
"name":"Average CPU percent greater than 10",
@ -2090,7 +2090,7 @@ None.
#### Request Examples
```
GET /v2.0/alarm-definitions?name=CPU percent greater than 10&dimensions=hostname:devstack&state=UNDETERMINED HTTP/1.1
Host: 192.168.10.4:8080
Host: 192.168.10.4:8070
Content-Type: application/json
X-Auth-Token: 2b8882ba2ec44295bf300aecb2caa4f7
Cache-Control: no-cache
@ -2123,11 +2123,11 @@ Returns a JSON object with a 'links' array of links and an 'elements' array of a
"links": [
{
"rel": "self",
"href": "http://192.168.10.4:8080/v2.0/alarm-definitions?name=CPU%20percent%20greater%20than%2010&dimensions=hostname:devstack&state=UNDETERMINED"
"href": "http://192.168.10.4:8070/v2.0/alarm-definitions?name=CPU%20percent%20greater%20than%2010&dimensions=hostname:devstack&state=UNDETERMINED"
},
{
"rel": "next",
"href": "http://localhost:8080/v2.0/alarm-definitions?offset=f9935bcc-9641-4cbf-8224-0993a947ea83&name=CPU%20percent%20greater%20than%2010&dimensions=hostname:devstack&state=UNDETERMINED"
"href": "http://localhost:8070/v2.0/alarm-definitions?offset=f9935bcc-9641-4cbf-8224-0993a947ea83&name=CPU%20percent%20greater%20than%2010&dimensions=hostname:devstack&state=UNDETERMINED"
}
],
"elements": [
@ -2136,7 +2136,7 @@ Returns a JSON object with a 'links' array of links and an 'elements' array of a
"links": [
{
"rel": "self",
"href": "http://192.168.10.4:8080/v2.0/alarm-definitions/f9935bcc-9641-4cbf-8224-0993a947ea83"
"href": "http://192.168.10.4:8070/v2.0/alarm-definitions/f9935bcc-9641-4cbf-8224-0993a947ea83"
}
],
"name": "CPU percent greater than 10",
@ -2174,7 +2174,7 @@ Returns a JSON object with a 'links' array of links and an 'elements' array of a
"links": [
{
"rel": "self",
"href": "http://192.168.10.4:8080/v2.0/alarm-definitions/g9323232-6543-4cbf-1234-0993a947ea83"
"href": "http://192.168.10.4:8070/v2.0/alarm-definitions/g9323232-6543-4cbf-1234-0993a947ea83"
}
],
"name": "Log error count exceeds 1000",
@ -2252,7 +2252,7 @@ Returns a JSON alarm definition object with the following fields:
"links": [
{
"rel": "self",
"href": "http://192.168.10.4:8080/v2.0/alarm-definitions/f9935bcc-9641-4cbf-8224-0993a947ea83"
"href": "http://192.168.10.4:8070/v2.0/alarm-definitions/f9935bcc-9641-4cbf-8224-0993a947ea83"
}
],
"name": "CPU percent greater than 10",
@ -2322,7 +2322,7 @@ See Changing Alarm Definitions for restrictions on changing expression and match
#### Request Examples
```
PUT /v2.0/alarm-definitions/f9935bcc-9641-4cbf-8224-0993a947ea83 HTTP/1.1
Host: 192.168.10.4:8080
Host: 192.168.10.4:8070
X-Auth-Token: 2b8882ba2ec44295bf300aecb2caa4f7
Content-Type: application/json
Cache-Control: no-cache
@ -2376,7 +2376,7 @@ Returns a JSON alarm definition object with the following parameters:
"links": [
{
"rel": "self",
"href": "http://192.168.10.4:8080/v2.0/alarm-definitions/f9935bcc-9641-4cbf-8224-0993a947ea83"
"href": "http://192.168.10.4:8070/v2.0/alarm-definitions/f9935bcc-9641-4cbf-8224-0993a947ea83"
}
],
"name": "CPU percent greater than 15",
@ -2444,7 +2444,7 @@ Only the parameters that are specified will be updated. See Changing Alarm Defin
#### Request Examples
```
PATCH /v2.0/alarm-definitions/f9935bcc-9641-4cbf-8224-0993a947ea83 HTTP/1.1
Host: 192.168.10.4:8080
Host: 192.168.10.4:8070
X-Auth-Token: 2b8882ba2ec44295bf300aecb2caa4f7
Content-Type: application/json
Cache-Control: no-cache
@ -2497,7 +2497,7 @@ Returns a JSON alarm definition object with the following fields:
"links": [
{
"rel": "self",
"href": "http://192.168.10.4:8080/v2.0/alarm-definitions/f9935bcc-9641-4cbf-8224-0993a947ea83"
"href": "http://192.168.10.4:8070/v2.0/alarm-definitions/f9935bcc-9641-4cbf-8224-0993a947ea83"
}
],
"name": "CPU percent greater than 15",
@ -2552,7 +2552,7 @@ None.
#### Request Examples
```
DELETE /v2.0/alarm-definitions/b461d659-577b-4d63-9782-a99194d4a472 HTTP/1.1
Host: 192.168.10.4:8080
Host: 192.168.10.4:8070
X-Auth-Token: 2b8882ba2ec44295bf300aecb2caa4f7
Cache-Control: no-cache
```
@ -2601,7 +2601,7 @@ None.
#### Request Examples
```
GET /v2.0/alarms?metric_name=cpu.system_perc&metric_dimensions=hostname:devstack&state=UNDETERMINED HTTP/1.1
Host: 192.168.10.4:8080
Host: 192.168.10.4:8070
Content-Type: application/json
X-Auth-Token: 2b8882ba2ec44295bf300aecb2caa4f7
Cache-Control: no-cache
@ -2631,11 +2631,11 @@ Returns a JSON object with a 'links' array of links and an 'elements' array of a
"links": [
{
"rel": "self",
"href": "http://192.168.10.4:8080/v2.0/alarms?metric_name=cpu.system_perc&metric_dimensions=hostname%3Adevstack&state=UNDETERMINED"
"href": "http://192.168.10.4:8070/v2.0/alarms?metric_name=cpu.system_perc&metric_dimensions=hostname%3Adevstack&state=UNDETERMINED"
},
{
"rel": "next",
"href": "http://192.168.10.4:8080/v2.0/alarms?offset=f9935bcc-9641-4cbf-8224-0993a947ea83&metric_name=cpu.system_perc&metric_dimensions=hostname%3Adevstack&state=UNDETERMINED"
"href": "http://192.168.10.4:8070/v2.0/alarms?offset=f9935bcc-9641-4cbf-8224-0993a947ea83&metric_name=cpu.system_perc&metric_dimensions=hostname%3Adevstack&state=UNDETERMINED"
}
],
"elements": [
@ -2644,11 +2644,11 @@ Returns a JSON object with a 'links' array of links and an 'elements' array of a
"links": [
{
"rel": "self",
"href": "http://192.168.10.4:8080/v2.0/alarms/f9935bcc-9641-4cbf-8224-0993a947ea83"
"href": "http://192.168.10.4:8070/v2.0/alarms/f9935bcc-9641-4cbf-8224-0993a947ea83"
},
{
"rel": "state-history",
"href": "http://192.168.10.4:8080/v2.0/alarms/f9935bcc-9641-4cbf-8224-0993a947ea83/state-history"
"href": "http://192.168.10.4:8070/v2.0/alarms/f9935bcc-9641-4cbf-8224-0993a947ea83/state-history"
}
],
"alarm_definition": {
@ -2656,7 +2656,7 @@ Returns a JSON object with a 'links' array of links and an 'elements' array of a
"id": "b7e5f472-7aa5-4254-a49a-463e749ae817",
"links": [
{
"href": "http://192.168.10.4:8080/v2.0/alarm-definitions/b7e5f472-7aa5-4254-a49a-463e749ae817",
"href": "http://192.168.10.4:8070/v2.0/alarm-definitions/b7e5f472-7aa5-4254-a49a-463e749ae817",
"rel": "self"
}
],
@ -2716,7 +2716,7 @@ None
####Request Examples
```
GET /v2.0/alarms/count?metric_name=cpu.system_perc&metric_dimensions=hostname:devstack&group_by=state,lifecycle_state
HTTP/1.1 Host: 192.168.10.4:8080
HTTP/1.1 Host: 192.168.10.4:8070
Content-Type: application/json
X-Auth-Token: 2b8882ba2ec44295bf300aecb2caa4f7
Cache-Control: no-cache
@ -2738,7 +2738,7 @@ Returns a JSON object containing the following fields:
"links": [
{
"rel": "self",
"href": "http://192.168.10.4:8080/v2.0/alarms/count?metric_name=cpu.system_perc&metric_dimensions=hostname%3Adevstack&group_by=state,lifecycle_state"
"href": "http://192.168.10.4:8070/v2.0/alarms/count?metric_name=cpu.system_perc&metric_dimensions=hostname%3Adevstack&group_by=state,lifecycle_state"
}
],
"columns": ["count", "state", "lifecycle_state"],
@ -2800,11 +2800,11 @@ Returns a JSON object with a 'links' array of links and an 'elements' array of a
"links": [
{
"rel": "self",
"href": "http://192.168.10.4:8080/v2.0/alarms/state-history?dimensions=hostname%3Adevstack"
"href": "http://192.168.10.4:8070/v2.0/alarms/state-history?dimensions=hostname%3Adevstack"
},
{
"rel": "next",
"href": "http://192.168.10.4:8080/v2.0/alarms/state-history?offset=1424451007004&dimensions=hostname%3Adevstack"
"href": "http://192.168.10.4:8070/v2.0/alarms/state-history?offset=1424451007004&dimensions=hostname%3Adevstack"
}
],
"elements": [
@ -2975,11 +2975,11 @@ Returns a JSON alarm object with the following fields:
"links":[
{
"rel":"self",
"href":"http://192.168.10.4:8080/v2.0/alarms/f9935bcc-9641-4cbf-8224-0993a947ea83"
"href":"http://192.168.10.4:8070/v2.0/alarms/f9935bcc-9641-4cbf-8224-0993a947ea83"
},
{
"rel":"state-history",
"href":"http://192.168.10.4:8080/v2.0/alarms/f9935bcc-9641-4cbf-8224-0993a947ea83/state-history"
"href":"http://192.168.10.4:8070/v2.0/alarms/f9935bcc-9641-4cbf-8224-0993a947ea83/state-history"
}
],
"alarm_definition":
@ -2990,7 +2990,7 @@ Returns a JSON alarm object with the following fields:
"links":[
{
"rel":"self",
"href":"http://192.168.10.4:8080/v2.0/alarm-definitions/ad837fca-5564-4cbf-523-0117f7dac6ad
"href":"http://192.168.10.4:8070/v2.0/alarm-definitions/ad837fca-5564-4cbf-523-0117f7dac6ad
}
]
},
@ -3036,7 +3036,7 @@ Consists of an alarm definition. An alarm has the following mutable properties:
#### Request Examples
```
PUT /v2.0/alarms/f9935bcc-9641-4cbf-8224-0993a947ea83 HTTP/1.1
Host: 192.168.10.4:8080
Host: 192.168.10.4:8070
X-Auth-Token: 2b8882ba2ec44295bf300aecb2caa4f7
Content-Type: application/json
Cache-Control: no-cache
@ -3074,11 +3074,11 @@ Returns a JSON alarm object with the following parameters:
"links":[
{
"rel":"self",
"href":"http://192.168.10.4:8080/v2.0/alarms/f9935bcc-9641-4cbf-8224-0993a947ea83"
"href":"http://192.168.10.4:8070/v2.0/alarms/f9935bcc-9641-4cbf-8224-0993a947ea83"
},
{
"rel":"state-history",
"href":"http://192.168.10.4:8080/v2.0/alarms/f9935bcc-9641-4cbf-8224-0993a947ea83/state-history"
"href":"http://192.168.10.4:8070/v2.0/alarms/f9935bcc-9641-4cbf-8224-0993a947ea83/state-history"
}
],
"alarm_definition_id":"ad837fca-5564-4cbf-523-0117f7dac6ad",
@ -3123,7 +3123,7 @@ Consists of an alarm with the following mutable properties:
#### Request Examples
```
PATCH /v2.0/alarms/f9935bcc-9641-4cbf-8224-0993a947ea83 HTTP/1.1
Host: 192.168.10.4:8080
Host: 192.168.10.4:8070
X-Auth-Token: 2b8882ba2ec44295bf300aecb2caa4f7
Content-Type: application/json
Cache-Control: no-cache
@ -3160,11 +3160,11 @@ Returns a JSON alarm object with the following fields:
"links": [
{
"rel": "self",
"href": "http://192.168.10.4:8080/v2.0/alarms/f9935bcc-9641-4cbf-8224-0993a947ea83"
"href": "http://192.168.10.4:8070/v2.0/alarms/f9935bcc-9641-4cbf-8224-0993a947ea83"
},
{
"rel": "state-history",
"href": "http://192.168.10.4:8080/v2.0/alarms/f9935bcc-9641-4cbf-8224-0993a947ea83/state-history"
"href": "http://192.168.10.4:8070/v2.0/alarms/f9935bcc-9641-4cbf-8224-0993a947ea83/state-history"
}
],
"alarm_definition_id": "ad837fca-5564-4cbf-523-0117f7dac6ad",
@ -3207,7 +3207,7 @@ None.
#### Request Examples
```
DELETE /v2.0/alarms/b461d659-577b-4d63-9782-a99194d4a472 HTTP/1.1
Host: 192.168.10.4:8080
Host: 192.168.10.4:8070
X-Auth-Token: 2b8882ba2ec44295bf300aecb2caa4f7
Cache-Control: no-cache
```
@ -3242,7 +3242,7 @@ None.
#### Request Data
```
GET /v2.0/alarms/37d1ddf0-d7e3-4fc0-979b-25ac3779d9e0/state-history HTTP/1.1
Host: 192.168.10.4:8080
Host: 192.168.10.4:8070
X-Auth-Token: 2b8882ba2ec44295bf300aecb2caa4f7
Cache-Control: no-cache
```
@ -3270,11 +3270,11 @@ Returns a JSON object with a 'links' array of links and an 'elements' array of a
"links": [
{
"rel": "self",
"href": "http://192.168.10.4:8080/v2.0/alarms/37d1ddf0-d7e3-4fc0-979b-25ac3779d9e0/state-history"
"href": "http://192.168.10.4:8070/v2.0/alarms/37d1ddf0-d7e3-4fc0-979b-25ac3779d9e0/state-history"
},
{
"rel": "next",
"href": "http://192.168.10.4:8080/v2.0/alarms/37d1ddf0-d7e3-4fc0-979b-25ac3779d9e0/state-history?offset=1424452147006"
"href": "http://192.168.10.4:8070/v2.0/alarms/37d1ddf0-d7e3-4fc0-979b-25ac3779d9e0/state-history?offset=1424452147006"
}
],
"elements": [

View File

@ -99,7 +99,7 @@ middleware:
server:
applicationConnectors:
- type: http
port: 8080
port: 8070
maxRequestHeaderSize: 16KiB # Allow large headers used by keystone tokens
requestLog:
timeZone: UTC

View File

@ -80,8 +80,8 @@ public class ITInfluxDBTest {
private void runAPI() throws Exception {
if (!isPortFree(8080)) {
throw new Exception("port 8080 is not free. Unable to start instance" + " of monasca api");
if (!isPortFree(8070)) {
throw new Exception("port 8070 is not free. Unable to start instance" + " of monasca api");
}
String latestShadedJarFileName = getLatestShadedJarFileName();
@ -97,7 +97,7 @@ public class ITInfluxDBTest {
System.out.println("Started " + latestShadedJarFileName);
waitForPortReady("localhost", 8080);
waitForPortReady("localhost", 8070);
}
private String getLatestShadedJarFileName() {

View File

@ -115,7 +115,7 @@ public class LinksTest {
}
public void shouldHydrate() throws URISyntaxException {
checkHydrate("http://localhost:8080/");
checkHydrate("http://localhost:8070/");
checkHydrate("https://localhost/");
checkHydrate("https://localhost//");
checkHydrate(""); // Should not happen but handle relative paths

View File

@ -121,5 +121,5 @@ if __name__ == '__main__':
wsgi_app = (
paste.deploy.loadapp('config:etc/api-config.ini',
relative_to=os.getcwd()))
httpd = simple_server.make_server('127.0.0.1', 8080, wsgi_app)
httpd = simple_server.make_server('127.0.0.1', 8070, wsgi_app)
httpd.serve_forever()