diff options
| author | Takashi Kajinami <tkajinam@redhat.com> | 2022-03-01 17:25:12 +0900 |
|---|---|---|
| committer | Takashi Kajinami <tkajinam@redhat.com> | 2022-03-01 17:25:12 +0900 |
| commit | 21a989e70aa02ec6ad7d15f39b34426b60009163 (patch) | |
| tree | be86dcb6fc30528fbae834fe2dc2b0c7b4d616e0 /ceilometer | |
| parent | bac34383c60b90ca674c1d3eb23cdb07d9233240 (diff) | |
| download | ceilometer-21a989e70aa02ec6ad7d15f39b34426b60009163.tar.gz | |
Remove reference to the tenant attribute of RequestContext
... because the attribute was deprecated a long ago and no longer
available since oslo.context 4.0.0[1].
[1] f4cbe4c296f4dd23c451a5804a70f639cd8976d6
Change-Id: Ica26126946633f54ecb04c8c0414633332785fab
Diffstat (limited to 'ceilometer')
| -rw-r--r-- | ceilometer/event/converter.py | 4 | ||||
| -rw-r--r-- | ceilometer/meter/notifications.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ceilometer/event/converter.py b/ceilometer/event/converter.py index c33a90e6..67734675 100644 --- a/ceilometer/event/converter.py +++ b/ceilometer/event/converter.py @@ -74,13 +74,13 @@ class EventDefinition(object): service=dict(type='text', fields='publisher_id'), request_id=dict(type='text', fields='ctxt.request_id'), project_id=dict(type='text', fields=['payload.tenant_id', - 'ctxt.tenant']), + 'ctxt.project_id']), user_id=dict(type='text', fields=['payload.user_id', 'ctxt.user_id']), # TODO(dikonoor):tenant_id is old terminology and should # be deprecated tenant_id=dict(type='text', fields=['payload.tenant_id', - 'ctxt.tenant']), + 'ctxt.project_id']), ) def __init__(self, definition_cfg, trait_plugin_mgr, raw_levels): diff --git a/ceilometer/meter/notifications.py b/ceilometer/meter/notifications.py index 72fb7a1f..3846ac61 100644 --- a/ceilometer/meter/notifications.py +++ b/ceilometer/meter/notifications.py @@ -70,7 +70,7 @@ class MeterDefinition(object): self._fallback_user_id = declarative.Definition( 'user_id', "ctxt.user_id|ctxt.user", plugin_manager) self._fallback_project_id = declarative.Definition( - 'project_id', "ctxt.tenant_id|ctxt.tenant", plugin_manager) + 'project_id', "ctxt.project_id|ctxt.tenant_id", plugin_manager) self._attributes = {} self._metadata_attributes = {} self._user_meta = None |