IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2024-12-01 21:19:28 -06:00
Code Issues Packages Projects Releases Wiki Activity
9,487 Commits 5,114 Branches 538 Tags 1.9 GiB
4f216f22e9
Commit Graph

3569 Commits

Author SHA1 Message Date
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
vaibhavinbayarea
24172fca01 Added feature request "predict value" in moving averages pipeline agg (#5689) 
issue-id: #5688
 2016-12-07 10:47:46 +01:00
Matt Toback
d28726be06 Moved ADD ROW to left to consolidate row actions along the same vertical area. (#6852) 2016-12-07 10:45:23 +01:00
Kyle McCullough
4ef940482c
alerting: add support for OpsGenie 2016-12-06 14:48:13 -06:00
utkarshcmu
6b26a0f91d Fixed hover position 2016-12-06 05:53:33 -08:00
utkarshcmu
13f0b32a8f Added sanitizer to help text 2016-12-06 05:24:03 -08:00
bergquist
6440d884db elastic: make sure old tests are for es2 2016-12-06 14:17:03 +01:00
utkarshcmu
034d84354e Fixed HelpText input box 2016-12-06 03:58:38 -08:00
utkarshcmu
42de27a2cb Added help text for users 2016-12-06 03:54:44 -08:00
Torkel Ödegaard
fa393c282a feat(graph): refactoring shared tooltip PR #6274 2016-12-06 11:55:20 +01:00
bergquist
005a17d52f Merge branch 'master' of https://github.com/lpic10/grafana into lpic10-master 2016-12-06 10:15:36 +01:00
Torkel Ödegaard
51165e76ba Merge branch 'shared_tooltip' of https://github.com/connection-reset/grafana into connection-reset-shared_tooltip 2016-12-06 09:32:22 +01:00
Torkel Ödegaard
9bb440bc82 Merge branch 'master' of github.com:grafana/grafana 2016-12-06 09:02:51 +01:00
Torkel Ödegaard
62269bb894 change(influxdb): always specify absolute time range in milliseconds, refactoring #6571 2016-12-06 08:56:01 +01:00
Torkel Ödegaard
c6bb86d833 Merge branch 'master' of https://github.com/ryantxu/grafana into ryantxu-master 2016-12-06 08:38:29 +01:00
Ben RUBSON
e51525dbde Only take bar series to calculate barWidth (#6756) 
* Only take bar series to calculate barWidth

solves #6751

* Typo

* Typo

* Typo

* Typo

* Refactor

* Simplify
 2016-12-06 08:36:23 +01:00
Mitsuhiro Tanda
5f6a3ecd56 (cloudwatch) don't expand variable when panel or row repeat is used (#6618) 
* (cloudwatch) don't expand variable when panel or row repeat is used

* fix test
 2016-12-06 08:16:41 +01:00
Mitsuhiro Tanda
be26c017f6 (cloudwatch) percentile support (#6634) 
* support extended statistics

* handle different response format for extended statistics
 2016-12-06 08:12:30 +01:00
Torkel Ödegaard
d56b9a720a feat(alerting): added confirm text when removing panel with alert rule 2016-12-06 08:11:21 +01:00
Torkel Ödegaard
ee36234196 Merge branch 'v4.0.x' 2016-12-06 07:42:35 +01:00
Torkel Ödegaard
f9fba0e935 fix(timerange): fixed time range zoom out shortcut, fixes #6837 2016-12-06 07:42:22 +01:00
Torkel Ödegaard
4c406dec2f cleanup(): removed unused (old) migrate stuff 2016-12-05 12:52:34 +01:00
Torkel Ödegaard
aea3093d85 change(Timepicker): removed last 90 days to make room for Last 2 days, #6758 2016-12-05 11:52:00 +01:00
Jaime Soriano Pastor
f2d5829944 Add 'Last 2 days' option to quick ranges (#6758) 2016-12-05 11:51:02 +01:00
Torkel Ödegaard
50022253bd Merge branch 'v4.0.x' 2016-12-05 11:44:02 +01:00
Torkel Ödegaard
890e5ce8ca feat(playlist): added support for kiosk mode & minor polish/fix, closes #6727 2016-12-05 11:43:51 +01:00
Torkel Ödegaard
c5ff1e4584 Merge branch 'v4.0.x' 2016-12-05 11:04:24 +01:00
Torkel Ödegaard
a9c0f66cda fix(influxdb): Fix for Ad-Hoc Filters variable & changing dashboards, fixes #6821 2016-12-05 11:04:05 +01:00
Axel Pirek
e6c8e75d62 Make tooltip shareable like crosshair 2016-12-01 10:10:23 +01:00
Carl Bergquist
d11b17b8fe Merge pull request #5677 from bmundt/remove_columns 
Added Hidden Column Style for Table Panel
 2016-11-30 00:08:17 +01:00
Carl Bergquist
3c662ade8c Merge pull request #6698 from grafana/cloudwatch_configurable_keys 
Cloudwatch configurable keys from config page.
 2016-11-29 23:37:13 +01:00
bergquist
180940a378 fix(singlestat): align width for gauge settings 2016-11-29 23:25:45 +01:00
bergquist
0d41b1294a fix(singlestat): align width for gauge settings 2016-11-29 23:24:46 +01:00
Carl Bergquist
c2ed24b788 Merge pull request #6740 from dirk-leroux/new_aggregation_on_singlestat_panel 
New aggregation on singlestat panel
 2016-11-29 23:18:01 +01:00
bergquist
a6ea2f4fdb Merge branch 'victorops' of https://github.com/ichekrygin/grafana into ichekrygin-victorops 2016-11-29 22:22:25 +01:00
Torkel Ödegaard
25a5fc465c fix(row): fixed dropping new panels onto panels, should split target panel 2016-11-29 11:38:02 -05:00
Torkel Ödegaard
7276b00fc7 fix(row): fixed dropping new panels onto panels, should split target panel 2016-11-29 11:37:06 -05:00
Dirk le Roux
49dda7e5c1 first, delta, range passing unit tests 
Signed-off-by: Dirk le Roux <dirk.leroux@gmail.com>
 2016-11-29 08:26:31 +02:00
Ryan McKinley
0534d43a6e use ms when query less then 5 mins 2016-11-28 14:57:36 -08:00
Ryan McKinley
1ce0d81736 Merge remote-tracking branch 'grafana/master' 2016-11-28 13:38:18 -08:00
Carl Bergquist
2bdb2f79ec fix(table): renderes empty date column as '-' (#6736) 
* fix(table): renderes empty date column as '-'

closes #6728

* docs(changelog): add note about closing 6728
 2016-11-28 14:42:43 -05:00
Torkel Ödegaard
a2d1cc1a46 fix(css): minor style fix 2016-11-28 09:39:07 -05:00
bergquist
7bc1c3cc1c feat(cloudwatch): make it possible to reset keys 
closes #6697
 2016-11-24 16:37:33 +01:00
bergquist
3d21f06d5b tech(cloudwatch): store keys in secure json blob 2016-11-24 14:16:52 +01:00
bergquist
1695aece0c feat(cloudwatch): add authtype dropdown to config page 2016-11-24 14:00:05 +01:00
bergquist
64784db870 feat(cloudwatch): adds access and secret key to edit config page 2016-11-24 14:00:05 +01:00
Torkel Ödegaard
2f354ed926 fix(getting started panel): some more work on this, #6466 2016-11-24 13:58:51 +01:00
Daniel Lee
0618122bcd feat(httpsettings): add tls auth option 
- Three text areas where the user can paste
in the CA Cert (optional), Client Cert
and Client Key.

- Tooltips for Auth checkboxes with brief
descriptions of what With Credentials and
With CA Cert are.

- Adds popover for TLS Auth header too.

- Aligns gf-form elements as labels and
checkboxes were not aligned before.

- Makes CA Cert optional as it is only
needed for self-signed certs.
 2016-11-24 13:33:28 +01:00
Joe Lanford
56b7e2dfaf Added support for TLS client auth for datasource proxies (#5801) 2016-11-24 13:22:25 +01:00
Torkel Ödegaard
2233938ba7 Merge branch 'master' into getting-started-panel 2016-11-24 13:17:22 +01:00
Torkel Ödegaard
ad7ae1b912 fix(graph): Fixed tooltip date header visible when x-mode was set to series, fixes #6364 2016-11-24 13:16:46 +01:00
Torkel Ödegaard
d9cf6a958b fix(unsaved changes): You now navigate to the intended page after saving in the unsaved changes dialog fixes #6675 2016-11-24 11:06:09 +01:00
Ben RUBSON
614bd7f1e8 Sort series by yaxis by default (#6683) 
* Sort series by yxis by default

* Sort series by yxis by default

* Sort series by yxis by default
 2016-11-24 10:24:49 +01:00
Torkel Ödegaard
223f2320eb fix(streaming): clear data stream on subject completion 2016-11-23 17:12:30 +01:00
Torkel Ödegaard
cf751c256b fix(graph): fixed order of graph tooltip when sort order was none, fixes #6648 2016-11-23 17:08:14 +01:00
bergquist
56156fcd7f feat(alerting): add median reducer to frontend 2016-11-22 14:35:26 +01:00
Torkel Ödegaard
2a33594c02 fix(templating): fixed duplicate button bug, fixes #6652 2016-11-22 14:20:24 +01:00
Torkel Ödegaard
34790e1fab fix(dashboard): minor fix to schema upgrade when schemaVersion is not correct, fixes #6650 2016-11-22 14:20:24 +01:00
benrubson
e71114f4fb Come back to #6287 for graph_tooltip.js 
as it is an only one loop solution
 2016-11-19 09:12:10 +01:00
benrubson
9797845460 Typo 2016-11-18 19:14:12 +01:00
benrubson
0034b6ede7 Highlight correct point when series has null values 2016-11-18 18:49:20 +01:00
benrubson
1eb0ea3450 Correctly stack series with null and missing values 2016-11-18 18:14:40 +01:00
benrubson
becb6303e5 Revert #6287 for graph_tooltip.js 2016-11-18 17:50:54 +01:00
Torkel Ödegaard
1dc581bdfa ux(gettingstarted): progress on getting started panel, #6466 2016-11-18 17:42:14 +01:00
benrubson
850d39fc50 Revert #6287 for jquery.flot.stack.js 2016-11-18 16:32:00 +01:00
Torkel Ödegaard
fd512457d8 Merge remote-tracking branch 'origin/master' into getting-started-panel-css2 2016-11-18 16:31:54 +01:00