Эх сурвалжийг харах

HUE-8330 [impala] Remove mocked impalad http address

Romain Rigaux 7 жил өмнө
parent
commit
67e565f407

+ 5 - 8
apps/impala/src/impala/server.py

@@ -50,14 +50,11 @@ def get_api(user, url):
 
 
 def _get_impala_server_url(session):
-  if session:
-    impala_settings = session.get_formatted_properties()
-    http_addr = next((setting['value'] for setting in impala_settings if setting['key'].lower() == 'http_addr'), None)
-    # Remove scheme if found
-    http_addr = http_addr.replace('http://', '').replace('https://', '')
-    return ('https://' if get_webserver_certificate_file() else 'http://') + http_addr
-  else:
-    return 'http://impalad:25000'
+  impala_settings = session.get_formatted_properties()
+  http_addr = next((setting['value'] for setting in impala_settings if setting['key'].lower() == 'http_addr'), None)
+  # Remove scheme if found
+  http_addr = http_addr.replace('http://', '').replace('https://', '')
+  return ('https://' if get_webserver_certificate_file() else 'http://') + http_addr
 
 
 class ImpalaServerClientException(Exception):

+ 1 - 1
desktop/core/src/desktop/templates/assist.mako

@@ -26,7 +26,7 @@ from dashboard.conf import HAS_SQL_ENABLED
 
 from desktop import appmanager
 from desktop import conf
-from desktop.conf import IS_EMBEDDED, USE_NEW_SIDE_PANELS, VCS, IS_MULTICLUSTER_ONLY
+from desktop.conf import IS_EMBEDDED, USE_NEW_SIDE_PANELS, VCS
 from desktop.lib.i18n import smart_unicode
 from desktop.views import _ko
 %>

+ 37 - 25
desktop/core/src/desktop/templates/ko_components/ko_app_switcher.mako

@@ -60,30 +60,26 @@ from desktop.views import _ko
   <script type="text/javascript">
     (function () {
       var apps = {
-        cdsw: {
-          label: 'Data Science',
-          img:'hi-as-cdsw'
-        },
-        altusAdmin: {
-          label: 'Altus Admin',
-          img:'hi-as-nav'
-        },
-        hue: {
-          label: 'Data Analytics (Hue)',
-          img: 'hi-as-hue'
-        },
-        cm: {
-          label: 'Cloudera Manager',
-          img: 'hi-as-cm'
-        },
-        navigator: {
-          label: 'Navigator',
-          img: 'hi-as-nav'
-        },
-        navopt: {
-          label: 'Data Engineering',
-          img: 'hi-as-nav'
-        }
+          hue: {
+            label: 'Data Warehouse',
+            icon: 'altus-icon altus-adb-query'
+          },
+          cdsw: {
+            label: 'Data Science',
+            icon:'altus-icon altus-ds'
+          },
+          dataFlow: {
+            label: 'Data Flow',
+            icon:'altus-icon altus-workload'
+          },
+          navigator: {
+            label: 'Data Stewart',
+            icon: 'altus-icon altus-adb'
+          },
+          navopt: {
+            label: 'Admin',
+            icon: 'altus-icon altus-iam'
+          }
       };
 
       var AppSwitcher = function AppSwitcher(params) {
@@ -92,7 +88,23 @@ from desktop.views import _ko
         self.links = ko.observableArray([]);
 
         var altusLinks = [{
-            product: 'altusAdmin',
+            product: 'hue',
+            link: 'https://sso.staging.aem.cloudera.com'
+          },
+          {
+            product: 'cdsw',
+            link: 'https://sso.staging.aem.cloudera.com'
+          },
+          {
+            product: 'dataFlow',
+            link: 'https://sso.staging.aem.cloudera.com'
+          },
+          {
+            product: 'navigator',
+            link: 'https://sso.staging.aem.cloudera.com'
+          },
+          {
+            product: 'navopt',
             link: 'https://sso.staging.aem.cloudera.com'
           }
         ];

+ 1 - 1
desktop/libs/notebook/src/notebook/connectors/hiveserver2.py

@@ -195,7 +195,7 @@ class HS2Api(Api):
     except Exception, e:
       LOG.warn('Failed to decode session handle: %s' % e)
 
-    if lang == 'impala':
+    if lang == 'impala' and session:
       http_addr = _get_impala_server_url(session)
       response['http_addr'] = http_addr