IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity
12,941 Commits 5,454 Branches 554 Tags 1.9 GiB
2782ad0955
Commit Graph

12941 Commits

Author SHA1 Message Date
bergquist
2782ad0955 plugins: only set error if errorstring is not empty 2018-01-29 09:53:18 +01:00
Torkel Ödegaard
cd2161e796 Revert "Fix typeahead to avoid generating new backend request on each keypress. ()" 
This reverts commit 475febd004.
 2018-01-29 08:38:23 +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 () 2018-01-26 15:05:05 +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. () 
* options.scopedVars was called without 'd', so a undefined was passed
  to the function convertDimensionFormat()
 2018-01-26 14:10:17 +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 () 
* 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


* auth: don't run cleanup of login attempts if feature is disabled



* 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.


* auth: rename login attempt validation to brute force login protection

Setting DisableLoginAttemptsValidation => DisableBruteForceLoginProtection
Configuration disable_login_attempts_validation => disable_brute_force_login_protection
2018-01-26 10:41:41 +01:00
James Westover
475febd004 Fix typeahead to avoid generating new backend request on each keypress. () 
* 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 () 2018-01-26 09:24:56 +01:00
Alexander Zobnin
b79017e4a4 graph: fix series sorting issue () 2018-01-26 09:23:56 +01:00
Carl Bergquist
ac2b36c271
Merge pull request from grafana/phantomjs_fix 
fixes broken phantomjs rendering
 2018-01-25 21:25:02 +01:00
Daniel Lee
4cfe179f47 variables: lint fix 2018-01-25 14:49:51 +01:00
Daniel Lee
8aa55ee352 variables: fix when datasource returns error 2018-01-25 14:16:06 +01:00
bergquist
49673c509d fixes broken phantomjs rendering 
when migrating from govendor to dep we broke the phantomjs rendering.

ref
2018-01-25 13:27:24 +01:00
Patrick O'Carroll
eb2d4b20bc added varibale to table hover, lightend colors for table light theme, fixes () 2018-01-25 12:17:16 +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
Jonathan McCall
579d2b63f8 Disable prefix and postfix font size when gauge mode is enabled () 
* Disable prefix and postfix font size when gauge mode is enabled

* Use function to hide prefix/postfix size when using gauge

* Rename disableFontSizes to canChangeFontSizes
 2018-01-25 09:27:25 +01:00
bergquist
31a5134a0f docs: improve docs for image uploaders 2018-01-24 22:26:00 +01:00
Carl Bergquist
7c9913cb8a
Merge pull request from tsvehagen/haproxy-example 
docs: Add haproxy example for running behind reverse-proxy
 2018-01-24 22:03:53 +01:00
bergquist
1508755422 cfg: remove local as default image uploader 
ref
2018-01-24 21:31:07 +01:00
Tobias Svehagen
f129754a96 docs: Add haproxy example for running behind reverse-proxy 2018-01-24 20:03:46 +01:00
hannes
43e6ea95e0 Cloudwatch: add support for multi instances () 
* 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
Torkel Ödegaard
889bc29330 ux: minor change, added import dashboard link to dashboard search side view 2018-01-24 15:29:16 +01:00
Leonard Gram
2d090829d8
Merge pull request from xlson/pruned-deps 
tech: adds/removes in vendor folder according to dep 0.4.0.
 2018-01-24 14:04:56 +01:00
Leonard Gram
f6fac03958 tech: adds/removes in vendor folder according to dep 0.4.0. 2018-01-24 14:01:45 +01:00
Marcus Efraimsson
39dd4799f0 docker: sync local time and timezone to mysql_tests block 2018-01-24 11:43:56 +01:00
Marcus Efraimsson
d36fd66dba dashfolder: fix for sqlite test 2018-01-24 11:43:08 +01:00
Marcus Efraimsson
1a5dee3c11
Merge pull request from grafana/mysql_dep_fix 
mysql: pin the mysql dependency
 2018-01-24 11:27:45 +01:00
Daniel Lee
9d2a667e8b dashfolder: fix for mysql test 2018-01-24 11:19:26 +01:00
bergquist
6618bff806 mysql: pin the mysql dependency 2018-01-24 11:07:57 +01:00
bergquist
d7f6f11eb1 tech: ignore /public and /node_modules 2018-01-24 11:01:27 +01:00
bergquist
d36e424fe0 tech: ignore /data folder for dep 2018-01-24 10:50:01 +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
Torkel Ödegaard
dd70710617 refactor: minor css class naming change of 2018-01-23 16:10:04 +01:00
Torkel Ödegaard
12b08b61d7 Merge remote-tracking branch 'origin/graphite-query-editor-enhancements' 2018-01-23 16:02:46 +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 2018-01-23 13:03:44 +01:00
hannes
d82af23f1c cloudwatch: fix ebs_volume_ids by create a client-session before call ec2:DescribeInstances. () 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
Marcus Efraimsson
1ce6a420cb docker: use mysql and postgres from latest fake-data-gen 2018-01-23 10:51:48 +01:00
Carl Bergquist
e24d9a6224
Merge pull request from bkaganyildiz/update-opsgenie-notifier 
Update OpsGenie Notifier to support different api domains.
 2018-01-23 08:57:13 +01:00
bkaganyildiz
97d969bd5c Update OpsGenie Notifier to support different api domains. 2018-01-22 22:27:35 +03:00
Patrick O'Carroll
c611ffa4bc 10583 panel resize icon fix () 
* removed svg, added ::after

* removed unnecessary code
 2018-01-22 16:49:45 +01:00