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
Peter Holmberg
cc7bf31c3e
Merge remote-tracking branch 'origin/develop' into unit-picker
2018-11-16 16:54:02 +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
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
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
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
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
