From 527e802b05d808531381ce3020e34f19c8a3aeb1 Mon Sep 17 00:00:00 2001 From: Stefan Wehner Date: Tue, 24 Mar 2015 11:37:26 +0100 Subject: [PATCH 1/4] Limit ElasticSearch return to title and tags --- src/app/features/elasticsearch/datasource.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/app/features/elasticsearch/datasource.js b/src/app/features/elasticsearch/datasource.js index 3c82d98f8d2..8fb9d8c12d5 100644 --- a/src/app/features/elasticsearch/datasource.js +++ b/src/app/features/elasticsearch/datasource.js @@ -270,7 +270,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) @@ -286,8 +287,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 }); } From 1f6d5bfd530ae4d367cd30e30d46b2f86ab8254c Mon Sep 17 00:00:00 2001 From: tuexss Date: Wed, 25 Mar 2015 12:03:20 +0100 Subject: [PATCH 2/4] readme cleanup --- README.md | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index dc9ed582fda..517ec0d4ac8 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ [IRC](http://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. ![](http://grafana.org/assets/img/start_page_bg.png) @@ -25,13 +25,13 @@ The code is available in the [develop](https://github.com/grafana/grafana/tree/d - [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) @@ -48,7 +48,7 @@ The code is available in the [develop](https://github.com/grafana/grafana/tree/d - [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 @@ -62,7 +62,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 @@ -70,12 +70,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) From f235b516dca76516eb43aca3e7b71d0444ccce84 Mon Sep 17 00:00:00 2001 From: tuexss Date: Wed, 25 Mar 2015 12:14:26 +0100 Subject: [PATCH 3/4] http->https for latest version --- latest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/latest.json b/latest.json index 90189fabeca..1ca0904fd94 100644 --- a/latest.json +++ b/latest.json @@ -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" } From 152b01064a7a6ad32bb799c2abde7a6a4667a6eb Mon Sep 17 00:00:00 2001 From: tuexss Date: Wed, 25 Mar 2015 12:17:22 +0100 Subject: [PATCH 4/4] http -> https for external links --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index dc9ed582fda..04c4d8c6dd4 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@ [Grafana](http://grafana.org) [![Build Status](https://api.travis-ci.org/grafana/grafana.svg)](https://travis-ci.org/grafana/grafana) [![Coverage Status](https://coveralls.io/repos/grafana/grafana/badge.png)](https://coveralls.io/r/grafana/grafana) [![Gitter](https://badges.gitter.im/Join Chat.svg)](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