adds config option for setting the app's base url (#69)

grafana · Feb 7, 2021 · 86f07d7 · 86f07d7
1 parent e37a9a0
commit 86f07d7
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 1 deletion.
diff --git a/pkg/config/config.go b/pkg/config/config.go
@@ -35,6 +35,7 @@ type Server struct {
 
 	StoragePath string `def:"<installPrefix>/var/lib/pyroscope" desc:"directory where pyroscope stores profiling data"`
 	ApiBindAddr string `def:":4040" desc:"port for the HTTP server used for data ingestion and web UI"`
+	BaseURL     string `def:"" desc:"base URL for when the server is behind a reverse proxy with a different path"`
 
 	// These will eventually be replaced by some sort of a system that keeps track of RAM
 	//   and updates

diff --git a/pkg/server/controller.go b/pkg/server/controller.go
@@ -119,6 +119,7 @@ type indexPage struct {
 	InitialState  string
 	BuildInfo     string
 	ExtraMetadata string
+	BaseURL       string
 }
 
 func (ctrl *Controller) renderIndexPage(dir http.FileSystem, rw http.ResponseWriter, _ *http.Request) {
@@ -185,6 +186,7 @@ func (ctrl *Controller) renderIndexPage(dir http.FileSystem, rw http.ResponseWri
 		InitialState:  initialStateStr,
 		BuildInfo:     buildInfoStr,
 		ExtraMetadata: extraMetadataStr,
+		BaseURL:       ctrl.cfg.Server.BaseURL,
 	})
 	if err != nil {
 		renderServerError(rw, fmt.Sprintf("could not marshal json: %q", err))

diff --git a/webapp/javascript/util/update_requests.js b/webapp/javascript/util/update_requests.js
@@ -1,7 +1,7 @@
 export function buildRenderURL(state) {
   const { from, until } = state;
 
-  let url = `/render?from=${encodeURIComponent(from)}&until=${encodeURIComponent(until)}`;
+  let url = `render?from=${encodeURIComponent(from)}&until=${encodeURIComponent(until)}`;
   const nameLabel = state.labels.find((x) => x.name == '__name__');
 
   if (nameLabel) {

diff --git a/webapp/templates/index.html b/webapp/templates/index.html
@@ -7,6 +7,9 @@
   <meta name="viewport" content="width=device-width">
   <title>Pyroscope</title>
   <link rel="stylesheet" href="build/styles.<%= webpack.hash %>.css">
+  {{- if .BaseURL }}
+  <base href="{{ .BaseURL }}">
+  {{- end }}
   {{ .ExtraMetadata }}
   <%= extra_metadata %>
   <% if (mode == "development") { %>