Torkel Ödegaard
8a61e0967e
Merge branch 'master' into develop
2017-12-12 13:22:13 +01:00
Torkel Ödegaard
a00af85f36
build: fixed unit test failure
2017-12-12 13:21:50 +01:00
Torkel Ödegaard
cafed8ce8f
Merge branch 'master' into develop
2017-12-12 13:19:07 +01:00
David Kaltschmidt
edb2dcf1b0
Extracted row matching function and added comments
2017-12-12 13:18:06 +01:00
Torkel Ödegaard
871b98c06b
graphite: minor fix for PR #10142 the query was being sent for every segmen t you selected before you completed the metric path
2017-12-12 12:56:40 +01:00
Torkel Ödegaard
bb52f3670e
Merge branch 'parseTarget' of https://github.com/DanCech/grafana into DanCech-parseTarget
2017-12-12 12:38:58 +01:00
David Kaltschmidt
8d70f13393
Type-agnostic row merge in table transform for multiple queries
...
* moved unique value naming to datasource (credit: @bergquist)
* merge rows based on same column-values and empty values
* expanded tests
2017-12-11 12:42:53 +01:00
Mikael Olenfalk
8e7166b5c4
Explicitly specify default region in CloudWatch datasource ( #9440 )
...
The datasource uses the default region in the query if the region
is "" in the settings. However setting the region to an empty string
is almost impossible and rendered incorrectly.
This commit introduces a special value "default" for region which
is shown in the drop down and is translated to the default region
of the data source when performing queries.
2017-12-11 09:37:27 +01:00
Dan Cech
588ce6606c
fix function re-ordering broken in #9436
2017-12-10 21:20:38 -05:00
Dan Cech
525ae4fdf5
support metric trees of varying depth, never send '.select metric' to graphite
2017-12-10 10:48:12 -05:00
Dan Cech
8dcfa18761
simplify function parameter addition
2017-12-10 10:45:41 -05:00
Dan Cech
3a1700cbee
improve handling of query references
2017-12-09 16:27:05 -05:00
Torkel Ödegaard
1e5983b46c
Merge branch 'develop' into develop-settings
2017-12-09 21:50:26 +01:00
Dan Cech
4fcf79a3a6
demonstrate parseTarget issue
2017-12-09 11:17:34 -05:00
Marcus Efraimsson
1985027549
dashfolders: Folder picker should set correct default values. Fixes #10135
2017-12-08 17:46:52 +01:00
Alexander Zobnin
d8612380e9
refactor: rename User Groups to Teams
2017-12-08 18:25:45 +03:00
Sven Klemm
ce809de1ed
postgres: change $__timeGroup macro to include "AS time" column alias ( #10119 )
...
* change $__timeGroup macro to include column alias
* update docs and help text for $__timeGroup macro
2017-12-08 15:14:10 +01:00
Torkel Ödegaard
9369a87e93
Merge branch 'develop' into develop-settings
2017-12-08 14:32:15 +01:00
Torkel Ödegaard
e03abde778
refactoring: #10130
2017-12-08 12:17:09 +01:00
Torkel Ödegaard
4aad4a069c
ux: graph legend refactoring
2017-12-08 10:54:53 +01:00
Torkel Ödegaard
8415ea6c71
refactoring: changing how graph height and legend height is calculated, using flex box seems to actually work, #10079
2017-12-07 19:53:32 +01:00
Torkel Ödegaard
c629a58b6d
refactor: removed graph height from legend decimal calc
2017-12-07 18:13:56 +01:00
Torkel Ödegaard
a7897b945b
Merge branch 'graph-legend-v5' of https://github.com/alexanderzobnin/grafana into alexanderzobnin-graph-legend-v5
2017-12-07 17:09:46 +01:00
Torkel Ödegaard
beb9f8ee74
Merge remote-tracking branch 'origin/master' into develop
2017-12-07 14:14:50 +01:00
Sven Klemm
a62ebb3e59
mysql: pass timerange for template variable queries ( #10071 )
...
* mysql: pass timerange for template variable queries
* mysql: document time range macro usage in template variables
* mysql: docs for on time range change refresh mode for template queries
* Revert "mysql: docs for on time range change refresh mode for template queries"
This reverts commit 5325972aa4
2017-12-07 11:18:36 +01:00
Alexander Zobnin
58d40eb6a0
graph: fix legend height calculation
2017-12-07 12:39:10 +03:00
Sven Klemm
b44c599410
postgres: pass timerange for template variable queries ( #10069 )
...
* pass timerange for template queries when refresh is set to timerange
change
* document on time range change refresh mode for template queries
2017-12-07 10:05:04 +01:00
Alexander Zobnin
3cdf0dce56
graph: move auto decimals calc to ticks.ts and use it for legend values format.
2017-12-07 10:49:00 +03:00
Alexander Zobnin
2cf1c29eae
graph: refactor (don't render twice)
2017-12-06 21:30:14 +03:00
bergquist
48d9d0d356
prom: enable min interval per panel
...
This commit makes it possible to set min interval per panel.
Overrides the value configured on the datasource.
ref #9705
2017-12-06 13:51:19 +01:00
David Kaltschmidt
011b2cd1b2
Fix merge issue on multi-query table transforms
...
* after a match has been found the merger should keep looking for more
2017-12-06 13:12:16 +01:00
Alexander Zobnin
6b4b7969fe
graph: fix karma tests
2017-12-06 14:55:57 +03:00
Alexander Zobnin
0c3e04ca60
graph: render legend before graph
2017-12-06 14:14:00 +03:00
Patrick O'Carroll
3aa1cb012a
added tooltip, fixes #10092 ( #10097 )
...
* added tooltip, fixes #10092
* fixed code formatting
2017-12-06 12:13:17 +01:00
Alexander Zobnin
ae80a589c1
graph: refactor
2017-12-06 12:22:35 +03:00
Alexander Zobnin
36b3309961
graph: convert legend.js to typescript
2017-12-06 11:29:13 +03:00
David Kaltschmidt
eb31833d52
Backwards-compat for multi-query table transform
...
* treat single-query table panels like they were before
* adjusted test cases
2017-12-05 11:25:10 +01:00
Alexander Zobnin
deebaabfc8
graph: make legend scrollable
2017-12-05 13:07:33 +03:00
bergquist
35232a77e6
removes unused properties
...
the dsType property caused some confusion about what datasource is
beeing used. I just removed it since it not beeing used.
closes #10072
2017-12-05 08:26:43 +01:00
David Kaltschmidt
1dd90c8105
Making the multi-query table transform the default table transform
2017-12-04 17:55:00 +01:00
David Kaltschmidt
b6867891f0
Tests for multi-query table transform
2017-12-03 14:32:02 +01:00
Torkel Ödegaard
d7337432ac
ux: progress on time picker dropdown version
2017-12-03 07:53:47 +01:00
Mitsuhiro Tanda
e8a6af7b22
fix templating undefined error ( #10004 )
2017-12-02 17:21:21 +01:00
Torkel Ödegaard
e871e56522
ux: add new panel and dash nav improvements
2017-12-01 20:11:55 +01:00
David Kaltschmidt
85eb2aaa80
Added basic table transformer test
2017-12-01 19:03:47 +01:00
David Kaltschmidt
91e866f145
Add multiquery_table table transform
...
The current table transform renders only the first query.
This PR adds a new transform to render all query results in a JOIN-ish
semantic.
* new table transform: Multi-Query table
* columns is the union of all non-value fields
* one value column per query is added
* rows that share all the same label values are merged into one
2017-12-01 14:27:22 +01:00
Torkel Ödegaard
b1a2344be1
added bundled dashboards
2017-11-30 16:51:06 +01:00
Carl Bergquist
af5ced0e18
Revert "prometheus nested query support"
2017-11-30 15:06:02 +01:00
Carl Bergquist
98f0305e68
Merge pull request #9983 from mtanda/prometheus_nested
...
prometheus nested query support
2017-11-30 14:57:34 +01:00
Mitsuhiro Tanda
98bb8bf761
prometheus nested query support
2017-11-29 18:34:44 +09:00
Torkel Ödegaard
e98af1b3fa
updated libs and fixed new typescript errors
2017-11-27 12:14:57 +01:00
Torkel Ödegaard
bc81298d4c
worked on search
2017-11-24 16:18:56 +01:00
Torkel Ödegaard
93d21bec75
Merge branch 'master' into develop
2017-11-24 09:25:14 +01:00
Torkel Ödegaard
b3ddcc8077
ux: sass fixes and polish
2017-11-23 20:41:16 +01:00
Patrick O'Carroll
4ce1ee4120
Migrate gfunc to ts ( #9973 )
...
* migrated gfunc from js to ts
* deleted gfunc.js, small fixes in gfunc.ts
2017-11-23 17:05:27 +01:00
Torkel Ödegaard
458f6fc4b2
sass refactoring and updating styles for list item elements
2017-11-23 12:54:12 +01:00
Torkel Ödegaard
856a0393ab
Merge branch 'develop' into develop-scrollable-panels
2017-11-23 10:27:16 +01:00
Torkel Ödegaard
68bd17bd0e
work on scrollable panels
2017-11-22 13:32:54 +01:00
Carl Bergquist
d8d44224f5
Merge pull request #9950 from seuf/es_56_max_concurrent_shards_request
...
Elasticsearch max_concurrent_shard_requests parameter for es 5.6+
2017-11-22 10:49:46 +01:00
Patrick O'Carroll
27e486d678
converted 3 .js files to .ts ( #9958 )
...
* converted files from .js to .ts
2017-11-22 10:11:50 +01:00
Torkel Ödegaard
9fc22e5a66
Merge branch 'master' of github.com:grafana/grafana into develop
2017-11-21 16:05:18 +01:00
Torkel Ödegaard
830c307bba
progress on scrollable panels work
2017-11-21 14:30:33 +01:00
THIERRY SALLE
bd4d665d54
Elasticsearch max_concurrent_shard_requests parameter for es 5.6+
2017-11-21 10:56:34 +01:00
bergquist
0390b4187b
prom: add prom2 dashboard as bundled dashboard
2017-11-21 10:12:24 +01:00
Cody Boggs
999b1211b6
show top 5 max scrape durations by job, and fix legend format
2017-11-21 10:12:24 +01:00
Cody Boggs
9151a2468d
fix scrape duration, add rule eval iteration stats, and reorg a bit
2017-11-21 10:12:24 +01:00
Cody Boggs
29de4e7c53
fix data source var and remove node_exporter dependency
2017-11-21 10:12:24 +01:00
Cody Boggs
d5ef0403af
First draft of a Prometheus 2.0 Stats dashboard
2017-11-21 10:12:24 +01:00
Patrick O'Carroll
25f63e0581
converted test-files to jest
2017-11-20 15:25:42 +01:00
Patrick O'Carroll
59cebca4b2
converted influx-series to TS, converted test to jest
2017-11-20 14:31:51 +01:00
Alexander Zobnin
10e3b63ddb
Merge remote-tracking branch 'upstream/develop' into feat-9887
2017-11-20 15:51:49 +03:00
Alexander Zobnin
f54547776d
graph: disable zoom in non-timeseries modes ( #9914 )
2017-11-20 10:06:34 +01:00
Maytee Chinavanichkit
c1e5f5be87
Use correct moments format for Showing last us time instead of value test ( #9923 )
...
Fixes this issue:
PhantomJS 2.1.1 (Mac OS X 0.0.0) SingleStatCtrl showing last us time
instead of value should set formatted value FAILED
expected '09/17/2017 4:56:37 pm' to equal '09/17/2017 16:56:37 pm'
2017-11-20 10:00:56 +01:00
Torkel Ödegaard
0e44fe082b
Merge branch 'master' into develop
2017-11-17 15:49:17 +01:00
Torkel Ödegaard
6595be95eb
influxdb: another minor refactor of #9474
2017-11-17 15:23:45 +01:00
Torkel Ödegaard
37409163b9
refactor: refactoring InfluxDB query builder with policy PR #9473
2017-11-17 15:16:36 +01:00
Torkel Ödegaard
bcb52417db
refactor: refactoring InfluxDB query builder with policy PR #9473
2017-11-17 15:16:04 +01:00
Torkel Ödegaard
4b76c6d652
Merge branch 'master' of https://github.com/omki2005/grafana into omki2005-master
2017-11-17 14:57:44 +01:00
Torkel Ödegaard
7ccc8ae298
elasticsearch: default version to 5.x
2017-11-17 12:23:40 +01:00
Torkel Ödegaard
26577ab600
Merge branch 'master' into graphite-series-by-tags
2017-11-16 16:20:44 +01:00
Torkel Ödegaard
3ae0cfa1d0
graphite: minor changes
2017-11-16 14:16:37 +01:00
Alexander Zobnin
126f3703dc
text panel: make scrollable
2017-11-16 15:43:04 +03:00
Alexander Zobnin
4b88cc0226
panels: general property which makes panel scrollable
2017-11-16 15:38:52 +03:00
Torkel Ödegaard
119f5427af
fix: fix cloudwatch metricFindQuery error that stopped it working completely, fixes #9876
2017-11-16 13:06:24 +01:00
Alexander Zobnin
e89e64e94e
dashlist: fix resizing after mode switching
2017-11-16 14:40:09 +03:00
Alexander Zobnin
7d8b2cb05f
dashlist: add scrollbar
2017-11-16 14:11:01 +03:00
Alexander Zobnin
06622088a1
dashlist: fix panel resizing
2017-11-16 14:10:28 +03:00
Patrick O'Carroll
d800e64368
fixes : #1871 Dropdown starred ( #9490 )
...
adding the ability to star dashboard in search and dashboard-list
closes #1871
2017-11-15 15:01:44 +01:00
Torkel Ödegaard
3b18adfe1a
graphite: progress on new query editor
2017-11-15 14:35:22 +01:00
Torkel Ödegaard
acede1d5f9
graphite: progress on new query editor
2017-11-15 13:45:51 +01:00
Carl Bergquist
5d6ed6c45f
prom: add support for default step param ( #9866 )
...
Alerting for prometheus have been depending on the step parameter from each query.
In https://github.com/grafana/grafana/pull/9226 we changed the behavior for step in the
frontend which caused problems for alerting. This commit fixes that by introducing a default
min interval value so alerting always have something to depend on.
closes #9777
2017-11-15 11:22:00 +01:00
Torkel Ödegaard
b5b93a68fc
Merge branch 'master' into graphite-series-by-tags
2017-11-15 11:12:11 +01:00
Sven Klemm
108f582ec4
sync documentation, add remark about to_timestamp and redshift ( #9841 )
2017-11-14 11:33:55 +01:00
Alexander Zobnin
e7f3480803
heatmap: fix tooltip in "Time series bucket" mode, #9332 ( #9867 )
2017-11-13 15:20:12 +01:00
Marcus Efraimsson
ecbe7d06a6
fix: Table panel now renders annotations correctly. Fixes #9842 ( #9868 )
2017-11-13 15:18:39 +01:00
Torkel Ödegaard
685ee393af
graph: the stack & legend sort sync was not working correctly, the z-index sorting that happened in after the legend sort order was applied and messed with the order even though the sort function returned zero for all entries, combined the sort function to one sort function, fixes #9789 ( #9797 )
2017-11-13 12:09:26 +01:00
Mitsuhiro Tanda
ae4bcdd54b
fix query inspector for cloudwatch
2017-11-12 00:41:14 +09:00
Dan Cech
5b38c230db
use SHOW RETENTIONS to test influxdb connection ( #9824 )
2017-11-08 20:33:15 +01:00
Alexander Zobnin
f5c5c4b88b
graph: don't change original series name in histogram mode, #8886 ( #9782 )
2017-11-04 08:09:41 +01:00
Torkel Ödegaard
f18de7e6a0
Merge branch 'alertList-no-alerts'
2017-11-03 10:17:07 +01:00
Torkel Ödegaard
cd95f5bcc2
refactor: alert list panel fixes and no alerts message, rewrite of PR #9721
2017-11-03 10:16:25 +01:00
Torkel Ödegaard
10fcf2f5be
Merge branch 'master' into develop
2017-11-02 15:56:09 +01:00
Patrick O'Carroll
a433698ddf
changed class name for no-alerts
2017-11-02 08:44:09 +01:00
Carl Bergquist
c783bdac39
Merge pull request #9753 from mtanda/cw_period
...
(cloudwatch) add period alias
2017-11-01 14:02:41 +01:00
Mitsuhiro Tanda
ebcb8be19a
add period alias
2017-11-01 18:47:21 +09:00
Torkel Ödegaard
c3bd07f9b4
testdata: added manual entry mode to test data
2017-11-01 09:59:24 +01:00
Patrick O'Carroll
5a26fc252e
new design for no alerts in alert-list, fixes #9721
2017-11-01 09:44:51 +01:00
Torkel Ödegaard
9aa6a6b4c4
Merge branch 'linkSrv-js-to-ts'
2017-10-31 14:29:42 +01:00
Alexander Zobnin
948a5259a2
fix: color picker bug at series overrides page, #9715 ( #9738 )
2017-10-31 13:53:45 +01:00
Sven Klemm
b6fafb13f5
always quote template variables for mysql when multi-value is allowed ( #9712 )
...
* always quote template variables for mysql when multi-value is allowed
* handle include all option similar to multi value
* declare type
* adjust tests to quoting change
* dont specify type but let it be inferred
* fix test for variable with includeAll
2017-10-31 12:23:50 +01:00
Sven Klemm
caa8b6100e
always quote template variables for postgres when multi-value or include ( #9714 )
...
all is allowed
2017-10-31 12:23:21 +01:00
Alexander Zobnin
ac2e72f22a
graphite: tag is required for values autocomplete
2017-10-31 10:20:01 +03:00
Carl Bergquist
1a3373e049
Merge pull request #9699 from it-teaching-abo-akademi/master
...
Alertlist: Inform when no alerts in current time range
2017-10-30 11:12:11 +01:00
Mitsuhiro Tanda
e9645045a0
ace editor for text panel
2017-10-30 11:05:09 +09:00
Daniel Lee
e541e60bc3
sql: remove title from annotation help
...
Fixes #9710
2017-10-29 20:03:23 +01:00
pkarmaka
cdd17f4871
[Bug Fix] Opentsdb Alias issue ( #9613 )
2017-10-28 13:10:18 +02:00
Tomas Strand
357d394c66
Alertlist: Inform when no alerts in current time range
...
Shows info that no alerts are found for the currently selected interval in Alertlist.
Fixes #9624
2017-10-27 17:20:07 +03:00
Alexander Zobnin
2374e91bfa
graphite: tags and values autocomplete based on @DanCech PR to graphite-web
2017-10-27 13:15:54 +03:00
Sven Klemm
34da0711ab
add __timeGroup macro for mysql ( #9596 )
...
* add __timeGroup macro for mysql
* put example __timeGroup query in frontend help
* do __timeGroup interval parsing in go similar to mysql
* ignore whitespace around interval
2017-10-27 11:26:25 +02:00
Torkel Ödegaard
9605ab4475
Merge branch 'master' into develop
2017-10-26 15:59:50 +02:00
Patrick O'Carroll
e654f80e4b
fixed link issues
2017-10-26 14:25:43 +02:00
Torkel Ödegaard
bf680acae5
ux: updated singlestat default colors
2017-10-26 11:57:48 +02:00
Torkel Ödegaard
74fcb2494a
prometheus: fixed unsaved changes warning when changing time range due to step option on query model was changed in datasource.query code, fixes #9675
2017-10-26 11:46:33 +02:00
Sven Klemm
56e53b8343
dont quote variables for mysql and postgres datasource ( #9611 )
2017-10-24 14:05:41 +02:00
Torkel Ödegaard
68562a2077
Merge branch 'master' into develop
2017-10-24 11:02:48 +02:00
bergquist
beb203209b
prom: adds pre built grafana dashboard
2017-10-24 11:01:08 +02:00
Patrick O'Carroll
a8285d0eb4
shore: migrating config/settings.js to typescript
2017-10-24 10:45:46 +02:00
utkarshcmu
a4a10f2b03
Fixed #9636
2017-10-24 00:49:03 -07:00
Torkel Ödegaard
b44daaabf2
Merge branch 'master' into develop
2017-10-24 09:06:09 +02:00
Alexander Zobnin
396eadc5ac
Use d3 from node_modules ( #9625 )
...
* tech: annotations refactor, add tests for regions processing
* tech: move d3 to npm and webpack, #9480
* tech: move color scale functions to separate module
* fix opacity legend rendering
2017-10-23 20:30:43 +02:00
bergquist
d25d689efa
tests: removes commented tests
2017-10-23 11:32:34 +02:00
bergquist
fcd5d581a8
graph: invert order when sorting by legend
...
sort order have now been inverted. Biggest values should
be at bottom of the graph.
ref #9538
2017-10-23 11:32:09 +02:00
Torkel Ödegaard
b986f744e4
fix: escape series name in graph legend, added aliasEscaped to time series model to reuse escape, fixes #9615
2017-10-23 10:15:58 +02:00
Torkel Ödegaard
4632b8daa5
build: another build fix
2017-10-22 18:10:22 +02:00
Torkel Ödegaard
7a277c69ac
tests: migrated two more tests to jest
2017-10-22 17:36:50 +02:00
Torkel Ödegaard
fff0fa2aee
Merge branch 'master' into develop
2017-10-22 11:51:14 +02:00
Torkel Ödegaard
4aa227dd84
[Tech]: Start migrating to Jest for tests ( #9610 )
...
* tech: investigating karma + jest mix
* tech: migrating tests to jest
* tech: moved anoter test file to jest
* test: migrated two more test files to jest
* test: updated readme and made test fail to verify that it causes CI build failure
* tech: added code coverage for jest tests
* tech: testing codecov coverage
* tech: migrated more tests
* tech: migrated template srv to typescript and the tests to jest
* tech: minor build fix
* tech: build fixes
* build: another attempt at fixing go test with coverage
2017-10-22 07:03:26 +02:00
Alexander Zobnin
6114f63d7c
graphite: auto detect version
2017-10-20 16:26:00 +03:00
Alexander Zobnin
89aea278a9
graphite: improved version comparison
2017-10-20 15:50:44 +03:00
Alexander Zobnin
c22a192bb8
graphite: split tags and functions into 2 rows when seriesByTag used
2017-10-20 12:32:20 +03:00
Alexander Zobnin
968ce15e7f
graphite: add tags to dropdown and switch to tag editor if selected
2017-10-20 12:07:31 +03:00
Carl Bergquist
1d7a0db54b
Sort series in the same order as legend in graph panel ( #9563 )
...
* graph: sort series in the same order as legend
closes #9538
* style: use function arrows
* graph: remove sort by legend option
sort series based on legend by default is sort order
is set and stack is enabled
* graph: remove useless sort
* graph: make code simpler
2017-10-19 13:04:02 +02:00
Carl Bergquist
e8141b48d2
Merge pull request #9555 from mtanda/prometheus_46_improve_minor_fix
...
(prometheus) minor fix of auto complete
2017-10-19 10:42:34 +02:00
Sven Klemm
b2d880c6de
modify $__timeGroup macro so it can be used in select clause ( #9527 )
...
* modify $__timeGroup macro so it can be used in select clause
* fix $__interval_ms for postgres datasource
* use $__timeGroup macro in documentation
* fix annotation template query
remove title since its no longer used and add tags instead
* change __timeFilter macro to work on postgresql < 8.1 and redshift
2017-10-18 18:10:01 +02:00
Alexander Zobnin
92c67e8c83
Fix heatmap Y axis rendering ( #9580 )
...
* heatmap: fix Y axis rendering, #9576
* heatmap: fix color legend rendering
2017-10-18 15:19:20 +02:00
bergquist
c2c5f529f3
prometheus: add builtin template variable as range vectors
...
add $__interval and $__interval_ms as range vectors to
prometheus editor
2017-10-18 14:03:23 +02:00
Carl Bergquist
e8da084baf
Merge pull request #9561 from mtanda/prometheus_46_fix_range
...
(prometheus) fix to show vector range popup
2017-10-18 13:39:57 +02:00
Torkel Ödegaard
8d68bd6bb9
fix: fixed prometheus step issue that caused browser crash, fixes #9575
2017-10-18 13:28:18 +02:00
Torkel Ödegaard
039fc2964a
fix: getting started panel and mark adding data source as done, fixes #9568
2017-10-18 12:02:57 +02:00
Mitsuhiro Tanda
8a43d4e25c
fix vector range
2017-10-17 21:27:04 +09:00
