70385119bc
removes d in disableResolvedMessage
2018-10-17 10:41:18 +02:00
5566a61aef
alerting: tests default value for disable resolve message
2018-10-17 09:53:03 +02:00
a3137e731d
clean up tests
2018-10-16 20:39:07 -04:00
e9b8051724
Merge branch 'master' of http://github.com/grafana/grafana into add-notification-channel-option-to-disable-resolved-alert
2018-10-16 17:43:26 -04:00
0eae7b077d
fix gofmt, add test, correct noted concerns with default value
2018-10-16 17:38:59 -04:00
c4dcf5a4ee
fix gofmt, add test, correct noted concerns with default value
2018-10-16 17:33:38 -04:00
49a3bd3097
add encrypt connstr param conditionally on the value chosen via GUI.
2018-10-16 13:14:22 -03:00
18c73631ea
rename UI Option, align with control, update tests
2018-10-16 07:12:32 -04:00
d859a6aeb8
rename new JSON data attrbute.
2018-10-15 20:34:03 -03:00
6376154b16
add channel option to disable the resolved alert (OK Message) that is sent when condition returns to normal.
2018-10-15 17:16:14 -04:00
37f16ca80a
Add 'encrypt' setting to MSSQL data source.
...
Fixes #13629
2018-10-15 14:47:54 -03:00
938541be2e
Merge pull request #13660 from grafana/alerting-validation-messages
...
Alerting: Propagate alert validation issues to the api/user
2018-10-15 18:16:29 +02:00
272274220c
Fix grammar in log message
2018-10-15 14:37:12 +02:00
6218fadf21
pkg/cmd/grafana-server/main.go: remove os.Kill as it cannot be trapped
...
See,
$ gometalinter --vendor --deadline 10m --disable-all --enable=megacheck ./...
pkg/cmd/grafana-server/main.go:103:42⚠️ os.Kill cannot be trapped (did you mean syscall.SIGTERM?) (SA1016) (megacheck)
2018-10-13 11:02:36 +02:00
ba67dc7689
changed to plain errors further down the alerting validation model so error did not get double wrapping in ValidationError
2018-10-12 23:15:23 -07:00
ec4698fb96
alerting: propagate alert validation issues to the user instead of just 'invalid alert data' message
2018-10-12 23:03:54 -07:00
d17025fb43
Merge pull request #13631 from mjtrangoni/fix-megacheck-issues
...
Fix trivial megacheck issues
2018-10-13 06:56:29 +02:00
74533a7a19
pkg/services/sqlstore/user_auth_test.go: comment unused users slice
...
See,
$ gometalinter --vendor --deadline 10m --disable-all --enable=megacheck ./...
pkg/services/sqlstore/user_auth_test.go:28:18⚠️ this result of append is never used, except maybe in other appends (SA4010) (megacheck)
2018-10-13 02:35:03 +02:00
8c9939df72
Adds backend hooks service so extensions can modify index data
2018-10-12 11:26:42 +02:00
d6292f8345
removed unused setting variable
2018-10-12 08:15:01 +02:00
d5d8d7efa6
minor setting refactorings
2018-10-12 07:55:36 +02:00
a69013c833
Merge pull request #13611 from grafana/remove-user-from-org-and-system
...
Remove user form org in single org setup improvement
2018-10-11 21:54:07 +02:00
69e0311cbc
Merge branch '13425-team-picker-bug'
2018-10-11 12:52:48 -07:00
19b69a82af
fmt
2018-10-11 15:26:06 -04:00
b671b9704f
changed property name to UserWasDeleted and added an assert for it
2018-10-11 12:20:53 -07:00
9c44c75936
pkg/services/alerting/notifiers/telegram.go: check error before close.
...
See,
$ gometalinter --vendor --deadline 6m --disable-all --enable=megacheck ./...
pkg/services/alerting/notifiers/telegram.go:130:2⚠️ should check returned error before deferring imageFile.Close() (SA5001) (megacheck)
2018-10-11 19:51:54 +02:00
18e127db2a
pkg/tsdb/*: Fix do not pass a nil Context
...
See,
$ gometalinter --vendor --deadline 6m --disable-all --enable=megacheck ./...
pkg/tsdb/mssql/mssql_test.go:695:33⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/mysql/mysql_test.go:772:32⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/postgres/postgres_test.go:704:33⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
2018-10-11 19:03:54 +02:00
b7599212e0
Merge pull request #13620 from grafana/frontend-extensions
...
Frontend extensions
2018-10-11 14:41:11 +02:00
abef94b0da
made it possible to have frontend code in symlinked folders that can add routes
2018-10-11 12:36:04 +02:00
18dfdc4f0d
add test for es alert when group by has no limit
2018-10-11 16:04:57 +08:00
5b46c08844
Merge remote-tracking branch 'origin/enterprise' into frontend-extensions
2018-10-11 09:41:57 +02:00
9585dc7825
added the UserWasRemoved flag to make api aware of what happened to return correct message to UI
2018-10-11 07:58:22 +02:00
5b5cb6622d
Remove user form org now completely removes the user from the system if the user is orphaned
2018-10-11 07:48:35 +02:00
f8a8b213f9
remove tab
2018-10-11 11:40:23 +08:00
567db87c3a
bug fix
...
bug fix
2018-10-11 11:36:40 +08:00
3b9ab6e204
Update time_series_query.go
...
fix alert no data when elasticsearch group by terms size is set to no limit
2018-10-11 11:21:06 +08:00
bc3b7357bd
Merge pull request #13400 from connection-reset/concurrent-sql
...
Run queries for sql data sources for panels with multiple queries concurrently
Also make max open connections, max idle connections and max connection
lifetime configurable in the data source settings
2018-10-10 19:12:38 +02:00
a4f90fd10d
add admin page to show enterprise license status
2018-10-10 13:04:54 -04:00
c0b7ca3902
fix /api/org/users so that query and limit querystrings works
2018-10-10 14:15:28 +02:00
5f69854e2a
Merge pull request #13571 from mtanda/cw_unit
...
cloudwatch: automatically set graph yaxis unit
fixes #13575
2018-10-10 09:52:10 +02:00
0612ce9b75
cloudwatch: return early if execute query returns error
...
This will stop a segfault from happening
2018-10-10 09:38:42 +02:00
f0fb8123ae
add test for automatically unit set
2018-10-10 14:07:08 +09:00
37e749f6da
fix crach bug
2018-10-10 13:56:58 +09:00
a1d4675169
Merge pull request #13490 from mtanda/stackdriver_distribution
...
Stackdriver heatmap support. Fixes #13559
2018-10-09 20:57:21 +02:00
6ed1cbd5bb
set unit for CloudWatch GetMetricStatistics result
2018-10-09 17:02:56 +09:00
d20b15834f
add gopkg.in/square/go-jose.v2 to dependencies, update github.com/hashicorp/yamux
2018-10-08 17:11:24 -04:00
8d53799bcd
stackdriver: always use regex full match for =~ and !=~operator
2018-10-08 15:57:31 +02:00
7e6a5c0a74
stackdriver: add tests from regex matching
2018-10-08 15:57:30 +02:00
a3122a4b85
stackdriver: test build filter string
2018-10-08 15:57:30 +02:00
5f7795aa1f
stackdriver: test that no interpolation is done when there are no wildcards
2018-10-08 15:57:30 +02:00
bergquist
Dave Waters
Ramiro Morales
Torkel Ödegaard
Andreas Kohn
Mario Trangoni
Dan Cech
Yuan Liu
Marcus Efraimsson
Mitsuhiro Tanda
Daniel Lee
Erik Sundell