Commit Graph

6072 Commits

Author SHA1 Message Date
Marcus Efraimsson
ef0b7bda6f singlestat: render time of last point based on dashboard timezone (#11425)
* singlestat: render time of last point based on dashboard timezone

* changelog: add note for #10338
2018-05-08 15:59:29 +02:00
Angrite
e52aceeaba Fix for #10078: symbol "&" is not escaped (#10137)
Fix for #10078: Render value as link in Table panel: ampersand symbol "&" is not escaped in link URL, resulting URL is wrong.
2018-05-08 15:47:09 +02:00
Chris Rice
10f934d287 Add alpha color channel support for graph bars (#10956)
* Set fillColor in bars on load and on color change

* Change bar fill color on color override

* Added test for series overrides

* Moved bars fill color setting into time_series. Fixed issue with prev commit where you could not show bars because of series overrides.
2018-05-08 15:18:57 +02:00
Andrew Richards
3095dabe3c interpolate 'field' again in Elasticsearch terms queries (#10026)
* interpolate 'field' again in Elasticsearch terms queries

Fix for #8662 which was regressed in commit e4950c2dc1 (the field 'field' was no longer interpolated)

* remove unnecessary check for existence of field 'field'
2018-05-08 15:17:16 +02:00
Seuf
1888708ca5 Templating : return __empty__ value when all value return nothing to prevent elasticsearch syntaxe error (#9701) 2018-05-08 14:04:20 +02:00
Torkel Ödegaard
4aae3c6c05 Merge branch 'master' of github.com:grafana/grafana 2018-05-08 11:33:13 +02:00
Alexander Zobnin
00454b32f5 fix XSS vulnerabilities in dashboard links (#11813)
fix XSS vulnerabilities in dashboard links
2018-05-08 11:28:16 +02:00
Torkel Ödegaard
1c886940ff Merge branch 'jereksel-feature/save_json' 2018-05-08 11:25:20 +02:00
Torkel Ödegaard
eb3aa7b193 PR: ux changes to #11528 2018-05-08 11:24:20 +02:00
Torkel Ödegaard
6a5ce09b08 Merge branch 'feature/save_json' of https://github.com/jereksel/grafana into jereksel-feature/save_json 2018-05-08 10:54:26 +02:00
Dan Cech
93a8d8a25b allow analytics.js to be cached, enable anonymizeIP setting (#11656) 2018-05-08 10:48:27 +02:00
Torkel Ödegaard
f84534adea Revert "Add baron scrollbar to a node managed by gafana (#11850)"
This reverts commit 34133671b9.
2018-05-08 09:45:08 +02:00
Torkel Ödegaard
4b61c7cd55 Merge branch 'influx-db-select-query-variable' 2018-05-08 09:29:53 +02:00
Torkel Ödegaard
b894a5ff16 Merge branch 'am/fix-query-variable-influxdb' of https://github.com/forzafootball/grafana into influx-db-select-query-variable 2018-05-08 09:01:58 +02:00
Patrick O'Carroll
8f0c8005af fixed svg background (#11848) 2018-05-08 06:40:34 +02:00
Ryan McKinley
34133671b9 Add baron scrollbar to a node managed by gafana (#11850)
* Add baron scroller to grafana panel, not plugin panel

* remove comment about root <div> element, since it will not be true
2018-05-08 06:39:12 +02:00
David
1236b7b918
Merge pull request #11770 from grafana/davkal/explore-panel-link
Explore: Add entry to panel menu to jump to Explore
2018-05-07 16:31:19 +02:00
Florian Plattner
5d54bc00e1 Fix/improved csv output (#11740)
* fix: initial cleanup and implementation

* feat: finish special character escaping

* feat: updates fileExport to generate RFC-4180 compliant CSV

* chore: replace html decoder with the lodash version and final cleanup

* fix: restore character html decoding
2018-05-07 10:22:54 +02:00
Torkel Ödegaard
fb7db147ed Merge remote-tracking branch 'origin/11809-permission-dropdown' 2018-05-07 09:49:38 +02:00
Marcus Efraimsson
d0753949bc
Merge pull request #11794 from grafana/11616-timepicker-buttons
fix dark/light theme date selector styling in timepicker control
2018-05-04 14:55:56 +02:00
Patrick O'Carroll
515eab2405 added left:unset to counter left:0 in recent react-select release 2018-05-04 11:46:17 +02:00
Patrick O'Carroll
c897485958 fixed text color in light theme 2018-05-04 10:30:42 +02:00
Marcus Efraimsson
6eba9c2438
Merge pull request #11802 from svenklemm/variable-interpolation
dont shadow format passed in as function parameter in replace function in templatesrv
2018-05-03 19:09:40 +02:00
Sven Klemm
a806f542c6 test if default variable interpolation is effective when no specific
format is specified
2018-05-03 18:42:58 +02:00
Marcus Efraimsson
da8f6c150b
Merge pull request #11751 from mtanda/11690
fix to match table column name and order
2018-05-03 18:33:46 +02:00
Daniel Lee
7db9cc3bf0
Merge pull request #11796 from alexanderzobnin/fix-11710
scroll: fix scrolling on mobile Chrome
2018-05-03 15:18:29 +02:00
Alexander Zobnin
83d599670d scroll: remove firefox scrollbars 2018-05-03 11:54:02 +03:00
Sven Klemm
764fa15e24 dont shadow format passed in as function parameter 2018-05-02 23:03:37 +02:00
Alexander Zobnin
64283408ee scroll: fix scrolling on mobile Chrome (#11710) 2018-05-02 12:43:25 +03:00
Marcus Efraimsson
f17100e98e
Merge pull request #11786 from marefr/11625_save_as
dashboard: show save as button if user has edit permission

This will show the "Save As..." button in dashboard settings page if the user 
has edit permissions (org role admin/editor or viewers_can_edit enabled) 
and has at least edit permission in any folder.
2018-05-02 11:15:22 +02:00
Marcus Efraimsson
1f21b3e23b
remove jest it.only to not skip important tests 2018-05-02 10:54:00 +02:00
Patrick O'Carroll
3dd073f98d fixed so all buttons are styled not just small ones, fixes #11616 2018-05-02 09:56:53 +02:00
Mitsuhiro Tanda
253b2cc081 add test for prometheus table column title 2018-05-01 05:00:56 +09:00
David Kaltschmidt
8a53ec610b Fix url encoding, expand template vars, fix TS hacks
* moved datasource related functions to panel sub-class
* expand panel template vars for url
* added keybindings for x -> Explore
* url encoding for explore state
2018-04-30 17:44:30 +02:00
David Kaltschmidt
05b0bfafe4 Explore: Add entry to panel menu to jump to Explore
* panel container menu gets new Explore entry (between Edit and Share)
* entry only shows if datasource has `supportsExplore` set to true (set
 for Prometheus only for now)
* click on Explore entry changes url to `/explore/state` via location provider
* `state` is a JSON representation of the panel queries
* datasources implement `getExploreState()` how to turn a panel config into explore initial
 state
* Explore can parse the state and initialize its query expressions
* ReactContainer now forwards route parameters as props to component
* `pluginlist` and `singlestat` panel subclasses needed to be adapted because
 `panel_ctrl` now has the location provider as a property already
2018-04-30 17:44:28 +02:00
Marcus Efraimsson
b0349bc795
Merge pull request #11575 from alexanderzobnin/fix-11498
Histogram: fix invisible highest value bucket
2018-04-30 16:32:21 +02:00
Daniel Lee
fc718b8a9a table: fix for padding
The table-panel-wrapper class got removed when clicking on the panel
menu which resulted in extra padding for the .panel-content div. This
fixes that by setting the table-specific css class lower down in the
html.
2018-04-30 16:17:37 +02:00
Alexander Zobnin
b16626c3b5
graph histogram: fix invisible highest value bucket 2018-04-30 16:12:31 +02:00
Marcus Efraimsson
5c57c7cff5
dashboard: show save as button if can edit and has edit permission to folders 2018-04-30 15:38:46 +02:00
Marcus Efraimsson
4f7791b9fa
fix dropdown typeahead issue
New explore feature overriding css for dropdown typeahead component.
2018-04-30 11:50:50 +02:00
David
cc74f6c6a0
Merge pull request #11761 from grafana/davkal/explore-multi-row
Explore: add support for multiple queries
2018-04-27 17:31:25 +02:00
David
d8abfe6a7d
Merge pull request #11742 from grafana/davkal/explore
Explore UI skeleton
2018-04-27 15:46:40 +02:00
David Kaltschmidt
949e3d29e8 Explore: add support for multiple queries
* adds +/- buttons to query rows in the Explore section
* on Run Query all query expressions are submitted
* `generateQueryKey` and `ensureQueries` are helpers to ensure each
 query field has a unique key for react.
2018-04-27 15:42:35 +02:00
Marcus Efraimsson
138c8c348e
revert renaming of unit key ppm
#11211 removed the unit key ppm in favor of conppm. A change which is not forward compatible.
This commit revert the unit key back to ppm.
Also adds some better error description if trying to use a unit which don't exists.
Fixes #11743
2018-04-27 13:41:20 +02:00
Mitsuhiro Tanda
c2b720835b fix to match table column name and order 2018-04-27 19:34:10 +09:00
David Kaltschmidt
d338b7ea7b Import and typescript fixups 2018-04-27 11:49:11 +02:00
David Kaltschmidt
f1220fd2a4 Explore WIP 2018-04-26 20:27:19 +02:00
Marcus Efraimsson
ddeba41638
fix so that google analytics script are cached 2018-04-26 15:49:22 +02:00
Daniel Lee
1dd4f03100
Merge pull request #11726 from grafana/11708_prom_variables
prometheus: variable query should fallback correctly to a series query
2018-04-26 10:29:09 +02:00
Marcus Efraimsson
fff5d7154e
Merge pull request #11721 from grafana/11677-missaligned-menu-carot
fix misalignment of unit and other drop downs in firefox
2018-04-25 17:24:54 +02:00