Patrick O'Carroll
7b9b34c6e1
migrated graph_tooltip to ts
2018-03-29 11:51:34 +02:00
Patrick O'Carroll
65f7c5f08f
started migration to ts
2018-03-29 10:40:45 +02:00
Julien Pivotto
1f1719c498
Fix #10555 #6888 Better escape for Prometheus variables
...
Prior this commit, C:\bar was escaped C:\\\bar. Should be C:\\\\bar.
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
2018-03-29 09:49:15 +02:00
Patrick O'Carroll
a3f15ced68
fixed graphpanel editmode and custom width for right side legend for IE11
2018-03-28 14:19:17 +02:00
Marcus Efraimsson
f673ec16d1
table panel: additional fixes for value to text mapping
...
Make the value to text mapping more similar to singlestat solution.
Adds more tests.
Also, allows string to be mapped to other string besides numeric values.
2018-03-27 19:04:45 +02:00
aandrew
67f0382222
add value to text mapping
2018-03-27 19:00:22 +02:00
Carl Bergquist
980e078222
Merge pull request #11326 from bergquist/more_traces
...
dataproxy: adds dashboardid and panelid as tags
2018-03-23 17:13:15 +01:00
Daniel Lee
e84f746d1d
Merge pull request #11348 from grafana/11306-sql-table-time
...
Postgres, MySQL, MSSQL minor refactoring/unification
2018-03-23 14:23:31 +01:00
Daniel Lee
78d314a9c1
Merge pull request #11140 from grafana/11131_right_legend_responsive
...
added media breakpoint to legend-right
2018-03-23 12:49:35 +01:00
Daniel Lee
4f38d237cb
legend: small refactoring
2018-03-23 11:08:24 +01:00
Marcus Efraimsson
c672e44d35
graph: minor fixes to y-axes alignment feature
2018-03-22 18:30:23 +01:00
Marcus Efraimsson
2e8aeffc13
Merge branch 'master' into 1271_share_zero
2018-03-22 16:59:36 +01:00
Marcus Efraimsson
bd4ecaeac6
mssql: update query editor help
2018-03-22 15:46:40 +01:00
Marcus Efraimsson
f5654f88e2
mysql: fix precision for the time column in table/annotation query mode
...
Use the ConvertSqlTimeColumnToEpochMs function to convert any native
datetime data type or epoch time (millisecond precision).
Refactored mysql implementation to make it more similar to postgres
and mssql implementations.
Added $__timeEpoch macro function with same implementation as $__time.
Added possibility to use a time column named time in addition to
the currectly supported time_sec.
Additional tests and update of existing.
Added test dashboard.
2018-03-22 15:40:46 +01:00
Marcus Efraimsson
66c03f84f5
postgres: fix precision for the time column in table/annotation query mode
...
Use the ConvertSqlTimeColumnToEpochMs function to convert any native
datetime data type or epoch time (millisecond precision).
Additional tests and update of existing due to timezone issues
running postgres on UTC and dev environment on non-utc.
Added test dashboard.
2018-03-22 15:32:33 +01:00
Marcus Efraimsson
b69ebee066
mssql: fix precision for the time column in table/annotation query mode
...
Use the ConvertSqlTimeColumnToEpochMs function to convert any native
datetime data type or epoch time (millisecond precision).
Additional tests and update of existing due to timezone issues
running MSSQL on UTC and dev environment on non-utc.
Update stored procedures test to handle more parameters.
Update test dashboard.
2018-03-22 15:23:12 +01:00
Marcus Efraimsson
b0076d4f65
mssql: remove UTC conversion in macro functions
...
Removes the macro function . Macro functions should not do UTC/timezone conversion - they should
work in the same way as postgres and mysql datasource implementations.
Grafana and Microsft SQL Server should be run on servers with UTC timezones.
2018-03-22 14:55:44 +01:00
Patrick O'Carroll
4916826364
small screen legend right also work like legend under in render + set scrollbar to undefined in destroyScrollbar so it doesnt become disabled when toggeling between right and under
2018-03-22 14:39:13 +01:00
Patrick O'Carroll
f2f709989f
fixed so legend right works like legend under on small screens
2018-03-22 09:41:05 +01:00
Marcus Efraimsson
42299eb328
Merge branch 'master' into 11306-sql-table-time
2018-03-21 12:08:48 +01:00
bergquist
f142548969
dataproxy: adds dashboardid and panelid as tags
...
closes #11315
2018-03-20 22:23:28 +01:00
Marcus Efraimsson
9df5476fe3
Merge pull request #11312 from grafana/func_editor_js_to_ts
...
convert func_editor.js to typescript
2018-03-20 20:51:58 +01:00
Marcus Efraimsson
de396b277e
Merge pull request #11309 from grafana/add_graphite_func_js_to_ts
...
convert add_graphite_func.js to typescript
2018-03-20 20:51:21 +01:00
Daniel Lee
1cef373d16
Merge remote-tracking branch 'upstream/master' into update-xorm
2018-03-20 19:21:58 +01:00
ilgizar
0e159dada1
Allocated to a separate alignment block. Replaced the attribute of the second axis by the attribute of the axes.
2018-03-20 22:44:48 +05:00
Patrick O'Carroll
47215098a3
changed var to const, changed to string interpolation
2018-03-20 14:43:09 +01:00
Patrick O'Carroll
3bdd006291
changed var to const
2018-03-20 14:26:03 +01:00
Daniel Lee
d34cd8730e
mssql: convert tests to jest
2018-03-20 13:01:32 +01:00
Daniel Lee
ae4c6e4648
mssql: fix precision for time column in table mode
...
ref #11306
2018-03-20 12:59:40 +01:00
Patrick O'Carroll
2a90370230
converted file to ts
2018-03-20 12:36:02 +01:00
ilgizar
e015047ed1
Fixed unit test.
2018-03-20 16:09:52 +05:00
ilgizar
341afe65ef
Merge remote-tracking branch 'upstream/master' into 1271_share_zero
2018-03-20 15:54:56 +05:00
ilgizar
1588295375
Changed the way this feature was activated. And changed tolltip.
2018-03-20 15:38:48 +05:00
ilgizar
230f018c78
Added validation of input parameters.
2018-03-20 15:37:18 +05:00
Patrick O'Carroll
2a50bc35a3
converted file to ts
2018-03-20 11:07:31 +01:00
Marcus Efraimsson
8f6626e805
mssql: encrypt password in database
2018-03-19 17:32:51 +01:00
Marcus Efraimsson
6044b3aeeb
Merge branch 'master' into mssql_datasource
2018-03-19 17:14:33 +01:00
Daniel Lee
caf60dda0e
Merge pull request #10376 from grafana/openTSDB-file-to-ts
...
migrated file to ts
2018-03-19 14:32:32 +01:00
Daniel Lee
8b9c44be17
Merge pull request #10369 from grafana/elastic-file-to-ts
...
migrated files to ts
2018-03-19 13:59:30 +01:00
Marcus Efraimsson
24c0f28f41
mssql: allow host without port and fallback to default port 1433
2018-03-19 13:24:31 +01:00
Marcus Efraimsson
62174c81c8
mssql: cleanup and minor changes
2018-03-19 13:06:46 +01:00
Marcus Efraimsson
8c2f3f761b
mssql: update readme
2018-03-19 11:20:17 +01:00
Marcus Efraimsson
74a98d46eb
mssql: remove logos for now
2018-03-19 11:02:55 +01:00
Marcus Efraimsson
d26d8c713e
Merge branch 'master' into mssql_datasource
2018-03-16 15:19:19 +01:00
Marcus Efraimsson
06afd24a10
mssql: add alternative logo without text
2018-03-16 15:18:05 +01:00
Marcus Efraimsson
1c7aff7810
mssql: strip inkscape from logo
2018-03-16 15:17:25 +01:00
Marcus Efraimsson
69b9fb6d15
mssql: minor improvements of query editor help
2018-03-16 15:11:15 +01:00
Marcus Efraimsson
ccd57fbfa3
mssql: skip rendering of mssql logos until we have a valid logo
2018-03-16 14:47:43 +01:00
Marcus Efraimsson
a6e4ac5484
mssql: update plugin.json, added description and name MSSQL -> Microsft SQL Server
2018-03-16 14:26:05 +01:00
Mitsuhiro Tanda
c6fa0b90a7
prometheus editor: variable autocomplete support (PR #9988 )
...
* prometheus ace editor, template variable support
* minor fix
* support [[var]] notation
* don't remove last ] if token type is string
* Revert "don't remove last ] if token type is string"
This reverts commit bce5b2d56e10012f8ffe
2018-03-15 20:17:51 +03:00
ryan
ad88e5398c
remove
2018-03-15 12:57:09 +01:00
ryan
3aed867b4b
fix merge error
2018-03-15 10:35:50 +01:00
ryan
4f8ee9f5a7
merge with master
2018-03-14 23:52:24 +01:00
ilgizar
bd3d17ab8c
Merge remote-tracking branch 'upstream/master' into 1271_share_zero
2018-03-14 23:42:58 +05:00
ilgizar
9d7ab78d9f
Resolved conflict
2018-03-14 23:39:05 +05:00
Marcus Efraimsson
d4beee2bb0
Merge branch 'master' into mssql_datasource
2018-03-13 16:03:02 +01:00
Alexander Zobnin
560aec50b3
Merge PR #8613
2018-03-13 15:36:32 +03:00
Alexander Zobnin
30d077d1d1
graph: minor refactor of histogram mode PR #8613
2018-03-13 15:25:28 +03:00
Alexander Zobnin
38a19f7c90
Merge branch 'histogram_multi' of https://github.com/mtanda/grafana into mtanda-histogram_multi
2018-03-13 13:18:55 +03:00
Carl Bergquist
6df13252bf
Merge pull request #11143 from ApsOps/colorize-singlestat-prefix-postfix
...
Add color to prefix and postfix in singlestat panel
2018-03-13 10:41:40 +01:00
ilgizar
7dd66450ad
Corrected work for graphs created before this feature.
2018-03-12 23:43:13 +05:00
ilgizar
8c82e5701c
Replaced array values to variables yLeft and yRight for easy reading code.
2018-03-12 23:12:45 +05:00
ilgizar
11ae926388
Rename test file according module name.
2018-03-12 23:11:11 +05:00
Alexander Zobnin
989ba9763f
prometheus: fix bug introduced by #9859 (httpMethod is undefined)
2018-03-12 19:41:07 +03:00
Alexander Zobnin
46d2067af2
prometheus: add tests for heatmap mode
2018-03-12 17:37:21 +03:00
Alexander Zobnin
94cf560304
Merge remote-tracking branch 'upstream/master' into prometheus-heatmap
2018-03-12 17:16:02 +03:00
Alexander Zobnin
479209f483
prometheus: datasource refactor
2018-03-12 17:13:05 +03:00
Carl Bergquist
e94d23e5ff
Merge pull request #10873 from willyhutw/cloudwatch_dimension_values_add_dimension_filter
...
Cloudwatch dimension_values add dimension filter.
2018-03-12 14:24:26 +01:00
ilgizar
8152b9d6fe
Refactoring
2018-03-12 10:54:03 +05:00
Mitsuhiro Tanda
4e1501b172
set default value of httpMethod
2018-03-12 13:53:05 +09:00
Mitsuhiro Tanda
a83ede0193
support POST for query and query_range
2018-03-12 13:25:05 +09:00
bergquist
71df2760a1
Merge branch 'cw_high_resolution' of https://github.com/mtanda/grafana
...
* 'cw_high_resolution' of https://github.com/mtanda/grafana :
fix, set default highResolution setting
support cloudwatch high resolution query
2018-03-08 18:02:35 +01:00
Alexander Zobnin
759e05d09e
heatmap: add explanation of Time series buckets mode
2018-03-07 17:08:34 +03:00
Aman
a94de51e5e
Add color to prefix and postfix in singlestat
2018-03-07 19:36:42 +05:30
Alexander Zobnin
5e452e445c
heatmap: able to set upper/lower bucket bound manually
2018-03-07 16:57:46 +03:00
Alexander Zobnin
18a90667ba
heatmap: refactor
2018-03-07 16:33:33 +03:00
Alexander Zobnin
a791a92d79
heatmap: fix Y axis and tooltip decimals and units issues
2018-03-07 13:28:44 +03:00
ilgizar
916539fad9
Append test to check not zero level.
2018-03-07 14:21:10 +05:00
ilgizar
7cddc54306
Add bs-tooltip to Y-Align element.
2018-03-07 12:12:39 +05:00
Carl Bergquist
08f587a0ef
Merge pull request #10838 from ilgizar/7107_right_y_axis
...
Thresholds for Right Y axis
2018-03-06 15:18:24 +01:00
Alexander Zobnin
0912f61ea3
heatmap: fix tooltip count and bucket bound format
2018-03-06 15:21:37 +03:00
Tony Dong
96504940a8
fix typo in heatmap rendering.ts ( #11101 )
2018-03-06 10:36:06 +01:00
Alexander Zobnin
5037f93a78
heatmap: sort series before converting to heatmap.
...
This allows to use histogram series from arbitrary datasource and display it properly.
2018-03-05 14:01:55 +03:00
Julien Pivotto
69c93e6401
Fix Prometheus 2.0 stats ( #11048 )
...
Fixes #11016
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
2018-03-03 13:40:28 +01:00
Daniel Lee
cc2f478792
Merge branch 'docs_v5.0'
2018-03-01 09:36:48 +01:00
Alexander Zobnin
fa8403750b
Merge remote-tracking branch 'upstream/master' into prometheus-heatmap
2018-03-01 11:09:04 +03:00
Alexander Zobnin
d6087eb5f4
heatmap: hide unused Y axis controls for tsbuckets mode
2018-02-28 16:30:00 +03:00
Alexander Zobnin
76c684cc01
heatmap: format numeric tick labels in tsbuckets mode
2018-02-28 16:19:58 +03:00
Alexander Zobnin
dfe8b0a0d2
heatmap: add rendering tests for tsbuckets mode
2018-02-28 15:58:28 +03:00
Alexander Zobnin
5c73ed6ecd
heatmap: use series names as top or bottom bounds, depends of datasource
2018-02-27 15:14:40 +03:00
Alexander Zobnin
f21cebeefd
heatmap: refactor
2018-02-27 14:17:57 +03:00
Alexander Zobnin
7c78e8e383
heatmap: add few tests for histogram converter
2018-02-27 14:17:29 +03:00
Alexander Zobnin
26ddb9977f
heatmap: fix Y bucket size calculation for 'tsbuckets' mode
2018-02-26 16:26:54 +03:00
Brian Gann
fa193fa888
offer template variables for tags
2018-02-22 18:45:11 -05:00
Marcus Efraimsson
6751bbc17f
Merge branch 'master' into docs_v5.0
2018-02-22 15:55:44 +01:00
Alexander Zobnin
2a2675c1af
heatmap: fix bucket labels shift
2018-02-22 16:54:28 +03:00
Alexander Zobnin
e0a874f677
heatmap tooltip: fix bucket bounds for 'tsbuckets' mode
2018-02-22 16:33:45 +03:00
Alexander Zobnin
cc34c9a651
heatmap tooltip: fix count decimals
2018-02-22 16:12:42 +03:00
Alexander Zobnin
bc47380032
heatmap: fix tooltip histogram for 'tsbuckets' mode
2018-02-22 16:06:21 +03:00
Alexander Zobnin
97c54e6956
heatmap: use buckets from histogram with 'tsbuckets' mode
2018-02-22 15:43:08 +03:00
