IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-15 01:53:33 -06:00
Code Issues Packages Projects Releases Wiki Activity
18,473 Commits 5,450 Branches 554 Tags 1.9 GiB
a0da303f80
Commit Graph

3513 Commits

Author SHA1 Message Date
Erik Sundell
e698202fae stackdriver: use new naming convention for query editor all over 2018-11-13 10:57:10 +01:00
Torkel Ödegaard
7b805bdb81 minor react panels refafactor 2018-11-13 08:40:42 +01:00
Torkel Ödegaard
9820c7806c some cleanup of unused stuff and type fixes 2018-11-13 08:09:12 +01:00
David Kaltschmidt
ff0ed06441 Explore: Don't suggest term items when text follows 
Tab completion gets in the way when constructing a query from the inside
out:

```
up| => |up => sum(|up)
```

At that point the language provider will not suggest anything.
 2018-11-12 17:40:05 +00:00
Torkel Ödegaard
727efa5a03 Merge branch 'pane-edit-ux-tabs' into develop 2018-11-12 16:25:13 +01:00
Torkel Ödegaard
e0feb72637 Merge remote-tracking branch 'origin/data-source-settings-to-react' into develop 2018-11-12 16:17:05 +01:00
Torkel Ödegaard
a2a4458923
Merge pull request #14023 from grafana/gauge-panel 
React Gauge Panel - first step
 2018-11-12 15:58:54 +01:00
