Commit Graph

2255 Commits

Author SHA1 Message Date
Erik Sundell
00d8e1f221 add table support flag for mssql 2018-11-29 10:38:33 +01:00
Erik Sundell
71f6235a8c add table support flag for logging 2018-11-29 10:38:20 +01:00
Erik Sundell
d66d2ae749 add table support flag for graphite 2018-11-29 10:38:04 +01:00
Torkel Ödegaard
2dc44f6089 Merge branch 'master' into develop 2018-11-23 13:59:35 +01:00
David Kaltschmidt
f831836fa7 Explore: make query field suggestions more robust
- drop invalid history items
- make highlighter more robust by defaulting to empty string on text to highlight
2018-11-23 12:25:43 +01:00
David Kaltschmidt
b778b5350a Explore: swtiching to logging should keep prometheus labels in case of error
Logging's query importer drops all labels that are not common to both datasources.

- keep labels if label lookup of logging datasource came back empty
- easier to remove labels than having to add them in the first place
2018-11-23 11:15:25 +01:00
Erik Sundell
a5947e820c Merge branch 'master' into develop 2018-11-22 13:43:25 +01:00
David Kaltschmidt
bbaa5b63c8 Fix history rendering for DataQuery 2018-11-22 11:02:53 +01:00
David Kaltschmidt
331d419d4f Combine query functions 2018-11-21 17:21:13 +01:00
David Kaltschmidt
22987ee75f Renamed targets to queries 2018-11-21 16:28:30 +01:00
David Kaltschmidt
b3161bea5a Explore: Introduce DataQuery interface for query handling
- Queries in Explore have been string based
- This PR introduces the use of the DataQuery type to denote all queries handled in Explore
- Within Explore all handling of DataQueries is transparent
- Modifying DataQueries is left to the datasource
- Using `target` as variable names for DataQueries to be consistent with the rest of Grafana
2018-11-21 14:45:57 +01:00
Daniel Lee
4aeea56342
Merge pull request #14007 from grafana/stackdriver-template-query-editor
Stackdriver template query editor
2018-11-20 13:41:18 +01:00
Erik Sundell
7021e07ab2 stackdriver: remove not used variable 2018-11-20 13:22:43 +01:00
Erik Sundell
b200f92710 stackdriver: use angular dropdown so that we can restrict user input 2018-11-20 13:18:00 +01:00
Torkel Ödegaard
649d727805 Merge branch 'master' into develop 2018-11-20 09:47:23 +01:00
Erik Sundell
fa32310f8a stackdriver: add query keyword to service, metric and project since these were the only fields in the editor that was missing it in the whole editor 2018-11-19 16:37:42 +01:00
Erik Sundell
19d1d7f35a stackdriver: add query keyword style to query fields 2018-11-19 16:26:06 +01:00
Erik Sundell
164e9a4f9a stackdriver: fix failing test 2018-11-19 16:19:56 +01:00
David
c20c787b62
Merge pull request #14104 from grafana/davkal/prometheus-rule-expansion
Prometheus: fix rules expansion
2018-11-19 15:11:09 +00:00
Erik Sundell
0ec4491a52 stackdriver: reimplementing service variable query type 2018-11-19 16:06:30 +01:00
Erik Sundell
795af5deed stackdriver: fix failing tests 2018-11-19 14:51:52 +01:00
Erik Sundell
0aeaec1ac6 stackdriver: add support for template variables 2018-11-19 14:44:40 +01:00
Erik Sundell
26b1cc5dcf stackdriver: join resource and metric labels. split them in values and keys 2018-11-19 11:34:40 +01:00
David
634d71a657
Merge pull request #14052 from grafana/davkal/explore-query-importer
Explore: POC for datasource query importers
2018-11-16 14:55:19 +00:00
David Kaltschmidt
e3e8be16b3 Prometheus: fix rules expansion
Rules expansion (available via query hints in explore) was broken for expressions that contained selectors.

- fix replacing regexp to recognize `{` and `[` as the end of a rule name
- moved logic to language utils
- added tests
2018-11-16 14:38:20 +00:00
David Kaltschmidt
411719bc70 Explore: POC for datasource query importers
Explore is about keeping context between datasources if possible. When
changing from metrics to logging, some of the filtering can be kept to
narrow down logging streams relevant to the metrics.

- adds `importQueries` function in language providers
- query import dependent on origin datasource
- implemented  prometheus-to-logging import: keeping label selectors
  that are common to both datasources
- added types
2018-11-16 13:52:58 +00:00
David
fe45cb9aa1
Merge pull request #14032 from grafana/davkal/explore-prevent-term-completion
Explore: Don't suggest term items when text follows
2018-11-15 16:43:15 +00:00
Torkel Ödegaard
f5b63fc65d Merge branch 'master' into develop 2018-11-15 16:56:21 +01:00
Erik Sundell
69137e6774 stackdriver: revert project test stuff 2018-11-15 13:23:42 +01:00
Erik Sundell
b9d5fa1b36 stackdriver: revert test code 2018-11-15 13:20:32 +01:00
David Kaltschmidt
ce59acd141 Extracted language provider variables for readibility 2018-11-15 11:20:27 +00:00
stop-cran
20214b3d6a [elasticsearch] Do not set a placeholder to index name, if it's already specified. 2018-11-14 18:45:18 +02:00
Torkel Ödegaard
0a080149ae
Merge pull request #14054 from marefr/6367_raw_document_reset
Fix switching from es raw document metric breaks query editor
2018-11-14 16:46:47 +01:00
Erik Sundell
2e0cbe75ee stackdriver: use arrow functions 2018-11-13 11:06:08 +01:00
Erik Sundell
e698202fae stackdriver: use new naming convention for query editor all over 2018-11-13 10:57:10 +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
e0feb72637 Merge remote-tracking branch 'origin/data-source-settings-to-react' into develop 2018-11-12 16:17:05 +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