IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-20 11:48:34 -06:00
Code Issues Packages Projects Releases Wiki Activity
11,344 Commits 5,454 Branches 554 Tags 1.9 GiB
c0d257a0ee
Commit Graph

4418 Commits

Author SHA1 Message Date
Daniel Lee
a31d0df897 shortcuts: fixes expand/collapse all rows 
Fixes #9069
 2017-08-21 21:04:20 +02:00
Daniel Lee
7b5019482e mysqlds: add placeholder/typeahead for localhost connection strings 
for the host field on the data source config page. Fixes #9046
 2017-08-21 13:44:33 +02:00
Daniel Lee
649122b4fb mysqlds: add placeholder/typeahead for localhost connection strings 
for the host field on the data source config page. Fixes #9046
 2017-08-21 13:43:09 +02:00
Matt Toback
020aae1427 Updated Grafana.net to .com 2017-08-14 11:05:28 +02:00
Torkel Ödegaard
17cb3f6e6a fix: graph fix for decimals, bug introduced by #61313478063b0e0721f204847f3c0298ea8f593f 2017-08-11 16:20:36 +02:00
Torkel Ödegaard
d4dd0222fa fix: prometheus does not have two editor modes, fixes #9025 2017-08-11 12:33:56 +02:00
Daniel Lee
02248273ae mysqlds: remove alpha state from plugin.json 2017-08-11 10:25:37 +02:00
Alexander Zobnin
776e6e2c3f ace: redefine completions for prometheus and add initial docs for functions 2017-08-10 19:58:59 +03:00
Alexander Zobnin
679ddc9696 ace: example snippet for prometheus 2017-08-10 16:49:09 +03:00
Daniel Lee
b716a2595a mysqlds: add support for key/value template variables 
If the template variable query has two columns named __text and __value
then return a list of key values. The value is used when the variable is
interpolated in the query. Allows mapping of texts to ids.
 2017-08-10 14:42:27 +02:00
Alexander Zobnin
d8d59fd8d4 ace: add custom behaviour for prometheus 2017-08-10 15:28:40 +03:00
Torkel Ödegaard
c7959ff06e fix: Using table cell links and ad hoc filters together now works & looks correct, fixes #8052 2017-08-10 14:12:31 +02:00
Torkel Ödegaard
d2437d3cf1 fix: ad-hoc filters now works with data source variables, fixes #8052 2017-08-10 12:04:46 +02:00
Alexander Zobnin
b260a642e7 ace: fix broken karma tests (error loading ace.js ) 2017-08-10 12:33:53 +03:00
Alexander Zobnin
e75b39376a ace: minor refactor 2017-08-10 11:53:55 +03:00
Alexander Zobnin
6b5400bdb6 ace: fix loading text snippets error 2017-08-10 11:23:32 +03:00
Torkel Ödegaard
149e694ce6 ace: prometheus completion improvements 2017-08-10 10:08:09 +02:00
Torkel Ödegaard
0b2cc404ff ace: working on editor completion stuff 2017-08-10 09:33:17 +02:00
Torkel Ödegaard
b9540e4c49 ace: minor ace theme tweaks 2017-08-09 21:12:15 +02:00
Daniel Lee
1105bb371f mysqlds: adds support for template variables 
Fixes #8855
 2017-08-09 19:32:53 +02:00
Daniel Lee
59513ff963 tempvar: bug fix for duplicate template var 
and a fix for when selecting the same value twice in
a template variable if it is not multi select. It threw an
exception on the second selection
 2017-08-09 14:28:23 +02:00
Torkel Ödegaard
459a8ed695 ace: minor changes to ace directive 2017-08-09 11:43:02 +02:00
Torkel Ödegaard
80f5c914e8 ace: removed the old text areas 2017-08-09 11:06:21 +02:00
Torkel Ödegaard
68cac6ccb5 Merge branch 'master' into ace-editor 2017-08-09 10:51:31 +02:00
Torkel Ödegaard
668cb3c1ef Merge branch 'v4.4.x' 2017-08-09 10:37:06 +02:00
Torkel Ödegaard
e8a20643d6 feat: store last seen date for users and present in stats and user lists, closes #9007 2017-08-09 10:36:41 +02:00
Alexander Zobnin
5c0773023f code-editor: increase autocomplete popup size 2017-08-09 11:23:05 +03:00
Alexander Zobnin
1c8c746956 code-editor: prometheus metrics autocomplete 2017-08-09 10:58:00 +03:00
Alexander Zobnin
aa670244f1 code-editor: initial prometheus syntax definition 2017-08-08 22:27:47 +03:00
Chris Burkhart
3e0b92d6fe Enable datasources to be able to round off to a UTC day properly 2017-08-08 09:34:41 -07:00
Alexander Zobnin
e0bbb74b0c code-editor: test editors for MySQL and prometheus 2017-08-08 18:42:26 +03:00
Alexander Zobnin
0e0e60317e code-editor: tabSize option 2017-08-08 18:41:11 +03:00
Alexander Zobnin
152c4170da code-editor: onChange option and usage docs 2017-08-08 18:31:13 +03:00
Torkel Ödegaard
68c4ce34d5 fix: templating issue with data source variables, can now be used right away in other query variables and panels (without page reload), fixes #7510 2017-08-08 17:08:35 +02:00
Alexander Zobnin
cd16db4d09 code-editor: use data- attributes for editor options 2017-08-08 16:28:51 +03:00
Alexander Zobnin
59d1654df4 code-editor: adjust editor styles 2017-08-08 16:05:15 +03:00
Brad Lhotsky
a8ac215039 Add a few more MySQL macros: 
* $__timeFrom() -> Returns the dashboard 'from' suitable for use querying
  against a MySQL TIMESTAMP field.
