bergquist
ec452dd704
docs(conf): remove internal options since its not working atm
2016-09-20 08:18:15 +02:00
bergquist
f26824049f
Merge branch 'master' into emails
2016-09-07 11:19:52 +02:00
bergquist
3b6820ef03
feat(oauth): create struct for generic oauth and add config values
2016-09-07 10:34:56 +02:00
Trent White
35b90afdd0
initial styling
2016-08-24 17:41:29 -04:00
bergquist
26c6437846
Merge branch 'master' into alerting
2016-08-22 12:27:08 +02:00
bergquist
92a52ccdf7
docs(conf): add more info about using database.url
2016-08-19 14:48:40 +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
cbe7f8b697
feat(config): add ascii dragon to sample.ini
2016-08-18 14:13:02 +02:00
Torkel Ödegaard
05697d5ecd
Merge branch 'master' into alerting
...
Conflicts:
conf/sample.ini
2016-08-17 10:03:33 +02:00
Torkel Ödegaard
6fae5a3b4e
Merge branch 'v3.1.x'
2016-08-17 10:02:08 +02:00
Torkel Ödegaard
093563ac37
fix(metrics): restored prefix default to prod.grafana..
2016-08-17 10:01:55 +02:00
Torkel Ödegaard
f9b628ad0e
Merge branch 'v3.1.x'
...
Conflicts:
conf/defaults.ini
conf/sample.ini
pkg/metrics/graphite.go
pkg/metrics/graphite_test.go
2016-08-17 09:53:46 +02:00
bergquist
f7a9102523
feat(metrics): improve graphite settings
...
Fixes the broken support for overriding settings with ENV variables.
closes #5769
2016-08-15 09:59:55 +02:00
bergquist
cf6736d480
fix(metrics): add ending dot for graphite prefix
2016-08-15 09:58:32 +02:00
bergquist
ebecc5e5a0
fix(metrics): make metrics cfg backwards compatible
2016-08-15 09:57:49 +02:00
Torkel Ödegaard
2c1b893c55
feat(metrics): minor fix for internal metrics fix PR #5758
2016-08-15 09:57:23 +02:00
bergquist
0524d0c625
fix(metrics): replaces . with _ in instance name
...
closes #5739
2016-08-15 09:57:00 +02:00
bergquist
4d0982a21c
Merge branch 'master' into alerting
2016-08-15 07:58:30 +02:00
bergquist
2fa97427eb
fix(metrics): add ending dot for graphite prefix
2016-08-12 08:06:54 +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
4fd8b2ace4
Merge branch 'master' into alerting
2016-08-10 12:53:41 +02:00
bergquist
03f0bc46a1
fix(metrics): make metrics cfg backwards compatible
2016-08-10 11:15:49 +02:00
Torkel Ödegaard
d49f0569f2
feat(metrics): minor fix for internal metrics fix PR #5758
2016-08-10 08:06:10 +02:00
bergquist
5b57210aeb
fix(metrics): replaces . with _ in instance name
...
closes #5739
2016-08-09 14:06:03 +02:00
Torkel Ödegaard
4fc50742a0
feat(alerting): working on image rendering with alert notifications
2016-07-29 14:55:02 +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
Soulou
e2c5fac9df
Predefine url to let the environment variable overrider do its job
2016-06-28 17:45:55 +02:00
bergquist
690a74c6b7
feat(login): invert naming for dissallow user pass login
2016-06-25 16:30:41 +02:00
Torkel Ödegaard
346ca3fc89
Merge branch 'master' into alerting
2016-06-25 09:56:57 -04:00
bergquist
ef9766eb96
docs(3.1): initial post about whats new in 3.1
2016-06-21 16:29:17 +02: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
26d93d7130
Merge branch 'master' into alerting_definitions
2016-06-08 09:36:50 +02:00
Torkel Ödegaard
1d8fdc09e7
feat(logging): added log format option, #4590
2016-06-08 08:48:46 +02:00
Torkel Ödegaard
7d6cda4916
Merge branch 'master' of github.com:grafana/grafana
2016-06-08 08:10:22 +02:00
Tom Hukins
d1c06a93df
Fix a typo ( #5306 )
2016-06-08 07:27:52 +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
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
1059a35bbc
feat(instrumentation): documented instrumentation options, closes #4696
2016-06-03 18:38:19 +02:00
Torkel Ödegaard
064e474b0a
Merge branch 'metrics_reporting'
2016-06-03 18:06:41 +02:00
Torkel Ödegaard
1a05ae2eaa
feat(instrumentation): more work
2016-06-03 15:06:57 +02:00
bergquist
d0ac258474
Merge branch 'master' into alerting_definitions
2016-06-03 12:22:46 +02:00
Torkel Ödegaard
e2c794ff31
feat(instrumentation): lots of refactoring to support tag based backend, #4696
2016-06-02 21:06:49 +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
minki
05cb6048ae
fixed separate typo
2016-05-23 09:32:18 +09: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
33108df13f
docs(conf): add warning about alerting in conf file
2016-05-10 16:32:20 +02:00
bergquist
35c73902da
Merge branch 'master' into alerting_definitions
2016-05-09 11:34:56 +02:00
Torkel Ödegaard
c6c07599c7
conf(): updated comments in config file, fixes #4933
2016-05-09 09:21:33 +02:00
fg2it
303cd8a5af
[RenderToPng fix] ( #4901 )
...
* removing useless code
* fix various minor typo
* don't silence phantomjs timeout and allow more time
* fix gofmt
2016-05-04 09:07:45 +02:00
bergquist
de7544fabd
fix(alerting): set alertin enabled to false
2016-04-29 15:40:16 +02: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
bergquist
6c8d084664
Merge branch 'ssl-for-mysql' of https://github.com/improbable-io/grafana into improbable-io-ssl-for-mysql
2016-01-07 17:08:31 +01:00
Ed Dawley
ec36e28368
Small typo in comment
2015-12-23 15:15:59 -06:00
Ed Dawley
4da56b65ab
Fixes #2818 . Adds support for mysql backends via unix sockets
2015-12-23 15:06:28 -06:00
Daniel Low
ea566fff24
Add TLS for mysql
...
Use ssl_mode for mysql and add docs
add docs for the new parameters in config
Tolerate ssl_mode without client authentication
Client cert is not necessary for a SSL connection. So we tolerate
failure if client cert is not provided.
Improve error message if missing server_cert_name and mode is not
skip-verify.
2015-12-22 12:42:52 +00: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
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
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
88d27fe649
log(color): disabled console log formating by default
2015-11-09 09:48:02 +01:00
Nick Owens
20b553461b
conf: add syslog logging defaults
2015-11-07 18:35:52 -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
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
woodsaj
852f9bd277
refactor quota settings
2015-09-11 01:47:33 +08:00
woodsaj
9023171940
inital backend suport for quotas. issue #321
...
Conflicts:
conf/defaults.ini
main.go
pkg/services/sqlstore/migrations/migrations.go
2015-09-11 01:01:36 +08:00
Jonathan A. Sternberg
5572588c54
Update docstring for postgres session provider
...
The postgres provider is named postgres and not postgresql. For somebody
configuring the server from the config file example, it is very easy to
write an invalid value into the file and accidentally use the "memory"
provider instead because of a typo.
2015-09-09 14:06:14 -04:00
Torkel Ödegaard
9603dce469
feat(dataproxy): added whitelist setting and feature for data proxies, closes #2626
2015-09-09 17:21:25 +02:00
Rodolphe Quiédeville
668b47cc6e
Add comments on app_mode with possible values
2015-09-04 09:01:06 +02:00
Torkel Ödegaard
d19e101e6b
feat(signup): almost done with new sign up flow, #2353
2015-08-31 11:35:07 +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
74ea266157
add login hint to defaults.ini
2015-08-20 11:20:40 -07:00
Torkel Ödegaard
ca9c11486e
config(github oauth): removed allowed_domains options, closes #1986
2015-08-18 20:19:37 +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
fe41a4e6fa
feat(ldap): began work on org role sync
2015-07-14 14:29:07 +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
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
177acf835c
fixed mysql session example config
2015-06-22 18:47:46 +02:00
Torkel Ödegaard
30db7e64fb
Fixed example redis session config, Fixes #2157
2015-06-13 20:06:53 +02:00
Torkel Ödegaard
bb2d810709
Final work password reset email, Closes #1456
2015-06-08 18:25:04 +02:00
Torkel Ödegaard
95fd34ed14
Merge branch 'emailing'
2015-06-08 17:57:33 +02:00
Torkel Ödegaard
db0c442eaf
Added configuration options for smtp
2015-06-08 17:56:56 +02:00
Torkel Ödegaard
901685bb63
Updated sample config and config docs with example for postgres session provider_config string, #2118
2015-06-05 08:18:37 +02:00
Torkel Ödegaard
eb793f7feb
Initial work on ldap support, #1450
2015-06-04 09:34:42 +02:00
Indrek Juhkam
b55d9350e7
Add github organizations support
2015-05-23 17:06:51 +03:00
Torkel Ödegaard
448a8b8d1c
Major refactorings around searching, moved to seperate package, trying to move stuff out of models package, extend search support searching different types of entities and different types of dashboards, #960
2015-05-13 13:36:24 +02:00
Torkel Ödegaard
1a9f630710
Began work on adding json files to search, #960
2015-05-11 20:04: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
38fc85d619
Final tweaks to auth proxy feature
2015-05-02 12:30:53 +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 Ödegaard
74a8fa61f2
Merged with 2.0 docs and restored some stuff
2015-04-29 10:33:37 +02:00
Garrett Bjerkhoel
7ea579bb71
Add team_ids configuration option
2015-04-28 20:19:48 -07:00
aibou
968b1b4308
Fix and update documents
2015-04-23 17:42:04 +09:00
Jason Harvey
ddaac50a25
Add allow_sign_up override for auth.google/github.
2015-04-16 13:43:18 -08:00
Torkel Ödegaard
e9afd30b47
Updated changelog with, Github OAuth: Now works with Github for Enterprise, thanks @williamjoy
2015-04-15 10:31:56 +02:00
William Wei
d048e39cde
grafana/grafana#1781 add oauth api url as config
2015-04-15 14:03:28 +08:00
Torkel Ödegaard
47a18bba99
Fixed defaults.ini, missing allowed_domains key, #1729
2015-04-13 14:04:52 +02:00
Torkel Ödegaard
8ee7d5c2d5
Deb package is starting to work
2015-04-10 11:05:56 +02:00
Torkel Ödegaard
2020fedfdb
Fixed issue with overriding default config values via command line
2015-04-10 10:58:32 +02:00
Torkel Ödegaard
4c6d7630cd
more work on refining config loading, and packaging
2015-04-09 17:18:04 +02:00
Torkel Ödegaard
d1767144a8
Reworking configuration loading and overriding
2015-04-09 12:16:59 +02:00
Torkel Ödegaard
96ee1c17a3
Worked on new deb & rpm packaging and init.d scripts
2015-04-08 14:10:04 +02:00
Torkel Ödegaard
eb575685aa
OAuth: Specify allowed email address domains for google or and github oauth logins, Closes #1660
2015-04-06 14:16:22 +02:00
Torkel Ödegaard
00fa7f5e86
Removed unusued config, updated sample config with session config
2015-04-02 07:51:16 +02:00
Torkel Ödegaard
4af1dcd54f
Updated defaults.ini, reverted change in previous commit
2015-03-31 17:42:51 +02:00
Torkel Ödegaard
463c519954
Dashlist panel: added fresh panel when changing limit, Fixes #1677
2015-03-31 17:30:27 +02:00
Torkel Ödegaard
b46f8bad6d
Added check for allow_user_org_create, updated admin docs
2015-03-30 10:12:24 +02:00
Torkel Ödegaard
80c771c945
Added googla analytics id setting
2015-03-27 17:13:44 +01:00
Torkel Ödegaard
c01efad997
Updated config (minor description change)
2015-03-27 11:26:20 +01:00
Torkel Ödegaard
165647184d
Updated docs: whats new in 2.0, added sharing reference docs page, #1571
2015-03-26 17:55:07 +01:00
Torkel Ödegaard
5f0e7cd52a
Added custom cache control headers for static content
2015-03-23 18:28:59 -04:00
Torkel Ödegaard
44bc2b2d56
Updated conf description, metrics interval
2015-03-22 16:30:28 -04:00
Torkel Ödegaard
d987532262
Added server metrics
2015-03-22 15:14:00 -04:00
Torkel Ödegaard
17063df3cc
Changed default org name form 'main' to 'Main Org.'
2015-03-12 19:43:52 +01:00
Jason Wilder
13206fbb69
Fix default anonymous org name
2015-03-12 11:51:54 -06:00
Torkel Ödegaard
c1d7bef768
added cert_key and cert_file to defaults.ini
2015-03-11 19:44:31 +01:00
Torkel Ödegaard
477e035f2e
Fixed anonymous access mode, Closes #1586
2015-03-11 17:34:11 +01:00
Torkel Ödegaard
f3d4d2782f
Simplified single org settings, now auto_assign_org, and auto_assign_org_role, new [users] config section, Closes #1585
2015-03-11 16:19:29 +01:00
Torkel Ödegaard
4f03a86414
Began work on configuration docs for Grafana 2.0, #1571
2015-03-11 15:13:52 +01:00
Torkel Ödegaard
7e0f1a57af
Progress on deb and rpm packaging, renamed config files, added file logging, #1476
2015-03-03 10:18:37 +01:00
