fix: change getting serverUrl for vmui-logs (#4604) (#4677)

VictoriaMetrics · Jul 21, 2023 · 23706ab · 23706ab
1 parent ee0bf07
commit 23706ab
Show file tree

Hide file tree

Showing 10 changed files with 14 additions and 14 deletions.
diff --git a/app/vlselect/vmui/asset-manifest.json b/app/vlselect/vmui/asset-manifest.json
@@ -1,14 +1,14 @@
 {
   "files": {
-    "main.css": "./static/css/main.f5cb3747.css",
-    "main.js": "./static/js/main.886fc1d3.js",
-    "static/js/27.c1ccfd29.chunk.js": "./static/js/27.c1ccfd29.chunk.js",
+    "main.css": "./static/css/main.4ca19d73.css",
+    "main.js": "./static/js/main.43d76cf9.js",
+    "static/js/522.b5ae4365.chunk.js": "./static/js/522.b5ae4365.chunk.js",
     "static/media/Lato-Regular.ttf": "./static/media/Lato-Regular.d714fec1633b69a9c2e9.ttf",
     "static/media/Lato-Bold.ttf": "./static/media/Lato-Bold.32360ba4b57802daa4d6.ttf",
     "index.html": "./index.html"
   },
   "entrypoints": [
-    "static/css/main.f5cb3747.css",
-    "static/js/main.886fc1d3.js"
+    "static/css/main.4ca19d73.css",
+    "static/js/main.43d76cf9.js"
   ]
 }
diff --git a/app/vlselect/vmui/index.html b/app/vlselect/vmui/index.html
@@ -1 +1 @@
-<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="./favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no"/><meta name="theme-color" content="#000000"/><meta name="description" content="UI for VictoriaMetrics"/><link rel="apple-touch-icon" href="./apple-touch-icon.png"/><link rel="icon" type="image/png" sizes="32x32" href="./favicon-32x32.png"><link rel="manifest" href="./manifest.json"/><title>VM UI</title><script src="./dashboards/index.js" type="module"></script><meta name="twitter:card" content="summary_large_image"><meta name="twitter:image" content="./preview.jpg"><meta name="twitter:title" content="UI for VictoriaMetrics"><meta name="twitter:description" content="Explore and troubleshoot your VictoriaMetrics data"><meta name="twitter:site" content="@VictoriaMetrics"><meta property="og:title" content="Metric explorer for VictoriaMetrics"><meta property="og:description" content="Explore and troubleshoot your VictoriaMetrics data"><meta property="og:image" content="./preview.jpg"><meta property="og:type" content="website"><script defer="defer" src="./static/js/main.886fc1d3.js"></script><link href="./static/css/main.f5cb3747.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
+<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="./favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no"/><meta name="theme-color" content="#000000"/><meta name="description" content="UI for VictoriaMetrics"/><link rel="apple-touch-icon" href="./apple-touch-icon.png"/><link rel="icon" type="image/png" sizes="32x32" href="./favicon-32x32.png"><link rel="manifest" href="./manifest.json"/><title>VM UI</title><script src="./dashboards/index.js" type="module"></script><meta name="twitter:card" content="summary_large_image"><meta name="twitter:image" content="./preview.jpg"><meta name="twitter:title" content="UI for VictoriaMetrics"><meta name="twitter:description" content="Explore and troubleshoot your VictoriaMetrics data"><meta name="twitter:site" content="@VictoriaMetrics"><meta property="og:title" content="Metric explorer for VictoriaMetrics"><meta property="og:description" content="Explore and troubleshoot your VictoriaMetrics data"><meta property="og:image" content="./preview.jpg"><meta property="og:type" content="website"><script defer="defer" src="./static/js/main.43d76cf9.js"></script><link href="./static/css/main.4ca19d73.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
diff --git a/app/vlselect/vmui/static/css/main.4ca19d73.css b/app/vlselect/vmui/static/css/main.4ca19d73.css
diff --git a/app/vlselect/vmui/static/css/main.f5cb3747.css b/app/vlselect/vmui/static/css/main.f5cb3747.css
diff --git a/app/vlselect/vmui/static/js/27.c1ccfd29.chunk.js b/app/vlselect/vmui/static/js/27.c1ccfd29.chunk.js
diff --git a/app/vlselect/vmui/static/js/522.b5ae4365.chunk.js b/app/vlselect/vmui/static/js/522.b5ae4365.chunk.js
diff --git a/app/vlselect/vmui/static/js/main.43d76cf9.js b/app/vlselect/vmui/static/js/main.43d76cf9.js
diff --git a/...ui/static/js/main.886fc1d3.js.LICENSE.txt → ...ui/static/js/main.43d76cf9.js.LICENSE.txt b/...ui/static/js/main.886fc1d3.js.LICENSE.txt → ...ui/static/js/main.43d76cf9.js.LICENSE.txt
@@ -7,7 +7,7 @@
 /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */
 
 /**
- * @remix-run/router v1.6.2
+ * @remix-run/router v1.7.1
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -18,7 +18,7 @@
  */
 
 /**
- * React Router DOM v6.11.2
+ * React Router DOM v6.14.1
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -29,7 +29,7 @@
  */
 
 /**
- * React Router v6.11.2
+ * React Router v6.14.1
  *
  * Copyright (c) Remix Software Inc.
  *

diff --git a/app/vlselect/vmui/static/js/main.886fc1d3.js b/app/vlselect/vmui/static/js/main.886fc1d3.js
diff --git a/app/vmui/packages/vmui/src/utils/default-server-url.ts b/app/vmui/packages/vmui/src/utils/default-server-url.ts
@@ -4,7 +4,7 @@ const { REACT_APP_LOGS } = process.env;
 
 export const getDefaultServer = (tenantId?: string): string => {
   const { serverURL } = getAppModeParams();
-  const logsURL = `${window.location.protocol}//${window.location.host}`;
+  const logsURL = window.location.href.replace(/\/(select\/)?(vmui)\/.*/, "");
   const url = serverURL || window.location.href.replace(/\/(?:prometheus\/)?(?:graph|vmui)\/.*/, "/prometheus");
   if (REACT_APP_LOGS) return logsURL;
   if (tenantId) return replaceTenantId(url, tenantId);