bergquist
5546828b9f
cfg: adds info about local img uploader to docs
2018-01-22 11:11:30 +01:00
Martin Szulecki
c82e23d96e
imguploader: Add support for new internal image store ( #6922 )
2018-01-12 21:40:12 +01:00
Mahmoud Saada
af15e3c0d0
Implement Azure Blob external image uploader
2017-12-27 08:53:00 -05:00
Carl Bergquist
35106537f2
Replace Read Only Editor role with ViewersCanEdit setting ( #10166 )
...
* removes readonly editor role
* adds viewersCanEdit setting
This enable you to allow viewers to edit/inspect
dashboards in grafana in their own browser without
allowing them to save dashboards
* remove read only editor option from all dropdowns
* migrates all read only viewers to viewers
* docs: replace readOnlyEditor with viewersCanEdit
2017-12-13 18:53:42 +01:00
bergquist
5f5cdad97a
improve error handling for datasources as cfg
2017-12-08 10:50:11 +01:00
bergquist
c766802325
improve sample datasource.yaml
2017-12-08 10:28:38 +01:00
bergquist
79d7213e11
fixes issue with datasource/dash as cfg and gitignore
2017-12-08 06:52:47 +01:00
bergquist
5006f9e4c5
dashboards as cfg: update docs to use /provisioning
2017-12-07 15:55:00 +01:00
bergquist
2e610cb256
dashboards as cfg: move dash/ds config files to /provisioning/*
2017-12-07 15:27:01 +01:00
bergquist
361acd3fa1
dashboards as cfg: include cfg files in dist packages
2017-12-07 15:27:01 +01:00
bergquist
2a18345eb2
dashboards as cfg: disable loading dashboards from disk by default
2017-12-07 15:27:01 +01:00
bergquist
d69b63cbc0
dashboards as cfg: read first cfg version
2017-12-07 15:27:01 +01:00
saady
767b460ff1
[GCS] Support for gcs path
2017-11-21 17:22:40 +00:00
Torkel Ödegaard
98b4074c16
refactoring: minor refactor of clean up dashboard history PR #9882
2017-11-17 14:41:44 +01:00
Torkel Ödegaard
aaa465a100
Merge branch 'feat-9671' of https://github.com/alexanderzobnin/grafana into alexanderzobnin-feat-9671
2017-11-17 14:16:49 +01:00
Carl Bergquist
9ea5af578e
Merge pull request #9504 from grafana/datasource_as_cfg
...
Datasources as configuration
2017-11-16 16:13:02 +01:00
bergquist
c60915c146
datasources as cfg: adds docs for all jsondata and secure_json fields
2017-11-16 14:22:52 +01:00
bergquist
87983021e2
datasources as cfg: convert yaml map into json for jsonData
2017-11-16 13:23:42 +01:00
bergquist
bfd8afaf13
docs: update metrics api path
2017-11-16 09:38:37 +01:00
bergquist
6267ef1391
datasource as cfg: fixes typos
2017-11-15 14:30:32 +01:00
bergquist
06a37d0023
datasource as cfg: show deletes first in example
2017-11-15 14:30:32 +01:00
bergquist
ebbfc529e0
datasource as cfg: support globbing
2017-11-15 14:30:32 +01:00
bergquist
0f136a940c
datasource as cfg: enable editable ds's
2017-11-15 14:30:32 +01:00
bergquist
b72cdae563
datasource as cfg: add org_id to example config
2017-11-15 14:30:32 +01:00
bergquist
dc002abe4c
datasource as cfg: test for reading all properties
2017-11-15 14:30:32 +01:00
bergquist
c9bfa781fd
datasource as cfg: improve name for this feature
2017-11-15 14:30:32 +01:00
bergquist
ba4bbd1d47
datasource as cfg: refactor tests to use yaml files
2017-11-15 14:30:32 +01:00
bergquist
0f29b8ac83
datasources as cfg: tests for insert/updating datasources
2017-11-15 14:30:32 +01:00
bergquist
39b6c04643
datasource as cfg: basic implementation
2017-11-15 14:30:32 +01:00
Alexander Zobnin
a0a1f4aacd
dashboard history: refactor after review
2017-11-15 13:36:36 +03:00
Alexander Zobnin
08e2bbef83
dashboard history: clean up dashboard version history
2017-11-14 18:22:18 +03:00
Furtchet
a51b1e8951
Update the config key to database_log_queries so it is more descriptive, as suggested in #9785 .
2017-11-06 08:01:31 -06:00
Furtchet
5fdfa3ff7e
MySQL Performance when using GF_DATABASE_URL
...
Set MaxIdleConn and MaxOpenConn when using the GF_DATABASE_URL configuration. Also added GF_DATABASE_DEBUG flag to print SQL statements and SQL execution times.
See #9784 for the details.
2017-11-03 14:05:32 -05:00
bergquist
dea631bedc
tech: remove rabbitmq event publisher
...
closes #9645
2017-10-24 14:10:23 +02:00
Ricard Clau
e4541a7fd1
support for s3 path ( #9151 )
2017-10-04 21:04:20 +02:00
Torkel Ödegaard
eaefa3c1fa
s3: minor fix for PR #9223
2017-09-27 09:43:32 +02:00
Torkel Ödegaard
50d82155ed
Merge branch 'master' of https://github.com/williamjoy/grafana into williamjoy-master
2017-09-27 09:37:26 +02:00
Tobias Hintze
af79d046db
introduce smtp config option for EHLO identity
2017-09-24 20:48:20 +02:00
William
88a8991722
config bucket and region for s3 uploader
...
this is to support cn-north-1 region as it can get s3 url programatically.
also keeps support 'bucket_url' for backward compatiblity
2017-09-19 04:57:25 -04:00
bergquist
bcf784375b
make it possible to configure sampler type
2017-09-18 11:08:58 +02:00
bergquist
f37a595f68
make samplerconfig.param configurable
2017-09-18 11:08:58 +02:00
bergquist
ec29b469e4
adds custom tags from settings
2017-09-18 11:08:58 +02:00
bergquist
935dad653c
set example port to zipkin default
2017-09-18 11:08:58 +02:00
bergquist
a234e894bb
makes jaeger tracing configurable
2017-09-18 11:08:58 +02:00
Konstantin Chukhlomin
fcdf282090
GCS support via JSON API
2017-09-15 16:11:02 +02:00
Konstantin Chukhlomin
72d7c4d620
Added GCS support #8370
2017-09-15 16:11:02 +02:00
Torkel Ödegaard
a47b31ac62
fix: MySQL/Postgress max_idle_conn default was wrongly set to zero, which does not mean unlimited but zero, which in practice disables connection pooling, not good. now max idle conn is set to golang's default which is 2, fixes #8513
2017-08-08 16:17:52 +02:00
Torkel Ödegaard
06e87c151f
feat: added settings to sample ini #8768
2017-07-31 15:04:47 +02:00
Torkel Ödegaard
23558c61d4
feat: wip work on #8768
2017-07-31 13:03:42 +02:00
Torkel Ödegaard
f5ed5c6529
settings(change): changed default value for allow sign up to false, closes #8743 , and changed default option allow_org_create to false
2017-07-24 12:36:42 +02:00
Torkel Ödegaard
9ff4ab1236
Merge branch 'master' into query_troubleshooting
2017-06-13 16:47:04 -04:00
Torkel Ödegaard
c34db77f04
grafana_com: changed name of oauth grafana_net integration (old settings names still work), and updated login button look, closes #8415
2017-05-22 14:56:50 +02:00
Torkel Ödegaard
78dbb4dc13
config: removed trace level from config comment
2017-05-18 14:19:39 +02:00
Mitja Z
c92d719a72
added support for listening on unix socket #4030 ( #8221 )
2017-04-27 08:54:21 +02:00
fir4
6d9e8bd147
webdav: allow specification of a different public_url than upload url
2017-04-25 17:22:18 +02:00
Calle Pettersson
a79102b42d
Fix ldap ca_cert example/docs for proper syntax ( #8044 )
2017-04-06 09:53:11 +02:00
timolehto
6e304e6e42
comments: Typos in defaults.ini ( #7988 )
2017-03-30 17:12:00 +02:00
Seuf
319b8d8fca
Configurable signout menu activation ( #7968 )
2017-03-29 11:33:28 +02:00
Dan Cech
dde8583db8
xorm engine.SetMaxConns is a deprecated alias for engine.SetMaxOpenConns
2017-03-27 18:04:03 -04:00
Torkel Ödegaard
4d4e165be7
links: updated links from grafana.net to grafana.com
2017-03-20 10:20:32 +01:00
Daniel Lee
6dfdcd7ca5
email: change default from name to Grafana
...
Changes default from name in smtp settings
from Grafana Admin to Grafana.
Fix for integration test (which is skipped but that
did not work)
2017-02-15 11:02:46 +01:00
Jacob Bednarz
7520b4f404
Update default configuration to include from_name values
2017-02-15 08:06:58 +11:00
bergquist
5b7b3fef64
conf: adds sample values for db conn settings
2017-02-10 15:30:01 +01:00
huydx
28d93b574d
(feat) support max connection setting for database configuration
2017-02-10 15:30:01 +01:00
Torkel Ödegaard
2a09d4a5a6
fix(): conf file had left over of old config key, #7395
2017-01-30 07:11:12 +01:00
Torkel Ödegaard
e073d20731
updated sample config
2017-01-25 13:34:02 +01:00
Torkel Ödegaard
40d39f8a3e
refactor(): renaming alerting hide ui option, #7318
2017-01-25 13:32:26 +01:00
Torkel Ödegaard
fee4846429
Merge branch 'alerting_ui' of https://github.com/smalik03/grafana into smalik03-alerting_ui
2017-01-25 13:16:48 +01:00
smalik
9862c9ff40
feat(alerting): Show/hide alerting UI using configuration variable
...
Use configuration variable "show_alerting_ui" to show/hide alerting UI
2017-01-20 10:43:29 -05:00
bergquist
06440ef57b
tech(dataproxy): moves cfg to [dataproxy]
2017-01-16 12:43:59 +01:00
bergquist
839eb97061
Merge branch 'feature/dataProxyAuditLog' of https://github.com/Ricky-N/grafana into Ricky-N-feature/dataProxyAuditLog
2017-01-16 12:02:43 +01:00
bergquist
eb8d1dfa34
docs(smtp): adds info about how to use passwords with #
...
closes #7265
2017-01-16 07:03:35 +01:00
Ricky Niemi
269d16301a
Rename to audit logging to data proxy logging
2017-01-11 07:40:06 -08:00
Ricky Niemi
0fee7c863a
Gate data proxy audit logging behind audit_logging server setting
2017-01-11 07:22:57 -08:00
bergquist
c18741c605
docs(ldap): adds note about special chars in password
...
closes #5337
2016-12-21 22:02:34 +01:00
Torkel Ödegaard
597ebb1161
fix(config): fixed issue setting generic oauth name via ENV variable, fixes #6974
2016-12-15 14:08:39 +01:00
Torkel Ödegaard
df562e23cf
feat(ldap): better ldap logging, closes #6918
2016-12-14 22:01:02 +01:00
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
Torkel Ödegaard
80d88d302c
fix(config): changed default for oauth and allow_sign_up setting, #6928
2016-12-12 16:35:42 +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
bergquist
464553a453
docs: explains how to use comment chars in passwords
2016-12-06 09:48:56 +01:00
Carl Bergquist
fbf2113904
Merge pull request #6795 from hvnsweeting/patch-1
...
Use space to separate multiple modes
2016-12-03 03:15:31 +01:00
Viet Hung Nguyen
c6e66ec15e
Update sample.ini
...
Use space to separate multiple modes
2016-12-02 13:48:08 +07:00
Viet Hung Nguyen
b00fc73242
Use space to separate multiple modes
2016-12-02 13:46:41 +07:00
bergquist
a51de8e987
tech(conf): remove dragoo :(
2016-11-10 16:15:55 +01:00
Eric Uldall
658fc1a67a
added hosted domain suppport to google oauth login ( #6372 )
2016-10-28 12:00:47 +02:00
bergquist
04f417a423
feat(alerting): enabled by default. configurable elert engine
...
closes #6210
2016-10-10 13:09:16 +02:00
bergquist
a3c91450d5
tech(config): add log.filters to default and sample
2016-10-07 10:39:01 +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
bergquist
92121ea656
feat(alerting): add nop uploader
...
ref #6183
2016-10-05 07:34:48 +02: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
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
b387c1291d
Merge branch 'master' into gnet-oauth
...
Conflicts:
pkg/api/login_oauth.go
2016-09-21 09:39:35 -04:00
Dan Cech
dcd96c90e2
add grafana.net auth section to defaults.ini, normalize section heading line lengths
2016-09-20 10:09:20 -04:00
bergquist
ec452dd704
docs(conf): remove internal options since its not working atm
2016-09-20 08:18:15 +02:00
bergquist
d7bf70a77b
tech(tsdb): remove skip ssl setting. should be based on datasource settings
2016-09-12 13:37:00 +02:00
Chen Chenglong
7b1c374f64
support connect ldap server with starttls ( #5969 )
...
* support connect ldap server with starttls
* add more doc for start_tls option
2016-09-10 09:40:56 +02:00
bergquist
aa80b52c07
feat(alerting): make it possible to skip ssl verification for alerting https requests
2016-09-08 16:29:31 +02:00
bergquist
f26824049f
Merge branch 'master' into emails
2016-09-07 11:19:52 +02:00
