-
Notifications
You must be signed in to change notification settings - Fork 2.4k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Allow embedding custom UI config in index.html #490
Conversation
@@ -2,4 +2,5 @@ | |||
<html lang="en"> | |||
<meta charset="UTF-8"> | |||
<title>Test Page</title> | |||
<!-- JAEGER_CONFIG=DEFAULT_CONFIG; --> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
change this to: "JAEGER_CONFIG = DEFAULT_CONFIG;" to be a more accurate fixture?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
how is it more accurate? The regexp ignores the whitespace.
cmd/query/app/static_handler.go
Outdated
} | ||
|
||
var c map[string]interface{} | ||
var unmarshall func([]byte, interface{}) error |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
s/unmarshall/unmarshal
Signed-off-by: Yuri Shkuro <[email protected]>
Signed-off-by: Yuri Shkuro <[email protected]>
Signed-off-by: Yuri Shkuro <[email protected]>
Signed-off-by: Yuri Shkuro <[email protected]>
Signed-off-by: Yuri Shkuro <[email protected]>
Signed-off-by: Yuri Shkuro <[email protected]>
Signed-off-by: Yuri Shkuro <[email protected]>
Signed-off-by: Yuri Shkuro <[email protected]>
Signed-off-by: Yuri Shkuro <[email protected]>
…keys, instead of strings Signed-off-by: Yuri Shkuro <[email protected]>
Signed-off-by: Yuri Shkuro <[email protected]>
return &StaticAssetsHandler{staticAssetsRoot: staticAssetsRoot} | ||
indexBytes, err := ioutil.ReadFile(staticAssetsRoot + "index.html") | ||
if err != nil { | ||
return nil, errors.Wrap(err, "Cannot read UI static assets") |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Now it fails without UI. Before it was working. Workaround is to create empty index.html
or do not include static handler if flag is empty
#493 uses query as a docker container, when xdock is executed it builds all images, Now we have to build UI which takes significant time.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
let's discuss on #497
For #489
replaces
in
index.html
withTODO:
index.html