c4f45f5f08
This patch does the following: - updates the Master SHAs for new development work. - includes updates to policy, paste and rootwrap files as required - moves the Aodh repository to openstack_services as it now has implemented a stable branch - Updated the keystone-wsgi file as it was still running the code from liberty - add 2 package requirements to keystone which must be present for the new wsgi file. - updates tempest.conf.j2 to replace ssh_auth_method with auth_method, and change auth_method to 'keypair' (configured is no longer an a valid option) Change-Id: I933c24c03518865d9d40519dafb2ba46769a5453 Signed-off-by: Kevin Carter <kevin.carter@rackspace.com>
93 lines
2.5 KiB
Django/Jinja
93 lines
2.5 KiB
Django/Jinja
---
|
|
sources:
|
|
- name: meter_source
|
|
interval: 600
|
|
meters:
|
|
- "*"
|
|
sinks:
|
|
- meter_sink
|
|
- name: cpu_source
|
|
interval: 600
|
|
meters:
|
|
- "cpu"
|
|
sinks:
|
|
- cpu_sink
|
|
- cpu_delta_sink
|
|
- name: disk_source
|
|
interval: 600
|
|
meters:
|
|
- "disk.read.bytes"
|
|
- "disk.read.requests"
|
|
- "disk.write.bytes"
|
|
- "disk.write.requests"
|
|
- "disk.device.read.bytes"
|
|
- "disk.device.read.requests"
|
|
- "disk.device.write.bytes"
|
|
- "disk.device.write.requests"
|
|
sinks:
|
|
- disk_sink
|
|
- name: network_source
|
|
interval: 600
|
|
meters:
|
|
- "network.incoming.bytes"
|
|
- "network.incoming.packets"
|
|
- "network.outgoing.bytes"
|
|
- "network.outgoing.packets"
|
|
sinks:
|
|
- network_sink
|
|
sinks:
|
|
- name: meter_sink
|
|
transformers:
|
|
publishers:
|
|
- notifier://
|
|
- name: cpu_sink
|
|
transformers:
|
|
- name: "rate_of_change"
|
|
parameters:
|
|
target:
|
|
name: "cpu_util"
|
|
unit: "%"
|
|
type: "gauge"
|
|
scale: "100.0 / (10**9 * (resource_metadata.cpu_number or 1))"
|
|
publishers:
|
|
- notifier://
|
|
- name: cpu_delta_sink
|
|
transformers:
|
|
- name: "delta"
|
|
parameters:
|
|
target:
|
|
name: "cpu.delta"
|
|
growth_only: True
|
|
publishers:
|
|
- notifier://
|
|
- name: disk_sink
|
|
transformers:
|
|
- name: "rate_of_change"
|
|
parameters:
|
|
source:
|
|
map_from:
|
|
name: "(disk\\.device|disk)\\.(read|write)\\.(bytes|requests)"
|
|
unit: "(B|request)"
|
|
target:
|
|
map_to:
|
|
name: "\\1.\\2.\\3.rate"
|
|
unit: "\\1/s"
|
|
type: "gauge"
|
|
publishers:
|
|
- notifier://
|
|
- name: network_sink
|
|
transformers:
|
|
- name: "rate_of_change"
|
|
parameters:
|
|
source:
|
|
map_from:
|
|
name: "network\\.(incoming|outgoing)\\.(bytes|packets)"
|
|
unit: "(B|packet)"
|
|
target:
|
|
map_to:
|
|
name: "network.\\1.\\2.rate"
|
|
unit: "\\1/s"
|
|
type: "gauge"
|
|
publishers:
|
|
- notifier://
|