Torkel Ödegaard
5b4fd8e9c8
Merge branch 'v3.1.x' of github.com:grafana/grafana into v3.1.x
2016-07-11 19:07:32 +02:00
Torkel Ödegaard
81af8f072c
feat(links): updated links to grafana.net
2016-07-11 19:07:16 +02:00
Torkel Ödegaard
817f24e6fb
Merge remote-tracking branch 'origin/development'
2016-07-11 15:24:24 +02:00
Bryan Irvine
eafb0f3248
get rid of weird line breaks and use action ( #4926 )
...
* get rid of weird line breaks and use action
When using restarts/stops/starts you'd get weird output sometimes, Strange line breaks 'OK' status overlapping the next lines etc...
This fixes those moves OK to the right place and colorizes them correctly.
* added : for more uniformity
when doing a restart the output looked like:
Stopping Grafana Server ... [ OK ]
Starting Grafana Server: ... [ OK ]
The Stopping line did not have a colon. I added it just to make it look better.
2016-07-11 15:23:39 +02:00
stuart nelson
eb35f8cb89
[prometheus] Use panelId and target.refId for requestId
...
Using these two values ties requests to a
particular query position within a panel, ensuring
that requests are canceled if:
- Duplicate requests with the same query are sent
- Requests from the same query position (but a
different query) are sent
The last point is important as it identifies
queries by a physical location in the dashboard
instead of with the query expression. If a
different query from the same position in a panel
is sent, the previous request should be canceled.
2016-07-11 14:47:14 +02:00
Torkel Ödegaard
9055beff1a
fix(table): fixed merge issue
2016-07-11 11:09:20 +02:00
Torkel Ödegaard
e518f50248
docs(): updated changelog
2016-07-11 10:09:49 +02:00
Torkel Ödegaard
08202dcb83
Merge branch 'v3.1.x'
2016-07-11 09:39:17 +02:00
Torkel Ödegaard
65683ab241
feat(table): added sanitize html option to column styles for table panel, fixes #4596
2016-07-11 09:38:06 +02:00
Torkel Ödegaard
4c4cb20bde
tech(sass): changed sass lint version to 1.7.0
2016-07-08 22:12:10 +02:00
Torkel Ödegaard
4133526d8d
feat(build): updated sass lint
2016-07-08 21:04:58 +02:00
Alexander Akulov
010dbddf59
Fix double slashes in POST request to ES ( #5536 )
2016-07-08 18:24:08 +02:00
Torkel Ödegaard
12d455f3c3
Merge branch 'v3.1.x' of github.com:grafana/grafana into v3.1.x
2016-07-08 18:23:15 +02:00
Torkel Ödegaard
615b692442
feat(apps): fixed unit tests
2016-07-08 18:21:25 +02:00
Torkel Ödegaard
ebdf0564eb
feat(apps): plugin dashboard sync is starting to work
2016-07-08 17:44:57 +02:00
Torkel Ödegaard
68a8d9bc91
feat(apps): more work on plugin dashboard sync
2016-07-08 13:41:46 +02:00
Torkel Ödegaard
85be7dd902
feat(apps): progress on app dashboard sync
2016-07-08 12:26:51 +02:00
Torkel Ödegaard
d44325affd
feat(apps): progress on app dashboard imports
2016-07-08 09:35:06 +02:00
Fraser Savage
5a8efa9a52
Update configuration.md ( #5527 )
...
Insert missing backtick.
2016-07-08 07:12:26 +02:00
Torkel Ödegaard
b62f1f00cd
feat(apps): auto update dashboard dashboards, #5529
2016-07-07 18:11:03 +02:00
Torkel Ödegaard
3f83bf6e47
Merge branch 'v3.1.x'
2016-07-07 14:48:41 +02:00
Torkel Ödegaard
4545b4d323
fix(login): minor fix redirect on login change
2016-07-07 14:48:22 +02:00
bmundt
e58ccc5a83
Hex units ( #5530 )
...
* added hex units
* deleted blank line, to fix style error
* added unit tests
* updated unit tests and changed the way it handles negative hex0x
2016-07-07 08:54:51 +02:00
Torkel Ödegaard
60abe75615
Merge branch 'v3.1.x'
2016-07-06 10:10:25 +02:00
Torkel Ödegaard
d74eb8c188
fix(login): fixed so that you get redirect back to the page or dashboard you where on when you clicked on sign in link, fixes #3312
2016-07-06 10:09:53 +02:00
Torkel Ödegaard
89c3880a59
Merge branch 'master' of github.com:grafana/grafana
2016-07-06 08:26:24 +02:00
Torkel Ödegaard
7c7e26bc18
feat(templating): refactoring template variable handling for variables that change on time refresh, closes #5021
2016-07-06 08:25:46 +02:00
Torkel Ödegaard
069100099d
Merge branch 'reflect_panel_repeat_when_time_range_changed' of https://github.com/mtanda/grafana
2016-07-06 07:40:51 +02:00
Adrián López
65aa6df45c
Warn user if there are no mappings ( #5246 )
2016-07-06 07:31:42 +02:00
Torkel Ödegaard
aad76d9220
Merge branch 'master' of github.com:grafana/grafana
2016-07-06 07:23:20 +02:00
Torkel Ödegaard
9088023116
fix(error handling): improved dashboard init error handling and notifications
2016-07-06 07:23:09 +02:00
Torkel Ödegaard
ad1d7f0ffb
Update package.json
2016-07-06 07:22:29 +02:00
Torkel Ödegaard
41bffd503d
Update CHANGELOG.md
2016-07-06 07:22:03 +02:00
Torkel Ödegaard
b4493155fc
fix(error handling): improved dashboard init error handling and notifications
2016-07-06 07:18:58 +02:00
Torkel Ödegaard
c1b7bd0f1b
Merge branch 'notify_migration_error' of https://github.com/mtanda/grafana
2016-07-06 06:34:17 +02:00
Torkel Ödegaard
6a8c774dcc
fix(graph): show graph panel render errors as panel errors, fixes #5414
2016-07-06 06:31:32 +02:00
Torkel Ödegaard
435aa88c05
Merge branch 'issue_5372' of https://github.com/kipe/grafana into kipe-issue_5372
2016-07-06 06:05:50 +02:00
Torkel Ödegaard
782427b5f2
Update latest.json
2016-07-06 05:28:49 +02:00
herver
9c73b2fa1c
Support data units for both IEC (Binary) and Metric (Decimal) variants ( #5473 )
2016-07-06 05:27:35 +02:00
Torkel Ödegaard
53f110c942
Merge branch 'master' of github.com:grafana/grafana
2016-07-05 18:02:23 +02:00
Torkel Ödegaard
fd5f7c2e34
fix(): updated changelog
2016-07-05 18:02:10 +02:00
Torkel Ödegaard
5595fc2683
refactor(): refactored date handling and locale handling in #5517
2016-07-05 17:59:43 +02:00
Torkel Ödegaard
f31960d325
Update latest.json
2016-07-05 16:39:36 +02:00
Torkel Ödegaard
c029e47a12
Merge branch 'moment-locale' of https://github.com/gofore/grafana into gofore-moment-locale
2016-07-05 16:22:33 +02:00
Joona Romppanen
438a73c58a
Added moment.js locales. Set locale from window.navigator at app init(). Use firstDayOfWeek on time picker
2016-07-05 17:08:44 +03:00
Torkel Ödegaard
460820a117
conf(): updated sample config and root_url to better explain it
2016-07-05 14:10:23 +02:00
Carl Bergquist
9312a13e6e
Merge pull request #5496 from joemiller/doc-update
...
grammar fix in docs
2016-07-03 09:44:00 -07:00
Torkel Ödegaard
8bd6b953b8
fix(elasticsearch): fix json escape logic when doing terms template value lookup, fixes #5485
2016-07-02 12:01:04 -04:00
joe miller
a6554a85c0
grammar fix in docs
2016-07-02 08:27:31 -07:00
Carl Bergquist
c047dacf18
Merge pull request #5442 from mtanda/snapshot_orig_url
...
(snapshot) save original url
2016-07-01 13:09:34 -07:00
