IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity
16,178 Commits 5,454 Branches 554 Tags 1.9 GiB
6dff5e6bc7
Commit Graph

16178 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Carl Bergquist
6dff5e6bc7
Merge pull request #13295 from mjtrangoni/fix-some-megacheck-issues 
Fix some megacheck issues
 2018-09-17 10:13:34 +02:00
Marcus Efraimsson
b2833daf32
Merge pull request #13285 from marefr/team_member_ext 
Team member labels
 2018-09-17 09:14:06 +02:00
Mario Trangoni
e85d0e8d6b pkg/services/sqlstore: Fix sess.Id is deprecated: use ID instead. (megacheck) 
See,
$ gometalinter --vendor --disable-all --enable=megacheck --disable=gotype --deadline 6m ./... | grep ID
alert.go:193:15⚠️ sess.Id is deprecated: use ID instead  (SA1019) (megacheck)
alert.go:252:18⚠️ sess.Id is deprecated: use ID instead  (SA1019) (megacheck)
annotation.go:113:12⚠️ sess.Table("annotation").Id is deprecated: use ID instead  (SA1019) (megacheck)
org.go:136:24⚠️ sess.Id is deprecated: use ID instead  (SA1019) (megacheck)
org.go:169:16⚠️ sess.Id is deprecated: use ID instead  (SA1019) (megacheck)
org_users.go:24:21⚠️ sess.Id is deprecated: use ID instead  (SA1019) (megacheck)
org_users.go:88:12⚠️ sess.Id is deprecated: use ID instead  (SA1019) (megacheck)
org_users.go:141:21⚠️ sess.Id is deprecated: use ID instead  (SA1019) (megacheck)
plugin_setting.go:103:12⚠️ sess.Id is deprecated: use ID instead  (SA1019) (megacheck)
preferences.go:97:12⚠️ sess.Id is deprecated: use ID instead  (SA1019) (megacheck)
quota.go:119:17⚠️ sess.Id is deprecated: use ID instead  (SA1019) (megacheck)
quota.go:221:17⚠️ sess.Id is deprecated: use ID instead  (SA1019) (megacheck)
team.go:77:24⚠️ sess.Id is deprecated: use ID instead  (SA1019) (megacheck)
user.go:243:16⚠️ sess.Id is deprecated: use ID instead  (SA1019) (megacheck)
user.go:267:13⚠️ sess.Id is deprecated: use ID instead  (SA1019) (megacheck)
user.go:282:13⚠️ sess.Id is deprecated: use ID instead  (SA1019) (megacheck)
user.go:313:12⚠️ sess.Id is deprecated: use ID instead  (SA1019) (megacheck)
user.go:475:3⚠️ sess.Id is deprecated: use ID instead  (SA1019) (megacheck)
user.go:479:13⚠️ sess.Id is deprecated: use ID instead  (SA1019) (megacheck)
user.go:493:13⚠️ sess.Id is deprecated: use ID instead  (SA1019) (megacheck)
 2018-09-16 12:37:08 +02:00
Mario Trangoni
f73236f8f4 pkg/services/sqlstore: Fix x.Sql is deprecated: use SQL instead. (megacheck) 
See,
$ gometalinter --vendor --disable-all --enable=megacheck --disable=gotype --deadline 6m ./... | grep SQL
alert.go:43:9⚠️ x.Sql is deprecated: use SQL instead.  (SA1019) (megacheck)
alert_notification.go:122:12⚠️ sess.Sql is deprecated: use SQL instead.  (SA1019) (megacheck)
annotation.go:226:12⚠️ x.Sql is deprecated: use SQL instead.  (SA1019) (megacheck)
dashboard.go:228:9⚠️ x.Sql is deprecated: use SQL instead.  (SA1019) (megacheck)
dashboard.go:302:10⚠️ x.Sql is deprecated: use SQL instead.  (SA1019) (megacheck)
dashboard.go:416:9⚠️ x.Sql is deprecated: use SQL instead.  (SA1019) (megacheck)
dashboard.go:635:12⚠️ x.Sql is deprecated: use SQL instead.  (SA1019) (megacheck)
migrations/user_mig.go:137:9⚠️ sess.Sql is deprecated: use SQL instead.  (SA1019) (megacheck)
plugin_setting.go:29:10⚠️ x.Sql is deprecated: use SQL instead.  (SA1019) (megacheck)
quota.go:41:12⚠️ x.Sql is deprecated: use SQL instead.  (SA1019) (megacheck)
quota.go:84:13⚠️ x.Sql is deprecated: use SQL instead.  (SA1019) (megacheck)
quota.go:143:12⚠️ x.Sql is deprecated: use SQL instead.  (SA1019) (megacheck)
quota.go:186:13⚠️ x.Sql is deprecated: use SQL instead.  (SA1019) (megacheck)
quota.go:234:12⚠️ x.Sql is deprecated: use SQL instead.  (SA1019) (megacheck)
team.go:172:12⚠️ x.Sql is deprecated: use SQL instead.  (SA1019) (megacheck)
team.go:199:17⚠️ x.Sql is deprecated: use SQL instead.  (SA1019) (megacheck)
team.go:223:9⚠️ x.Sql is deprecated: use SQL instead.  (SA1019) (megacheck)
temp_user.go:99:10⚠️ x.Sql is deprecated: use SQL instead.  (SA1019) (megacheck)
temp_user.go:124:10⚠️ x.Sql is deprecated: use SQL instead.  (SA1019) (megacheck)
user.go:375:3⚠️ sess.Sql is deprecated: use SQL instead.  (SA1019) (megacheck)
user.go:377:3⚠️ sess.Sql is deprecated: use SQL instead.  (SA1019) (megacheck)
user.go:379:3⚠️ sess.Sql is deprecated: use SQL instead.  (SA1019) (megacheck)
 2018-09-16 12:26:05 +02:00