* $__timeTo() -> Returns the dashboard 'to' suitable for use querying
  against a MySQL TIMESTAMP field.
* $__unixEpochFiler(column) -> If you store timestamps as UNIX epoch's,
  this builds: column > 'from' AND column < 'to'
* $__unixEpochFrom() -> Returns the dashboard 'from' suitable for use querying
  against a MySQL integer field (UNIX epochs)
* $__unixEpochTo() -> Returns the dashboard 'to' suitable for use querying
  against a MySQL integer field (UNIX epochs)
 2017-08-08 14:40:27 +02:00
Alexander Zobnin
eb944551c0 code-editor: add autocomplete styles 2017-08-08 15:32:23 +03:00
Alexander Zobnin
928fedaad7 code-editor: minor refactor 2017-08-08 15:19:15 +03:00
Torkel Ödegaard
d3680d290c fix: graphite issue with metricFind and sending from/until in normal format, fixes #8997 2017-08-08 13:51:54 +02:00
Torkel Ödegaard
83beff300b Merge branch 'v4.4.x' 2017-08-08 11:26:45 +02:00
Torkel Ödegaard
64b5153e7d fix: change view json to use the grafana built json viewer, fixes #9002 2017-08-08 11:26:16 +02:00
Torkel Ödegaard
781dd25c82 Merge branch 'elasticsearch-filtering' 2017-08-08 11:09:00 +02:00
Torkel Ödegaard
f979e95820 tablepanel: minor update to table panel, #8052 2017-08-08 11:08:51 +02:00
Torkel Ödegaard
1507c02ebb Merge branch 'feat-8539' of https://github.com/alexanderzobnin/grafana 2017-08-08 09:33:23 +02:00
Alexander Zobnin
bf8171fd63 code-editor: initial autocomplete 2017-08-07 21:30:36 +03:00
Alexander Zobnin
b74fe05fec code-editor: support language mode 2017-08-07 20:19:15 +03:00
Alexander Zobnin
ecb66e7678 code-editor: disable depreacation warning 2017-08-07 19:43:58 +03:00
Alexander Zobnin
e4dabb657c code-editor: initial directive for rich code editor (ace) 2017-08-07 19:31:50 +03:00
Torkel Ödegaard
3e392ef921 ux: added minor help tip to graphite ds settings 2017-08-07 15:55:05 +02:00
Alexander Zobnin
4fe79edd40 Graphite 1.0 functions (#8987) 
* graphite-ds: add graphite version to config editor

* graphite-ds: modify add-graphite-function to show only version-related functions

* graphite-ds: refactor, move func filtering to gfunc.js

* graphite-ds: add new functions for graphite 1.0.x

* graphite-ds: fix unit tests (add jsonData)
 2017-08-07 15:10:59 +02:00
Daniel Lee
649fe7e462 Merge branch 'v4.4.x' 2017-08-07 10:47:23 +02:00
Torkel Ödegaard
d285045ff6 removed unused images 2017-08-07 10:11:39 +02:00
Torkel Ödegaard
132cd36b0c Delete fav16.png 
fixes #8989
 2017-08-07 10:10:37 +02:00
Patrick Tescher
c082372ffe Add a Safari Pinned Tab Icon (#8983) 
Icon adopted from grafana_icon.svg

Reference document:
https://developer.apple.com/library/content/documentation/AppleApplicati
ons/Reference/SafariWebContent/pinnedTabs/pinnedTabs.html
 2017-08-07 09:39:36 +02:00
Louis Ventre
97d1676fe8 Add time extremity with InfluxDB (#8722) 2017-08-07 09:26:32 +02:00
Jesse White
f547c93a4f fix: hide modals when pressing Esc, fixes #8988 (#8994) 2017-08-07 09:23:33 +02:00
Torkel Ödegaard
0a23f3dd28 Merge branch 'master' of github.com:grafana/grafana 2017-08-04 14:02:18 +02:00
Torkel Ödegaard
26766ddb27 Merge branch 'v4.4.x' 2017-08-04 14:02:01 +02:00
Torkel Ödegaard
c0b0a54a8f fix: search bug where search was hidden when you click starred or tags filter links, fixes #8981 2017-08-04 14:01:09 +02:00
Daniel Lee
6131347806 graph: adds decimals option for y-axis 
Fixes #8187
 2017-08-03 17:57:04 +02:00
Daniel Lee
ef0c90b9ca graph: change tick decimal calculation for y-axis 
Fixes #8872. Use the automatic calculation by Flot to get the
number of decimal places for ticks on the y-axis rather than
the number of decimal places for the min value.
 2017-08-03 16:58:31 +02:00
Alexander Zobnin
77b7f4b376 heatmap: add unit tests for convertToCards() 2017-08-02 21:27:10 +03:00
Alexander Zobnin
c7e8b98d14 heatmap: minor refactor, don't repeat cards stats calculation 2017-08-02 21:24:59 +03:00
Torkel Ödegaard
a5bdfec0de ES: return .raw fields in field lookups, closes #8975 2017-08-02 16:52:43 +02:00
Daniel Lee
b241b98196 singlestat: fix for variable 
in the prefix or postfix fields and when adding a gauge.
Previously the template variable substition was only done
when not rendering the gauge.
 2017-08-02 16:40:26 +02:00
Torkel Ödegaard
a5d5f3d82f feat: add ad hoc filters directly from table panel cells, kibana 3 style, #8052 2017-08-02 16:15:22 +02:00
Torkel Ödegaard
c17b5d1306 table: minor table options improvement 2017-08-02 12:34:36 +02:00
Torkel Ödegaard
ede827f5c0 feat: Elasticsearch change to how queries without date histogram are transformed into Grafana data stucture, now it is processed into a table structure instead of json structure 2017-08-02 12:15:39 +02:00
Torkel Ödegaard
6224a25e42 feat: Elasticsearch filtering wip, moved to typescript 2017-08-02 11:16:37 +02:00
Alexander Zobnin
f7ea08dba7 heatmap: fix rendering tests 2017-08-01 16:51:55 +03:00
Alexander Zobnin
663a3293ee heatmap: some legend fixes 2017-08-01 16:23:01 +03:00
Alexander Zobnin
b01a4e6583 heatmap: use the same color for selection as for graph 2017-08-01 16:21:40 +03:00
Alexander Zobnin
f64ebf538c heatmap: minor legend fixes 2017-08-01 15:25:52 +03:00
Alexander Zobnin
91a921e12d heatmap: add show legend option 2017-08-01 14:07:52 +03:00
Alexander Zobnin
e72baca4a7 heatmap: fix black selection area 2017-08-01 13:54:09 +03:00
Alexander Zobnin
2aa26c98b6 heatmap: initial legend 2017-08-01 13:53:16 +03:00
Torkel Ödegaard
5d2054323b Merge branch 'aws-instance-attribute-tags' of https://github.com/paco3346/grafana into paco3346-aws-instance-attribute-tags 2017-08-01 09:38:58 +02:00
Torkel Ödegaard
c4eadb576e fix: graphite bug fix introduced in recent commit 2017-07-31 22:39:56 +02:00
Torkel Ödegaard
73a1a262ef Merge branch 'v4.4.x' 2017-07-31 22:33:36 +02:00
Torkel Ödegaard
e9989cb690 fix: make it easier to close search by clicking outside result container, fixes #8848 2017-07-31 22:33:22 +02:00
Torkel Ödegaard
0fcc87010a fix: cloudwatch fix for templating namespace argument to metrics tempalting function, fixes #8965 2017-07-31 22:30:49 +02:00
Mitsuhiro Tanda
91a533d948 (cloudwatch) high resolution custom metrics (#8958) 
* support 1 second resolution Custom Metrics

* upgrade to aws-sdk-go v1.10.18

* simplify period calculation

* add test

* fix period calculation bug
 2017-07-31 21:19:19 +02:00
squain
ede6d71e72 Fix typo in alert_howto.html (#8964) 2017-07-31 21:16:39 +02:00
Torkel Ödegaard
44fbd3ec9f feat: calls to Graphite api /metrics/find now include panel or dashboard time ranges in some scenarios, closes #8055 2017-07-31 17:21:25 +02:00
Alexander Zobnin
c79a68dcd1 heatmap: refactor, build cards before rendering 2017-07-31 18:15:03 +03:00
Alexander Zobnin
55b24be115 heatmap: refactor, directive for color legend 2017-07-31 17:45:05 +03:00
Torkel Ödegaard
61d8eb1fac Merge branch 'v4.4.x' 2017-07-31 15:07:22 +02:00
Torkel Ödegaard
d630f3d59e Merge branch 'external-user-mng' into v4.4.x 2017-07-31 15:07:01 +02:00
Torkel Ödegaard
73563d087c feat: more work on #8768 2017-07-31 14:39:33 +02:00
Alexander Zobnin
ef9dd014c7 heatmap: add color scale options, issue #8539 2017-07-31 14:03:03 +03:00
Cedric Cellier
417c5163dd Fix typos (#8954) 
Some being user visible.
 2017-07-31 12:12:28 +02:00
Daniel Lee
22758d5112 Merge branch 'v4.4.x' 2017-07-27 14:40:33 +02:00
Daniel Lee
7b768bca3f singlestat: change threshold check in flot gauge 
Fixes #5515. Flot gauge has its own threshold check that is different
from the threshold check in singlestat. This changes the flot check to
be exclusive (same as the singlestat check). E.g. if the threshold is
10, then the value 10 is over the threshold.
 2017-07-27 14:34:29 +02:00
amitkumar912
c4683f1ae8 Opentsdb datasource labeling fix (#8929) 
* Fix Labeling issue when hiding Queries.

Issue #8928

* Fix spacing.

* Replacing tabs with spaces.

* Fix for jshint
 2017-07-26 21:27:42 +02:00
Alexander Zobnin
cb8ecb2d5f Heatmap fixes (adapted for v4.4.x branch) (#8920) 
* heatmap: fix converting error when series contains 0 and log scale is selected, issue #8884

* heatmap: fix app crash when Y min set to 0 with log scale

* heatmap: fix tooltip for 'zero' buckets in log scale

* heatmap: fix tooltip histogram for log scales

* heatmap: fix flicker of the highlighted element

this was caused by too often fired mouseenter/mouseleave events

* heatmap: fix missing X axis option for log scales

* heatmap: fix missing zero bucket in tooltip histogram
 2017-07-25 16:28:29 +02:00
Torkel Ödegaard
6956110497 Merge branch 'master' of github.com:grafana/grafana 2017-07-24 12:23:33 +02:00
Torkel Ödegaard
cd0e1a8978 Merge branch 'v4.4.x' 2017-07-24 12:21:43 +02:00
Torkel Ödegaard
2d2800e710 fix: url did not update correctly when closing settings view by using ESC key, fixes #8869 2017-07-24 12:21:30 +02:00
Daniel Lee
4a678c2884 influxdb: fix for adding math query part 
Fixes #8870. Fixes out of bound exception on adding a math query part
when there is no group by interval (or only one query part).
 2017-07-22 01:31:26 +02:00
Kakuya Ando
bbfdfc012f fix(prometheus) when tag value duplicate, tags not working. (#8040) 2017-07-21 09:51:25 +02:00
Alexander Zobnin
af56cc4c28 Panel Alertlist: use dashboard timezone (#8880) 
* panel-alertlist: use dashboard timezone, fixes #8874

* alert state history: use dashboard timezone, issue #8874

* alert state history: minor refactor
 2017-07-19 20:45:57 +02:00
Mitsuhiro Tanda
e8157f01ec add new dashboard shortcut 2017-07-19 17:54:34 +09:00
Mitsuhiro Tanda
aecc6860e3 set focus on text field when opening panel/query editor (#8879) 
* (prometheus) set focus to top expression when opening editor

* (text panel) set focus to top expression when opening editor
 2017-07-19 10:33:04 +02:00
Alexander Zobnin
9bbc942534 table-panel: clickable cell link - draft (#8738) 
* table-panel: clickable cell link - draft

* table-panel: clickable cell link - fix link target option

* table-panel: fix undefined columnStyle.link

* table-panel: option to highlight cell with link

* table-panel: render variables for all cells in row

* table-panel: remove cell highlighting

* table-panel: add help for URL field

* linkPopover directive for link info in table panel

* table-panel: add link info popover to cells

* table-panel: use native popover instead directive

* table-panel: link drop refactor, remove unused code

* table-panel: fix unclickable link when drop is opened

* refactoring: minor refactoring to #8738, do not think we need a full blown popover for the links, simple tooltip is enough and more efficient, sadly we do not have a modern tooltip framework, still using old bootstrap 2.3 tooltip

* table-panel: add tests for link rendering
 2017-07-18 20:59:34 +02:00
Alexander Gängel
4073949af0 add templating for prometheus monitoring other promethues (#8845) 2017-07-18 19:52:29 +02:00
Mitsuhiro Tanda
a6920eb2ff (prometheus) replace each by for (#8881) 2017-07-18 19:50:44 +02:00
Mitsuhiro Tanda
32f9a42d5e Fix performance degradation by always setting fill = 0.001 (#8868) 
* add benchmark

* fix, prevent plotLineArea() call if fill == 0

* remove benchmark
 2017-07-17 20:50:58 +02:00
Daniel Koehler
c5f6cf0809 fix for wrong locale and text issues #8840 (#8854) 
fixes https://github.com/grafana/grafana/issues/8840
by setting a default locale. Also uses fromNow(true) to work arround the replace.
 2017-07-14 21:58:27 +02:00
Matt Toback
a045f175b6 Fixed typo 2017-07-14 12:20:04 -04:00
Torkel Ödegaard
e4950c2dc1 fix: elasticsearch with template variable with terms agg on IP field, fixes #8662 2017-07-12 07:43:30 +02:00
ajrnz
43974898c1 Interpolate the field property in elastic search term queries (#8663) 
* Interpolate the field property in elastic search term queries

* more defensive interpolation of query.field in ES templates
 2017-07-12 07:25:56 +02:00
Torkel Ödegaard
bb3bcbe6a1 fix: for issue in graph panel axes labels when iframe embedding, fixes #8827 2017-07-12 07:12:05 +02:00
Denis Doria
89822acf38 More precise detection for self reference variable on templates (#8814) 
This should close the bug #8773
 2017-07-12 06:54:32 +02:00
Alin Sinpalean
5bffdfe9a4 When converting Prometheus results to table, handle the case where the returned series have non-uniform sets of labels. (#8826) 2017-07-12 06:52:59 +02:00
Daniel Lee
3a075be7e9 cloudwatch: make dimension text in alias popover clearer 2017-07-07 18:17:05 +02:00
Torkel Ödegaard
cff1c37064 fix: InfluxDB direct access with normal inflxudb credentials was not sent correctly, fixes #8789 2017-07-06 09:46:31 +02:00
Torkel Ödegaard
e5b499a958 fix: Text area css issue prevented scrolling, fixes #8797 2017-07-06 09:36:57 +02:00
Jesse White
1940b33dc1 fix: handling of http errors without any data (#8777) 2017-07-04 22:55:13 +02:00
Alexander Zobnin
934c0fea6f histogram: improved ticks rendering 2017-07-04 21:49:57 +02:00
Alexander Zobnin
c1c1bcb874 histogram: don't cut negative values, issue #8628 2017-07-04 21:49:09 +02:00
Daniel Lee
1da98f5e1e Revert "Histogram fix (#8727)" 
This reverts commit 8634c9d457.
 2017-07-04 21:48:39 +02:00
Alexander Zobnin
1499c2bf74 Fix User/Org default timezone bug (#8748) 
* dashboard: don't override timezone if default selected, issue #8503

* dashboard: hide UTC icon immediately after timezone changing
 2017-07-03 09:20:55 +02:00
Daniel Lee
fb99ddf295 influxdb: tweak to help text 2017-06-29 13:58:54 +02:00
Daniel Lee
7ea5930a90 alerting: minor fix 2017-06-29 12:18:10 +02:00
Alexander Zobnin
97a7081b57 Fix 8706 (#8734) 
* heatmap: fix incorrect time for UTC timezone, fixes #8706

* heatmap: fix tests for time format
 2017-06-29 10:40:28 +02:00
Alexander Zobnin
8634c9d457 Histogram fix (#8727) 
* histogram: don't cut negative values, issue #8628

* histogram: add percent/count option

* histogram: add tests for values normalizing

* histogram: improved ticks rendering

* histogram: fix default value in axes editor
 2017-06-28 17:12:55 +02:00
Daniel Lee
3ac306a72e playlist: fixes #6727. Remember Kiosk mode 2017-06-28 16:29:46 +02:00
Daniel Lee
b674b9dba2 heatmap: small fix for tooltip auto decimals 
Closes #8717
 2017-06-27 22:25:04 +02:00
Alexander Zobnin
83fbace6b9 heatmap: fix tooltip decimals calculation 2017-06-27 22:24:27 +02:00
Alexander Zobnin
12644372c4 heatmap: fix scaledDecimals calculation (use the same method as in flot.js) 2017-06-27 22:24:27 +02:00
Alexander Zobnin
c12a7d7f59 heatmap: adjust tests for fixed decimals calc 2017-06-27 22:24:27 +02:00
Alexander Zobnin
7c840cdf38 heatmap: fix tooltip decimals 2017-06-27 22:24:27 +02:00
Alexander Zobnin
b63d2b3279 heatmap: fix Y axis decimals with log scale 2017-06-27 22:24:27 +02:00
Alexander Zobnin
8e5672aee6 heatmap: fix Y axis value rounding with linear scale 2017-06-27 22:24:27 +02:00
Alexander Zobnin
1deeef9e91 Table panel: add option for preserving text formatting (#8708) 
* table_panel: add option for preserving text formatting

* table_panel: fix undefined style error

* table_panel: fix class adding (add space before 'class')

* table_panel: aligin Type options labels
 2017-06-27 06:38:49 -04:00
Denis Doria
e8d01218d8 Fix label showing up when Axes are configured to not be displayed (#8697) 
This should close the issue #8695
 2017-06-25 14:23:37 +02:00
Torkel Ödegaard
73fcc919cd change: made dashboard save message optional 2017-06-23 11:49:32 -04:00
Torkel Ödegaard
86a73c359b fix: data source selector did not show, fixes #8692 2017-06-23 11:32:17 -04:00
Torkel Ödegaard
2a93bed453 ux: aligned tabbed view body with header title 2017-06-19 19:22:44 -04:00
Denis Doria
eaba985f25 Fix issue with kilovolt-ampere reactive (kvar) #8596 (#8650) 
This changes the css to handle overflow of the string on the input fields.
If an overflow happends an ellipsis is used.
 2017-06-19 16:23:12 -04:00
Torkel Ödegaard
77136d7a70 Merge branch 'master' of github.com:grafana/grafana 2017-06-19 16:02:31 -04:00
Torkel Ödegaard
8440d2d0a2 fix: fixed search issues with in active mode and keyboard nav 2017-06-19 16:02:16 -04:00
Denis Doria
41d300f69d Fix timeInterval for mysql datasource (#8651) 
* Fix timeInterval for mysql datasource

This changes the > to >= and the < to <=, so the intervals are inclusive.
This should fix the #8635

* Fix validation
 2017-06-19 08:58:22 -04:00
Alexander Zobnin
9a7e460865 fix heatmap count values bug introduced by #8632 2017-06-18 21:47:08 +03:00
Alexander Zobnin
8626bdfed8 Merge remote-tracking branch 'upstream/master' 2017-06-18 20:59:05 +03:00
Alexander Zobnin
1f4140057b heatmap-tooltip: normalize histogram Y axis 2017-06-18 20:58:13 +03:00
Salman Jalali
49fdbb3843 Update kbn.js 2017-06-17 06:08:10 +02:00
Torkel Ödegaard
724368d0cd fix: data source dropdown select 2017-06-16 11:43:37 -04:00
Torkel Ödegaard
25f88e9b3a Merge branch 'master' of github.com:grafana/grafana 2017-06-16 10:47:53 -04:00
Torkel Ödegaard
056c57d551 ux: temporary remove search 2017-06-16 10:47:17 -04:00
Brandon Arp
5d63ad21c1 allow heatmap parsing of scaled datapoints (#8632) 2017-06-16 10:45:52 -04:00
Torkel Ödegaard
a49e82e447 ux: revert dashboard search nav change, this is a tempoary change until we redesign the sidenav 2017-06-16 09:47:21 -04:00
Torkel Ödegaard
840099bec0 refactor: metric segment remake 2017-06-15 15:56:24 -04:00
Torkel Ödegaard
76c4bfe268 ux: new metric segment is starting to work 2017-06-15 14:03:26 -04:00
Torkel Ödegaard
5f3b5fdcb2 updated 2017-06-15 12:21:12 -04:00
Torkel Ödegaard
6a95df403a refacoring: more work on metric segment replacement 2017-06-14 19:42:45 -04:00
Torkel Ödegaard
380e7e7f04 Merge branch 'master' into metric-segment-remake 2017-06-14 16:17:13 -04:00
Torkel Ödegaard
581b977787 Merge branch 'master' of github.com:grafana/grafana 2017-06-13 18:32:38 -04:00
Torkel Ödegaard
c771dd4bd2 ux: metrics tab add query feature 2017-06-13 18:31:43 -04:00
Torkel Ödegaard
9ff4ab1236 Merge branch 'master' into query_troubleshooting 2017-06-13 16:47:04 -04:00
Daniel Lee
1f92e589e8 exporter: query template var keeps refresh value.. 
on export if the value is not set to never. Otherwise the template
variable will not be populated with any values.""
 2017-06-13 22:42:58 +02:00
Torkel Ödegaard
812ac5cb8e Merge branch 'master' of github.com:grafana/grafana 2017-06-13 13:22:08 -04:00
Torkel Ödegaard
7d642546b3 fix: restore dashboard history version did not reload route correctly when slug did not change 2017-06-13 13:21:22 -04:00
Trent White
192c447c2c create new auth icon for grafana.com so it doesn't share the same file as the main logo (#8581) 2017-06-12 17:17:00 +02:00
Martin Molnar
d10d897d65 fix: component name of plugin page contains 'undefined' (#8590) 2017-06-12 15:11:00 +02:00
Torkel Ödegaard
cdd5ba6198 fix: influxdb test data source error handling now works better, fixes #8577 2017-06-08 21:41:58 +02:00
Torkel Ödegaard
217c746445 ux: close edit views when opening panel in edit mode 2017-06-08 14:23:51 +02:00
Torkel Ödegaard
95c8a76aa6 ux: minor search style improvements 2017-06-08 13:56:51 +02:00
Torkel Ödegaard
50b09f4f10 Merge branch 'master' of github.com:grafana/grafana 2017-06-08 11:54:11 +02:00
Torkel Ödegaard
2c75593c1a refactoring: elasticsearch raw doc size limit option PR, #8527 2017-06-08 11:53:12 +02:00
Torkel Ödegaard
3c41d0477a Merge branch 'master' of https://github.com/mk-dhia/grafana into mk-dhia-master 2017-06-08 11:22:48 +02:00
Daniel Lee
f7c48c5a5f singlestat: fix ignoring zero value for table data 
When table data returns a column with the value 0, it should not ignore
it. This change checks for undefined instead of if the value is truthy.

Fixes #8531
 2017-06-08 11:06:37 +02:00
Michael Ambrose
f0169656ba Added test to for Cloudwatch EC2 tag selection 2017-06-07 16:53:49 -04:00
Michael Ambrose
525da95f49 Updated cloudwatch plugin to allow specific tag selection 
Tags come back from AWS as a key value pair inside an array
This array is now converted to an object
Tags can be selected when using the 'ec2_instance_attribute' query
Example: `ec2_instance_attribute(us-east-1, Tags.Name, { "tag:Grafana": [ "true" ] })`
 2017-06-07 16:53:49 -04:00
Torkel Ödegaard
01ff3bbe0a ux: mini css position fix 2017-06-07 22:03:10 +02:00
Torkel Ödegaard
61bdc91272 ux: css fix to search position when sidemenu is pinned 2017-06-07 21:54:55 +02:00
Torkel Ödegaard
e7e675e471 Merge branch 'walmartlabs-master' (Dashboard History Feature, #8472) 2017-06-07 14:30:03 +02:00
Torkel Ödegaard
3ba8aeb9a7 dashboard_history: fix for scenario where reverted dashbord has different title and url must change not just route reload 2017-06-07 14:02:45 +02:00
Torkel Ödegaard
64d620c987 dasboard_history: minor style fix change 2017-06-07 13:50:59 +02:00
Torkel Ödegaard
56b3c4a3a0 dasboard_history: fixed disabled attribute so it works both by disabling and fixing style, no need for disabled class and disabled attribute 2017-06-07 13:46:36 +02:00
Torkel Ödegaard
577dfee086 dasboard_history: fixed json diff so only dashbord is compared and not the whole dashboard revision object (message and restoreFrom etc was showing up in json diff) 2017-06-07 13:36:03 +02:00
Torkel Ödegaard
8f6c9c5946 dasboard_history: some polish around styles & diff colors, and minor fixes 2017-06-07 12:39:06 +02:00
Torkel Ödegaard
ef1dfed0d8 dasboard_history: big refactoring of how the compare api looked, now a POST with a model for new & base version, refactored a simplified UI code as well, this was done to lay foundation to make it possible to do diff against current in browser unsaved version 2017-06-07 11:50:09 +02:00
Torkel Ödegaard
948e5ae74d dashboard_history: further css & markup fixes, removing style overrides & resuing existing styles and markup components 2017-06-06 23:04:14 +02:00
Torkel Ödegaard
c4e872b9da dashboard_history: minor changes and fixes 2017-06-06 16:27:28 +02:00
Torkel Ödegaard
7b5f7ed553 dashboard_history: SQL did not work when using MySQL, fixes to dashboard version numbering, so inserts start at 1, added migration to fix old dashboards with version 0 2017-06-06 15:40:10 +02:00
Torkel Ödegaard
9b629cd5a6 dashboard_history: fixed history srv unit tests 2017-06-06 14:28:21 +02:00
Torkel Ödegaard
546d489dd3 dashboard_history: restored unsaved changes modal to simple cancel, discard, save 2017-06-06 14:27:30 +02:00
Torkel Ödegaard
88da3a99e1 refactoring: trying to remove all the css overrides in history tab and make the styles more more inline with best practice css, and if needed use modifier overrides instead 2017-06-06 11:03:56 +02:00
Torkel Ödegaard
689e366f59 refactoring: updated api url routes so they do not conflict with slug route 2017-06-06 09:51:14 +02:00
Torkel Ödegaard
e43d09e15b fix: fixed failing frontend test 2017-06-05 23:31:45 +02:00
Torkel Ödegaard
9c1401849e fix: always show dashboard history for now, need a way to make dropdown more dynamic 2017-06-05 23:14:07 +02:00
Torkel Ödegaard
2a52e25d5b refactoring: removed double error alert, backendSrv is already showing an error alert 2017-06-05 23:06:31 +02:00
Torkel Ödegaard
cabbfe9adc refactoring: moved dashboard history item formating (message) and fixed dashboard history migration issue, and removed from frontend tests that where no longer needed 2017-06-05 22:59:04 +02:00
Torkel Ödegaard
f18ebea03e fix: dashboard save modals had double submit on enter after my refactoring this morning 2017-06-05 18:01:16 +02:00
Torkel Ödegaard
c87418d060 refactoring: Dashboard history restore operation is now reusing existing 
operations instead of duplicating a bunch of get & save logic.
 2017-06-05 17:45:27 +02:00
Torkel Ödegaard
e18007153d refactoring: Renamed dashboard version queries that wrongly had Command suffix, added missing OrgId to dashboard history commands and queries 2017-06-05 16:34:32 +02:00
Daniel Lee
1b79e17970 graph: better generation of y-axis ticks for log-scale 
If there are too many ticks generated for the y-axis (which can occur
for log scale 2, with a small y-min and a large max), then the ticks
will be regenerated using larger jumps between the ticks.

This also handles the case when y-min is set to 0. Previously, y-min of
0 was ignored as zero is not a valid value for log scale. Now the tick
generator approximates zero by setting min to 0.1.

Ref #8244

Ref #8516
 2017-06-05 15:06:22 +02:00
Torkel Ödegaard
fdfcd5cbf0 refactoring:: dashboard save modal and save as modal needed an update 2017-06-05 14:56:11 +02:00
Torkel Ödegaard
f3980504e2 Merge branch 'master' into walmartlabs-master 2017-06-05 13:43:00 +02:00
Dhia MOAKHAR
7c1dc2444d change size in raw_document from text to number 
update query builder and specs
 2017-06-04 13:20:58 +00:00
Torkel Ödegaard
d2eca2faa1 ux: new navbar fixes, restored delete option in dashboard dropdown, fixes #8521 2017-06-04 14:18:25 +02:00
Dhia MOAKHAR
045f5e11fc [elasticsearch] Fix bug when switching from "Raw Document" metric type 
when switch to "raw Document" metric type we do free all "Group by"
however when we switch back to another type we do not reset the default aggregation (date histogram)
Thus all modification will through exception as no "Group by" is defined and panel should be recreated
the fix will reintialize the "Group by" by setting default value
 2017-06-03 02:55:26 +00:00
Dhia MOAKHAR
d55cc4e2a3 [elasticsearch] Fix add metric that was not working properly 
when selecting Raw Documet metric type, the $scope.target.metrics was replaced by [$scope.agg],
 however the pointer to this variables is shared with metricAggs.
 Instead we free the array and add $scope.agg
 2017-06-03 02:50:10 +00:00
Dhia MOAKHAR
966c2912fc [elasticsearch] Add option for result set size in raw_dcument 
it allows to specify the result set size in raw_document.
 Example: table  panel could show more (or less) than 500 line if needed.
 Added test to spec
 2017-06-02 23:56:48 +00:00
Torkel Ödegaard
d47c47853a ux: added css annimations for dash edit views 2017-06-02 15:29:25 +02:00
Torkel Ödegaard
3bea304bab ux: made new search more responsive 2017-06-02 14:19:39 +02:00
Torkel Ödegaard
e9d5e037e8 ux: merge branch navbarv2, new navbar with dashboard search available on all pages, closes #6475 2017-06-02 14:00:42 +02:00
sanchitraizada
77c046aac6 Implement review feedback 2017-06-01 17:57:09 -04:00
Torkel Ödegaard
95a4ec8bf2 Merge branch 'v4.3.x' 2017-05-31 10:55:06 +02:00
Torkel Ödegaard
812958162a revert: removed lazy loading feature, closes #8500 2017-05-31 10:47:04 +02:00
Torkel Ödegaard
cd3807055e chrome: an attempt to fix scroll issue with chrome, but this did not fix the problem as it seems to be caused by some interaction between graph rendering and scrolling, #8494 2017-05-30 13:50:38 +02:00
Pranay Kanwar
26ec874fb1 Frontend query changes corresponding #8336 (#8489) 2017-05-30 09:53:11 +02:00
Torkel Ödegaard
f16e3e38ee Merge branch 'v4.3.x' 2017-05-29 12:20:34 +02:00
Daniel Lee
d318c9093f graph: Handle data with zeroes for log scale 
fixes #8446. Data with all values equal to zero, creates a max with the
value of Infinite. The for loop for creating ticks then gets stuck in an
infinite loop. This fix resets min and max and creates some fake ticks
for the y-axis if the min and max are not finite numbers.
 2017-05-29 12:18:54 +02:00
Torkel Ödegaard
0d865a83bc fix: fixed test data fake metric query, fixes #8474 2017-05-29 12:17:51 +02:00
Victor Azevedo
980b9b5ca0 use fielddata_fields in elasticsearch 2.x queries 
Resolves issue #8467
 2017-05-29 12:15:51 +02:00
Torkel Ödegaard
5e0b03928e Merge branch 'v4.3.x' 2017-05-29 10:49:02 +02:00
Torkel Ödegaard
0d39852ef4 fix: fixed test data fake metric query, fixes #8474 2017-05-29 10:48:38 +02:00
Daniel Lee
c17d02e496 csv: remove sep metadata as only works for excel 2017-05-26 15:43:09 +02:00
Cédric Reginster
ee0d0155a5 Refactor to component based style 2017-05-26 15:43:09 +02:00
Cédric Reginster
f484b4c347 Make csv export date time format configurable 
- Move export csv options to modal dialog
 2017-05-26 15:43:09 +02:00
Daniel Lee
3292a48381 graph: dashes with linewidth fix. Fixes #8469 
Adds series override options for dash spaces and dash length.
 2017-05-26 15:09:05 +02:00
Dan Cech
8422697199 centralize oauth http calls, validate response status (#8470) 2017-05-26 14:35:32 +02:00
sanchitraizada
e6616cc551 Merge pull request #10 from walmartlabs/version-control 
History and Version Control for Dashboard Updates
 2017-05-25 14:50:47 -07:00
Victor Azevedo
0a1c2a7024 use fielddata_fields in elasticsearch 2.x queries 
Resolves issue #8467
 2017-05-25 11:43:29 -04:00
Ben Tranter
b6e46c9eb8 History and Version Control for Dashboard Updates 
A simple version control system for dashboards. Closes #1504.

Goals

1. To create a new dashboard version every time a dashboard is saved.
2. To allow users to view all versions of a given dashboard.
3. To allow users to rollback to a previous version of a dashboard.
4. To allow users to compare two versions of a dashboard.

Usage

Navigate to a dashboard, and click the settings cog. From there, click
the "Changelog" button to be brought to the Changelog view. In this
view, a table containing each version of a dashboard can be seen. Each
entry in the table represents a dashboard version. A selectable
checkbox, the version number, date created, name of the user who created
that version, and commit message is shown in the table, along with a
button that allows a user to restore to a previous version of that
dashboard. If a user wants to restore to a previous version of their
dashboard, they can do so by clicking the previously mentioned button.
If a user wants to compare two different versions of a dashboard, they
can do so by clicking the checkbox of two different dashboard versions,
then clicking the "Compare versions" button located below the dashboard.
From there, the user is brought to a view showing a summary of the
dashboard differences. Each summarized change contains a link that can
be clicked to take the user a JSON diff highlighting the changes line by
line.

Overview of Changes

Backend Changes

- A `dashboard_version` table was created to store each dashboard
  version, along with a dashboard version model and structs to represent
  the queries and commands necessary for the dashboard version API
  methods.
- API endpoints were created to support working with dashboard
  versions.
- Methods were added to create, update, read, and destroy dashboard
  versions in the database.
  - Logic was added to compute the diff between two versions, and
  display it to the user.
  - The dashboard migration logic was updated to save a "Version
  1" of each existing dashboard in the database.

Frontend Changes

- New views
- Methods to pull JSON and HTML from endpoints

New API Endpoints

Each endpoint requires the authorization header to be sent in
the format,

```
Authorization: Bearer <jwt>
```

where `<jwt>` is a JSON web token obtained from the Grafana
admin panel.

`GET "/api/dashboards/db/:dashboardId/versions?orderBy=<string>&limit=<int>&start=<int>"`

Get all dashboard versions for the given dashboard ID. Accepts
three URL parameters:

- `orderBy` String to order the results by. Possible values
  are `version`, `created`, `created_by`, `message`. Default
  is `versions`. Ordering is always in descending order.
- `limit` Maximum number of results to return
- `start` Position in results to start from

`GET "/api/dashboards/db/:dashboardId/versions/:id"`

Get an individual dashboard version by ID, for the given
dashboard ID.

`POST "/api/dashboards/db/:dashboardId/restore"`

Restore to the given dashboard version. Post body is of
content-type `application/json`, and must contain.

```json
{
  "dashboardId": <int>,
  "version": <int>
}
```

`GET "/api/dashboards/db/:dashboardId/compare/:versionA...:versionB"`

Compare two dashboard versions by ID for the given
dashboard ID, returning a JSON delta formatted
representation of the diff. The URL format follows
what GitHub does. For example, visiting
[/api/dashboards/db/18/compare/22...33](http://ec2-54-80-139-44.compute-1.amazonaws.com:3000/api/dashboards/db/18/compare/22...33)
will return the diff between versions 22 and 33 for
the dashboard ID 18.

Dependencies Added

- The Go package [gojsondiff](https://github.com/yudai/gojsondiff)
  was added and vendored.
 2017-05-24 19:14:39 -04:00
Torkel Ödegaard
90871ca12e Merge branch 'v4.3.x' 2017-05-24 16:48:05 +02:00
Torkel Ödegaard
896f849b84 fix: influxdb query editor did no show alias by input field when in text editor mode, fixes #8459 2017-05-24 16:47:38 +02:00
Torkel Ödegaard
a5318def66 Merge branch 'v4.3.x' 2017-05-24 11:20:35 +02:00
Torkel Ödegaard
634ee0f9fa fix: graphg panel logarithmic scale goes blow x-axis, fixes #8244 2017-05-24 11:20:07 +02:00
Torkel Ödegaard
3695337980 refactoring: Elasticearch filter label PR #8420 2017-05-23 15:14:23 +02:00
Torkel Ödegaard
648e8a9547 Merge branch 'master' of https://github.com/limefamily/grafana into limefamily-master 2017-05-23 14:48:14 +02:00
Torkel Ödegaard
044668a395 login: minor fix to login page 2017-05-23 11:10:16 +02:00
Daniel Lee
73cb035231 mysql: annotation support. Fixes #8382 
Simple query editor - a text area with a Show Help section.
Validation for empty query and if the time_sec column is missing.
 2017-05-23 09:53:20 +02:00
Torkel Ödegaard
c34db77f04 grafana_com: changed name of oauth grafana_net integration (old settings names still work), and updated login button look, closes #8415 2017-05-22 14:56:50 +02:00
Torkel Ödegaard
7c50563f0f fix: fixed crash when gzip was enabled 2017-05-22 14:09:54 +02:00
Torkel Ödegaard
a64c06d02c mysql: add user permission notice mysql config view, closes #8359 2017-05-22 13:53:43 +02:00
Torkel Ödegaard
a0b9dcad4d alert: alerting annotation improvements, fixes #8421 2017-05-22 13:02:49 +02:00
Torkel Ödegaard
20e631a22d fix: All alert annotations showed up in unsaved/new dashboards graph panels with alert, fixes #8361 2017-05-22 10:49:26 +02:00
Torkel Ödegaard
7cb6466251 feat: query troubleshooter, improving json explorer 2017-05-20 23:43:59 +02:00
Torkel Ödegaard
d840645dd7 feat: metrics tab, minor change 2017-05-20 23:03:04 +02:00
Torkel Ödegaard
a8673a2e33 feat: metrics tab 2017-05-20 22:41:34 +02:00
Torkel Ödegaard
4a2c405ac0 feat: metris tab, moved data source selector 2017-05-20 18:35:34 +02:00
Torkel Ödegaard
499e01d832 feat: metrics tab reworking 2017-05-20 18:21:41 +02:00
Torkel Ödegaard
5e090b84ec feat: Copy to clipboard now works in query troubleshooter 2017-05-20 14:52:33 +02:00
Torkel Ödegaard
b8aa6a8e47 query: more work on metrics tab changes 2017-05-20 10:48:47 +02:00
Torkel Ödegaard
912301fe24 query: more work on metrics tab changes 2017-05-20 10:14:41 +02:00
Torkel Ödegaard
5909f9ef92 feat: more work on metrics tab reworkings 2017-05-19 21:32:23 +02:00