mirror of
https://github.com/grafana/grafana.git
synced 2025-02-25 18:55:37 -06:00
Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
commit
df4a00f8ef
24
README.md
24
README.md
@ -1,11 +1,11 @@
|
||||
[Grafana](http://grafana.org) [](https://travis-ci.org/grafana/grafana) [](https://coveralls.io/r/grafana/grafana) [](https://gitter.im/grafana/grafana?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
|
||||
================
|
||||
[Website](http://grafana.org) |
|
||||
[Twitter](http://twitter.com/grafana) |
|
||||
[IRC](http://webchat.freenode.net/?channels=grafana) |
|
||||
[Twitter](https://twitter.com/grafana) |
|
||||
[IRC](https://webchat.freenode.net/?channels=grafana) |
|
||||
[Email](mailto:contact@grafana.org)
|
||||
|
||||
Grafana is An open source, feature rich metrics dashboard and graph editor for
|
||||
Grafana is an open source, feature rich metrics dashboard and graph editor for
|
||||
Graphite, InfluxDB & OpenTSDB.
|
||||
|
||||

|
||||
@ -84,13 +84,13 @@ grafana admin user that is created on first startup also creates the main accoun
|
||||
- [See it in action](http://grafana.org/docs/features/graphite)
|
||||
|
||||
### Graphing
|
||||
- Fast rendering, even over large timespans.
|
||||
- Click and drag to zoom.
|
||||
- Multiple Y-axis.
|
||||
- Bars, Lines, Points.
|
||||
- Fast rendering, even over large timespans
|
||||
- Click and drag to zoom
|
||||
- Multiple Y-axis
|
||||
- Bars, Lines, Points
|
||||
- Smart Y-axis formating
|
||||
- Series toggles & color selector
|
||||
- Legend values, and formating options
|
||||
- Legend values, and formatting options
|
||||
- Grid thresholds, axis labels
|
||||
- [Annotations](http://grafana.org/docs/features/annotations)
|
||||
|
||||
@ -107,7 +107,7 @@ grafana admin user that is created on first startup also creates the main accoun
|
||||
- [Time range controls](http://grafana.org/docs/features/time_range)
|
||||
|
||||
### InfluxDB
|
||||
- Use InfluxDB as a metric data source, annotation source and for dashboard storage
|
||||
- Use InfluxDB as a metric data source, annotation source, and for dashboard storage
|
||||
- Query editor with series and column typeahead, easy group by and function selection
|
||||
|
||||
### OpenTSDB
|
||||
@ -121,7 +121,7 @@ There are no dependencies, Grafana is a client side application that runs in you
|
||||
Head to [grafana.org](http://grafana.org) and [download](http://grafana.org/download/)
|
||||
the latest release.
|
||||
|
||||
Then follow the quick [setup & config guide](http://grafana.org/docs/). If you have any problems please
|
||||
Then follow the [quick setup & config guide](http://grafana.org/docs/). If you have any problems please
|
||||
read the [troubleshooting guide](http://grafana.org/docs/troubleshooting).
|
||||
|
||||
## Documentation & Support
|
||||
@ -129,12 +129,12 @@ Be sure to read the [getting started guide](http://grafana.org/docs/features/int
|
||||
feature guides.
|
||||
|
||||
## Run from master
|
||||
Grafana uses nodejs and grunt for asset management (css & javascript), unit test runner and javascript syntax verification.
|
||||
Grafana uses Node.js and Grunt for asset management (css & javascript), unit test runner and javascript syntax verification.
|
||||
- clone repository
|
||||
- install nodejs
|
||||
- npm install (in project root)
|
||||
- npm install -g grunt-cli
|
||||
- grunt (runt default task that will generate css files)
|
||||
- grunt (grunt default task that will generate css files)
|
||||
- grunt build (creates optimized & minified release)
|
||||
- grunt release (same as grunt build but will also create tar & zip package)
|
||||
- grunt test (executes jshint and unit tests)
|
||||
|
@ -1,4 +1,4 @@
|
||||
{
|
||||
"version": "1.9.1",
|
||||
"url": "http://grafanarel.s3.amazonaws.com/grafana-1.9.1.tar.gz"
|
||||
"url": "https://grafanarel.s3.amazonaws.com/grafana-1.9.1.tar.gz"
|
||||
}
|
||||
|
@ -265,7 +265,8 @@ function (angular, _, config, kbn, moment) {
|
||||
query: { query_string: { query: queryString } },
|
||||
facets: { tags: { terms: { field: "tags", order: "term", size: 50 } } },
|
||||
size: this.searchMaxResults,
|
||||
sort: ["_uid"]
|
||||
sort: ["_uid"],
|
||||
fields: ["title", "tags"]
|
||||
};
|
||||
|
||||
return this._post('/dashboard/_search', query)
|
||||
@ -281,8 +282,8 @@ function (angular, _, config, kbn, moment) {
|
||||
var hit = resultsHits[i];
|
||||
displayHits.dashboards.push({
|
||||
id: hit._id,
|
||||
title: hit._source.title,
|
||||
tags: hit._source.tags
|
||||
title: hit.fields.title,
|
||||
tags: hit.fields.tags
|
||||
});
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user