Fix influx, prometheus, elastic, protocol; correct version embedding (#…

…69) * Fix influx, prometheus, elastic, protocol; correct version embedding in release; and placement of database description * Drop console log
multiprocessio · Oct 12, 2021 · ba29c9e · ba29c9e
1 parent ad1729e
commit ba29c9e
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 10 deletions.
diff --git a/desktop/panel/database.ts b/desktop/panel/database.ts
@@ -89,13 +89,13 @@ export async function evalDatabase(
   ) {
     const defaultPort = DEFAULT_PORT[connector.database.type];
     // This is going to get annoying if one of these dbs ever has a non-HTTP protocol.
-    const { hostname, port } = new URL(
+    const { protocol, hostname, port } = new URL(
       fullHttpURL(connector.database.address, undefined, defaultPort)
     );
     log.info(
       `Connecting ${
         serverId ? 'through tunnel ' : ''
-      }to ${hostname}:${port} for ${connector.database.type} query`
+      }to ${protocol}//${hostname}:${port} for ${connector.database.type} query`
     );
     return await tunnel(
       project,
@@ -129,7 +129,7 @@ export async function evalDatabase(
           return evalPrometheus(
             content,
             info.database.range,
-            host,
+            protocol + '//' + host,
             port,
             connector,
             info
@@ -140,7 +140,7 @@ export async function evalDatabase(
           return evalInflux(
             content,
             info.database.range,
-            host,
+            protocol + '//' + host,
             port,
             connector,
             info

diff --git a/desktop/panel/databases/prometheus.ts b/desktop/panel/databases/prometheus.ts
@@ -1,4 +1,5 @@
 import fetch from 'node-fetch';
+import log from '../../../shared/log';
 import { timestampsFromRange } from '../../../shared/sql';
 import {
   DatabaseConnectorInfo,
@@ -29,6 +30,7 @@ export async function evalPrometheus(
     end.valueOf() / 1000
   }&step=${panel.database.step}`;
 
+  log.info('Prometheus query: ' + endpoint);
   const headers: Record<string, string> = {};
   if (
     connector.database.username ||

diff --git a/desktop/scripts/release.build b/desktop/scripts/release.build
@@ -1,10 +1,9 @@
 rm -rf build
 yarn
 setenv UI_ESBUILD_ARGS "--minify"
-yarn build-ui
-prepend "window.DS_CONFIG_VERSION='{arg0}';" build/ui.js
-prepend "window.DS_CONFIG_MODE='desktop';" build/ui.js
 yarn build-desktop
+prepend "window.DS_CONFIG_MODE='desktop';" build/ui.js
+prepend "window.DS_CONFIG_VERSION='{arg0}';" build/ui.js
 prepend "global.DS_CONFIG_VERSION='{arg0}';" build/desktop.js
 yarn electron-packager --overwrite --out=releases --build-version={arg0} --app-version={arg0} . "DataStation Community Edition"
 zip -9 -r releases/{os}-{arch}-{arg0}.zip "releases/DataStation Community Edition-{os}-{arch}"
diff --git a/ui/components/Select.tsx b/ui/components/Select.tsx
@@ -33,6 +33,7 @@ export function Select({
   used,
   allowNone,
   tooltip,
+  subtext,
 }: {
   value: string;
   onChange: (value: string) => void;
@@ -43,6 +44,7 @@ export function Select({
   used?: Array<string>;
   allowNone?: string;
   tooltip?: React.ReactNode;
+  subtext?: React.ReactNode;
 }) {
   let selectClass = 'select vertical-align-center';
   if (className) {
@@ -78,7 +80,7 @@ export function Select({
   }, [value, getOptionValues(children).join(',')]);
 
   const select = (
-    <React.Fragment>
+    <div>
       <select
         className={`${label ? '' : className} select-container`}
         value={value}
@@ -91,7 +93,10 @@ export function Select({
         {children}
       </select>
       {tooltip && <Tooltip>{tooltip}</Tooltip>}
-    </React.Fragment>
+      <div>
+        <small>{subtext}</small>
+      </div>
+    </div>
   );
   if (label) {
     return (

diff --git a/ui/panels/DatabasePanel.tsx b/ui/panels/DatabasePanel.tsx
@@ -89,6 +89,7 @@ export function DatabasePanelDetails({
                 panel.database.connectorId = connectorId;
                 updatePanel(panel);
               }}
+              subtext={VENDORS[connector.database.type]?.name}
             >
               {vendorsWithConnectors.map((g) => (
                 <optgroup label={g.label} key={g.label}>
@@ -100,7 +101,6 @@ export function DatabasePanelDetails({
                 </optgroup>
               ))}
             </Select>
-            <small>{VENDORS[connector.database.type]?.name}</small>
           </React.Fragment>
         )}
       </div>