diff options
| -rw-r--r-- | ceilometer/exchange_control.py | 3 | ||||
| -rw-r--r-- | ceilometer/meter/data/meters.yaml | 28 | ||||
| -rw-r--r-- | ceilometer/meter/notifications.py | 1 | ||||
| -rw-r--r-- | doc/source/install/manual.rst | 17 | ||||
| -rw-r--r-- | etc/ceilometer/event_definitions.yaml | 8 |
5 files changed, 2 insertions, 55 deletions
diff --git a/ceilometer/exchange_control.py b/ceilometer/exchange_control.py index 0cb79887..717cdc12 100644 --- a/ceilometer/exchange_control.py +++ b/ceilometer/exchange_control.py @@ -20,9 +20,6 @@ EXCHANGE_OPTS = [ cfg.StrOpt('glance_control_exchange', default='glance', help="Exchange name for Glance notifications."), - cfg.StrOpt('magnetodb_control_exchange', - default='magnetodb', - help="Exchange name for Magnetodb notifications."), cfg.StrOpt('keystone_control_exchange', default='keystone', help="Exchange name for Keystone notifications."), diff --git a/ceilometer/meter/data/meters.yaml b/ceilometer/meter/data/meters.yaml index 119acc0f..650b0309 100644 --- a/ceilometer/meter/data/meters.yaml +++ b/ceilometer/meter/data/meters.yaml @@ -30,15 +30,6 @@ metric: resource_id: $.payload.image_id project_id: $.payload.owner_id - # MagnetoDB - - name: 'magnetodb.table.index.count' - type: 'gauge' - unit: 'index' - event_type: 'magnetodb.table.create.end' - volume: $.payload.index_count - resource_id: $.payload.table_uuid - user_id: $._context_user - - name: 'volume.size' event_type: - 'volume.exists' @@ -392,25 +383,6 @@ metric: project_id: $.payload.tenant_id resource_id: $.payload.stack_identity - # MagnetoDB - - name: 'magnetodb.table.create' - type: 'gauge' - unit: 'table' - volume: 1 - event_type: 'magnetodb.table.create.end' - resource_id: $.payload.table_uuid - user_id: _context_user - project_id: _context_tenant - - - name: 'magnetodb.table.delete' - type: 'gauge' - unit: 'table' - volume: 1 - event_type: 'magnetodb.table.delete.end' - resource_id: $.payload.table_uuid - user_id: _context_user - project_id: _context_tenant - # Volume - name: 'volume' type: 'gauge' diff --git a/ceilometer/meter/notifications.py b/ceilometer/meter/notifications.py index 237c8ead..a1234563 100644 --- a/ceilometer/meter/notifications.py +++ b/ceilometer/meter/notifications.py @@ -220,7 +220,6 @@ class ProcessMeterNotifications(plugin_base.NotificationBase): conf.trove_control_exchange, conf.zaqar_control_exchange, conf.swift_control_exchange, - conf.magnetodb_control_exchange, conf.ceilometer_control_exchange, conf.magnum_control_exchange, conf.dns_control_exchange, diff --git a/doc/source/install/manual.rst b/doc/source/install/manual.rst index 1f5b71a4..6c1734b0 100644 --- a/doc/source/install/manual.rst +++ b/doc/source/install/manual.rst @@ -524,21 +524,8 @@ details about any other options you might want to modify before starting the service. -Configuring MagnetoDB to send notifications -=========================================== - -Configure the driver in ``magnetodb-async-task-executor.conf`` - - :: - - notification_driver=messagingv2 - -You also would need to restart the service magnetodb-async-task-executor -(if it's already running) after changing the above configuration file. - - Notifications queues -======================== +==================== .. index:: double: installing; notifications queues; multiple topics @@ -586,7 +573,7 @@ Doing this, it's easy to listen/receive data from multiple internal and external Using multiple dispatchers -================================ +========================== .. index:: double: installing; multiple dispatchers diff --git a/etc/ceilometer/event_definitions.yaml b/etc/ceilometer/event_definitions.yaml index 5f0d82ae..784b4060 100644 --- a/etc/ceilometer/event_definitions.yaml +++ b/etc/ceilometer/event_definitions.yaml @@ -252,14 +252,6 @@ fields: payload.target.metadata.object observer_id: fields: payload.observer.id -- event_type: magnetodb.table.* - traits: &kv_store - resource_id: - fields: payload.table_uuid - user_id: - fields: _context_user_id - project_id: - fields: _context_tenant - event_type: ['network.*', 'subnet.*', 'port.*', 'router.*', 'floatingip.*', 'pool.*', 'vip.*', 'member.*', 'health_monitor.*', 'healthmonitor.*', 'listener.*', 'loadbalancer.*', 'firewall.*', 'firewall_policy.*', 'firewall_rule.*', 'vpnservice.*', 'ipsecpolicy.*', 'ikepolicy.*', 'ipsec_site_connection.*'] traits: &network_traits user_id: |