IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2024-11-25 02:10:45 -06:00
Code Issues Packages Projects Releases Wiki Activity
16,222 Commits 5,081 Branches 538 Tags 1.8 GiB
ba4d5ddaaa
Commit Graph

16222 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adrian Muraru
ba4d5ddaaa
Update render.js 2018-09-19 19:36:56 +03:00
Adrian Muraru
dbcd242b09
Updated phantomjs render script to take full height screenshots 2018-09-19 18:43:33 +03:00
Marcus Efraimsson
28ff8a6716
Merge pull request #13342 from svenklemm/unnest 
Don't use unnest in queries for redshift compatibility
 2018-09-19 16:08:23 +02:00
Marcus Efraimsson
978284bc3d
devenv: re-add missing docker-compose files 2018-09-19 14:35:27 +02:00
Torkel Ödegaard
6eb15df953
Merge pull request #13339 from grafana/davkal/13337-fix-rules-filter 
Explore: Fix click to filter for recording rule expressions
 2018-09-19 13:53:42 +02:00
David Kaltschmidt
6aac8610eb Explore: Fix click to filter for recording rule expressions 
- recording rule names contain ':'
- include this in the pattern for metric names
 2018-09-19 11:45:55 +02:00
Sven Klemm
e07513bd65 Don't use unnest in queries for redshift compatibility 2018-09-19 10:59:25 +02:00
Carl Bergquist
fe9d86c070
Merge pull request #13330 from mjtrangoni/fix-megacheck-issues 
Fix megacheck issues
 2018-09-19 09:52:09 +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
61b2100b9f
Merge pull request #13317 from bergquist/nuke_codecov 
disable codecov
 2018-09-18 12:33:24 +02:00
Torkel Ödegaard
d964a6505f
Merge pull request #13305 from bergquist/devenv_cleanup 
removes unused files
 2018-09-18 12:32:26 +02:00
bergquist
0f8b9b8ff9 set maxworkers 2 for frontend tests 2018-09-18 12:18:35 +02:00
bergquist
63ed02e626 removes codedov refs 2018-09-18 11:44:31 +02:00
bergquist
1be26ad362 disable codecov 2018-09-18 11:39:22 +02:00
Marcus Efraimsson
ccf3cb5c8b
Merge pull request #13307 from Nick-Triller/fix_setting_test 
Fix setting test
 2018-09-17 18:28:22 +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
Torkel Ödegaard
3853a0865c
Merge pull request #13300 from bergquist/devenv_docker 
Moves docker/ to devenv/docker
 2018-09-17 15:51:06 +02:00
Torkel Ödegaard
742d2041a4
Merge pull request #13282 from grafana/davkal/explore-multiline-syntax 
Explore: Add multiline syntax highlighting to query field
 2018-09-17 13:20:19 +02:00
bergquist
6938fd5fff Merge branch 'brian2222-patch-1' 
* brian2222-patch-1:
  removes testdata from getting started
  Update getting_started.md
 2018-09-17 11:51:48 +02:00
bergquist
d84a0ec3e7 removes testdata from getting started 2018-09-17 11:50:22 +02:00
bergquist
8e69d7731a moves benchmark script to devenv 
ref #11433
 2018-09-17 11:17:23 +02:00
bergquist
c1f797ed90 moves docker/ to devenv/docker 2018-09-17 11:10:03 +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
bergquist
d9ca8b43b7 changelog: adds note about closing #9735 2018-09-17 10:50:32 +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
Marcus Efraimsson
6ffca7f184
docs: add version disclaimer for postgres query editor 2018-09-17 10:32:28 +02:00
Marcus Efraimsson
112f03a6ab
Merge pull request #13293 from svenklemm/postgres-docs-query-builder 
Add documentation for postgres query builder
 2018-09-17 10:28:39 +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
bergquist
7588283287 docs: template variable support for annotations 2018-09-17 09:30:03 +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
brian2222
02dd27333e
Update getting_started.md 
list of datasources updated in section: dashboards, panels, the buildingblocks of grafana...
 2018-09-16 18:22:09 -07: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
Sven Klemm
138e7ab264 Add documentation for PostgreSQL query builder 2018-09-14 21:58:02 +02: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