Torkel Ödegaard
974d4d9739
Revert "Don't animate panels on initial render ( #10130 )"
...
This reverts commit e0c173c5af
2017-12-08 11:53:51 +01:00
Alexander Zobnin
e0c173c5af
Don't animate panels on initial render ( #10130 )
...
* grid: dont animate panels on initial render
* grid: dont animate panels on initial render
2017-12-08 11:49:14 +01:00
Alexander Zobnin
3de17ecda7
dashboard grid: enable CSS transforms ( #10125 )
2017-12-08 08:21:00 +01:00
Marcus Efraimsson
017b337f00
dashfolders: create folder page
...
Fixes #10085
2017-12-07 19:32:38 +01:00
Marcus Efraimsson
2ea663df78
dashfolders: New Dashboard Folder page
...
Fixes #10083 . Permissions page is just a placeholder
for now.
2017-12-07 17:30:54 +01:00
Torkel Ödegaard
68dab71275
refactor: sidemenu toggle & hiding logic
2017-12-07 16:25:21 +01:00
Torkel Ödegaard
beb9f8ee74
Merge remote-tracking branch 'origin/master' into develop
2017-12-07 14:14:50 +01:00
Marcus Efraimsson
f87b9aaa8a
dashboard: keyboard nav in dashboard search - closes #10100
...
Pressing enter/return for a folder toggles it.
Pressing enter/return for a dashboard navigates to it.
2017-12-06 20:34:41 +01:00
Marcus Efraimsson
0029d96579
dashboard: Show CTA for empty lists/folders #10083
2017-12-06 14:27:29 +01:00
Marcus Efraimsson
dd3c9da009
dashboard: Dashboard folder page wip #10083
2017-12-06 14:11:25 +01:00
Marcus Efraimsson
8e8c3d2eeb
Merge branch 'develop' into develop_searchresults
2017-12-05 14:25:20 +01:00
Daniel Lee
781349d360
dashboard: dashboard search results component. closes #10080
2017-12-05 14:20:44 +01:00
Torkel Ödegaard
90bcec8178
nav: updated nav item id for manage dashboards
2017-12-05 12:25:59 +01:00
Torkel Ödegaard
90da964a14
refactoring PR #10068
2017-12-05 12:19:01 +01:00
Torkel Ödegaard
cc2349f6aa
Merge branch 'feat-10064' of https://github.com/alexanderzobnin/grafana into develop
2017-12-05 12:03:33 +01:00
Alexander Zobnin
afc036492c
dashboard: migrations for repeat rows ( #10070 )
2017-12-05 11:46:58 +01:00
Alexander Zobnin
4d7ff4de15
move import menu item to the original place
2017-12-04 18:00:22 +03:00
Alexander Zobnin
4403d919c1
move DashboardImportCtrl tests to jest
2017-12-04 16:51:37 +03:00
Alexander Zobnin
44ea0ff71d
Move import dashboard from modal to the page
2017-12-04 15:55:37 +03:00
Torkel Ödegaard
d29c695d44
refactor: minor refactoring of #10027
2017-12-04 13:38:38 +01:00
Torkel Ödegaard
df693134bd
Merge branch 'feat-10008' of https://github.com/alexanderzobnin/grafana into alexanderzobnin-feat-10008
2017-12-04 13:23:38 +01:00
Torkel Ödegaard
d7337432ac
ux: progress on time picker dropdown version
2017-12-03 07:53:47 +01:00
Torkel Ödegaard
f7babd392b
Merge branch 'develop' into develop-settings
2017-12-02 15:45:10 +01:00
Torkel Ödegaard
dae5110db0
ux: updated dashboard nav
2017-12-02 15:35:59 +01:00
Torkel Ödegaard
1c27df97d6
ux: dashboard setings progres
2017-12-02 07:05:58 +01:00
Torkel Ödegaard
c8ead22722
started on dashboard settings refactor
2017-12-01 21:04:48 +01:00
Torkel Ödegaard
e871e56522
ux: add new panel and dash nav improvements
2017-12-01 20:11:55 +01:00
Torkel Ödegaard
126257845c
ux: dashboard nav update
2017-12-01 15:58:12 +01:00
Torkel Ödegaard
289ba74ede
ux: new dashnav design
2017-12-01 15:56:08 +01:00
Alexander Zobnin
8593ca001d
repeat row: refactor
2017-12-01 16:34:49 +03:00
Torkel Ödegaard
6bff416430
navigation: more progress on new page header
2017-12-01 12:51:46 +01:00
Torkel Ödegaard
75bb894485
ux: new page-header design, most pages beside admin done
2017-12-01 11:32:00 +01:00
Alexander Zobnin
88760983ab
repeat row: add more tests
2017-11-30 10:42:53 +03:00
Alexander Zobnin
36ef186587
repeat row: expose scopedVars to row panels
2017-11-29 16:40:13 +03:00
Alexander Zobnin
dd9c727e60
repeat row: handle collapsed rows
2017-11-29 14:14:43 +03:00
Alexander Zobnin
08d470d76a
dashboard: initial repeat row implementation
2017-11-29 12:51:14 +03:00
Marcus Efraimsson
6c5748203d
Restore Page Footer after migration to new scrollbar #9652
2017-11-28 14:17:53 +01:00
Patrick O'Carroll
afd0fc3652
export view json now templatized, fixes #10001
2017-11-28 13:27:43 +01:00
Alexander Zobnin
b97ad93be1
fix panel solo mode ( #10002 )
2017-11-28 09:38:28 +01:00
Torkel Ödegaard
7f3a3b9e55
search fix and update buttons on dashboard list page
2017-11-27 14:49:31 +01:00
Torkel Ödegaard
c38a64e4cc
Merge remote-tracking branch 'origin/migrate-view-state' into develop
2017-11-27 13:37:12 +01:00
Torkel Ödegaard
fdb217c283
build: fixed lint issue
2017-11-27 13:19:33 +01:00
Patrick O'Carroll
be74957a60
fixed link i specs-file
2017-11-27 12:29:20 +01:00
Alexander Zobnin
24fe3af20f
Improve dashboard grid layout migration WIP ( #9943 )
...
* grid: fix small panels migration and make panel height closer to row height
* grid: migrate rows
* grid: increase min panel height
* grid: fix panel placement for complex layouts
* dashboard migration: refactor
* dashboard migration: add tests for grid layout
* dashboard: fix complex layout migration
* dashboard migration fix: fill current row if it possible
* test: fix karma tests by setting default panel span
* dashboard: fix migration when panel height more than row height
* dashboard: fix migration for collapsed rows
* grid: add all rows if even one collapsed or titled row is present
2017-11-27 12:22:52 +01:00
Torkel Ödegaard
df2d49da33
test fix
2017-11-27 12:16:40 +01:00
Torkel Ödegaard
0a1c8fdac4
Merge branch 'develop' of github.com:grafana/grafana into develop
2017-11-27 12:15:58 +01:00
Torkel Ödegaard
e98af1b3fa
updated libs and fixed new typescript errors
2017-11-27 12:14:57 +01:00
Marcus Efraimsson
7ce766d9d4
dashlist: Support for clear all filters
2017-11-27 11:33:54 +01:00
Patrick O'Carroll
e3f45546d1
migrated viewstatesrv to ts
2017-11-27 11:23:15 +01:00
Torkel Ödegaard
bc81298d4c
worked on search
2017-11-24 16:18:56 +01:00
Patrick O'Carroll
b752cfee1f
migrated four files to ts, addd some code to config to make it work ( #9980 )
2017-11-24 12:59:36 +01:00
Marcus Efraimsson
d9ecb59dae
dashlist: Support for check/uncheck all
2017-11-23 18:32:44 +01:00
Marcus Efraimsson
7ee57b774a
dashlist: When searching should reset checked state to false
2017-11-23 14:59:52 +01:00
Daniel Lee
9ba9043d64
dashlist: change scrollbar to new perfect scroll directive
2017-11-23 13:31:35 +01:00
Daniel Lee
245cebedde
dashlist: style list to be same as dash search
2017-11-23 11:53:55 +01:00
Torkel Ödegaard
d9a913afe1
Merge branch 'develop-scrollable-panels' into develop
2017-11-23 11:13:21 +01:00
Torkel Ödegaard
856a0393ab
Merge branch 'develop' into develop-scrollable-panels
2017-11-23 10:27:16 +01:00
Daniel Lee
41a3431c4e
dashlist: starred filter search
2017-11-22 18:44:57 +01:00
Daniel Lee
ba511f3e24
dashlist: adds tag filter select (GitHub style)
2017-11-21 18:53:49 +01:00
Daniel Lee
121d48ec26
dashlist: toggle folders
2017-11-21 17:06:30 +01:00
Daniel Lee
bd2b26e9f5
dashlist: fix tag filtering and some css
2017-11-21 14:47:19 +01:00
Torkel Ödegaard
830c307bba
progress on scrollable panels work
2017-11-21 14:30:33 +01:00
Daniel Lee
8daff73ba2
dashlist: started fixing js/css after design changes
2017-11-20 18:15:59 +01:00
Torkel Ödegaard
8160e68f93
fix: build & tests
2017-11-17 16:18:30 +01:00
Torkel Ödegaard
0e44fe082b
Merge branch 'master' into develop
2017-11-17 15:49:17 +01:00
Patrick O'Carroll
d800e64368
fixes : #1871 Dropdown starred ( #9490 )
...
adding the ability to star dashboard in search and dashboard-list
closes #1871
2017-11-15 15:01:44 +01:00
Torkel Ödegaard
bf82d166bc
feat: refactoring hide time picker PR #9756
2017-11-03 09:13:40 +01:00
Torkel Ödegaard
10fcf2f5be
Merge branch 'master' into develop
2017-11-02 15:56:09 +01:00
Daniel Lee
84b277d5c0
dashfolders: fix for dashlist nav
2017-11-01 20:12:32 +01:00
Torkel Ödegaard
97cc454ded
ux: minor changes
2017-11-01 14:23:46 +01:00
Patrick O'Carroll
63c79f066a
option to hide Time picker, fixes #2013
2017-11-01 12:26:45 +01:00
Torkel Ödegaard
894951c7d4
fix: panel view now wraps, no scrolling required, fixes #9746
2017-11-01 11:24:26 +01:00
Torkel Ödegaard
c3bd07f9b4
testdata: added manual entry mode to test data
2017-11-01 09:59:24 +01:00
Torkel Ödegaard
84b10df887
Merge branch 'develop' of github.com:grafana/grafana into develop
2017-10-31 16:14:40 +01:00
Torkel Ödegaard
9aa6a6b4c4
Merge branch 'linkSrv-js-to-ts'
2017-10-31 14:29:42 +01:00
Daniel Lee
a366b137a2
dashfolders: bulk edit tag filtering
...
Still ugly though
2017-10-30 19:34:55 +01:00
Daniel Lee
e85abf6810
dashboards: bulk edit delete
...
If both a parent folder and a child is chosen then
only sends the parent folder for deletion as the
child folder will be deleted anyway.
2017-10-29 22:08:26 +01:00
bergquist
e1765e360e
tech: add missing include
2017-10-29 20:21:41 +01:00
Carl Bergquist
e5ec357625
Merge pull request #9697 from bergquist/fix_removed_threshols
...
save as should only delete threshold for panels with alerts
2017-10-28 23:48:31 +02:00
bergquist
728471eef4
save as should only delete threshold for panels with alerts
...
closes #9681
2017-10-27 15:41:53 +02:00
Torkel Ödegaard
cae852a1a2
updated icons
2017-10-27 08:33:04 +02:00
Torkel Ödegaard
9605ab4475
Merge branch 'master' into develop
2017-10-26 15:59:50 +02:00
Patrick O'Carroll
f097bce565
more link fixes
2017-10-26 14:47:07 +02:00
Torkel Ödegaard
74fcb2494a
prometheus: fixed unsaved changes warning when changing time range due to step option on query model was changed in datasource.query code, fixes #9675
2017-10-26 11:46:33 +02:00
Torkel Ödegaard
9718fa7c03
grid: work in progress on row repeats
2017-10-26 09:53:48 +02:00
Daniel Lee
7f3293ce80
dashfolders: rough draft of bulk edit
2017-10-25 16:12:03 +02:00
Torkel Ödegaard
7559982b05
grid: minor changes
2017-10-25 12:38:08 +02:00
Torkel Ödegaard
a299118c92
Merge branch 'develop' of github.com:grafana/grafana into develop
2017-10-24 20:29:53 +02:00
Torkel Ödegaard
38f97d5cc9
grid: worked on row options modal and row removal
2017-10-24 20:13:34 +02:00
Patrick O'Carroll
95250e4ea3
replace store.js with store.ts, test for store.ts ( #9646 )
2017-10-24 16:13:49 +02:00
Torkel Ödegaard
df12cbc4a7
tests: added test for DashboardRow
2017-10-24 15:46:03 +02:00
Torkel Ödegaard
15024e96e4
ux: row collapse / expand starting to work
2017-10-24 12:33:14 +02:00
Torkel Ödegaard
68562a2077
Merge branch 'master' into develop
2017-10-24 11:02:48 +02:00
Torkel Ödegaard
3e89ec4ff2
ux: updated icons
2017-10-24 10:47:24 +02:00
Patrick O'Carroll
a8285d0eb4
shore: migrating config/settings.js to typescript
2017-10-24 10:45:46 +02:00
Patrick O'Carroll
8afb84a5e5
fix: fixed playlist controls and view state, fixes #9639
2017-10-24 10:43:48 +02:00
Torkel Ödegaard
fff0fa2aee
Merge branch 'master' into develop
2017-10-22 11:51:14 +02:00
Torkel Ödegaard
4aa227dd84
[Tech]: Start migrating to Jest for tests ( #9610 )
...
* tech: investigating karma + jest mix
* tech: migrating tests to jest
* tech: moved anoter test file to jest
* test: migrated two more test files to jest
* test: updated readme and made test fail to verify that it causes CI build failure
* tech: added code coverage for jest tests
* tech: testing codecov coverage
* tech: migrated more tests
* tech: migrated template srv to typescript and the tests to jest
* tech: minor build fix
* tech: build fixes
* build: another attempt at fixing go test with coverage
2017-10-22 07:03:26 +02:00
Torkel Ödegaard
1e61eae9f4
fix: fixed save to file button in export modal, fixes #9586
2017-10-19 12:52:26 +02:00
Torkel Ödegaard
6f71af449b
ux: new fixes
2017-10-18 09:48:37 +02:00
Torkel Ödegaard
bc8c2409c0
ux: work on rows
2017-10-17 14:53:52 +02:00
Torkel Ödegaard
e375159eec
grid: row work
2017-10-17 12:04:18 +02:00
Torkel Ödegaard
cd10be0f52
newgrid: row progress
2017-10-16 16:09:23 +02:00
Torkel Ödegaard
a979767439
grid: minor progress on new row concept
2017-10-16 10:58:08 +02:00
Torkel Ödegaard
2ff4b86781
ux: add panel progress
2017-10-16 10:39:50 +02:00
Torkel Ödegaard
772ab7812f
ux: worked on add panel function
2017-10-16 09:55:55 +02:00
Torkel Ödegaard
a3bd761b0c
ux: testing out new icons
2017-10-14 21:17:16 +02:00
Torkel Ödegaard
825cac38b4
ux: minor fixes
2017-10-13 17:01:38 +02:00
Torkel Ödegaard
0c31d23086
grid: fixed grid width issues
2017-10-13 15:11:05 +02:00
Torkel Ödegaard
70005d3e37
grid: repeat refactoring and unit tests
2017-10-13 14:50:16 +02:00
Torkel Ödegaard
e5a6cb6241
newgrid: added constants, changed grid to 24 cols, added tests for panel repeats
2017-10-13 13:51:05 +02:00
Torkel Ödegaard
8bb9d92a73
grid: minor progress on panel repeats
2017-10-12 21:37:27 +02:00
Torkel Ödegaard
215d59865e
changed name back to use underscore instead of camelcase, need to think more about this
2017-10-12 20:02:07 +02:00
Torkel Ödegaard
83e496606e
fixed dashboard sorting
2017-10-12 19:55:52 +02:00
Torkel Ödegaard
770a21b368
newgrid: worked panel duplicate
2017-10-12 19:01:02 +02:00
Torkel Ödegaard
48c8e4d627
fix: various fixes for new grid
2017-10-12 17:38:49 +02:00
Torkel Ödegaard
88ceb19d96
Merge branch 'master' into develop
2017-10-12 16:32:44 +02:00
Daniel Lee
4c5bf76829
dashgrid: fix or skip tests for repeat rows
2017-10-12 12:01:13 +02:00
Daniel Lee
5272dd6605
dashboardgrid: disable dynamic_dashboard_srv for now
...
The row concept is probably going to change a lot so disabling
the repeating panels and repeating rows code and tests for now.
2017-10-12 11:04:38 +02:00
Paul Mestemaker
2f73208ca8
Update unsaved_changes_modal.ts
2017-10-11 15:57:33 -07:00
Torkel Ödegaard
3a089dd04c
newgrid: various fixes
2017-10-11 21:36:03 +02:00
Torkel Ödegaard
0d9ac4d5a4
newgrid: fixed migration code to new grid
2017-10-11 16:58:11 +02:00
Torkel Ödegaard
85405a2e8d
Merge branch 'develop' of github.com:grafana/grafana into develop
2017-10-11 16:32:14 +02:00
Torkel Ödegaard
331b50dcaa
grid: edit/view now works
2017-10-11 16:32:05 +02:00
Daniel Lee
0f6270098b
dashboard: fixes for panels without rows
2017-10-11 16:09:05 +02:00
Torkel Ödegaard
9785e6b630
fix: ignore upgrading dashboard grid when there are no rows
2017-10-11 14:40:18 +02:00
Torkel Ödegaard
d8e4decc60
grid: fixed migration for rows without height
2017-10-11 14:36:25 +02:00
Torkel Ödegaard
087b55aece
newgrid: progress on fullscreen/edit view modes
2017-10-11 11:42:49 +02:00
Torkel Ödegaard
2e77bd0cb1
grid: progress on react grid
2017-10-10 17:57:53 +02:00
Torkel Ödegaard
10a3504309
grid: progress on new grid, resize & saving layouts works
2017-10-10 14:20:53 +02:00
Torkel Ödegaard
207773e07e
grid: minor progress
2017-10-10 09:34:14 +02:00
Torkel Ödegaard
a867dc069b
tech: got angular component to load inside react grid
2017-10-09 20:38:48 +02:00
Torkel Ödegaard
63bf2a0278
grid: need to find a way to add angular component inside react
2017-10-09 17:52:25 +02:00
Torkel Ödegaard
6cd2624caf
ux: initial react grid poc
2017-10-09 17:24:10 +02:00
Torkel Ödegaard
647a3cc5ae
Merge branch 'master' into develop
2017-10-09 16:01:54 +02:00
Torkel Ödegaard
9e61cacd16
tests: found the unhandled promise issue in the dash import tests
2017-10-08 15:56:42 +02:00
Torkel Ödegaard
b228c23dbe
testing: fixing tests
2017-10-07 22:05:31 +02:00
Torkel Ödegaard
3519d8d69b
annotations: minor change to default/edit annotation color
2017-10-07 12:23:20 +02:00
Torkel Ödegaard
25aa9df270
Create annotations ( #8197 )
...
* annotations: add 25px space for events section
* annotations: restored create annotation action
* annotations: able to use fa icons as event markers
* annotations: initial emoji support from twemoji lib
* annotations: adjust fa icon position
* annotations: initial emoji picker
* annotation: include user info into annotation requests
* annotation: add icon info
* annotation: display user info in tooltip
* annotation: fix region saving
* annotation: initial region markers
* annotation: fix region clearing (add flot-temp-elem class)
* annotation: adjust styles a bit
* annotations: minor fixes
* annoations: removed userId look in loop, need a sql join or a user cache for this
* annotation: fix invisible events
* lib: changed twitter emoij lib to be npm dependency
* annotation: add icon picker to Add Annotation dialog
* annotation: save icon to annotation table
* annotation: able to set custom icon for annotation added by user
* annotations: fix emoji after library upgrade (switch to 72px)
* emoji: temporary remove bad code points
* annotations: improve icon picker
* annotations: icon show icon picker at the top
* annotations: use svg for emoji
* annotations: fix region drawing when add annotation editor opened
* annotations: use flot lib for drawing region fill
* annotations: move regions building into event_manager
* annotations: don't draw additional space if no events are got
* annotations: deduplicate events
* annotations: properly render cut regions
* annotations: fix cut region building
* annotations: refactor
* annotations: adjust event section size
* add-annotations: fix undefined default icon
* create-annotations: edit event (frontend part)
* fixed bug causes error when hover event marker
* create-annotations: update event (backend)
* ignore grafana-server debug binary in git (created VS Code)
* create-annotations: use PUT request for updating annotation.
* create-annotations: fixed time format when editing existing event
* create-annotations: support for region update
* create-annotations: fix bug with limit and event type
* create-annotations: delete annotation
* create-annotations: show only selected icon in edit mode
* create-annotations: show event editor only for users with at least Editor role
* create-annotations: handle double-sized emoji codepoints
* create-annotations: refactor
use CP_SEPARATOR from emojiDef
* create-annotations: update emoji list, add categories.
* create-annotations: copy SVG emoji into public/vendor/npm and use it as a base path
* create-annotations: initial tabs for emoji picker
* emoji-picker: adjust styles
* emoji-picker: minor refactor
* emoji-picker: refactor - rename and move into one directory
* emoji-picker: build emoji elements on app load, not on picker open
* emoji-picker: fix emoji searching
* emoji-picker: refactor
* emoji-picker: capitalize category name
* emoji-picker: refactor
move buildEmojiElem() into emoji_converter.ts for future reuse.
* jquery.flot.events: refactor
use buildEmojiElem() for making emojis, remove unused code for font awesome based icons.
* emoji_converter: handle converting error
* tech: updated
* merged with master
* shore: clean up some stuff
* annotation: wip tags
* annotation: filtering by tags
* tags: parse out spaces etc. from a tags string
* annotations: use tagsinput component for tag filtering
* annotation: wip work on how we query alert & panel annotations
* annotations: support for updating tags in an annotation
* linting
* annotations: work on unifying how alert history annotations and manual panel annotations are created
* tslint: fixes
* tags: create tag on blur as well
Currently, the tags directive only creates the tag when the
user presses enter. This change means the tag is created on
blur as well (when the user clicks outside the input field).
* annotations: fix update after refactoring
* annotations: progress on how alert annotations are fetched
* annotations: minor progress
* annotations: progress
* annotation: minor progress
* annotations: move tag parsing from tooltip to ds
Instead of parsing a tag string into an array in the annotation_tooltip
class, this moves the parsing to the datasources. InfluxDB ds already
does that parsing. Graphite now has it.
* annotations: more work on querying
* annotations: change from tags as string to array
when saving in the db and in the api.
* annotations: delete tag link if removed on edit
* annotation: more work on depricating annotation title
* annotations: delete tag links on delete
* annotations: fix for find
* annotation: added user to annotation tooltip and added alertName to annoation dto
* annotations: use id from route instead from cmd for updating
* annotations: http api docs
* create annotation: last edits
* annotations: minor fix for querying annotations before dashboard saved
* annotations: fix for popover placement when legend is on the side (and doubel render pass is causing original marker to be removed)
* annotations: changing how the built in query gets added
* annotation: added time to header in edit mode
* tests: fixed jshint built issue
2017-10-07 10:31:39 +02:00
Torkel Ödegaard
a1b543aa35
shore: cleanup unused stuff in common.d.ts
2017-10-03 18:27:25 +02:00
Torkel Ödegaard
4cc878b56d
build: fixed build
2017-10-02 17:10:23 +02:00
Torkel Ödegaard
a02cac2126
refactoring: minor refactoring of PR #8916
2017-10-02 16:45:25 +02:00
Torkel Ödegaard
42a0e9ebdf
Merge branch 'day_rounding' of https://github.com/ctide/grafana into ctide-day_rounding2
2017-10-02 16:20:23 +02:00
Torkel Ödegaard
03a88206a3
Merge branch 'master' of github.com:grafana/grafana
2017-10-02 15:30:14 +02:00
Torkel Ödegaard
d38c891fac
merge with master
2017-10-02 14:14:45 +02:00
Patrick O'Carroll
bd348e16bb
redesigned dashboard links settingd, fixed a misspelling in rows and added fixed width to buttons ( #9397 )
2017-10-02 13:04:48 +02:00
Torkel Ödegaard
0c86241c5b
Webpack ( #9391 )
...
* webpack poc, this is not going to work for plugins, dam
* tech: webpack and systemjs for plugins starting to work
* tech: webpack and systemjs combo starting to work
* tech: webpack + karma tests progress
* tech: webpack + karma progress
* tech: working on tests
* tech: webpack
* tech: webpack + karma, all tests pass
* tech: webpack + karma, all tests pass
* tech: webpack all tests pass
* webpack: getting closer
* tech: webpack progress
* webpack: further build refinements
* webpack: ng annotate fixes
* webpack: optimized build fix
* tech: minor fix for elasticsearch
* tech: webpack + ace editor
* tech: restored lodash move mixin compatability
* tech: added enzyme react test and upgraded to react v16
* tech: package version fix
* tech: added testdata to built in bundle
* webpack: sass progress
* tech: prod & dev build is working for the sass
* tech: clean up unused grunt stuff and moved to scripts folder
* tech: added vendor and manifest chunks, updated readme and docs
* tech: webpack finishing touches
2017-10-01 20:02:25 +02:00
Daniel Lee
992cc1b680
panel: rename label on csv export modal
2017-09-29 11:32:13 +02:00
Torkel Ödegaard
7aa753a25f
tech: migrating elasticsearch to typescript
2017-09-28 12:52:39 +02:00
Torkel Ödegaard
5849fbf04e
Merge branch 'master' of github.com:grafana/grafana into develop
2017-09-28 10:37:57 +02:00
chrisrd
0e5e2f3fb9
Fix export_modal message ( #9353 )
...
Remove duplicate "to", and "others" is plural not possessive.
2017-09-27 09:46:56 +02:00
Torkel Ödegaard
18337f610d
Merge branch 'master' into develop
2017-09-22 08:42:07 +02:00
Torkel Ödegaard
491fa6cad8
tech: more tslint rules
2017-09-21 17:23:31 +02:00
Torkel Ödegaard
b8d9722b4f
tech: removing unused variables from typescript files, and making tslint rules more strict
2017-09-21 16:40:18 +02:00
Gordon McGuire
5e013f82b4
fix: close for 'Unsaved Changes' modal, #9284 ( #9313 )
...
Missing reference to the controller instance.
2017-09-21 09:05:59 +02:00
Torkel Ödegaard
41e01184aa
Merge branch 'master' into develop
2017-09-18 12:32:29 +02:00
Alexander Zobnin
54f0650321
Remove alert thresholds on panel duplicate, issue #9178 ( #9257 )
2017-09-15 13:34:31 +02:00
Torkel Ödegaard
a9e3130ef6
Merge branch 'master' into develop
2017-09-13 16:06:34 +02:00
Torkel Ödegaard
1a53d6453b
Merge branch 'v4.4.x'
2017-09-13 10:02:04 +02:00
Torkel Ödegaard
f6100dd8eb
ux: success/error alerts refactoring, #9214
2017-09-12 09:05:32 +02:00
Torkel Ödegaard
a38ded9e7e
Merge branch 'master' into develop-newgrid-row-design2
2017-09-07 15:05:41 +02:00
Jesse White
91fb3f2224
fix: cancel the initial timer when changing the auto-refresh interval, fixes #9139 ( #9140 )
2017-09-01 07:19:51 +02:00
Daniel Lee
abeaef71cc
DashExport: fix View JSON in export menu
...
ref #9002
2017-08-30 09:56:49 +02:00
Torkel Ödegaard
1aa5ed0cde
ux: minor fixes
2017-08-25 10:41:24 +02:00
Torkel Ödegaard
d87653b079
ux: new grid progress
2017-08-25 10:19:08 +02:00
Torkel Ödegaard
160d8cec92
grid: minor progres on new grid
2017-08-24 16:37:00 +02:00
Torkel Ödegaard
47cf8e6337
grid: minor progres on new grid
2017-08-24 14:08:05 +02:00
Daniel Lee
bf4ffe41b0
Merge branch 'v4.4.x'
2017-08-23 15:19:51 +02:00
Daniel Lee
e763104a6f
csv: add toggle for export to Excel
...
Adds back feature that adds 'sep=;' text that excel needs in a csv file.
Also adds toggle to make this optional if exporting to other spreadsheet
programs. Fixes #9083 .
2017-08-23 15:17:53 +02:00
Torkel Ödegaard
afe0137c66
grid work
2017-08-18 17:39:07 +02:00
Torkel Ödegaard
da9c8c814f
progress on rows as panelsW
2017-08-18 16:33:36 +02:00
Torkel Ödegaard
55c6b4b99c
started on rows as panels in single grid
2017-08-18 13:25:51 +02:00
Torkel Ödegaard
301ae2ea05
Merge branch 'develop' into develop-newgrid-rows
2017-08-18 08:57:33 +02:00
Torkel Ödegaard
8817cc9aaf
ux: color tweaks
2017-08-17 21:32:23 +02:00
Torkel Ödegaard
7ed2ed71f0
ux: dashboard stuff
2017-08-17 18:50:46 +02:00
Torkel Ödegaard
637ff61f90
Merge branch 'develop' into develop-newgrid-rows
2017-08-17 15:56:38 +02:00
Torkel Ödegaard
6609dbff90
ux: sidenav fixes and dashboard search changes
2017-08-17 12:06:51 +02:00
Torkel Ödegaard
db54416deb
ux: sidenav fixes and dashboard search changes
2017-08-15 15:25:18 +02:00
Torkel Ödegaard
7bf6904119
ux: scrollbar stuff
2017-08-15 11:51:47 +02:00
Torkel Ödegaard
8d6a1cdbb4
ux: wip
2017-08-14 18:11:35 +02:00
Torkel Ödegaard
1dab313ca3
Merge branch 'master' into develop
2017-08-14 10:30:36 +02:00
Torkel Ödegaard
d4dd0222fa
fix: prometheus does not have two editor modes, fixes #9025
2017-08-11 12:33:56 +02:00
Torkel Ödegaard
8f2975c69b
moving panels betwen rows are starting to work
2017-08-11 12:12:17 +02:00
Torkel Ödegaard
9f945578b8
grid: progress on row support
2017-08-10 17:17:15 +02:00
Torkel Ödegaard
7cb6093dba
new-grid: fixed destory issues
2017-08-10 15:08:53 +02:00
Torkel Ödegaard
23666c0f78
grid: remove panel works
2017-08-10 14:54:56 +02:00
Torkel Ödegaard
a2a4325b6e
Merge branch 'develop-newgrid' of github.com:grafana/grafana into develop-newgrid
2017-08-09 15:35:06 +02:00
Torkel Ödegaard
77b42220f4
feat: new grid fixes
2017-08-09 15:33:19 +02:00
Torkel Ödegaard
d25dae9b58
Merge branch 'master' into develop-newgrid
2017-08-09 14:07:06 +02:00
Chris Burkhart
3e0b92d6fe
Enable datasources to be able to round off to a UTC day properly
2017-08-08 09:34:41 -07:00
Torkel Ödegaard
d3680d290c
fix: graphite issue with metricFind and sending from/until in normal format, fixes #8997
2017-08-08 13:51:54 +02:00
Torkel Ödegaard
83beff300b
Merge branch 'v4.4.x'
2017-08-08 11:26:45 +02:00
Torkel Ödegaard
64b5153e7d
fix: change view json to use the grafana built json viewer, fixes #9002
2017-08-08 11:26:16 +02:00
Torkel Ödegaard
95f67ed79d
minor fixes
2017-08-05 08:51:57 +02:00
Torkel Ödegaard
957e1c188a
Merge branch 'develop' into develop-newgrid
2017-08-04 13:26:05 +02:00
Torkel Ödegaard
a0a2eda5c6
Merge branch 'master' into gridstack
2017-08-04 13:09:26 +02:00
Torkel Ödegaard
de7bb8cb62
feat: new grid system progressW
2017-08-04 10:47:23 +02:00
Torkel Ödegaard
a5d5f3d82f
feat: add ad hoc filters directly from table panel cells, kibana 3 style, #8052
2017-08-02 16:15:22 +02:00
Torkel Ödegaard
9fb60c2fc8
Merge branch 'develop' into panel-title-menu-ux
2017-08-02 09:56:08 +02:00
Torkel Ödegaard
21a3f443f2
Merge branch 'master' into panel-title-menu-ux
2017-08-01 11:43:00 +02:00
Torkel Ödegaard
2d2800e710
fix: url did not update correctly when closing settings view by using ESC key, fixes #8869
2017-07-24 12:21:30 +02:00
Alexander Zobnin
1499c2bf74
Fix User/Org default timezone bug ( #8748 )
...
* dashboard: don't override timezone if default selected, issue #8503
* dashboard: hide UTC icon immediately after timezone changing
2017-07-03 09:20:55 +02:00
Daniel Lee
ebcbcdc27a
dashfolders: inherited permissions for dashboards
...
Allow duplicate permissions if the original is an
inherited permission from a parent folder.
If a dashboard has permissions but the parent folder
does not, return the default permissions for the
editor and view role combined with the permissions
for the child dashboard.
2017-06-24 03:50:22 +02:00
Torkel Ödegaard
fc69d59cae
dashboard folder search fix
2017-06-23 16:00:26 -04:00
Torkel Ödegaard
456225365f
Merge branch 'develop' of github.com:grafana/grafana into develop
2017-06-23 12:59:14 -04:00
Torkel Ödegaard
e854fadb67
Merge branch 'master' into develop
2017-06-23 12:56:59 -04:00
Torkel Ödegaard
73fcc919cd
change: made dashboard save message optional
2017-06-23 11:49:32 -04:00
Daniel Lee
97ff245ad0
dashfolders: validation for duplicates in acl modal
2017-06-23 17:45:55 +02:00
Torkel Ödegaard
b7255723ea
ux: style tweaks, trying out non italic headers
2017-06-23 09:18:39 -04:00
Torkel Ödegaard
876bb08b05
Merge branch 'develop' of github.com:grafana/grafana into develop
2017-06-22 19:05:49 -04:00
Torkel Ödegaard
5360303ad4
ux: nav changes
2017-06-22 19:05:33 -04:00
Daniel Lee
6d86afd472
dashfolders: use canadmin permission in settings menu
2017-06-23 00:36:17 +02:00
Daniel Lee
82cfa29c00
dashfolders: tests for permission modal
2017-06-23 00:36:08 +02:00
Torkel Ödegaard
9c6c8c0f3f
acl fixes
2017-06-22 17:10:43 -04:00
Torkel Ödegaard
a82b25eb79
acl: more acl work
2017-06-22 15:16:41 -04:00
Daniel Lee
691ff32ae9
dashfolders: allow overflow-y for modals
2017-06-22 02:07:49 +02:00
Torkel Ödegaard
2257c1f874
dashboard acl work
2017-06-21 19:02:03 -04:00
Torkel Ödegaard
aab6c98e45
Merge branch 'dashboard-acl' into dashboard_folders
2017-06-21 17:57:57 -04:00
Torkel Ödegaard
a37c441193
dashboard acl
2017-06-21 17:57:04 -04:00
Torkel Ödegaard
945302ba52
working on dashbord acl stuff
2017-06-21 17:14:06 -04:00
Daniel Lee
38142b371f
WIP: fix js tests for acl
2017-06-21 01:19:30 +02:00
Daniel Lee
ca1f429831
WIP: fix folder-picker for dashlist
2017-06-21 01:07:14 +02:00
Torkel Ödegaard
43ffe826fa
dashboard acl work
2017-06-20 17:18:20 -04:00
Torkel Ödegaard
408c37170f
refactoring: dashboard folders
2017-06-20 14:45:00 -04:00
Torkel Ödegaard
3edd209736
dashboard acl modal
2017-06-20 12:36:07 -04:00
Daniel Lee
cb8b5c0d42
WIP: adding roles - not finished
2017-06-20 01:08:04 +02:00
Torkel Ödegaard
f7194878fe
dashboard guardian refactoring starting to work
2017-06-19 13:47:44 -04:00
Torkel Ödegaard
d9dca72ee4
dashboard_folders: refactoring picker and folder selection in dashboard settings & save as menu
2017-06-16 16:57:37 -04:00
Torkel Ödegaard
0ad4a0faa9
Merge branch 'master' into dashboard_folders
2017-06-16 13:08:45 -04:00
Torkel Ödegaard
a49e82e447
ux: revert dashboard search nav change, this is a tempoary change until we redesign the sidenav
2017-06-16 09:47:21 -04:00
Torkel Ödegaard
e63fa9c83c
Merge branch 'master' into dashboard_folders
2017-06-15 16:23:10 -04:00
Daniel Lee
29ec05298e
WIP: add test for add user group permission
2017-06-15 20:39:27 +02:00
Daniel Lee
0e853163fd
WIP: can edit dashboard permission
2017-06-15 20:21:14 +02:00
Torkel Ödegaard
41662b8540
dashboard_folders: updated
2017-06-14 12:55:21 -04:00
Torkel Ödegaard
210813f126
dashboard_folders: fixes to user picker & group picker
2017-06-14 12:32:43 -04:00
Torkel Ödegaard
908eb24d3a
dashboard_folders: fixes to user & group picker
2017-06-14 12:21:05 -04:00
Torkel Ödegaard
581b977787
Merge branch 'master' of github.com:grafana/grafana
2017-06-13 18:32:38 -04:00
Torkel Ödegaard
9ff4ab1236
Merge branch 'master' into query_troubleshooting
2017-06-13 16:47:04 -04:00
Daniel Lee
1f92e589e8
exporter: query template var keeps refresh value..
...
on export if the value is not set to never. Otherwise the template
variable will not be populated with any values.""
2017-06-13 22:42:58 +02:00
Torkel Ödegaard
7d642546b3
fix: restore dashboard history version did not reload route correctly when slug did not change
2017-06-13 13:21:22 -04:00
Daniel Lee
88e1fcb910
WIP: fixes after version history merge
2017-06-12 22:51:50 +02:00
Daniel Lee
18269a5886
WIP: user + user-group pickers for permissions
2017-06-12 15:49:09 +02:00
Daniel Lee
96afb91ac4
WIP: fixes after navbar changes
...
Fixes for merge conflicts and navbar metadata
added for user group pages.
2017-06-12 15:49:09 +02:00
Daniel Lee
5c89c4b2bd
WIP: dashlist in template for new folder
2017-06-12 15:49:09 +02:00
Daniel Lee
533f2d3d72
WIP: refactor folder-picker for dashlist
2017-06-12 15:49:09 +02:00
Daniel Lee
7381d2565d
WIP: adds folder-picker to save as dialog
2017-06-12 15:49:09 +02:00
Daniel Lee
d081f85289
WIP: use metric-segment for folder picker
2017-06-12 15:49:09 +02:00
Daniel Lee
6c736e002a
WIP: add dummy root folder to folder picker
...
Can move a dash from a folder back to root level as well
2017-06-12 15:49:09 +02:00
Daniel Lee
1e865211c9
WIP: Create new dashboard button in dash search
2017-06-12 15:49:09 +02:00
Daniel Lee
06a15eec5c
WIP: permissions moved to settings tab. Adds folder dropdown to general settings tab
2017-06-12 15:49:09 +02:00
