IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-09 23:16:16 -06:00
Code Issues Packages Projects Releases Wiki Activity
20,709 Commits 5,440 Branches 554 Tags 1.9 GiB
878da68c90
Commit Graph

9670 Commits

Author SHA1 Message Date
Torkel Ödegaard
b21eb36909 Merge branch 'master' of github.com:grafana/grafana 2019-02-21 12:18:34 +01:00
Torkel Ödegaard
31511ee3cc fixed snapshots failing in master 2019-02-21 12:10:01 +01:00
Dominik Prokop
0df56f9356 Merge branch 'master' into cli/watch-sass-var 2019-02-21 11:56:54 +01:00
Marcus Efraimsson
c586bc519f
Merge pull request #15553 from grafana/14507_fix 
fix; mysql query using __interval_ms variable throws error
 2019-02-21 11:40:54 +01:00
Torkel Ödegaard
9a7866a040
Merge pull request #15560 from grafana/scrollbar-fixes 
Fixed scrollbar issue introduced in theme changes
 2019-02-21 11:32:19 +01:00
Marcus Efraimsson
d8e655bbcf
fix: mysql query using __interval_ms variable throws error 
fixes #14507
 2019-02-21 10:25:52 +01:00
Dominik Prokop
9b03815141 Merge branch 'master' into cli/watch-sass-var 2019-02-21 09:50:24 +01:00
Torkel Ödegaard
7d105439f9 Fixed scrollbar issue introduced in theme changes 2019-02-21 09:41:53 +01:00
Dominik Prokop
f28cc871e1 Fix build 2019-02-21 09:09:24 +01:00
ijin08
a9c5fe5be1 updated colors in light, dark and theme files, in template file basic colors uses variables from dark/light files, also changed to -basic in some files 2019-02-20 16:11:36 +01:00
Torkel Ödegaard
20a03db144
Merge pull request #15510 from grafana/fix/graphite-func-editor 
Display graphite function name editor in a tooltip
 2019-02-20 10:48:08 +01:00
