IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-13 00:55:47 -06:00
Code Issues Packages Projects Releases Wiki Activity
39,826 Commits 5,451 Branches 554 Tags 1.9 GiB
c3c4a57c79
Commit Graph

335 Commits

Author SHA1 Message Date
Torkel Ödegaard
ae768193e3 Now handles all dashbord routes 2019-02-04 13:49:14 +01:00
Alexander Zobnin
df9ecc6816
azuremonitor: don't go back to dashboard if escape pressed in the editor 2019-02-04 14:11:49 +03:00
Torkel Ödegaard
2cb1733c59 wip: progress 2019-02-03 14:53:42 +01:00
Torkel Ödegaard
cba2ca5531 Url state -> dashboard model state sync starting to work 2019-02-03 12:29:47 +01:00
Torkel Ödegaard
60f700a1d2 wip: dashboard react 2019-02-02 19:23:19 +01:00
Torkel Ödegaard
aeaac7480b New solo panel route working in all scenarios I can test 2019-02-01 08:15:21 +01:00
Torkel Ödegaard
6a4777eafc wip: New react container route for solo panels that supports both angular and react panels 2019-01-31 09:44:37 +01:00
Torkel Ödegaard
6663b2fab9 Moved time_srv to services folder, this should not belong to dashboard feature but it is too dependant on dashboard to move it out now, needs a bigger refactoring to isolate from dashboard 2019-01-31 08:44:46 +01:00
Torkel Ödegaard
474185c977 Moved a few things around 2019-01-31 08:37:15 +01:00
Torkel Ödegaard
05738258bb Fixed dashboard import issue after move 2019-01-24 09:47:06 +01:00
Torkel Ödegaard
9d5560afe2 Moving files to better locations 2019-01-23 20:21:07 +01:00
Hugo Häggmark
9d6ac2c3d4 fix: Viewers can edit means that viewers have acces to Explore #14281 2019-01-21 08:47:41 +01:00
Torkel Ödegaard
ecab597e5e renaming DataSource type to DataSourceSettings and moved to grafana ui 2019-01-17 18:51:07 +01:00
Hugo Häggmark
dc9b83030f Removed default export for colors 2019-01-11 07:03:12 +01:00
Hugo Häggmark
d376fae393 Moved colorpicker to ui/components 2019-01-11 07:03:12 +01:00
Peter Holmberg
ffc06e9962 extract store from configurestore 2018-11-05 16:54:48 +01:00
Peter Holmberg
f15ed848f9 Merge branch 'master' into data-source-settings-to-react 2018-11-01 13:52:53 +01:00
Torkel Ödegaard
dcf8327dc9 moved profile pages to it's own feature folder 2018-10-31 12:25:46 -07:00
Torkel Ödegaard
17386c49d4 moved new teams page 2018-10-31 12:21:16 -07:00
Peter Holmberg
5140325a0d renders angular component 2018-10-31 13:23:05 +01:00
Peter Holmberg
7c5e04277c Merge branch 'master' into org-page-to-react 2018-10-29 14:26:11 +01:00
Torkel Ödegaard
e7f6cdc625 Merge branch '13739/alert-to-react' 2018-10-25 17:44:23 +02:00
Peter Holmberg
1f8b61f9a6 load preferences 2018-10-25 07:45:22 +02:00
Peter Holmberg
596a83407e fixed routes and page 2018-10-24 16:17:25 +02:00
Peter Holmberg
8c742a9530 Merge branch 'master' into data-source-settings-to-react 2018-10-24 14:50:33 +02:00
Torkel Ödegaard
53d9619cb9 fix: another fix for #13764 , #13793 2018-10-23 16:22:00 +02:00
Torkel Ödegaard
8a1e0cd83b fix: kiosk url fix, fixes #13764 2018-10-23 15:37:11 +02:00
Peter Holmberg
c92813f313 Merge branch 'master' into data-source-settings-to-react 2018-10-22 14:49:41 +02:00
Torkel Ödegaard
dddbe62d6c Merge branch 'master' into react-panels-step1 2018-10-19 09:15:37 +02:00
Peter Holmberg
f25a843a2c created view 2018-10-17 14:36:18 +02:00
Torkel Ödegaard
543c67a297 react panels: got data 2018-10-14 16:31:20 +02:00
Peter Holmberg
e642fce4a5 created component for http settings 2018-10-12 16:16:06 +02:00
Peter Holmberg
c5946ebd27 Merge branch 'data-source-instance-to-react' into data-source-settings-to-react 2018-10-12 09:20:43 +02:00
Torkel Ödegaard
abef94b0da made it possible to have frontend code in symlinked folders that can add routes 2018-10-11 12:36:04 +02:00
Torkel Ödegaard
5b46c08844 Merge remote-tracking branch 'origin/enterprise' into frontend-extensions 2018-10-11 09:41:57 +02:00
Torkel Ödegaard
f4a9817b94 poc: frontend extensions 2018-10-11 08:49:12 +02:00
Dan Cech
a4f90fd10d
add admin page to show enterprise license status 2018-10-10 13:04:54 -04:00
Peter Holmberg
61cac5fd61 reverted back and using angular for settings and dashboards 2018-10-08 16:01:17 +02:00
Peter Holmberg
4ecd33c79c Fixed nav model 2018-10-08 14:09:02 +02:00
Peter Holmberg
e1c77f634d Merge branch 'master' into new-data-source-as-separate-page 2018-10-05 13:15:26 +02:00
Peter Holmberg
841ca49942 removed duplicate route 2018-10-05 13:09:06 +02:00
Torkel Ödegaard
afdec3d1b0
Revert "Revert "Org users to react"" 2018-10-03 09:43:10 +02:00
Torkel Ödegaard
fe4f2f71c3
Revert "Org users to react" 2018-10-03 09:40:37 +02:00
Peter Holmberg
7a39e5554b view and route 2018-10-02 16:18:42 +02:00
Peter Holmberg
c3f87b56ee removed duplicate route 2018-10-02 14:13:30 +02:00
Peter Holmberg
09b681326e Merge branch 'master' into org-users-to-react 2018-10-02 11:18:01 +02:00
Torkel Ödegaard
f37a60dcd5 Merge branch 'data-sources-list-to-react' 2018-10-02 09:33:58 +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
Peter Holmberg
8f99276606 first crude display 2018-09-28 17:21:00 +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
Peter Holmberg
3081e0f84a Merge branch 'master' into 13411-react-api-key 2018-09-28 13:10:55 +02:00
Peter Holmberg
166f93cf54 components, test, removed old not used files 2018-09-28 11:05:34 +02:00
Johannes Schill
362010c438 Remove angular code related to API Keys and point the route to the React component #13411 2018-09-27 11:53:19 +02:00
Johannes Schill
353a836128 wip: Reactify the api keys page #13411 2018-09-27 11:53:18 +02:00
Peter Holmberg
e8cc0f3fff render list 2018-09-25 14:53:55 +02:00
David Kaltschmidt
d07a3a7637 Explore: moved code to app/features/explore 2018-09-24 12:16:06 +02:00
Torkel Ödegaard
e58c2ebc1c tech: remove all mobx stuff 2018-09-14 09:43:34 +02:00
Torkel Ödegaard
a83beac565 redux: moved folders to it's own features folder 2018-09-12 09:15:18 +02:00
Torkel Ödegaard
ec41d76080 mobx -> redux: major progress on folder migration 2018-09-11 19:00:37 +02:00
Torkel Ödegaard
89ea47e7fb Merge branch 'master' into folder-to-redux 2018-09-11 15:07:03 +02:00
Peter Holmberg
9f73f13091 Teams page replace mobx (#13219) 
* 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

* team settings

* actions for group sync

* tests for team groups

* removed comment

* remove old stores

* fix: formating of datasource.go

* fix: minor changes to imports

* adding debounce and fixing issue in teamlist

* refactoring: moving types to their own files
 2018-09-11 14:14:03 +02:00
Torkel Ödegaard
9caa030108 Merge remote-tracking branch 'origin/teams-page-replace-mobx' into folder-to-redux 2018-09-10 21:14:33 +02:00
Torkel Ödegaard
108a20196f Merge branch 'master' into teams-page-replace-mobx 2018-09-10 19:31:19 +02:00
Torkel Ödegaard
59b5b146da wip: began folder to redux migration 2018-09-10 14:30:42 +02:00
Torkel Ödegaard
6c90a53654 refactor: moved stuff into new features dir manage-dashboards 2018-09-10 13:59:31 +02:00
Torkel Ödegaard
e4d9620fc0 move: moved styleguide to admin 2018-09-10 13:38:45 +02:00
Torkel Ödegaard
a440d3510a renaming things in admin 2018-09-07 17:55:38 +02:00
Peter Holmberg
306c3e6c10 creating types, actions, reducer 2018-09-05 12:34:32 +02:00
Torkel Ödegaard
0aea60bf17 Merge branch 'master' into redux-poc2 2018-09-05 12:11:11 +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
Torkel Ödegaard
826dfceac0
fix: fixed home dashboard redirect issue when behind reverse proxy, fixes #12429 (#13135) 2018-09-04 15:42:10 +02:00
Torkel Ödegaard
2ac202b22f moving things around 2018-09-02 07:11:21 -07:00
Torkel Ödegaard
2c85e44ab7 wip: moveing things around 2018-08-31 09:49:02 -07:00
Torkel Ödegaard
593cc5380f wip: redux refactor 2018-08-31 09:42:32 -07: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
cf58eea1db redux: wip progress for using redux 2018-08-31 13:24:36 +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
e1beaaa0f7
tslint: tslint to const fixes part3 (#13036) 2018-08-26 21:52:57 +02:00
Marcus Efraimsson
39669e5002 fix redirect to panel when using an outdated dashboard slug (#12901) 2018-08-13 15:41:15 +02:00
Torkel Ödegaard
013f8cd8ea refactor: moving code around a bit, refactoring PR #12796 2018-08-05 11:39:46 +02:00
David Kaltschmidt
c6e9ffb168 Use url params for explore state 
- putting state in the path components led to 400 on reload
- use `/explore?state=JSON` instead
 2018-07-17 12:56:05 +02:00
Torkel Ödegaard
c03764ff8a
Refactor team pages to react & design change (#12574) 
* Rewriting team pages in react

* teams to react progress

* teams: getting team by id returns same DTO as search, needed for AvatarUrl

* teams: progress on new team pages

* fix: team test

* listing team members and removing team members now works

* teams: team member page now works

* ux: fixed adding team member issue

* refactoring TeamPicker to conform to react coding styles better

* teams: very close to being done with team page rewrite

* minor style tweak

* ux: polish to team pages

* feature: team pages in react & everything working

* fix: removed flickering when changing tabs by always rendering PageHeader
 2018-07-11 11:23:07 -07:00
David Kaltschmidt
f69654fcd5 Restrict Explore UI to Editor and Admin roles 
Access is restricted via not showing in the following places:

* hide from sidemenu
* hide from panel header menu
* disable keybinding `x`

Also adds a `roles` property to reactContainer routes that will be
checked if `roles` is set, and on failure redirects to `/`.
 2018-05-30 13:13:29 +02:00
David Kaltschmidt
f5e351af8b Explore split view 
* button to bring a up a duplicate explore area to compare
* side by side rendering of two explore components
* right component has close button
* left component has page title
 2018-05-24 10:55:01 +02:00
David Kaltschmidt
05b0bfafe4 Explore: Add entry to panel menu to jump to Explore 
* panel container menu gets new Explore entry (between Edit and Share)
* entry only shows if datasource has `supportsExplore` set to true (set
 for Prometheus only for now)
* click on Explore entry changes url to `/explore/state` via location provider
* `state` is a JSON representation of the panel queries
* datasources implement `getExploreState()` how to turn a panel config into explore initial
 state
* Explore can parse the state and initialize its query expressions
* ReactContainer now forwards route parameters as props to component
* `pluginlist` and `singlestat` panel subclasses needed to be adapted because
 `panel_ctrl` now has the location provider as a property already
 2018-04-30 17:44:28 +02:00
David Kaltschmidt
d338b7ea7b Import and typescript fixups 2018-04-27 11:49:11 +02:00
David Kaltschmidt
f1220fd2a4 Explore WIP 2018-04-26 20:27:19 +02:00
David Kaltschmidt
cc5d7002b0 Add weback-dev-server with hot/hmr support 
* adds `npm start` / `yarn start` script
* starts a webpack-dev-server using the dev config, served on :3333
* hot reloading (HMR) for react/styles, not working for angular code
* new entry `dev.ts` for dynamic imports of CSS theme (ExtractText does
not work with HMR)
* TS loader pipeline moved out of common to add HMR for react
* applied `hot()` to some react containers (that's their new default
 export, named exports remains for testing)
* added sections to README
* updated yarn.lock
 2018-04-19 11:42:53 +02:00
Marcus Efraimsson
91fa076fb3 folders: should be possible to browse folder using only uid 
That is, the slug part of url should be optional.
 2018-03-13 21:32:37 +01:00
Marcus Efraimsson
5fbfd67b94 dashboards: should be possible to browse dashboard using only uid 
That is, the slug part of url should be optional.
Closes #11231
 2018-03-13 21:06:25 +01:00
Marcus Efraimsson
20ebb614f6 dashboards: cleanup 
Move api calls to backend_srv
 2018-02-21 16:56:34 +01:00
Torkel Ödegaard
541b0a0ca1 fix: fixed bug with redirect after new dashboard saved, related to buggy angularjs location path/url and base href, fixes #10817 2018-02-07 14:10:23 +01:00
Marcus Efraimsson
6def21e83f dashboard: fix loading of snapshot and scripted dashboard (#10755) 
Fixes #10753
 2018-02-05 10:31:53 +01:00
Carl Bergquist
cc0cc8dd73 changes to new urlformat for home dashboard (#10738) 2018-02-05 10:24:48 +01:00
Marcus Efraimsson
3db328f516 fix for dashboard/folder url's when having a sub path in root_url config 2018-02-01 16:30:48 +01:00
Marcus Efraimsson
ef90b3e49c Merge branch '7883_new_url_structure' into 7883_frontend_step2 2018-02-01 11:08:39 +01:00
Marcus Efraimsson
b135df9a6c Merge remote-tracking branch 'upstream/master' into 7883_new_url_structure 2018-02-01 10:48:06 +01:00
Marcus Efraimsson
40c83e3e22 dashboards: update dashboard/folder url if browser url is not the same as from backend 2018-01-31 18:40:54 +01:00
Marcus Efraimsson
92a0171a9b folders: change the front end route for browsing folders 
Change the front end route for folders to /dashboards/f/<uid>/<slug of folder title>.
Use new route for deleting dashboard/folder by uid.
Retrieve dashboard/folder by uid when moving or deleting dashboards/folders.
 2018-01-31 18:40:54 +01:00
Torkel Ödegaard
75cf9ae27d fix: use replace when redirecting to new url 2018-01-31 17:26:35 +01:00
Marcus Efraimsson
57edf89033 dashboards: make scripted dashboards work using the old legacy urls 
Scripted dashboards are still requested from /dashboard/script/scripted.js
#7883
 2018-01-31 14:07:49 +01:00
Marcus Efraimsson
3efb3d8efa dashboards: add new default frontend route for rendering a dashboard panel 
New default route /d-solo/<uid>/<slug of dashboard title> where dashboard
panel are rendered by unique identifier and panel identifier.
If old route /dashboard-solo/db/<slug of dashboard tile> are used,
try to lookup dashboard by slug and redirect to new default route.
Change url logic for sharing a panel so that the new default route
for rendering a dashboard panel are used.
 #7883
 2018-01-31 11:01:23 +01:00
Marcus Efraimsson
aefcff26a6 dashboards: add new default frontend route for loading a dashboard 
New default route /d/<uid>/<slug of dashboard title> where dashboard
are loaded by unique identifier.
If old route /dashboard/db/<slug of dashboard tile> are used,
try to lookup dashboard by slug and redirect to new default route.
 #7883
 2018-01-31 00:27:51 +01:00
Daniel Lee
ccd86873e7 dashfolders: autosave permissions on change (remove update button) 2018-01-26 14:02:22 +01:00
Johannes Schill
2de0489868 dashfolders: Send down backendSrv to the react components #10275 2018-01-25 15:30:15 +01:00
Johannes Schill
f23fb740a9 dashfolders: Add FolderPermissions container and make sure isFolder is passed to PermissionsStore #10275 2018-01-25 15:20:00 +01:00
Torkel Ödegaard
cfa775e012 ds: updated ds nav 2018-01-18 18:17:58 +01:00
Torkel Ödegaard
ccde8d9e2f feat: ds edit nav 2018-01-18 17:42:40 +01:00
Daniel Lee
545d7b9477 dashfolders: convert folder settings to React 2018-01-11 15:42:45 +01:00
Johannes Schill
8abef88b94 mobx: poc in using each store as individual prop on the react containers (#10414) 
* mobx: poc in using each store as individual prop on the react containers

* prettier test

* fix: end the war between prettier vs tslint.

* mobx: Move stores into their own folders

* mobx: Refactor the AlertRule into its own file and add a helper-file

* mobx: Move NavItem out of NavStore and remove lodash dependancy

* mobx: Move ResultItem and SearchResultSection models out of the SearchStore

* mobx: ServerStatsStore rename .tsx => .ts. And move ServerStat-model to its own file.

* mobx: Remove lodash and jquery dependancy from ViewStore

* mobx: Remove issue with double question mark
 2018-01-03 20:11:07 +01:00
Torkel Ödegaard
8f50795a94 tech: url and query mobx store so now react components and containers can read and modify url path and query via mobx store 2017-12-31 22:31:11 +01:00
Torkel Ödegaard
4c1a67c34e tech: began reworking alerting list to mobx 2017-12-28 18:49:33 +01:00
Torkel Ödegaard
5b91bb9163 tech: minor progress on mobx state tree & react containers, working on unit testing 2017-12-27 13:15:27 +01:00
Torkel Ödegaard
4181602b78 react: progress on react containers and mobx-state-tree store 2017-12-21 11:56:45 +01:00
Torkel Ödegaard
2b95cd5081 refactor: moving routes into core, improved bundle loader 2015-09-15 08:53:06 +02:00
Torkel Ödegaard
abac8bccc6 tech(typescript): its looking good 2015-09-10 11:26:40 +02:00
Torkel Ödegaard
13c70ac02c feat(signup): selecting org after invite now works 2015-08-31 09:37:14 +02:00
Torkel Ödegaard
24dfa55465 feat(signup): progress on new sign up and email verification flow, #2353 2015-08-28 09:24:30 +02:00
Torkel Ödegaard
43ef9f909a feat(admin): admin page for all grafana organizations (list / edit view), #2457 2015-08-11 15:20:50 +02:00
Torkel Ödegaard
024c112944 feat(invite): redesign for pending invite list, added revoke button and link, copy invite also works now, #2353 2015-07-20 14:26:49 +02:00
Torkel Ödegaard
4ac652b127 feat(invite): began work on invited signup view, also added backdrop to login view, #2353 2015-07-19 12:34:03 +02:00
Torkel Ödegaard
aa4d60c21e Worked on reset password views, refactored out password strength to a reusable directive 2015-06-08 10:57:01 +02:00
Torkel Ödegaard
e40b462040 began work on reset password view, and angular controller 2015-06-05 11:45:04 +02:00
Torkel Ödegaard
35cc0a1cc0 Rewriting anb abstracting how dashboards are loaded, unifying db, json files, and script dashboards, #960 2015-05-12 17:39:56 +02:00
Torkel Ödegaard
b3be51f17f Lots of work on search and dashboard loading, trying to generalize concepts and code, #960 2015-05-12 14:11:30 +02:00
Torkel Ödegaard
e221cbfbd6 Merge branch 'sidemenu_default_open' of https://github.com/raintank/grafana 2015-05-05 20:34:07 +02:00
Anthony Woods
8aef297e71 show sidemenu when admin user logs in the first time. #54 2015-05-05 10:43:19 +08:00
Torkel Ödegaard
e5c1169120 HTTP API: GET /api/dashboards/db/:slug response changed property to to match the POST request nameing, Fixes #1928 2015-05-04 08:36:44 +02:00
Torkel Ödegaard
294f7f1f0d Merge branch 'v2.0.x' 
Conflicts:
	conf/sample.ini
 2015-04-29 15:59:35 +02:00
Torkel Ödegaard
d10ce90936 Fixed XSS issue with file based dashboards, was really casued by an issue with alertSrv accepting html in message alerts 2015-04-29 15:50:47 +02:00
Torkel Ödegaard
16fc6e8b42 More work on editable false dashboards, #1834 2015-04-27 10:09:32 +02:00
Torkel Ödegaard
236c4e65f8 Began work on dashboard: editable flag, that actually stops users from changing anything, #1834 2015-04-23 15:26:48 +02:00
Torkel Ödegaard
538ec7c0a0 Unsaved changes: Do not show for snapshots, scripted and file based dashboards, Fixes #1707 2015-04-06 11:22:35 +02:00
Torkel Ödegaard
b83367063e Small improvement to dashboard loading error handling 2015-03-31 14:03:01 +02:00
Torkel Ödegaard
fde11be279 Renamed src directory to public 2015-03-29 12:57:28 +02:00