Daniel Lee
4bc5945c17
dashfolders: remove inline styles
2018-01-30 17:26:44 +01:00
Daniel Lee
f5107d5023
alerting: add permission check in api for pausing alerts
2018-01-30 14:41:25 +01:00
Daniel Lee
87d6d791d5
dashfolders: adds comment for dashboard api tests
2018-01-30 14:09:30 +01:00
Daniel Lee
2b7984355a
dashfolders: adds comment for dashboard acl test
2018-01-30 13:28:00 +01:00
Daniel Lee
a00a42d9ee
api: extract api test code to common_test.go
2018-01-30 13:17:48 +01:00
Daniel Lee
0fb05bcf59
Merge remote-tracking branch 'upstream/master' into dashboard_permissions
2018-01-30 09:26:23 +01:00
Johannes Schill
ee57ed10f9
dashfolders: Add min-width to align icons in permissions list and some margin between icon and text #10275
2018-01-29 17:10:25 +01:00
Johannes Schill
0573545d5a
ui: Fix Firefox align issue in dropdowns #10527 ( #10662 )
2018-01-29 17:06:16 +01:00
Torkel Ödegaard
b1cf4cf01c
fix: InfluxDB Query Editor and selecting template variable in where clause caused issue, fixes #10402 , fixes #10663
2018-01-29 17:04:29 +01:00
Daniel Lee
d74a98feff
dashfolders: link to folder for inherited permissions
...
In the permissions view in dashboard settings, this adds a
link to the parent folder for inherited permissions. Which
allows the user to easily navigate to the folder and change
inherited permissions.
2018-01-29 16:10:47 +01:00
Johannes Schill
7900fd4a79
test: Update Tooltip test to check for className support
2018-01-29 15:54:59 +01:00
Alexander Zobnin
479658489a
fix: remove repeated rows when repeat was disabled. ( #10653 )
2018-01-29 15:17:27 +01:00
Johannes Schill
e6c161d897
test: Update Popover test to check for className support
2018-01-29 15:10:05 +01:00
Johannes Schill
51b0f2b0c8
dashfolders: Get rid of unused import #10275
2018-01-29 14:53:10 +01:00
Johannes Schill
787b493c00
dashfolders: Use grafana's question mark instead of FA's and use the react tooltip instead of angular's #10275
2018-01-29 14:53:10 +01:00
Johannes Schill
d9460d0b2b
dashfolders: Add className to Tooltip component
2018-01-29 14:51:28 +01:00
Alexander Zobnin
04053ec56c
fix: don't show manually hidden sidemenu after view mode toggle ( #10659 )
2018-01-29 14:33:41 +01:00
Daniel Lee
146af8595d
dashfolders: css class as parameter for Picker
...
For the permissions picker, pass in an extra class to decide
if the description should be aligned left or right.
2018-01-29 14:30:01 +01:00
Daniel Lee
5ee2d1de05
dashfolders: select with description for permissions
...
The dropdown for selecting permission is a new component built on
react-select that includes a description for the permission for
every option in the select.
2018-01-29 13:56:12 +01:00
Alexander Zobnin
b3ac85766e
fix: show sidebar after mouse wheel scrolling ( #10657 )
2018-01-29 13:38:37 +01:00
Torkel Ödegaard
a0323e96fa
fix: tweak of PR #10635
2018-01-29 10:46:05 +01:00
Torkel Ödegaard
dd4374cc65
Merge remote-tracking branch 'origin/10612_table-date-format'
2018-01-29 10:41:57 +01:00
Torkel Ödegaard
9363c40a0c
Merge branch 'master' of github.com:grafana/grafana
2018-01-29 10:41:28 +01:00
Torkel Ödegaard
b6ce16ebae
ux: minor tweak of #10634
2018-01-29 10:41:06 +01:00
bergquist
2782ad0955
plugins: only set error if errorstring is not empty
2018-01-29 09:53:18 +01:00
Torkel Ödegaard
c5a75ab84a
Merge remote-tracking branch 'origin/10628_search_media_break'
2018-01-29 09:29:46 +01:00
Torkel Ödegaard
cd2161e796
Revert "Fix typeahead to avoid generating new backend request on each keypress. ( #10596 )"
...
This reverts commit 475febd004
2018-01-29 08:38:23 +01:00
Daniel Lee
a7fba593df
dashfolders: add help popover. Add folder title for inherited permissions
2018-01-27 18:16:21 +01:00
Daniel Lee
50b20a0e5a
dashfolders: use react component for dashboard permissions
...
Switch out the angular component for the new react component on the
dashboard permissions editview on the settings page.
2018-01-27 17:26:40 +01:00
Patrick O'Carroll
5f81f401e3
replaced input with gf-form-dropdown
2018-01-26 17:25:12 +01:00
Patrick O'Carroll
ffff75b01a
reverted media queries
2018-01-26 16:59:16 +01:00
bergquist
c34d458b94
Merge branch 'go1.9.3'
...
* go1.9.3:
tech: upgrade to golang 1.9.3
2018-01-26 16:00:31 +01:00
Alexander Zobnin
e6c19eb8e9
graphite: fix nested alerting queries ( #10633 )
2018-01-26 15:05:05 +01:00
Patrick O'Carroll
2f891726c3
fix for sm
2018-01-26 14:57:55 +01:00
Patrick O'Carroll
08822fbdca
added media break for md and sm
2018-01-26 14:46:52 +01:00
Daniel Lee
83548f98b9
dashfolders: add disabled Admin permission to list
...
This is a fake entry that is used to signal to the user that an Admin
user always has Admin rights and they cannot be removed.
2018-01-26 14:38:27 +01:00
bergquist
33beacff0a
tech: upgrade to golang 1.9.3
2018-01-26 14:34:47 +01:00
Leonard Gram
d85b9c28c1
Locks down prometheus1 to v1.8.2 in live-test.
2018-01-26 14:32:20 +01:00
hannes
eefcb3080a
fix typo in parameter. ( #10613 )
...
* options.scopedVars was called without 'd', so a undefined was passed
to the function convertDimensionFormat()
2018-01-26 14:10:17 +01:00
Daniel Lee
ccd86873e7
dashfolders: autosave permissions on change (remove update button)
2018-01-26 14:02:22 +01:00
bergquist
0c6a90db08
changelog: move all 4.7 changes into 5.0
2018-01-26 11:16:09 +01:00
bergquist
a17dbf9af8
changelog: be more explicit about backwards compatibility
2018-01-26 10:51:31 +01:00
Marcus Efraimsson
3d1c624c12
WIP: Protect against brute force (frequent) login attempts ( #10031 )
...
* db: add login attempt migrations
* db: add possibility to create login attempts
* db: add possibility to retrieve login attempt count per username
* auth: validation and update of login attempts for invalid credentials
If login attempt count for user authenticating is 5 or more the last 5 minutes
we temporarily block the user access to login
* db: add possibility to delete expired login attempts
* cleanup: Delete login attempts older than 10 minutes
The cleanup job are running continuously and triggering each 10 minute
* fix typo: rename consequent to consequent
* auth: enable login attempt validation for ldap logins
* auth: disable login attempts validation by configuration
Setting is named DisableLoginAttemptsValidation and is false by default
Config disable_login_attempts_validation is placed under security section
#7616
* auth: don't run cleanup of login attempts if feature is disabled
#7616
* auth: rename settings.go to ldap_settings.go
* auth: refactor AuthenticateUser
Extract grafana login, ldap login and login attemp validation together
with their tests to separate files.
Enables testing of many more aspects when authenticating a user.
#7616
* auth: rename login attempt validation to brute force login protection
Setting DisableLoginAttemptsValidation => DisableBruteForceLoginProtection
Configuration disable_login_attempts_validation => disable_brute_force_login_protection
#7616
2018-01-26 10:41:41 +01:00
Daniel Lee
08c78ab8b7
dashfolders: fix tests for ViewStore after merge
2018-01-26 09:55:03 +01:00
James Westover
475febd004
Fix typeahead to avoid generating new backend request on each keypress. ( #10596 )
...
* Fix typeahead to not generate new request on each keypress.
* Change to debounce method
2018-01-26 09:27:06 +01:00
Alexander Zobnin
cffbb6afd5
fix vertical panel repeat ( #10619 )
2018-01-26 09:24:56 +01:00
Alexander Zobnin
b79017e4a4
graph: fix series sorting issue ( #10617 )
2018-01-26 09:23:56 +01:00
Carl Bergquist
ac2b36c271
Merge pull request #10610 from grafana/phantomjs_fix
...
fixes broken phantomjs rendering
2018-01-25 21:25:02 +01:00
Johannes Schill
49634593cf
dashfolders: New snapshot since we changed from defaultValue to value per latest React documentation #10275
2018-01-25 15:37:49 +01:00
Johannes Schill
1255a0a356
refactor: Replace _.find with Array.prototype.find()
2018-01-25 15:37:27 +01:00
