public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
16,283 Commits 655 Branches 650 Tags
5a2b1b1abfcf722ad6024def32a0e06eee29e2fa
Commit Graph

3820 Commits

Author SHA1 Message Date
Torkel Ödegaard 5a2b1b1abf Merge pull request #13424 from aidan-/master 
imguploader: Add support for ECS credential provider for S3
 2018-09-26 20:05:04 +02:00
bergquist b04052f515 alerting: move all notification conditions to defaultShouldNotify 2018-09-26 14:34:10 +02:00
Aidan Rowe 53c7b33926 imguploader: Add support for ECS credential provider for S3 2018-09-26 10:22:17 +10:00
Carl Bergquist af0f3f2119 Merge pull request #13391 from grafana/provisioning-interval 
provisioning: changed update interval default 3 to 10 seconds
 2018-09-25 22:43:34 +02:00
Carl Bergquist 4520962ac2 Merge pull request #13401 from grafana/render-limits 
Concurrent render limits
 2018-09-25 15:28:57 +02:00
Torkel Ödegaard 862ca07f03 fix: updated tests 2018-09-25 14:01:38 +02:00
Axel Pirek d2f2c3f220 Fix spelling of your and you're 2018-09-25 12:38:02 +02:00
Torkel Ödegaard cb96c6d942 Changed setting to be an alerting setting 2018-09-25 12:17:04 +02:00
Torkel Ödegaard 4dab595ed7 rendering: Added concurrent rendering limits 2018-09-24 16:14:11 +02:00
Torkel Ödegaard 98dad530e2 provisioning: changed provisioning default update interval from 3 to 10 seconds 2018-09-22 10:06:57 +02:00
Mario Trangoni 60dfff11a0 Fix datbase > database 2018-09-21 13:41:31 +02:00
Mario Trangoni da46cc2fca Fix changed want md5 hash 2018-09-21 13:41:03 +02:00
Mario Trangoni 80fa66fcb0 Fix some typos found by codespell 
See,
$ codespell -S "./.git*,./vendor*,./public*"
 2018-09-21 11:54:52 +02:00
Mario Trangoni 3689bb778c Fix misspell issues 
See,
$ gometalinter --disable-all --enable misspell --deadline 10m --vendor ./...
pkg/api/dtos/alerting_test.go:32:13⚠️ "expectes" is a misspelling of "expects" (misspell)
pkg/api/static/static.go:2:18⚠️ "Unknwon" is a misspelling of "Unknown" (misspell)
pkg/components/imguploader/azureblobuploader.go:55:48⚠️ "conatiner" is a misspelling of "container" (misspell)
pkg/login/ldap_settings.go:51:115⚠️ "compatability" is a misspelling of "compatibility" (misspell)
pkg/middleware/auth_proxy_test.go:122:22⚠️ "Destory" is a misspelling of "Destroy" (misspell)
pkg/middleware/logger.go:2:18⚠️ "Unknwon" is a misspelling of "Unknown" (misspell)
pkg/services/notifications/codes.go:9:13⚠️ "Unknwon" is a misspelling of "Unknown" (misspell)
pkg/services/session/mysql.go:170:3⚠️ "Destory" is a misspelling of "Destroy" (misspell)
pkg/services/session/mysql.go:171:24⚠️ "Destory" is a misspelling of "Destroy" (misspell)
pkg/services/session/session.go:95:4⚠️ "Destory" is a misspelling of "Destroy" (misspell)
pkg/services/session/session.go:96:1⚠️ "Destory" is a misspelling of "Destroy" (misspell)
pkg/services/session/session.go:167:25⚠️ "Destory" is a misspelling of "Destroy" (misspell)
pkg/setting/setting.go:1:18⚠️ "Unknwon" is a misspelling of "Unknown" (misspell)
pkg/tsdb/cloudwatch/cloudwatch.go:199:14⚠️ "resolutin" is a misspelling of "resolutions" (misspell)
pkg/tsdb/cloudwatch/cloudwatch.go:270:15⚠️ "resolutin" is a misspelling of "resolutions" (misspell)
pkg/tsdb/elasticsearch/response_parser.go:531:24⚠️ "Unkown" is a misspelling of "Unknown" (misspell)
pkg/tsdb/elasticsearch/client/search_request.go:113:7⚠️ "initaite" is a misspelling of "initiate" (misspell)

Note: Unknwon is a library name, and Destory a mysql typo.
 2018-09-21 11:54:36 +02:00
Mario Trangoni 03a2a39a2a pkg/tracing/tracing.go: replace deprecated cfg.New function 
$ gometalinter --vendor --disable-all --enable=megacheck --disable=gotype --deadline=6m ./...
pkg/tracing/tracing.go:81:25⚠️ cfg.New is deprecated: use NewTracer() function  (SA1019) (megacheck)
 2018-09-20 22:32:22 +02:00
Mario Trangoni 0dea8fe1e0 pkg/services/sqlstore/user.go: empty branch 
$ gometalinter --vendor --disable-all --enable=megacheck --disable=gotype --deadline=6m ./...
pkg/services/sqlstore/user.go:274:3⚠️ empty branch (SA9003) (megacheck)
 2018-09-20 20:16:14 +02:00