Peter Holmberg
490fb9e8e6 import changes 2018-11-12 11:25:47 +01:00
Peter Holmberg
656900516b draw gauge 2018-11-09 16:37:09 +01:00
Erik Sundell
30f9a324ac stackdriver: remove service query tyhpe 2018-11-09 14:36:50 +01:00
Erik Sundell
3b9eda2561 stackdriver: correct aligner name 2018-11-09 14:36:04 +01:00
Erik Sundell
f307fc4760 stackdriver: typescriptifying props 2018-11-09 14:30:28 +01:00
Erik Sundell
996b470dd0 stackdriver: remove redundant try catch 2018-11-09 14:24:21 +01:00
Erik Sundell
bb1f79ecdc stackdriver: rename query function 2018-11-09 13:55:16 +01:00
Erik Sundell
5424603052 stackdriver: rename query variable 2018-11-09 13:55:16 +01:00
Erik Sundell
f14b3e7fcf stackdriver: remove debug log 2018-11-09 13:55:16 +01:00
Erik Sundell
9c85793dbb stackdriver: test saved variable 2018-11-09 13:55:15 +01:00
Erik Sundell
b262be73e0 stackdriver: fix failing tests 2018-11-09 13:55:15 +01:00
Erik Sundell
45f49c2e5b stackdriver: remove services query type 2018-11-09 13:55:15 +01:00
Erik Sundell
209b1c026e stackdriver: update tests 2018-11-09 13:55:15 +01:00
Erik Sundell
0280179d35 stackdriver: add tests for render snapshop and default query type 2018-11-09 13:55:15 +01:00
Erik Sundell
7bdf97d3e6 stackdriver: remove lodash since object assign will do the trick 2018-11-09 13:55:15 +01:00
Erik Sundell
85ef5c2523 stackdriver: make sure we don't crash when selected service doesnt have a value 2018-11-09 13:55:15 +01:00
Erik Sundell
8333bf0b76 stackdriver: add simple render test 2018-11-09 13:55:15 +01:00
Erik Sundell
2d14bd10f3 stackdriver: add default value for query type 2018-11-09 13:55:14 +01:00
Erik Sundell
588c5c045a stackdriver: pass query definition from react, making it possible to use another definition than the query string only 2018-11-09 13:55:14 +01:00
Erik Sundell
5069f4afc9 stackdriver: make it possible to use alignment period template variable 2018-11-09 13:55:14 +01:00
Erik Sundell
a027a87d50 stackdriver: make it possible to use aligner template variable 2018-11-09 13:55:14 +01:00
Erik Sundell
2a6aec721e stackdriver: make it possible to use aggregation template variable 2018-11-09 13:55:14 +01:00
Erik Sundell
a951e577b7 stackdriver: make it possible to use aggregation template variable 2018-11-09 13:55:14 +01:00
Erik Sundell
20f1956225 stackdriver: make it possible to use metric type template variable 2018-11-09 13:55:13 +01:00
Erik Sundell
40bb3551cf stackdriver: return correct value 2018-11-09 13:55:13 +01:00
Erik Sundell
fcf39a0839 stackdriver: fix default value bug 2018-11-09 13:55:13 +01:00
Erik Sundell
042d156e5f stackdriver: extend label width 2018-11-09 13:55:13 +01:00
Erik Sundell
21940c2ca3 stackdriver: revert refactoring 2018-11-09 13:55:12 +01:00
Erik Sundell
2780ef27fd stackdriver: extract variables for pickers 2018-11-09 13:55:12 +01:00
Erik Sundell
b3c34be648 stackdriver: cleanup 2018-11-09 13:55:12 +01:00
Erik Sundell
a46b9cb0bb stackriver: rename interface 2018-11-09 13:55:12 +01:00
Erik Sundell
e9e20224d4 stackriver: use type for state 2018-11-09 13:55:12 +01:00
Erik Sundell
e0c0dc1453 stackdriver: rename state vars 2018-11-09 13:55:12 +01:00
Erik Sundell
9872ea7d8c stackdriver: extract common function 2018-11-09 13:55:11 +01:00
Erik Sundell
c993a4d296 stackdriver: streamline the way labels are refreshed when a new value is picked in the dropdowns above 2018-11-09 13:55:11 +01:00
Erik Sundell
1791e7329c stackdriver: handle default state 2018-11-09 13:55:11 +01:00
Erik Sundell
3c5f8325f5 stackdriver: refactor dropdown component 2018-11-09 13:55:11 +01:00
Erik Sundell
3c1cf214bc stackdriver: replace components with basic stateless select 2018-11-09 13:55:11 +01:00
Erik Sundell
1194da0d04 stackdriver: remove not used func. wrap query in exception 2018-11-09 13:55:11 +01:00
Erik Sundell
3af1d74c6a stackdriver: reload all child dropdown and update selected accordingly 2018-11-09 13:55:10 +01:00
Erik Sundell
c40794c2b9 stackdriver: improve default state handling 2018-11-09 13:55:10 +01:00
Erik Sundell
16c6d79dd6 stackdriver: use standard naming convention for selects 2018-11-09 13:55:10 +01:00
Erik Sundell
d80025d215 stackdriver: streamline label change 2018-11-09 13:55:10 +01:00
Erik Sundell
727472a3cb stackdriver: refactor TemplateQueryComponent 2018-11-09 13:55:10 +01:00
Erik Sundell
f0b4af9f6c stackdriver: use enum for query type 2018-11-09 13:55:10 +01:00
Erik Sundell
ca77cdc37e stackdriver: add aggregation query 2018-11-09 13:55:09 +01:00
Erik Sundell
b1db07789b stackdriver: add alignment periods 2018-11-09 13:55:09 +01:00
Erik Sundell
a0b8c4acba stackdriver: add aligner query 2018-11-09 13:55:09 +01:00
Erik Sundell
b3edad40a9 stackdriver: add resource types query 2018-11-09 13:55:09 +01:00
Erik Sundell
cb0d563aae stackdriver: add support for resource label queries 2018-11-09 13:55:09 +01:00
Erik Sundell
8c3874ee30 stackdriver: return friendly display name 2018-11-09 13:55:08 +01:00
Erik Sundell
4ab278dca4 stackdriver: add metric labels query 2018-11-09 13:55:08 +01:00
Erik Sundell
cbb663015e stackdriver: move response parsing to datasource file 2018-11-09 13:55:08 +01:00
Erik Sundell
7ccce76b80 stackdriver: return values for services and metric types 2018-11-09 13:55:08 +01:00
Erik Sundell
33c9217cc9 stackdriver: refactoring - rename react components and file structure changes 2018-11-09 13:55:08 +01:00
Erik Sundell
4bcf3bf1ff stackdriver: remove not used code 2018-11-09 13:53:44 +01:00
Erik Sundell
ba4d52e048 stackdriver: add selector components for service and metric type 2018-11-09 13:53:44 +01:00
Erik Sundell
1969ad41e8 stackdriver: refactor stackdriver query ctrl 2018-11-09 13:53:44 +01:00
Erik Sundell
637b91ab8d stackdriver: conditional template component rendering 2018-11-09 13:53:44 +01:00
Erik Sundell
0792c182cc stackdriver: add react component for template query editor 2018-11-09 13:53:44 +01:00
Michael Huynh
22b8b04dbe
Preserve suffix text when applying function suggestion 
Updates all PromQL function-like suggestions to omit parentheses
when inserted. Such insertions also preserve any suffix text.

