diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-03-26 17:13:27 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-03-26 17:13:27 +0000 |
| commit | 614e2373ecca5367414c2cc9e578fb73576431c0 (patch) | |
| tree | 61cf499ec55bae30e4ee0305003d59155b389205 | |
| parent | 53ae04422207f046048aad2b5d1d09810ae35135 (diff) | |
| parent | aa9be399c1f2e2feb9cf73379d8a9d95e4adce86 (diff) | |
| download | ceilometer-614e2373ecca5367414c2cc9e578fb73576431c0.tar.gz | |
Merge "support disabling profiler and http meters"
| -rw-r--r-- | ceilometer/middleware.py | 3 | ||||
| -rw-r--r-- | ceilometer/profiler/notifications.py | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/ceilometer/middleware.py b/ceilometer/middleware.py index f8c305a9..9aed621f 100644 --- a/ceilometer/middleware.py +++ b/ceilometer/middleware.py @@ -40,7 +40,8 @@ OPTS = [ cfg.CONF.register_opts(OPTS) -class HTTPRequest(plugin_base.NotificationBase): +class HTTPRequest(plugin_base.NotificationBase, + plugin_base.NonMetricNotificationBase): event_types = ['http.request'] @staticmethod diff --git a/ceilometer/profiler/notifications.py b/ceilometer/profiler/notifications.py index c44c376e..5373173c 100644 --- a/ceilometer/profiler/notifications.py +++ b/ceilometer/profiler/notifications.py @@ -35,7 +35,8 @@ cfg.CONF.import_opt('keystone_control_exchange', 'ceilometer.identity.notifications') -class ProfilerNotifications(plugin_base.NotificationBase): +class ProfilerNotifications(plugin_base.NotificationBase, + plugin_base.NonMetricNotificationBase): event_types = ["profiler.*"] |