Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
nomad-lab
nomad-FAIR
Commits
ca498f4e
Commit
ca498f4e
authored
Jan 28, 2019
by
Markus Scheidgen
Browse files
Fixed kibana path for staging env.
parent
d58a9916
Pipeline
#42848
passed with stage
in 32 seconds
Changes
5
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
gui/.env.development
View file @
ca498f4e
REACT_APP_API_BASE = 'http://localhost:8000/nomad/api'
REACT_APP_APP_BASE = '/nomad'
REACT_APP_APP_STATIC_BASE = ''
REACT_APP_DEBUG = 'true'
\ No newline at end of file
REACT_APP_DEBUG = 'true'
REACT_KIBANA_BASE = '/nomad/kibana'
\ No newline at end of file
gui/src/components/Development.js
View file @
ca498f4e
...
...
@@ -3,7 +3,7 @@ import PropTypes from 'prop-types'
import
{
withStyles
}
from
'
@material-ui/core/styles
'
import
Markdown
from
'
./Markdown
'
import
gitInfo
from
'
../gitinfo
'
import
{
app
Base
}
from
'
../config
'
import
{
kibana
Base
}
from
'
../config
'
class
Development
extends
React
.
Component
{
static
propTypes
=
{
...
...
@@ -31,7 +31,7 @@ class Development extends React.Component {
This system pushes logs, events, monitoring data,
and other application metrics to a central database where it
can be analysed visually.
\n\n[Link to Kiaba](
${
appBase
}
/
kibana/)
\n\n[Link to Kiaba](
${
kibana
Base
}
/)
`
}
<
/Markdown
>
<
/div
>
)
...
...
gui/src/config.js
View file @
ca498f4e
...
...
@@ -8,6 +8,7 @@ import { createMuiTheme } from '@material-ui/core'
window
.
nomadEnv
=
window
.
nomadEnv
||
{}
export
const
apiBase
=
process
.
env
.
REACT_APP_API_BASE
||
window
.
nomadEnv
.
apiBase
export
const
appBase
=
process
.
env
.
REACT_APP_APP_BASE
||
window
.
nomadEnv
.
appBase
export
const
kibanaBase
=
process
.
env
.
REACT_KIBANA_BASE
||
window
.
nomadEnv
.
kibanaBase
export
const
appStaticBase
=
process
.
env
.
REACT_APP_APP_STATIC_BASE
||
window
.
nomadEnv
.
appStaticBase
export
const
debug
=
process
.
env
.
REACT_APP_DEBUG
?
process
.
env
.
REACT_APP_DEBUG
===
'
true
'
:
window
.
nomadEnv
.
debug
...
...
ops/helm/nomad/templates/gui-deployment.yml
View file @
ca498f4e
...
...
@@ -23,6 +23,7 @@ data:
"apiBase": "{{ .Values.proxy.external.path }}/api",
"appBase": "{{ .Values.proxy.external.path }}",
"appStaticBase": "{{ .Values.proxy.external.path }}",
"kibanaBase": "{{ .Values.proxy.external.kibanaPath }}",
"appDebug": false
};
---
...
...
ops/helm/nomad/values.yaml
View file @
ca498f4e
...
...
@@ -59,6 +59,7 @@ proxy:
host
:
"
enc-staging-nomad.esc.rzg.mpg.de"
port
:
80
path
:
"
/fairdi/nomad"
kibanaPath
:
"
/fairdi/kibana"
## configuration of the chart dependency for rabbitmq
rabbitmq
:
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment