openstack/cloudkitty
Code Issues Proposed changes

Merge "Fix API report requests when using opensearch" into stable/2024.1

Browse Source
This commit is contained in:
Zuul 2024-05-27 15:12:19 +00:00 committed by Gerrit Code Review
commit 6641acb738
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cloudkitty/storage/v2/opensearch/client.py
View File

@ -98,14 +98,15 @@ class OpenSearchClient(object):
sources = [] sources = []
for elem in groupby: for elem in groupby:
if elem == 'type': if elem == 'type':
sources.append({'type': {'terms': {'field': 'type'}}}) sources.append({'type': {'terms': {'field': 'type.keyword'}}})
elif elem == 'time': elif elem == 'time':
# Not doing a date_histogram aggregation because we don't know # Not doing a date_histogram aggregation because we don't know
# the period # the period
sources.append({'begin': {'terms': {'field': 'start'}}}) sources.append({'begin': {'terms': {'field': 'start'}}})
sources.append({'end': {'terms': {'field': 'end'}}}) sources.append({'end': {'terms': {'field': 'end'}}})
else: else:
sources.append({elem: {'terms': {'field': 'groupby.' + elem}}}) field = 'groupby.' + elem + '.keyword'
sources.append({elem: {'terms': {'field': field}}})
return {"sources": sources} return {"sources": sources}

6
cloudkitty/tests/storage/v2/opensearch/test_client.py
View File

@ -86,9 +86,9 @@ class TestOpenSearchClient(unittest.TestCase):
self.assertEqual( self.assertEqual(
self.client._build_composite(['one', 'type', 'two']), self.client._build_composite(['one', 'type', 'two']),
{'sources': [ {'sources': [
{'one': {'terms': {'field': 'groupby.one'}}}, {'one': {'terms': {'field': 'groupby.one.keyword'}}},
{'type': {'terms': {'field': 'type'}}}, {'type': {'terms': {'field': 'type.keyword'}}},
{'two': {'terms': {'field': 'groupby.two'}}}, {'two': {'terms': {'field': 'groupby.two.keyword'}}},
]}, ]},
) )

6
releasenotes/notes/fix-opensearch-report-344508dd4e3d0ccc.yaml Normal file
View File

@ -0,0 +1,6 @@
---
fixes:
- |
Fix some API report requests that were returning HTTP 500 errors when using
the ``opensearch`` storage backend. This fixes failures to load the Horizon
``Rating`` panel.