Skip to content

Commit 9498c78

Browse files
committed
Merged with master, resolved conflicts
2 parents 746e203 + 28e7f0f commit 9498c78

File tree

1,138 files changed

+28572
-8796
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,138 files changed

+28572
-8796
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
node_modules
2+
npm-debug.log
23
coverage/
34
.aws-config.json
45
awsconfig

CHANGELOG.md

Lines changed: 50 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,51 @@
1-
# 2.5 (unreleased)
1+
# 3.0.0 (unrelased master branch)
2+
3+
4+
### Breaking changes
5+
**InfluxDB 0.8.x** The data source for the old version of influxdb (0.8.x) is no longer included in default builds. Can easily be installed via improved plugin system, closes #3523
6+
**KairosDB** The data source is no longer included in default builds. Can easily be installed via improved plugin system, closes #3524
7+
8+
# 2.6.1 (unrelased, 2.6.x branch)
9+
10+
### New Features
11+
* **Elasticsearch**: Support for derivative unit option, closes [#3512](https://github.com/grafana/grafana/issues/3512)
12+
13+
# 2.6.0 (2015-12-14)
14+
15+
### New Features
16+
* **Elasticsearch**: Support for pipeline aggregations Moving average and derivative, closes [#2715](https://github.com/grafana/grafana/issues/2715)
17+
* **Elasticsearch**: Support for inline script and missing options for metrics, closes [#3500](https://github.com/grafana/grafana/issues/3500)
18+
* **Syslog**: Support for syslog logging, closes [#3161](https://github.com/grafana/grafana/pull/3161)
19+
* **Timepicker**: Always show refresh button even with refresh rate, closes [#3498](https://github.com/grafana/grafana/pull/3498)
20+
* **Login**: Make it possible to change the login hint on the login page, closes [#2571](https://github.com/grafana/grafana/pull/2571)
21+
22+
### Bug Fixes
23+
* **metric editors**: Fix for clicking typeahead auto dropdown option, fixes [#3428](https://github.com/grafana/grafana/issues/3428)
24+
* **influxdb**: Fixed issue showing Group By label only on first query, fixes [#3453](https://github.com/grafana/grafana/issues/3453)
25+
* **logging**: Add more verbose info logging for http reqeusts, closes [#3405](https://github.com/grafana/grafana/pull/3405)
26+
27+
# 2.6.0-Beta1 (2015-12-04)
28+
29+
### New Table Panel
30+
* **table**: New powerful and flexible table panel, closes [#215](https://github.com/grafana/grafana/issues/215)
31+
32+
### Enhancements
33+
* **CloudWatch**: Support for multiple AWS Credentials, closes [#3053](https://github.com/grafana/grafana/issues/3053), [#3080](https://github.com/grafana/grafana/issues/3080)
34+
* **Elasticsearch**: Support for dynamic daily indices for annotations, closes [#3061](https://github.com/grafana/grafana/issues/3061)
35+
* **Elasticsearch**: Support for setting min_doc_count for date histogram, closes [#3416](https://github.com/grafana/grafana/issues/3416)
36+
* **Graph Panel**: Option to hide series with all zeroes from legend and tooltip, closes [#1381](https://github.com/grafana/grafana/issues/1381), [#3336](https://github.com/grafana/grafana/issues/3336)
37+
38+
### Bug Fixes
39+
* **cloudwatch**: fix for handling of period for long time ranges, fixes [#3086](https://github.com/grafana/grafana/issues/3086)
40+
* **dashboard**: fix for collapse row by clicking on row title, fixes [#3065](https://github.com/grafana/grafana/issues/3065)
41+
* **influxdb**: fix for relative time ranges `last x months` and `last x years`, fixes [#3067](https://github.com/grafana/grafana/issues/3067)
42+
* **graph**: layout fix for color picker when right side legend was enabled, fixes [#3093](https://github.com/grafana/grafana/issues/3093)
43+
* **elasticsearch**: disabling elastic query (via eye) caused error, fixes [#3300](https://github.com/grafana/grafana/issues/3300)
44+
45+
### Breaking changes
46+
* **elasticsearch**: Manual json edited queries are not supported any more (They very barely worked in 2.5)
47+
48+
# 2.5 (2015-10-28)
249

350
**New Feature: Mix data sources**
451
- A built in data source is now available named `-- Mixed --`, When picked in the metrics tab,
@@ -11,12 +58,12 @@ it allows you to add queries of differnet data source types & instances to the s
1158

1259
**New Feature: New and much improved time picker**
1360
- Support for quick ranges like `Today`, `This day last week`, `This week`, `The day so far`, etc.
14-
- Muck improved UI and improved support for UTC, [Issue #2761](https://github.com/grafana/grafana/issues/2761) for more info.
61+
- Improved UI and improved support for UTC, [Issue #2761](https://github.com/grafana/grafana/issues/2761) for more info.
1562

1663
**User Onboarding**
1764
- Org admin can now send email invites (or invite links) to people who are not yet Grafana users
1865
- Sign up flow now supports email verification (if enabled)
19-
- See [Issue #2353](https://github.com/grafana/grafana/issues/2354) for more info.
66+
- See [Issue #2353](https://github.com/grafana/grafana/issues/2353) for more info.
2067

2168
**Other new Features && Enhancements**
2269
- [Pull #2720](https://github.com/grafana/grafana/pull/2720). Admin: Initial basic quota support (per Org)

Godeps/Godeps.json

Lines changed: 33 additions & 22 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awsutil/copy.go

Lines changed: 4 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awsutil/copy_test.go

Lines changed: 32 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awsutil/equal.go

Lines changed: 27 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awsutil/equal_test.go

Lines changed: 29 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)