root
/
grafana
mirror of https://github.com/grafana/grafana.git
1
0
Fork 0
Code Issues Actions 170 Packages Projects Releases Wiki Activity
9,511 Commits 1,414 Branches 627 Tags 2.6 GiB
Commit Graph

148 Commits

Author SHA1 Message Date
Torkel Ödegaard 6e27db148c Merge branch 'authproxy_ldap' of https://github.com/seuf/grafana into seuf-authproxy_ldap 2016-12-14 21:45:15 +01:00
Seuf ae27c17c68 Auth Proxy improvements 
- adds the option to use ldap groups for authorization in combination with an auth proxy
- adds an option to limit where auth proxy requests come from by configure a list of ip's
- fixes a security issue, session could be reused
 2016-12-12 09:43:17 +01:00
Torkel Ödegaard 88e1d56bc2 fix(logging): added extra logging when default config file is not found (ie homepath is not correct), fixes #6829 2016-12-06 07:36:10 +01:00
bergquist ab2f109443 fix(config): error message for broken config file 
closes #6731
 2016-11-28 17:55:18 +01:00
Torkel Ödegaard ea5cb0d076 fix(server side rendering): Fixed address used when rendering panel via phantomjs and using non default http_addr config, fixes #6660 2016-11-23 15:35:43 +01:00
bergquist 5dea0fda51 fix(settings): remove nil pointer exception 2016-11-18 16:43:14 +01:00
Carl Bergquist 7bdedff89c feat(plugins): make sure windows data plugin path is absolute (#6264) 2016-10-13 15:36:35 +02:00
bergquist 04f417a423 feat(alerting): enabled by default. configurable elert engine 
closes #6210
 2016-10-10 13:09:16 +02:00
Eric Perrino d3b0905899 Added allow_sign_up setting to auth.ldap to be able to disable automatic user creation for LDAP logins (#6191) 2016-10-07 08:49:58 +02:00
Torkel Ödegaard 5f5bbfbda5 Merge branch 'master' of github.com:grafana/grafana 2016-09-28 21:12:37 +02:00
Torkel Ödegaard c28d004731 Merge branch 'go_routines' 2016-09-28 21:06:07 +02:00
Torkel Ödegaard 71e2c6f6ef refactor(backend): refactoring management of go routines in backend 2016-09-28 21:06:00 +02:00
Dan Cech 6d7061dcaf fix typo in config loader 2016-09-28 13:10:31 -04:00
Torkel Ödegaard 2750c8a801 feat(config): changed name of allow_user_login_pass to disable_login_form, changed the section of the config option to [auth], impacts merged PR #5423 2016-09-28 15:27:08 +02:00
bergquist dbb7852f21 feat: purge old files and snapshots 
closes #4087
closes #2172
 2016-09-26 14:33:40 +02:00
Torkel Ödegaard 23de094a81 feat(alerting/annotations): fixed broken test 2016-09-08 13:22:30 +02:00
paulroche 5ba6bab237 redact provider_config (#5915) 2016-08-27 09:50:35 +02:00
bergquist 26c6437846 Merge branch 'master' into alerting 2016-08-22 12:27:08 +02:00
bergquist c663e32ea8 Merge branch 'database_url' of https://github.com/Scalingo/grafana into Scalingo-database_url 2016-08-19 13:15:44 +02:00
bergquist 99e99922b4 feat(alerting): add support for uploading images to webdav. 
closes #5770
 2016-08-11 16:48:54 +02:00
Torkel Ödegaard 2b276d5cd1 feat(alerting): working on alert notification and image rendering 2016-07-30 13:36:21 +02:00
Torkel Ödegaard d9096110f8 Merge branch 'master' into alerting 
Conflicts:
	pkg/api/dashboard.go
	pkg/models/dashboards.go
	pkg/services/sqlstore/dashboard.go
 2016-07-11 18:28:07 +02:00
Andris Raugulis 1c293781e3 Log to default log directory, only if custom configuration failed. (#5393) 2016-06-30 16:37:06 -07:00
Soulou aa064b18e8 Test environment override for secret and url with credentials 2016-06-29 13:49:41 +02:00
bergquist 690a74c6b7 feat(login): invert naming for dissallow user pass login 2016-06-25 16:30:41 +02:00
Kevin Fitzpatrick 040586604b Allow configuration to disable the username and password login interface. 
Used for when admins only want users to login via OAuth.
 2016-06-23 10:09:13 -07:00
bergquist 8ec311ade4 Merge branch 'master' into alerting 2016-06-16 16:29:41 +02:00
Torkel Ödegaard ec0b09450c Merge branch 'export-dashboard' 
Conflicts:
	conf/defaults.ini
	pkg/setting/setting.go
	public/app/core/components/grafana_app.ts
	public/app/core/core.ts
	public/app/features/dashboard/dashboardCtrl.js
 2016-06-16 08:06:43 +02:00
Torkel Ödegaard 0667d73660 Merge branch 'new-logger' into alerting_definitions 
Conflicts:
	pkg/api/api.go
	pkg/setting/setting.go
 2016-06-07 13:31:56 +02:00
Torkel Ödegaard a02cf5beb7 feat(logging): added loging filters 2016-06-07 12:11:41 +02:00
Torkel Ödegaard 9741af2031 feat(logging): progress on new logging #4590 2016-06-07 09:29:47 +02:00
Torkel Ödegaard 22778e6efd feat(logging): a lot of progress on moving to new logging lib, #4590 2016-06-06 23:06:44 +02:00
Torkel Ödegaard f36a44c49a Merge branch 'master' into alerting_definitions 
Conflicts:
	conf/defaults.ini
	pkg/api/dashboard.go
 2016-06-06 08:43:01 +02:00
Torkel Ödegaard 6b2a4fe8e8 feat(instrumentation): work on settings model for internal metrics publishing, #4696 2016-06-02 14:32:17 +02:00
Torkel Ödegaard 540def2c39 feat(import): working on unit tests for import ctrl 2016-05-27 13:52:19 +02:00
bergquist ef4f5147be Merge branch 'master' into alerting_definitions 2016-05-19 08:05:35 +02:00
Torkel Ödegaard b6dcf6bd02 Merge branch 'v3.0.x' 2016-05-18 14:23:59 +02:00
Torkel Ödegaard d474eba53a fix(logging): fixed reading config level from config file, fixes #5079 2016-05-18 14:18:08 +02:00
Torkel Ödegaard 495404ef73 Merge branch 'master' into alerting_definitions 2016-05-16 14:12:56 +02:00
Anton Chevychalov c6744925c4 Add new parameter to config: default_theme. 2016-05-12 18:21:11 +03:00
bergquist 6d66d9f42d feat(alerting): adds fearture toogle for alerting 2016-04-29 14:35:58 +02:00
Torkel Ödegaard b4a8c227cc feat(update checks): started work on update checks 2016-04-11 12:21:48 -04:00
Tom Dyas d557beb5f1 redact settings containing 'secret' besides 'password' 
Ensure that settings with the word 'secret' in the name are redacted just
as ones with 'password' in the name are. For example, the Google Auth
client secret should be redacted now.
 2016-03-01 13:50:45 -05:00
Robert McLeod 4c3048964d removed unused import: errors 2016-02-19 16:09:40 +13:00
Robert McLeod cacf14a41e Fixed bug that wasn't showing the StaticRootPath when validation failed 2016-02-19 16:00:51 +13:00
bergquist 4fe72ebf69 feat(macaron): upgrades macaron version 2016-01-13 15:11:23 +01:00
Carl Bergquist 333f9101a0 Merge pull request #3458 from improbable-io/use-memcache-for-session 
Add memcache as session provider
 2015-12-17 15:56:15 +01:00
Torkel Ödegaard f83d5f4280 cleanup(influxdb_08): removed influxdb 0.8 data source as an built in official data source, moved it to an external plugin repo, https://github.com/grafana/datasource-plugin-influxdb-08, closes #3523 2015-12-15 11:21:00 +01:00
Torkel Ödegaard 2ec5bc77d7 Merge branch 'external-plugins' 2015-12-15 10:10:48 +01:00
Carl Bergquist 280f9befae Merge pull request #2949 from shoonoise/master 
Add option to hide raintank share button

Fixes #2727
 2015-12-14 17:29:09 +01:00