IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-20 11:48:34 -06:00
Code Issues Packages Projects Releases Wiki Activity
17,484 Commits 5,454 Branches 554 Tags 1.9 GiB
b372b4323d
Commit Graph

7681 Commits

Author SHA1 Message Date
David Kaltschmidt
bf1af66292 Explore: error handling and time fixes 
- use global range types
- add ErrorBoundary around individual Explore components
- fix table merge on empty results
- fix TimePicker date parsing on ISO dates
- fix TimePicker range string after relative move
 2018-10-26 18:16:00 +02:00
Torkel Ödegaard
bcf669fab5 ux experiments 2018-10-26 16:29:08 +02:00
Jon Ferreira
07cb622729 Add code to flot that plots any datapoints which to not have neighbors 
as 0.5 radius points
 - fixes https://github.com/grafana/grafana/issues/13605
 2018-10-26 09:10:07 -04:00
Peter Holmberg
ccbff592d2 adding default value and update actions 2018-10-26 14:51:33 +02:00
Peter Holmberg
affb04a3ce moved state to redux, renamed entities 2018-10-26 14:15:37 +02:00
Torkel Ödegaard
94c35e2577 testing panel edit ux idea 2018-10-26 13:20:10 +02:00
David
239dfbc9ae
Merge pull request #13824 from grafana/davkal/explore-plugins 
Explore: move suggestions logic to datasource language provider
 2018-10-26 11:40:52 +02:00
Torkel Ödegaard
e7f6cdc625 Merge branch '13739/alert-to-react' 2018-10-25 17:44:23 +02:00
Torkel Ödegaard
4112591042
Merge pull request #13818 from mtanda/cw_stat_template 
support template variable in stat field
 2018-10-25 17:08:09 +02:00
Torkel Ödegaard
f1660aa21a fix: updated backend srv to use appEvents and removed parts of alertsSrv 2018-10-25 17:05:17 +02:00
Peter Holmberg
a98f7e548f simple select 2018-10-25 16:56:49 +02:00
Erik Sundell
6a447a24fb stackdriver: don't set project name in query response since default project is now loaded in its own query 2018-10-25 14:16:01 +02:00
Alexander Zobnin
1dad52eaad
graph legend: fix table padding 2018-10-25 13:28:05 +03:00
David Kaltschmidt
6f2315d5c5 Moved prom language features to datasource language provider 2018-10-25 12:24:24 +02:00
Alexander Zobnin
9e15d47e13
graph legend: fix phantomjs rendering when legend is on the right 2018-10-25 13:21:28 +03:00
Torkel Ödegaard
be6f68f341 fix for annotation promise clearing, bug introduced last week when merging react panels step1 2018-10-25 11:35:32 +02:00
Alexander Zobnin
533f35853b
Merge remote-tracking branch 'upstream/master' into graph-legend-to-react 2018-10-25 11:56:02 +03:00
Torkel Ödegaard
defccb5ab3 fix panel solo size 2018-10-25 10:32:23 +02:00
Peter Holmberg
1f8b61f9a6 load preferences 2018-10-25 07:45:22 +02:00
Mitsuhiro Tanda
08631ea23f support template variable in stat field 2018-10-25 13:03:20 +09:00
Sven Klemm
9bb2b70a95 only look in current database in findMetricTable 2018-10-24 19:21:26 +02:00
Alexander Zobnin
e4b3f31f82
graph legend: fix table alignment 2018-10-24 17:38:10 +03:00
Alexander Zobnin
f5a0b0044a
graph legend: minor refactor 2018-10-24 16:57:44 +03:00
David Kaltschmidt
54a3e2d1d1 Added types to query rows 2018-10-24 14:55:56 +02:00
Peter Holmberg
f34cbae2dd cleaned up the flow 2018-10-24 14:33:53 +02:00
Johannes Schill
b880f8d548 Update the regex-matching in templateSrv to work with the new variable-syntax and be more flexible to regex-changes #13804 2018-10-24 13:29:03 +02:00
David
a6fc74e35b
Merge pull request #13803 from grafana/davkal/explore-fix-resize 
Explore: fix graph resize on window resize
 2018-10-24 12:32:27 +02:00
