Commit Graph
20263 Commits
Author SHA1 Message Date
Peter Holmberg f52aa4de4e Merge branch '15217-panels-without-queries' into move-error-boundry 2019-02-12 16:13:15 +01:00
Peter Holmberg f0565684c7 Merge branch '15217-panels-without-queries' of https://github.com/grafana/grafana into 15217-panels-without-queries 2019-02-12 16:11:04 +01:00
Peter Holmberg 530a370379 bubble error from datapanel to panelchrome 2019-02-12 16:06:02 +01:00
Johannes Schill c3965e332d chore: Rename renderPanel to renderPanelBody 2019-02-12 12:28:53 +01:00
Johannes Schill d5918498da chore: Rename renderDataPanel to renderPanel 2019-02-12 12:28:53 +01:00
Johannes Schill 01208ccd68 chore: Rename renderHelper > renderDataPanel and move logic to smaller functions 2019-02-12 12:28:53 +01:00
Johannes Schill b5dbf26dc4 chore: PR feedback, shorten boolean check 2019-02-12 12:28:53 +01:00
Johannes Schill 075fb8e91c chore: Rename isDataPanel to noQueries 2019-02-12 12:28:53 +01:00
Johannes Schill b7b1a79405 chore: Only show Queries tab for panel plugins with isDataPanel set to true 2019-02-12 12:28:53 +01:00
Johannes Schill d3115325a9 feat: Only use the DataPanel component when panel plugin has isDataPanel set to true in plugin.json. And fix PanelData when using snapshots 2019-02-12 12:28:53 +01:00
Johannes Schill 3f64d61fd2 feat: Add util to convert snapshotData to PanelData 2019-02-12 12:28:53 +01:00
Johannes Schill c4b2dcefbe feat: Introduce IsDataPanel attribute to plugin.json 2019-02-12 12:28:53 +01:00
Johannes Schill 0811fbd6d0 fix: Add missing typing 2019-02-12 12:28:52 +01:00
Torkel Ödegaard e5759fa0ed Merge pull request #15387 from grafana/hugoh/can-not-set-decimal-threshold-in-gauge
Fixes #15372 with number input and parseFloat
2019-02-12 12:22:09 +01:00
Hugo Häggmark da80286f97 Fixes #15372 with number input and parseFloat 2019-02-12 11:10:31 +01:00
Peter Holmberg 1db5d86b12 Merge branch '15217-panels-without-queries' into move-error-boundry 2019-02-12 10:54:55 +01:00
Peter Holmberg 7d0edb285d Revert "hard move"
This reverts commit a2dad6157a.
2019-02-12 10:53:05 +01:00
Johannes Schill be58e275a5 chore: PR feedback, shorten boolean check 2019-02-12 09:55:09 +01:00
Torkel Ödegaard bc8418adac Merge branch 'master' of github.com:grafana/grafana 2019-02-12 09:49:01 +01:00
Johannes Schill 2db9cb3d93 chore: Rename isDataPanel to noQueries 2019-02-12 09:48:46 +01:00
Torkel Ödegaard 38a74c6444 Merge pull request #15383 from bergquist/test_provisoned_ds
enable testing provsioned datasources
2019-02-12 09:48:36 +01:00
bergquist 3b9105e1be enable testing provsioned datasources
closes #12164
2019-02-12 08:45:21 +01:00
Torkel Ödegaard 342aa0ad01 Merge branch 'master' of github.com:grafana/grafana 2019-02-12 08:22:28 +01:00
Torkel Ödegaard edd9576f15 Fixed elastic5 docker compose block 2019-02-12 08:04:30 +01:00
Torkel Ödegaard 1407691de2 Merge pull request #15377 from grafana/fix/named-colors-palette-default-colors
Fix error caused by named colors that are not part of named colors palette
2019-02-12 06:57:19 +01:00
Dominik Prokop a5d158c014 Added one more test case for color resolving helper 2019-02-11 21:22:53 +01:00
Dominik Prokop ed208f2b5f Fix error caused by named colors that are not part of named colors palette 2019-02-11 21:11:19 +01:00
Torkel Ödegaard b590c4da40 Merge pull request #15371 from grafana/react-panels-request-id-fix
Fixed issue with gauge requests being cancelled
2019-02-11 20:47:27 +01:00
Torkel Ödegaard fc91e1cf57 Fixed issue with gauge requests being cancelled 2019-02-11 17:47:47 +01:00
Torkel Ödegaard e38cfc1a71 Update package.json 2019-02-11 17:43:02 +01:00
Torkel Ödegaard 0493d905f1 Update CHANGELOG.md 2019-02-11 17:42:31 +01:00
Torkel Ödegaard a79bd42414 Merge pull request #15306 from grafana/explore/dedup-strategu-url
Persist deduplication strategy in url
2019-02-11 17:12:41 +01:00
Daniel Lee 951e5932d4 changelog: adds note for #15363 2019-02-11 17:00:16 +01:00
Torkel Ödegaard e50b7b3279 Merge branch 'ui-new-red-green-blue' 2019-02-11 16:51:30 +01:00
Torkel Ödegaard 99df7b87c0 Merge branch 'master' of github.com:grafana/grafana 2019-02-11 16:51:24 +01:00
Torkel Ödegaard 6d11999e20 Merge pull request #15367 from grafana/gauge-max-value
Fix issue with Max value in Gauge
2019-02-11 16:50:42 +01:00
Torkel Ödegaard 5195954681 style tweak to alert 2019-02-11 16:50:12 +01:00
Daniel Lee 18615a3357 Merge pull request #15363 from bergquist/edition_to_build_info
adds edition to build_info metric
2019-02-11 16:46:53 +01:00
Torkel Ödegaard afc2efa56d Removed plus icons 2019-02-11 16:45:47 +01:00
Peter Holmberg a2dad6157a hard move 2019-02-11 16:44:09 +01:00
Torkel Ödegaard 8e93b68e6d restoring green CTA 2019-02-11 16:38:05 +01:00
Torkel Ödegaard b920ee0ea3 Merge branch 'master' into ui-new-red-green-blue 2019-02-11 16:26:58 +01:00
Torkel Ödegaard b93cdf56fb Removed double page container 2019-02-11 16:26:02 +01:00
Johannes Schill 0019e0ffc9 chore: Only show Queries tab for panel plugins with isDataPanel set to true 2019-02-11 16:21:54 +01:00
Peter Holmberg c332e106a2 Removing default thresholds values. 2019-02-11 16:00:08 +01:00
bergquist e4e42fcd08 adds edition to build_info metric 2019-02-11 15:42:12 +01:00
Torkel Ödegaard c4fa64e6dc Updated lint-staged 2019-02-11 15:23:50 +01:00
Daniel Lee 93f1a48641 changelog: adds note for #14623 2019-02-11 15:21:02 +01:00
Torkel Ödegaard 4408817e65 Fixed double page class on api keys and org details page 2019-02-11 15:18:11 +01:00
Daniel Lee 1c364b57b5 Merge pull request #15353 from grafana/14623-azure-monitor-alerting
Adds alerting for the Azure Monitor API in the Azure Monitor datasource
2019-02-11 15:16:32 +01:00