IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-12 08:35:43 -06:00
Code Issues Packages Projects Releases Wiki Activity
9,440 Commits 5,453 Branches 554 Tags 1.9 GiB
b8572b69f0
Commit Graph

3549 Commits

Author SHA1 Message Date
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
Torkel Ödegaard
0c9001c7ae ux(gettingstarted): progress on getting started panel, #6466 2016-11-18 16:31:19 +01:00
Ryan McKinley
7958615097 Use ms rather than second precision 2016-11-17 09:21:25 -08:00
Torkel Ödegaard
e34bf9a1fa Merge branch 'utkarshcmu-or_alerting' 2016-11-17 15:49:52 +01:00
Torkel Ödegaard
62e8a039a1 refactor(alerting): refactoring PR for OR conditions, #6579 2016-11-17 15:48:15 +01:00
Torkel Ödegaard
457ae74343 Merge branch 'or_alerting' of https://github.com/utkarshcmu/grafana into utkarshcmu-or_alerting 2016-11-17 14:43:24 +01:00
Torkel Ödegaard
98d1748e43 fix(templating): work on fixing exporting issues when using templating variables, like data source variables, and panel repeats, requires more work #6189 2016-11-17 12:32:11 +01:00
Torkel Ödegaard
9d5928ddd6 feat(templating): don't persist template variable options when variable has refresh enabled, closes #6586 2016-11-17 11:38:06 +01:00
Torkel Ödegaard
eafe0d6bfa fix(templating): fixed issue when adding template variable, fixes #6622 2016-11-17 11:28:33 +01:00
Torkel Ödegaard
196fdbfd31 fix(dashboard): fixed issue when dragging new panel to drop zone 2016-11-17 10:31:37 +01:00
Torkel Ödegaard
a45fdfdd3f fix(dashboard): minor fixes, and restored in-activity timer to 1min 2016-11-17 10:11:59 +01:00
ichekrygin
8f0d51171d Resolve rebase w/ upstream conflicts. 
Remove: `Alert on Exec Error` (no longer needed)
Add: `ruleUrl` to VictorOps message body.
 2016-11-16 16:13:33 -08:00
