Commit 0f3bb930 authored by Jacob Vosmaer's avatar Jacob Vosmaer

More grafana setup, not done yet

parent 5c802d2e
gitlab-shell/
.ssh/
gitlab-satellites/
repositories/
gitlab/
gitlab-ci/
gitlab-runner/
gitlab-ci-multi-runner/
Procfile
postgresql/data
postgresql/.s.*
postgresql-replica/data
postgresql-replica/.s.*
redis/*.conf
.bundle/
gitlab-openldap/bin/
gitlab-openldap/etc/
gitlab-openldap/include/
gitlab-openldap/lib/
gitlab-openldap/libexec/
gitlab-openldap/openldap-2.4.40.tgz
gitlab-openldap/openldap-2.4.40/
gitlab-openldap/sbin/
gitlab-openldap/share/
.vagrant/
gitlab-workhorse/
.vagrant_enabled
port
.ruby-version
localhost.*
influxdb/src
influxdb/bin
influxdb/pkg
influxdb/*.tar.gz
grafana/src
grafana/pkg
grafana/bin
grafana/public
grafana/conf
grafana/vendor
grafana/*.tar.gz
influxdb/meta/
influxdb/wal/
influxdb/influxdb.conf
grafana/grafana.ini
grafana/data/
grafana/gdk-pg-created
......@@ -172,7 +172,7 @@ influxdb/meta/meta.db:
influxdb/influxdb.conf:
sed -e "s|/home/git|${gitlab_development_root}|g" $@.example > $@
grafana-setup: grafana/grafana.ini grafana/bin/grafana-server
grafana-setup: grafana/grafana.ini grafana/bin/grafana-server grafana/gdk-pg-created
grafana/bin/grafana-server:
cd grafana && make
......@@ -182,6 +182,10 @@ grafana/grafana.ini:
-e "s/GDK_USERNAME/${shell whoami}/g" \
$@.example > $@
grafana/gdk-pg-created:
PATH=${postgres_bin_dir}:${PATH} support/create-grafana-db
touch $@
clean-config:
rm -f \
gitlab/config/gitlab.yml \
......
......@@ -20,12 +20,12 @@ foreman_start() {
}
db() {
foreman_start -c all=0,redis=1,postgresql=1,openldap=1,influxdb=1,grafana=1
foreman_start -c all=0,redis=1,postgresql=1,openldap=1,influxdb=1
}
app() {
print_port
foreman_start -c all=0,rails-web=1,rails-background-jobs=1,gitlab-workhorse=1,workhorse-stunnel=1
foreman_start -c all=0,rails-web=1,rails-background-jobs=1,gitlab-workhorse=1,workhorse-stunnel=1,grafana=1
}
all() {
......
#!/usr/bin/env ruby
begin
foreman_pid = spawn('./run', 'db')
sleep 10
system *%W(createdb -h #{Dir.pwd}/postgresql grafana)
status = $?
ensure
Process.kill('TERM', foreman_pid)
end
exit status.success?
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment