Commit Graph
38884 Commits
Author SHA1 Message Date
Aleksei Magusev 92e5968f91 Fix ResponseParser for InfluxDB to return only string values 2018-04-09 11:52:12 +02:00
Aleksei Magusev a101177b55 Conditionally select a field to return in ResponseParser for InfluxDB
This patch also fixes "value[1] || value[0]" to not ignore zeros.
2018-04-09 11:51:22 +02:00
bergquist 25be937bfa docs: fixes typo 2018-04-09 09:55:10 +02:00
Torkel Ödegaard d60c7b2013 docs: updated debian distro in install docs to stretch, closes #11527 2018-04-09 08:18:58 +02:00
Penghan Wang fbed72c89c Merge branch 'master' into feature/add_es_alerting 2018-04-09 14:00:28 +08:00
Andrzej Ressel c4b57a2562 Revert files 2018-04-08 20:40:09 +02:00
Andrzej Ressel cfd1f5c072 Revert files 2018-04-08 20:38:08 +02:00
Andrzej Ressel 697a3eaa43 Fix after merge 2018-04-08 20:31:17 +02:00
Andrzej Ressel 30f048965c Merge branch 'master' into feature/discord 2018-04-08 20:09:56 +02:00
Andrzej Ressel dc11f1da81 Make dashboard JSON editable 2018-04-08 20:00:18 +02:00
Marcus Efraimsson f3e1557761 guardian: when updating permissions should verify existing permissions
Before in CheckPermissionBeforeUpdate, access was verified for updated
permissions. Now access is verified for existing permissions.
Refactored guardian tests to cover more test cases for org admin, editor
and viewer roles
2018-04-08 15:06:22 +02:00
Marcus Efraimsson 84d034c688 api: allow authenticated users to search current org users and teams
Any authenticated user of an organization should be able to
- search its organization's users
- search its organization's users
- retrieve a single user of its organization (this how it was
  implemented earlier)
2018-04-07 10:39:28 +02:00
Daniel Lee ce787b88bf css: quick fix after IE11 changes
Temporary fix so that the add panel panel works properly. This will
break a3f15ced68.
2018-04-06 21:29:42 +02:00
Alexander Zobnin 41e5d66e39 scrollbar: fix add panel height bug 2018-04-06 20:31:44 +03:00
Alexander Zobnin d3d64337b4 scrollbar: styles cleanup 2018-04-06 20:00:03 +03:00
Daniel Lee 817b8d3946 Merge pull request #11511 from grafana/side-menu-icon-fix
fixed sidemenu icon issue created by earlier pr
2018-04-06 17:53:50 +02:00
Daniel Lee 3fd9c787cf Merge pull request #11497 from grafana/dash-class-to-ts
migrated dash_class to ts
2018-04-06 17:48:18 +02:00
Sven Klemm 107c0d81d2 Merge remote-tracking branch 'upstream/master' into postgres-query-builder 2018-04-06 17:01:45 +02:00
Patrick O'Carroll c7cd754a94 migrating to ts 2018-04-06 15:02:32 +02:00
Daniel Lee 51148709bb Merge pull request #11496 from grafana/segment-srv-to-ts
migrated segment_srv to ts
2018-04-06 11:18:51 +02:00
Patrick O'Carroll 6d6ecbd458 fixed sidemenu icon issue created by earlier pr 2018-04-06 10:54:06 +02:00
Patrick O'Carroll 0203e7afd5 Merge branch 'dashboard-acl-ux2' of github.com:grafana/grafana into dashboard-acl-ux2 2018-04-06 09:50:36 +02:00
Patrick O'Carroll b363e160d9 added icons for viewer and editor, fixed add permission team avatar 2018-04-06 09:43:59 +02:00
Daniel Lee 4ac290215e Merge branch 'fix-11053' of https://github.com/alexanderzobnin/grafana into alexanderzobnin-fix-11053 2018-04-05 22:30:13 +02:00
Jonas Hahnfeld dfccabab75 singlestat: Fix optimization in setTableColumnToSensibleDefault
tableColumnOptions is an associative array that has no property length.
Use tableData.columns as in the default case which works just fine.
2018-04-05 20:59:11 +02:00
Jonas Hahnfeld e3dbef755a influxdb: Check before assuming first column to be 'time'
When running queries like 'SHOW [...] CARDINALITY' introduced with
InfluxDB 1.4 there is only a single column 'count'. However, the data
source always assumed 'time' which threw an error because the code
couldn't find a non-time column to display.

