浏览代码

add text panel page

Trent White 10 年之前
父节点
当前提交
ebcab0f26e
共有 3 个文件被更改,包括 6 次插入4 次删除
  1. 1 0
      docs/mkdocs.yml
  2. 2 2
      docs/sources/guides/basic_concepts.md
  3. 3 2
      docs/sources/index.md

+ 1 - 0
docs/mkdocs.yml

@@ -49,6 +49,7 @@ pages:
 - ['reference/graph.md', 'Reference', 'Graph Panel']
 - ['reference/graph.md', 'Reference', 'Graph Panel']
 - ['reference/singlestat.md', 'Reference', 'Singlestat Panel']
 - ['reference/singlestat.md', 'Reference', 'Singlestat Panel']
 - ['reference/dashlist.md', 'Reference', 'Dashboard List Panel']
 - ['reference/dashlist.md', 'Reference', 'Dashboard List Panel']
+- ['reference/text.md', 'Reference', 'Text Panel']
 - ['reference/sharing.md', 'Reference', 'Sharing']
 - ['reference/sharing.md', 'Reference', 'Sharing']
 - ['reference/annotations.md', 'Reference', 'Annotations']
 - ['reference/annotations.md', 'Reference', 'Annotations']
 - ['reference/timerange.md', 'Reference', 'Time Range Controls']
 - ['reference/timerange.md', 'Reference', 'Time Range Controls']

+ 2 - 2
docs/sources/guides/basic_concepts.md

@@ -58,9 +58,9 @@ There are a wide variety of styling and formatting options that each Panel expos
 
 
 Panels can be dragged and dropped and rearranged on the Dashboard. They can also be resized.
 Panels can be dragged and dropped and rearranged on the Dashboard. They can also be resized.
 
 
-There are currently three Panel types: [Graph](/reference/graph/), [Singlestat](/reference/singlestat/), [Dashlist](/reference/dashlist/), and [Text]().
+There are currently four Panel types: [Graph](/reference/graph/), [Singlestat](/reference/singlestat/), [Dashlist](/reference/dashlist/), and [Text](/reference/text/).
 
 
-Panels like the [Graph](/reference/graph/) panel allow you to graph as many metrics and series as you want. Other panels like [Singlestat](/reference/singlestat/) require a reduction of a single query into a single number. [Dashlist](/reference/dashlist/) and [Text]() are special panels that do not connect to any Data Source.
+Panels like the [Graph](/reference/graph/) panel allow you to graph as many metrics and series as you want. Other panels like [Singlestat](/reference/singlestat/) require a reduction of a single query into a single number. [Dashlist](/reference/dashlist/) and [Text](/reference/text/) are special panels that do not connect to any Data Source.
 
 
 Panels can be made more dynamic by utilizing [Dashboard Templating](/reference/templating/) variable strings within the panel configuration (including queries to your Data Source configured via the Query Editor).
 Panels can be made more dynamic by utilizing [Dashboard Templating](/reference/templating/) variable strings within the panel configuration (including queries to your Data Source configured via the Query Editor).
 
 

+ 3 - 2
docs/sources/index.md

@@ -12,7 +12,8 @@ Grafana is most commonly used for Internet infrastructure and application analyt
 
 
 Grafana features pluggable panels and data sources allowing easy extensibility. There is currently rich support for [Graphite](http://graphite.readthedocs.org/en/latest/), [InfluxDB](http://influxdb.org) and [OpenTSDB](http://opentsdb.net). There is also experimental support for [KairosDB](https://github.com/kairosdb/kairosdb), and SQL is on the roadmap. Grafana has a variety of panels, including a fully featured graph panel with rich visualization options.
 Grafana features pluggable panels and data sources allowing easy extensibility. There is currently rich support for [Graphite](http://graphite.readthedocs.org/en/latest/), [InfluxDB](http://influxdb.org) and [OpenTSDB](http://opentsdb.net). There is also experimental support for [KairosDB](https://github.com/kairosdb/kairosdb), and SQL is on the roadmap. Grafana has a variety of panels, including a fully featured graph panel with rich visualization options.
 
 
-Version 2.0 was released in April 2015: Grafana now ships with its own backend server that brings [many changes and features](../guides/whats-new-in-v2/).
+Version 2.0 was released in April 2015: Grafana now ships with its own backend server that brings [many changes and features](../guides/whats-new-in-v2/).    
+Version 2.1 was released in July 2015 and added [even more features and enhancements](../guides/whats-new-in-v2-1/).
 
 
 ## Community Resources, Feedback, and Support
 ## Community Resources, Feedback, and Support
 
 
@@ -24,7 +25,7 @@ Most of the new features and improvements that go into Grafana come from our use
 
 
 If you have any trouble with Grafana, whether you can't get it set up or you just want clarification on a feature, there are a number of ways to get help:
 If you have any trouble with Grafana, whether you can't get it set up or you just want clarification on a feature, there are a number of ways to get help:
 
 
-- [Troubleshooting guide](../troubleshooting)
+- [Troubleshooting guide](/installation/troubleshooting/)
 - \#grafana IRC channel on the freenode network (chat.freenode.net)
 - \#grafana IRC channel on the freenode network (chat.freenode.net)
 - Search closed and open [issues on GitHub](https://github.com/grafana/grafana/issues)
 - Search closed and open [issues on GitHub](https://github.com/grafana/grafana/issues)
 - [Mailing list](https://groups.io/org/groupsio/grafana)
 - [Mailing list](https://groups.io/org/groupsio/grafana)