Commit Graph
19865 Commits
Author SHA1 Message Date
Torkel Ödegaard cdfbcbce22 updated circleci build-container version 2018-10-11 22:06:36 +02:00
Torkel Ödegaard 4aa7dc0c85 minor change to cloudwatch code formatting 2018-10-11 12:58:17 -07:00
Torkel Ödegaard caf995bb94 Merge branch 'update-cloudwatch-extended-stats-check' of https://github.com/apalaniuk/grafana into apalaniuk-update-cloudwatch-extended-stats-check 2018-10-11 12:55:09 -07: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
Torkel Ödegaard c368c72d40 minor ux fix for new select 2018-10-11 12:50:58 -07:00
Torkel Ödegaard b49f4a8c86 Merge pull request #13632 from mrudelle/master
13340 complete oauth doc
2018-10-11 21:30:42 +02:00
Dan Cech 19b69a82af fmt 2018-10-11 15:26:06 -04:00
Matthieu Rudelle 3aef519cdc grafana/grafana#13340 complete oauth doc 2018-10-11 21:22:02 +02:00
Torkel Ödegaard b671b9704f changed property name to UserWasDeleted and added an assert for it 2018-10-11 12:20:53 -07:00
Adam Palaniuk 58a156ba03 Update check for invalid percentile statistics 2018-10-11 14:00:34 -05: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
Marcus Efraimsson bcdda7b9ad devenv: fix influxdb block 2018-10-11 17:17:10 +02:00
Marcus Efraimsson 90f6817f6f docs: refer to v5.3 instead of v5.2 2018-10-11 16:36:28 +02:00
Marcus Efraimsson ff5e4e2885 Merge pull request #13618 from grafana/stackdriver-docs-update
stackdriver docs: metric query editor and annotations
2018-10-11 16:25:23 +02:00
Peter Holmberg 6a35eda862 removed unsused function 2018-10-11 15:55:33 +02:00
Daniel Lee 03fefd7bea docs: stackdriver fixes after review
- index page datasource order changed
- image links changed to the image box format
- incorrect sentence fixed
2018-10-11 15:42:47 +02:00
Peter Holmberg 8ab2d8b0b9 fix mutability bug, removed unused constructor 2018-10-11 15:32:13 +02:00
Erik Sundell c84cf1f598 stackdriver: check if array is empty to prevent filter from crashing. This closes #13607 2018-10-11 15:10:47 +02:00
Johannes Schill 7689e9bbf2 Handle DescriptionPicker's initial state #13425 2018-10-11 15:06:51 +02:00
Daniel Lee 9f660a7b18 stackdriver docs: metric query editor and annotations 2018-10-11 14:42:34 +02:00
Torkel Ödegaard b7599212e0 Merge pull request #13620 from grafana/frontend-extensions
Frontend extensions
2018-10-11 14:41:11 +02:00
Johannes Schill 2787284033 Update snapshots after merge 2018-10-11 14:01:13 +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
Johannes Schill dc9e822cc7 Remove CTA when CTA-action is clicked instead of a /new route #13471 2018-10-11 13:52:09 +02:00
Carlos Mondragon b121700103 Add fancy delete button for ApiKeys. 2018-10-11 13:50:54 +02:00
Carlos Mondragon 5f5840b24c Add form to both the CTA page and the regular list. 2018-10-11 13:50:53 +02:00
Carlos Mondragon 0937335f14 Add onClick handler to CTA. 2018-10-11 13:50:53 +02:00
Carlos Mondragon af985743d2 Updated tests for new protip. 2018-10-11 13:50:53 +02:00
Carlos Mondragon 081cb7a695 Updated protip, not sure what to write there. 2018-10-11 13:50:53 +02:00
Carlos Mondragon f03fa364df Update tests for ApiKeys CTA screen. 2018-10-11 13:50:53 +02:00
Marcus Efraimsson db1325cc24 changelog: add notes about closing #13616
[skip ci]
2018-10-11 13:49:50 +02:00
Carlos Mondragon d2573a6bc8 Show CTA if there are no ApiKeys, otherwise show table. 2018-10-11 13:48:15 +02:00
Marcus Efraimsson 776b14f7bb Merge pull request #13617 from grafana/13616_phantomjs_legend
fix phantomjs render of graph panel when legend displayed as table to the right
2018-10-11 13:47:34 +02:00
Carlos Mondragon 0bf2d5ebcd Extract ApiKeyCount from state. 2018-10-11 13:31:52 +02:00
Torkel Ödegaard 795b0ca90f Merge pull request #13619 from grafana/13591/loading-indicators-config-pages
Adding loading spinner to org pages
2018-10-11 13:02:47 +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
Peter Holmberg 02e7d713a1 Added Loading state on org pages 2018-10-11 11:49:34 +02:00
Marcus Efraimsson fc79ba30ae fix phantomjs render of graph panel when legend as table to the right 2018-10-11 11:46:07 +02:00
Marcus Efraimsson 026463f902 changelog: add notes about closing #13172
[skip ci]
2018-10-11 10:26:13 +02:00
Marcus Efraimsson 1b32ff5795 Merge pull request #13609 from Yukinoshita-Yukino/master
elasticsearch: fix no limit size in terms aggregation for alerting queries
2018-10-11 10:21:58 +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 f4a9817b94 poc: frontend extensions 2018-10-11 08:49:12 +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