Leonard Gram
b379b28337
build: only runs db related tests on db.
2018-05-30 16:27:47 +02:00
Leonard Gram
e33b17fac6
build: integration testing postegres on ci.
2018-05-30 16:27:47 +02:00
Leonard Gram
50d1519a91
build: mysql integration testing on ci.
2018-05-30 16:27:47 +02:00
David Kaltschmidt
827fb7e8de
Fix karma tests that rely on MetricsPanelCtrl
2018-05-30 15:24:47 +02:00
Leonard Gram
21ecaae6ff
changelog: Second epochs are now correctly converted to ms.
2018-05-30 14:30:01 +02:00
David Kaltschmidt
7224ca6c62
Fix panel menu test
2018-05-30 13:24:09 +02:00
David Kaltschmidt
f69654fcd5
Restrict Explore UI to Editor and Admin roles
...
Access is restricted via not showing in the following places:
* hide from sidemenu
* hide from panel header menu
* disable keybinding `x`
Also adds a `roles` property to reactContainer routes that will be
checked if `roles` is set, and on failure redirects to `/`.
2018-05-30 13:13:29 +02:00
David
7a3c1e162c
Merge pull request #11942 from grafana/davkal/design-integration
...
Explore: Time selector, split view, design integration
2018-05-30 12:27:24 +02:00
David Kaltschmidt
ac1dda3b3a
Fix CSS to hide grid controls in fullscreen/low-activity views
...
* there was a comma missing to hide the handles, fixed now
* added new styles to hide header interaction in full screen panels
2018-05-30 12:07:51 +02:00
David
40844614bf
Merge pull request #12096 from grafana/davkal/11446-fix-systemjs-cachebust
...
Fix cache busting for systemjs imports for plugins
2018-05-30 10:05:46 +02:00
Marcus Efraimsson
f2942d94a5
changelog: add notes about closing #11645
...
[skip ci]
2018-05-30 09:26:15 +02:00
Kim Christensen
48fc5edda1
Support InfluxDB count distinct aggregation ( #11658 )
...
influxdb: support count distinct aggregation
2018-05-30 09:22:16 +02:00
bergquist
c7acbcdaf5
provisioning: enable relative path's
...
this commit enable relatives path for provisioning dashboards.
this enables easier dev setups
2018-05-30 08:46:44 +02:00
bergquist
f32e3a2960
changelog: note about closing #11858
2018-05-29 17:22:52 +02:00
Carl Bergquist
813a9a975f
Merge pull request #12090 from grafana/11858_create_dashboard_link
...
Show create dashboard link if at least editor in one folder
2018-05-29 17:18:41 +02:00
bergquist
b253284acc
devenv: improve readme
2018-05-29 16:52:02 +02:00
bergquist
1411709db1
provisioning: place testfiles within testdata folder
2018-05-29 16:30:12 +02:00
David
9b9e3962c5
Merge pull request #12072 from grafana/davkal/12024-fix-alignment
...
Changed Prometheus interval-alignment to cover whole panel range
2018-05-29 15:03:06 +02:00
Marcus Efraimsson
048ac3089b
Merge branch 'master' into feature/add_es_alerting
2018-05-29 14:36:52 +02:00
Marcus Efraimsson
79575ea124
changelog: add notes about closing #11494
...
[skip ci]
2018-05-29 14:29:00 +02:00
Christophe Le Guern
3ba3fd9a59
Add new regions to handleGetRegions function ( #12082 )
...
As public/app/plugins/datasource/cloudwatch/partials/config.html and this file differ between the AWS regions available, I've updated the latest so they share the same data.
In that way, the regions() method in dashboards returns the same list as the frontend does.
2018-05-29 14:26:33 +02:00
Torkel Ödegaard
6e145ad32d
Merge branch 'master' of github.com:grafana/grafana
2018-05-29 14:11:36 +02:00
Torkel Ödegaard
4c9b146bda
PR: minor change to PR #12004 before merge
2018-05-29 14:11:05 +02:00
Marcus Efraimsson
2c8571a686
Merge pull request #12089 from bergquist/graphite_header
...
graphite: avoid distributed tracing headers in direct/browser mode
2018-05-29 14:07:18 +02:00
Torkel Ödegaard
249e682511
Merge branch 'master' of https://github.com/mammuthus/grafana
2018-05-29 14:04:54 +02:00
Torkel Ödegaard
be34417b3a
fix: refactoring PR #11996 and fixing issue #11551 16706hashkey in json editors
2018-05-29 14:02:52 +02:00
bergquist
a1e6c31ec1
devenv: script for setting up default datasources
2018-05-29 14:00:46 +02:00
Torkel Ödegaard
634a26d2eb
Merge branch 'remove_hash' of https://github.com/eMerzh/grafana
2018-05-29 13:25:44 +02:00
Torkel Ödegaard
ddd5e5ae70
tech: updated react-grid-layout to latest official release, closes #12100
2018-05-29 13:23:07 +02:00
David
c67d72db63
Merge pull request #12041 from grafana/davkal/11931-table-docs
...
Document table row merge for multiple queries
2018-05-29 12:08:55 +02:00
David Kaltschmidt
8bcd55d221
Fix cache busting for systemjs imports for plugins
...
* everything imported via systemjs in the path `plugin/` will get a
timestamp appended for cache busting
* timestamp is set once on page load
* plugin css loader gets cache buster too
2018-05-29 12:01:10 +02:00
bergquist
6a82098ddf
devenv: scripts for generating many unique dashboards
2018-05-29 11:52:00 +02:00
Marcus Efraimsson
e80f54c243
Merge pull request #12094 from grafana/elastic6-docker
...
docker: new block for elasticsearch6
2018-05-29 11:22:42 +02:00
Daniel Lee
fb41048dd7
docker: new block for elasticsearch6
2018-05-29 11:04:16 +02:00
Marcus Efraimsson
2d5ec9b9e4
changelog: add notes about closing #12087
...
[skip ci]
2018-05-29 10:50:13 +02:00
Marcus Efraimsson
1bc94c7d5a
Merge pull request #12088 from thurt/12087-better-error-when-smtp-not-configured
...
inviting users: show friendlier error message when smtp is not configured
2018-05-29 10:46:46 +02:00
Leonard Gram
e6f2811b21
sql: seconds epochs are now correctly converted to ms.
...
Closes #12061
2018-05-29 08:44:03 +02:00
Marcus Efraimsson
7c3e8afd82
add validation of uid when importing dashboards
2018-05-28 22:34:40 +02:00
Brice Maron
01f80950de
fix: add track by name in annotation list to avoid $$hashKey in json
2018-05-28 21:11:32 +02:00
bergquist
83b7bbd60b
changelog: adds note about closing #9703
2018-05-28 20:55:11 +02:00
bergquist
add791b2cc
Merge branch '9703-auth-proxy'
...
* 9703-auth-proxy:
go fmt fixes
configure proxy environments for Transport property
2018-05-28 20:49:40 +02:00
bergquist
d7b5fb4604
go fmt fixes
2018-05-28 20:48:01 +02:00
iyeonok
bafe25fbd9
configure proxy environments for Transport property
...
related issue: https://github.com/grafana/grafana/issues/9703
2018-05-28 20:48:01 +02:00
Marcus Efraimsson
7548d6f6d1
Show create dashboard link if at least editor in one folder
2018-05-28 20:37:39 +02:00
bergquist
e708e9ac3c
graphite: avoid dtracing headers in direct mode
...
closes #11494
2018-05-28 20:35:19 +02:00
David Kaltschmidt
6d8d6cdb57
Fix sourcemaps for webpack hot config
2018-05-28 20:32:33 +02:00
thurt
b487aa3e6a
return better error message when err is ErrSmtpNotEnabled
...
fixes #12087
2018-05-28 17:49:31 +00:00
Marcus Efraimsson
7cb0403faa
elasticsearch: handle if alert query contains template variable
...
If datasource handles targetContainsTemplate function it can evaluate if a certain
query contains template variables and this is used for show an error message that
template variables not is supported in alert queries.
2018-05-28 19:45:18 +02:00
Marcus Efraimsson
e5e1683840
Merge branch 'master' into feature/add_es_alerting
2018-05-28 18:10:34 +02:00
bergquist
8d400b8f7b
changelog: adds note about closing #9847
2018-05-28 17:50:36 +02:00
