bergquist
8cd1d17916
feat(alerting): new alerting model\
2016-06-10 13:15:16 +02:00
bergquist
ef35184a80
feat(alerting): rename alertrule model to alertruleDAO
2016-06-10 10:00:00 +02:00
bergquist
fdf051ad5a
feat(alerting): begin alert rule storage refactoring
2016-06-09 22:21:28 +02:00
bergquist
3898f427f5
feat(alerting): update the ux model
2016-06-09 15:10:50 +02:00
Torkel Ödegaard
55af988e02
feat(alerting): mocking with new alert rule model
2016-06-09 12:14:50 +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
Torkel Ödegaard
071c16b73c
feat(alerting): start on new ui
2016-06-09 10:13: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
Torkel Ödegaard
26d93d7130
Merge branch 'master' into alerting_definitions
2016-06-08 09:36:50 +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
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
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
0667d73660
Merge branch 'new-logger' into alerting_definitions
...
Conflicts:
pkg/api/api.go
pkg/setting/setting.go
2016-06-07 13:31:56 +02:00
Mitsuhiro Tanda
487b2089a9
cache label width
2016-06-07 14:28:08 +09:00
Mitsuhiro Tanda
b28368c859
cache panel width
2016-06-07 14:04:06 +09:00
Mitsuhiro Tanda
25899b72d2
use applyAsync for compile ( #5287 )
2016-06-06 17:18:18 +02:00
Mitsuhiro Tanda
f877afb74d
use async apply ( #5258 )
2016-06-06 17:18:10 +02:00
Torkel Ödegaard
34e17f7282
feat(alerting): requests looks to be working again
2016-06-06 17:11:46 +02:00
Mitsuhiro Tanda
83c76981b2
fix profiling code
2016-06-06 17:42:11 +09:00
Mitsuhiro Tanda
975b53b318
enable profiling in development mode
2016-06-06 17:42:11 +09:00
Torkel Ödegaard
70cb8400c3
feat(alerting): changed name of root Alerts nav item and page from Alerts to Alerting
2016-06-06 09:17:29 +02:00
bergquist
d0ac258474
Merge branch 'master' into alerting_definitions
2016-06-03 12:22:46 +02:00
bergquist
510360a509
docs(elastic): updates readme
2016-06-02 14:56:31 +02:00
Torkel Ödegaard
49fe90874a
Merge branch 'v3.0.x'
2016-06-02 12:09:10 +02:00
Torkel Ödegaard
acbaef1907
fix(influxdb): fixed issue with backslash escaping in tag filter, fixes #5249
2016-06-02 12:08:13 +02:00
Torkel Ödegaard
8ab324988c
Merge branch 'v3.0.x'
2016-06-02 09:57:20 +02:00
Torkel Ödegaard
38790e2c4b
fix(elasticsearch): fixed templating lucene / json escaping issue, fixes #5228 , fixes #5227
2016-06-02 09:54:28 +02:00
bergquist
76758d270f
feat(alerting): set basic description text of status ok
2016-05-31 20:03:15 +02:00
bergquist
68f148880d
feat(alerting): add alert info at log page
2016-05-31 16:26:06 +02:00
bergquist
1ded0b30c2
fix(alerting): fix broken model bind in alerting tab
2016-05-31 13:12:05 +02:00
bergquist
c5c261e955
feat(alerting): improve spacing in alerting tab
2016-05-30 17:50:35 +02:00
bergquist
411568351d
feat(alerting): revert operand positions
2016-05-30 14:47:59 +02:00
bergquist
1686d86c3b
Merge branch 'master' into alerting_definitions
2016-05-30 08:26:08 +02:00
Torkel Ödegaard
1ea54049d0
feat(templating): added new template variable type constant
2016-05-28 16:59:29 +02:00
hc4
cf87e8ecf5
Fix parsing of intervals. defined in ms ( #5151 )
...
* Fix parsing of intervals. defined in ms
Fix parsing of intervals. defined in ms.
Increase accuracy for sub-second inrevals.
Closes #5008
* Tests for sub-ms intervals
Unit test for 2034d4b971
2016-05-27 17:26:20 +02:00
Carl Bergquist
a6afd85526
Merge pull request #5197 from minkikim89/fixtypo
...
Fixed type
2016-05-27 16:57:07 +02:00
Torkel Ödegaard
bf90fbc678
fix(templating): fixed failing templating unit test
2016-05-27 09:23:08 +02:00
Torkel Ödegaard
696fad702f
Merge branch 'v3.0.x'
...
Conflicts:
public/app/features/templating/templateValuesSrv.js
2016-05-26 14:21:17 +02:00
Torkel Ödegaard
724a511995
fix(templating): fixed issue with value being shown instead of it's text representation, fixes #5172
2016-05-26 13:18:02 +02:00
Torkel Ödegaard
90c9c70416
fix(): another fix for panel image rendering
2016-05-26 08:49:55 +02:00
Torkel Ödegaard
f8a4661d05
Merge branch 'master' of github.com:grafana/grafana
2016-05-26 08:37:19 +02:00
Torkel Ödegaard
dd494e648a
fix(rendering): fixed issue with phantomjs panel rendering
2016-05-26 07:45:53 +02:00
