Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Labels
Merge Requests
95
Merge Requests
95
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Jobs
Commits
Open sidebar
nexedi
slapos
Commits
0fbdacc5
Commit
0fbdacc5
authored
Dec 05, 2019
by
Jérome Perrin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
software/grafana: use monitoring stack for new promises
parent
f8507b72
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
11 deletions
+5
-11
software/grafana/buildout.hash.cfg
software/grafana/buildout.hash.cfg
+1
-1
software/grafana/instance.cfg.in
software/grafana/instance.cfg.in
+4
-4
software/grafana/software.cfg
software/grafana/software.cfg
+0
-6
No files found.
software/grafana/buildout.hash.cfg
View file @
0fbdacc5
...
...
@@ -15,7 +15,7 @@
[instance-profile]
filename = instance.cfg.in
md5sum =
8abfd8ce01c375257e94f64824478f5c
md5sum =
53dc6a0bf8376436dcb5c0dc08e722de
[influxdb-config-file]
filename = influxdb-config-file.cfg.in
...
...
software/grafana/instance.cfg.in
View file @
0fbdacc5
...
...
@@ -79,10 +79,10 @@ module = check_port_listening
name = ${:_buildout_section_name_}.py
[check-url-available-promise]
recipe = slapos.cookbook:check_url_availabl
e
path = ${directory:promise}/${:_buildout_section_name_}
dash_path = {{ dash_bin }}
c
url_path = {{ curl_bin }
}
<= monitor-promise-bas
e
module = check_url_available
name = ${:_buildout_section_name_}.py
c
onfig-url = ${:url
}
[influxdb]
ipv6 = ${instance-parameter:ipv6-random}
...
...
software/grafana/software.cfg
View file @
0fbdacc5
...
...
@@ -6,8 +6,6 @@ extends =
../../component/make/buildout.cfg
../../component/golang/buildout.cfg
../../component/openssl/buildout.cfg
../../component/curl/buildout.cfg
../../component/dash/buildout.cfg
buildout.hash.cfg
gowork.cfg
...
...
@@ -153,11 +151,7 @@ context =
key grafana_homepath gowork:grafana-homepath
key loki_bin gowork:loki-bin
key promtail_bin gowork:promtail-bin
key curl_bin :curl-bin
key dash_bin :dash-bin
key monitor_template monitor2-template:rendered
curl-bin = ${curl:location}/bin/curl
dash-bin = ${dash:location}/bin/dash
[versions]
slapos.recipe.template = 4.2
...
...
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