public/grafana
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
19,865 Commits 655 Branches 650 Tags
b94de101cd95b23f0266cd61e311f09ae8ad7592
Commit Graph
4385 Commits
Author SHA1 Message Date
bergquist 5566a61aef alerting: tests default value for disable resolve message 2018-10-17 09:53:03 +02:00
Dave Waters a3137e731d clean up tests 2018-10-16 20:39:07 -04:00
Dave Waters 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
Dave Waters 0eae7b077d fix gofmt, add test, correct noted concerns with default value 2018-10-16 17:38:59 -04:00
Dave Waters c4dcf5a4ee fix gofmt, add test, correct noted concerns with default value 2018-10-16 17:33:38 -04:00
Ramiro Morales 49a3bd3097 add encrypt connstr param conditionally on the value chosen via GUI. 2018-10-16 13:14:22 -03:00
Leonard Gram 1329c70965 codestyle 2018-10-16 14:22:50 +02:00
Dave Waters 18c73631ea rename UI Option, align with control, update tests 2018-10-16 07:12:32 -04:00
Peter Holmberg ee0cc9bd77 Merge branch 'master' into data-source-instance-to-react 2018-10-16 12:14:11 +02:00
Mitsuhiro Tanda fce50cf1b8 return default region list from backend 2018-10-16 12:20:39 +09:00
Mitsuhiro Tanda f6cb01d38a show all CloudWatch regions 2018-10-16 12:03:33 +09:00
Mitsuhiro Tanda 2b20402d7d get region list from ec2:DescribeRegions 2018-10-16 12:03:33 +09:00
Mitsuhiro Tanda 48aef0c50e fix concurrent map writes 2018-10-16 11:45:58 +09:00
Ramiro Morales d859a6aeb8 rename new JSON data attrbute. 2018-10-15 20:34:03 -03:00
Dave Waters 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
Ramiro Morales 37f16ca80a Add 'encrypt' setting to MSSQL data source. 
Fixes #13629
 2018-10-15 14:47:54 -03:00
Torkel Ödegaard 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
Andreas Kohn 272274220c Fix grammar in log message 2018-10-15 14:37:12 +02:00
Torkel Ödegaard 631af46c48 Merge branch 'master' into react-panels-step1 2018-10-14 10:44:38 +02:00
Mario Trangoni 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
Torkel Ödegaard 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
Torkel Ödegaard ec4698fb96 alerting: propagate alert validation issues to the user instead of just 'invalid alert data' message 2018-10-12 23:03:54 -07:00
Torkel Ödegaard d17025fb43 Merge pull request #13631 from mjtrangoni/fix-megacheck-issues 
Fix trivial megacheck issues
 2018-10-13 06:56:29 +02:00
Mario Trangoni 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
Leonard Gram 97a3a4f33a removes debug log. 2018-10-12 15:13:55 +02:00
Torkel Ödegaard 8ba865bf57 Merge branch 'master' into react-panels-step1 2018-10-12 13:31:20 +02:00
Torkel Ödegaard 8c9939df72 Adds backend hooks service so extensions can modify index data 2018-10-12 11:26:42 +02:00
Torkel Ödegaard d6292f8345 removed unused setting variable 2018-10-12 08:15:01 +02:00
Torkel Ödegaard d5d8d7efa6 minor setting refactorings 2018-10-12 07:55:36 +02:00
Torkel Ödegaard 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
Torkel Ödegaard 69e0311cbc Merge branch '13425-team-picker-bug' 2018-10-11 12:52:48 -07:00
Dan Cech 19b69a82af fmt 2018-10-11 15:26:06 -04:00
Torkel Ödegaard b671b9704f changed property name to UserWasDeleted and added an assert for it 2018-10-11 12:20:53 -07:00
Mario Trangoni 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
Mario Trangoni 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
Torkel Ödegaard b7599212e0 Merge pull request #13620 from grafana/frontend-extensions 
Frontend extensions
 2018-10-11 14:41:11 +02:00
Leonard Gram d360d8cebc Requests for ds via backend blocked for users without permissions. 2018-10-11 13:52:23 +02:00
Leonard Gram ec9ed5c830 Removes unused code. 2018-10-11 13:52:23 +02:00
Torkel Ödegaard abef94b0da made it possible to have frontend code in symlinked folders that can add routes 2018-10-11 12:36:04 +02:00
Yuan Liu 18dfdc4f0d add test for es alert when group by has no limit 2018-10-11 16:04:57 +08:00
Torkel Ödegaard 5b46c08844 Merge remote-tracking branch 'origin/enterprise' into frontend-extensions 2018-10-11 09:41:57 +02:00
Torkel Ödegaard 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
Torkel Ödegaard 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
Yuan Liu f8a8b213f9 remove tab 2018-10-11 11:40:23 +08:00
Yuan Liu 567db87c3a bug fix 
bug fix
 2018-10-11 11:36:40 +08:00
Yuan Liu 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
Marcus Efraimsson 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
Dan Cech a4f90fd10d add admin page to show enterprise license status 2018-10-10 13:04:54 -04:00
Leonard Gram 721dd532e4 User without permission to a datasource won't see it. 2018-10-10 15:55:16 +02:00
Leonard Gram ccfcf02e33 Refactors ds permissions to a filter. 2018-10-10 14:25:57 +02:00