Peter Holmberg
dd2fb7961f
removed snaps
2018-10-17 10:37:56 +02:00
Peter Holmberg
776f9aa288
Merge remote-tracking branch 'origin/data-source-instance-to-react' into permissions-code-to-enterprise
2018-10-17 10:00:18 +02:00
Peter Holmberg
66311a065c
removing datasource permissions states from grafana
2018-10-16 15:36:33 +02:00
Leonard Gram
1329c70965
codestyle
2018-10-16 14:22:50 +02:00
Peter Holmberg
ee0cc9bd77
Merge branch 'master' into data-source-instance-to-react
2018-10-16 12:14:11 +02:00
Peter Holmberg
ef0def2277
Merge branch 'master' into permissions-code-to-enterprise
2018-10-16 11:09:58 +02:00
Torkel Ödegaard
c1399a0404
Merge pull request #13686 from grafana/logo-alt-text
...
Logo alt text + unwanted char
2018-10-16 09:58:35 +02:00
Johannes Schill
2a82b57d93
Remove unwanted char
2018-10-16 08:11:26 +02:00
Johannes Schill
6d3f037ef1
Fix incorrect alt text on logo
2018-10-16 07:50:44 +02:00
Marcus Efraimsson
f4b7b003be
changelog: add notes about closing #13464
...
[skip ci]
2018-10-16 01:08:37 +02:00
Marcus Efraimsson
baa3985478
changelog: add notes about closing #13553
...
[skip ci]
2018-10-16 01:05:45 +02:00
Marcus Efraimsson
e86027e3d3
update changelog
...
[skip ci]
2018-10-16 01:03:20 +02:00
Carl Bergquist
efe9d27820
Merge pull request #13683 from eripe970/patch-2
...
Small readme update, link to license
2018-10-15 23:59:56 +02:00
Carl Bergquist
795a24d027
Merge pull request #13681 from eripe970/patch-1
...
Small fixes to documentation
2018-10-15 23:59:27 +02:00
Erik Pettersson
85597862f3
doc(documentation) license
...
Link to the grafana license file from the docs.
2018-10-15 23:42:49 +02:00
Erik Pettersson
25b68809b0
doc(documenation)
...
Use same name for Elasticsearch. The docs contained a mix of Elastic and Elasticsearch.
2018-10-15 23:35:47 +02:00
Torkel Ödegaard
938541be2e
Merge pull request #13660 from grafana/alerting-validation-messages
...
Alerting: Propagate alert validation issues to the api/user
2018-10-15 18:16:29 +02:00
Marcus Efraimsson
709458501e
Merge pull request #13675 from ankon/patch-1
...
Fix grammar in log message
2018-10-15 17:27:02 +02:00
Leonard Gram
6fd3430677
build: makes sure publisher.sh is available when deploying.
2018-10-15 14:54:21 +02:00
Andreas Kohn
272274220c
Fix grammar in log message
2018-10-15 14:37:12 +02:00
Marcus Efraimsson
bac937f079
changelog: add notes about closing #13641 #13650
...
[skip ci]
2018-10-15 14:28:47 +02:00
Marcus Efraimsson
e830352d38
changelog: add notes about closing #13628
...
[skip ci]
2018-10-15 11:46:12 +02:00
Marcus Efraimsson
9f85a7494a
Merge pull request #13651 from grafana/13628_fix_dag
...
Make sure to add all variable nodes to directed acyclic graph (dag) before linking variables
2018-10-15 11:42:59 +02:00
Marcus Efraimsson
d9b73418f1
update .bra.toml for using latest bra version
2018-10-15 11:03:24 +02:00
Carl Bergquist
3f6f98a532
Merge pull request #13661 from mjtrangoni/remove-os-kill
...
Remove os.Kill as it cannot be trapped
2018-10-15 08:47:26 +02:00
Torkel Ödegaard
a029492d91
Merge pull request #13355 from jsferrei/jsferrei/fix-annotation-render-issue
...
Fix graph render blocked by annotations issue
2018-10-14 10:35:16 +02:00
Torkel Ödegaard
5e9ef5f699
Merge pull request #13664 from steaksauce-/master
...
Removed reference to plugin_api.md (SDK Readme)
2018-10-14 10:23:46 +02:00
Torkel Ödegaard
3de439ddca
Update CHANGELOG.md
2018-10-14 10:23:15 +02:00
Torkel Ödegaard
40e3758698
Merge pull request #13662 from franciscocpg/adding-time-clock
...
Adding time clock
2018-10-14 10:19:39 +02:00
Torkel Ödegaard
37548792f5
Merge pull request #13659 from grafana/graph-time-format-fix
...
fix for graph time formating for Last 24h ranges
2018-10-14 10:16:37 +02:00
steaksauce-
77856d090b
Removed reference to plugin_api.md (SDK Readme) on the development page as the file that it points to no longer exists. This addresses an open issue on the grafana.org repo
2018-10-13 22:16:47 -05:00
Francisco Guimarães
b4bca473db
Adding tests
2018-10-13 09:32:21 -03:00
Francisco Guimarães
3db5d14214
Adding time clockms and clocks
2018-10-13 09:03:16 -03:00
Mario Trangoni
6218fadf21
pkg/cmd/grafana-server/main.go: remove os.Kill as it cannot be trapped
...
See,
$ gometalinter --vendor --deadline 10m --disable-all --enable=megacheck ./...
pkg/cmd/grafana-server/main.go:103:42⚠️ os.Kill cannot be trapped (did you mean syscall.SIGTERM?) (SA1016) (megacheck)
2018-10-13 11:02:36 +02:00
Torkel Ödegaard
ba67dc7689
changed to plain errors further down the alerting validation model so error did not get double wrapping in ValidationError
2018-10-12 23:15:23 -07:00
Torkel Ödegaard
ec4698fb96
alerting: propagate alert validation issues to the user instead of just 'invalid alert data' message
2018-10-12 23:03:54 -07:00
Torkel Ödegaard
d17025fb43
Merge pull request #13631 from mjtrangoni/fix-megacheck-issues
...
Fix trivial megacheck issues
2018-10-13 06:56:29 +02:00
Torkel Ödegaard
7051a150cf
updated gitignore
2018-10-12 21:55:45 -07:00
Torkel Ödegaard
193829adac
Merge pull request #13656 from olshansky/fix-label-values-regex
...
fix: label values regex for single letter labels
2018-10-13 06:53:33 +02:00
Torkel Ödegaard
8452bbceb3
Merge pull request #13657 from i-ky/patch-1
...
Typos in plugin development documentation
2018-10-13 06:53:00 +02:00
Torkel Ödegaard
551e0843fa
fix for graph time formating for Last 24h ranges, fixes #13650
2018-10-12 21:51:21 -07:00
Mario Trangoni
74533a7a19
pkg/services/sqlstore/user_auth_test.go: comment unused users slice
...
See,
$ gometalinter --vendor --deadline 10m --disable-all --enable=megacheck ./...
pkg/services/sqlstore/user_auth_test.go:28:18⚠️ this result of append is never used, except maybe in other appends (SA4010) (megacheck)
2018-10-13 02:35:03 +02:00
i-ky
e950fa7983
fixed a typo
2018-10-13 01:15:16 +03:00
i-ky
7acea2a109
fixed a typo
2018-10-13 00:45:05 +03:00
olshansky
91e201ffa8
fix: label values regex for single letter labels
...
Closes : #13641
2018-10-12 23:13:11 +03:00
Torkel Ödegaard
4fefb2039d
Merge pull request #13649 from grafana/update-jest-23-10
...
updated jest to 23.10
2018-10-12 15:16:12 +02:00
Leonard Gram
97a3a4f33a
removes debug log.
2018-10-12 15:13:55 +02:00
Marcus Efraimsson
4b1a2d3b11
make sure to add all variable nodes to dag before linking variables
2018-10-12 14:15:44 +02:00
Daniel Lee
23d38ffc8d
changelog: adds note for #13607
2018-10-12 14:00:52 +02:00
Torkel Ödegaard
e78c1b4abc
Merge pull request #13644 from grafana/backend-hooks-service
...
Adds backend hooks service so extensions can modify index data
2018-10-12 13:47:40 +02:00
