Skip to content

Commit d7cc72a

Browse files
inishchithvaleriocos
authored andcommitted
[elk] Add option to fetch from selected branches
Signed-off-by: inishchith <[email protected]>
1 parent 8f5661c commit d7cc72a

File tree

2 files changed

+15
-1
lines changed

2 files changed

+15
-1
lines changed

grimoire_elk/elk.py

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,7 @@ def feed_backend(url, clean, fetch_archive, backend_name, backend_params,
132132
offset = None
133133
from_date = None
134134
category = None
135+
branches = None
135136
latest_items = None
136137
filter_classified = None
137138

@@ -183,6 +184,15 @@ def feed_backend(url, clean, fetch_archive, backend_name, backend_params,
183184
except AttributeError:
184185
pass
185186

187+
if 'branches' in signature.parameters:
188+
try:
189+
branches = backend_cmd.branches
190+
except AttributeError:
191+
try:
192+
branches = backend_cmd.parsed_args.branches
193+
except AttributeError:
194+
pass
195+
186196
if 'filter_classified' in signature.parameters:
187197
try:
188198
filter_classified = backend_cmd.parsed_args.filter_classified
@@ -207,6 +217,8 @@ def feed_backend(url, clean, fetch_archive, backend_name, backend_params,
207217
params['latest_items'] = latest_items
208218
if category:
209219
params['category'] = category
220+
if branches:
221+
params['branches'] = branches
210222
if filter_classified:
211223
params['filter_classified'] = filter_classified
212224
if from_date and (from_date.replace(tzinfo=None) != parser.parse("1970-01-01")):

grimoire_elk/raw/elastic.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ def add_update_date(self, item):
154154
# Also add timestamp used in incremental enrichment
155155
item['metadata__timestamp'] = timestamp.isoformat()
156156

157-
def feed(self, from_date=None, from_offset=None, category=None,
157+
def feed(self, from_date=None, from_offset=None, category=None, branches=None,
158158
latest_items=None, arthur_items=None, filter_classified=None):
159159
""" Feed data in Elastic from Perceval or Arthur """
160160

@@ -205,6 +205,8 @@ def feed(self, from_date=None, from_offset=None, category=None,
205205
# by all Perceval backends
206206
if category is not None:
207207
params['category'] = category
208+
if branches is not None:
209+
params['branches'] = branches
208210
if filter_classified is not None:
209211
params['filter_classified'] = filter_classified
210212

0 commit comments

Comments
 (0)