Commit Graph
8388 Commits
Author SHA1 Message Date
Marcus Efraimsson 5b35c694dc dashboard: generate and include uid in dashboard model. #7883 2018-01-30 23:18:34 +01:00
Marcus Efraimsson 025a14ec24 db: add migrations for creating a unique index for uid. #7883 2018-01-30 23:18:34 +01:00
Marcus Efraimsson 50aa9ec69c db: add migrations for generating uid for existing dashboards. #7883 2018-01-30 23:18:34 +01:00
Marcus Efraimsson 401b01e1e6 db: add new column uid to the dashboard table. #7883 2018-01-30 23:18:34 +01:00
bergquist 8c8328eac5 test: fixes failing test in go1.10 2018-01-30 16:00:32 +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
Marcus Efraimsson f08932b78a WIP: folder api. #10630 2018-01-30 10:53:28 +01:00
Daniel Lee 0fb05bcf59 Merge remote-tracking branch 'upstream/master' into dashboard_permissions 2018-01-30 09:26:23 +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
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
bergquist 2782ad0955 plugins: only set error if errorstring is not empty 2018-01-29 09:53:18 +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
Carl Bergquist ac2b36c271 Merge pull request #10610 from grafana/phantomjs_fix
fixes broken phantomjs rendering
2018-01-25 21:25:02 +01:00
bergquist d62d5c7418 provisioning: delete dashboards from db when file is missing 2018-01-25 15:25:07 +01:00
Daniel Lee bc5fae5367 dashfolders: merge conflict 2018-01-25 14:54:50 +01:00
bergquist 49673c509d fixes broken phantomjs rendering
when migrating from govendor to dep we broke the phantomjs rendering.

ref #10602
2018-01-25 13:27:24 +01:00
Leonard Gram 1c034b7a73 fixes minor typo 2018-01-25 09:30:37 +01:00
bergquist c3a768b3ed provsioning: dont stop grafana due to missing 2018-01-25 09:30:37 +01:00
bergquist 57e7048b8f provisioning: enables title changes for dashboards 2018-01-24 19:16:57 +01:00
hannes 43e6ea95e0 Cloudwatch: add support for multi instances (#10570)
* cloudwatch: fix ebs_volume_ids by create a client-session before call ec2:DescribeInstances.

* cloudwatch: add support for multi instanceIds on call ebs_volume_ids.
2018-01-24 15:41:42 +01:00
Marcus Efraimsson d36fd66dba dashfolder: fix for sqlite test 2018-01-24 11:43:08 +01:00
Daniel Lee 9d2a667e8b dashfolder: fix for mysql test 2018-01-24 11:19:26 +01:00
bergquist 6a6eab5ea1 plugins: map error property on query result 2018-01-24 10:37:04 +01:00
bergquist ee973a977b stats: send amount of stars as stats 2018-01-23 22:51:05 +01:00
bergquist ea988a37dd tech: avoid using deprecated functions 2018-01-23 22:30:45 +01:00
bergquist 5a1cf2c793 style: minor code style changes 2018-01-23 22:28:47 +01:00
bergquist 77a4ccb822 dashboards: save provisioning meta data 2018-01-23 21:54:30 +01:00
bergquist 67a9e6a71d provisioing: add lookup table provisioned dashboards 2018-01-23 21:52:55 +01:00
Torkel Ödegaard 3662b03d8f Merge branch 'master' of github.com:grafana/grafana 2018-01-23 13:04:09 +01:00
Torkel Ödegaard dbfaf5dac8 refactor: minor refactoring of PR #10560 2018-01-23 13:03:44 +01:00
hannes d82af23f1c cloudwatch: fix ebs_volume_ids by create a client-session before call ec2:DescribeInstances. (#10566) 2018-01-23 12:57:05 +01:00
Torkel Ödegaard a24aa3ae28 Merge branch 'generic-oauth-jwt' of https://github.com/DanCech/grafana 2018-01-23 12:44:27 +01:00
bkaganyildiz 97d969bd5c Update OpsGenie Notifier to support different api domains. 2018-01-22 22:27:35 +03:00
Carl Bergquist 184e7046df Merge pull request #10059 from FunkyM/local-image-store
Add support for internal image store
2018-01-22 11:03:00 +01:00
Daniel Lee 94a54248c1 dashfolders: show folders use can save to in picker
Instead of returning all folders a user has some sort of access to,
this change creates a new end point that returns folders the user
has write access to. This new endpoint is used in the folder picker
2018-01-20 01:58:28 +01:00
bergquist 083abff297 Merge branch 'master' into provisioning
* master:
  install dep instead of govendor on setup
  remove unused code from vendor
  migrate from govendor to dep
  fix: cloudwatch corrected error handling so original error is not thrown away
  Generic Oauth Support for ADFS (#9242)
  Adjusted the border color on the buttons in dashboard nav, fixed alert email text area width, fixed padding-top issue on dashboard settings aside
  mysql: convert numbers to text for annotation tooltip
  mysql: update to use ColumnTypes interface in new version
  mysql: update mysql driver to latest master
  gofmt my dear friend
  ux: updated react-layout-grid
2018-01-19 10:36:02 +01:00
Torkel Ödegaard 4f59d229fe fix: cloudwatch corrected error handling so original error is not thrown away 2018-01-19 09:24:44 +01:00
Dan Cech a09044a45a go fmt 2018-01-18 19:17:05 -05:00
Dan Cech 04e17c145f support for decoding JWT id tokens 2018-01-18 18:25:58 -05:00
Torkel Ödegaard 4720b86f5c Merge remote-tracking branch 'origin/mattttt-style-tweaks' 2018-01-18 19:18:34 +01:00
Torkel Ödegaard 2d192f6cc8 Merge branch 'dashboard_permissions' of github.com:grafana/grafana into dashboard_permissions 2018-01-18 18:24:17 +01:00
Torkel Ödegaard cfa775e012 ds: updated ds nav 2018-01-18 18:17:58 +01:00
Dan Cech 5bb22b836d Generic Oauth Support for ADFS (#9242)
* check upn field if email address isn't present, support for adfs

* correctly set login to the user's email address if not specified by the oauth server

* break up GenericOAuth.UserInfo into helper functions
2018-01-18 17:24:04 +01:00
Matt 0dffb6dbb1 Adjusted the border color on the buttons in dashboard nav, fixed alert email text area width, fixed padding-top issue on dashboard settings aside 2018-01-18 14:40:08 +01:00
Daniel Lee f64637c2c5 dashfolders: stop user locking themselves out of a folder 2018-01-18 14:30:04 +01:00
bergquist 7858965117 codestyle: extract code into methods 2018-01-18 12:04:12 +01:00
Daniel Lee 6d13645206 mysql: update to use ColumnTypes interface in new version
The custom code in vendor is not needed anymore and most of the
mapping code can be replaced.
2018-01-18 11:50:16 +01:00