diff options
| author | Angus Salkeld <asalkeld@mirantis.com> | 2014-09-18 11:29:58 +1000 |
|---|---|---|
| committer | Angus Salkeld <asalkeld@mirantis.com> | 2014-10-03 15:40:25 +1000 |
| commit | a98d2c9c5df5179b207ec8d2df9be42312fab336 (patch) | |
| tree | 49bcb0f666d7d951473839f31581c7125e836045 /etc | |
| parent | 8795f4d80f0690716b63ba58d4efefbf6283c259 (diff) | |
| download | heat-a98d2c9c5df5179b207ec8d2df9be42312fab336.tar.gz | |
Add OSprofiler integration into Heat
This adds builtin rpc and db traces to Heat, as well as
some toplevel stack methods to aid in reading the output.
A 'profiler' config group is added to enable profiling.
Change-Id: Ie5c1c8f1931f59e4d4bcf1ec3b791f55984eb6d2
Closes-bug: #1363782
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/heat/api-paste.ini | 11 | ||||
| -rw-r--r-- | etc/heat/heat.conf.sample | 13 |
2 files changed, 21 insertions, 3 deletions
diff --git a/etc/heat/api-paste.ini b/etc/heat/api-paste.ini index 224c4572f..42260da72 100644 --- a/etc/heat/api-paste.ini +++ b/etc/heat/api-paste.ini @@ -1,7 +1,7 @@ # heat-api pipeline [pipeline:heat-api] -pipeline = request_id faultwrap ssl versionnegotiation authurl authtoken context apiv1app +pipeline = request_id faultwrap ssl versionnegotiation osprofiler authurl authtoken context apiv1app # heat-api pipeline for standalone heat # ie. uses alternative auth backend that authenticates users against keystone @@ -24,7 +24,7 @@ pipeline = request_id faultwrap versionnegotiation context custombackendauth api # heat-api-cfn pipeline [pipeline:heat-api-cfn] -pipeline = cfnversionnegotiation ec2authtoken authtoken context apicfnv1app +pipeline = cfnversionnegotiation osprofiler ec2authtoken authtoken context apicfnv1app # heat-api-cfn pipeline for standalone heat # relies exclusively on authenticating with ec2 signed requests @@ -33,7 +33,7 @@ pipeline = cfnversionnegotiation ec2authtoken context apicfnv1app # heat-api-cloudwatch pipeline [pipeline:heat-api-cloudwatch] -pipeline = versionnegotiation ec2authtoken authtoken context apicwapp +pipeline = versionnegotiation osprofiler ec2authtoken authtoken context apicwapp # heat-api-cloudwatch pipeline for standalone heat # relies exclusively on authenticating with ec2 signed requests @@ -97,3 +97,8 @@ paste.filter_factory = heat.common.custom_backend_auth:filter_factory # Middleware to set x-openstack-request-id in http response header [filter:request_id] paste.filter_factory = heat.openstack.common.middleware.request_id:RequestIdMiddleware.factory + +[filter:osprofiler] +paste.filter_factory = osprofiler.web:WsgiMiddleware.factory +hmac_keys = SECRET_KEY +enabled = yes
\ No newline at end of file diff --git a/etc/heat/heat.conf.sample b/etc/heat/heat.conf.sample index cce268340..5afda5c50 100644 --- a/etc/heat/heat.conf.sample +++ b/etc/heat/heat.conf.sample @@ -1270,6 +1270,19 @@ #api_paste_config=api-paste.ini +[profiler] + +# +# Options defined in heat.common.config +# + +# If False fully disable profiling feature. (boolean value) +#profiler_enabled=false + +# If False do not trace SQL requests. (boolean value) +#trace_sqlalchemy=false + + [revision] # |