IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-20 11:48:34 -06:00
Code Issues Packages Projects Releases Wiki Activity
17,678 Commits 5,454 Branches 554 Tags 1.9 GiB
159c5cdb63
Commit Graph

1437 Commits

Author SHA1 Message Date
Torkel Ödegaard
2fb721d3c6 various fixes to to queries tab (in react mode) 2018-10-14 21:14:11 +02:00
Torkel Ödegaard
8e85295b2b react panels query processing 2018-10-14 18:19:49 +02:00
Torkel Ödegaard
543c67a297 react panels: got data 2018-10-14 16:31:20 +02:00
Torkel Ödegaard
cd4619dad1 working on react data / query exectution 2018-10-14 15:39:34 +02:00
Torkel Ödegaard
2e1d45a875 changed DataPanel from HOC to use render props 2018-10-14 12:41:09 +02:00
Torkel Ödegaard
0662b5f962 fixing unit tests 2018-10-14 11:13:04 +02:00
Torkel Ödegaard
8ba865bf57 Merge branch 'master' into react-panels-step1 2018-10-12 13:31:20 +02:00
Torkel Ödegaard
ee1d4ce0e2 fix tab switching 2018-10-10 09:26:17 +02:00
praveensastry
1093f9da7e refactoring after review comments 2018-10-10 09:57:37 +11:00
praveensastry
b74e76298f render drag handle only in edit mode 2018-10-09 13:40:17 +11:00
Torkel Ödegaard
b7ba73819c mini fix 2018-10-04 09:14:47 +02:00
Torkel Ödegaard
dcb7f0d492 Merge branch 'master' into react-panels-ux-idea2 2018-10-04 09:08:19 +02:00
Johannes Schill
97802f30ae Fix issue with updating role permissions #13507 2018-10-03 13:37:00 +02:00
David
7b543ca4b5
Merge pull request #13463 from grafana/davkal/explore-url-state 
Explore: Store UI state in URL
 2018-10-01 10:09:15 +02:00
David Kaltschmidt
200784ea4a Explore: Store UI state in URL 
Storing queries, split state, and time range in URL.

- harmonize query serialization when generating Explore URLs in
  dashboards (use of `renderUrl`)
- move URL parse/serialization to Wrapper
- keep UI states under two keys, one for left and one for right Explore
- add option to angular router to not reload page on search change
- add lots of types
- fix time service function that gets triggered by URL change
 2018-09-28 16:44:07 +02:00
