Преглед изворни кода

[ui- Quick Start] Logging Python version in the logs and display it on Quick Start page (#4274)

Ayush Goyal пре 2 месеци
родитељ
комит
4550f8c7ee

+ 1 - 1
desktop/core/src/desktop/js/apps/admin/Overview/Overview.scss

@@ -80,7 +80,7 @@
       margin-left: 8px;
     }
 
-    .overview__trademark-text {
+    .overview__footer-text {
       text-align: right;
       padding: 10px;
     }

+ 7 - 1
desktop/core/src/desktop/js/apps/admin/Overview/OverviewTab.tsx

@@ -21,6 +21,7 @@ import ConfigStatus from './ConfigStatus';
 import Analytics from './Analytics';
 import { i18nReact } from '../../../utils/i18nReact';
 import './Overview.scss';
+import { hueWindow } from 'types/types';
 
 const Overview = (): JSX.Element => {
   const { t } = i18nReact.useTranslation();
@@ -46,7 +47,12 @@ const Overview = (): JSX.Element => {
   return (
     <div className="hue-overview-component">
       <Tabs tabPosition="left" items={items} />
-      <div className="overview__trademark-text">
+      <div className="overview__footer-text">
+        {(window as hueWindow).PYTHON_VERSION && (
+          <div>
+            {t('Python version: {{version}}', { version: (window as hueWindow).PYTHON_VERSION })}
+          </div>
+        )}
         {t('Hue and the Hue logo are trademarks of Cloudera, Inc.')}
       </div>
     </div>

+ 1 - 0
desktop/core/src/desktop/js/types/types.ts

@@ -59,6 +59,7 @@ export interface hueWindow {
   HUE_BASE_URL?: string;
   HUE_LANG?: string;
   HUE_VERSION?: string;
+  PYTHON_VERSION?: string;
   LOGGED_USERNAME?: string;
   SQL_ANALYZER_MODE?: string;
   USER_IS_ADMIN?: boolean;

+ 2 - 1
desktop/core/src/desktop/settings.py

@@ -67,7 +67,8 @@ if ENV_HUE_PROCESS_NAME not in os.environ:
 
 desktop.log.basic_logging(os.environ[ENV_HUE_PROCESS_NAME])
 
-logging.info("Welcome to Hue " + HUE_DESKTOP_VERSION)
+logging.info("Welcome to Hue %s" % HUE_DESKTOP_VERSION)
+logging.info("Python version: %s" % sys.version.split(' ')[0])
 
 
 # Add fancy logging

+ 3 - 0
desktop/core/src/desktop/templates/global_js_constants.mako

@@ -774,6 +774,9 @@
   };
 
   window.HUE_VERSION = '${ hue_version() }';
+  % if is_admin(user):
+  window.PYTHON_VERSION = '${ sys.version.split(' ')[0] }';
+  % endif
 
   %if hasattr(ENABLE_NEW_INDEXER, 'get') and ENABLE_NEW_INDEXER.get():
     window.IS_NEW_INDEXER_ENABLED = true;