diff --git a/ceilometer/notification.py b/ceilometer/notification.py index 38ed00a3f9..56a3760e3d 100644 --- a/ceilometer/notification.py +++ b/ceilometer/notification.py @@ -68,7 +68,7 @@ OPTS = [ EXCHANGES_OPTS = [ cfg.MultiStrOpt('notification_control_exchanges', default=['nova', 'glance', 'neutron', 'cinder', 'heat', - 'keystone', 'sahara', 'trove', 'zaqar', 'swift', + 'keystone', 'trove', 'zaqar', 'swift', 'ceilometer', 'magnum', 'dns', 'ironic', 'aodh'], deprecated_group='DEFAULT', deprecated_name="http_control_exchanges", diff --git a/ceilometer/pipeline/data/event_definitions.yaml b/ceilometer/pipeline/data/event_definitions.yaml index 6aab359f16..17f26a4191 100644 --- a/ceilometer/pipeline/data/event_definitions.yaml +++ b/ceilometer/pipeline/data/event_definitions.yaml @@ -202,33 +202,6 @@ fields: payload.stack_identity name: fields: payload.name -- event_type: sahara.cluster.* - traits: &sahara_crud - project_id: - fields: payload.project_id - user_id: - fields: ctxt.user_id - resource_id: - fields: payload.cluster_id - name: - fields: payload.name -- event_type: sahara.cluster.health - traits: &sahara_health - <<: *sahara_crud - verification_id: - fields: payload.verification_id - health_check_status: - fields: payload.health_check_status - health_check_name: - fields: payload.health_check_name - health_check_description: - fields: payload.health_check_description - created_at: - type: datetime - fields: payload.created_at - updated_at: - type: datetime - fields: payload.updated_at - event_type: ['identity.user.*', 'identity.project.*', 'identity.group.*', 'identity.role.*', 'identity.OS-TRUST:trust.*', 'identity.region.*', 'identity.service.*', 'identity.endpoint.*', 'identity.policy.*'] traits: &identity_crud diff --git a/ceilometer/tests/unit/test_notification.py b/ceilometer/tests/unit/test_notification.py index 5b5fa38b4b..eef14e7573 100644 --- a/ceilometer/tests/unit/test_notification.py +++ b/ceilometer/tests/unit/test_notification.py @@ -93,7 +93,7 @@ class TestNotification(BaseNotificationTest): self.srv = notification.NotificationService(0, self.CONF) def test_targets(self): - self.assertEqual(15, len(self.srv.get_targets())) + self.assertEqual(14, len(self.srv.get_targets())) def test_start_multiple_listeners(self): urls = ["fake://vhost1", "fake://vhost2"] diff --git a/releasenotes/notes/remove-sahara-9254593d4fb137b9.yaml b/releasenotes/notes/remove-sahara-9254593d4fb137b9.yaml new file mode 100644 index 0000000000..9afae551e4 --- /dev/null +++ b/releasenotes/notes/remove-sahara-9254593d4fb137b9.yaml @@ -0,0 +1,9 @@ +--- +upgrade: + - | + Default value of the ``[notification] notification_control_exchanges`` + option has been updated and ``sahara`` is no longer included by default. + + - | + The default event definiton has been updated and no longer includes + events for sahara.