Related: #13885
 2018-11-09 20:43:20 +08:00
Peter Holmberg
b536a9f760 can render something 2018-11-08 16:40:53 +01:00
David
203078280f
Merge pull request #13942 from grafana/davkal/explore-logging-graph 
Explore: Logging graph overview and view options
 2018-11-08 14:38:29 +01:00
David Kaltschmidt
6b8d7c89ac Refactored log stream merging, added types, tests, comments 2018-11-08 14:24:54 +01:00
Torkel Ödegaard
964a21b091 Merge branch 'master' into panel-edit-ux 2018-11-08 11:46:04 +01:00
Marcus Efraimsson
f065af320d
fix switching from es raw document metric breaks query editor 2018-11-08 01:00:20 +01:00
Torkel Ödegaard
29e18fddd0 refactored how testing state was handled, using redux for this felt way to require way to much code 2018-11-07 14:28:44 -08:00
Torkel Ödegaard
dcb5015022
Merge pull request #13951 from marefr/11977_6x_terms 
Fix terms agg order deprecation warning on es 6+
 2018-11-07 20:47:41 +01:00
Torkel Ödegaard
7d87f57367 experimental option boxes 2018-11-06 18:55:35 +01:00
David Kaltschmidt
dfc0c5052d Fix loglevel tests for Explore loggging 2018-11-06 15:40:29 +01:00
David Kaltschmidt
a5ed86edba Graph log entries by log level 2018-11-06 12:00:05 +01:00
David Kaltschmidt
e39e82949d Adaptive bar widths for log graph 2018-11-06 11:07:12 +01:00
Torkel Ödegaard
562411af1a fixed options 2018-11-06 07:23:02 +01:00
Torkel Ödegaard
b9612aaa23 minor code style change 2018-11-05 10:38:55 -08:00
Torkel Ödegaard
9393b06166 basic panel options working 2018-11-05 10:31:39 -08:00
Torkel Ödegaard
35e62bbbe0 wip: react panel options architecture 2018-11-05 17:46:09 +01:00
Torkel Ödegaard
dd4eab1722 panel options wip 2018-11-05 13:44:09 +01:00
David
0df14f3fa8
Merge pull request #13927 from grafana/davkal/explore-start-task 
Explore: fix metric selector for additional rows
 2018-11-05 12:30:02 +01:00
David
24e5922d68
Merge pull request #13953 from miqh/fix/suppress-aggregation-suggestions 
Handle suggestions for alternate syntax aggregation contexts
 2018-11-05 12:15:37 +01:00
Marcus Efraimsson
fdedb917a2
Merge pull request #13892 from grisme/13606-table-cell-background-color 
Fix bug with background color in table cell with link
 2018-11-05 11:43:47 +01:00
Michael Huynh
f79b790ef6
Add tests covering alternate syntax for aggregation contexts 
Related: #13690
 2018-11-03 08:07:08 +08:00
Michael Huynh
5e748243af
Handle suggestions for alternate syntax aggregation contexts 
In aggregation contexts using the alternate syntax form, labels will
precede metrics. A cursor at the label position cannot provide
meaningful suggestions unless a metric is specified. In the latter case,
no suggestions are presented at all.

Related: #13690
 2018-11-03 07:56:13 +08:00
