Johannes Schill
76ba7d1f8c
test: Add snapshot tests for UserPicker and UserPickerOption ( #10289 )
2018-01-09 14:39:10 +01:00
Johannes Schill
68d43b865f
fix: Add interface for props to UserPickerOption ( #10289 )
2018-01-09 14:39:10 +01:00
Johannes Schill
5931d6c87d
ux: POC on new select box for the user picker ( #10289 )
2018-01-09 14:39:10 +01:00
Alexander Zobnin
04b9752932
dashboard: fix opening links in new tab ( #10465 )
2018-01-09 13:59:11 +01:00
Alexander Zobnin
51cd3a0d0c
alert list: fix rendering timeout when share panel ( #10467 )
2018-01-09 13:58:24 +01:00
Marcus Efraimsson
3ecec8e0d2
More fixes for relative urls when running Grafana under a different sub path ( #10470 )
...
* Add nginx proxy docker container
Ease test/verification of running Grafana thru a reverse proxy
* Add apache proxy docker container
Ease test/verification of running Grafana thru a reverse proxy
* Fix relative urls for reset password page
* Fix relative urls for signup page
* Fix relative urls for login page
* Fix relative urls edit plugin page
2018-01-09 13:56:41 +01:00
Patrick O'Carroll
48548f0641
put this.props.search in the Highlighter
2018-01-09 13:18:16 +01:00
Patrick O'Carroll
bebcc24f3d
moved state handling for search to store
2018-01-09 13:05:50 +01:00
Marcus Efraimsson
4af1aca97c
Merge pull request #10463 from AnonyV/master
...
Fixed the subUrl bugs for folder/settings/teams etc. with root_url modified
2018-01-09 12:42:22 +01:00
Torkel Ödegaard
62165f91bf
fix: added back colors to rootScope, fixes #10462
2018-01-09 11:13:37 +01:00
AnonyV
6c9554499b
fixed the subUrl bugs from https://community.grafana.com/t/suburl-not-work-at-some-links-and-buttons/4701 with folder/settings/teams etc.
2018-01-09 18:03:43 +08:00
Mariano Benítez Mulet
ec9db318e3
Fix typo in error message
2018-01-09 08:24:14 +01:00
Patrick O'Carroll
025835c9bf
updated snapshot
2018-01-08 17:43:33 +01:00
Patrick O'Carroll
8b00e65a83
styling fix
2018-01-08 17:28:18 +01:00
Patrick O'Carroll
457a02b970
added highlight to search
2018-01-08 17:22:44 +01:00
Patrick O'Carroll
fc6d14127d
fixed regex issue
2018-01-05 15:19:25 +01:00
Patrick O'Carroll
3797054eb4
made a view of filtered list
2018-01-05 14:17:50 +01:00
Patrick O'Carroll
5079dcdc62
updated jest file and snapshot
2018-01-05 10:34:01 +01:00
Patrick O'Carroll
2248bf437c
added search function
2018-01-04 15:27:09 +01:00
Patrick O'Carroll
0068e82718
new styling and markup
2018-01-04 13:08:49 +01:00
Torkel Ödegaard
27835f373e
cleanup: removed unused typescript typings import
2018-01-04 10:12:02 +01:00
Torkel Ödegaard
c42a232644
Merge branch 'react-mobx'
2018-01-04 09:12:57 +01:00
Trent White
ee05ea8d60
new add alert notification channel icon
2018-01-03 14:23:14 -05: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
Johannes Schill
d2cdacce40
fix: Change max size of panel JSON editor so button is shown on smaller screens, #10346 ( #10415 )
2018-01-03 20:04:45 +01:00
Patrick O'Carroll
58e0bdd71f
added empty list cta to notification channels, fixes 10393 ( #10400 )
2018-01-02 12:16:38 +01:00
Torkel Ödegaard
f049fc4816
mobx: fixed issue with view store, and added missing snapshot
2018-01-02 11:02:43 +01:00
Torkel Ödegaard
5981f67226
tech: enzyme container test working
2018-01-01 18:54:23 +01:00
Torkel Ödegaard
644adef465
tech: enzyme container test working
2018-01-01 16:04:32 +01:00
Torkel Ödegaard
3301f8f194
react: trying to get enzyme and mobx tests working
2018-01-01 15:39:26 +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
029317ed18
tech: alert list react migration progress
2017-12-31 14:16:19 +01:00
Alexander Zobnin
62df406d7b
fix info popover, #10302 ( #10377 )
2017-12-31 12:26:02 +01:00
Alexander Zobnin
e84b6d189a
fix move dashboard variables, #10347 ( #10375 )
2017-12-31 12:24:42 +01:00
Marcus Efraimsson
11ae7d5964
dashfolders: relative links should work when root_path is specified ( #10363 )
...
Fixes #10336
2017-12-31 12:24:21 +01:00
Alexander Zobnin
d210e766e7
fix mixed datasource add query button, #10316 ( #10361 )
2017-12-31 12:21:49 +01:00
Torkel Ödegaard
5a571f4784
tech: react mobx progress
2017-12-29 17:13:58 +01:00
Torkel Ödegaard
4c1a67c34e
tech: began reworking alerting list to mobx
2017-12-28 18:49:33 +01:00
Torkel Ödegaard
8fd8853770
tech: progress on react pages
2017-12-28 17:03:40 +01:00
bergquist
1f9e2ef6ec
prom: fixes broken test
2017-12-28 16:43:48 +01:00
bergquist
71272d9076
prom: make $__$interval the first suggested range vector
2017-12-28 16:01:02 +01:00
Carl Bergquist
7a8a52a145
Merge pull request #10362 from grafana/cloudwatch-file-to-ts
...
migrated datasource to ts
2017-12-28 13:44:18 +01:00
Patrick O'Carroll
54c502ae4d
fixed error
2017-12-28 09:44:37 +01:00
Patrick O'Carroll
0c5314cec7
migrated datasource to ts
2017-12-27 13:25:40 +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
8aff969f70
Merge branch 'master' into react-mobx
2017-12-27 11:00:37 +01:00
Alexander Zobnin
1108101087
Fix tooltip unit when legend isn't shown ( #10348 )
...
* graph: fix tooltip unit when legend isn't shown, #10311
* fix broken tests (updateLegendValues() function)
2017-12-27 09:50:51 +01:00
Torkel Ödegaard
c8f87a3d09
refactor: minor refactoring of PR #10236
2017-12-27 09:49:12 +01:00
Alexander Zobnin
77843623b2
don't save dashboard on make editable, #10236
2017-12-27 09:49:12 +01:00
Alexander Zobnin
d4ff603eb0
fix scripted dashboard loader, #10350 ( #10351 )
2017-12-27 09:36:25 +01:00
Lichun Wei
2559259763
new aws region cn-northwest-1 ( #10353 )
...
see http://docs.aws.amazon.com/general/latest/gr/rande.html for regions
2017-12-27 09:34:12 +01:00
Torkel Ödegaard
3e7420320c
Merge branch 'master' into react-mobx
2017-12-26 13:53:39 +01:00
Marcus Efraimsson
39eb8f9eba
Dashboard: View JSON improvements ( #10327 )
...
* dashboard: enable copy to clipboard for view json and panel json
* dashboard: use code editor for view json under settings
2017-12-26 13:52:19 +01:00
Torkel Ödegaard
c11cf18879
refactor: tried to simplify and also minimize scope a bit for #10323
2017-12-26 13:22:01 +01:00
Torkel Ödegaard
b4ab91d651
Merge remote-tracking branch 'origin/10248_copy_panels'
2017-12-26 12:31:46 +01:00
Torkel Ödegaard
8fb0692da6
Merge remote-tracking branch 'origin/migrate-dashboard-files-to-ts'
2017-12-26 12:26:50 +01:00
Mitsuhiro Tanda
6d5628f2ea
ignore trailing whitespace ( #10344 )
2017-12-26 11:59:03 +01:00
Mitsuhiro Tanda
e3274d6765
(prometheus) show label name in paren after by/without/on/ignoring/group_left/group_right
2017-12-26 01:57:10 +09:00
Torkel Ödegaard
24723cdb3c
fix: fixed issue with optimized build, fixes #10333
2017-12-23 08:34:48 +01:00
Patrick O'Carroll
52f30f6f00
migrated file to ts ( #10328 )
2017-12-22 20:52:57 +01:00
Marcus Efraimsson
281e519fab
fix: remove unused code
2017-12-22 10:26:01 +01:00
Marcus Efraimsson
68457f5636
dashboard: copy panel to clipboard
...
Adds a new menu item to panels, Copy to Clipboard, that will both
copy the panel json to the clipboard and temporarily store the panel object
in the browsers window object. The temporarily stored panel object are
available in Add Panel from any dashboard for as long you don't refresh
the browser.
Fixes #10248 , #1004
2017-12-22 10:24:55 +01:00
Patrick O'Carroll
972c3bc635
code formatting fix
2017-12-21 13:44:34 +01:00
Patrick O'Carroll
9b63a81756
migrated files to ts + fixed specfile
2017-12-21 13:22:20 +01:00
Torkel Ödegaard
02ad2e5f0f
tech: cleaned up unused stuff
2017-12-21 12:31:04 +01:00
Torkel Ödegaard
9f7560b6f9
ux: removed unused stuff form style guide
2017-12-21 12:20:55 +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
3a1f52d8a2
prettier: ran on all files again, sorry. now settings are defined in package.json
2017-12-21 08:39:31 +01:00
Torkel Ödegaard
444240dffc
tech: mobx tests
2017-12-21 08:27:47 +01:00
Marcus Efraimsson
af34f9977e
Add avatar to team and team members page ( #10305 )
...
* teams: add db migration for email column in teams table
* teams: /teams should render index page with a 200 OK
* teams: additional backend functionality for team and team members
Possibility to save/update email for teams.
Possibility to retrive avatar url when searching for teams.
Possibility to retrive avatar url when searching for team members.
* teams: display team avatar and team member avatars
Possibility to save and update email for a team
* teams: create team on separate page instead of modal dialog
2017-12-20 21:20:12 +01:00
Marcus Efraimsson
d41ce4f9ca
Various dashboard folders improvements ( #10309 )
...
* dashfolders: fix url for create dashboard from manage dashboards
Don't include folderId querystring if you don't manage a folder and
creating a new dashboard from there.
* dashfolders: don't store folderId in dashboard model
Use folderId from meta instead
#10307
* dashfolders: minor ux fix
* dashfolders: minor fix for edit folder title
2017-12-20 21:17:55 +01:00
Torkel Ödegaard
354913a704
mobx: progress on poc
2017-12-20 17:24:04 +01:00
Torkel Ödegaard
61b4e5ab2d
fix: unit test fixed
2017-12-20 13:02:52 +01:00
Torkel Ödegaard
85879a7014
prettier: change to single quoting
2017-12-20 12:33:33 +01:00
Torkel Ödegaard
2a360c45a2
ux: minor name change to search sections
2017-12-20 12:26:52 +01:00
Torkel Ödegaard
e683f6afa4
Merge remote-tracking branch 'origin/10277_logout_route_full_page_reload'
2017-12-20 12:20:06 +01:00
Torkel Ödegaard
4acf6b0eee
Merge remote-tracking branch 'origin/10190_fix_select_icon_and_firefox'
2017-12-20 11:22:29 +01:00
Marcus Efraimsson
bbdb1cddd7
dashboard: delete row improvements
...
Possibility to delete row and all its panels or
only the row which will leave its panels in the dashboard.
2017-12-20 11:13:24 +01:00
Torkel Ödegaard
ee216ba6fb
poc: mobx test
2017-12-20 10:53:16 +01:00
Marcus Efraimsson
1ddcaf5b6f
minor fixes and formatting after review
2017-12-19 18:01:09 +01:00
Marcus Efraimsson
0bfedfe4d6
dashfolders: use validation service for folder creation and dashboard import. #10197
2017-12-19 18:00:59 +01:00
Marcus Efraimsson
4846125ec0
dashfolders: support creating new folder when moving dashboards. #10197
2017-12-19 18:00:47 +01:00
Marcus Efraimsson
2d0f5f06e4
dashfolders: support creating new folder when saving a dashboard. #10197
2017-12-19 18:00:38 +01:00
Marcus Efraimsson
7f9c0df464
dashfolders: support creating new folder in dashboard settings. #10197
2017-12-19 18:00:26 +01:00
Marcus Efraimsson
60d7e4308c
dashfolders: support creating new folder from the folder picker. #10197
2017-12-19 18:00:06 +01:00
Torkel Ödegaard
af1f3dd77b
poc: mobx poc
2017-12-19 17:26:51 +01:00
Torkel Ödegaard
fadfc665e4
tech: ran pretttier on all typescript files
2017-12-19 16:06:54 +01:00
Johannes Schill
143c0022b8
Merge branch 'master' into 10190_fix_select_icon_and_firefox
2017-12-19 15:54:02 +01:00
Marcus Efraimsson
b1621e1e8f
Merge pull request #10286 from grafana/10230_new_to_search_popup
...
added new to new dahsboard and folder
2017-12-19 15:51:04 +01:00
Daniel Lee
6ad06364c7
search: closes dash search when selecting current dashboard ( #10285 )
...
Fixes #10231 .
2017-12-19 15:28:58 +01:00
Johannes Schill
0bc6f4e2bd
fix: Original dashboard link from snapshot should be an a-tag, not a button ( #10269 ) ( #10283 )
2017-12-19 14:58:12 +01:00
Daniel Lee
31fc19c6d7
dashboard: fixes #10262
2017-12-19 14:55:03 +01:00
Patrick O'Carroll
0d283214a0
added new to new dahsboard and folder
2017-12-19 14:52:34 +01:00
Johannes Schill
23cceaecc4
test: Update test with new component signature
2017-12-19 14:45:44 +01:00
Johannes Schill
add5df07bf
Merge branch 'master' into 10190_fix_select_icon_and_firefox
2017-12-19 13:52:45 +01:00
Johannes Schill
fee3e7c02a
Merge branch 'master' into 10277_logout_route_full_page_reload
2017-12-19 13:50:36 +01:00
Johannes Schill
a55b42d11f
fix: The /logout route should always full page reload ( #10277 )
2017-12-19 13:39:11 +01:00
Torkel Ödegaard
75bb511019
tech: added prettier to precommit
2017-12-19 13:27:05 +01:00
Johannes Schill
3e28ce94eb
ux: Add icon to selected option in PageHeader navigation on small screens, update select boxes for Firefox so the arrow to the right is aligned with the other select boxes ( #10190 )
2017-12-19 13:19:44 +01:00
Johannes Schill
e1a527a87a
ux: Fix color picker positioning when scrolled down to the bottom of a page ( #10258 ) ( #10271 )
2017-12-19 12:58:55 +01:00
Johannes Schill
e569c8ea10
fix: Navigation on small screens when Grafana is installed in a sub directory ( #10252 ) ( #10261 )
...
* ux: Add missing icon for login with grafana-com, fixes #10238
* fix: This fix potentially solves installations in sub directories, #10252
2017-12-18 16:22:58 +01:00
Torkel Ödegaard
22643eb109
cloudwatch: fixed optimized build issue, fixes #10174
2017-12-18 14:36:34 +01:00
Mitsuhiro Tanda
3cb841f3db
fix text panel rows limit ( #10246 )
2017-12-18 14:29:48 +01:00
Mitsuhiro Tanda
6bb7f77346
use ace editor in panel edit ( #10245 )
2017-12-18 14:29:23 +01:00
Daniel Lee
77cc546315
dashfolder: nginject fix
2017-12-15 16:36:31 +01:00
Daniel Lee
7dac64354f
teams: missing nginject attribute
2017-12-15 16:26:00 +01:00
Torkel Ödegaard
71658d1e76
grid: disable resize and drag on non editable dashboards, closes #10235
2017-12-15 16:23:26 +01:00
Torkel Ödegaard
4112abd699
logging: removed logging from panel loader
2017-12-15 15:43:32 +01:00
Torkel Ödegaard
23e0ca5543
Merge branch 'master' of github.com:grafana/grafana
2017-12-15 14:55:50 +01:00
Torkel Ödegaard
d1e0e36996
fix: dont show settings for viewers
2017-12-15 14:51:20 +01:00
bergquist
ea4ef47982
prometheus: change default resolution to 1/1
...
this should make the value of the step value more
consistant for most users
ref #9705
2017-12-15 14:24:31 +01:00
Torkel Ödegaard
a8a5f8181b
fix: viewers can edit now works correctly
2017-12-15 14:19:49 +01:00
Torkel Ödegaard
ed48d27d85
fix: fixed minor ux and firefox issues, fixes #10228
2017-12-15 13:34:50 +01:00
Torkel Ödegaard
63d4499a2b
ux: minor fixes
2017-12-15 13:14:00 +01:00
Torkel Ödegaard
fdf4bad1b7
fix: sidemenu profile main text is now username instead of name
2017-12-15 13:03:07 +01:00
Torkel Ödegaard
c395237710
Merge branch Grafana v5 'develop' branch
2017-12-15 12:06:09 +01:00
Torkel Ödegaard
8905c8e5fb
Merge branch 'team_member_count' of https://github.com/bergquist/grafana into develop
2017-12-15 11:53:47 +01:00
Torkel Ödegaard
75bfe313d7
Merge remote-tracking branch 'origin/develop-filter-table' into develop
2017-12-15 11:44:51 +01:00
bergquist
256f7176a2
teams: add team count when searching for team
...
closes #10207
2017-12-15 11:08:06 +01:00
Torkel Ödegaard
9a711a4fc3
ux: minor position change for layout selector, fixes #10217
2017-12-15 09:58:39 +01:00
Torkel Ödegaard
3300af909a
Merge branch 'develop' of github.com:grafana/grafana into develop
2017-12-15 09:50:18 +01:00
Torkel Ödegaard
ba3dbac50d
fix: view json from share modal now works, #10217
2017-12-15 09:49:57 +01:00
Torkel Ödegaard
69305c20a0
Merge branch 'develop' of github.com:grafana/grafana into develop
2017-12-15 09:29:41 +01:00
Torkel Ödegaard
25d8f21b64
ux: used new add data sources icon
2017-12-15 09:19:29 +01:00
Marcus Efraimsson
a84e03ddc4
dashfolders: styling of selected filters
...
#10081
2017-12-15 09:14:10 +01:00
Marcus Efraimsson
bd7837e8d7
dashfolders: styling of selected filters
...
#10081
2017-12-14 20:20:36 +01:00
Torkel Ödegaard
581257416e
Merge remote-tracking branch 'origin/develop-icons' into develop
2017-12-14 19:56:19 +01:00
Marcus Efraimsson
62e6fed5ce
dashfolders: fix moving plugin dashboard to folder
...
If moving a dashboard and the server responds with a plugin-dashboard
error we add the overwrite flag and moving the dashboard again.
Fixes #10183
2017-12-14 16:51:23 +01:00
Marcus Efraimsson
b1bb012343
dashfolders: fix folder selection dropdown in dashboard settings
...
Use folder id from meta instead of dashboard object
2017-12-14 15:58:24 +01:00
Carl Bergquist
f5d26bfcc9
Merge pull request #10050 from davkal/davkal/multi-query-table
...
Add support to render values of multiple queries in the same table
2017-12-14 15:57:07 +01:00
Patrick O'Carroll
780d3e2c8f
fix for merge conflict
2017-12-14 15:50:47 +01:00
Trent White
764992df2a
add links for large cta
2017-12-14 09:31:59 -05:00
Patrick O'Carroll
0f62b3e04d
resolve merge conflict
2017-12-14 15:15:54 +01:00
Marcus Efraimsson
854d22fa8e
dashfolders: bulk move/delete improvements
...
bulk delete dashboards synchronously
moved bulk delete and move dashboards to backend_srv
better error handling/messages when moving and deleting folders/dashboards
fixes #10181
2017-12-14 15:09:17 +01:00
Torkel Ödegaard
4f56d4ac07
snapshots: fixed snapshot issues, fixes #10214
2017-12-14 14:58:45 +01:00
Patrick O'Carroll
33f2e31393
replaced old table with filter-table, removed edit button, made whole rows to links
2017-12-14 14:30:13 +01:00
Torkel Ödegaard
4e38526404
playlist: fixed playlist buttons in dashboard header, fixes #10213
2017-12-14 14:27:47 +01:00
Torkel Ödegaard
0085114d4e
ux: minor changes to search input
2017-12-14 13:08:32 +01:00
Johannes Schill
b012131050
Magnifying glass on search fields #10188 ( #10206 )
...
* ux: Add magnifying glass icon to search input and remove the text label (#10188 )
* ux: Add new look on search field to manage dashboards, users, teams, data sources, plugins. Change to use our own icon class instead of .fa (#10188 )
* ux: Add new search look on org/users (#10188 )
2017-12-14 12:46:00 +01:00
Torkel Ödegaard
776c39fd79
templating: made templateSrv globally accessable as ES6 module, DashboardRow can not interpolate row title
2017-12-14 12:31:57 +01:00
Torkel Ödegaard
9007e26106
Merge branch 'develop' of github.com:grafana/grafana into develop
2017-12-14 12:10:59 +01:00
Torkel Ödegaard
ff89531849
fix: ignore row clones in schema migration
2017-12-14 12:10:32 +01:00
Daniel Lee
bcc85862fe
dshttpsettings: Move whitelisted cookies to end of config page
2017-12-14 11:46:44 +01:00
Daniel Lee
592cb386e2
dshttpsettings: add field for cookies that should be kept
...
The ds proxy strips out cookies. Cookie names specified in
this field will not be stripped out. This is the frontend
change only.
2017-12-14 11:46:44 +01:00
Marcus Efraimsson
196a05d487
dashfolders: bulk move/delete improvements
...
Use slug and url instead of uri
Check/uncheck a folder will check/uncheck all its children dashboards
Allow to move dashboards when there are both folders and dashboards selected
Hide the header of section when only managing one folder
#10081 #10181
2017-12-14 11:26:16 +01:00
Daniel Lee
fcca36a256
fix: after removed file
2017-12-14 09:46:55 +01:00
Daniel Lee
34cffc6b92
dashfolder: fix after backendSrv change
...
also removes unused create folder modal
2017-12-14 09:35:14 +01:00
Daniel Lee
c5c403b6ef
orgswitcher: update test
2017-12-14 09:02:23 +01:00
Trent White
2c4de364f8
annotation icon fix
2017-12-13 18:18:51 -05:00
Trent White
1cbd88fc14
dashboard settings icons
2017-12-13 18:17:56 -05:00