Torkel Ödegaard
dd0b1d8410 Merge branch 'remove-mobx' 2018-09-15 15:04:03 +02:00
Torkel Ödegaard
693f2fd8e9
Merge pull request #13273 from grafana/permissions-to-redux 
Permissions to redux
 2018-09-15 15:02:13 +02:00
Torkel Ödegaard
66ae7ddc02 fix: increased team picker limit to 50, closes #13294 2018-09-15 04:59:45 -07:00
Torkel Ödegaard
438119b806
Merge pull request #13284 from cbonte/hipchat-notifications 
fix hipchat color code used for "no data" notifications
 2018-09-15 13:57:09 +02:00
Torkel Ödegaard
3f309ff5dd rename folder 2018-09-15 04:50:22 -07:00
Marcus Efraimsson
da68b858d7
display team member labels 2018-09-14 17:28:34 +02:00
Marcus Efraimsson
9a6446c2b5
new column for team_member table 2018-09-14 17:27:36 +02:00
Cyril Bonté
0f4ee4ce87 fix hipchat color code used "no data" notifications 2018-09-14 17:22:07 +02:00
Torkel Ödegaard
6cdfff52f7 Merge branch 'master' of github.com:grafana/grafana 2018-09-14 17:10:20 +02:00
Torkel Ödegaard
f2833bfd52
Merge pull request #13252 from grafana/10040_active_directory 
docs: include active directory ldap example and restructure
 2018-09-14 17:09:44 +02:00
Torkel Ödegaard
462b5d937c gdev: added test dashboard for polystat panel 2018-09-14 16:48:31 +02:00
David Kaltschmidt
1a38c45dde Hotfix for Explore (empty page after running query) 
Since #13212 adhoc filters are being gathered, in Explore the template
  service has no variables set and then throws when iterating over them.
 2018-09-14 16:09:43 +02:00
Torkel Ödegaard
5fbe8eff4f ldap: made minor change to group search, and to docs 2018-09-14 11:28:17 +02:00
Torkel Ödegaard
270b736302
Merge pull request #13270 from tianon/fix-gauge-accuracy 
Fix gauge display accuracy for "percent (0.0-1.0)"
 2018-09-14 09:58:14 +02:00
Torkel Ödegaard
84a4b64176
Update CHANGELOG.md 2018-09-14 09:57:58 +02:00
Torkel Ödegaard
e58c2ebc1c tech: remove all mobx stuff 2018-09-14 09:43:34 +02:00
Torkel Ödegaard
ddf86c25d7
Merge pull request #13274 from grafana/12946-table-cell-link 
Added underline to links in table
 2018-09-14 09:38:11 +02:00
Carl Bergquist
047fb770c8
Merge pull request #13269 from DanCech/pluginUpgrade 
use pluginName consistently when upgrading plugins
 2018-09-14 09:35:58 +02:00
