Browse Source

docs: updated go and node version requirements for building, fixes #8097

Torkel Ödegaard 8 years ago
parent
commit
09cec3118f
2 changed files with 19 additions and 18 deletions
  1. 17 16
      README.md
  2. 2 2
      docs/sources/project/building_from_source.md

+ 17 - 16
README.md

@@ -1,4 +1,4 @@
-[Grafana](https://grafana.com) [![Circle CI](https://circleci.com/gh/grafana/grafana.svg?style=svg)](https://circleci.com/gh/grafana/grafana) 
+[Grafana](https://grafana.com) [![Circle CI](https://circleci.com/gh/grafana/grafana.svg?style=svg)](https://circleci.com/gh/grafana/grafana)
 ================
 ================
 [Website](https://grafana.com) |
 [Website](https://grafana.com) |
 [Twitter](https://twitter.com/grafana) |
 [Twitter](https://twitter.com/grafana) |
@@ -19,12 +19,6 @@ Graphite, Elasticsearch, OpenTSDB, Prometheus and InfluxDB.
 - [What's New in Grafana 4.2](http://docs.grafana.org/guides/whats-new-in-v4-2/)
 - [What's New in Grafana 4.2](http://docs.grafana.org/guides/whats-new-in-v4-2/)
 
 
 ## Features
 ## Features
-### Graphite Target Editor
-- Graphite target expression parser
-- Feature rich query composer
-- Quickly add and edit functions & parameters
-- Templated queries
-- [See it in action](http://docs.grafana.org/datasources/graphite/)
 
 
 ### Graphing
 ### Graphing
 - Fast rendering, even over large timespans
 - Fast rendering, even over large timespans
@@ -48,16 +42,23 @@ Graphite, Elasticsearch, OpenTSDB, Prometheus and InfluxDB.
 - [Time range controls](http://docs.grafana.org/reference/timerange/)
 - [Time range controls](http://docs.grafana.org/reference/timerange/)
 - [Share snapshots publicly](http://docs.grafana.org/v2.0/reference/sharing/)
 - [Share snapshots publicly](http://docs.grafana.org/v2.0/reference/sharing/)
 
 
-### Elasticsearch
-- Feature rich query editor UI
-
 ### InfluxDB
 ### InfluxDB
 - Use InfluxDB as a metric data source, annotation source
 - Use InfluxDB as a metric data source, annotation source
-- Query editor with series and column typeahead, easy group by and function selection
+- Query editor with field and tag typeahead, easy group by and function selection
+
+### Graphite
+- Graphite target expression parser
+- Feature rich query composer
+- Quickly add and edit functions & parameters
+- Templated queries
+- [See it in action](http://docs.grafana.org/datasources/graphite/)
+
+### Elasticsearch, Prometheus & OpenTSDB
+- Feature rich query editor UI
 
 
-### OpenTSDB
-- Use as metric data source
-- Query editor with metric name typeahead and tag filtering
+### Alerting
+- Define alert rules using graphs & query conditions
+- Schedule & evalute alert rules, send notifications to Slack, Hipchat, Email, PagerDuty, etc.
 
 
 ## Requirements
 ## Requirements
 There are no dependencies except an external time series data store. For dashboards and user accounts Grafana can use an embedded
 There are no dependencies except an external time series data store. For dashboards and user accounts Grafana can use an embedded
@@ -78,8 +79,8 @@ the latest master builds [here](https://grafana.com/grafana/download)
 
 
 ### Dependencies
 ### Dependencies
 
 
-- Go 1.8
-- NodeJS v4+
+- Go 1.8.1
+- NodeJS LTS
 
 
 ### Get Code
 ### Get Code
 
 

+ 2 - 2
docs/sources/project/building_from_source.md

@@ -13,8 +13,8 @@ dev environment. Grafana ships with its own required backend server; also comple
 
 
 ## Dependencies
 ## Dependencies
 
 
-- [Go 1.8](https://golang.org/dl/)
-- [NodeJS](https://nodejs.org/download/)
+- [Go 1.8.1](https://golang.org/dl/)
+- [NodeJS LTS](https://nodejs.org/download/)
 
 
 ## Get Code
 ## Get Code
 Create a directory for the project and set your path accordingly. Then download and install Grafana into your $GOPATH directory
 Create a directory for the project and set your path accordingly. Then download and install Grafana into your $GOPATH directory