Mario Trangoni 303e70db25 pkg/tsdb/elasticsearch/response_parser.go: simplify redundant code 
$ gometalinter --vendor --disable-all --enable=megacheck --disable=gotype --deadline=6m ./...
pkg/tsdb/elasticsearch/response_parser.go:95:41⚠️ should use make(map[string]string) instead (S1019) (megacheck)
pkg/tsdb/elasticsearch/response_parser.go:125:41⚠️ should use make(map[string]string) instead (S1019) (megacheck)
pkg/tsdb/elasticsearch/response_parser.go:317:5⚠️ redundant break statement (S1023) (megacheck)
pkg/tsdb/elasticsearch/response_parser.go:358:5⚠️ redundant break statement (S1023) (megacheck)
 2018-09-20 20:07:03 +02:00
Mario Trangoni b609d81194 pkg/tsdb/elasticsearch/client/search_request.go: simplify loop with 
append.

$ gometalinter --vendor --disable-all --enable=megacheck --disable=gotype --deadline=6m ./...
pkg/tsdb/elasticsearch/client/search_request.go:59:4⚠️ should replace loop with sr.Aggs = append(sr.Aggs, aggArray...) (S1011) (megacheck)
pkg/tsdb/elasticsearch/client/search_request.go:303:4⚠️ should replace loop with agg.Aggregation.Aggs = append(agg.Aggregation.Aggs, childAggs...) (S1011) (megacheck)
 2018-09-20 20:00:02 +02:00
Mario Trangoni 13a1d0a026 pkg/tsdb/elasticsearch/client/client.go: use time.Since instead of time.Now().Sub 
$ gometalinter --vendor --disable=all --enable=megacheck --deadline=10m ./...
pkg/tsdb/elasticsearch/client/client.go:147:13⚠️ should use time.Since instead of time.Now().Sub (S1012) (megacheck)
pkg/tsdb/elasticsearch/client/client.go:190:14⚠️ should use time.Since instead of time.Now().Sub (S1012) (megacheck)
pkg/tsdb/elasticsearch/client/client.go:218:13⚠️ should use time.Since instead of time.Now().Sub (S1012) (megacheck)
 2018-09-18 23:42:25 +02:00
Mario Trangoni f19fd1a9b0 pkg/plugins/dashboards_updater.go: Simplify err check 
$ gometalinter --vendor --disable=all --enable=megacheck --deadline=10m ./...
pkg/plugins/dashboards_updater.go:51:2⚠️ 'if err != nil { return err }; return nil' can be simplified to 'return err' (S1013) (megacheck)
 2018-09-18 23:42:25 +02:00
Mario Trangoni bb5aaa2dce pkg/services/sqlstore/alert_notification.go: Simplify err check 
$ gometalinter --vendor --disable=all --enable=megacheck --deadline=10m ./...
pkg/services/sqlstore/alert_notification.go:242:3⚠️ 'if err != nil { return err }; return nil' can be simplified to 'return err' (S1013) (megacheck)
 2018-09-18 23:42:20 +02:00
Torkel Ödegaard d964a6505f Merge pull request #13305 from bergquist/devenv_cleanup 
removes unused files
 2018-09-18 12:32:26 +02:00
Nick Triller f8ca55bb1f Fix setting test 2018-09-17 17:56:52 +02:00
bergquist 8dbba467f1 moves /tests to /pkg/plugins 
ref #11433
 2018-09-17 17:29:47 +02:00
Torkel Ödegaard e74ce72410 Merge pull request #13301 from bergquist/devenv_tests 
moves files from /tests to more appropriate folders
 2018-09-17 15:51:42 +02:00
Carl Bergquist f2247c160a Merge pull request #13279 from bergquist/init_some_counter_as_zero 
Internal metrics: starts counters at zero
 2018-09-17 11:09:19 +02:00
Carl Bergquist f22f1d46c8 Merge pull request #10163 from grafana/9587_annotation_tags_wih_temp_var 
annotations: allows template variables to be used in tag filter
 2018-09-17 10:34:38 +02:00
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
bergquist 8e5000fb31 moves files from /tests to more appropriate folders 
ref #11433
 2018-09-17 10:10:20 +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
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 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 5fbe8eff4f ldap: made minor change to group search, and to docs 2018-09-14 11:28:17 +02:00
bergquist 0bf5a6ad71 metrics: starts some counters at zero 
without starting the counter as zero Grafana will not send any metrics
to graphite using the bridge.
 2018-09-14 10:06:10 +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
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
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
bergquist aed8208d78 renames PartialMatch to MatchAny 2018-09-13 15:15:42 +02:00
bergquist 835a75335c Merge branch 'master' into 9587_annotation_tags_wih_temp_var 
* master:
  fix theme parameter not working problem while prefer theme set to light (#13232)
  fix: added type export to fix failing test
  fix: fixed typescript test error
  another circleci fix
  Another circleci fix
  changed gometalinter to use github master
  commented out metalinter as gopkg is having issues
  Fix prometheus label filtering for comparison queries (#13213)
  Upgrade react and enzyme (#13224)
  Teams page replace mobx (#13219)
  upgrade of typescript and tslint and jest (#13223)
  fix nil pointer dereference (#13221)
 2018-09-12 09:23:54 +02:00
qhyou11 1786198558 fix theme parameter not working problem while prefer theme set to light (#13232) 2018-09-12 06:52:38 +02:00
bergquist 1638c6bea1 enable partial tag matches for annotations 2018-09-11 15:50:04 +02:00
Mitsuhiro Tanda 28250271cc fix nil pointer dereference (#13221) 2018-09-11 12:53:39 +02:00