Torkel Ödegaard
0e9a6dcedc Use datasource cache for backend tsdb/query endpoint (#13266) 
fix: use datasource cache for backend datasources
 2018-09-14 09:30:32 +02:00
Patrick O'Carroll
7b0215380f added underline to links in table 2018-09-14 08:31:41 +02:00
Torkel Ödegaard
331be7d47a fix: add permission fixes 2018-09-14 08:25:35 +02:00
Torkel Ödegaard
776d81189f test: added simple dashboard reducer test 2018-09-14 07:52:17 +02:00
Torkel Ödegaard
7bb0109261 feat: dashboard permissions are working 2018-09-14 07:47:33 +02:00
Tianon Gravi
74912dca8d Fix gauge display accuracy for "percent (0.0-1.0)" 
The "Decimals" value was incorrectly applied to the metric value used to calculate the gauge display in addition to the text value (so a "Decimals" value of "1" turns "45.1%" into "50%" in the gauge display even though the label still correctly says "45.1%").
 2018-09-13 15:41:49 -07:00
Dan Cech
124b21a6aa
use pluginName consistently when upgrading plugins 2018-09-13 17:19:51 -04:00
Torkel Ödegaard
06855d2bc3
Merge pull request #13253 from grafana/13240_auth_stats 
Fix anonymous usage stats for authentication types
 2018-09-13 21:17:16 +02:00
Torkel Ödegaard
4b0eeab2b3
Merge pull request #13259 from bergquist/disable_metrics_endpoint 
[metrics]enabled = false should disable the /metrics endpoint.
 2018-09-13 21:14:28 +02:00
Carl Bergquist
ec5aa332ac removes old unused examples (#13260) 
Just wanted to reduce the amount of files/folders in root
 2018-09-13 21:09:21 +02:00
Torkel Ödegaard
fbfcc62269
fix: added loading screen error scenario (#13256) 2018-09-13 21:08:41 +02:00
David Kaltschmidt
379227c75d Updated CHANGELOG.md 2018-09-13 17:52:28 +02:00
Marcus Efraimsson
e33b2d5fce
changelog: add notes about closing #11555 
[skip ci]
 2018-09-13 17:29:37 +02:00
David
d67d890ccc
Merge pull request #11789 from mtanda/prom_annotation_series_timestamp 
(prometheus) add annotation option to treat series value as timestamp
 2018-09-13 17:21:12 +02:00
Sven Klemm
0254a29e35 Interpolate $__interval in backend for alerting with sql datasources (#13156) 
add support for interpolate $__interval and  $__interval_ms in sql datasources
 2018-09-13 16:51:00 +02:00
Marcus Efraimsson
1d66f9a42c
anonymous usage stats for authentication types 2018-09-13 16:36:23 +02:00
bergquist
bff350166e disabling internal metrics disables /metric endpoint 
but we will still keep sending metrics to graphite

closes #10638
 2018-09-13 16:09:52 +02:00
Torkel Ödegaard
c7fdea1dfb wip: dashboard permissions to redux 2018-09-13 16:00:02 +02:00
Torkel Ödegaard
d173ebe7e8 Merge branch 'master' into permissions-to-redux 2018-09-13 14:48:04 +02:00
Torkel Ödegaard
e1a1da9064 fix: add folder permission fix 2018-09-13 14:31:12 +02:00
Torkel Ödegaard
bae560717d fix: fixed tslint issue introduced in recent prometheus PR merge 2018-09-13 14:23:43 +02:00
Torkel Ödegaard
f2edb82e79
Folder pages to redux (#13235) 
* creating types, actions, reducer

* load teams and store in redux

* delete team

* set search query action and tests

* Teampages page

* team members, bug in fetching team

* flattened team state, tests for TeamMembers

* test for team member selector

* wip: began folder to redux migration

* team settings

* actions for group sync

* wip: progress on redux folder store

* wip: folder to redux

* wip: folder settings page to redux progress

* mobx -> redux: major progress on folder migration

* redux: moved folders to it's own features folder

* fix: added loading nav states

* fix: gofmt issues

* wip: working on reducer test

* fix: added reducer test
 2018-09-13 14:10:51 +02:00
Torkel Ödegaard
d35eca333f folder permissions in redux 2018-09-13 13:56:09 +02:00
Mitsuhiro Tanda
dc08093f6c minor fix 2018-09-13 20:15:33 +09:00
Mitsuhiro Tanda
3031c2e6fc fix test 2018-09-13 20:07:43 +09:00
Mitsuhiro Tanda
2926725bab add annotation option to treat series value as timestamp 2018-09-13 20:05:30 +09:00
David
e4496080ff
Merge pull request #12251 from mtanda/prometheus_use_matchers_for_completion 
(prometheus) get label name/value from series API
 2018-09-13 11:48:13 +02:00
Torkel Ödegaard
f360b6186b wip: first couple of things starting to work 2018-09-13 10:52:29 +02:00