bergquist
b17298c97c
test(alerting): remove unused code to enable gorename
2016-06-10 07:11:14 +02:00
bergquist
fdf051ad5a
feat(alerting): begin alert rule storage refactoring
2016-06-09 22:21:28 +02:00
stuart nelson
048bcf19f6
Use panel+ref for unique id
...
Previously, if a user changed the query between
requests, the previous query would not be
canceled. This handles that edge-case.
2016-06-09 15:17:17 +02:00
stuart nelson
8797be9f89
Add existence check for canceler.
2016-06-09 15:16:53 +02:00
bergquist
3898f427f5
feat(alerting): update the ux model
2016-06-09 15:10:50 +02:00
bergquist
1e4761854e
Merge branch 'alerting_definitions' into alert_ui_take2
2016-06-09 13:03:40 +02:00
stuart nelson
cc64d65c2f
Rename cacheKey to exprID/requestID
...
Depending on context in the code, rename cacheKey
to exprID when it identifies a unique expression,
and rename cacheKey to requestID when it is
identifying a request.
2016-06-09 12:57:55 +02:00
Torkel Ödegaard
55af988e02
feat(alerting): mocking with new alert rule model
2016-06-09 12:14:50 +02:00
stuart nelson
efdb990e56
Return an error for a canceled request.
...
Allow the datasource to decide how to handle a
canceled request.
2016-06-09 12:13:17 +02:00
stuart nelson
bc7c2cd3f5
Create cacheKey at top-level
...
Responsibility is now to pass the cacheKey through
to `datasourceRequest` in each datasources'
implementation of `query`.
2016-06-09 11:36:46 +02:00
bergquist
66d47a9303
tech(alerting): go vet fix
2016-06-09 10:49:25 +02:00
Torkel Ödegaard
c85bb47675
Merge branch 'alerting_definitions' into alert_ui_take2
2016-06-09 10:46:03 +02:00
Torkel Ödegaard
dee5f582d7
Merge branch 'master' into alerting_definitions
2016-06-09 10:45:16 +02:00
Torkel Ödegaard
1584dac00a
Merge branch 'master' of github.com:grafana/grafana
2016-06-09 10:43:46 +02:00
Torkel Ödegaard
79986e5593
Merge branch 'query-part-refactor'
...
Conflicts:
public/app/plugins/datasource/influxdb/query_part.ts
2016-06-09 10:43:07 +02:00
Torkel Ödegaard
b8aa8b3079
feat(prometheus): restore old prometheus query editor, revert this commit in prometheus query editor v2 branch
2016-06-09 10:37:33 +02:00
bergquist
544073b7e1
feat(alerting): make sure saved alerts are valid
2016-06-09 10:27:23 +02:00
Torkel Ödegaard
071c16b73c
feat(alerting): start on new ui
2016-06-09 10:13:34 +02:00
bergquist
a1f97e0b77
feat(alerting): add heartbeat writer
2016-06-09 10:00:34 +02:00
Mark Baas
ced3bafa99
returns correct index ( #5275 )
2016-06-09 08:13:31 +02:00
Mukesh
755ec552de
Bugfix: org select btn was not working on profile ( #5317 )
2016-06-09 00:43:38 +02:00
stuart nelson
18f9f6c159
Add in-flight identifier for Prometheus requests
...
Repeat Prometheus requests with the same query
will cancel preceding requests.
2016-06-08 18:05:46 +02:00
stuart nelson
6da7ed9706
Add support for canceling in-flight requests
...
Repeat requests, if they already exist in the
in-flight request map, will cause the previous
request to cancel.
The implementation of the unique key is the
responsibility of individual datasources.
2016-06-08 18:04:31 +02:00
Torkel Ödegaard
a66027830b
Merge branch 'alerting_definitions' of github.com:grafana/grafana into alerting_definitions
2016-06-08 09:42:31 +02:00
Torkel Ödegaard
26d93d7130
Merge branch 'master' into alerting_definitions
2016-06-08 09:36:50 +02:00
bergquist
ffac5c1299
docs(changelog): add note about changelog
2016-06-08 09:35:34 +02:00
Carl Bergquist
fe5673134f
Merge pull request #5292 from Thib17/master
...
Enable the "limit" param in /api/search
2016-06-08 09:19:58 +02:00
bergquist
366fb11416
style(alerting): add fmt fixes
2016-06-08 08:50:11 +02:00
Torkel Ödegaard
1d8fdc09e7
feat(logging): added log format option, #4590
2016-06-08 08:48:46 +02:00
Torkel Ödegaard
7d6cda4916
Merge branch 'master' of github.com:grafana/grafana
2016-06-08 08:10:22 +02:00
Torkel Ödegaard
b25cb60259
Merge branch 'new-logger'
...
Conflicts:
CHANGELOG.md
2016-06-08 08:09:59 +02:00
Torkel Ödegaard
87e98f01cd
feat(logging): updated syslog writer to work with log15 log interface, closes #4590
2016-06-08 08:09:29 +02:00
Karl
22cda198ae
Apply EscapeFilter to username to address grafana/grafana#5121 ( #5279 )
2016-06-08 07:28:16 +02:00
Tom Hukins
d1c06a93df
Fix a typo ( #5306 )
2016-06-08 07:27:52 +02:00
Torkel Ödegaard
eed0d9c8d2
feat(graph performance): graph performance tweaks, refactoring #5297
2016-06-08 07:23:44 +02:00
Torkel Ödegaard
bf82fdb678
Merge branch 'perf_graph_js' of https://github.com/mtanda/grafana into mtanda-perf_graph_js
2016-06-08 06:53:28 +02:00
Torkel Ödegaard
e1e7fbf83d
Merge branch 'master' of github.com:grafana/grafana
2016-06-08 06:51:43 +02:00
Torkel Ödegaard
c739428c30
feat(profiling): refactorign profiling code, #5286
2016-06-08 06:51:10 +02:00
Torkel Ödegaard
2a7d2ffccb
Merge branch 'profiling_in_dev' of https://github.com/mtanda/grafana into mtanda-profiling_in_dev
2016-06-08 05:47:30 +02:00
Zdenek Styblik
5eceabf810
fix(): Check Organization exists before User is added ( #5302 )
...
Commit adds a check whether Organization exists before User is added to
the organization.
Fixes #3151 .
2016-06-08 05:46:21 +02:00
Torkel Ödegaard
67ad903556
feat(test metrics): fixed issue with built in Grafana test data source, fixes #5299
2016-06-08 05:45:13 +02:00
Torkel Ödegaard
36b0802789
fix(png): fixed issue with png rendering, fixes #5274
2016-06-08 05:29:38 +02:00
Torkel Ödegaard
93fdc18fd4
feat(logging): fixed dependencies
2016-06-07 15:59:50 +02:00
bergquist
8d4aa5d114
test(alerting): update dashboard json
2016-06-07 15:52:33 +02:00
Torkel Ödegaard
e4ea24dfc4
Merge branch 'new-logger' into alerting_definitions
...
Conflicts:
pkg/services/sqlstore/migrations/migrations_test.go
2016-06-07 15:51:22 +02:00
Torkel Ödegaard
73b0e6c37b
feat(logging): disable migrator logging during test
2016-06-07 15:50:16 +02:00
Torkel Ödegaard
d7c03359ea
feat(alerting): fixed test issues
2016-06-07 14:54:30 +02:00
Torkel Ödegaard
3289225b77
feat(alerting): fixed test issues
2016-06-07 14:51:53 +02:00
Torkel Ödegaard
8105ec4660
feat(alerting): fixed test issues
2016-06-07 14:27:56 +02:00
Torkel Ödegaard
461e6ae4ac
feat(alerting): added missing godep libs
2016-06-07 13:50:55 +02:00
