Torkel Ödegaard
277a696fa5
fix: added missing ini default keys, fixes #12800 ( #12912 )
2018-08-14 08:49:56 +02:00
Emil Flink
5bea54eaaa
Support client certificates for LDAP servers
2018-08-03 12:00:20 +02:00
gzzo
cb76fc7f2d
Add auto_assign_org_id to defaults.ini
...
For #12801
2018-08-02 12:29:47 -04:00
Jan Garaj
e37e8cb38c
Add missing tls_skip_verify_insecure ( #12748 )
2018-07-30 00:02:16 -07:00
Torkel Ödegaard
913b8576f8
docs: minor docs fix
2018-07-18 13:20:28 +02:00
Torkel Ödegaard
c189262bac
ldap: Make it possible to define Grafana admins via ldap setup, closes #2469
2018-07-16 16:56:42 +02:00
Carl Bergquist
828fb39ee2
Merge pull request #11643 from mrsiano/generic_oauth
...
Pass configured/auth headers to a Datasource.
2018-06-21 14:21:59 +02:00
mrsiano
cc1e3a0e3c
Pass configured/auth headers to a Datasource.
...
In some setups (ex openshift), the Datasource will require Grafana
to pass oauth token as header when sending queries.
Also, this PR allow to send any header which is something
Grafana currently does not support.
2018-06-21 14:58:05 +03:00
Anton Sergeyev
2024cf4b56
#11607 fixed formatting
2018-06-14 12:46:29 +05:00
Anton Sergeyev
516839d7b2
#11607 Cleanup time of temporary files is now configurable
2018-06-14 12:35:22 +05:00
Julien Pivotto
a5e6cb9a02
Fix #9847 Add a generic signout_redirect_url to enable oauth logout
...
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
2018-05-27 14:52:50 +02:00
David Kaltschmidt
1e6e89121c
Settings to enable Explore UI
2018-04-27 11:39:14 +02:00
Mario Trangoni
298ece0a02
conf: fix codespell issues
2018-04-13 20:31:29 +02:00
Daniel Lee
92388f7faf
session: update defaults for ConnMaxLifetime
...
to be the same as the 5.0.3 release defaults
2018-03-20 19:31:01 +01:00
Daniel Lee
1cef373d16
Merge remote-tracking branch 'upstream/master' into update-xorm
2018-03-20 19:21:58 +01:00
DavidLambauer
b90c323e31
Minor format changes
...
Just fixed some minor inconsistencies in the format of the file. There were some configurations uncommented like so:
```
; container_name =
```
and some other like so:
```
;container_name =
```
So there is a need for a small perfection here!
I also removed some unnecessary line breaks, bullying my eyes...
2018-03-18 10:17:48 +01:00
Daniel Lee
9cdd7cb04c
database: expose SetConnMaxLifetime as config setting
...
For MySQL, setting this to be shorter than the wait_timeout MySQL setting
solves the issue with connection errors after the session has timed out for
the connection to the database via xorm.
2018-03-16 01:09:00 +01:00
Laurent Godet
59704ee939
Fix Github OAuth not working with private Organizations ( #11028 )
...
* Fix Github OAuth not working with private organizations
* Update documentation
2018-02-28 13:08:15 +01:00
Daniel Lee
fe49182b9d
snapshots: fixes cleanup of old snapshots
...
Snapshot cleanup did not work due to time.Now syntax error. Added test
for it as well to catch any future errors.
Added error and debug logging so that it is possible to see any errors in the future.
Removed an unused configuration value and deprecated the remove expired snapshots
setting.
2018-02-22 16:12:16 +01:00
bergquist
4dc6074e79
provisioning: dont ignore sample yaml files
...
closes #10963
2018-02-20 08:40:37 +01:00
Scott Brenner
2d03ab1770
Update sample.ini
2018-02-15 10:41:26 -08:00
Scott Brenner
7535cefed9
Update ldap.toml
2018-02-15 10:41:15 -08:00
Scott Brenner
b8b6dc6d6d
Minor typo fix
2018-02-15 10:37:23 -08:00
bergquist
dba087463a
provisioing: always skip sample.yaml files
2018-02-14 11:33:58 +01:00
bergquist
b010e4df93
provisioning: support camelcase for dashboards configs
2018-02-14 10:30:08 +01:00
bergquist
4a35244cb9
provisioning: support camcelCase provisioning files
2018-02-14 10:30:08 +01:00
Scott Brenner
e57c8d0357
Minor typo fix
...
Minor typo fix
2018-02-12 13:59:19 -08:00
bergquist
e93fe9db25
provisioning: update sample config to use path
2018-02-09 15:25:31 +01:00
Leonard Gram
b549d29319
Merge branch 'master' into provisioning
2018-02-08 11:01:09 +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
bergquist
1508755422
cfg: remove local as default image uploader
...
ref #9967
2018-01-24 21:31:07 +01:00
bergquist
67a9e6a71d
provisioing: add lookup table provisioned dashboards
2018-01-23 21:52:55 +01:00
bergquist
5546828b9f
cfg: adds info about local img uploader to docs
2018-01-22 11:11:30 +01:00
Martin Szulecki
c82e23d96e
imguploader: Add support for new internal image store ( #6922 )
2018-01-12 21:40:12 +01:00
Mahmoud Saada
af15e3c0d0
Implement Azure Blob external image uploader
2017-12-27 08:53:00 -05:00
Carl Bergquist
35106537f2
Replace Read Only Editor role with ViewersCanEdit setting ( #10166 )
...
* removes readonly editor role
* adds viewersCanEdit setting
This enable you to allow viewers to edit/inspect
dashboards in grafana in their own browser without
allowing them to save dashboards
* remove read only editor option from all dropdowns
* migrates all read only viewers to viewers
* docs: replace readOnlyEditor with viewersCanEdit
2017-12-13 18:53:42 +01:00
bergquist
5f5cdad97a
improve error handling for datasources as cfg
2017-12-08 10:50:11 +01:00
bergquist
c766802325
improve sample datasource.yaml
2017-12-08 10:28:38 +01:00
bergquist
79d7213e11
fixes issue with datasource/dash as cfg and gitignore
2017-12-08 06:52:47 +01:00
bergquist
5006f9e4c5
dashboards as cfg: update docs to use /provisioning
2017-12-07 15:55:00 +01:00
bergquist
2e610cb256
dashboards as cfg: move dash/ds config files to /provisioning/*
2017-12-07 15:27:01 +01:00
bergquist
361acd3fa1
dashboards as cfg: include cfg files in dist packages
2017-12-07 15:27:01 +01:00
bergquist
2a18345eb2
dashboards as cfg: disable loading dashboards from disk by default
2017-12-07 15:27:01 +01:00
bergquist
d69b63cbc0
dashboards as cfg: read first cfg version
2017-12-07 15:27:01 +01:00
saady
767b460ff1
[GCS] Support for gcs path
2017-11-21 17:22:40 +00:00
Torkel Ödegaard
98b4074c16
refactoring: minor refactor of clean up dashboard history PR #9882
2017-11-17 14:41:44 +01:00
Torkel Ödegaard
aaa465a100
Merge branch 'feat-9671' of https://github.com/alexanderzobnin/grafana into alexanderzobnin-feat-9671
2017-11-17 14:16:49 +01:00
Carl Bergquist
9ea5af578e
Merge pull request #9504 from grafana/datasource_as_cfg
...
Datasources as configuration
2017-11-16 16:13:02 +01:00
bergquist
c60915c146
datasources as cfg: adds docs for all jsondata and secure_json fields
2017-11-16 14:22:52 +01:00
bergquist
87983021e2
datasources as cfg: convert yaml map into json for jsonData
2017-11-16 13:23:42 +01:00
bergquist
bfd8afaf13
docs: update metrics api path
2017-11-16 09:38:37 +01:00
bergquist
6267ef1391
datasource as cfg: fixes typos
2017-11-15 14:30:32 +01:00
bergquist
06a37d0023
datasource as cfg: show deletes first in example
2017-11-15 14:30:32 +01:00
bergquist
ebbfc529e0
datasource as cfg: support globbing
2017-11-15 14:30:32 +01:00
bergquist
0f136a940c
datasource as cfg: enable editable ds's
2017-11-15 14:30:32 +01:00
bergquist
b72cdae563
datasource as cfg: add org_id to example config
2017-11-15 14:30:32 +01:00
bergquist
dc002abe4c
datasource as cfg: test for reading all properties
2017-11-15 14:30:32 +01:00
bergquist
c9bfa781fd
datasource as cfg: improve name for this feature
2017-11-15 14:30:32 +01:00
bergquist
ba4bbd1d47
datasource as cfg: refactor tests to use yaml files
2017-11-15 14:30:32 +01:00
bergquist
0f29b8ac83
datasources as cfg: tests for insert/updating datasources
2017-11-15 14:30:32 +01:00
bergquist
39b6c04643
datasource as cfg: basic implementation
2017-11-15 14:30:32 +01:00
Alexander Zobnin
a0a1f4aacd
dashboard history: refactor after review
2017-11-15 13:36:36 +03:00
Alexander Zobnin
08e2bbef83
dashboard history: clean up dashboard version history
2017-11-14 18:22:18 +03:00
Furtchet
a51b1e8951
Update the config key to database_log_queries so it is more descriptive, as suggested in #9785 .
2017-11-06 08:01:31 -06:00
Furtchet
5fdfa3ff7e
MySQL Performance when using GF_DATABASE_URL
...
Set MaxIdleConn and MaxOpenConn when using the GF_DATABASE_URL configuration. Also added GF_DATABASE_DEBUG flag to print SQL statements and SQL execution times.
See #9784 for the details.
2017-11-03 14:05:32 -05:00
bergquist
dea631bedc
tech: remove rabbitmq event publisher
...
closes #9645
2017-10-24 14:10:23 +02:00
Ricard Clau
e4541a7fd1
support for s3 path ( #9151 )
2017-10-04 21:04:20 +02:00
Torkel Ödegaard
eaefa3c1fa
s3: minor fix for PR #9223
2017-09-27 09:43:32 +02:00
Torkel Ödegaard
50d82155ed
Merge branch 'master' of https://github.com/williamjoy/grafana into williamjoy-master
2017-09-27 09:37:26 +02:00
Tobias Hintze
af79d046db
introduce smtp config option for EHLO identity
2017-09-24 20:48:20 +02:00
William
88a8991722
config bucket and region for s3 uploader
...
this is to support cn-north-1 region as it can get s3 url programatically.
also keeps support 'bucket_url' for backward compatiblity
2017-09-19 04:57:25 -04:00
bergquist
bcf784375b
make it possible to configure sampler type
2017-09-18 11:08:58 +02:00
bergquist
f37a595f68
make samplerconfig.param configurable
2017-09-18 11:08:58 +02:00
bergquist
ec29b469e4
adds custom tags from settings
2017-09-18 11:08:58 +02:00
bergquist
935dad653c
set example port to zipkin default
2017-09-18 11:08:58 +02:00
bergquist
a234e894bb
makes jaeger tracing configurable
2017-09-18 11:08:58 +02:00
Konstantin Chukhlomin
fcdf282090
GCS support via JSON API
2017-09-15 16:11:02 +02:00
Konstantin Chukhlomin
72d7c4d620
Added GCS support #8370
2017-09-15 16:11:02 +02:00
Torkel Ödegaard
a47b31ac62
fix: MySQL/Postgress max_idle_conn default was wrongly set to zero, which does not mean unlimited but zero, which in practice disables connection pooling, not good. now max idle conn is set to golang's default which is 2, fixes #8513
2017-08-08 16:17:52 +02:00
Torkel Ödegaard
06e87c151f
feat: added settings to sample ini #8768
2017-07-31 15:04:47 +02:00
Torkel Ödegaard
23558c61d4
feat: wip work on #8768
2017-07-31 13:03:42 +02:00
Torkel Ödegaard
f5ed5c6529
settings(change): changed default value for allow sign up to false, closes #8743 , and changed default option allow_org_create to false
2017-07-24 12:36:42 +02:00
Torkel Ödegaard
9ff4ab1236
Merge branch 'master' into query_troubleshooting
2017-06-13 16:47:04 -04:00
Torkel Ödegaard
c34db77f04
grafana_com: changed name of oauth grafana_net integration (old settings names still work), and updated login button look, closes #8415
2017-05-22 14:56:50 +02:00
Torkel Ödegaard
78dbb4dc13
config: removed trace level from config comment
2017-05-18 14:19:39 +02:00
Mitja Z
c92d719a72
added support for listening on unix socket #4030 ( #8221 )
2017-04-27 08:54:21 +02:00
fir4
6d9e8bd147
webdav: allow specification of a different public_url than upload url
2017-04-25 17:22:18 +02:00
Calle Pettersson
a79102b42d
Fix ldap ca_cert example/docs for proper syntax ( #8044 )
2017-04-06 09:53:11 +02:00
timolehto
6e304e6e42
comments: Typos in defaults.ini ( #7988 )
2017-03-30 17:12:00 +02:00
Seuf
319b8d8fca
Configurable signout menu activation ( #7968 )
2017-03-29 11:33:28 +02:00
Dan Cech
dde8583db8
xorm engine.SetMaxConns is a deprecated alias for engine.SetMaxOpenConns
2017-03-27 18:04:03 -04:00
Torkel Ödegaard
4d4e165be7
links: updated links from grafana.net to grafana.com
2017-03-20 10:20:32 +01:00
Daniel Lee
6dfdcd7ca5
email: change default from name to Grafana
...
Changes default from name in smtp settings
from Grafana Admin to Grafana.
Fix for integration test (which is skipped but that
did not work)
2017-02-15 11:02:46 +01:00
Jacob Bednarz
7520b4f404
Update default configuration to include from_name values
2017-02-15 08:06:58 +11:00
bergquist
5b7b3fef64
conf: adds sample values for db conn settings
2017-02-10 15:30:01 +01:00
huydx
28d93b574d
(feat) support max connection setting for database configuration
2017-02-10 15:30:01 +01:00
Torkel Ödegaard
2a09d4a5a6
fix(): conf file had left over of old config key, #7395
2017-01-30 07:11:12 +01:00
Torkel Ödegaard
e073d20731
updated sample config
2017-01-25 13:34:02 +01:00
Torkel Ödegaard
40d39f8a3e
refactor(): renaming alerting hide ui option, #7318
2017-01-25 13:32:26 +01:00
Torkel Ödegaard
fee4846429
Merge branch 'alerting_ui' of https://github.com/smalik03/grafana into smalik03-alerting_ui
2017-01-25 13:16:48 +01:00
