public/grafana
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
38,884 Commits 655 Branches 650 Tags
29fcc463336f7f0e00e94de6fe1cc6350c4eb0da
Commit Graph
38884 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Ryan McKinley 17b9609209 Sparklines should scale to the data range (#12010) 
* Add a full range option to sparklines

* line zero=false
 2018-05-28 16:30:44 +02:00
Torkel Ödegaard 7b09dfe9a0 Merge branch 'davkal/split-webpack-config-hot' 2018-05-28 14:18:35 +02:00
David Kaltschmidt ebe8e62bd5 Split webpack dev config into dev and hot 
Motivation:

* too many conditionals for config, better to be explicit
* different priorities: faster build for hot mode
* working SCSS sources for styles in hot mode

The biggest differences:

* removed linter from TS loader in hot (should be editor or precommit
 or responsibility)
* simplified styles loading
* hot needs more extensions to resolve
* removed commons chunking for hot
* removed devServer from dev

Reduced HMR time from 8s to 4s on my machine.
 2018-05-28 13:49:15 +02:00
David ced8c5f0e4 Upgrade webpack loaders (#12081) 
* upgrade all webpack loaders to recent version
* keep TS loader at 4.0.0 (5.0.0 requires webpack 4)
* remove unused json-loader
 2018-05-28 13:46:57 +02:00
Marcus Efraimsson 5a96863eed pin versions of xorm to resolve sql tests 
Resolves issue with postgres tests.
Also sets timezone of test instance and database to utc to resolve
mysql tests.
Closes #12065
 2018-05-28 13:07:41 +02:00
Carl Bergquist 519e58a267 Merge pull request #12071 from grafana/12056_usage_stats 
Additional anonymous usage stats
 2018-05-28 11:23:16 +02:00
bergquist a2ed0b15da build: fixes broken path for bra run 
removes os and arch from binary path
when building in dev mode
 2018-05-28 10:39:42 +02:00
Marcus Efraimsson c9e9f25699 use sql builder for the get system stats sql query 2018-05-28 10:37:17 +02:00
Carl Bergquist 6c259eb04d Merge pull request #12077 from roidelapluie/logout 
Fix #9847 Add a generic signout_redirect_url to enable oauth logout
 2018-05-28 08:06:00 +02:00
Mitsuhiro Tanda e65cf5cbb5 fix directly specified variable rendering 2018-05-28 11:28:08 +09:00
Daniel Lee de295af231 Merge pull request #12003 from mageo/master 
Added Swiss franc currency
 2018-05-28 01:13:21 +02:00
Sven Klemm 17b46804e8 remove unused function renderAdhocFilters 2018-05-27 19:39:43 +02:00
Sven Klemm d77f9b2e74 send param in callback for get-param-options 2018-05-27 17:25:20 +02:00
Julien Pivotto a5e6cb9a02 Fix #9847 Add a generic signout_redirect_url to enable oauth logout 
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
 2018-05-27 14:52:50 +02:00
Sven Klemm 039e38d510 make separator configurable 2018-05-26 23:03:59 +02:00
Sven Klemm 291d732b36 fix error message 2018-05-26 20:53:01 +02:00