IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2024-12-02 13:39:19 -06:00
Code Issues Packages Projects Releases Wiki Activity
20,491 Commits 5,123 Branches 538 Tags 1.8 GiB
9c9691f7af
Commit Graph

9580 Commits

Author SHA1 Message Date
Hugo Häggmark
9c9691f7af Added feature toggle editors_can_own 2019-02-22 14:39:22 +01:00
Valentin Agachi
425636ff70 Improve Loki logs render with ANSI colors (#15558) 
* Improve Loki logs render with ANSI colors

* fixup! Improve Loki logs render with ANSI colors

* fixup! Improve Loki logs render with ANSI colors

* fixup! Improve Loki logs render with ANSI colors
 2019-02-22 13:13:10 +01:00
Torkel Ödegaard
ed06f04899
Merge pull request #15570 from grafana/15563-plugin-text-mode 
panel: defensive coding that fixes #15563
 2019-02-22 09:00:41 +01:00
Dominik Prokop
67d0bca3cb
Merge pull request #15579 from grafana/fix/bring-plugins-scss-back 
Bring back plugins page styles
 2019-02-21 22:14:51 +01:00
Dominik Prokop
167a18f1f2 Merge branch 'master' into tooling/npm-scripts 2019-02-21 21:28:16 +01:00
Johannes Schill
5054e841ba
Merge pull request #15551 from grafana/15281-dashboard2explore 
fix: Filter out values not supported by Explore yet #15281
 2019-02-21 16:38:32 +01:00
Dominik Prokop
f471be2453 Bring back plugins page styles 2019-02-21 16:37:42 +01:00
Dominik Prokop
d4c40e4360 Imports updates 2019-02-21 15:12:22 +01:00
Daniel Lee
bd0f55cbb8 panel: defensive coding that fixes #15563 
If a plugin incorrectly uses an attribute in the
query-editor-row directive, it should not throw
an exception.
 2019-02-21 14:42:31 +01:00
Torkel Ödegaard
67e39a5562 Merge branch 'cli/watch-sass-var-new-colors' 2019-02-21 12:33:10 +01:00
Torkel Ödegaard
3868602581 Updated body & page variables to use variables from code theme 2019-02-21 12:32:29 +01:00
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