Commit Graph

14930 Commits

Author SHA1 Message Date
Marcus Efraimsson
67410f7a4d
changelog: add notes about closing #10748, #8805
[skip ci]
2018-05-31 15:48:19 +02:00
Patrick O'Carroll
37f9bdfc8c save modal ux improvements (#11822)
changes to save modal when saving an updated dashboard

Changed time range and variables are now not saved by default, 
you'll need to actively choose if you want to save updated time 
range and or variables.
2018-05-31 15:40:57 +02:00
Marcus Efraimsson
938deae4b4
changelog: add notes about closing #11515
[skip ci]
2018-05-31 15:24:01 +02:00
Marcus Efraimsson
a1b20bf69a
Merge pull request #12092 from grafana/11515_import_uid
Validate uid when importing dashboards
2018-05-31 15:18:24 +02:00
bergquist
44f5b92fbc provisioning: only provision if json file is newer then db 2018-05-31 11:38:29 +02:00
David Kaltschmidt
0c45ee63a9 Guard /explore by editor role on the backend 2018-05-31 11:26:24 +02:00
bergquist
2bd4c14e5f make path absolute before following symlink 2018-05-31 09:53:15 +02:00
bergquist
47d3884377 provisioning: follow symlinked folders
fixes #11958
2018-05-31 09:38:09 +02:00
bergquist
d5aeae3a90 test: fixes broken test on windows 2018-05-31 08:27:29 +02:00
Carl Bergquist
5c30643f6e
Merge pull request #12101 from bergquist/devenv
devenv: initial scripts for setting up devenv
2018-05-30 21:49:17 +02:00
Marcus Efraimsson
82ba27b5f2
changelog: add notes about closing #11771
[skip ci]
2018-05-30 21:31:31 +02:00
Marcus Efraimsson
d2296d332e
Merge pull request #12107 from grafana/davkal/11771-hide-gridcontrols
Fix CSS to hide grid controls in fullscreen/low-activity views
2018-05-30 21:29:24 +02:00
Marcus Efraimsson
a4b1dd036d
changelog: add notes about closing #11971
[skip ci]
2018-05-30 18:11:47 +02:00
Patrick O'Carroll
b894b5e669 Fix singlestat threshold tooltip (#12109)
fix singlestat threshold tooltip
2018-05-30 18:09:57 +02:00
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