Torkel Ödegaard
28bff0c1f3
Merge branch 'v4.3.x'
2017-05-24 13:22:09 +02:00
Torkel Ödegaard
b17a1ed557
playlist: fixed dashboard play ordering, fixes #7688
2017-05-24 13:21:43 +02:00
Prasanna Gautam
6541ffe045
minor change: more accurate variable name ( #8449 )
2017-05-24 08:38:13 +02:00
Torkel Ödegaard
befc15c5a1
fix: s3 image uploads to us-east-1 (us standard) did not return correct image urls so images shared to slack and other services was not correct, fixes #8444
2017-05-23 15:50:22 +02:00
Torkel Ödegaard
359421b5e8
refactor: sqlstore inTransaction consolidated to one version, fixes #8376
2017-05-23 10:56:23 +02: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
a0b9dcad4d
alert: alerting annotation improvements, fixes #8421
2017-05-22 13:02:49 +02:00
Dave Scott
f7215608e9
Update VictorOps notifier w/ auto resolve and image URL ( #8431 )
...
* Fixed newline JSON buy in VictorOps integration
* Fixed payload sent to VictorOps so that link displays correctly
* Fixed formatted to resolve go error
* Add auto resolve incidents and image URL to VictorOps notifier
2017-05-21 10:02:48 +02:00
Torkel Ödegaard
43d5525aaa
Merge branch 'master' into alert_state
2017-05-18 13:38:34 +02:00
Daniel Lee
16fb7a2e4a
Merge pull request #8394 from berghauz/master
...
Proxy support added to webdav uploader, fixes #7922
2017-05-17 14:49:22 +02:00
Dan Cech
9dc220b8e2
include error message in email notification ( #8392 )
2017-05-17 09:51:51 +02:00
berghauz
48cf58e739
Indenting fix
2017-05-17 03:58:18 +03:00
berghauz
c713bd9a9a
Proxy support added, fixes #7922
...
Well, i'm really want to see it working in 4.3.0
2017-05-17 02:50:56 +03:00
Daniel Lee
e8b798914d
mysql: adds mapping for int/long
2017-05-16 16:07:42 +02:00
Torkel Ödegaard
f84dc24fcb
alerting: improving and fixing alert history, #7257
2017-05-15 16:17:05 +02:00
Torkel Ödegaard
f697f81950
sqlite: fixed database table looked handling, now retries up to 5 times, fixes #7992
2017-05-15 12:19:19 +02:00
Daniel Lee
a9c535e551
mysql: add some more type mapping
...
Decimals mapped to floats for now. No mapping for bit or
any of the blob types. Tinyint not mapped to bool.
2017-05-12 11:37:51 +02:00
Torkel Ödegaard
4ce0bf4d16
mysql: improved mysql data source, added test feature when adding data source, fixed cache issue
2017-05-11 10:50:24 +02:00
Tiantian Gao
b2c14b858e
Fix http logging time_ms unit is wrong ( #8342 )
...
In fact, the unit of `time_ms` int http logging is not "ms", this patch fix it.
2017-05-11 08:53:40 +02:00
Pranay Kanwar
ee8799de88
Fix dropcounter option, is called dropResets ( #8336 )
2017-05-10 15:46:19 +02:00
Daniel Lee
4a35126bf6
api: health check returns 503 if db is failing
...
ref #3302
2017-05-10 15:23:59 +02:00
Torkel Ödegaard
b042c53980
ux: updated heatmap icon
2017-05-03 08:56:51 +02:00
Dan Cech
665cf55e6e
make generic oauth provider flexible enough to handle bitbucket's oauth implementation ( #8248 )
2017-05-02 14:37:56 +02:00
rogerswingle
02455753b5
Specify region for s3 ( #8251 )
2017-05-01 19:22:20 +02:00
Mitja Z
c92d719a72
added support for listening on unix socket #4030 ( #8221 )
2017-04-27 08:54:21 +02:00
Yaron de Leeuw
d4f7a2bc99
minor code style: use strings.Replace fourth argument in influxdb ( #8225 )
...
Remove 5 lines from the codebase and an unecessary function,
by calling `strings.Replace` with -1 for the fourth argument.
A better alternative to what was merged in #8037
2017-04-27 08:51:43 +02:00
Torkel Ödegaard
19a04b7e4a
change: minor change to health check api endpoint
2017-04-25 17:24:36 +02:00
Torkel Ödegaard
f6f2d85aa7
change: minor change to health check api endpoint
2017-04-25 17:24:06 +02:00
Daniel Lee
6538e86793
webdav: add tests + path.join for public url param
...
Fixes #7914 . Fixes #7921
2017-04-25 17:22:18 +02:00
fir4
6d9e8bd147
webdav: allow specification of a different public_url than upload url
2017-04-25 17:22:18 +02:00
Torkel Ödegaard
368e847d12
feat: added api health endpoint that does not require auth and never creates sessions, returns db status as well. #3302
2017-04-25 17:17:45 +02:00
Torkel Ödegaard
b780415f25
fix: change to remember me cookie encoding
2017-04-25 15:33:15 +02:00
Daniel Lee
aee4af2148
api: omit unused fields for /api/datasources
...
Fixes #7822
2017-04-25 15:23:36 +02:00
Torkel Ödegaard
87c978ebc9
fix: better error handling / messsage when testing email notification when stmp is not configured, fixes #8093
2017-04-25 13:16:41 +02:00
Dan Cech
b489e93d94
Config Array Syntax ( #8204 )
...
* refactor util encryption library so it doesn't have to import log
* add util.SplitString to handle space and/or comma-separated config lines
* go fmt
2017-04-25 09:14:29 +02:00
Torkel Ödegaard
ae5e004b69
mysql: time filter macro updated
2017-04-24 14:55:43 +02:00
Daniel Lee
7784e4e24b
mysql: add datetime type to table data
2017-04-23 21:56:58 +02:00
Daniel Lee
413ee33d5d
mysql: fix go vet error
2017-04-23 20:07:20 +02:00
Torkel Ödegaard
b22b3e5bb9
mysql: added default query template
2017-04-21 16:28:01 +02:00
Torkel Ödegaard
97e2d75f51
mysql: added support for tables in mysql queries
2017-04-21 15:07:43 +02:00
Torkel Ödegaard
c78c460f79
mysql: worked on mysql data soruce
2017-04-20 17:10:23 +02:00
Daniel Lee
6ec1d16327
fix: cli admin reset-password fixes cmd args
...
Fixes the homepath and config command line args. This allows the
command to be used even when the homepath is different from the
default.
Fixes #7730
2017-04-20 13:30:17 +02:00
Torkel Ödegaard
50e70cf3db
build: fixed unit test
2017-04-20 13:04:42 +02:00
Torkel Ödegaard
fc878bc8ad
build: fixed order
2017-04-20 11:59:11 +02:00
Torkel Ödegaard
11806dfa78
mysql: progress
2017-04-19 17:26:37 +02:00
Daniel Lee
ee3a553800
Merge pull request #8163 from bashgeek/telegram_metrics
...
Add metrics/matches to Telegram notifications (proposed fix for #8110 )
2017-04-19 15:03:03 +02:00
Daniel Schmitz
d123b951e9
Fixed parsing error
2017-04-19 17:02:52 +08:00
Torkel Ödegaard
e164eba677
mysql: began work on backend macro engine
2017-04-19 10:10:08 +02:00
Daniel Schmitz
7078d5d524
Added metrics/matches to telegram notifications; Added some HTML to beautify
2017-04-19 15:53:23 +08:00
Torkel Ödegaard
0bae7212f6
annotations: removed category stuff, my mistake, we need tags
2017-04-18 17:15:22 +02:00
