Torkel Ödegaard
5ccdbf01fd
merge with master
2016-09-28 13:02:15 +02:00
bergquist
dbb7852f21
feat: purge old files and snapshots
...
closes #4087
closes #2172
2016-09-26 14:33:40 +02:00
Dan Cech
fc17ed351c
support logging in with grafana.net credentials
2016-09-19 16:48:07 -04:00
Torkel Ödegaard
23de094a81
feat(alerting/annotations): fixed broken test
2016-09-08 13:22:30 +02:00
bergquist
4646723cbb
Merge branch 'custom-github-style-oauth' of https://github.com/kfitzpatrick/grafana into kfitzpatrick-custom-github-style-oauth
2016-09-07 08:15:44 +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
Kevin Fitzpatrick
b4646b6c3a
Allow users to use a generic oauth that conforms to the github style.
...
Enables users to set their own link text.
2016-06-30 15:07:55 -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
