bergquist
c3ff3d644c
fixes nil ref in tests
2019-01-22 16:16:32 +01:00
bergquist
31b5db06f1
Merge branch 'master' into poc_token_auth
...
* master: (156 commits)
Fixed issues with the sanitizie input in text panels, added docs, renamed config option
build: removes arm32v6 docker image.
Updated version in package.json to 6.0.0-pre1
Update CHANGELOG.md
build: armv6 docker image.
build: skips building rpm for armv6.
build: builds for armv6.
Explore: mini styling fix for angular query editors
Removed unused props & state in PromQueryField
chore: Remove logging and use the updated config param
chore: Reverse sanitize variable so it defaults to false
feat: wip: Sanitize user input on text panel
fix: Text panel should re-render when panel mode is changed #14922
Minor rename of LogsProps and LogsState
Splitted up LogLabels into LogLabelStats and LogLabel
Refactored out LogRow to a separate file
Removed strange edit
Added link to side menu header and fixed styling
Moved ValueMapping logic and tests to separate files
Fixed data source selection in explore
...
2019-01-22 15:39:54 +01:00
bergquist
64124b5042
add setting for how to long we should keep expired tokens
2019-01-22 15:31:43 +01:00
bergquist
12f8338977
stores hashed state code in cookie
2019-01-22 15:22:24 +01:00
bergquist
d3ec8e1ccb
creates new config section for login settings
2019-01-22 15:22:11 +01:00
Marcus Efraimsson
4096449aec
extract auth token interface and remove auth token from context
2019-01-22 12:00:33 +01:00
Marcus Efraimsson
366e356e08
more auth token tests
2019-01-21 21:48:18 +01:00
bergquist
777bd9ea18
adds cleanup job for old session tokens
2019-01-21 19:03:32 +01:00
Marcus Efraimsson
f040f9a400
fix tests after renaming now
2019-01-21 16:53:00 +01:00
Marcus Efraimsson
38efc1d7d2
s/print/log
2019-01-21 15:53:40 +01:00
bergquist
92620af75f
avoid calling now() multiple times
2019-01-21 15:48:17 +01:00
Marcus Efraimsson
dd8476d81a
passing auth token tests
2019-01-21 15:06:33 +01:00
Marcus Efraimsson
565408194a
handle expired tokens
2019-01-21 13:22:20 +01:00
bergquist
697ddccd8e
set userToken on request when logging in
2019-01-21 11:42:10 +01:00
bergquist
55b3013eb3
moves initWithToken to auth package
2019-01-21 11:37:44 +01:00
Marcus Efraimsson
734a7d38b2
set cookie name from configuration
2019-01-21 11:21:43 +01:00
Marcus Efraimsson
766cfab374
change rotate time
2019-01-21 10:22:18 +01:00
Marcus Efraimsson
0d1e3759eb
mixor fixes
2019-01-21 10:20:23 +01:00
bergquist
2e97d39abe
removes commented code
2019-01-21 10:01:48 +01:00
bergquist
47a7d93fd9
moves rotation into auth since both happens before c.Next()
2019-01-21 08:59:01 +01:00
sharkpc0813
35013a28cd
add timeout test for alert handling.
2019-01-18 11:23:00 +09:00
bergquist
fd937e3d95
remove maxage from session token
2019-01-17 21:03:27 +01:00
bergquist
c2accfa4c0
inital code for rotate
2019-01-17 17:11:52 +01:00
bergquist
aba6148c43
login users based on token cookie
2019-01-16 16:44:40 +01:00
Pavel Bakulev
f461d52004
Converted notification id to uid via fmt for old alert notification settings
2019-01-16 16:52:00 +02:00
Pavel Bakulev
2de32756c2
Returned id for alert notifications which were created without uid
2019-01-16 16:52:00 +02:00
Pavel Bakulev
4bcace567b
Formatted errors to err
2019-01-16 16:50:00 +02:00
Pavel Bakulev
d0370ea7ad
Using func InitNotifier for verifying notification settings
2019-01-16 16:50:00 +02:00
Pavel Bakulev
f132e929ce
Added uid for alert notifications
2019-01-16 16:50:00 +02:00
Pavel Bakulev
6d1ec19fe9
Renamed validation funcs for alert notification
2019-01-16 16:45:42 +02:00
Pavel Bakulev
5c10a897f8
Instantiating notifiers from config before using
2019-01-16 16:45:42 +02:00
Pavel Bakulev
4fa45253cf
Added orgName parameter for alert_notifications
2019-01-16 16:45:42 +02:00
Pavel Bakulev
6e3e9a337d
Added alert_notification configuration
2019-01-16 16:45:42 +02:00
Marcus Efraimsson
b0df7280be
begin user auth token implementation
2019-01-15 15:16:20 +01:00
bergquist
1b6203e430
removes error2 logger
2019-01-15 11:49:18 +01:00
Carl Bergquist
1a7eb2f462
Merge pull request #14868 from bergquist/provisioning_inifinite_loop
...
Avoid infinite loop in the dashboard provisioner
2019-01-15 10:34:18 +01:00
sharkpc0813
e172bade40
fix that alert context and result handle context do not use the same derived context.
2019-01-15 17:51:50 +09:00
bergquist
8880829eda
avoid infinite loop in the dashboard provisioner
...
if one dashboard with an uid is refered to by two
provsioners each provsioner overwrite each other.
filling up dashboard_versions quite fast if using
default settings.
ref #12864
2019-01-14 16:38:39 +01:00
fredbcode
110ffb69de
Fix bug tls renegociation problem in Notification channel (webhook) #14800
2019-01-13 21:42:33 +01:00
NighterMan
ec0fe11939
pushover: add support for attaching images ( closes #10780 )
...
Use native pushover native attachment support to deliver images
2019-01-13 04:09:51 +01:00
bergquist
fbb3ad5fc4
make sure frequency cannot be zero
...
frequency set to zero causes division by zero
panics in the alert schedular.
closes #14810
2019-01-10 14:17:10 +01:00
Torkel Ödegaard
0a936a55b4
Fixed new gometalinter issues
2019-01-07 11:01:31 +01:00
tpetr
db61fc1dd1
EqualFold()
2019-01-05 00:17:31 -05:00
tpetr
32dfc4e8b1
forgot go fmt
2019-01-05 00:02:15 -05:00
tpetr
5bc8d50864
pull connection string args from url instead
2019-01-04 23:52:36 -05:00
Torkel Ödegaard
3e873a2500
Merge pull request #14710 from grafana/fixed-gometalinter
...
Fixed new gotmetalinter warning
2019-01-03 07:23:45 +01:00
Torkel Ödegaard
80e441f48b
Fixed new gotmetalinter warning
2019-01-02 19:17:35 +01:00
tpetr
a693d42e31
add support for defining additonal database connection string args via extra_connection_string_args
2019-01-02 13:02:40 -05:00
Dan Cech
efa738ddf6
Merge pull request #14540 from grafana/session-skip-update
...
only update session in mysql database when required
2018-12-31 11:54:04 -05:00
Torkel Ödegaard
22399b336f
Merge pull request #14577 from marefr/14351_db_migration
...
fix only create/drop database indices if not exists/exists
2018-12-31 16:20:07 +01:00