Merge pull request #2244 from Quentin-M/fix_clustered_tags

w/g/f/remote.py: add missing local field to auto_complete_{tags,values}
graphite-project · Feb 26, 2018 · 8ad9ad4 · 8ad9ad4
2 parents d6e45fa + 9e20e18
commit 8ad9ad4
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 9 deletions.
diff --git a/webapp/graphite/finders/remote.py b/webapp/graphite/finders/remote.py
@@ -189,6 +189,7 @@ def auto_complete_tags(self, exprs, tagPrefix=None, limit=None, requestContext=N
         fields = [
             ('tagPrefix', tagPrefix or ''),
             ('limit', str(limit)),
+            ('local', self.params.get('local', '1')),
         ]
         for expr in exprs:
             fields.append(('expr', expr))
@@ -223,6 +224,7 @@ def auto_complete_values(self, exprs, tag, valuePrefix=None, limit=None, request
             ('tag', tag or ''),
             ('valuePrefix', valuePrefix or ''),
             ('limit', str(limit)),
+            ('local', self.params.get('local', '1')),
         ]
         for expr in exprs:
             fields.append(('expr', expr))

diff --git a/webapp/graphite/tags/views.py b/webapp/graphite/tags/views.py
@@ -1,9 +1,10 @@
 from graphite.util import jsonResponse, HttpResponse, HttpError
 from graphite.storage import STORE, extractForwardHeaders
 
-def _requestContext(request):
+def _requestContext(request, queryParams):
   return {
     'forwardHeaders': extractForwardHeaders(request),
+    'localOnly': queryParams.get('local') == '1',
   }
 
 @jsonResponse
@@ -15,7 +16,7 @@ def tagSeries(request, queryParams):
   if not path:
     raise HttpError('no path specified', status=400)
 
-  return STORE.tagdb.tag_series(path, requestContext=_requestContext(request))
+  return STORE.tagdb.tag_series(path, requestContext=_requestContext(request, queryParams))
 
 @jsonResponse
 def tagMultiSeries(request, queryParams):
@@ -32,7 +33,7 @@ def tagMultiSeries(request, queryParams):
   else:
     raise HttpError('no paths specified',status=400)
 
-  return STORE.tagdb.tag_multi_series(paths, requestContext=_requestContext(request))
+  return STORE.tagdb.tag_multi_series(paths, requestContext=_requestContext(request, queryParams))
 
 @jsonResponse
 def delSeries(request, queryParams):
@@ -49,7 +50,7 @@ def delSeries(request, queryParams):
   else:
     raise HttpError('no path specified', status=400)
 
-  return STORE.tagdb.del_multi_series(paths, requestContext=_requestContext(request))
+  return STORE.tagdb.del_multi_series(paths, requestContext=_requestContext(request, queryParams))
 
 @jsonResponse
 def findSeries(request, queryParams):
@@ -67,7 +68,7 @@ def findSeries(request, queryParams):
   if not exprs:
     raise HttpError('no tag expressions specified', status=400)
 
-  return STORE.tagdb.find_series(exprs, requestContext=_requestContext(request))
+  return STORE.tagdb.find_series(exprs, requestContext=_requestContext(request, queryParams))
 
 @jsonResponse
 def tagList(request, queryParams):
@@ -77,7 +78,7 @@ def tagList(request, queryParams):
   return STORE.tagdb.list_tags(
     tagFilter=request.GET.get('filter'),
     limit=request.GET.get('limit'),
-    requestContext=_requestContext(request),
+    requestContext=_requestContext(request, queryParams),
   )
 
 @jsonResponse
@@ -89,7 +90,7 @@ def tagDetails(request, queryParams, tag):
     tag,
     valueFilter=queryParams.get('filter'),
     limit=queryParams.get('limit'),
-    requestContext=_requestContext(request),
+    requestContext=_requestContext(request, queryParams),
   )
 
 @jsonResponse
@@ -109,7 +110,7 @@ def autoCompleteTags(request, queryParams):
     exprs,
     tagPrefix=queryParams.get('tagPrefix'),
     limit=queryParams.get('limit'),
-    requestContext=_requestContext(request)
+    requestContext=_requestContext(request, queryParams)
   )
 
 @jsonResponse
@@ -134,5 +135,5 @@ def autoCompleteValues(request, queryParams):
     tag,
     valuePrefix=queryParams.get('valuePrefix'),
     limit=queryParams.get('limit'),
-    requestContext=_requestContext(request)
+    requestContext=_requestContext(request, queryParams)
   )
diff --git a/webapp/tests/test_finders_remote.py b/webapp/tests/test_finders_remote.py
@@ -339,6 +339,7 @@ def test_auto_complete_tags(self, http_request):
         'fields': [
           ('tagPrefix', 'tag'),
           ('limit', '100'),
+          ('local', '1'),
           ('expr', 'name=test'),
         ],
         'headers': None,
@@ -367,6 +368,7 @@ def test_auto_complete_tags(self, http_request):
         'fields': [
           ('tagPrefix', 'tag'),
           ('limit', '5'),
+          ('local', '1'),
           ('expr', 'name=test'),
           ('expr', 'tag3=value3'),
         ],
@@ -417,6 +419,7 @@ def test_auto_complete_values(self, http_request):
           ('tag', 'tag1'),
           ('valuePrefix', 'value'),
           ('limit', '100'),
+          ('local', '1'),
           ('expr', 'name=test'),
         ],
         'headers': None,
@@ -446,6 +449,7 @@ def test_auto_complete_values(self, http_request):
           ('tag', 'tag1'),
           ('valuePrefix', 'value'),
           ('limit', '5'),
+          ('local', '1'),
           ('expr', 'name=test'),
           ('expr', 'tag3=value3'),
         ],