Torkel Ödegaard
c04590784b
Merge branch 'utkarshcmu-help-text'
2016-12-16 13:43:51 +01:00
Torkel Ödegaard
af363ab478
fix(panel): build fixes
2016-12-16 13:43:43 +01:00
Torkel Ödegaard
62f3b16671
feat(panel): working on panel help text and unifying panel links, panel errors, and panel help into a single panel feature, #4079 , #6847
2016-12-16 13:06:04 +01:00
Torkel Ödegaard
ac9ae52cea
feat(panel): working on panel help text and unifying panel links, panel errors, and panel help into a single panel feature, #4079 , #6847
2016-12-16 12:46:29 +01:00
Torkel Ödegaard
b9043c915e
feat(panel): working on panel help text, #4079 , #6847
2016-12-16 11:48:32 +01:00
Torkel Ödegaard
ca7bc25c83
feat(panel): working on panel help text, #4079 , #6847
2016-12-16 10:34:00 +01:00
bergquist
ca7baca21d
feat(alerting): adds ok as no data option
...
closes #6866
2016-12-15 11:13:19 +01:00
bergquist
6a161216de
fix(influxdb): fixes bug with empty tagColumn for annotations
2016-12-15 10:54:22 +01:00
Torkel Ödegaard
8fc6e4cfb0
fix(auth proxy, ldap): fixed so users cannot change password when ldap or auth proxy is enabled, fixes #2495 , do not allow user to change email or username depending on what property auth proxy is using, fixes #6903
2016-12-14 22:19:25 +01:00
Torkel Ödegaard
6e27db148c
Merge branch 'authproxy_ldap' of https://github.com/seuf/grafana into seuf-authproxy_ldap
2016-12-14 21:45:15 +01:00
Torkel Ödegaard
330c1b945e
refactor(datasource): refactoring datasource secure json fields handling, #6697 , #6692
2016-12-14 21:06:10 +01:00
Torkel Ödegaard
b38e9b0cac
fix(cloudwatch): removed debugger statement
2016-12-14 20:40:02 +01:00
Torkel Ödegaard
c3920bfba1
fix(cloudwatch): fixed broken cloudwatch edit page, #6697
2016-12-14 20:38:35 +01:00
Torkel Ödegaard
467ddc19c3
feat(panel): worked on panel description tooltip, #6847
2016-12-14 17:22:19 +01:00
Torkel Ödegaard
5f7ad9ddb6
Merge branch 'help-text' of https://github.com/utkarshcmu/grafana into utkarshcmu-help-text
2016-12-14 16:20:36 +01:00
Torkel Ödegaard
7425c63528
fix(dashboard): fixed unit test
2016-12-14 14:42:25 +01:00
Torkel Ödegaard
e72a60bbf5
feat(graph): shared graph tooltip is not a select option with 3 options, normal, shared crosshair & shared tooltip, CTRL+O or CMD+O cycles option, closes #6894
2016-12-14 14:33:33 +01:00
Torkel Ödegaard
baec2bbe8a
fix(firefox): fixed table options tab UX issues, fixes #6900
2016-12-14 13:16:54 +01:00
Torkel Ödegaard
488fe62f15
fix(singletat): fixed/polished layout in singlestat ui options tab
2016-12-14 12:58:20 +01:00
Torkel Ödegaard
faf6a5fd36
fixed issue in metric segment and option lookup, #6912
2016-12-14 10:50:48 +01:00
bergquist
b620c7457d
test(query_editor): adds test for nesting queries in targetFull
2016-12-13 10:46:09 +01:00
bergquist
76f78c0f72
test(alert_tab): basic test skeleton
...
I created this test by misstake. But instead of deleting it I thought it
might be good to keep it to make it easier to add tests for the alert
tab
2016-12-13 09:50:38 +01:00
Torkel Ödegaard
9da44141f1
fix(git): removed external submodule, accedentially included in PR, fixes #6929
2016-12-12 15:43:04 +01:00
bergquist
530e1b358a
Merge branch 'master' into adrianlzt-bug/show_multiple_tags_with_influxdb
2016-12-12 14:55:56 +01:00
bergquist
ce4e71364c
test(influxdb): adds tests for supporting multiple tags
2016-12-12 14:55:39 +01:00
Torkel Ödegaard
5ec7dea81a
Merge branch 'v4.0.x'
2016-12-12 14:39:53 +01:00
Torkel Ödegaard
8feaef20e0
fix(graph): fixed graph issue with axes mode set to series and picking Max value, fixes #6926
2016-12-12 14:37:40 +01:00
bergquist
d599f45707
Merge branch 'bug/show_multiple_tags_with_influxdb' of https://github.com/adrianlzt/grafana into adrianlzt-bug/show_multiple_tags_with_influxdb
2016-12-12 13:30:27 +01:00
Torkel Ödegaard
ee6cd727ea
Merge branch 'master' of github.com:grafana/grafana
2016-12-12 11:38:31 +01:00
Torkel Ödegaard
3bb9d47a45
minor change to #6904
2016-12-12 11:38:10 +01:00
Torkel Ödegaard
815722c3cc
Merge branch 'upgrade_typescript' of https://github.com/Nepomuceno/grafana into Nepomuceno-upgrade_typescript
2016-12-12 10:53:19 +01:00
huydx
015fa82cf5
fix(alert): alert test should return error when it failed to dispatch
2016-12-12 18:22:58 +09:00
Seuf
ae27c17c68
Auth Proxy improvements
...
- adds the option to use ldap groups for authorization in combination with an auth proxy
- adds an option to limit where auth proxy requests come from by configure a list of ip's
- fixes a security issue, session could be reused
2016-12-12 09:43:17 +01:00
Gabriel Nepomuceno
a8ae0a5b79
fixing compilation of grunt
2016-12-09 21:53:00 +00:00
Gabriel Nepomuceno
f3ebd2d849
upgrading bases and correcting identation missing tslint
2016-12-09 14:57:25 +00:00
Axel
2adbe3e13e
Prettify duration value format ( #6875 )
...
* Prettify duration unit format
Format duration like "2 days, 19 hours, 48 minutes" and make Decimals useful e.g.
0 decimals: 2 days
2 decimals: 2 days, 19 hours, 48 minutes
3 decimals: 2 days, 19 hours, 48 minutes, 27 seconds
Previous code did some rounding that is now gone so numbers might be
different.
* Rewrite kbn.toDuration without moment.js
Because https://github.com/moment/moment/issues/3653
* Add tests for kbn.toDuration
2016-12-09 15:55:25 +01:00
bergquist
619c5c4f1b
Merge branch 'master' into elastic5_support
2016-12-09 11:41:23 +01:00
bergquist
ebec02ffae
style(elastic): minor code style changes
2016-12-09 11:40:00 +01:00
bergquist
99c5f7d571
feat(elastic): remove support for ES 1.x
2016-12-09 11:34:19 +01:00
bergquist
873024b917
tech(elastic): use bool conditions for all es queries
2016-12-09 11:13:28 +01:00
Matt Toback
e58b6989c2
Small refactor to make hover highlighting proper, added a title tag for the completed grafana step. ( #6882 )
2016-12-09 09:42:24 +01:00
Matt Toback
f39f77692b
Adjusted the active state to fix the faint line showing. Probably related to the font change going into 4.0 ( #6886 )
2016-12-09 09:41:54 +01:00
Torkel Ödegaard
05772b30d7
feat(ux): completed work on getting started panel, #6466
2016-12-08 10:25:05 +01:00
Torkel Ödegaard
dee6b7d150
Merge branch 'master' into getting-started-panel
2016-12-08 08:51:40 +01:00
Matt Toback
6ae6a5d312
Polished some styles, updated issue 6466
2016-12-07 14:51:00 -05:00
Torkel Ödegaard
924535c6d0
change(graph): changed null value graph option to default to null, closes #6868
2016-12-07 15:27:20 +01:00
Adrian Lopez
395b834a23
Better match for culumn inside tagsColumn
2016-12-07 12:23:57 +01:00
Torkel Ödegaard
e082d78697
fix(elasticsearch): removed unused code
2016-12-07 12:07:56 +01:00
Torkel Ödegaard
7b68e6ea3b
feat(elasticsearch): Added support for Missing option (bucket) for terms aggregation, refactoring PR #4244 , thx @shanielh
2016-12-07 12:06:47 +01:00
Carl Bergquist
0294446af9
Merge pull request #6856 from kylemcc/opsgenie-alerting
...
alerting: add support for OpsGenie
2016-12-07 11:23:54 +01:00