ichekrygin
b46cbc5fbe Add option to alert on ExecutionError 2016-11-16 14:02:34 -08:00
ichekrygin
4ca304b756 Change VictorOps fa from fa-exclamation-triangle -> fa-pagelines 2016-11-16 14:02:34 -08:00
ichekrygin
1e558e3936 Fix user-facing text 2016-11-16 14:02:34 -08:00
ichekrygin
b0620a9d4b Add VictorOps alert notification capability 2016-11-16 14:02:34 -08:00
Torkel Ödegaard
42167a65c6 testdata(): added test graph for null stacking scenario, #6566 2016-11-16 19:00:23 +01:00
Torkel Ödegaard
4581bb4a7a fix(singletat): Support repeated template variables in prefix/postfix, fixes #6595 2016-11-16 18:44:39 +01:00
Torkel Ödegaard
e6776f71d9 cleanup(sass): removed tight-form styles 2016-11-16 18:26:39 +01:00
Torkel Ödegaard
d7e8753c59 cleanup(): removed unused gfbox style 2016-11-16 18:08:45 +01:00
Torkel Ödegaard
079b0ef44a change(alerting): delete alert rule from panel model when duplicating panel 2016-11-16 18:03:00 +01:00
Torkel Ödegaard
a50178eab1 ux(tweak): minor polish to date picker styling 2016-11-16 17:56:42 +01:00
Torkel Ödegaard
f64385cfc9 ux(tweak): minor polish to date picker styling 2016-11-16 17:53:56 +01:00
Torkel Ödegaard
465451c289 cleanup(): removed unused uio-angular tab component 2016-11-16 17:47:37 +01:00
Torkel Ödegaard
18e965c775 fix(error handling): fixed server side error handling page 2016-11-16 17:41:44 +01:00
Torkel Ödegaard
e3564d12a1 fix(404): fixed 404 page 2016-11-16 17:09:00 +01:00
Dan Cech
c980efd470 fix up sass lint warnings (#6603) 2016-11-16 17:08:38 +01:00
Torkel Ödegaard
e7a30ac464 fix(units): fixed issue with data rate bit units, fixes #6602 2016-11-16 16:29:10 +01:00
Torkel Ödegaard
4fa995eafa ux(view/tv mode): treat tab change as user activity, resets in activity timer 2016-11-16 14:44:55 +01:00
Torkel Ödegaard
9c7f8268dc fix(build): fixed failing unit test 2016-11-16 14:39:17 +01:00
Torkel Ödegaard
171335bfef fix(ux): fixed dropzone display issues, fixes #6598 2016-11-16 14:28:52 +01:00
Mitsuhiro Tanda
9740752c1e (cloudwatch) long retention support (#6547) 2016-11-16 10:50:33 +01:00
Matt Toback
10cf32f835 Removed green border from OK alerts. Makes dashboards too busy, competes for attention where action is unnceessary (#6555) 2016-11-16 10:50:01 +01:00
Torkel Ödegaard
f91a833e6a fix(panel): set initial transparency state at first link 2016-11-16 09:44:16 +01:00
Ben RUBSON
a4de6da9a0 Correct series highlight (#6578) 
solves issue #6573
 2016-11-15 18:59:17 +01:00
utkarshcmu
b2db2b26dd Added OR to alert_tab 2016-11-14 18:36:22 -08:00
Ryan McKinley
04356f31d2 missing space 2016-11-14 14:56:11 -08:00
Ryan McKinley
3588b9732f round the seconds 2016-11-14 13:40:33 -08:00
bergquist
a87fd11f26 feat(stats): add alerts to global admin stats 2016-11-11 14:04:38 +01:00
huydx
f5a804a558 Fix typo (password strenght -> password strength) 2016-11-11 18:02:58 +09:00
Andrew McDonald
b98f817d68 Fix for cloudwatch datasource requesting too many datapoints (#6544) 
The range checking in _getPeriod appeared to be using a different variable than the period that had just been calculated for its bounds checks.
 2016-11-11 08:54:44 +01:00
bergquist
abb8f33d77 feat(alertlist): make it possible to filter on alerts from current dashboard 2016-11-10 16:07:13 +01:00
Torkel Ödegaard
18a37a9eef ux(getting started): struggleing witch cleaning up the css, #6466 2016-11-10 14:21:37 +01:00
Torkel Ödegaard
575828f1e9 Merge branch 'getting-started-panel' of github.com:grafana/grafana into getting-started-panel 2016-11-10 13:25:18 +01:00
Torkel Ödegaard
de74bf0c33 Merge branch 'master' into getting-started-panel 2016-11-10 13:24:10 +01:00
Carl Bergquist
a825e63a19 Merge pull request #6515 from grafana/influxdb_alias_seriename 
[Influxdb] Backend support for seriename alias
 2016-11-10 12:56:53 +01:00
bergquist
ecba23e883 Merge branch 'master' into influxdb_alias_seriename 2016-11-10 12:22:17 +01:00
Torkel Ödegaard
6767bdd76d fix(graph): fixed issue log base scale on right y axis, option was not applied at all, also issue with log scale and max value calculation fixed, fixes #6534 2016-11-10 12:04:55 +01:00
Torkel Ödegaard
316d754a21 fix(ui/browser): fixed border not showing in safari, fixes #6530 2016-11-10 11:31:27 +01:00
Torkel Ödegaard
71eb0f3278 fix(graph): fixed issue with bar width when used in series override, fixes #6528 2016-11-10 10:50:48 +01:00
Ben RUBSON
6495ba155a Correct timeStep in case of missing values (#6526) 
* Correct timeStep in case of missing values

* Comment
 2016-11-10 10:20:27 +01:00
Ben RUBSON
2443326386 Add some comments about some previous modifications (#6533) 2016-11-10 10:19:42 +01:00
bergquist
6a8138904e fix(shortcuts): CTRL on windows or linux 2016-11-09 14:48:51 +01:00
Torkel Ödegaard
1d4cace849 fix(testdata): fixed query in default grafana data source 2016-11-09 12:52:56 +01:00
Torkel Ödegaard
a9c6bdc197 panel(graph): stacking can now handle null values, #6287 2016-11-09 11:34:34 +01:00
Torkel Ödegaard
485980eebf Merge branch 'issue-2912' of https://github.com/benrubson/grafana into benrubson-issue-2912 2016-11-09 11:17:04 +01:00
Torkel Ödegaard
33664b0a7e docs(): minor docs change 2016-11-09 11:14:04 +01:00
Torkel Ödegaard
2164bbd447 ux(tv mode): added 1 second delay animation 2016-11-09 10:59:06 +01:00
Torkel Ödegaard
fb57bf77da ux(getting started): progress on getting started panel and persited help flag states, #6466 2016-11-09 10:41:39 +01:00
bergquist
97271514fb feat(influxdb): cleanup influxdb query editor options 2016-11-09 10:30:03 +01:00
Leandro Piccilli
717a96ab8d Fix raw document query on ES 5.x 2016-11-08 22:18:59 +01:00
Leandro Piccilli
a5ee705b89 Merge branch 'master' of https://github.com/grafana/grafana 2016-11-08 22:18:30 +01:00
Torkel Ödegaard
652eb057cf change(graph): change default line width from 2 to 1 2016-11-08 20:57:17 +01:00
bergquist
eb34855adb feat(pagerduty): add support for auto resolve 
closes #6513
 2016-11-08 20:38:38 +01:00
bergquist
b5c96d2685 style(influxdb): fixes broken layout 2016-11-08 20:02:55 +01:00
Torkel Ödegaard
5f2cb8e193 Merge branch 'master' into getting-started-panel 2016-11-08 16:23:01 +01:00
Torkel Ödegaard
fd09f17cd3 docs(): alerting docs, #6490 2016-11-08 14:53:28 +01:00
Utkarsh Bhatnagar
e642dce027 Fixed import dashboard bug (#6480) 2016-11-08 14:03:04 +01:00
Matt Toback
b8ad86fabd Alert pulse tweak (#6508) 
* Added faint tint of red to alerting panels, started working on animation. more to come

* Finally happy with pulse animation. Ready to merge
 2016-11-08 14:02:45 +01:00
Torkel Ödegaard
dea5fd385f ux(alerting): minor wording change on alert tab 2016-11-08 09:34:52 +01:00
utkarshcmu
74632b5e98 Added last function for alerting conditions 2016-11-07 23:16:57 -08:00
bergquist
6dd076efc1 Merge branch 'alerting_pagerduty' of https://github.com/utkarshcmu/grafana into utkarshcmu-alerting_pagerduty 2016-11-08 07:48:20 +01:00
utkarshcmu
a7e67f3bdd Removed invalid alerting state 2016-11-07 17:43:13 -08:00
Roger Swingle
69ff13adce add govcloud 2016-11-07 13:56:29 -05:00
utkarshcmu
f8d1eb11a9 Removed ExecError state 2016-11-07 07:12:43 -08:00
utkarshcmu
638d3bcb42 Removed NoData option 2016-11-07 07:08:51 -08:00
utkarshcmu
df8cd764b2 Added trigger options with Pagerduty 2016-11-07 07:08:51 -08:00
utkarshcmu
139bbecc10 Added Pagerduty basic alerting 2016-11-07 07:08:51 -08:00
Torkel Ödegaard
a100836bb4 docs(): Added pages for alerting docs, added keyboard shortcuts doc article, #6490 2016-11-07 15:18:27 +01:00
bergquist
b2d8e83c7d fix(alert_tab): better execution state description 2016-11-07 14:54:42 +01:00
bergquist
489f087fbd feat(alerting): reduce states. Make exeuction result configurable. 
ref #6444
 2016-11-07 12:42:39 +01:00
Torkel Ödegaard
b88791135f sasslint fix 2016-11-06 18:05:01 +01:00
Torkel Ödegaard
907fb9c1be ux(dashboard): fix for dropzone width when resizing another panel 2016-11-06 17:41:17 +01:00
Torkel Ödegaard
2d19af601a fix(alerting): various alerting fixes 2016-11-06 15:40:02 +01:00
Torkel Ödegaard
8db40b25db ux(dashboard): final tweaks to view mode and kiosk mode, better animation for view mode, and kiosk mode can be entered via kiosk url parameter, #6476 2016-11-06 10:15:36 +01:00
Torkel Ödegaard
bd996a4810 ux(viewmode): refining view mode #6476 2016-11-05 21:05:12 +01:00
Torkel Ödegaard
d38de2cc8b ux(view/kiosk mode): added view mode and kiosk mode, #6476 2016-11-05 14:23:37 +01:00
Torkel Ödegaard
0d82fb71ad ux(keybindings): updated look of dashboard keybindings help modal, #6465 2016-11-05 12:19:52 +01:00
Torkel Ödegaard
aaa174a091 ux(dashboard): minor fix so hide controls hide panel resize handles 2016-11-05 08:32:16 +01:00
Torkel Ödegaard
3cc4a194a9 ux(keybindings): polish help modal with keybindings, #6465 2016-11-04 17:19:03 +01:00
Torkel Ödegaard
4ab095b051 fix(ux): fixed issue with row menu gliding over header, or in realting extending outside it's bound and not getttin the menu background 2016-11-04 15:35:32 +01:00
utkarshcmu
2f60929d1e Added slack mention functionality 2016-11-04 06:05:44 -07:00
Torkel Ödegaard
2da2d5df56 Merge branch 'master' of github.com:grafana/grafana 2016-11-04 12:15:08 +01:00
Torkel Ödegaard
c99f4cb9c5 ux(dashboard): minor cleanup 2016-11-04 12:14:43 +01:00
Torkel Ödegaard
2fa7100c3b ux(dashboard): lots of tweaks and polish to row menu, added remove X to add panel and row option views, #6442 2016-11-04 11:43:49 +01:00
Ryan Bak
7165c866c2 Add blank default options for constant templates (#6460) 
Restores ability to change constant templates without going into
templating menu
 2016-11-04 11:41:39 +01:00
TerraTech
05d24020b1 settings.html: Fixup filename for custom.ini (#6463) 2016-11-04 11:41:12 +01:00
Matt
616e9ce5f6 Changed panel-handle cursor to proper 2 directional 2016-11-03 22:56:39 -04:00
Matt
cf248a503b Added panel name to individual add panel item to show full name when long 2016-11-03 17:49:54 -04:00
Matt
80f8c0712c Merge branch 'v4ux' of https://github.com/grafana/grafana into v4ux 2016-11-03 17:41:54 -04:00
Matt
308cc9d9f6 Thinned out fonts for row headers, sits much nicer in the dashboard 2016-11-03 17:41:35 -04:00
Torkel Ödegaard
abf1f6a163 ux(dashboard): added back hide controls toggle and shortcut, #6442 2016-11-03 22:39:59 +01:00
Torkel Ödegaard
d0513d3a54 ux(dashboard): changed name of delete row to remove row, #6442 2016-11-03 22:32:04 +01:00
Torkel Ödegaard
0da60a8bb2 ux(dashboard): minor tweak to row menu animation, it hides in a better way now after click #6442 2016-11-03 22:29:53 +01:00
Torkel Ödegaard
98be1734fa ux(dashboard): refining new row slide out menu, #6442 2016-11-03 22:14:29 +01:00
Torkel Ödegaard
d917f69255 Merge branch 'v4ux' of github.com:grafana/grafana into v4ux 2016-11-03 20:32:45 +01:00
Torkel Ödegaard
82592f0c13 ux(help): began work on new help modal 2016-11-03 20:32:36 +01:00
Matt
4e15e61b39 Added vertical ellipses, played with box shadows and borders and such. Ellipses need to fade to Opacity 0 when menu is open. 2016-11-03 15:12:39 -04:00
Carl Bergquist
262b806193 Merge pull request #6455 from utkarshcmu/opentsdb_template_fix 
Fixed multi-value nested templating for opentsdb
 2016-11-03 17:11:52 +01:00
Torkel Ödegaard
3e712178cc ux(dashboard): began removing build mode and adding new slide out row menu 2016-11-03 15:50:11 +01:00
Torkel Ödegaard
f91e067235 ux(dashboard): keybinding changes / new, #6442 2016-11-03 15:14:44 +01:00
Torkel Ödegaard
8ea2d3f19c ux(dashboard): removed getting started stuff from dashlist panel, #6442 2016-11-03 13:24:01 +01:00
Torkel Ödegaard
e80241b5f4 ux(dashboard): minor tweaks 2016-11-03 13:19:40 +01:00
Torkel Ödegaard
f1137e4d20 ux(dashboard): removed green row icon gain, replaced with collapse icon, #6442 2016-11-03 11:30:25 +01:00
Carl Bergquist
61c48aecc2 [Alertlist] Set max-height to respect row height (#6454) 
* feat(alertlist): max-height to respect row height

closes #6417

* feat(alertlist): use pre calculated panel.height instead

* style(alertlist): rearrange variable order
 2016-11-03 11:01:21 +01:00
utkarshcmu
89cf32b160 Made quotes consistent 2016-11-03 01:22:24 -07:00
utkarshcmu
849ac9441a Fixed multi-value nested templating for opentsdb 2016-11-03 01:18:54 -07:00
Torkel Ödegaard
075c722527 ux(dashboard): worked on single row edit mode, #6442 2016-11-02 22:24:08 +01:00
Matt Toback
15e369ec02 First pass of getting started panel for home dashboard 2016-11-02 17:21:11 -04:00
Torkel Ödegaard
e23f898418 ux(dashboard): minor tweaks and polish, added g a shortcut for go to alerting list 2016-11-02 22:08:17 +01:00
Torkel Ödegaard
cdea420285 ux(dashboard): fixes for changing panel tabs, #6442 2016-11-02 21:45:46 +01:00