Commit Graph

2694 Commits

Author SHA1 Message Date
Tobias Skarhed
d3c213973c Basic cleanup 2018-07-04 13:13:06 +02:00
Tobias Skarhed
12d158f391 Add mocks in test file 2018-07-04 13:13:06 +02:00
Tobias Skarhed
8f1bcd9117 Remove q and stub 2018-07-04 13:13:06 +02:00
Tobias Skarhed
80b2f5c756 Add Jest stubs 2018-07-04 13:13:06 +02:00
Tobias Skarhed
69c85e0d7e Remove async 2018-07-04 13:13:06 +02:00
Tobias Skarhed
12e76ad197 Remove logs and comments 2018-07-04 13:13:06 +02:00
Tobias Skarhed
bd417bedb2 Start elastic ds test conversion 2018-07-04 13:13:06 +02:00
Sven Klemm
fee36b2b35 include where constraints in query generation 2018-07-04 12:22:45 +02:00
Sven Klemm
ced0a5828f rearrange elements of query builder 2018-07-04 11:56:26 +02:00
Sven Klemm
9847c2186f mv query_part to sql_part 2018-07-04 11:39:58 +02:00
Sven Klemm
19dcc1f41a Merge remote-tracking branch 'upstream/master' into postgres-query-builder 2018-07-04 10:12:27 +02:00
David
0d1f7c8782 Fix bar width issue in aligned prometheus queries (#12483)
* Fix bar width issue in aligned prometheus queries

This was broken because null values were filled in with unaligned times.

* use aligned times for result transformation
* add tests

An earlier version of this fix aligned the times again in the transformer, but
I think it's safe to only deal with aligned times in the response.

* Fixed prometheus heatmap tranformer test

The interval needs to be 1 to prevent step alignment.
2018-07-02 11:04:36 -07:00
Sven Klemm
410449b5e7 use sqlPart for ui parts 2018-06-30 11:11:34 +02:00
Sven Klemm
d26cacccd9 Merge remote-tracking branch 'upstream/master' into postgres-query-builder 2018-06-30 10:49:17 +02:00
Marcus Efraimsson
845724e8b9
update mysql/mssql query/annotation help sections 2018-06-29 20:39:06 +02:00
Daniel Lee
8537f10285
Merge pull request #11892 from ApsOps/colorize-singlestat-prefix-postfix-option
Make colorization of prefix and postfix optional in singlestat
2018-06-28 14:42:48 +02:00
Tobias Skarhed
af0a4a6039 Karma to Jest: 3 test files (#12414)
* Karma to Jest: viewstate_srv

* Karma to Jest: annotations_srv

* Remove comments

* Karma to Jest: series_override_ctrl

* Remove unnecessary code

* Class to function and fix lint error

* Fix ngInject
2018-06-28 04:43:23 -07:00
Aman
e11f6f5cdf
Make pre/postfix coloring checkboxes inactive when gauge is active 2018-06-26 13:06:26 +05:30
Sven Klemm
682c684df3 Merge remote-tracking branch 'upstream/master' into postgres-query-builder 2018-06-26 09:26:35 +02:00
Aman
1dd65f7a39
Add options to colorize prefix and postfix in singlestat 2018-06-22 14:50:04 +05:30
Daniel Lee
b2187b70a7
Merge pull request #11990 from mtanda/issue_11925
fix "Cloudwatch panel does not allow arbitrary variable values in query"
2018-06-21 18:00:49 +02:00
Daniel Lee
6871f4c14e
Merge pull request #12018 from forzafootball/am/fix-query-variable-influxdb
Conditionally select a field to return in ResponseParser for InfluxDB
2018-06-21 12:25:15 +02:00
Marcus Efraimsson
296a841685
Merge pull request #12123 from alexanderzobnin/fix-11792
graph: fix legend decimals precision calculation
2018-06-20 13:08:17 +02:00
Tobias Skarhed
8666c77cc9 Karma to Jest: time_srv (#12303)
* Begin Karma to Jest: time_srv

* Remove experimental fix

* location search stubs for each test

* Fix issue where time service was not available for other tests
2018-06-18 09:47:23 -07:00
Sven Klemm
6c7984a840 Merge remote-tracking branch 'upstream/master' into postgres-query-builder 2018-06-16 10:36:50 +02:00
David Kaltschmidt
d5196ab322 remove internal influx ifql datasource 2018-06-14 20:42:33 +01:00
Tobias Skarhed
dbbd6b9b66 Remove import 2018-06-14 15:27:11 +02:00
Tobias Skarhed
ef0586acab Karma to Jest: query_builder 2018-06-14 14:20:42 +02:00
Tobias Skarhed
155ff06cbe Karma to Jest: threshold_manager 2018-06-14 13:22:17 +02:00
Tobias Skarhed
2465f53324 Karma to Jest: query_def, index_pattern 2018-06-14 12:18:11 +02:00
Tobias Skarhed
a911d36dea Remove import 2018-06-14 12:00:54 +02:00
Tobias Skarhed
04029a94cd Karma to Jest: elastic_response 2018-06-14 11:56:03 +02:00
Marcus Efraimsson
71b0326769
Merge pull request #12237 from dehrax/12224-version-panel
Convert tests from Karma to Jest
2018-06-14 10:13:46 +02:00
Carl Bergquist
d3a3e7cfd1
Merge pull request #12222 from PrincipalsOffice/remove-QueryOptionsCtrl-references
removed QueryOptionsCtrl references
2018-06-13 09:34:02 +02:00
Tobias Skarhed
d91e9ddd22 Convert tests from Karma to Jest 2018-06-12 13:54:07 +02:00
Tobias Skarhed
da9a28f37d Karma to Jest: graph-tooltip 2018-06-11 15:59:20 +02:00
Jiang Ye
c92874875c removed QueryOptionsCtrl references 2018-06-09 16:06:03 -04:00
David Kaltschmidt
ab76864e61 hot-fix ifql testdatasource() 2018-06-08 14:56:48 +02:00
Alexander Zobnin
24f6d34abd
graph: fix legend decimals precision calculation 2018-06-07 16:02:44 +03:00
David Kaltschmidt
cdba2bd184 Annotations support for ifql datasource 2018-06-06 16:11:40 +02:00
David Kaltschmidt
2c86484e54 Template variable support for ifql datasource
* Implements findMetricQuery()
* Macros for template queries: measurements(), tags(), tag_values(),
 field_keys()
* Tests for macro expansion
2018-06-06 14:11:48 +02:00
Sven Klemm
a05d694d31 Merge remote-tracking branch 'upstream/master' into postgres-query-builder 2018-06-05 23:21:46 +02:00
David Kaltschmidt
d7379912c1 Query helpers for IFQL datasource
* raw CSV preview next to query field (query inspector is not that
 useful here)
* added result table and record counts
2018-06-05 17:15:35 +02:00
David
45a156577c
Merge pull request #12143 from grafana/davkal/ifql-datasource
InfluxDB IFQL datasource (beta)
2018-06-05 14:23:21 +02:00
David Kaltschmidt
64f5874778 Remove round-robin urls in ifql DS 2018-06-05 13:49:35 +02:00
David Kaltschmidt
1d587450b3 IFQL range variable expansion 2018-06-05 13:42:32 +02:00
Patrick O'Carroll
d650dc94c9 fixed so default is all and general only show dashboards 2018-06-04 17:25:20 +02:00
Patrick O'Carroll
937b26f3fd added s to folderId in params 2018-06-04 16:28:24 +02:00
David Kaltschmidt
08ee1da6b1 InfluxDB IFQL datasource 2018-06-04 12:24:47 +02:00
Sven Klemm
6220dec076 Merge remote-tracking branch 'upstream/master' into postgres-query-builder 2018-06-02 12:57:14 +02:00
Marcus Efraimsson
b6afe5f2e8
Merge pull request #11380 from WPH95/feature/add_es_alerting
elasticsearch: alerting support
2018-06-01 15:17:28 +02:00
Patrick O'Carroll
0c269d64d0 Alert panel filters (#11712)
alert list panel: filter alerts by name, dashboard, folder, tags
2018-06-01 14:36:40 +02:00
Marcus Efraimsson
28f0acd854
Merge branch 'master' into feature/add_es_alerting 2018-05-31 16:33:07 +02:00
Patrick O'Carroll
b894b5e669 Fix singlestat threshold tooltip (#12109)
fix singlestat threshold tooltip
2018-05-30 18:09:57 +02:00
David
7a3c1e162c
Merge pull request #11942 from grafana/davkal/design-integration
Explore: Time selector, split view, design integration
2018-05-30 12:27:24 +02:00
Kim Christensen
48fc5edda1 Support InfluxDB count distinct aggregation (#11658)
influxdb: support count distinct aggregation
2018-05-30 09:22:16 +02:00
David
9b9e3962c5
Merge pull request #12072 from grafana/davkal/12024-fix-alignment
Changed Prometheus interval-alignment to cover whole panel range
2018-05-29 15:03:06 +02:00
Marcus Efraimsson
048ac3089b
Merge branch 'master' into feature/add_es_alerting 2018-05-29 14:36:52 +02:00
Marcus Efraimsson
2c8571a686
Merge pull request #12089 from bergquist/graphite_header
graphite: avoid distributed tracing headers in direct/browser mode
2018-05-29 14:07:18 +02:00
bergquist
e708e9ac3c graphite: avoid dtracing headers in direct mode
closes #11494
2018-05-28 20:35:19 +02:00
Marcus Efraimsson
7cb0403faa
elasticsearch: handle if alert query contains template variable
If datasource handles targetContainsTemplate function it can evaluate if a certain
query contains template variables and this is used for show an error message that
template variables not is supported in alert queries.
2018-05-28 19:45:18 +02:00
Marcus Efraimsson
e5e1683840
Merge branch 'master' into feature/add_es_alerting 2018-05-28 18:10:34 +02:00
Ryan McKinley
17b9609209 Sparklines should scale to the data range (#12010)
* Add a full range option to sparklines

* line zero=false
2018-05-28 16:30:44 +02:00
Mitsuhiro Tanda
e65cf5cbb5 fix directly specified variable rendering 2018-05-28 11:28:08 +09:00
Sven Klemm
17b46804e8 remove unused function renderAdhocFilters 2018-05-27 19:39:43 +02:00
Sven Klemm
928353c628 Merge remote-tracking branch 'upstream/master' into postgres-query-builder 2018-05-26 13:37:00 +02:00
David Kaltschmidt
750ea9bbdd Changed Prometheus interval-alignment to cover whole panel range
* the existing query date alignment shifts the range forward to match
a multiple epoch of the interval, but keeps the range length the same,
the result is that the start date is shifted forward as well, leaving a
gap in the graph (or a zero-line when null-as-zero was set, issue #12024)
* this pr extends the aligned range to cover the original start date as
well
2018-05-25 16:46:38 +02:00
David Kaltschmidt
eadaff6191 Explore: Design integration
* style header like other grafana components
* use panel container for graph and same styles for query field
* fix typeahead CSS selector (was created outside of .explore)
* use navbar buttons for +/- of rows
* moved elapsed time under run query button
* fix JS error on multiple timeseries being returned
* fix color for graph lines
* show prometheus query errors
2018-05-24 10:55:00 +02:00
Marcus Efraimsson
1324a67cbd
Merge branch 'master' into WPH95-feature/add_es_alerting 2018-05-23 14:35:45 +02:00
Carl Bergquist
64053e1954
Merge pull request #11788 from mtanda/prom_query_timeout
add query timeout option for Prometheus
2018-05-22 09:40:29 +02:00
Aleksei Magusev
b7482ae8b7 Fix ResponseParser for InfluxDB to return only string values 2018-05-21 16:38:58 +02:00
Aleksei Magusev
e104e9b2c2 Conditionally select a field to return in ResponseParser for InfluxDB
This patch also fixes "value[1] || value[0]" to not ignore zeros.
2018-05-21 16:38:53 +02:00
Sven Klemm
cd49f2d425 Merge remote-tracking branch 'upstream/master' into postgres-query-builder 2018-05-21 15:58:31 +02:00
Daniel Lee
de7a880d66 Revert "Conditionally select a field to return in ResponseParser for InfluxDB"
This reverts commit a101177b55.

Ref #12009
2018-05-21 15:47:29 +02:00
Daniel Lee
80f8fb1e02 Revert "Fix ResponseParser for InfluxDB to return only string values"
This reverts commit 92e5968f91.

Ref #12009
2018-05-21 15:46:23 +02:00
Mitsuhiro Tanda
067ceb178e Revert "move queryTimeout option to common setting"
This reverts commit 3ba59a1d66a2a3c07ccd04a48c403f0772fbef31.
2018-05-21 21:45:51 +09:00
Mitsuhiro Tanda
12ace5ab65 move queryTimeout option to common setting 2018-05-21 21:45:51 +09:00
Mitsuhiro Tanda
8ddcd67080 add query timeout option for Prometheus 2018-05-21 21:45:51 +09:00
Sven Klemm
8b47d7c520 set style for registered query components 2018-05-21 12:53:06 +02:00
Sven Klemm
a5bcd8eac0 fix metric column when using group by 2018-05-21 12:10:18 +02:00
Sven Klemm
3af4e4e0d6 separate label in template from type 2018-05-21 11:44:37 +02:00
Sven Klemm
e93276b1f8 use sql part component 2018-05-21 11:10:00 +02:00
Sven Klemm
de9a117dc6 use sql part component 2018-05-21 11:04:52 +02:00
Sven Klemm
b12d049f6f quote column name in buildValueQuery 2018-05-19 17:21:53 +02:00
Sven Klemm
731c7520b3 return values quotes for suggestions in where expression 2018-05-19 15:34:48 +02:00
Sven Klemm
9e05477558 Merge remote-tracking branch 'upstream/master' into postgres-query-builder 2018-05-19 12:27:23 +02:00
Torkel Ödegaard
6c0752473a
Sqlstore refactor (#11908)
* refactor: tracing service refactoring

* refactor: sqlstore to instance service

* refactor: sqlstore & registory priority

* refactor: sqlstore refactor wip

* sqlstore: progress on getting tests to work again

* sqlstore: progress on refactoring and getting tests working

* sqlstore: connection string fix

* fix: not sure why this test is not working and required changing expires

* fix: updated grafana-cli
2018-05-18 11:10:10 +02:00
Daniel Lee
b086981e15
Merge pull request #11954 from grafana/11830-firefox-legend
legend: fixes Firefox/baron scroll bug
2018-05-16 16:49:42 +02:00
Daniel Lee
50026fad2e legend: fixes Firefox/baron scroll bug
Compensates for Firefox scrollbar calculation error in the baron framework.
Offsetwidth and clientwidth are used to find the width of the scrollbar. In
the legend these differ by 9px and cause the scroll div to grow by 9px for
every refresh. This fix compensates with a negative margin-right in that
case.

Fixes #11830
2018-05-16 15:08:22 +02:00
Mitsuhiro Tanda
87c9c47579 use canMakeEditable 2018-05-16 11:58:51 +09:00
Mitsuhiro Tanda
fe301142ba allow to add annotation for non editable dashboard 2018-05-16 11:51:28 +09:00
David Kaltschmidt
a1b92369db Merge remote-tracking branch 'origin/master' into prometheus_align_queries
* origin/master: (21 commits)
  docs: removes notes about beeing introduced in 5.0
  lock caniuse-db version to resolve phantomjs rendering issue
  Update dashboard_permissions.md
  move database-specific code into dialects (#11884)
  refactor: tracing service refactoring (#11907)
  fix typo in getLdapAttrN (#11898)
  docs: update installation instructions targeting v5.1.2 stable
  changelog: add notes about closing #11862, #11656
  Fix dependencies on Node v10
  Update dashboard.md
  changelog: add notes about closing #10338
  Phantom render.js is incorrectly retrieving number of active panels (#11100)
  singlestat: render time of last point based on dashboard timezone (#11425)
  Fix for #10078: symbol "&" is not escaped (#10137)
  Add alpha color channel support for graph bars (#10956)
  interpolate 'field' again in Elasticsearch terms queries (#10026)
  Templating : return __empty__ value when all value return nothing to prevent elasticsearch syntaxe error (#9701)
  http_server: All files in public/build have now a huge max-age (#11536)
  fix: ldap unit test
  decrease length of auth_id column in user_auth table
  ...
2018-05-14 12:11:14 +02:00
David Kaltschmidt
e731c248d7 Prometheus step alignment: shift interval only on jitter
* only increase interval by step if jitter happened
* shift both start and end
* simplified tests by using low epoch numbers
2018-05-14 12:08:30 +02:00
Marcus Efraimsson
cde347bd3d
Merge branch 'master' into WPH95-feature/add_es_alerting 2018-05-08 17:13:08 +02:00
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
David
06aca5e8b5
Merge branch 'master' into prometheus_align_queries 2018-05-08 12:22:55 +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