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
Torkel Ödegaard
201f50b121
Merge branch 'master' into external-plugins
...
Conflicts:
pkg/api/login.go
public/app/core/routes/all.js
public/app/core/table_model.ts
public/app/panels/table/table_model.ts
public/app/plugins/panels/table/editor.ts
public/app/plugins/panels/table/table_model.ts
2015-12-14 17:28:57 +01:00
carl bergquist
fab1062c0b
Merge branch 'ldap_login_hints' of https://github.com/tmonk42/grafana into tmonk42-ldap_login_hints
...
Conflicts:
conf/defaults.ini
pkg/setting/setting.go
closes #2571
closes #2494
2015-12-11 15:16:57 +01:00
Carl Bergquist
225e7a6a32
Merge pull request #3161 from mischief/syslog
...
syslog support closes #3160
2015-12-11 14:03:21 +01:00
Daniel Low
ed16914715
Add memcache as session provider
2015-12-08 13:35:09 +00:00
Torkel Ödegaard
67dc761344
fix(security): do not print ENV config values when they are passwords, fixes #3337
2015-12-04 10:38:27 +01:00
Torkel Ödegaard
65a7fa320a
feat(plugins): made plugins that live outside public work
2015-11-19 16:50:17 +01:00
Nick Owens
60e797ccc4
pkg/setting: integrate syslog logger settings
2015-11-07 18:35:57 -08:00
shoonoise
b4a2b96e32
Add options to manage snapshot publishing
2015-10-29 16:40:03 +03:00
ctdk
d37e18fdcf
Add config option to strip (most) colors from console logs
2015-10-01 13:16:23 -07:00
Torkel Ödegaard
6a30511fc4
Merge branch 'quotas' of https://github.com/raintank/grafana into raintank-quotas
2015-09-15 14:23:13 +02:00
Torkel Ödegaard
64973f1d57
fix(settings): another attempt at fixing, #2736
2015-09-14 15:54:35 +02:00
Torkel Ödegaard
d7bfb727b0
fix(settings): reverted prev settings fix for detecting public_gen folder in dev, caused issue for prod build
2015-09-14 13:42:23 +02:00
Torkel Ödegaard
d17f8538b2
fix(backend): made public_gen detection more bullet proof, #2731
2015-09-13 15:23:23 +02:00
Torkel Ödegaard
8174b9f041
fix(tests): fixed failling backend test
2015-09-11 08:58:45 +02:00
Torkel Ödegaard
286b4c0e46
Merge branch 'typescript'
2015-09-11 08:01:11 +02:00
woodsaj
852f9bd277
refactor quota settings
2015-09-11 01:47:33 +08:00
Torkel Ödegaard
0b5f40e66c
tech(): made config system check for generated css or javascript files and panic if there are none, also if there is a public_gen directory it will use that, even if static root is set to public
2015-09-10 13:34:32 +02:00
Torkel Ödegaard
9603dce469
feat(dataproxy): added whitelist setting and feature for data proxies, closes #2626
2015-09-09 17:21:25 +02:00
Mat Schaffer
6c04ee1abd
Iterate over the right env override list variable
2015-09-01 11:11:54 +09:00
Torkel Ödegaard
d19e101e6b
feat(signup): almost done with new sign up flow, #2353
2015-08-31 11:35:07 +02:00
Torkel Ödegaard
d25624a8ad
feat(signup): began work on new / alternate signup flow that includes email verification, #2353
2015-08-27 13:59:58 +02:00
Torkel Ödegaard
3d37c9c9a3
feat(tagmanager): support to add google tagmanager id, closes #2569
2015-08-21 09:30:39 +02:00
Haneysmith, Nathan
235bbc9c7e
custom login hints via config file
2015-08-20 11:15:36 -07:00
woodsaj
c138f390ac
close all existing loggers before re-initilizing loggers. fixes #2533
2015-08-17 15:59:40 +08:00
Brandon Turner
1e2e65b40d
Allow default org role to be Read Only Editor
2015-08-05 23:04:47 -05:00
Dieter Plaetinck
0f7a77f45b
fix unknown key error formatting
2015-07-24 12:29:03 +02:00
Torkel Ödegaard
0b5ba55131
feat(ldap): work on reading ldap config from toml file, #1450
2015-07-15 10:08:23 +02:00
Torkel Ödegaard
a7b1df34c5
feat(ldap): more unit tests for ldap to grafana user sync
2015-07-14 10:20:30 +02:00
Torkel Ödegaard
bfe7b77313
More work on ldap auth, got memberOf working in the docker ldap test server, playing with config options and structures, #1450
2015-07-13 14:23:59 +02:00
Torkel Ödegaard
db1847bc1d
More work on ldap, gotten ldap search (read attributes) to work
2015-07-10 15:29:34 +02:00
Torkel Ödegaard
0ef7271326
Started work on LDAP again, #1450
2015-07-10 11:10:48 +02:00
Torkel Ödegaard
aedaae852b
Fixed minor mistake in last commit
2015-06-30 12:14:13 +02:00
Torkel Ödegaard
ae0f8c77d1
Auth: You can now authenicate against api with username / password using basic auth, Closes #2218
2015-06-30 09:37:52 +02:00
Torkel Ödegaard
5962bcbc6c
Do not show create org link when allow_org_create is set to false, Fixes #2135
2015-06-11 08:16:09 +02:00
Torkel Ödegaard
db0c442eaf
Added configuration options for smtp
2015-06-08 17:56:56 +02:00
Torkel Ödegaard
89418a155a
More work on email and notification infra #1456
2015-06-05 11:08:19 +02:00
Torkel Ödegaard
3706d0dedd
More work on email and notification infra #1456
2015-06-04 17:23:46 +02:00
Torkel Ödegaard
3f5ab189cd
Began work on emailing service #1456
2015-06-04 14:29:39 +02:00
Torkel Ödegaard
eb793f7feb
Initial work on ldap support, #1450
2015-06-04 09:34:42 +02:00
Torkel Ödegaard
85c3a0aa14
Panel menu now hides edit actions for users with role Viewer, Closes #1826
2015-06-01 16:36:15 +02:00
Torkel Ödegaard
1c9993f185
Backend configuration: When unknown key was detected the log error was not visible in log file due to logging was initialized after user config file is loaded, logging is now initialized twice, once based on defaults and command line arguments, then then again after user config file, Fixes #1992
2015-05-14 10:15:46 +02:00
Torkel Ödegaard
a40299b4dc
Progress on json file index and search #960
2015-05-12 12:20:03 +02:00
Torkel Ödegaard
34539c0c13
Enforce domain, host header validation against domain setting, Refactoring of PR #1866 , Closes #1732
2015-05-05 11:21:06 +02:00
Torkel Ödegaard
f416e2d1ac
More middleware unit test, starting to look really good
2015-05-01 22:26:16 +02:00
Torkel Ödegaard
cb8110cd48
Refactoring, worked on middleware unit tests, and began thinking about api unit tests, #1921
2015-05-01 16:23:36 +02:00
Torkel Ödegaard
d1e9b6d6ae
Began work on auth_proxy feature ( #1932 ), and began work on testing http api, and auth middleware
2015-05-01 11:55:59 +02:00
Torkel Ödegaard
5de9230924
Security: New config option to disable the use of gravatar for profile images, Closes #1891
2015-05-01 08:40:13 +02:00
Torkel Odegaard
1edb13d715
Fixed gofmt formating
2015-04-19 09:29:08 +02:00
Torkel Odegaard
7178dcad35
Windows: Fixed runtime issue with file logging config that casued errors on startup
2015-04-19 09:14:50 +02:00
Torkel Ödegaard
6de584aafc
Updated to config file finding, and added homepath command line option
2015-04-12 09:15:49 +02:00
Torkel Ödegaard
d32c03ed11
Rpm working again, systemd working on centos 7
2015-04-10 16:20:01 +02:00