Johannes Schill
38c155403e Move the variable regex to constants to make sure we use the same reg… (#13801) 2018-10-24 12:06:09 +02:00
David
8f7686c5a7
Merge pull request #13773 from miqh/fix/click-typeahead-suggestion 
Fix click-based selection of typeahead suggestion
 2018-10-24 11:42:58 +02:00
Alexander Zobnin
8a2921399e
graph panel: fix legend alignment 2018-10-24 12:42:44 +03:00
David Kaltschmidt
d6ff16fe72 Explore: fix graph resize on window resize 
- resize HOC wrapper only resized first child which in case of large
  graphs was the warning button
- moved warning button inside the panel parent
 2018-10-24 11:30:32 +02:00
David
7d0eccdd23
Merge pull request #13787 from grafana/davkal/explore-transactions 
Explore: query transactions for faster result display
 2018-10-24 11:24:29 +02:00
Erik Sundell
c5af0bf1c5 Resource type filter (#13784) 
* stackdriver: add resource type to filter and group bys

* stackdriver: remove not used param

* stackdriver: refactor filter and group by code

* stackdriver: remove resource type if its already in filter list

* stackdriver: remove debug logging

* stackdriver: remove more debug logging

* stackdriver: append resource type to legend name if there are more than one type present in the response

* stackdriver: only make new request if filter has real value

* stackdriver: format legend support for resource type

* stackdriver: add resource type to documentation

* stackdriver: not returning promise from query function

* stackdriver: fix refactoring bug

* stackdriver: remove not used import
 2018-10-24 11:18:49 +02:00
David Kaltschmidt
a121cd0e49 Fix race condition on add/remove query row 2018-10-24 11:08:15 +02:00
Peter Holmberg
ed99a543a5 moving things 2018-10-24 10:23:11 +02:00
Peter Holmberg
3e0a34ceca typing changes 2018-10-24 10:18:28 +02:00
Peter Holmberg
bd2f9a38d9 Added margin and correct border radius 2018-10-23 17:25:16 +02:00
David Kaltschmidt
f19ffee5b4 Fix rebase, fix empty field still issuing query problem 2018-10-23 17:21:33 +02:00
Torkel Ödegaard
6932306995
Merge pull request #13795 from grafana/kiosk-mode-url-fix 
Another fix for kiosk mode handling
 2018-10-23 17:07:29 +02:00
Torkel Ödegaard
53d9619cb9 fix: another fix for #13764 , #13793 2018-10-23 16:22:00 +02:00
Torkel Ödegaard
102d495af9
Merge pull request #13793 from grafana/kiosk-mode-url-fix 
Kiosk mode url fix
 2018-10-23 16:15:50 +02:00
David Kaltschmidt
0cd89e80ca Submit query when enabling result viewer 2018-10-23 16:13:23 +02:00
David Kaltschmidt
fbed57ab43 Get query hints per query transaction 2018-10-23 16:10:52 +02:00
David Kaltschmidt
2e02a8c855 Explore: query transactions 
Existing querying was grouped together before handed over to the
datasource. This slowed down result display to however long the slowest
query took.

- create one query transaction per result viewer (graph, table, etc.)
  and query row
- track latencies for each transaction
- show results as soon as they are being received
- loading indicator on graph and query button to indicate that queries
  are still running and that results are incomplete
- properly discard transactions when removing or changing queries
 2018-10-23 16:09:48 +02:00
Torkel Ödegaard
15e1e41540
Merge pull request #13768 from davewat/feat-toggle-legend-shortcut 
Feat - keyboard shortcut to toggle legend
 2018-10-23 16:06:32 +02:00
David
e761fb1936
Merge pull request #13761 from grafana/davkal/explore-reuse-table-merge 
Explore: reuse table merge from table panel
 2018-10-23 16:00:57 +02:00
Peter Holmberg
bb6409384e connected to store, self remove logic 2018-10-23 16:00:04 +02:00
Torkel Ödegaard
2107f88fc1
Merge pull request #13770 from ceh-forks/editor-duplicate-placeholder 
ux: remove duplicate placeholder attribute
 2018-10-23 15:52:33 +02:00
Torkel Ödegaard
8a1e0cd83b fix: kiosk url fix, fixes #13764 2018-10-23 15:37:11 +02:00
Johannes Schill
22a0f3cf94 fix: Text box variables with empty values should not be considered fa… (#13791) 
* fix: text box template variable doesn't work properly without a default value
 2018-10-23 14:05:10 +02:00
Alexander Zobnin
f150c34b66
Merge remote-tracking branch 'upstream/master' into graph-legend-to-react 2018-10-23 14:35:55 +03:00
Peter Holmberg
bbd02dd616 renaming things 2018-10-23 13:34:27 +02:00
Alexander Zobnin
fa5fad5c7e
graph legend: review fixes 2018-10-23 14:08:30 +03:00
Sven Klemm
2f254187fc Merge remote-tracking branch 'upstream/master' into mysql_query_builder 2018-10-23 10:06:34 +02:00
Sven Klemm
261122ff4b sync mysql query editor template with postgres 2018-10-23 10:04:45 +02:00
Sven Klemm
fdaa153c95 add char as datatype for metric and group columns 2018-10-23 09:51:17 +02:00
Marcus Efraimsson
e6abc0691e
fix injecting dependencies to graph legend directive 2018-10-22 19:23:40 +02:00
Alexander Zobnin
5a4c362985
Merge remote-tracking branch 'upstream/master' into graph-legend-to-react 2018-10-22 17:18:35 +03:00
Daniel Lee
6e0728ad88 stackdriver: some tweaks to the text on the config page and in docs 2018-10-22 16:14:17 +02:00
Erik Sundell
89958f2933 stackdriver: remove not needed scope 2018-10-22 16:12:55 +02:00
Erik Sundell
e13e2f8a45 stackdriver: change name of authentication type 2018-10-22 16:12:22 +02:00
Erik Sundell
5b9cd830d2 stackdriver: improve config page info box documentation 2018-10-22 16:12:22 +02:00
Erik Sundell
dd745e0cf0 stackdriver: prevent backend query from being made when there are not yet any defined targets 2018-10-22 16:12:22 +02:00
Erik Sundell
5deba92d05 stackdriver: fix failing tests 2018-10-22 16:12:22 +02:00
Erik Sundell
ae8a765190 stackdriver: improve error handling 2018-10-22 16:12:22 +02:00
Alexander Zobnin
91636ec122
graph legend: fix legend when series are having the same alias 2018-10-22 17:12:18 +03:00
Erik Sundell
a56c5841e9 stackdriver: improve error handling in the datasource 2018-10-22 16:11:17 +02:00
Erik Sundell
277cae2d85 stackdriver: fix broken condition after rebase 2018-10-22 16:11:17 +02:00
Erik Sundell
569fe2327e stackdriver: remove debug log 2018-10-22 16:11:17 +02:00
Erik Sundell
fa1d225743 stackdriver: fix failing test 2018-10-22 16:11:17 +02:00
Erik Sundell
b9cb4649bb stackdriver: get default project from backend. also ensure default project could be retrieved when authentication type is gce 2018-10-22 16:11:17 +02:00
Erik Sundell
09fb1760a1 stackdriver: only load default project from backend if it's not available on the target. this might happen when using gce authentication and provisioning 2018-10-22 16:08:11 +02:00
Erik Sundell
835f1d788e stackdriver: display error message if project name is not present in jwt file 2018-10-22 16:03:14 +02:00
Erik Sundell
9fb1d3a9a6 stackdriver: only load project name if it's not already stored in the ds info json 2018-10-22 16:03:14 +02:00
Erik Sundell
aa2e64e160 stackdriver: improve ui for toggling authentication type 2018-10-22 16:03:14 +02:00
Erik Sundell
dd9e9ed419 stackdriver: make backend query a pure test datasource function 2018-10-22 16:03:13 +02:00
Erik Sundell
412a1f6d99 stackdriver: wip - return metric descriptors in the format of tablew 2018-10-22 16:03:13 +02:00
Erik Sundell
77e4c4249d stackdriver: wip - add very basic checkbox for gce auto authentication 2018-10-22 16:03:13 +02:00
Mitsuhiro Tanda
022a45becd Revert "for development" 
This reverts commit cf2f110e42bb0ca041be7bb0ebf549bf565c51bc.
 2018-10-22 16:03:12 +02:00
Mitsuhiro Tanda
5b53c0497a for development 2018-10-22 16:03:11 +02:00
Alexander Zobnin
011d7ffa70
graph legend: fix quotes displaying 
React already escapes all strings, so it's no need to pass escaped alias
 2018-10-22 16:46:13 +03:00
Alexander Zobnin
36354856f9
graph legend: minor refactor 2018-10-22 15:59:08 +03:00
Peter Holmberg
b7d821b524 component working 2018-10-22 14:22:40 +02:00
Alexander Zobnin
302158fb2b
graph legend: fix rendering after legend changes 2018-10-22 15:02:06 +03:00
Alexander Zobnin
4b9462993e
graph legend: refactor, fix another review issues 2018-10-22 14:17:46 +03:00
Torkel Ödegaard
16a2b207cc fix: DataPanel isFirstLoad state fix 2018-10-22 09:54:43 +02:00
Michael Huynh
3bb0b0a551
Fix click-based selection of typeahead suggestion 
In short, the underlying problem appears to be the `onChange()` handler
being triggered after handling the blur event. Since the contents have
not actually changed this forces the typeahead state to reset which
undesirably puts a stop to propagating the selected suggestion back up
to get set.

Related: #13604
 2018-10-21 12:51:21 +08:00
Emil Hessman
30baaa48fe ux: remove duplicate placeholder attribute 2018-10-20 15:08:38 +02:00
Dave Waters
4b524fafa5 initial work to add shortcut to toggle legend - generic 2018-10-19 16:33:23 -04:00
Sven Klemm
7c8b4915c1 fix order for mysql, remove postgres specific code 2018-10-19 18:23:03 +02:00
Peter Holmberg
5f515bb3fc using react component 2018-10-19 15:33:16 +02:00
David Kaltschmidt
374fe9dcb4 Explore: reuse table merge from table panel 
- Extracted table panel's merge logic to combine multiple tables into one
- Put the merge logic into the table model as it merges multiple table
  models
- make use of merge in Explore's table query response handler
- copied tests over to table model spec, kept essential tests in
  transformer spec
 2018-10-19 15:29:58 +02:00
Alexander Zobnin
daa95c2375
graph legend: refactor, move behaviour logic into component 2018-10-19 16:20:00 +03:00
Sven Klemm
8ce7e113d9 adjust meta data queries for mysql 2018-10-19 15:07:38 +02:00
Sven Klemm
aae21a631e fix references to postgres datatypes 2018-10-19 14:52:25 +02:00
Alexander Zobnin
44ed188c84
graph legend: review fixes 2018-10-19 14:32:37 +03:00
Torkel Ödegaard
4f4bba7f8c
Merge pull request #13578 from grafana/react-panels-step1 
WIP: React panels step1
 2018-10-19 12:59:09 +02:00
Torkel Ödegaard
b95d64e7a0 fix: fixed variable srv tests 2018-10-19 11:14:02 +02:00
Marcus Efraimsson
b124ba9a83
Merge pull request #13726 from mtanda/cw_unit_override 
Allow unit overwrite if cloudwatch/stackdriver datasource response doesn't include unit
 2018-10-19 11:02:42 +02:00
Erik Sundell
b2932058c7 stackdriver: only add unit to resonse obj if it has a value 2018-10-19 10:42:57 +02:00
Sven Klemm
215ca50cc1 make interpolateVariable arrow function 2018-10-19 10:19:33 +02:00
Torkel Ödegaard
936fe56080 fix: another set of fixes for refresh 2018-10-19 10:05:48 +02:00
Torkel Ödegaard
11f66bb909 fixed issue with template refresh 2018-10-19 09:43:54 +02:00
Torkel Ödegaard
dddbe62d6c Merge branch 'master' into react-panels-step1 2018-10-19 09:15:37 +02:00
Sven Klemm
c4452ba335 Fix tslint errors 2018-10-18 20:01:40 +02:00
Sven Klemm
5d8826d034 Merge remote-tracking branch 'upstream/master' into mysql_query_builder 2018-10-18 19:28:52 +02:00
Torkel Ödegaard
5bd11744dd
Merge pull request #13670 from svenklemm/metrics-segment-xss 
Escape values in metric segment and sql part
 2018-10-18 17:24:47 +02:00
Erik Sundell
0f0763b6b8 stackdriver: fix failing tests 2018-10-18 16:45:46 +02:00
Erik Sundell
d1740f090a stackdriver: make sure unit is not returned to the panel if mapping from stackdriver unit to grafana unit can't be made 2018-10-18 16:42:08 +02:00
Sven Klemm
2803cdca40 Fix variable highlighting 2018-10-18 15:04:54 +02:00
Torkel Ödegaard
5c95a01229 Merge branch 'master' of github.com:grafana/grafana 2018-10-18 14:38:43 +02:00
Mitsuhiro Tanda
4687ce2f7b allow unit override if cloudwatch response unit is none 2018-10-18 20:51:46 +09:00
Mitsuhiro Tanda
e465b2d53a Revert "don't overwrite unit if user set" 
This reverts commit 9dd33b79e037fc75ddc5f3a6b294edba99e99b94.
 2018-10-18 20:51:46 +09:00
Mitsuhiro Tanda
287ba77abf don't overwrite unit if user set 2018-10-18 20:51:46 +09:00
Torkel Ödegaard
0b490912bd
Merge pull request #13716 from grafana/davkal/13613-fix-split-layout 
Explore: fix render issues in split view
 2018-10-18 13:00:23 +02:00
David
bf1a0585ed
Merge pull request #13712 from grafana/davkal/explore-react-table 
Explore: Use react-table as table component
 2018-10-18 12:44:56 +02:00
Alexander Zobnin
5f712ab529
graph legend: remove unused code 2018-10-18 12:31:06 +03:00
Alexander Zobnin
fe0c5c73dd
graph legend: refactor 2018-10-18 12:30:34 +03:00
David Kaltschmidt
9e647590ac Review feedback, increased height 2018-10-18 10:42:25 +02:00
Peter Holmberg
ab2be340f7 remove not used file 2018-10-18 09:34:51 +02:00
Peter Holmberg
02769b6d3c Merge branch 'master' into datasource-dashboards-to-react 2018-10-18 08:34:31 +02:00
David Kaltschmidt
a1410b54a5 Explore: fix render issues in split view 
- avoid line wrap in row tools (add/remove/clear)
- avoid text overflow in query field
 2018-10-17 17:59:03 +02:00
David
1d60c45a04
Merge pull request #13663 from miqh/fix/label-value-suggestions 
Fix typeahead behaviour for QueryField
 2018-10-17 16:56:02 +02:00
Marcus Efraimsson
da89c27caf
Merge pull request #13702 from grafana/data-source-instance-to-react 
Support Data source permissions
 2018-10-17 16:54:57 +02:00
Peter Holmberg
84bbfe11ca tests 2018-10-17 16:14:45 +02:00
Michael Huynh
22e0ff8b9c Update PromQueryField tests to address fixed bug 
Related: #13484
 2018-10-17 22:09:21 +08:00
Michael Huynh
a8c5ab76b3
Fix typeahead behaviour for QueryField 
These changes were originally intended to address a bug whereby a
suggestion for an already selected label value continues to appear.
However, they also appear to fix several other problems in the area:

- Wrong suggestions when using negated label matching operators
- Misaligned label value suggestion replacements

Related: #13484
 2018-10-17 22:09:03 +08:00
Peter Holmberg
c2c3e15022 hooked up actions 2018-10-17 15:56:34 +02:00
David Kaltschmidt
ff67213b42 Explore: Use react-table as table component 
- adds react-table as dependency
- replaces custom table component in Explore
- vendors react-table styles and overrides them (currently in
  explore.scss)
 2018-10-17 14:58:04 +02:00
Peter Holmberg
f25a843a2c created view 2018-10-17 14:36:18 +02:00
Marcus Efraimsson
cf93b1e700
Merge pull request #13708 from svenklemm/interpolateVariable 
postgres: fix template variables error
 2018-10-17 13:42:47 +02:00
Marcus Efraimsson
7b656097a7
postgres: use arrow function declaration of interpolateVariable 2018-10-17 13:30:07 +02:00
Sven Klemm
ec0fd96f08 Use closure for calling interpolateVariable 2018-10-17 12:30:07 +02:00
Marcus Efraimsson
62f21a254a
Merge pull request #12337 from mtanda/cw_regions 
show all CloudWatch regions (avoid hard coding)
 2018-10-17 11:55:43 +02:00
Peter Holmberg
314fffeae1 Merge branch 'data-source-instance-to-react' into datasource-dashboards-to-react 2018-10-17 11:12:13 +02:00
Peter Holmberg
b7b0ce0107 remove addpermissions component 2018-10-17 11:07:17 +02:00
bergquist
70385119bc removes d in disableResolvedMessage 2018-10-17 10:41:18 +02:00
Peter Holmberg
dd2fb7961f removed snaps 2018-10-17 10:37:56 +02:00
Peter Holmberg
776f9aa288 Merge remote-tracking branch 'origin/data-source-instance-to-react' into permissions-code-to-enterprise 2018-10-17 10:00:18 +02:00
Mitsuhiro Tanda
c64a5a6e0e re-add hard coded region list 2018-10-17 14:02:02 +09:00
Dave Waters
e9b8051724 Merge branch 'master' of http://github.com/grafana/grafana into add-notification-channel-option-to-disable-resolved-alert 2018-10-16 17:43:26 -04:00
Marcus Efraimsson
3612a1c00e
Merge pull request #13678 from ramiro/add-encrypt-mssql-ds-option 
Add encrypt setting to MSSQL data source.
 2018-10-16 19:07:00 +02:00
Alexander Zobnin
46ec15a11e
graph legend: add color picker (react) 2018-10-16 16:50:43 +03:00
Peter Holmberg
66311a065c removing datasource permissions states from grafana 2018-10-16 15:36:33 +02:00
Dave Waters
18c73631ea rename UI Option, align with control, update tests 2018-10-16 07:12:32 -04:00
Alexander Zobnin
5a2e399d2d
Merge remote-tracking branch 'upstream/master' into graph-legend-to-react 2018-10-16 13:49:13 +03:00
Peter Holmberg
ee0cc9bd77 Merge branch 'master' into data-source-instance-to-react 2018-10-16 12:14:11 +02:00
Peter Holmberg
ef0def2277 Merge branch 'master' into permissions-code-to-enterprise 2018-10-16 11:09:58 +02:00
Johannes Schill
2a82b57d93 Remove unwanted char 2018-10-16 08:11:26 +02:00
Johannes Schill
6d3f037ef1 Fix incorrect alt text on logo 2018-10-16 07:50:44 +02:00