Daniel Lee
9b90b835b2 Merge remote-tracking branch 'origin/master' into stackdriver-plugin 2018-09-28 16:20:40 +02:00
Torkel Ödegaard
7d44aacf4a refactoring: slight changes to PR #13247 2018-09-27 14:50:14 +02:00
Torkel Ödegaard
f2307f92de Merge branch 'text_variable-3173' of https://github.com/daldoyle/grafana into daldoyle-text_variable-3173 2018-09-27 14:36:37 +02:00
Torkel Ödegaard
283f693600 fix: also set dashboard refresh to false 2018-09-26 13:13:00 -07:00
Torkel Ödegaard
0f4904038e simplified fix for 12030 2018-09-26 13:08:55 -07:00
Jiang Ye
4c4e5533a1 prevent refresh on fixed time window 2018-09-26 13:08:55 -07:00
Torkel Ödegaard
c282f39121 Merge branch 'master' into stackdriver-plugin 2018-09-21 10:17:13 +02:00
Torkel Ödegaard
3c7e54461f updated 2018-09-18 15:32:06 +02:00
Torkel Ödegaard
be3b684140 Merge branch 'master' into react-panels 2018-09-18 15:19:43 +02:00
Torkel Ödegaard
c2686781b9 Merge branch 'text_variable-3173' of https://github.com/daldoyle/grafana 2018-09-17 13:21:11 +02:00
Torkel Ödegaard
dd0b1d8410 Merge branch 'remove-mobx' 2018-09-15 15:04:03 +02:00
Torkel Ödegaard
3f309ff5dd rename folder 2018-09-15 04:50:22 -07:00
Torkel Ödegaard
e58c2ebc1c tech: remove all mobx stuff 2018-09-14 09:43:34 +02:00
Daniel Lee
65cbcc06eb upload: make the button text configurable 2018-09-14 09:39:16 +02:00
Erik Sundell
b71e7f33c3 Improved user experience 2018-09-14 09:35:26 +02:00
Erik Sundell
4fa4c27537 Upload: Fixing link function in directive 2018-09-14 09:35:26 +02:00
Torkel Ödegaard
331be7d47a fix: add permission fixes 2018-09-14 08:25:35 +02:00
Torkel Ödegaard
7bb0109261 feat: dashboard permissions are working 2018-09-14 07:47:33 +02:00
Torkel Ödegaard
c7fdea1dfb wip: dashboard permissions to redux 2018-09-13 16:00:02 +02:00
Torkel Ödegaard
f2edb82e79
Folder pages to redux (#13235) 
* creating types, actions, reducer

* load teams and store in redux

* delete team

* set search query action and tests

* Teampages page

* team members, bug in fetching team

* flattened team state, tests for TeamMembers

* test for team member selector

* wip: began folder to redux migration

* team settings

* actions for group sync

* wip: progress on redux folder store

* wip: folder to redux

* wip: folder settings page to redux progress

* mobx -> redux: major progress on folder migration

* redux: moved folders to it's own features folder

* fix: added loading nav states

* fix: gofmt issues

* wip: working on reducer test

* fix: added reducer test
 2018-09-13 14:10:51 +02:00
David
a5bcd4b8e4 Adhoc-filtering for prometheus dashboards (#13212) 
* Basic adhoc-filtering support for prometheus
 2018-09-12 18:10:57 +02:00
Dan Doyle
f0e905f3c9 First pass at a text based template var, getting feedback from devs 2018-09-12 13:17:15 +00:00
Torkel Ödegaard
c82bf7f67f fix: changing edit / view fullscreen modes now work 2018-09-10 17:55:06 +02:00
Torkel Ödegaard
100ab0ba23 Merge branch 'master' into react-panels 2018-09-10 15:42:36 +02:00
Marcus Efraimsson
35a24032a7
Merge pull request #13208 from grafana/fix-dashboard-permissions 
fix: Dashboard permissions now shows correctly
 2018-09-10 14:00:55 +02:00
Torkel Ödegaard
6c90a53654 refactor: moved stuff into new features dir manage-dashboards 2018-09-10 13:59:31 +02:00
Torkel Ödegaard
17e99bb38a Merge branch 'master' of github.com:grafana/grafana 2018-09-10 13:29:57 +02:00
Torkel Ödegaard
34567bc4f1 moved folders from features into the main feature folder they belong to 2018-09-10 13:29:27 +02:00
Carl Bergquist
7e0637aa9d
Merge pull request #12260 from strohi/panelids-for-htmlbookmark 
added id tag to Panels for html bookmarking on longer Dashboards
 2018-09-10 13:01:35 +02:00
Torkel Ödegaard
9cfe2a7f5c fix: Dashboard permissions now shows correctly, fixes #13201 2018-09-10 11:35:59 +02:00
Patrick O'Carroll
2b74b1c4d6 added radix rule and changed files to follow rule (#13153) 2018-09-05 16:51:31 +02:00
Torkel Ödegaard
c9ae585d2a Merge branch '12918-no-conditional-assignment' 2018-09-05 12:09:32 +02:00
Torkel Ödegaard
dc236b5063 refatoring: minor changes to PR #13149 2018-09-05 12:09:16 +02:00
Torkel Ödegaard
00c0b71f3d Merge branch '12918-only-arrow-functions4' 2018-09-05 11:46:54 +02:00
Patrick O'Carroll
777010b20b added no-conditional-assignment rule and changed files to follow new rule 2018-09-05 10:53:58 +02:00
Patrick O'Carroll
72ab24f300 Changed functions to arrow functions for only-arrow-functions rule. (#13131) 2018-09-05 07:47:30 +02:00
Patrick O'Carroll
dc4f547a40 Changed functions to arrow functions for only-arrow-functions rule. 2018-09-04 17:02:32 +02:00
Patrick O'Carroll
0f326f18dc changed functions to arrowfunctions for only-arrow-functions rule (#13127) 2018-09-04 15:55:41 +02:00
Patrick O'Carroll
b8d82df97e added no-angle-bracket-type-assertion rule and updatet files to follow rule (#13115) 2018-09-03 11:30:44 +02:00
Patrick O'Carroll
7837ee4466 Updated rules for variable name (#13106) 
* updated rules for variable name and fixed files that didn't follow new rules

* fixed test so it uses new rule

* made exceptions to rule in interval_variable
 2018-09-03 11:00:46 +02:00
Patrick O'Carroll
abbb6f933c added jsdoc-format rule and fixed files that didn't follow new rule (#13107) 2018-08-31 16:40:43 +02:00
Torkel Ödegaard
154fbe2413
New TV Mode, dashboard toolbar update (layout change & new cycle view mode button) (#13025) 
* wip: design update for navbar with kiosk mode button

* feat: progress on new view mode button

* css: view state refactorings

* feat: kiosk modes & playlist support

* feature: cycle tv mode feature, renamed view modes to TV, and Kiosk

* fix: updated the alert notification message

* fix: removed unused parameter

* fix: correct the css class set for tv mode

* some minor improvements to playlist
 2018-08-30 11:52:31 +02:00
Torkel Ödegaard
36bc8b77fb Merge branch 'tsconfig-no-implicit-this' 2018-08-30 11:46:13 +02:00
Patrick O'Carroll
a8547ae36e added this:any to functions and changed functions to arrowfunctions 2018-08-30 10:49:18 +02:00
Patrick O'Carroll
552a61b6ae changed var to let in 50 files (#13075) 2018-08-30 09:03:11 +02:00
Patrick O'Carroll
b494a29e02 changed var to let in last files (#13087) 2018-08-30 08:58:43 +02:00
Torkel Ödegaard
c960af098a tslint: added 1 more rule, #12918 2018-08-30 07:47:46 +02:00
Patrick O'Carroll
5e0d0c5816 changed var to const (#13061) 2018-08-29 14:26:50 +02:00
Torkel Ödegaard
e1beaaa0f7
tslint: tslint to const fixes part3 (#13036) 2018-08-26 21:52:57 +02:00
Torkel Ödegaard
35c00891e7
tslint: more const fixes (#13035) 2018-08-26 20:19:23 +02:00
Torkel Ödegaard
314b645857
tslint: changing vars -> const (#13034) 2018-08-26 18:43:07 +02:00
Torkel Ödegaard
9b978b7203
tslint: autofix of let -> const (#13033) 2018-08-26 17:14:40 +02:00
Torkel Ödegaard
fd81f89509 wip: angular panels now have similar edit mode and panel type selection enabling quick changing between panel react and angular panel types 2018-08-25 12:22:50 -07:00
Torkel Ödegaard
6ba8f6c5ab wip: major change for refresh and render events flow 2018-08-25 08:49:39 -07:00
Torkel Ödegaard
91b343403c wip: minor fixes 2018-08-25 07:21:00 -07:00
Torkel Ödegaard
1c97816275 wip: trying to align react & angular edit modes 2018-08-24 18:46:17 +02:00
Torkel Ödegaard
0b794ff685 Merge branch 'master' into react-panels 2018-08-24 17:29:10 +02:00
Alexander Zobnin
060fb1af05 tests: fix missing tests (with .jest suffix) 2018-08-23 13:00:15 +03:00
Marcus Efraimsson
660530a3a6
Merge pull request #12914 from dehrax/12224-final 
Karma to Jest: rename and cleanup
 2018-08-14 12:55:23 +02:00
Tobias Skarhed
a65589a5fb Rename test files 2018-08-14 10:52:41 +02:00
Tobias Skarhed
fa6d25af72 Remove comment 2018-08-13 16:36:22 +02:00
Tobias Skarhed
be7b663369 Cleanup 2018-08-13 16:36:22 +02:00
Tobias Skarhed
38422ce8a4 All tests passing 2018-08-13 16:36:22 +02:00
Tobias Skarhed
35694a76ef Class to function. Half tests passing 2018-08-13 16:36:22 +02:00
Torkel Ödegaard
624f3a0173 refactor: take submenu into account PR #12796 2018-08-05 11:39:46 +02:00
Torkel Ödegaard
b1b8a38061 refactor: renaming variables, refactoring PR #12796 2018-08-05 11:39:46 +02:00
Torkel Ödegaard
013f8cd8ea refactor: moving code around a bit, refactoring PR #12796 2018-08-05 11:39:46 +02:00
Tobias Skarhed
f00b5eee83 Remove weird import 2018-08-05 11:39:46 +02:00
Tobias Skarhed
4b84a58575 Disable submenu when autopanels is enabled 2018-08-05 11:39:46 +02:00
Tobias Skarhed
36c406eefb Extract to own method 2018-08-05 11:39:46 +02:00
Tobias Skarhed
1618b095c7 Use and add keybard shortcut 2018-08-05 11:39:46 +02:00
Tobias Skarhed
63fa9fdc6d Add temporary url parameter 2018-08-05 11:39:46 +02:00
Tobias Skarhed
338a37abc8 Replace floor with round 2018-08-05 11:39:46 +02:00
Tobias Skarhed
9e4748e2aa Go with just single margin compensation 2018-08-05 11:39:46 +02:00
Tobias Skarhed
78b3dc40f1 Add margin and padding compensation 2018-08-05 11:39:46 +02:00
Tobias Skarhed
a9f24bb36d Remove weird import 2018-08-05 11:39:45 +02:00
Tobias Skarhed
818fe09a7f Fit panels to screen height 2018-08-05 11:39:45 +02:00
Tobias Skarhed
61eb96ed79 Remove simple tests 2018-08-03 12:34:13 +02:00
Torkel Ödegaard
4e089229fb minor fix for legacy panels 2018-07-16 14:56:40 +02:00
Torkel Ödegaard
211e0f2199 wip: another baby step, another million to go 2018-07-11 12:11:21 -07:00
Torkel Ödegaard
902eba90d0 Merge branch 'master' into react-panels 2018-07-11 11:39:22 -07:00
Torkel Ödegaard
b4e0ace7a2
fix: folder picker did not notify parent that the initial folder had been changed, fixes #12543 (#12554) 2018-07-11 10:58:06 -07:00
Tobias Skarhed
cfa555b569 Add folder name to dashboard title (#12545) 
* Add folder name to dashboard title. No display on medium displays and below

* Compare folderId instead

* folderId bigger than 0
 2018-07-11 03:31:07 -07:00
Torkel Ödegaard
dc3a81200b wip: you can now change panel type in edit mode 2018-07-09 13:24:15 -07:00
Torkel Ödegaard
761283231c react panels: working on changing type 2018-07-09 18:17:51 +02:00
Torkel Ödegaard
8036c49ffe wip: minopr progress on react panel edit infra 2018-07-08 12:29:23 -07:00
Torkel Ödegaard
50f24c98f7 wip: minor progres on react panels edit mode 2018-07-08 07:39:25 -07:00
Torkel Ödegaard
dbe191fd55 wip: viz editor started 2018-07-07 05:10:42 -07:00
Torkel Ödegaard
dec62d7340 another baby step 2018-07-06 04:42:59 -07:00
Torkel Ödegaard
c86fc6fb47 react-panels: minor progress on data flow 2018-07-05 13:10:39 -07:00
Torkel Ödegaard
447bc3a6e0 Merge branch 'react-panels' of github.com:grafana/grafana into react-panels 2018-07-05 09:37:42 -07:00
Torkel Ödegaard
09ad8360ea Merge branch 'master' into react-panels 2018-07-05 09:36:03 -07:00
Torkel Ödegaard
b8724ae0c4
refactoring: enterprise build/hooks refactorings (#12478) 2018-07-02 04:33:39 -07:00
Torkel Ödegaard
ab9e1b35cd wip: minor progress on DataPanel 2018-07-01 17:34:42 +02:00
Tobias Skarhed
af0a4a6039 Karma to Jest: 3 test files (#12414) 
* Karma to Jest: viewstate_srv

* Karma to Jest: annotations_srv

* Remove comments

* Karma to Jest: series_override_ctrl

* Remove unnecessary code

* Class to function and fix lint error

* Fix ngInject
 2018-06-28 04:43:23 -07:00
Torkel Ödegaard
70c808130f react panels wip 2018-06-28 04:31:55 -07:00
Torkel Ödegaard
682c792dfb wip: react panels editor mode, tabs working 2018-06-26 12:07:41 -07:00
Torkel Ödegaard
2f5bcd37ec react panels wip 2018-06-26 16:45:42 +02:00
Torkel Ödegaard
cec70c1ed8 feat: panels v2, metrics-tab loading 2018-06-26 16:32:01 +02:00
Torkel Ödegaard
0f97d38485 Merge branch 'react-panels' of github.com:grafana/grafana into react-panels 2018-06-26 16:07:12 +02:00
Torkel Ödegaard
1420147ccb Merge branch 'master' into react-panels 2018-06-26 15:18:54 +02:00
Daniel Lee
75e378b689
Merge pull request #12367 from dehrax/12224-history-ctrl 
Karma to Jest: history_ctrl
 2018-06-21 14:52:01 +02:00
Tobias Skarhed
4c31173853 Karma to Jest: history_ctrl. .gitingore: .vs/ 2018-06-21 11:54:47 +02:00
Tobias Skarhed
d00e2c20cf Karma to Jest: history_ctrl. Update version: ts-jest 2018-06-20 15:25:57 +02:00
Marcus Efraimsson
051ddb245d
Merge pull request #12346 from grafana/12256_export 
Make sure to process panels in collapsed rows when exporting dashboard
 2018-06-20 13:17:32 +02:00
Torkel Ödegaard
1099daec38 wip: react panels, query editor loading from react PanelEditor view 2018-06-20 12:05:03 +02:00
Marcus Efraimsson
41ac8d4cd5
fix regressions after save modal changes of not storing time and variables per default 
Fix problem with adhoc variable filters not handled.
Fix problem with saving variables and time per default when saving a
dashboard as/first time.
Fix updating dashboard model after save with saving time/variables
enabled so that next time you save you won't get checkboxes for save
time/variables unless any values changed.
Tests validating correctness if time/variable values has changed.
 2018-06-20 09:52:29 +02:00
Torkel Ödegaard
230606146d wip: react panel minor progrss 2018-06-19 21:25:57 +02:00
Torkel Ödegaard
65b96e1161 Merge branch 'react-panels' of github.com:grafana/grafana into react-panels 2018-06-19 20:00:46 +02:00
Torkel Ödegaard
c74a1c18fb Merge branch 'master' of github.com:grafana/grafana into react-panels 2018-06-19 20:00:01 +02:00
Torkel Ödegaard
13bc9f6fb2 updated 2018-06-19 17:30:10 +02:00
Tobias Skarhed
3a9a36d6cf Karma to Jest: history_srv (#12341) 
* Karma to Jest: history_srv

* Fix TS errors

* Remove q, as it is not needed
 2018-06-19 08:05:49 -07:00
Torkel Ödegaard
db52ea66bd react panels minor progress 2018-06-19 16:57:55 +02:00
Marcus Efraimsson
a2e08dc4e8
make sure to process panels in collapsed rows when exporting dashboard 2018-06-19 16:56:14 +02:00
Torkel Ödegaard
aa5c9f199a react panel minor progress 2018-06-19 14:51:57 +02:00
Torkel Ödegaard
35403c1875 wip: react panel makeover mini progress 2018-06-19 08:42:41 +02:00
Tobias Skarhed
8666c77cc9 Karma to Jest: time_srv (#12303) 
* Begin Karma to Jest: time_srv

* Remove experimental fix

* location search stubs for each test

* Fix issue where time service was not available for other tests
 2018-06-18 09:47:23 -07:00
Torkel Ödegaard
542da8dc45 Merge branch 'master' into react-panels 2018-06-18 15:08:06 +02:00
Marcus Efraimsson
a738347957
snapshot: copy correct props when creating a snapshot 2018-06-18 11:04:16 +02:00
André Niemann
757e2b0b7e added comment to reason the id tag 2018-06-18 10:59:44 +02:00
Marcus Efraimsson
1626a66bab
Merge pull request #12275 from dehrax/12224-exporter 
karma to jest: exporter, playlist_edit_ctrl
 2018-06-14 15:10:06 +02:00
Tobias Skarhed
23abf044ff Fix PR feedback 2018-06-14 14:37:48 +02:00
Patrick O'Carroll
9802d86783
Merge pull request #12189 from ryantxu/focus-panel-search 
autoFocus the add-panel search filter, and add on enter
 2018-06-14 09:54:41 +02:00
Tobias Skarhed
a3552a60e1 Improve test readability 2018-06-14 09:46:36 +02:00
Tobias Skarhed
94b8cbdc6a Karma to Jest: exporter 2018-06-13 15:15:36 +02:00
Marcus Efraimsson
2288e01752
Merge pull request #12169 from alexanderzobnin/feat-10796 
Import dashboard to folder
 2018-06-13 13:10:52 +02:00
André Niemann
23c97d080f added id tag to Panels for html bookmarking on longer Dashboards 2018-06-13 10:07:47 +02:00
Alexander Zobnin
25504e84ed
dashboard import to folder: minor fixes 2018-06-13 10:44:37 +03:00
Patrick O'Carroll
0bb30b146c save-modal save button (#12047) 
Disable save dashboard button when saving
 2018-06-12 11:54:50 +02:00
ryan
09dbb52423 Merge remote-tracking branch 'grafana/master' into focus-panel-search 
* grafana/master:
  nicer collapsed row behaviour (#12186)
  remove DashboardRowCtrl (#12187)
  Annotations support for ifql datasource
  Template variable support for ifql datasource
  Query helpers for IFQL datasource
 2018-06-07 10:31:46 +02:00
Ryan McKinley
17a2ce13f0 nicer collapsed row behaviour (#12186) 
* nicer collapsed row behavior

* don't block events

* use a div to toggle

* use singular name
 2018-06-06 21:58:42 -07:00
ryan
c71608aae8 add panel on enter 2018-06-07 03:08:39 +02:00
ryan
37c45a81a9 autoFocus the search filter 2018-06-07 02:48:54 +02:00
Alexander Zobnin
8fd3015e52
dashboard: improve import UX for non-editor users 
validate folderId, import only into available folders
 2018-06-06 15:35:19 +03:00
Alexander Zobnin
4ff4ac1d5f
dashboard: import into current folder from manage folder page 2018-06-05 20:01:48 +03:00