IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2024-12-01 13:09:22 -06:00
Code Issues Packages Projects Releases Wiki Activity
13,962 Commits 5,114 Branches 538 Tags 1.9 GiB
d4398479f5
Commit Graph

5888 Commits

Author SHA1 Message Date
Daniel Lee
685a371747
Merge pull request #11316 from ryantxu/ace-disable-snippets 
Expose option to disable snippets in ACE code-editor
 2018-03-20 20:53:34 +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
4dcf1b72b3
Merge pull request #11313 from ryantxu/remove-unused-images 
Remove unused kibana images
 2018-03-20 20:44:00 +01:00
Daniel Lee
70cd501373
Merge pull request #11320 from daniellee/update-xorm 
mysql: fixes panics when mysql connection times out (#11155)
 2018-03-20 20:16:18 +01:00
Daniel Lee
32d1477b79
Merge pull request #11319 from alexanderzobnin/fix-11318 
snapshot: fix legend rendering bug
 2018-03-20 20:02:25 +01:00
Alexander Zobnin
a472d38fbf snapshot: fix legend rendering bug 2018-03-20 21:33:54 +03:00
Daniel Lee
1cef373d16 Merge remote-tracking branch 'upstream/master' into update-xorm 2018-03-20 19:21:58 +01:00
Daniel Lee
70630d742e snapshots: removes errors for empty values in ViewStore 
Occurs when opening a snapshot.
 2018-03-20 19:12:52 +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
ryan
f9acb4157b Expose option to disable snippets 2018-03-20 15:26:41 +01:00
Patrick O'Carroll
47215098a3 changed var to const, changed to string interpolation 2018-03-20 14:43:09 +01:00
ryan
54c4b6a11a Remove unused kibana images 2018-03-20 14:39:19 +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
Carl Bergquist
10a0460dc6
Merge pull request #11282 from alexanderzobnin/fix-11086 
Fix rendering link to panel in collapsed row
 2018-03-20 12:40:30 +01:00
Patrick O'Carroll
2a90370230 converted file to ts 2018-03-20 12:36:02 +01:00
Alexander Zobnin
05ac7d8fca dashboard: fix phantomjs panel rendering in collapsed row 2018-03-20 14:13:31 +03: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
294ee5a610 Merge branch 'master' into mssql_datasource 2018-03-19 11:03:13 +01:00
Marcus Efraimsson
74a98d46eb mssql: remove logos for now 2018-03-19 11:02:55 +01:00
flopp999
6718915a23
Changed Swedish and Icelandic currency 
Swedish krone -> Swedish krona
Icelandic krone - > Icelandic króna
 2018-03-16 19:46:20 +01:00
Alexander Zobnin
205714759e fix failed tests for dashboard view state 2018-03-16 21:45:31 +03:00
Alexander Zobnin
0e5b790b54 dashboard: fix rendering link to panel in collapsed row 2018-03-16 21:03:49 +03: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
Patrick O'Carroll
fc9014f920 added indent to dashboards inside folder in search dropdown, and added indent to dashboard icon in search item 2018-03-16 12:36:36 +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 bce5b2d56e.

* Revert "support [[var]] notation"

This reverts commit 10012f8ffe.

* fix token type and regex
 2018-03-15 20:17:51 +03:00
Patrick O'Carroll
1094dc32bc made a keyboard shortcut to duplicate panel 2018-03-15 17:22:11 +01:00
Marcus Efraimsson
d2267643ed Merge branch 'master' into mssql_datasource 2018-03-15 09:53:19 +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
Carl Bergquist
0ef94ea403
Merge pull request #11232 from grafana/11231_dash_url 
Should be possible to browse dashboard using only uid
 2018-03-14 14:18:58 +01:00
Marcus Efraimsson
91fa076fb3 folders: should be possible to browse folder using only uid 
That is, the slug part of url should be optional.
 2018-03-13 21:32:37 +01:00
Marcus Efraimsson
5fbfd67b94 dashboards: should be possible to browse dashboard using only uid 
That is, the slug part of url should be optional.
Closes #11231
 2018-03-13 21:06:25 +01:00
Marcus Efraimsson
d4beee2bb0 Merge branch 'master' into mssql_datasource 2018-03-13 16:03:02 +01:00
flopp999
0fd75e6005
Added icon for iOS web app 
If you using Safari on a iOS device and save the page to home screen you will get the Grafana icon as icon
 2018-03-13 15:12:04 +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
Yohann BARRE
a3388ef45f Second to HH:mm:ss formatter (#11105) 
* Seconds to HH:MM:SS format
 2018-03-13 09:52:41 +01:00
Carl Bergquist
bf6ff50d0b
Merge pull request #11087 from alexanderzobnin/prometheus-heatmap 
Prometheus heatmap support
 2018-03-13 09:44:25 +01:00
flopp999
185aa6d47b
Added concentration units and "Normal cubic metre" 
ppm, ppb, ng/m3, ng/Nm3, μg/m3, μg/Nm3, mg/m3, mg/Nm3, g/m3, g/Nm3, Nm3
ppm was moved from "Dimensionless" and "submenu" to "Concentration"
 2018-03-12 20:59:43 +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
Carl Bergquist
74602b1077
Merge pull request #11183 from jtyr/jtyr-timeticks 
Adding Timeticks unit
 2018-03-12 09:53:53 +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
Jiri Tyr
6bfed903c4 Adding Timeticks unit 2018-03-09 17:20:24 +00:00
bergquist
0ee6a5216b Merge branch 'master' of https://github.com/mayli/grafana into mayli-master 
* 'master' of https://github.com/mayli/grafana:
  Use B/s instead Bps for Bytes per second
 2018-03-08 18:50:02 +01:00
Carl Bergquist
a589f701ad
Merge pull request #10925 from mtanda/cw_high_resolution 
(cloudwatch) support high resolution query
 2018-03-08 18:06:08 +01:00
Carl Bergquist
b1494637d1
Merge pull request #11141 from mtanda/templating_comma_join 
add comma templating format
 2018-03-07 16:49:19 +01:00
Mitsuhiro Tanda
244cbe8cbd add csv templating format 2018-03-08 00:13:58 +09: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
Daniel Lee
4acc8f8ad7
Merge pull request #11119 from bergquist/no_row_setting_viewer 
hide row actions for viewers
 2018-03-07 14:25:39 +01:00
Patrick O'Carroll
3c9f31a0bb added media breakpoint to legend-right 2018-03-07 13:10:44 +01:00
Alexander Zobnin
a791a92d79 heatmap: fix Y axis and tooltip decimals and units issues 2018-03-07 13:28:44 +03:00
Daniel Lee
3a19cf52ef
Merge pull request #11123 from grafana/mobile_menu_polish 
changed background for mobile menu background on light theme,
 2018-03-07 10:58:57 +01:00
Daniel Lee
c657fe8875
Merge pull request #11092 from grafana/11091_anonymous_sign_in 
made drop-menu into link
 2018-03-07 10:54:48 +01: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
Daniel Lee
8e81dc1e79 scrolling: faster wheelspeed 
ref #11053
 2018-03-06 20:08:00 +01: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
Patrick O'Carroll
9b3863a150 changed background for mobile menu background on light theme, increased font size in and added border-right in menu 2018-03-06 14:16:10 +01:00
Alexander Zobnin
0912f61ea3 heatmap: fix tooltip count and bucket bound format 2018-03-06 15:21:37 +03:00
bergquist
d3b23b01d8 hide row actions for viewers 
closes #11112
 2018-03-06 12:32:50 +01:00
Torkel Ödegaard
0de90accfb fix: restores white resize handle for panels, fixes #11103 2018-03-06 11:19:01 +01:00
Tony Dong
96504940a8 fix typo in heatmap rendering.ts (#11101) 2018-03-06 10:36:06 +01:00
Carl Bergquist
c372716692
Merge pull request #11109 from bergquist/unsaved_changes_fix 
ignore iteration property when checking for unsaved changes
 2018-03-06 10:33:27 +01:00
Carl Bergquist
1fe8b33f65
Merge pull request #11000 from victorclaessen/master 
Added radiation units
 2018-03-06 09:38:12 +01:00
bergquist
a7d62f44d3 ignore iteration property when checking for unsaved changes 
closes #11063
 2018-03-05 22:03:26 +01:00
Patrick O'Carroll
42cd462cbf made drop-menu into link 2018-03-05 14:09:04 +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
Torkel Ödegaard
e67b1ebf33 Merge branch 'master' of github.com:grafana/grafana 2018-02-28 13:06:16 +01:00
Marcus Efraimsson
576deb37e8 login: hide sign up if configured so. Fixes #11041 2018-02-28 13:01:35 +01:00
Torkel Ödegaard
0c6b34e216 Merge branch 'tag-variables' of https://github.com/DanCech/grafana into DanCech-tag-variables 2018-02-28 12:39:53 +01:00
Marcus Efraimsson
71a0a298bf permissions: remove client validation and handle server validation 2018-02-27 16:04:45 +01: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
Torkel Ödegaard
dff2c14aed fix: changed react-grid-layout to use grafana fork to a commit before 15503084fb, this fixes all the panel movement bugs, fixes #10831 2018-02-27 11:34:29 +01:00
Alexander Zobnin
26ddb9977f heatmap: fix Y bucket size calculation for 'tsbuckets' mode 2018-02-26 16:26:54 +03:00
Patrick O'Carroll
7fb34f7918 gave scroll-canvas-dashboard 100% height in kiosk-mode, fixes #11010 (#11017) 2018-02-26 11:52:48 +01:00
Dan Cech
abf498fc7f
improve maintainability 2018-02-23 09:51:19 -05:00
Dan Cech
dc6f977304
support [[variable:type]] syntax 2018-02-22 18:45:11 -05:00
Brian Gann
fa193fa888
offer template variables for tags 2018-02-22 18:45:11 -05:00
Brian Gann
b316dfea98
feature for issue #9911 2018-02-22 18:45:11 -05:00
victorclaessen
91e8468fb4
Added radiation units 
Add common units in radiation and health physics monitoring, Bq, Ci, Gy, rad, Sv, rem. C/kg, R, Sv/h.
 2018-02-22 19:21:08 +01:00
Marcus Efraimsson
cacfdc6421 dashboards: remove non-supported keyboard shortcuts for delete/collapse row 2018-02-22 18:08:51 +01:00
Marcus Efraimsson
34f1611d18 dashboards: fix keyboard shortcut for expand/collapse rows 2018-02-22 18:03:29 +01:00
Marcus Efraimsson
609f3c1c9d dashboards: fix keyboard shortcut for remove panel 2018-02-22 18:02:29 +01:00
Marcus Efraimsson
6751bbc17f Merge branch 'master' into docs_v5.0 2018-02-22 15:55:44 +01:00
Marcus Efraimsson
a34acdda1a
Merge pull request #10739 from grafana/10630_folder_api 
New folder and permissions API
 2018-02-22 15:51:54 +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
ilgizar
66590042a6 Add unit tests. 2018-02-22 15:41:11 +05:00
ilgizar
9e68cbea51 Refactoring code 2018-02-22 15:38:32 +05:00
Marcus Efraimsson
bb7a6718f1 Fix save as dashboard from folder to General folder (#10988) 
* dashboards: fix save as dashboard from folder to general folder

* dashboards: disable save button in save dashboard as dialog when creating a new folder
 2018-02-22 10:52:21 +01:00
Alexander Zobnin
e361a31a2a prometheus: tests for heatmap format 2018-02-21 20:22:46 +03:00
Marcus Efraimsson
20ebb614f6 dashboards: cleanup 
Move api calls to backend_srv
 2018-02-21 16:56:34 +01:00
Marcus Efraimsson
b7cf6f9781 folders: use folder api for retrieving folder 2018-02-21 16:55:35 +01:00
Marcus Efraimsson
9d288c3a86 Merge branch 'master' into 10630_folder_api 2018-02-21 16:38:36 +01:00
Marcus Efraimsson
3f3175972e dashboards: fix batch dashboard/folder delete response 
Use message returned from backend and use that as alert success response to user
 2018-02-21 16:38:09 +01:00
Torkel Ödegaard
aa3872a0e2 fix: elasticsearch terms size now allows custom values again, fixes #10124 2018-02-21 15:41:55 +01:00
Marcus Efraimsson
0135178645 folders: fix create folder in folder picker 2018-02-21 15:05:33 +01:00
Leonard Gram
13209f5671
Merge pull request #10639 from overcookedpanda/hash-rate-units 
added hash rate units for monitoring mining processes
 2018-02-21 13:39:09 +01:00
Alexander Zobnin
efa869bb89 prometheus: initial heatmap support 2018-02-21 15:26:45 +03:00
Marcus Efraimsson
71c9741764 permissions: use updated api endpoint for dashboard permissions 2018-02-21 11:53:02 +01:00
Marcus Efraimsson
3c6bc263dc Merge branch 'master' into 10630_folder_api 2018-02-21 11:25:56 +01:00
Torkel Ödegaard
98a4731454 fix: scrollbar position now to max right pos, fixes #10982 2018-02-21 11:01:48 +01:00
Torkel Ödegaard
2f6e77af1e Merge branch 'master' into docs_v5.0 2018-02-21 10:47:14 +01:00
Alexander Zobnin
ceb8223ddf Fixes for heatmap panel in Grafana 5 (#10973) 
* heatmap: fix chart height

* heatmap: fix font size

* heatmap: fix legend size

* heatmap: fix rendering tests
 2018-02-21 09:16:56 +01:00
Torkel Ödegaard
3964d6b797 fix: added new known data source plugins, and minor migration fix for v1 dashboards 2018-02-20 16:08:43 +01:00
Torkel Ödegaard
dceac3aa71 fix: fixes to signup flow, fixes #9816 2018-02-20 13:39:16 +01:00