This change actually checks this assumption and thereby fixes displaying
the result in a Singlestat in Table mode (closes #11476).
2018-04-05 20:53:22 +02:00
Marcus Efraimsson f619dd579e provisioning: fix tests for save provisioned dashboard modal 2018-04-05 20:51:47 +02:00
Marcus Efraimsson 6bbeb723ca Merge branch 'master' into readonly_dashboards 2018-04-05 20:30:27 +02:00
Marcus Efraimsson bcdb3ec84d provisioning: ux fixes when saving provisioned dashboards
Wider modal.
Tried to improve provisioning description text.
Code editor for json.
Button that allows to save the json to a file.
2018-04-05 20:28:04 +02:00
Marcus Efraimsson 4cc80efee6 graphite: use a query when testing data source
Using a query (POST /render) request instead of GET /metrics/find to better
mimic an actual request for rendering a panel in a dashboard. The POST /render
request will add at least a custom http header which can be problematic when
using direct access mode since it will trigger a CORS prerequest check. By
doing this kind of query when testing the data source possible CORS issues
can be detected there instead of later when trying to use the data source
in a dashboard.
2018-04-05 18:11:35 +02:00
Patrick O'Carroll 35bc4e4632 migrated metric_segment to ts 2018-04-05 17:10:32 +02:00
Alexander Zobnin 9f07ae72ee scrollbar: fix search scroller in mobile view 2018-04-05 16:47:20 +03:00
Alexander Zobnin d6233714d2 Merge remote-tracking branch 'upstream/master' into fix-11053 2018-04-05 16:30:46 +03:00
Marcus Efraimsson 166778b32a Merge pull request #11439 from grafana/ldap-block
docker: add users and groups to ldap block
2018-04-05 15:30:11 +02:00
Alexander Zobnin fa43782299 scrollbar: fix graph legend height 2018-04-05 16:28:12 +03:00
Marcus Efraimsson 94d1a9fd83 Merge pull request #11430 from grafana/11332_esc_timepicker
Enable closing timepicker using escape key
2018-04-05 15:11:34 +02:00
Daniel Lee fcfc33ee57 changelog: adds note for #11165 2018-04-05 15:02:54 +02:00
Patrick O'Carroll 714d555e36 migrated dash_class to ts 2018-04-05 14:33:27 +02:00
Patrick O'Carroll 7083e8a0a9 migrated segment_srv to ts 2018-04-05 14:09:32 +02:00
Daniel Lee 32b833e488 Merge pull request #11271 from grafana/11073_dashboard_folder_indent
added indent to dashboards inside folder in search dropdown…
2018-04-05 11:12:17 +02:00
Patrick O'Carroll b321a21cb5 removed indent for manage dashboards 2018-04-05 11:00:15 +02:00
Alexander Zobnin b4ef55f5d0 scrollbar: fix potential memory leaks in event handlers 2018-04-05 11:51:32 +03:00
ryan 66d020eb7e skip migration if it is a big number 2018-04-05 09:51:08 +02:00
ryan 392c47f39b Merge remote-tracking branch 'grafana/master' into annotations-created
* grafana/master: (51 commits)
  Use curly brackets around hyperlink help text #11478 (#11479)
  migrated playlist-routes to ts
  migrated last all.js to ts
  Notes for closing #7119
  changelog: adds note for #11128
  variables: adds test for variable sorting
  Add case-insensitive sort for variables.
  graphite: fixes #11434
  settings: fixes test
  changed from margin to padding
  changed variable for tabbed close btn hover, and changed text-strong variable for lighttheme, removed commented out variable
  mssql: typos in help sections
  Webpack Grafana plugin template project to links (#11457)
  rm panel.type  constrain from threshold_mapper.ts (#11448)
  No need for node_modules/bin in npm run-script (#11449)
  changelog: adds note about closing #11555
  add article
  fix some typos
  migrated graph_tooltip to ts
  started migration to ts
  ...
2018-04-05 09:48:00 +02:00
Daniel Lee 088720cf2b Merge pull request #11417 from grafana/ie11_alerting_style_fix
removed padding for icons and added margin
2018-04-04 23:24:41 +02:00
Daniel Lee 2d1f2f3636 Merge pull request #11480 from grafana/graph_tooltip_to_ts
Graph tooltip to ts
2018-04-04 23:03:31 +02:00
Daniel Lee 28849bbd57 Merge pull request #11481 from grafana/all-js-to-ts
migrated last all.js to ts
2018-04-04 22:09:10 +02:00
Daniel Lee dc4cb0d565 Merge pull request #11483 from grafana/playlist-routes-to-ts
migrated playlist-routes to ts
2018-04-04 22:02:02 +02:00
Jarno Tuovinen 90aab44558 Use curly brackets around hyperlink help text #11478 (#11479) 2018-04-04 20:07:22 +02:00
Alexander Zobnin b69316752a scrollbar: fix dashboard width updating for different modes 2018-04-04 19:51:12 +03:00