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
Marcus Efraimsson
f3125b447b
dead code
2019-01-21 10:20:23 +01:00
Marcus Efraimsson
0495499b4f
fix ip address parsing of loopback address
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
Hugo Häggmark
9d6ac2c3d4
fix: Viewers can edit means that viewers have acces to Explore #14281
2019-01-21 08:47:41 +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
Marcus Efraimsson
81879f0162
fix broken code
2019-01-17 20:29:26 +01:00
Marcus Efraimsson
97c7963f17
fix cannot set cookie when response is written
2019-01-17 20:27:53 +01:00
Marcus Efraimsson
8b3fe41b0a
log fix
2019-01-17 17:32:33 +01:00
bergquist
c2accfa4c0
inital code for rotate
2019-01-17 17:11:52 +01:00
Daniel Lee
dd96f2a522
azuremonitor: move files into grafana
...
Initial port of the code from the plugin - lots of small things to fix.
2019-01-17 10:55:03 +01:00
bergquist
aba6148c43
login users based on token cookie
2019-01-16 16:44:40 +01:00
Pavel Bakulev
6a8e39ba17
Added uid to AlertNotification json
2019-01-16 16:52:00 +02: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
8764fb5aa6
inject login/logout hooks
2019-01-15 15:16:20 +01:00
Marcus Efraimsson
b0df7280be
begin user auth token implementation
2019-01-15 15:16:20 +01:00
Marcus Efraimsson
e08f61059b
utils
2019-01-15 15:16:20 +01:00
bergquist
3cd0cb3d3f
removes debug2 logging
2019-01-15 11:52:39 +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
Marcus Efraimsson
130e4aa666
Merge pull request #14608 from marefr/es_bucket_script
...
Fix support bucket script pipeline aggregations
2019-01-14 15:58:42 +01:00
bergquist
db448b5d53
Merge branch 'fredbcode-master'
...
* fredbcode-master:
Fix bug tls renegociation problem in Notification channel (webhook) #14800
2019-01-13 21:43:47 +01:00
fredbcode
110ffb69de
Fix bug tls renegociation problem in Notification channel (webhook) #14800
2019-01-13 21:42:33 +01:00
Sofia Papagiannaki
8def73ba13
Fix Error 500 on unexisting /api/alert-notification/<id>
2019-01-13 21:30:20 +02: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
Torkel Ödegaard
fda0f92cf9
Merge pull request #12991 from pgiraud/repeat_min_span
...
Repeating panels - Max per row
2019-01-11 09:31:21 +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
Pierre GIRAUD
a881497908
Max number of repeated panels per row
...
Instead of min width
2019-01-09 08:01:42 +01:00
Torkel Ödegaard
56edba5a63
Merge pull request #14746 from jaken551/master
...
14722 - removing unnecessary arn check that breaks assume role featur…
2019-01-07 16:49:35 +01:00
Torkel Ödegaard
0a936a55b4
Fixed new gometalinter issues
2019-01-07 11:01:31 +01:00
jaken551
64163f0198
14722 - removing unnecessary arn check that breaks assume role feature in other AWS partitions
2019-01-06 15:21:58 -05: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
Ander Arguiñano
089d85af63
Added macros to mysql
2019-01-03 22:29:57 +01:00
Ander Arguiñano
3801a75131
FIxed syntaxis mistake unixEpochNanoFrom and unixEpochNanoTo
2019-01-03 22:25:10 +01:00
Ander Arguiñano
ed6782402b
Merge remote-tracking branch 'upstream/master' into nanosecond-postgresql
2019-01-03 21:48:10 +01:00
Ander Arguiñano
b4eac406d5
Added previous macros to mssql
2019-01-03 21:43:08 +01:00
Ander Arguiñano
9105625f24
Added unixEpochNanoTo and unixEpochNanoFrom macros to postgresql
2019-01-03 21:31:47 +01:00
Ander Arguiñano
4d8d2a9690
Renamed unixEpochFilterNano to unixEpochNanoFilter
2019-01-03 20:40:17 +01:00
Torkel Ödegaard
3e873a2500
Merge pull request #14710 from grafana/fixed-gometalinter
...
Fixed new gotmetalinter warning
2019-01-03 07:23:45 +01:00
Sven Klemm
4c51e8df20
Don't cut off subsecond precision for postgres macros
...
Change time format to RFC3339Nano for $__timeFilter, $__timeFrom and
$__timeTo macros
2019-01-02 23:38:09 +01:00
Ander Arguiñano
1a67a8db80
Nanosecond timestamp support postgresql
2019-01-02 23:00:21 +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
Torkel Ödegaard
983b85139c
Merge pull request #14665 from bergquist/sqlite_cache_mode_setting
...
WIP: makes cache mode configurable
2018-12-31 08:35:27 +01:00
Torkel Ödegaard
6eb9f83647
Merge pull request #14678 from bergquist/set_orgid_for_provisioned_dashboards
...
Adds orgId to user dto for provisioned dashboards
2018-12-31 08:34:01 +01:00
Daniel Lee
ce50e9331a
ldap: adds extra debug logging
2018-12-30 22:53:00 +01:00
bergquist
9895b1e6d0
adds orgId to user dto for provisioned dashboards
2018-12-28 10:49:00 +01:00
bergquist
24636da800
closes the body properly on successful webhooks
...
this commit also adds a test docker container
for receiving alerting web hook requests
2018-12-27 16:08:13 +01:00
bergquist
74124ec8ed
makes cache mode configurable
...
this makes the cache mode in the sqlite connection
string configurable. the default also changed from
shared to private to solve #107272 but allow the user
to use shared if performance is more important.
ref #10727
2018-12-27 10:48:11 +01:00
Clément MATHIEU
c29c9d1664
Add support for InfluxDB's time zone clause (backend)
2018-12-21 16:49:01 +01:00
Marcus Efraimsson
b45f72a140
elasticsearch: support bucket script pipeline aggregations
2018-12-20 01:24:36 +01:00
Carl Bergquist
c201fc170f
Merge pull request #14563 from tdabasinskas/broken_oauth_provider
...
Support OAuth providers that are not RFC6749 compliant
2018-12-19 16:05:53 +01:00
Tomas Dabasinskas
eb517a3791
Update field name
2018-12-19 15:36:45 +02:00
Tomas Dabasinskas
3aa24b3afa
Rename the setting and add description
2018-12-19 14:59:33 +02:00
Carl Bergquist
52ccb49167
Merge pull request #14593 from bergquist/export_create_notifier_func
...
export init notifier func
2018-12-19 13:51:40 +01:00
bergquist
69489993c3
export init notifier func
...
makes it possible to validate that an notifier can be
initialzed from the provisioning package
2018-12-19 13:38:49 +01:00
Torkel Ödegaard
cbeefcd376
Merge pull request #14574 from grafana/14543_org_redirect
...
fix signed in user for orgId=0 result should return active org id
2018-12-19 11:31:06 +01:00
Torkel Ödegaard
36154e59b0
Merge pull request #14571 from oiooj/pr-ds-limit
...
Raise datasources number to 5000
2018-12-19 11:26:16 +01:00
Torkel Ödegaard
60ea99078e
Panel help view fixes
2018-12-19 11:03:54 +01:00
Carl Bergquist
251e80aa5e
Merge pull request #14547 from jacobrichard/master
...
Adding CIDR capability to auth_proxy whitelist
2018-12-19 08:55:03 +01:00
Jacob Richard
34d3086ec8
Adding tests for auth proxy CIDR support
2018-12-18 21:16:29 -06:00
Marcus Efraimsson
12f3c8f9d6
fix only add column if not exists for mysql
2018-12-18 23:02:08 +01:00
Carl Bergquist
854487acab
Merge pull request #14441 from cinaglia/delete-external-snapshot
...
Add support for deleting external snapshots from Snapshots List
2018-12-18 22:43:12 +01:00
Marcus Efraimsson
a451c20129
fix handling of indices with multiple columns (mysql)
2018-12-18 22:28:27 +01:00
Marcus Efraimsson
09b3014683
fix only create/drop database indices if not exists/exists
2018-12-18 21:47:45 +01:00
Marcus Efraimsson
e82b3632f6
fix signed in user for orgId=0 result should return active org id
2018-12-18 20:02:27 +01:00
Dan Cech
3f85901c4a
only update session in mysql database when required
2018-12-18 11:19:32 -05:00
Baokun Lee
f51222027d
Raise datasources number to 5000
2018-12-18 23:59:14 +08:00
Victor Cinaglia
48fe92a945
snapshots: Close response body after error check
2018-12-18 08:32:49 -05:00
Tomas Dabasinskas
54b73025dc
Add OAuth provider flag to indicate if it's broken
2018-12-18 13:50:37 +02:00
Tomas Dabasinskas
052772ea2e
Register BrokenAuthHeaderProviders if needed
2018-12-18 13:48:25 +02:00
Torkel Ödegaard
a4091813bf
Merge pull request #14534 from grafana/14409/threshold-ux-changes
...
14409/threshold ux changes
2018-12-18 11:30:48 +01:00
Carl Bergquist
ac458a4e4b
Merge pull request #14511 from grafana/go-ldap-v3
...
ldap: upgrades go-ldap to v3
2018-12-18 08:18:40 +01:00
Jacob Richard
0b50582b56
Adding CIDR capability to auth_proxy whitelist
2018-12-17 23:43:14 -06:00
Torkel Ödegaard
1ee1247912
Gauge option form markup fixes
2018-12-17 17:54:40 +01:00
bergquist
7aa84aeb61
moves migrations to /sqlstore/migrations
2018-12-17 16:36:57 +01:00
bergquist
dbcc2e868d
adds integration tests to ci build
2018-12-17 16:36:57 +01:00
bergquist
11cde7ed71
renames main lock function
2018-12-17 16:36:57 +01:00
bergquist
c565b018c5
clean up integration tests
2018-12-17 16:36:57 +01:00
bergquist
823bba8d98
change from db_text to nvarchar
2018-12-17 16:36:57 +01:00
bergquist
dc49bebb00
adds server lock package
2018-12-17 16:36:57 +01:00
bergquist
ff136b6ba8
initial verison of server lock
2018-12-17 16:36:57 +01:00
Daniel Lee
167e8815d3
ldap: upgrades go-ldap to v3
2018-12-16 01:05:14 +01:00
Torkel Ödegaard
b15bb4fb95
Merge remote-tracking branch 'origin/master' into develop
2018-12-14 17:02:08 +01:00
Joesis
92a8c5b81b
log error when resolvePath
2018-12-13 02:10:29 -08:00
Daniel Lee
90e2175716
migration: renames logging ds to loki ds in data_source table
2018-12-12 20:54:05 +01:00
Marcus Efraimsson
c46d01dc83
Merge pull request #14090 from marefr/8843_pipeline_doc_count
...
Fix pipeline aggregations on doc count
2018-12-12 13:21:13 +01:00
Torkel Ödegaard
f9110f7902
Merge branch 'master' into develop
2018-12-11 10:00:29 +01:00
Victor Cinaglia
411d67cae7
snapshots: Add support for deleting external snapshots
2018-12-10 18:47:23 -05:00
Victor Cinaglia
9d6da10e82
snapshots: Move external snapshot creation to backend
2018-12-10 16:36:32 -05:00
Victor Cinaglia
d9d6a4481f
snapshots: Add external_delete_url column
2018-12-10 16:25:02 -05:00
Scott Glajch
62a5cd27ba
Add the AWS/SES Cloudwatch metrics of BounceRate and ComplaintRate. Pull request #14399
2018-12-07 16:42:29 -05:00
Torkel Ödegaard
efede26eea
Merge pull request #14382 from grafana/davkal/remove-explore-tab
...
Remove Explore > "New tab" from sidebar
2018-12-07 20:24:13 +01:00
Torkel Ödegaard
eb6d0e9f51
Merge branch 'master' into develop
2018-12-07 14:59:38 +01:00
bergquist
9eea585773
removes unused code
2018-12-07 14:39:44 +01:00
bergquist
5d720674e3
Merge branch 'master' into add_google_hangouts_chat_notifier
...
* master: (322 commits)
graphInterval needs to update after query execution, fixes #14364
Explore: Parse initial dates
Aligned styling of stats popover/box with rest of grafana & minor css refactoring
Prometheus: Make result transformer more robust for empty responses
Rebase fixes
Explore: Logging line parsing and field stats
fixed unit tests
made unknown color theme aware and sync with graph color, some minor cleanup
Explore: improve error handling
use render props instead of cloneElement
sort of a hacky way to figure if the small variation should be used for the label
add basic button group component, using the the same label style as is
explore logs styling
wip: alternative level styling & hover effect
wip: explore logs styling
more detailed error message for loki
If user login equals user email, only show the email once #14341
UserPicker and TeamPicker should use min-width instead of fixed widths to avoid overflowing form buttons. #14341
wip: explore logs styling
restoring monospace & making sure width are correct when hiding columns
...
2018-12-07 14:31:13 +01:00
bergquist
a90bba859a
fixes merge error
2018-12-07 14:17:09 +01:00
David Kaltschmidt
80d62013b2
Remove Explore > "New tab" from sidebar
...
- we don't support tabs yet, might as well remove the entry
2018-12-07 11:27:46 +01:00
moznion
4397ee61d0
Put issue number to test code
2018-12-05 22:47:41 +09:00
moznion
d1e1cde00e
Fix bug what updating user quota doesn't work
...
Reason is same as 061e06c226
2018-12-05 22:29:07 +09:00
moznion
061e06c226
Fix bug what updating org quota doesn't work
...
3c330c8e4c/pkg/services/sqlstore/quota.go (L106)
2018-12-05 22:19:40 +09:00
Carl Bergquist
3c330c8e4c
Merge pull request #14317 from mjtrangoni/fix-misspell-issues
...
pkg/*: Fix misspelling issues using locale US
2018-12-05 10:34:28 +01:00
Torkel Ödegaard
180ca021b5
Merge branch 'master' into develop
2018-12-05 10:17:22 +01:00
Torkel Ödegaard
769407cd34
Merge pull request #14314 from nitti/add_influxdb_cumulative_sum
...
added support for influxdb cumulative_sum function in tsdb
2018-12-05 09:29:04 +01:00
Brian Gann
02365514f9
redact value for plugin proxy routes
2018-12-04 22:35:00 -06:00
Mario Trangoni
fadd816d89
pkg/*: Fix misspell issues
...
See,
$ find . -type f | xargs misspell -locale US | grep -vi -e vendor -e devenv -e Unknwon -e Destory | grep pkg
./pkg/services/sqlstore/org_test.go:190:15: "frome" is a misspelling of "from"
./pkg/tsdb/elasticsearch/response_parser.go:544:24: "Unkown" is a misspelling of "Unknown"
./pkg/tsdb/opentsdb/opentsdb.go:87:20: "marshalling" is a misspelling of "marshaling"
./pkg/components/dynmap/dynmap_test.go:2:7: "Licence" is a misspelling of "License"
./pkg/components/dynmap/dynmap.go:2:7: "Licence" is a misspelling of "License"
2018-12-04 23:29:34 +01:00
Tom Nitti
1e53c12921
added support for influxdb cumulative_sum function in tsdb
2018-12-04 12:46:50 -06:00
danielbh
d1b8f13c66
feat: #11067 prevent removing last grafana admin permissions
2018-12-03 20:05:52 -05:00
Marcus Efraimsson
95218c13ce
Merge pull request #14262 from kornholi/fix/dataproxy-auth
...
dataproxy: Override incoming Authorization header
2018-12-03 06:49:31 -08:00
Marcus Efraimsson
ffec795fab
Merge pull request #14232 from SilverFire/security-password-reset
...
Prevent password reset when login form is disabled or either LDAP or Auth Proxy is enabled
2018-12-03 06:02:29 -08:00
Marcus Efraimsson
acb45867f8
Merge pull request #14179 from mattiarossi/master
...
Add support for offset in date histogram aggregation
2018-12-03 05:43:42 -08:00
SilverFire - Dmitry Naumenko
474197269e
Prevent password reset when login form is disabled or either LDAP or Auth Proxy is enabled
2018-12-03 15:32:26 +02:00
Kornelijus Survila
0cafd9a663
dataproxy: Override incoming Authorization header
2018-11-30 12:12:55 -07:00
Marcus Efraimsson
624e5e5b3d
let each sql datasource handle timeFrom and timeTo macros
2018-11-30 14:30:02 +01:00
Matthew Coltman
bbd0ec3a8b
Add AWS/CodeBuild namespace for CloudWatch datasource
2018-11-29 21:02:44 +01:00
Erik Sundell
6f85fa6b35
add new flag in order to be able to indicate whether the datasource has native support for tables
2018-11-28 15:06:22 +01:00
Mattia Rossi
ce74b1ddc2
Requested Backend changes, removed link in popover description for the offset field
2018-11-27 03:42:20 -05:00
Marcus Efraimsson
c0bf7c5f13
Merge pull request #14140 from grafana/fix_dashboard_service_log
...
log the actual error if failing to update alert data
2018-11-26 06:49:19 -08:00
Mattia Rossi
f6fc7f7b64
Requested Backend changes, added details to popover description for the offset field
2018-11-26 08:58:25 -05:00
Marcus Efraimsson
a022284cb0
fix handle of elasticsearch 6.0+ version
2018-11-23 15:24:16 +01:00
Marcus Efraimsson
36aec52c08
return actual error if failing to update alert data
2018-11-22 11:19:08 +01:00
Marcus Efraimsson
40a38552a9
Merge pull request #14151 from grafana/14150_cloudwatch
...
Fix invalid time range causes panic in Cloudwatch datasources
2018-11-21 09:23:51 -08:00
Marcus Efraimsson
a6a1362ad1
temporary fix for starting grafana not running systemd
2018-11-21 18:15:28 +01:00
Marcus Efraimsson
3534762f49
cloudwatch: handle invalid time ranges
2018-11-21 17:51:02 +01:00
Marcus Efraimsson
879aed7d06
cloudwatch: recover/handle panics when executing queries
2018-11-21 17:49:17 +01:00
Carl Bergquist
acf8d43682
Merge pull request #14056 from mjtrangoni/fix-errcheck-issues
...
Fix errcheck issues
2018-11-21 17:23:56 +01:00
