Torkel Ödegaard
6cb1dafb1d
feat(alerting): progress on notifications
2016-07-25 16:26:28 +02:00
Torkel Ödegaard
8df558dece
feat(notifications): refactoring notification handling
2016-07-25 13:52:17 +02:00
Torkel Ödegaard
a6c6094775
feat(alerting): started reworking notifications
2016-07-22 16:45:17 +02:00
Torkel Ödegaard
7eb2d2cf47
feat(alerting): working on state management
2016-07-22 13:14:09 +02:00
Torkel Ödegaard
783d697529
feat(alerting): more output when testing alert
2016-07-21 21:54:12 +02:00
Torkel Ödegaard
b073fe0eba
feat(alerting): more work on handling result and saving state
2016-07-21 17:31:46 +02:00
Torkel Ödegaard
f0fc336e88
feat(alerting): worked on alert condition eval tests
2016-07-21 16:19:28 +02:00
Torkel Ödegaard
3ad38eefd2
feat(alerting): test results look better
2016-07-21 13:57:19 +02:00
Torkel Ödegaard
f6a160b270
feat(alerting): testing alert is starting to work
2016-07-21 13:09:12 +02:00
Torkel Ödegaard
9e91aacd34
feat(alerting): progress on testing alerts
2016-07-21 10:29:11 +02:00
Torkel Ödegaard
20fcffb71e
feat(alerting): working on alerting conditions model
2016-07-19 16:15:26 +02:00
Torkel Ödegaard
f38c954639
feat(alerting): more work on alert conditions
2016-07-19 11:54:41 +02:00
Torkel Ödegaard
29d308e447
feat(alerting): refactoring alert model to use conditions concept
2016-07-19 11:24:27 +02:00
Torkel Ödegaard
b0fe69822a
Merge branch 'master' into alerting
...
Conflicts:
public/app/core/services/alert_srv.ts
public/app/partials/confirm_modal.html
2016-07-18 18:22:35 +02:00
Torkel Ödegaard
3f861dd039
Merge branch 'v3.1.x'
2016-07-18 16:27:27 +02:00
Torkel Ödegaard
3ae327320a
fix(prometheus): fixed svg link in prometheus dashboard, fixes #5604
2016-07-18 16:27:02 +02:00
Torkel Ödegaard
78d0badffe
Merge branch 'v3.1.x' of github.com:grafana/grafana into v3.1.x
2016-07-18 16:22:31 +02:00
Torkel Ödegaard
575b015fe0
fix(panel rendering): Fixed png panel rendering timing issue, #5606
2016-07-18 16:18:00 +02:00
Torkel Ödegaard
b9a2546a10
fix(iframe): fixed issue with using full height of iframe, fixes #5605
2016-07-18 16:17:46 +02:00
Torkel Ödegaard
7ad0904fdb
:Merge branch 'master' of github.com:grafana/grafana
2016-07-18 16:16:44 +02:00
Torkel Ödegaard
ffd865c7ca
fix(panel rendering): Fixed png panel rendering timing issue, #5606
2016-07-18 16:13:50 +02:00
Torkel Ödegaard
e507bb6dd7
fix(iframe): fixed issue with using full height of iframe, fixes #5605
2016-07-18 15:41:06 +02:00
Torkel Ödegaard
6c6dae1c92
Merge branch 'elasticsearch_precision_threshold' of https://github.com/lucasrodcosta/grafana into lucasrodcosta-elasticsearch_precision_threshold
2016-07-18 13:56:34 +02:00
Torkel Ödegaard
c82d5f86ac
fix(singlestat): fixed minor editor blur issue on decimal option that did not cause update of rendered value, fixes #5004
2016-07-18 11:24:41 +02:00
Loren West
51940fa209
Tooltip detatch too soon on mobile click ( #5598 )
...
* Tooltip detatch too soon on mobile click
* Fixed syntax error
2016-07-18 09:04:06 +02:00
Torkel Ödegaard
f13b869aa4
feat(alerting): work on alerting
2016-07-14 13:32:16 +02:00
Jack Meagher
2c77f2231e
Do not substitute #[A-Z] in graphite target when invalid ref ( #5581 )
...
* Do not substitute #[A-Z] in graphite target when invalid ref
In the case where #[A-Z] does not reference another query, such as #J when there
are only 2 queries, do not perform the substitution. This prevents the situation
target name without a query labelled J (10th query).
* Do not substitute #[A-Z] in graphite target when invalid ref
In the case where #[A-Z] does not reference another query, such as #J when there
are only 2 queries, do not perform the substitution. This prevents the situation
target name without a query labelled J (10th query).
2016-07-14 10:29:22 +02:00
Torkel Ödegaard
82eebf64b6
fix(graph): Fix so that zoom works even when no data exists, fixes #5570
2016-07-13 10:02:53 +02:00
Torkel Ödegaard
cc5c45112a
Merge branch 'master' of github.com:grafana/grafana
2016-07-12 15:55:10 +02:00
Torkel Ödegaard
4bb4d7f7d3
Merge branch 'v3.1.x'
2016-07-12 15:54:31 +02:00
Torkel Ödegaard
b2acac3a41
feat(apps): more polish on app dashboard save warning, #5529
2016-07-12 08:41:56 +02:00
Torkel Ödegaard
f3db2fa262
feat(plugins): hide link on small screens
2016-07-11 19:16:35 +02:00
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
d9096110f8
Merge branch 'master' into alerting
...
Conflicts:
pkg/api/dashboard.go
pkg/models/dashboards.go
pkg/services/sqlstore/dashboard.go
2016-07-11 18:28:07 +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
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
Alexander Akulov
010dbddf59
Fix double slashes in POST request to ES ( #5536 )
2016-07-08 18:24:08 +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
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
7c7e26bc18
feat(templating): refactoring template variable handling for variables that change on time refresh, closes #5021
2016-07-06 08:25:46 +02:00
