Torkel Ödegaard hace 10 años
padre
commit
81bae9a844

+ 10 - 2
docs/mkdocs.yml

@@ -26,8 +26,11 @@ pages:
 
 
 # Introduction:
 # Introduction:
 - ['index.md', 'About', 'Grafana']
 - ['index.md', 'About', 'Grafana']
-- ['install.md', 'Installation', 'Installation']
-- ['troubleshooting/index.md', 'Installation', 'Troubleshooting']
+- ['installation/installation.md', 'Installation', 'Install & Configure']
+- ['installation/provisioning.md', 'Installation', 'Provisioning']
+- ['installation/performance.md', 'Installation', 'Performance tips']
+- ['installation/troubleshooting.md', 'Installation', 'Troubleshooting']
+
 - ['features/intro.md', 'User Guides', 'Getting started']
 - ['features/intro.md', 'User Guides', 'Getting started']
 - ['features/graphs.md', 'User Guides', 'Graph options']
 - ['features/graphs.md', 'User Guides', 'Graph options']
 - ['features/annotations.md', 'User Guides', 'Annotations']
 - ['features/annotations.md', 'User Guides', 'Annotations']
@@ -37,10 +40,15 @@ pages:
 - ['features/scripted_dashboards.md', 'User Guides', 'Scripted dashboards']
 - ['features/scripted_dashboards.md', 'User Guides', 'Scripted dashboards']
 - ['features/playlist.md', 'User Guides', 'Playlist']
 - ['features/playlist.md', 'User Guides', 'Playlist']
 - ['features/export_import.md', 'User Guides', 'Import & Export']
 - ['features/export_import.md', 'User Guides', 'Import & Export']
+- ['screencasts/index.md', 'User Guides', 'Screencasts']
 
 
 - ['features/graphite.md', 'Metric Queries', 'Graphite guide']
 - ['features/graphite.md', 'Metric Queries', 'Graphite guide']
 - ['features/influxdb.md', 'Metric Queries', 'InfluxDB guide']
 - ['features/influxdb.md', 'Metric Queries', 'InfluxDB guide']
 - ['features/opentsdb.md', 'Metric Queries', 'OpenTSDB guide']
 - ['features/opentsdb.md', 'Metric Queries', 'OpenTSDB guide']
+
+- ['contributing/building_from_source.md', 'Contribute', 'Building from souce']
+- ['contributing/cla.html.slim', 'Contribute', 'Contributor License Agreement']
+
 - ['support/index.md', 'Support', 'Support']
 - ['support/index.md', 'Support', 'Support']
 
 
 - ['jsearch.md', '**HIDDEN**']
 - ['jsearch.md', '**HIDDEN**']

+ 0 - 0
docs/sources/install.md → docs/sources/installation/installation.md


+ 6 - 2
docs/sources/performance/index.md → docs/sources/installation/performance.md

@@ -1,8 +1,12 @@
 ---
 ---
-title: Docs - Performance
+page_title: Performance Tips
+page_description: Grafana performance tips
+page_keywords: grafana, performance, documentation
 ---
 ---
 
 
-# Performance
+# Performance tips
+
+## Graphite
 
 
 Graphite 0.9.13 adds a much needed feature to the json rendering API that is very important for Grafana. If you are experiance slow
 Graphite 0.9.13 adds a much needed feature to the json rendering API that is very important for Grafana. If you are experiance slow
 load & rendering times for large time ranges then it is most likely caused by running Graphite 0.9.12 or lower. The latest version
 load & rendering times for large time ranges then it is most likely caused by running Graphite 0.9.12 or lower. The latest version

+ 7 - 5
docs/sources/provisioning/index.md → docs/sources/installation/provisioning.md

@@ -1,5 +1,7 @@
 ---
 ---
-title: Docs - Install via provisioning
+page_title: Provisioning
+page_description: Grafana provisioning
+page_keywords: grafana, provisioning, documentation
 ---
 ---
 
 
 # Provisioning
 # Provisioning
@@ -7,23 +9,23 @@ title: Docs - Install via provisioning
 Here are links for how to install Grafana (and some include graphite or influxdb as well) via a provisioning
 Here are links for how to install Grafana (and some include graphite or influxdb as well) via a provisioning
 system. These are not maintained by any core Grafana team member and might be out of date.
 system. These are not maintained by any core Grafana team member and might be out of date.
 
 