Dominik Prokop
5f4f559d19 Fix blue in dark theme 2019-02-19 21:23:04 +01:00
Daniel Lee
c5a70e9b97 Pass dashboardModel to PanelCtrl class. Fixes #15541 2019-02-19 18:53:07 +01:00
Dominik Prokop
d19616a16b Merge branch 'master' into cli/watch-sass-var 2019-02-19 17:27:25 +01:00
Dominik Prokop
83bb3fb8d4 Remove old overwritten sass vars 2019-02-19 17:05:50 +01:00
Johannes Schill
6f9edf4a22 fix: Filter out values not supported by Explore yet #15281 2019-02-19 16:43:39 +01:00
Dominik Prokop
88a46e6dd4 Bump Prettier version (#15532) 
* Fix prettier version to 1.16.4
 2019-02-19 15:41:35 +01:00
ijin08
2372474ca8 updated theme variables to master 2019-02-19 13:57:56 +01:00
Torkel Ödegaard
5b1cf9c94f
Merge pull request #15530 from grafana/graph2-using-reactpanelplugin 
graph2 should use ReactPanelPlugin from @grafana/ui
 2019-02-19 12:08:02 +01:00
Torkel Ödegaard
3f1c4c3ed9
Merge pull request #15531 from grafana/hugoh/react-switch-works-outside-switch 
Surrounded Switch with div to restrict size
 2019-02-19 12:06:59 +01:00
Hugo Häggmark
d2893c2d1a Fixes #15506 2019-02-19 11:17:40 +01:00
Torkel Ödegaard
baddf42c8e
Merge pull request #15515 from grafana/13767_fix 
fix native annotation filtered by template variable with pipe
 2019-02-19 11:14:04 +01:00
Johannes Schill
8876d17dc0 chore: graph2 panel plugin should use the new ReactPanelPlugin from @grafana/ui 2019-02-19 11:00:23 +01:00
Johannes Schill
891b2ca1a2 fix: Have the tab param removed from the url when leaving edit mode #15485 2019-02-19 09:43:35 +01:00
Marcus Efraimsson
56136a5396
fix native annotation filtered by template variable with pipe 2019-02-18 22:54:45 +01:00
Torkel Ödegaard
13e27601df Fixed navbar backbutton padding 2019-02-18 21:29:42 +01:00
Torkel Ödegaard
1eb804c655
Merge pull request #15411 from grafana/theme-files-cleanup 
[wip]Cleaning up the theme .scss files
 2019-02-18 20:23:40 +01:00
Torkel Ödegaard
9d78960c5e
Merge pull request #15503 from grafana/explore-icon 
Updated explore icon and style tweaks
 2019-02-18 18:37:51 +01:00
Torkel Ödegaard
df170aee16 Updated explore icon and style tweaks 
Lowered icon size and improved paddings, tried to align placement between dashboard and explore
 2019-02-18 18:26:24 +01:00
Dominik Prokop
1069d7f5b1 Display graphite function name editor in a tooltip 2019-02-18 17:55:38 +01:00
Peter Holmberg
93e8edfddd Fixing array direction, adding simple render test, fixes #15478 
Fixed unit test and updated gauge
Added migration for threshold order
 2019-02-18 16:46:32 +01:00
Torkel Ödegaard
e5562305e3 fixed page-header-bg 2019-02-18 15:35:27 +01:00
Torkel Ödegaard
2afd3cf5aa
Merge pull request #15499 from grafana/hugoh/bug-thresholds-and-infinity 
Fixes #15477
 2019-02-18 15:07:24 +01:00
ijin08
c62f06b427 reversed most of grays in dark theme 2019-02-18 14:35:13 +01:00
Hugo Häggmark
92972eed7b Fixes #15477 2019-02-18 13:56:48 +01:00
Torkel Ödegaard
35253cb7f7
Merge pull request #15498 from grafana/fix/15463 
Remove maxDataPoints and interval props from props to remember in panel model
 2019-02-18 12:37:07 +01:00
Torkel Ödegaard
abddb442a1
Changed how react panels store their options (#15468) 
Changed how react panels store their options

* Added a ReactPanelPlugin as the interface that react panels export, this way react panels have clearer api, and gives us hooks to handle migrations and a way for panel to handle panel changes in the future
* Moved gauge value options into a sub oject and made editor more generic, will be moved out of gauge pane later and shared between singlestat, gauge, bargauge, honecomb
* Also remove nested options prop that was there due to bug
* Added missing Gauge props
* Fixed gauge issue that will require migration later and also value options editor did not handle null decimals or 0 decimals
* Fixed unit tests
* More fixes for react panels
 2019-02-18 11:41:14 +01:00
Torkel Ödegaard
a6cae5b2b8
Merge pull request #15494 from grafana/minor-tweaks-panel-edit 
Removed primary class from Add Query button, and changed name of panel options tab
 2019-02-18 11:36:19 +01:00
Dominik Prokop
8e035676e1 Remove maxDataPoints and interval props from props to remember in panel model 2019-02-18 11:33:16 +01:00
Dominik Prokop
75dd7d0036 Fix typo in view mode cykle button 2019-02-18 11:08:42 +01:00
Dominik Prokop
4721250d19 Variables regenerated 2019-02-18 11:05:02 +01:00
Dominik Prokop
6da57d4c08 Make clear that variable scss files are generated from templates 2019-02-18 11:03:52 +01:00
Torkel Ödegaard
bf826d7c81 Removed primary class from Add Query button, and changed name of Panel Options tab o General Options 2019-02-18 10:49:14 +01:00
Torkel Ödegaard
89ad525986 Fixed issue with PanelHeader and grid-drag-handle class still being applied in fullscreen, fixes #15480 2019-02-17 08:11:57 +01:00
Torkel Ödegaard
2d5fd7fdfd
Fixed prettier issue (#15471) 
Fixed prettier CI issue that caused build failures
 2019-02-16 15:45:19 +01:00
Torkel Ödegaard
1adc1a6097
Merge pull request #15455 from grafana/fixed-handling-of-alert-urls 
Fixed handling of alert urls with true flags
 2019-02-15 16:27:23 +01:00
ijin08
794fb3e039 new dark-3 became new dark-2, created new lighter dark-3, changed panel-bg, empty-cta etc to dark-2 2019-02-15 14:02:46 +01:00
Torkel Ödegaard
7699706e65 fixed handling of alert urls with true flags, fixes #15454 2019-02-15 11:23:31 +01:00
Torkel Ödegaard
7b59b9cf4b Fixed dashboard navbar buttons being visible in fullscreen, fixes #15450 2019-02-15 11:03:24 +01:00
Torkel Ödegaard
7fd89ff77a
Merge pull request #15424 from grafana/move-error-boundry 
Move error boundry from DataPanel to PanelChrome
 2019-02-14 18:27:03 +01:00
David
2c92365969
Merge pull request #15305 from avaly/feature/ansi-colors 
Support ANSI colors codes in Loki logs
 2019-02-14 18:01:23 +01:00
Torkel Ödegaard
19a080a4d4 Restored loading spinner to DataPanel 2019-02-14 15:29:36 +01:00
Torkel Ödegaard
79008a7acd added another error message scenario 2019-02-14 15:23:34 +01:00
Torkel Ödegaard
2bc26a01f9 Fixes to error handling and clearing, also publishing of legacy events so old query editors work with react panels fully 2019-02-14 15:18:55 +01:00
ijin08
3b3a5b6797 increased blue in dark-1-5, dark-3 and dark-4 2019-02-14 13:32:45 +01:00
Torkel Ödegaard
cc61d9c5cc Merge branch 'master' into move-error-boundry 2019-02-14 13:10:49 +01:00
ijin08
a405be4415 Merge branch 'theme-files-cleanup' of github.com:grafana/grafana into theme-files-cleanup 2019-02-14 11:48:33 +01:00
ijin08
cbb91adb43 changed color for blue light in light theme + small changes in naming etc 2019-02-14 11:47:17 +01:00
ijin08
6160f36121 removed more unused variables, restyled scrollbar 2019-02-13 18:04:53 +01:00
Peter Holmberg
0c72fb3be1 Merge branch 'master' into move-error-boundry 2019-02-13 16:52:52 +01:00
Torkel Ödegaard
ef9e74fabb Fixed issue with sass variables used from typescript, the prettier lowercases export variables 2019-02-13 16:36:59 +01:00
Peter Holmberg
aad558ce9c using error callback from datapanel instead 2019-02-13 15:54:10 +01:00
Patrick O'Carroll
65b4273551
Merge branch 'master' into theme-files-cleanup 2019-02-13 15:46:59 +01:00
ijin08
7a4508d11e added new dark variable to dark theme(the color used for page-bg), changed some backgroud colors that doesn't use variables to use variables, made some slight tweaks to dark variables, fixed so item hover is the same as card hover 2019-02-13 14:56:28 +01:00
Torkel Ödegaard
124b3486eb Merge branch 'master' into 15330-vizpicker-red-when-0-hits 2019-02-13 14:49:11 +01:00
Dominik Prokop
06bae9aa46 Added common theme variabless generation, created GrafanaThemeCommons interface 2019-02-13 14:45:11 +01:00
Torkel Ödegaard
ffdf747080 More files that has fixed with prettier 2019-02-13 11:39:41 +01:00
Torkel Ödegaard
cfea8bdcae Prettier had not been running as a precommit hook for some time so had to run in on all files again 2019-02-13 11:14:53 +01:00
ijin08
09dbd6b1a6 removed _plugins.scss and _settings_permissions.scc, removed unused classes in _login.scss, reduced dark variabels in light theme and alignied light theme a bit with dark theme, turned blue-gray, dark-3 and panel-bg variables into one variable and removed gray-7 in dark theme 2019-02-13 11:04:22 +01:00
Johannes Schill
27bbadce1d feat: Add EmptySearchResult ui component and use it in VizTypePicker 2019-02-13 09:22:09 +01:00
Torkel Ödegaard
3b0ae4bd0a
Merge pull request #15368 from grafana/15217-panels-without-queries 
POC: Panels without queries can skip DataPanel
 2019-02-13 08:06:25 +01:00
Torkel Ödegaard
6be50c952c
Merge pull request #15400 from grafana/removed-icons-in-buttons 
Removed some icons in action button
 2019-02-13 08:05:11 +01:00
Johannes Schill
b6305c2d80 Revert "feat: Add css-support for invalid form input elements" 
This reverts commit b1aa84804b.
 2019-02-13 07:46:21 +01:00
Johannes Schill
44eaa3eaa8 Revert "feat: Highlight vizpicker input when there are no panels matching the search query" 
This reverts commit 11db48e76e.
 2019-02-13 07:46:14 +01:00
Dominik Prokop
2542a43ec0 Regenerating variabless sas on theme edit v1 2019-02-12 21:54:20 +01:00
Torkel Ödegaard
88ef2e1d32 Fixed a minor plugin json lingering issue 2019-02-12 18:31:35 +01:00
Torkel Ödegaard
f195459b01 Removed some icons in action button 
Trying to align some title case issues
 2019-02-12 17:51:08 +01:00
Dominik Prokop
0a66d8afc7 Merge branch 'master' into cli/watch-sass-var 2019-02-12 17:20:14 +01:00
Peter Holmberg
1c5118748a implement show error in panelcorner 2019-02-12 17:01:07 +01:00
Hugo Häggmark
90d162e608 Merge with master 2019-02-12 16:47:57 +01:00
Hugo Häggmark
222482b6be Forgot about the snapshots 2019-02-12 16:31:11 +01:00
Torkel Ödegaard
ef7236439a
Merge pull request #15391 from grafana/fixed-double-datasource-edit-page 
Fixed issues with double page body and husky pre-commit hook
 2019-02-12 16:28:07 +01:00
Hugo Häggmark
4c74b09a9d Renamed to FilterInput and added label and search icon 2019-02-12 16:22:57 +01:00
Johannes Schill
11db48e76e feat: Highlight vizpicker input when there are no panels matching the search query 2019-02-12 16:19:23 +01:00
Torkel Ödegaard
5708660893 Updated a few plugin json files with dataFormats 2019-02-12 16:15:05 +01:00
Johannes Schill
b1aa84804b feat: Add css-support for invalid form input elements 2019-02-12 16:14:48 +01:00
Peter Holmberg
9f88a22b4c remove comments 2019-02-12 16:14:26 +01:00
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
Torkel Ödegaard
a1453607a9 Changed noQueries to a dataFormats array that will allow a panel to define supported formats and prefered (first in array) 2019-02-12 16:05:29 +01:00
Torkel Ödegaard
bde9e9d5a5
Merge pull request #15394 from grafana/13066-save-as-dashboard 
fix: No need to have edit permissions to be able to "Save as"
 2019-02-12 15:57:41 +01:00
Torkel Ödegaard
8bd7e5a5f4
Merge pull request #15374 from grafana/explore/dedup-selector 
Move deduplication calculation from Logs component to reselect selector
 2019-02-12 14:57:06 +01:00
Torkel Ödegaard
2c4cb03cd3 Fixed issues with double page body and husky pre-commit hook 2019-02-12 14:41:12 +01:00
Johannes Schill
335042b2d0 fix: No need to have edit permissions to be able to "Save as" a dashboard 2019-02-12 14:29:27 +01:00
Dominik Prokop
dd19ec3b22 Move explore selectors to a separate file 2019-02-12 12:36:46 +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
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
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
Hugo Häggmark
25dbca9585 Merge with master 2019-02-12 08:50:05 +01:00
Hugo Häggmark
130eedc4ae Found another input that was tied to a regexp 2019-02-12 08:48:54 +01:00
Hugo Häggmark
5388541fd7 Fixes bug #12972 with a new type of input that escapes and unescapes special regexp characters 2019-02-12 08:48:54 +01:00
bergquist
3b9105e1be enable testing provsioned datasources 
closes #12164
 2019-02-12 08:45:21 +01:00
Torkel Ödegaard
fc91e1cf57 Fixed issue with gauge requests being cancelled 2019-02-11 17:47:47 +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
Dominik Prokop
1693f083cc Move deduplication calculation from Logs component to redux selector 2019-02-11 16:57:49 +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
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
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
Torkel Ödegaard
931bece16e Merge branch 'master' into ui-new-red-green-blue 2019-02-11 15:00:00 +01:00
Torkel Ödegaard
962815169e Color tweaks 2019-02-11 14:58:11 +01:00
ijin08
56b35354c7 changed back to old green in light theme 2019-02-11 14:21:43 +01:00
Daniel Lee
52fe6b0316
Merge pull request #15198 from CorpGlory/azure-monitor-refactor-#15087 
Azure Monitor: refactor #15087
 2019-02-11 14:19:42 +01:00
Daniel Lee
22d64a8c2a
Merge pull request #15301 from grafana/azure-monitor-autocomplete 
Azure Monitor: improve autocomplete for Log Analytics and App Insights editor
 2019-02-11 14:06:43 +01:00
Torkel Ödegaard
77ba734491 Fixed issue with light theme introduced by #15333 2019-02-11 13:54:50 +01:00
Torkel Ödegaard
c92cd73bd8
Merge pull request #15355 from grafana/15284_fix_time_range 
WIP: Datasources with custom time range handling should always take dashboard timezone into consideration
 2019-02-11 13:43:47 +01:00
Torkel Ödegaard
9570394c49 minor style update 2019-02-11 13:42:37 +01:00
Torkel Ödegaard
b14958edef Minor style fixes 2019-02-11 13:24:02 +01:00
Dominik Prokop
85780eb30c Remove not related code 2019-02-11 13:18:16 +01:00
Marcus Efraimsson
b9c36e5301
make sure opentsdb takes dashboard timezone into consideration 2019-02-11 13:13:38 +01:00
Marcus Efraimsson
519dfd0899
make sure influx takes dashboard timezone into consideration 2019-02-11 13:11:56 +01:00
Torkel Ödegaard
a4dd63e224 Merge branch 'master' into ui-new-red-green-blue 2019-02-11 13:04:25 +01:00
Dominik Prokop
cee2e4788b Do not read store state from toggle panelaction creator 2019-02-11 12:56:37 +01:00
Torkel Ödegaard
6f16f70456
Merge pull request #15354 from grafana/fix/plugin-loading-failure 
Fix plugin loading failure message not being displayed
 2019-02-11 12:49:08 +01:00
Marcus Efraimsson
37a73b6b35
make sure graphite takes dashboard timezone into consideration 2019-02-11 12:04:27 +01:00
Dominik Prokop
14bf960b64 Merge branch 'master' into explore/dedup-strategu-url 2019-02-11 12:03:45 +01:00
Dominik Prokop
c9fbd43231 Review changes 2019-02-11 11:59:48 +01:00
Torkel Ödegaard
ba2f698b81
Merge pull request #15352 from grafana/fixed-missing-graph-time-axis 
Fixed missing time axis on graph due to width not being passed
 2019-02-11 11:50:04 +01:00