Browse Source

HUE-3893 [sentry] Use the same component and serviceName as the Solr Sentry service

Romain Rigaux 9 years ago
parent
commit
1de7fa7

+ 2 - 2
apps/security/src/security/views.py

@@ -19,7 +19,7 @@ import json
 
 from desktop.lib.django_util import render
 
-from libsentry.sentry_site import get_hive_sentry_provider, get_sentry_server_admin_groups
+from libsentry.sentry_site import get_hive_sentry_provider, get_sentry_server_admin_groups, get_solr_sentry_provider
 
 
 def hive(request):
@@ -47,7 +47,7 @@ def _sentry(request, component):
       'initial': json.dumps({
           'component': component,
           'user': request.user.username,
-          'sentry_provider': get_hive_sentry_provider(),
+          'sentry_provider': get_solr_sentry_provider() if component == 'solr' else get_hive_sentry_provider(),
           'is_sentry_admin': request.user.groups.filter(name__in=get_sentry_server_admin_groups()).exists()
       }),
       'has_impersonation_perm': _has_impersonation_perm(request.user) and component == 'hive',

+ 3 - 0
desktop/libs/libsentry/src/libsentry/api2.py

@@ -64,6 +64,9 @@ def ha_error_handler(func):
 
 
 def get_api(user, component):
+  if component == 'solr':
+    component = component.upper()
+
   client = _get_client(user.username, component)
 
   return SentryApi(client)

+ 3 - 0
desktop/libs/libsentry/src/libsentry/sentry_site.py

@@ -57,6 +57,9 @@ def get_conf(name='sentry'):
 def get_hive_sentry_provider():
   return get_conf(name='hive').get(_CONF_HIVE_PROVIDER, 'server1')
 
+def get_solr_sentry_provider():
+  return 'service1'
+
 
 def get_sentry_server_principal():
   # Get kerberos principal and replace host pattern