alihan/fn-serverless
1
0
Fork 0
mirror of https://github.com/fnproject/fn.git synced 2022-10-28 21:29:17 +03:00
Code Issues Packages Projects Releases Wiki Activity

Update README.md (#766)

Browse Source 
This PR changes the instructions for running Prometheus and Grafana in Docker to use the `--add-host` parameter instead of the `--link` parameter which is deprecated and which has been reported by @shaunsmith to sometimes not work. 

The supplied command has been verified by @shaunsmith on Mac and Linux and by me on Linux.
This commit is contained in:
Nigel Deakin
2018-02-13 19:27:55 +00:00
committed by Tolga Ceylan
parent f287ad274e
commit 05ec91e310
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
examples/grafana/README.md
View File

@@ -59,14 +59,14 @@ Note the last line. This specifies the host and port of the Fn server from which
If you are running a cluster of Fn servers then you can specify them all here. If you are running a cluster of Fn servers then you can specify them all here.
Now start Prometheus, specifying this config file. Now start Prometheus, specifying this config file.
In the following command, `${GOPATH}/src/github.com/fnproject/fn/examples/grafana/prometheus.yml` is the path of the above Prometheus configuration file. You may need to modify this to use the actual path on your local machine.
``` ```
docker run --name=prometheus -d -p 9090:9090 \ docker run --rm --name=prometheus -d -p 9090:9090 \
-v ${GOPATH}/src/github.com/fnproject/fn/examples/grafana/prometheus.yml:/etc/prometheus/prometheus.yml \ -v `pwd`/prometheus.yml:/etc/prometheus/prometheus.yml \
--link fnserver prom/prometheus --add-host="fnserver:`docker network inspect bridge -f '{{range .IPAM.Config}}{{.Gateway}}{{end}}'`" \
prom/prometheus
``` ```
Note: The parameter `--link fnserver` means that Prometheus can use `fnserver` to refer to the running Fn server. This requires the Fn server to be running in docker. Note: This command uses the parameter `--add-host` to define a hostname `fnserver` in the docker container
and configure it to use the IP address on which the Fn server is listening.
Open a browser on Prometheus's graph tool at [http://localhost:9090/graph](http://localhost:9090/graph). If you wish you can use this to view metrics and display metrics from the Fn server: see the [Prometheus](https://prometheus.io/) documentation for instructions. Alternatively continue with the next step to view a ready-made set of graphs in Grafana. Open a browser on Prometheus's graph tool at [http://localhost:9090/graph](http://localhost:9090/graph). If you wish you can use this to view metrics and display metrics from the Fn server: see the [Prometheus](https://prometheus.io/) documentation for instructions. Alternatively continue with the next step to view a ready-made set of graphs in Grafana.
@@ -79,7 +79,8 @@ Open a terminal window and navigate to the directory containing this example.
Start Grafana on port 3000: Start Grafana on port 3000:
``` ```
docker run --name=grafana -d -p 3000:3000 \ docker run --name=grafana -d -p 3000:3000 \
--link prometheus grafana/grafana --add-host="prometheus:`docker network inspect bridge -f '{{range .IPAM.Config}}{{.Gateway}}{{end}}'`" \
grafana/grafana
``` ```
Open a browser on Grafana at [http://localhost:3000](http://localhost:3000). Open a browser on Grafana at [http://localhost:3000](http://localhost:3000).