Torkel Ödegaard
dee5f582d7
Merge branch 'master' into alerting_definitions
2016-06-09 10:45:16 +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
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
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
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
25899b72d2
use applyAsync for compile ( #5287 )
2016-06-06 17:18:18 +02: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
1686d86c3b
Merge branch 'master' into alerting_definitions
2016-05-30 08:26:08 +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
Jared Wiltshire
c9d6321f38
Allow for proxying Authorization header and automatically convert ( #4832 )
...
Authorization header to X-DS-Authorization in backend_srv.js
2016-05-26 07:13:29 +02:00
Torkel Ödegaard
8f0240a295
Merge branch 'footer'
2016-05-24 07:53:13 +02:00
Torkel Ödegaard
9a7817a271
Merge branch 'master' into footer
...
Conflicts:
pkg/api/frontendsettings.go
2016-05-23 20:59:23 +02:00
Utkarsh Bhatnagar
8a0d5aa38d
[Bug Fix] #5136 ( #5142 )
2016-05-23 20:58:21 +02:00
Torkel Ödegaard
dfe3806d01
fix(elasticsearch): fixed query editor issue with elasticsearch
2016-05-23 10:14:40 +02:00
Torkel Ödegaard
c60d737928
Merge branch 'v3.0.x'
...
Conflicts:
package.json
2016-05-23 09:29:14 +02:00
Torkel Ödegaard
1da149d9e1
feat(annotations): annotations can now use a template variable as data source, closes #5054
2016-05-23 09:28:14 +02:00
minki
70d6b32e14
Fixed type
2016-05-22 05:38:57 +09:00
Torkel Ödegaard
a3ee388b66
Merge branch 'master' into query-part-refactor
2016-05-19 14:52:18 +02:00
bergquist
ef4f5147be
Merge branch 'master' into alerting_definitions
2016-05-19 08:05:35 +02:00
Torkel Ödegaard
1bb4ca22e7
fix(test): fixed failing unsaved changes test
2016-05-19 07:58:44 +02:00
hijklmno
f1b5a265ab
fix trailing whitespace in kbn.js
2016-05-16 15:35:42 -07:00
hijklmno
451e917e7d
Add dBm as an option in energy units
2016-05-16 15:24:31 -07:00
bergquist
fa19e0d9c6
style(modal): use standard valid styles
2016-05-16 17:03:01 +02:00
bergquist
6435fa6b99
fix(modal): add undefined check
2016-05-16 16:48:28 +02:00
bergquist
2ce9d4571c
fix(alerting): fix spacing
2016-05-16 14:29:54 +02:00
bergquist
80f7fe8646
feat(alerting): add confirm text dialog when deleting dashboards with alerts
2016-05-16 11:54:28 +02:00
Torkel Ödegaard
b170b6ec8b
feat(query part): moved query part editor from influxdb to core
2016-05-11 14:52:44 +02:00
Torkel Ödegaard
d3bbc245c9
feat(query_part): began query part refactor to be able to reuse it in prometheus query editor
2016-05-10 14:32:25 +02:00
bergquist
9da2e6e907
feat(alerting): update path
2016-05-09 15:17:26 +02:00
Torkel Ödegaard
de26a17dc7
feat(footer): began work on page footer
2016-05-03 09:00:58 +02:00
bergquist
ca959d1ab0
Merge branch 'master' into alerting_definitions
2016-05-02 13:22:58 +02:00
Torkel Ödegaard
0d85254a19
fix(annotations): Fixed issue with entering annotation edit view, fixes #4857
2016-04-29 23:14:39 +02:00
Torkel Ödegaard
8b4c7c94b8
feat(templating): completed work on templating as data source, closes #816
2016-04-28 19:31:43 +02:00
Torkel Ödegaard
7349427189
feat(data source variable): progress on data source as variable
2016-04-28 19:08:35 +02:00
bergquist
bd30a4d23e
Merge branch 'master' into alerting_definitions
2016-04-28 16:04:28 +02:00
Torkel Ödegaard
5d652dcaef
fix(table): table column sorting fix
2016-04-28 15:48:49 +02:00
bergquist
ecfbc2edca
feat(alerting): adds alert history page
2016-04-28 11:42:03 +02:00
bergquist
5bc3672296
Merge branch 'master' into alerting_definitions
2016-04-28 11:03:33 +02:00
bergquist
6a5ecb3fca
feat(alerting): adds basic page for listing alerts
2016-04-27 13:02:28 +02:00
Torkel Ödegaard
65b4945548
Merge branch 'master' into query-editor-style
2016-04-27 08:43:34 +02:00
Torkel Ödegaard
aa98ada141
fix(snapshots): fixed snapshot issue introdiuced yesterday
2016-04-26 14:51:06 +02:00
Torkel Ödegaard
34cb17546d
fix(): minor fix for event emitter
2016-04-26 12:39:24 +02:00
Torkel Ödegaard
bbf4d00319
fix(query editors): added select style to segment, used by data source selector
2016-04-25 15:49:33 +02:00
Torkel Ödegaard
6b813b4e2a
feat(query editors): remember collapsed state
2016-04-25 15:11:40 +02:00
Torkel Ödegaard
1a433de0b4
Merge branch 'master' into query-editor-style
2016-04-25 14:22:36 +02:00
Torkel Ödegaard
00827ce921
fix(): let binding cycle complete before adding panel to dom
2016-04-24 12:50:33 +02:00
