public/grafana
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
14,297 Commits 655 Branches 650 Tags
f2b5b6f299491d37ba277b6d3cd33e287c0e7ce7
Commit Graph
14297 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Carl Bergquist f2b5b6f299 Merge pull request #11694 from flopp999/patch-5 
Added requests/sec(throughput)
 2018-04-24 21:30:34 +02:00
Marcus Efraimsson 7626775491 Merge pull request #11695 from grafana/11508_variables_preview_values 
allow to show more preview values for variables
 2018-04-24 20:05:47 +02:00
Patrick O'Carroll a40314022b added pointer to show more, reset values on new query 2018-04-24 17:40:03 +02:00
Marcus Efraimsson d36efddcf7 Merge pull request #11699 from grafana/11466-edit-row 
fixed so user who can edit dashboard can edit row
 2018-04-24 14:57:50 +02:00
Carl Bergquist 005556632f Merge pull request #11705 from mjtrangoni/fix-ineffassign-issues 
Fix ineffassign issues
 2018-04-24 12:56:16 +02:00
Patrick O'Carroll 38a4a2dc60 changed test name and dashboardMock code 2018-04-24 11:22:58 +02:00
Patrick O'Carroll 1446f54447 fixed test 2018-04-24 09:45:53 +02:00
Mario Trangoni 2e927a1053 add ineffassign to circleci gometalinter check 2018-04-23 20:07:31 +02:00
Mario Trangoni b02a860e66 pkg/components: fix ineffassign issues 2018-04-23 20:03:57 +02:00
Mario Trangoni 15f11effa0 pkg/cmd: fix ineffassign issues 2018-04-23 19:34:55 +02:00
Mario Trangoni bc570bb140 pkg/log: fix ineffassign issues 2018-04-23 19:31:23 +02:00
Mario Trangoni 6eb00000fe pkg/services: fix ineffassign issues 2018-04-23 19:28:54 +02:00
Patrick O'Carroll 45e6d9fcc4 removed import config 2018-04-23 17:45:51 +02:00
Patrick O'Carroll 3eaaa5d32d fixed so user who can edit dashboard can edit row, fixes #11466 2018-04-23 17:44:29 +02:00
Leonard Gram 3a48ea8dde Fixes signing of packages. 
Signing was failing as the builds
were expected to run as ubuntu but
is run as root.

Closes #11686
 2018-04-23 17:05:32 +02:00
Dan Cech affd3d15a0 Merge pull request #11150 from sbskas/master 
Make Ldap group composed of  DNs work.
 2018-04-23 10:49:45 -04:00
Marcus Efraimsson d14ac54af6 db: fix failing user auth tests for postgres 2018-04-23 16:02:59 +02:00
Daniel Lee 1dea5cb34b Merge pull request #11683 from marefr/11668_default_permissions 
Fix for default permissions on folder are not shown as inherited in it's dashboards
 2018-04-23 14:58:22 +02:00
flopp999 28ce71253f changed rps to reqps 2018-04-23 14:06:25 +02:00
bergquist 3cca45dd88 bump version 2018-04-23 13:59:52 +02:00
Patrick O'Carroll c2cc77fa08 added button to show more preview values for variables, button runs a function that increases options limit, fixes #11508 2018-04-23 13:00:24 +02:00
flopp999 1cc4c0c1f0 Added requests/sec(throughput) 
#9630
 2018-04-23 12:05:26 +02:00
Marcus Efraimsson 079346917f use inherited property from api when rendering permissions 2018-04-23 09:23:31 +02:00
Marcus Efraimsson d86ed679b1 return inherited property for permissions 2018-04-23 09:23:14 +02:00
Carl Bergquist 6315142d00 Merge pull request #11689 from mjtrangoni/fix-ineffassign-issues 
pkg/tsdb: fix ineffassign isues
 2018-04-23 07:57:55 +02:00
Carl Bergquist 7e089314f7 Merge pull request #11688 from mjtrangoni/fix-gometalinter-circleci 
fix CircleCI gometalinter test
 2018-04-23 07:54:21 +02:00
Mario Trangoni 556219b192 pkg/tsdb: fix ineffassign isues 2018-04-22 20:51:58 +02:00
Mario Trangoni fd20aa7c03 fix circleci gometalinter test 2018-04-22 16:22:29 +02:00
Daniel Lee 6b5854936d Merge pull request #11502 from marefr/graphite_ds_test 
graphite: use a query when testing data source
 2018-04-22 11:31:51 +02:00
Daniel Lee b5a54c535b Merge pull request #11654 from svenklemm/postgres-docs-timefilter 
postgres: adjust timeFilter, timeFrom and timeTo macro examples
 2018-04-22 11:16:15 +02:00
Sven Klemm eb994ad72e Merge remote-tracking branch 'upstream/master' into postgres-docs-timefilter 2018-04-21 18:31:45 +02:00
Daniel Lee 3451f9a9db Merge branch 'annotations-created' of https://github.com/ryantxu/grafana into ryantxu-annotations-created 2018-04-20 17:14:06 +02:00
bergquist e168bfe03e docs: release 5.1.0-beta1 2018-04-20 13:23:45 +02:00
bergquist 177220e2fe build: fixes release deploy 2018-04-20 12:59:44 +02:00
bergquist d7f58d74d3 changelog: adds releaste date for 5.1.0-beta1 2018-04-20 11:16:24 +02:00
Daniel Lee cdbd4e0fc0 graphite: convert ds test to jest 2018-04-20 11:09:52 +02:00
Daniel Lee c2064781a0 Merge pull request #11640 from grafana/11637-dropdown-styling 
removed padding and moved carrot
 2018-04-20 11:05:40 +02:00
bergquist 98bbb01898 build: removes gometalinter 
for some reason the linter lints files in /vendor
which it should not. So we have to remove it until
it works as expected

ref #10381
 2018-04-20 10:35:29 +02:00
bergquist 03a9650c57 cli: adds os and arch headers 
this makes it possible for the plugin repo
to provide the correct package if arch and os matters
 2018-04-20 09:52:25 +02:00
Dan Cech 7cc3d0c34e Merge branch 'master' into master 2018-04-19 12:01:48 -04:00
Sven Klemm 5076f9304b slightly better example 2018-04-19 17:01:48 +02:00
Sven Klemm 048cecdab5 adjust timeFilter, timeFrom and timeTo macro examples 2018-04-19 16:56:58 +02:00
bergquist 7a62231816 build: only lint the pkg folder 2018-04-19 11:29:02 +02:00
bergquist f50bcb6aae changelog: adds note about closing #11476 2018-04-19 11:20:29 +02:00
Carl Bergquist 2dfa576c76 Merge pull request #11504 from hahnjo/11476-influxdb-show-cardinality 
influxdb: Check before assuming first column to be 'time'
 2018-04-19 11:18:01 +02:00
Marcus Efraimsson e6f38591b5 dev: only build server with bra run 2018-04-19 10:43:31 +02:00
Carl Bergquist 4f0d7586ae Merge pull request #11648 from mjtrangoni/add-gometalinter-circleci 
Add gometalinter to CircleCI
 2018-04-19 09:35:21 +02:00
Mario Trangoni 3543f1c3d4 add gometalinter to circleci 2018-04-18 22:52:21 +02:00
Mario Trangoni 33ae8d35ea comment unused struct fields 2018-04-18 22:23:49 +02:00
Carl Bergquist 89acafd567 Merge pull request #11646 from mjtrangoni/fix-varcheck-issues 
remove unused variables detected by varcheck
 2018-04-18 21:45:11 +02:00