public/grafana
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
38,884 Commits 655 Branches 650 Tags
29fcc463336f7f0e00e94de6fe1cc6350c4eb0da
Commit Graph
9252 Commits
Author SHA1 Message Date
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
bugficks f31fe495e9 fix go fmt 2019-01-15 13:54:25 +01:00
bugficks 7db848f153 [Feature request] MySQL SSL CA in datasource connector 
https://github.com/grafana/grafana/issues/8570
 2019-01-15 13:29:56 +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