From e1da1f9d72d5ee8755ceb22ea09b37abfb76fe71 Mon Sep 17 00:00:00 2001 From: Gregory Eremin Date: Thu, 7 Jul 2016 21:25:43 +0200 Subject: [PATCH] Cleanup makefile and update readme --- Makefile | 26 +------------------------- README.md | 4 ++++ 2 files changed, 5 insertions(+), 25 deletions(-) diff --git a/Makefile b/Makefile index 04b95b5..8059ce1 100644 --- a/Makefile +++ b/Makefile @@ -1,29 +1,5 @@ graphite: - @echo "Building Carbon" - docker build -t localhots/carbon:v1 -f Carbon.dockerfile . - @echo "Starting Carbon" - docker run -d --name carbon \ - -p 2003:2003 \ - -p 2004:2004 \ - -p 7002:7002 \ - -v /data/graphite/whisper /var/whisper \ - localhots/carbon:v1 - - @echo "Building Brubeck" - docker build -t localhots/brubeck:v1 -f Brubeck.dockerfile . - @echo "Starting Brubeck" - docker run -d --name brubeck --link carbon:carbon \ - -p 8080:8080 \ - -p 8126:8126 \ - -p 9126:9126 \ - localhots/brubeck:v1 - - @echo "Building Grafana" - docker build -t localhots/grafana:v1 -f Grafana.dockerfile . - @echo "Starting Grafana" - docker run -d --name grafana --link carbon:carbon --link brubeck:brubeck \ - -p 3000:3000 \ - localhots/grafana:v1 + docker-compose build . fast: @echo "Graphite is fast now!" diff --git a/README.md b/README.md index 3a9427f..d6e8b24 100644 --- a/README.md +++ b/README.md @@ -6,12 +6,16 @@ replace original stack with other components that have [better](https://github.com/lomik/go-carbon/tree/v0.7.2#performance) performance. Quite [impressive](https://github.com/github/brubeck/tree/5d139a4#faq). +Reading metrics from Whisper and performing all the transformations on them is +done by [Graphite API](https://github.com/brutasse/graphite-api), a Python app. + Grafana 3 is also included. **Included software:** * [go-carbon](https://github.com/lomik/go-carbon/tree/v0.7.2) `v0.7.2` * [Brubeck](https://github.com/github/brubeck/tree/5d139a4) `5d139a4` +* [Graphite API](https://github.com/brutasse/graphite-api) `latest` * [Grafana](https://github.com/grafana/grafana/tree/v3.1.0-beta1) `v3.1.0-beta1` **Local installation:**