Marcus Efraimsson
5803bfd2c7
fix terms agg order deprecation warning on es 6+ 2018-11-02 17:53:47 +01:00
David Kaltschmidt
583334df05 Explore: Logging graph overview and view options 
- Logging gets a graph for log distribution (currently per stream, but I
  think I'll change that to per log-level)
- added grid columns for timestamp and unique labels
- show common labels of streams
- View options to show/hide time columns, label columns
- created `--small` modifier for Switch CSS classes
- merging of streams is now a datasource responsibility
 2018-11-02 08:25:36 +01:00
Marcus Efraimsson
c2e1422c00
Merge pull request #13921 from svenklemm/postgres-delta 
Add delta window function to postgres query builder
 2018-11-01 09:55:26 +01:00
David Kaltschmidt
edd575b552 Explore: fix metric selector for additional rows 
- race condition in language provider leads to only one row getting
  selector options
- fixed by always returning the start task promise
 2018-11-01 09:46:05 +01:00
Sven Klemm
f608340c35 Add delta window function to postgres query builder 
Unlike the increase function delta doesn't check for resets
and can go negative. This is similar to the prometheus delta
function.
 2018-10-31 19:26:18 +01:00
David Kaltschmidt
4f959648a7 Explore: async starts of language provider 
- changed `start()` to return promise on main language feature task
- promise resolves to list of secondary tasks
- speeds up time to interaction of metric selector
- lazy loading of certain metric selector and log label selector items
- loading indication of metric and log label selectors
 2018-10-31 17:53:28 +01:00
Torkel Ödegaard
749d7a2f0c
Merge pull request #13913 from Yukinoshita-Yukino/master 
Add only display date option to table panel column
 2018-10-31 13:31:43 +01:00
Torkel Ödegaard
89cd15d98c removed logging call 2018-10-31 04:38:16 -07:00
Torkel Ödegaard
dfb9419f86 Merge branch 'graph-legend-to-react' 2018-10-31 04:26:44 -07:00
Yuan Liu
6daf73fec0
add table column date format 2018-10-31 18:51:34 +08:00
Torkel Ödegaard
36cd73819a fixed memory leaks and minor refactoring 2018-10-31 03:40:03 -07:00
Marcus Efraimsson
f348acccf3
Merge pull request #13758 from grafana/mysql_query_builder 
mysql graphical query builder
 2018-10-31 10:52:16 +01:00
David Kaltschmidt
c92f5462fe Explore: repair logging after code restructuring 
this is a fix-up PR that cleans up Explore Logging after the recent
restructuring.

- log results need to be merged since query transactions have been
  introduced
- logging DS has its own language provider, query field, and start page
  (some of them based on prometheus components)
- added loader animation to log viewer
- removed logging logic from prometheus components
 2018-10-30 16:35:49 +01:00
David
758ec4bc70
Merge pull request #13844 from grafana/davkal/explore-empty-page 
Explore: Pluggable components from datasource plugins
 2018-10-30 14:54:34 +01:00
David Kaltschmidt
cf19ecc8f5 Make Explore plugin exports explicit 2018-10-30 14:38:34 +01:00
Anton
355e76a48e Fix cell coloring 2018-10-29 23:26:29 +03:00
Anton
6092fa4dc3 Fix bug with background color in table cell with link 2018-10-29 23:13:07 +03:00
David Kaltschmidt
d0776937b5 Pluggable components from datasource plugins 
- when instantiating a datasource, the datasource service checks if the
  plugin module exports Explore components, and if so, attaches them to
  the datasource
- Explore component makes all major internal pluggable from a datasource
  `exploreComponents` property
- Moved Prometheus query field to promehteus datasource and registered
  it as an exported Explore component
- Added new Start page for Explore, also exported from the datasource
 2018-10-29 15:14:36 +01:00
Sebastian
85aed0276e
Update grafana_stats.json 
The grafana_stats.json used the following prometheus query: "increase(grafana_alerting_result_total[1m])" But a metric called "grafana_alerting_result_total" is currently not there anymore. So i changed the query to "increase(grafana_alerting_active_alerts[1m])" and updated the title as well (Before: "Grafana alert results", Now: "Grafana active alerts").
 2018-10-29 12:05:24 +01:00
Torkel Ödegaard
e47de5602b added missing alpha state prop to graph2 panel 2018-10-28 12:46:18 -07:00
Torkel Ödegaard
9f1f5805ec added switch form component 2018-10-28 12:10:49 -07:00
Torkel Ödegaard
9f35b8a65e
Merge pull request #13827 from grafana/remove-projectname-from-query-response 
stackdriver: Remove redundant project name assignment
 2018-10-28 19:08:38 +01:00
David
121ac93d08
Merge pull request #13847 from miqh/fix/multi-line-aggregation 
Fix label suggestions inside multi-line aggregation contexts
 2018-10-28 18:05:31 +01:00
David Kaltschmidt
9245dad53e Fix query hint tests after refactor 2018-10-28 17:48:17 +01:00
David
2ec827f02f
Merge pull request #13774 from miqh/feat/sum-query-suggestion 
Implement sum aggregation suggestion with placeholder support
 2018-10-28 17:37:42 +01:00
Michael Huynh
d1d5e9f7d3
Add tests to cover PlaceholdersBuffer and sum hint 
Related: #13615
 2018-10-28 21:07:40 +08:00
Michael Huynh
c255b5da11
Add sum aggregation query suggestion 
Implements rudimentary support for placeholder values inside a string
with the `PlaceholdersBuffer` class. The latter helps the newly added
sum aggregation query suggestion to automatically focus on the label
so users can easily choose from the available typeahead options.

Related: #13615
 2018-10-28 21:03:39 +08:00
Torkel Ödegaard
c5f9d8092f Reduce re-renderings when changing view modes 2018-10-27 16:54:04 +02:00
Torkel Ödegaard
10e5d725bc updated singlestat logo 2018-10-27 15:13:57 +02:00
Michael Huynh
61843b58db
Add tests to cover aggregation context cases 
This should cover use cases involving multi-line queries and range
vector syntax inside aggregation contexts.

Related: #12890
 2018-10-27 17:02:03 +08:00
Michael Huynh
2a4a19388f
Fix label suggestions for multi-line aggregation queries 
No label suggestions were being returned for multi-line aggregation
contexts because the parsed selector string does not see the full
context before a `by` or `without` clause.

This solution stitches together all text nodes that comprise the query
editor to ensure the selector has sufficient context to generate
suggestions.

Also, an additional workaround has been included to ensure range vector
syntax does not disrupt label suggestions in aggregation contexts.

Related: #12890
 2018-10-27 16:54:12 +08: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
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
David Kaltschmidt
6f2315d5c5 Moved prom language features to datasource language provider 2018-10-25 12:24:24 +02:00
Alexander Zobnin
533f35853b
Merge remote-tracking branch 'upstream/master' into graph-legend-to-react 2018-10-25 11:56:02 +03: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
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
f19ffee5b4 Fix rebase, fix empty field still issuing query problem 2018-10-23 17:21:33 +02:00
David Kaltschmidt
fbed57ab43 Get query hints per query transaction 2018-10-23 16:10:52 +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
Alexander Zobnin
f150c34b66
Merge remote-tracking branch 'upstream/master' into graph-legend-to-react 2018-10-23 14:35:55 +03: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
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
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
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
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
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
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
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
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
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
Mitsuhiro Tanda
c64a5a6e0e re-add hard coded region list 2018-10-17 14:02:02 +09:00
Alexander Zobnin
46ec15a11e
graph legend: add color picker (react) 2018-10-16 16:50:43 +03:00
Alexander Zobnin
5a2e399d2d
Merge remote-tracking branch 'upstream/master' into graph-legend-to-react 2018-10-16 13:49:13 +03:00
Mitsuhiro Tanda
fce50cf1b8 return default region list from backend 2018-10-16 12:20:39 +09:00
Mitsuhiro Tanda
a417d6fa21 don't merge hard coded region list 2018-10-16 12:03:33 +09:00
Mitsuhiro Tanda
61e2710961 add error message 2018-10-16 12:03:33 +09:00
Mitsuhiro Tanda
6564abd5f3 get regions from after datasource save 2018-10-16 12:03:33 +09:00