bergquist
|
96e8ecfa7b
|
feat(cli): adds command to reset admin password
closes #5479
|
2016-12-09 15:25:02 +01:00 |
|
bergquist
|
cd85e1f651
|
Merge branch 'master' into cli_db_commands
|
2016-12-09 12:36:05 +01:00 |
|
bergquist
|
ba7a990f86
|
tech: bump version in server cli
|
2016-12-09 12:30:36 +01:00 |
|
bergquist
|
02392e5189
|
docs(changelog): adds PR contributors name to release notes
|
2016-12-09 12:19:41 +01:00 |
|
bergquist
|
64f22e7037
|
docs(changelog): add note about closing #6356
|
2016-12-09 11:49:23 +01:00 |
|
bergquist
|
cfb6033765
|
Merge branch 'elastic5_support'
|
2016-12-09 11:42:15 +01:00 |
|
bergquist
|
619c5c4f1b
|
Merge branch 'master' into elastic5_support
|
2016-12-09 11:41:23 +01:00 |
|
bergquist
|
ebec02ffae
|
style(elastic): minor code style changes
|
2016-12-09 11:40:00 +01:00 |
|
bergquist
|
99c5f7d571
|
feat(elastic): remove support for ES 1.x
|
2016-12-09 11:34:19 +01:00 |
|
bergquist
|
873024b917
|
tech(elastic): use bool conditions for all es queries
|
2016-12-09 11:13:28 +01:00 |
|
Matt Toback
|
e58b6989c2
|
Small refactor to make hover highlighting proper, added a title tag for the completed grafana step. (#6882)
|
2016-12-09 09:42:24 +01:00 |
|
Matt Toback
|
f39f77692b
|
Adjusted the active state to fix the faint line showing. Probably related to the font change going into 4.0 (#6886)
|
2016-12-09 09:41:54 +01:00 |
|
Carl Bergquist
|
20e4cb9a0b
|
Merge pull request #6885 from utkarshcmu/patch-1
Fixed Create org API in docs
|
2016-12-09 08:53:33 +01:00 |
|
Utkarsh Bhatnagar
|
db3ac79015
|
Fixed Create org API in docs
|
2016-12-08 12:08:04 -08:00 |
|
bergquist
|
6265afd8b6
|
docs: updat latest to 4.0.2
|
2016-12-08 15:17:13 +01:00 |
|
bergquist
|
7c3c8bc4c9
|
docs(changelog): add date for 4.0.2 release
|
2016-12-08 15:14:44 +01:00 |
|
bergquist
|
49827de278
|
docs: release 4.0.2
|
2016-12-08 15:05:37 +01:00 |
|
bergquist
|
a90f650109
|
update package.json version to 4.0.2
|
2016-12-08 14:04:08 +01:00 |
|
bergquist
|
f68350acbf
|
docs(alerting): link fix to issue rather then commit
|
2016-12-08 14:01:59 +01:00 |
|
Torkel Ödegaard
|
22bf6420f1
|
Merge branch 'master' of github.com:grafana/grafana
|
2016-12-08 10:25:26 +01:00 |
|
Torkel Ödegaard
|
05772b30d7
|
feat(ux): completed work on getting started panel, #6466
|
2016-12-08 10:25:05 +01:00 |
|
Carl Bergquist
|
249b82d28b
|
Merge pull request #6873 from dec5e/reference_typos
Fix some typos in Reference docs
|
2016-12-08 09:49:10 +01:00 |
|
Andrey Artemov
|
c97e95227a
|
Fix some typos in "Export & Import" reference
|
2016-12-08 10:34:53 +02:00 |
|
Andrey Artemov
|
c94805d4c2
|
Fix typo in Singlestat page title
|
2016-12-08 10:34:31 +02:00 |
|
Torkel Ödegaard
|
dee6b7d150
|
Merge branch 'master' into getting-started-panel
|
2016-12-08 08:51:40 +01:00 |
|
Matt Toback
|
6ae6a5d312
|
Polished some styles, updated issue 6466
|
2016-12-07 14:51:00 -05:00 |
|
bergquist
|
8ee85626f2
|
fix(api): return correct json info after updating datasource
closes #6869
|
2016-12-07 18:09:17 +01:00 |
|
bergquist
|
c871212d6c
|
docs(changelog): adds note about fixing avg() reducer bug
|
2016-12-07 15:58:03 +01:00 |
|
bergquist
|
dd3060fdc3
|
feat(alerting): calculate avg of valid points
|
2016-12-07 15:55:37 +01:00 |
|
Torkel Ödegaard
|
924535c6d0
|
change(graph): changed null value graph option to default to null, closes #6868
|
2016-12-07 15:27:20 +01:00 |
|
bergquist
|
2bdd2a59cb
|
test(alerting): improve naming for test scenario
|
2016-12-07 15:19:58 +01:00 |
|
Adrian Lopez
|
395b834a23
|
Better match for culumn inside tagsColumn
|
2016-12-07 12:23:57 +01:00 |
|
Torkel Ödegaard
|
e082d78697
|
fix(elasticsearch): removed unused code
|
2016-12-07 12:07:56 +01:00 |
|
Torkel Ödegaard
|
7b68e6ea3b
|
feat(elasticsearch): Added support for Missing option (bucket) for terms aggregation, refactoring PR #4244, thx @shanielh
|
2016-12-07 12:06:47 +01:00 |
|
bergquist
|
dd432e671e
|
docs(changelog): note about closing #6687
|
2016-12-07 11:28:18 +01:00 |
|
Carl Bergquist
|
0294446af9
|
Merge pull request #6856 from kylemcc/opsgenie-alerting
alerting: add support for OpsGenie
|
2016-12-07 11:23:54 +01:00 |
|
Carl Bergquist
|
2c7adccf12
|
Use cache for http.client in tsdb package. (#6833)
* datasource: move caching closer to datasource struct
* tsdb: use cached version of datasource http transport
closes #6825
|
2016-12-07 11:10:42 +01:00 |
|
vaibhavinbayarea
|
24172fca01
|
Added feature request "predict value" in moving averages pipeline agg (#5689)
issue-id: #5688
|
2016-12-07 10:47:46 +01:00 |
|
Matt Toback
|
d28726be06
|
Moved ADD ROW to left to consolidate row actions along the same vertical area. (#6852)
|
2016-12-07 10:45:23 +01:00 |
|
Carl Bergquist
|
b0679b610f
|
Merge pull request #6857 from SaaldjorMike/typo
Fix docs typo
|
2016-12-06 23:36:55 +01:00 |
|
Mike Rostermund
|
c5b29228ee
|
Add missing char/typo
|
2016-12-06 22:26:43 +01:00 |
|
Kyle McCullough
|
4ef940482c
|
alerting: add support for OpsGenie
|
2016-12-06 14:48:13 -06:00 |
|
bergquist
|
6440d884db
|
elastic: make sure old tests are for es2
|
2016-12-06 14:17:03 +01:00 |
|
Torkel Ödegaard
|
83afbd4262
|
Merge branch 'master' of github.com:grafana/grafana
|
2016-12-06 11:58:51 +01:00 |
|
Torkel Ödegaard
|
e1b25b3999
|
changelog(): updated changelog with info on shared tooltip feature merged via PR #6274, closes #1578
|
2016-12-06 11:58:39 +01:00 |
|
Torkel Ödegaard
|
fa393c282a
|
feat(graph): refactoring shared tooltip PR #6274
|
2016-12-06 11:55:20 +01:00 |
|
bergquist
|
005a17d52f
|
Merge branch 'master' of https://github.com/lpic10/grafana into lpic10-master
|
2016-12-06 10:15:36 +01:00 |
|
bergquist
|
464553a453
|
docs: explains how to use comment chars in passwords
|
2016-12-06 09:48:56 +01:00 |
|
Torkel Ödegaard
|
51165e76ba
|
Merge branch 'shared_tooltip' of https://github.com/connection-reset/grafana into connection-reset-shared_tooltip
|
2016-12-06 09:32:22 +01:00 |
|
bergquist
|
8f1ed07275
|
metrics: 64bit fields should come first in structs
https://golang.org/pkg/sync/atomic/#pkg-note-BUG
|
2016-12-06 09:08:51 +01:00 |
|