Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
5
Merge Requests
5
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jérome Perrin
slapos
Commits
b4e4218d
Commit
b4e4218d
authored
Oct 26, 2021
by
Jérome Perrin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
software/grafana: version up grafana v8.3.4
parent
79c59324
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
5 deletions
+11
-5
software/grafana/buildout.hash.cfg
software/grafana/buildout.hash.cfg
+1
-1
software/grafana/instance.cfg.in
software/grafana/instance.cfg.in
+2
-0
software/grafana/software.cfg
software/grafana/software.cfg
+8
-4
No files found.
software/grafana/buildout.hash.cfg
View file @
b4e4218d
...
@@ -15,7 +15,7 @@
...
@@ -15,7 +15,7 @@
[instance-profile]
[instance-profile]
filename = instance.cfg.in
filename = instance.cfg.in
md5sum =
60aad3c9b3b8c2668e865671d4146183
md5sum =
079c518004cc0239e61e295aa3879f52
[influxdb-config-file]
[influxdb-config-file]
filename = influxdb-config-file.cfg.in
filename = influxdb-config-file.cfg.in
...
...
software/grafana/instance.cfg.in
View file @
b4e4218d
...
@@ -780,6 +780,8 @@ software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/a
...
@@ -780,6 +780,8 @@ software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/a
slave = true
slave = true
config-url = ${grafana:url}
config-url = ${grafana:url}
config-https-only = true
config-https-only = true
config-type = websocket
config-websocket-path-list = /api/live/ws
return = domain secure_access
return = domain secure_access
[apache-frontend-available-promise]
[apache-frontend-available-promise]
...
...
software/grafana/software.cfg
View file @
b4e4218d
...
@@ -24,17 +24,20 @@ parts =
...
@@ -24,17 +24,20 @@ parts =
part = python3
part = python3
[nodejs]
[nodejs]
<= nodejs-1
4.16
.0
<= nodejs-1
6.13
.0
[yarn]
[yarn]
<= yarn-1.22.10
<= yarn-1.22.15
[gcc]
max_version = 0
[go_github.com_grafana_grafana]
[go_github.com_grafana_grafana]
<= go-git-package
<= go-git-package
go.importpath = github.com/grafana/grafana
go.importpath = github.com/grafana/grafana
repository = https://github.com/grafana/grafana
repository = https://github.com/grafana/grafana
revision = v
7.5.2-0-gca413c612f
revision = v
8.3.4-0-ga551d74b11
[go_github.com_grafana_loki]
[go_github.com_grafana_loki]
<= go-git-package
<= go-git-package
...
@@ -90,9 +93,10 @@ command = bash -c "
...
@@ -90,9 +93,10 @@ command = bash -c "
. ${gowork:env.sh} &&
. ${gowork:env.sh} &&
# Unlike the loki, grafana _needs_ CGO_ENABLED, so we override here
# Unlike the loki, grafana _needs_ CGO_ENABLED, so we override here
export CGO_ENABLED=1 &&
export CGO_ENABLED=1 &&
make gen-go && \
go run build.go setup && \
go run build.go setup && \
go run build.go build && \
go run build.go build && \
${yarn:location}/bin/yarn install --
pure-lockfi
le && \
${yarn:location}/bin/yarn install --
immutab
le && \
${yarn:location}/bin/yarn run build && \
${yarn:location}/bin/yarn run build && \
${yarn:location}/bin/yarn run plugins:build-bundled && \
${yarn:location}/bin/yarn run plugins:build-bundled && \
# Cleanup yarn and Cypress caches
# Cleanup yarn and Cypress caches
...
...
Write
Preview
Markdown
is supported
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