IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'docs-2.6'

Browse Source
This commit is contained in:
Torkel Ödegaard 2016-01-08 10:25:20 +01:00
commit 3362d6bc56
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/Makefile
View File

@ -44,7 +44,7 @@ docs-test: docs-build
$(DOCKER_RUN_DOCS) "$(DOCKER_DOCS_IMAGE)" ./test.sh $(DOCKER_RUN_DOCS) "$(DOCKER_DOCS_IMAGE)" ./test.sh
docs-build: docs-build:
git fetch https://github.com/grafana/grafana.git docs-2.1 && git diff --name-status FETCH_HEAD...HEAD -- . > changed-files git fetch https://github.com/grafana/grafana.git docs-2.5 && git diff --name-status FETCH_HEAD...HEAD -- . > changed-files
echo "$(GIT_BRANCH)" > GIT_BRANCH echo "$(GIT_BRANCH)" > GIT_BRANCH
echo "$(GITCOMMIT)" > GITCOMMIT echo "$(GITCOMMIT)" > GITCOMMIT
docker build -t "$(DOCKER_DOCS_IMAGE)" . docker build -t "$(DOCKER_DOCS_IMAGE)" .

10
docs/sources/project/building_from_source.md
View File

@ -11,7 +11,7 @@ dev environment. Grafana ships with its own required backend server; also comple
## Dependencies ## Dependencies
- [Go 1.4](https://golang.org/dl/) - [Go 1.5](https://golang.org/dl/)
- [NodeJS](https://nodejs.org/download/) - [NodeJS](https://nodejs.org/download/)
## Get Code ## Get Code
@ -54,7 +54,7 @@ bra run
## Running Grafana Locally ## Running Grafana Locally
You can run a local instance of Grafana by running: You can run a local instance of Grafana by running:
``` ```
./bin/grafana-server ./bin/grafana-server
``` ```
If you built the binary with `go run build.go build`, run `./bin/grafana-server` If you built the binary with `go run build.go build`, run `./bin/grafana-server`
@ -63,7 +63,7 @@ If you built it with `go build .`, run `./grafana`
Open grafana in your browser (default [http://localhost:3000](http://localhost:3000)) and login with admin user (default user/pass = admin/admin). Open grafana in your browser (default [http://localhost:3000](http://localhost:3000)) and login with admin user (default user/pass = admin/admin).
## Developing for Grafana ## Developing for Grafana
To add features, customize your config, etc, you'll need to rebuild on source change (requires that you executed [godep restore](#build-the-backend), as outlined above). To add features, customize your config, etc, you'll need to rebuild on source change (requires that you executed [godep restore](#build-the-backend), as outlined above).
``` ```
go get github.com/Unknwon/bra go get github.com/Unknwon/bra
bra run bra run
@ -88,7 +88,7 @@ You only need to add the options you want to override. Config files are applied
Learn more about Grafana config options in the [Configuration section](/installation/configuration/) Learn more about Grafana config options in the [Configuration section](/installation/configuration/)
## Create a pull requests ## Create a pull requests
Please contribute to the Grafana project and submit a pull request! Build new features, write or update documentation, fix bugs and generally make Grafana even more awesome. Please contribute to the Grafana project and submit a pull request! Build new features, write or update documentation, fix bugs and generally make Grafana even more awesome.
Before or after you create a pull request, sign the [contributor license agreement](/project/cla.html). Before or after you create a pull request, sign the [contributor license agreement](/project/cla.html).
Together we can build amazing software faster. Together we can build amazing software faster.