IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity
13,965 Commits 5,454 Branches 554 Tags 1.9 GiB
f8543fced9
Commit Graph

5375 Commits

Author SHA1 Message Date
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
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
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
Alexander Zobnin
a791a92d79 heatmap: fix Y axis and tooltip decimals and units issues 2018-03-07 13:28:44 +03: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
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
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
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
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
ilgizar
7eeb68b590 Refactoring code. Change Y-Zero to Y-Level. 2018-02-20 16:58:49 +05:00
Torkel Ödegaard
21d48df095 fix: plugin dashboard did not get plugin id after import 2018-02-20 11:30:18 +01:00
Patrick O'Carroll
9f4b7ac26f added scroll to org list modal (#10960) 
* added scroll to org list modal, fixes #10774

* removed console.log
 2018-02-20 11:08:53 +01:00
Patrick O'Carroll
1293fcadd2 added an if to check for null to sort null as 0 (#10961) 
* added an if to check for null to sort null as 0

* changed 0 to -Infinity
 2018-02-20 09:45:30 +01:00
Torkel Ödegaard
7d0c3ae6a7 fix: alert history list now shows on graphs with manually added annotation events, fixes #10968 2018-02-20 09:33:28 +01:00
Marcus Efraimsson
fce1e3f7f1 Merge branch 'master' into 10630_folder_api 2018-02-19 13:32:45 +01:00
Torkel Ödegaard
ae20366b01 graph: added 0.5 point radius option 2018-02-19 11:37:42 +01:00
Zachary Cava
710bb70746 [elasticsearch] Allow nested fields for annotation source (#10936) 2018-02-19 09:26:13 +01:00
Patrick O'Carroll
9c36ee22a8 changed m3 and dm3 to fixedUnit, fixes #10920 (#10944) 2018-02-19 09:23:02 +01:00
Mitsuhiro Tanda
f47542db28 migrate panels in collapsed rows (#10948) 2018-02-19 09:07:29 +01:00
ilgizar
57013d2228 Share zero between Y axis. 2018-02-18 00:54:35 +05:00
Torkel Ödegaard
2e9433c495 fix: fixed redirect after save, fixes #10946 2018-02-16 16:29:14 +01:00
Torkel Ödegaard
497132c441 fix: esc key now closes panel edit/view mode as usual, fixes #10945 2018-02-16 16:09:54 +01:00
Torkel Ödegaard
5323971c21
refactoring: alert rule query refactoring (#10941) 2018-02-16 13:56:04 +01:00
Mitsuhiro Tanda
3b04efa4c0 migrate minSpan (#10924) 2018-02-16 09:29:10 +01:00
Patrick O'Carroll
244ae555d9 Close modal with esc (#10929) 
* added var to check if modal is open and an if for escape fullview

* moved showconfirmmodal to utils, showconfirmmodal now uses showmodal, esc works in textinput

* made esc global
 2018-02-16 09:14:32 +01:00
Alexander Zobnin
2c5f3fbc5b repeat row: fix panels placement bug (#10932) 2018-02-16 09:11:26 +01:00
Daniel Lee
6fa46d9539 plugins: update meta data for all core plugins 
So that the readme's can be published on Grafana.com
 2018-02-15 16:50:38 +01:00
Leonard Gram
3ddfd8bd09 alert notifiers: better error messages. 2018-02-15 16:48:01 +01:00
Mitsuhiro Tanda
18c54a9341 support cloudwatch high resolution query 2018-02-15 23:35:01 +09:00
Torkel Ödegaard
57103ec98a fix: refactoring #10922 2018-02-15 12:42:17 +01:00
Torkel Ödegaard
4b4e38531b Merge branch 'fix-10526' of https://github.com/alexanderzobnin/grafana 2018-02-15 11:46:33 +01:00
Alexander Zobnin
b4c51f8822 Fix phantomjs legend rendering issue, #10526 2018-02-15 12:59:14 +03:00
Carl Bergquist
fcca578f41 updates readmes for mysql and postgres (#10913) 
ref #10813
 2018-02-15 09:38:39 +01:00
ilgizar
425586f67d Set default threshold axis to 'left' for panels created before this feature. 2018-02-14 23:44:04 +05:00
Torkel Ödegaard
fcaa8227a6
Dashboard acl query fixes (#10909) 
* initial fixes for dashboard permission acl list query, fixes #10864

* permissions: refactoring of acl api and query
 2018-02-14 15:04:26 +01:00
Torkel Ödegaard
8dd4d505ee Merge branch 'dashboard-search-permissions-filter' 2018-02-14 10:48:55 +01:00
Torkel Ödegaard
bb681cd498 Merge branch '10819_empty_dashboard_list' 2018-02-14 09:38:19 +01:00
Torkel Ödegaard
b0fae0129c ux: refactoring #10884 2018-02-14 09:37:39 +01:00
Mitsuhiro Tanda
6a85369c50 add 13-24 for min width (#10891) 2018-02-13 17:22:55 +01:00