-### Puppet
+## Puppet
 
 
 * [forge.puppetlabs.com/bfraser/grafana](https://forge.puppetlabs.com/bfraser/grafana)
 * [forge.puppetlabs.com/bfraser/grafana](https://forge.puppetlabs.com/bfraser/grafana)
 
 
-### Ansible
+## Ansible
 
 
 * [github.com/bobrik/ansible-grafana](https://github.com/bobrik/ansible-grafana)
 * [github.com/bobrik/ansible-grafana](https://github.com/bobrik/ansible-grafana)
 * [github.com/bitmazk/ansible-digitalocean-influxdb-grafana](https://github.com/bitmazk/ansible-digitalocean-influxdb-grafana)
 * [github.com/bitmazk/ansible-digitalocean-influxdb-grafana](https://github.com/bitmazk/ansible-digitalocean-influxdb-grafana)
 
 
-### Docker
+## Docker
 
 
 * [github.com/kamon-io/docker-grafana-graphite](https://github.com/kamon-io/docker-grafana-graphite)
 * [github.com/kamon-io/docker-grafana-graphite](https://github.com/kamon-io/docker-grafana-graphite)
 * [github.com/kamon-io/docker-grafana-influxdb](https://github.com/kamon-io/docker-grafana-influxdb)
 * [github.com/kamon-io/docker-grafana-influxdb](https://github.com/kamon-io/docker-grafana-influxdb)
 * [github.com/tutumcloud/tutum-docker-grafana](https://github.com/tutumcloud/tutum-docker-grafana)
 * [github.com/tutumcloud/tutum-docker-grafana](https://github.com/tutumcloud/tutum-docker-grafana)
 * [github.com/mingfang/docker-grafana](https://github.com/mingfang/docker-grafana)
 * [github.com/mingfang/docker-grafana](https://github.com/mingfang/docker-grafana)
 
 
-### Chef
+## Chef
 
 
 * [github.com/JonathanTron/chef-grafana](https://github.com/JonathanTron/chef-grafana)
 * [github.com/JonathanTron/chef-grafana](https://github.com/JonathanTron/chef-grafana)
 * [github.com/dzautner/grafana-cookbook](https://github.com/dzautner/grafana-cookbook)
 * [github.com/dzautner/grafana-cookbook](https://github.com/dzautner/grafana-cookbook)

+ 0 - 0
docs/sources/troubleshooting/index.md → docs/sources/installation/troubleshooting.md


+ 5 - 5
docs/sources/screencasts/index.md

@@ -1,14 +1,14 @@
----
-title: Docs - Screencasts
----
+page_title: Screencasts
+page_description: Grafana screencasts
+page_keywords: grafana, screencasts, documentation, guides
 
 
 # Screencasts
 # Screencasts
 
 
-#### Grafana Screencasts - Episode 2 - Templated Graphite Queries
+## Grafana Screencasts - Episode 2 - Templated Graphite Queries
 <iframe width="561" height="315" src="//www.youtube.com/embed/FhNUrueWwOk?list=PLDGkOdUX1Ujo3wHw9-z5Vo12YLqXRjzg2" frameborder="0" allowfullscreen></iframe>
 <iframe width="561" height="315" src="//www.youtube.com/embed/FhNUrueWwOk?list=PLDGkOdUX1Ujo3wHw9-z5Vo12YLqXRjzg2" frameborder="0" allowfullscreen></iframe>
 
 
 <br>
 <br>
-#### Grafana Screencasts - Episode 1 - Building Graphite Queries
+## Grafana Screencasts - Episode 1 - Building Graphite Queries
 <iframe width="560" height="315" src="//www.youtube.com/embed/mgcJPREl3CU?list=PLDGkOdUX1Ujo3wHw9-z5Vo12YLqXRjzg2" frameborder="0" allowfullscreen></iframe>
 <iframe width="560" height="315" src="//www.youtube.com/embed/mgcJPREl3CU?list=PLDGkOdUX1Ujo3wHw9-z5Vo12YLqXRjzg2" frameborder="0" allowfullscreen></iframe>
 
 
 <br>
 <br>

+ 1 - 1
vendor/phantomjs/render.js

@@ -31,7 +31,7 @@ page.open(params.url, function (status) {
       return $('canvas').length > 0;
       return $('canvas').length > 0;
     });
     });
 
 
-    if (canvas || tries === 10) {
+    if (canvas || tries === 100) {
       page.render(params.png);
       page.render(params.png);
       phantom.exit();
       phantom.exit();
     }
     }