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
a57310efa4
Merge pull request #15796 from grafana/move-unitpicker-to-grafana-uo 
Move unitpicker to grafana/ui
 2019-03-05 15:01:17 +01:00
Torkel Ödegaard
cd78f0bef2 Fixed scrollbar not visible due to content being added a bit after mount, fixes #15711 2019-03-05 14:32:33 +01:00
Peter Holmberg
ee4df15526 moving 2019-03-05 13:55:29 +01:00
Hugo Häggmark
062b5f26fe style: add gicon-shield to sidemenu class 
Closes #15591
 2019-03-05 13:46:22 +01:00
Hugo Häggmark
09b036dc93 fix: update datasource in componentDidUpdate 
Closes #15751
 2019-03-05 13:08:31 +01:00
Hugo Häggmark
d3642a3e91
Moved Server Admin and children to separate menu item on Side Menu (#15592) 
* Moved Server Admin and children to separate menu item on Side Menu

* Removed style guide after PR comments
 2019-03-05 13:02:41 +01:00
Torkel Ödegaard
be8f60b0bf
Merge pull request #15791 from grafana/fix/leave-playlist 
Fix for leaving playlist mode
 2019-03-05 12:38:14 +01:00
Peter Holmberg
a158a19272 reordered import 2019-03-05 12:10:20 +01:00
Peter Holmberg
978cdfba00 Wrapperd playlist controls in clickoutsidewrapper 2019-03-05 12:08:57 +01:00
Torkel Ödegaard
a5455691b3 Hide time info switch when no time options are specified 2019-03-05 11:43:25 +01:00
Torkel Ödegaard
1711622eff
Merge pull request #15784 from grafana/15782-error-fix 
In error popup, fixes bug so that string errors are shown again. Fixes #15782
 2019-03-05 10:52:47 +01:00
Hugo Häggmark
48570c6272
Made sure that DataSourceOption displays value and fires onChange/onBlur events (#15757) 
* Fixed #15682 

* fix: Add hideTimeOverride to state since we need to control the Switch

* fix: Back the maxDataPoints change, we need to keep it as a string

Co-authored-by:johannes.schill@polyester.se
 2019-03-05 10:49:45 +01:00
Daniel Lee
8b1e25b50a utils: show string errors. Fixes #15782 2019-03-05 09:32:02 +01:00
Torkel Ödegaard
0016ad2cb3
Merge pull request #15774 from ryantxu/set-options 
Rename PanelEditorProps.onChange to onOptionsChange
 2019-03-05 09:11:56 +01:00
Torkel Ödegaard
57810ea5e5
Merge pull request #15775 from ryantxu/rename-interpolate 
use replaceVariables rather than onInterpolate
 2019-03-05 09:10:45 +01:00
Dominik Prokop
cee5f030dc
Fixed url of back button in datasource edit page, when root_url configured (#15759) 
* Fixed url of back button in datasource edit page, when root_url configured

* Update snapshots

* Use app config directly in ButtonRow instead of passing datasources page URL via prop

* Snapshots update
 2019-03-05 07:35:45 +01:00
ryan
3d16528459 use onOptionsChange 2019-03-04 12:35:24 -08:00
ryan
251008f590 use replaceVariables rather than onInterpolate 2019-03-04 11:44:38 -08:00
ryan
77d709d9df use updateOptions rather than onChange 2019-03-04 11:21:05 -08:00
Marcus Efraimsson
646ca90b10
Merge pull request #15767 from grafana/15650-autofitpanel-kiosktvmode 
No scroll in autofitpanel-mode
 2019-03-04 08:44:28 -08:00
Johannes Schill
92ec8757d3 fix: Kiosk mode should have &kiosk appended to the url #15765 2019-03-04 16:33:00 +01:00
Johannes Schill
cc40a515be fix: When in tv-mode, autofitpanel should not take space from the navbar #15650 2019-03-04 13:46:10 +01:00
Torkel Ödegaard
7540527010
Merge pull request #15612 from jsferrei/upstream_stacking_fix 
Toggle stack should trigger a render, not a refresh
 2019-03-04 10:54:36 +00:00
Torkel Ödegaard
28cac0976d
Merge pull request #15752 from grafana/hugoh/bug-repeated-row-gauge 
Passing scopedVars down to DataPanel from PanelChrome
 2019-03-04 10:53:07 +00:00
Hugo Häggmark
3a65e27e83 Fixes #15739 2019-03-04 10:42:59 +01:00
parry
25b09168eb Don't mutate seriesList parameter in mergeSeriesByTime (#15619) 
* do not mutate seriesList in mergeSeriesByTime

* extendedseriesList -> extendedDatapointsList

* remove toString() from datapoints, since the value can be null
 2019-03-04 09:56:47 +01:00
SamuelToh
d2c161c2e6 Catch bad regex exception at controller level 2019-03-02 20:50:25 +10:00
SamuelToh
6bfbdbe20b 11780: invalid reg value can cause unexpected behaviour 2019-03-01 20:34:40 +10:00
ryan
d3cbc5638c Merge remote-tracking branch 'grafana/master' into alpha-text2 
* grafana/master:
  Explore: Enable click on name label
  Bumping grafana ui version (#15669)
  Need this to be available for plugins
  docs: 6.0 whats new
  Updated latest.json with 6.0
  Update CHANGELOG.md
  docs: grafana 6.0 has been released.
  moves social package to /login
  moves tracing packge into /infra
  Update CHANGELOG.md
  changelog: adds notes for #14509 and #15179
  graph: fixes click after scroll in series override menu
  moves metric package to /infra
  stackdriver: change reducer mapping for distribution metrics
  stackdriver: fix for float64 bounds for distribution metrics
  Fixed value dropdown not updating when it's current value updates, fixes #15566
 2019-02-28 10:07:53 -08:00
Torkel Ödegaard
84b2c0447e Fixed right side scrollbar margin on dashboard page 2019-02-28 08:29:18 -08:00
David Kaltschmidt
539333bb01 Explore: Enable click on name label 
- click on the name label in a prometheus table was disabled
- it was disabled because every query used to have a metric which is no
longer true
- this change enables it
 2019-02-26 14:21:46 -08:00
Jon Ferreira
0bdca7957a Toggle stack should trigger a render, not a refresh 2019-02-25 11:29:34 -05:00
Leonard Gram
ccc97ed649
Merge pull request #15634 from grafana/15621-series-overrides 
graph: fixes click after scroll in series override menu
 2019-02-25 12:50:06 +01:00
Leonard Gram
5ff44bdbcf
Merge pull request #15616 from grafana/fixed-variable-dropdown-update 
Fixed value dropdown not updating when it's current value updates
 2019-02-25 09:39:28 +01:00
Daniel Lee
e76655df43 graph: fixes click after scroll in series override menu 
Makes changes to dropdown-typeahead2 so that a css
class for the button can be passed in. Means it can
be used instead of dropdown-typeahead.

Switches to using dropdown-typeahead2 for series_overrides
directive and for the influxdb, mysql and postgres datasources
as it already contains a fix for this issue.

This commit also fixes the index property which
was set using an incorrectly spelled length property in the
series_overrides directive.

Closes #15621
 2019-02-25 02:11:28 +01:00
Daniel Lee
35fc0c5329 stackdriver: change reducer mapping for distribution metrics 
- Distribution metrics are now mapped to more reducers
when the metric kind is cumulative.
- The witdth of the metrics dropdown is now much wider.
- Changed the text from Select Aggregation to Select Reducer
to line up with the UI in Stackdriver.
 2019-02-24 17:44:15 +01:00
ryan
e5ce759167 update 2019-02-23 21:53:20 -08:00
Torkel Ödegaard
f768808b6e Fixed value dropdown not updating when it's current value updates, fixes #15566 2019-02-23 08:59:00 +01:00
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
ijin08
7be18e1a08 changed some more color variables to use variables 2019-02-21 15:05:17 +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
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