From 68a7c3fa3ba5642371dcb7ef102a52700cc09087 Mon Sep 17 00:00:00 2001 From: Victor Hooi Date: Thu, 3 Sep 2015 16:29:58 +1000 Subject: [PATCH 1/4] Add note about phantomjs binary and PNG rendering. --- docs/sources/reference/sharing.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/sources/reference/sharing.md b/docs/sources/reference/sharing.md index 16ddcd8f01b..df5115829ca 100644 --- a/docs/sources/reference/sharing.md +++ b/docs/sources/reference/sharing.md @@ -30,7 +30,8 @@ after a certain time period. ## Share Panel Click a panel title to open the panel menu, then click share in the panel menu to open the Share Panel dialog. Here you have access to a link that will take you to exactly this panel with the current time range and selected template variables. -You also get a link to service side rendered PNG of the panel. Useful if you want to shara image of the panel. +You also get a link to service side rendered PNG of the panel. Useful if you want to share an image of the panel. +Please note that for OSX and Windows, you will need to ensure that a `phantomjs` binary is available under `vendor/phantomjs/phantomjs`. For Linux, a `phantomjs` binary should be included. ### Embed Panel You can embed a panel using an iframe on another web site. This tab will show you the html that you need to use. From b80adcc00af1bf846ea5015ef773b24195f89d39 Mon Sep 17 00:00:00 2001 From: Victor Hooi Date: Thu, 3 Sep 2015 16:35:49 +1000 Subject: [PATCH 2/4] Add note about phantomjs libraries. --- docs/sources/reference/sharing.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/sources/reference/sharing.md b/docs/sources/reference/sharing.md index df5115829ca..81566b24e06 100644 --- a/docs/sources/reference/sharing.md +++ b/docs/sources/reference/sharing.md @@ -31,7 +31,7 @@ after a certain time period. Click a panel title to open the panel menu, then click share in the panel menu to open the Share Panel dialog. Here you have access to a link that will take you to exactly this panel with the current time range and selected template variables. You also get a link to service side rendered PNG of the panel. Useful if you want to share an image of the panel. -Please note that for OSX and Windows, you will need to ensure that a `phantomjs` binary is available under `vendor/phantomjs/phantomjs`. For Linux, a `phantomjs` binary should be included. +Please note that for OSX and Windows, you will need to ensure that a `phantomjs` binary is available under `vendor/phantomjs/phantomjs`. For Linux, a `phantomjs` binary is included - however, you should ensure that any requisite libraries (e.g. libfontconfig) are available. ### Embed Panel You can embed a panel using an iframe on another web site. This tab will show you the html that you need to use. From 668b47cc6e652efcc196050d7b4cf5559de989d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rodolphe=20Qui=C3=A9deville?= Date: Fri, 4 Sep 2015 09:01:06 +0200 Subject: [PATCH 3/4] Add comments on app_mode with possible values --- conf/defaults.ini | 1 + conf/sample.ini | 1 + 2 files changed, 2 insertions(+) diff --git a/conf/defaults.ini b/conf/defaults.ini index 6ebf5fac01d..689a6334b30 100644 --- a/conf/defaults.ini +++ b/conf/defaults.ini @@ -3,6 +3,7 @@ # Do not modify this file in grafana installs # +# possible values : production, development app_mode = production #################################### Paths #################################### diff --git a/conf/sample.ini b/conf/sample.ini index 9a8d9aa3908..c92656481b1 100644 --- a/conf/sample.ini +++ b/conf/sample.ini @@ -3,6 +3,7 @@ # Everything has defaults so you only need to uncomment things you want to # change +# possible values : production, development ; app_mode = production #################################### Paths #################################### From 697aaf7e7000ec45fbc477e978669863646696ad Mon Sep 17 00:00:00 2001 From: Julien Danjou Date: Fri, 4 Sep 2015 17:14:27 +0200 Subject: [PATCH 4/4] partials: fix closing markup in datasourceHttpConfig --- public/app/features/org/partials/datasourceHttpConfig.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/app/features/org/partials/datasourceHttpConfig.html b/public/app/features/org/partials/datasourceHttpConfig.html index 94c208d8370..81d84d28f35 100644 --- a/public/app/features/org/partials/datasourceHttpConfig.html +++ b/public/app/features/org/partials/datasourceHttpConfig.html @@ -9,7 +9,7 @@
  • - Access Direct = url is used directly from browser, Proxy = Grafana backend will proxy the request + Access Direct = url is used directly from browser, Proxy = Grafana backend will proxy the request