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
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
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
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
Anton Chevychalov
c6744925c4
Add new parameter to config: default_theme.
2016-05-12 18:21:11 +03: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
woodsaj
86ed85aa6e
move toMap function to be a method on the quota structs
2015-09-15 17:18:26 +08: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
woodsaj
6488324cf1
enhance quota support.
...
now includes:
- perOrg (users, dashboards, datasources, api_keys)
- perUser (orgs)
- global (users, orgs, dashboards, datasources, api_keys, sessions)
2015-09-11 23:17:10 +08: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
2fa9311eee
Progress on ldap support, #1450
2015-07-13 16:45:47 +02:00
Torkel Ödegaard
14f439f8ba
refactor(ldap): refactoring ldap code, #1450
2015-07-13 15:37:25 +02:00
