Commit Graph

12817 Commits

Author SHA1 Message Date
bergquist
1a6c2ea8d8 dashboards as cfg: logs error when trying to import dashboard with id
dashboard json cannot contain fixed id when importing from
disk. We used to override this but it didnt caught all problems
so now we block dashboards from beeing imported instead.

closes #10504
2018-01-15 12:26:43 +01:00
bergquist
3951df136c Merge branch 'backend_plugins'
* backend_plugins: (34 commits)
  code style fixes
  Adds Table in backend datasource contract.
  Adds Tables types to protobuf
  Review tsdb protobuf contract
  supports windows compatible plugin binaries
  moves plugin proxy to plugin package
  improves name for plugin logger
  uses pluginmanagers log instead of global
  removes commented code
  makes datasource handshake more explicit
  backend plugins: improves logging
  dont spawn new subprocess while shutting down
  plugins: restart killed plugins
  query result should be a map
  test for plugin path builder
  merge backend datasources and datasources
  use int64 for timestamps
  fixes invalid valud/timestamp order
  merge backend-datasource and datasource type
  fixes broken unit test
  ...
2018-01-15 10:48:06 +01:00
bergquist
5499f4910c Merge branch 'master' into backend_plugins
* master: (117 commits)
  fix: share snapshot controller was missing ngInject comment, fixes #10511
  Use URLEncoding instead of StdEncoding to be sure state value will be corectly decoded (#10512)
  Optimize metrics and notifications docs
  Optimize cli and provisioning docs
  docs: Guide for IIS reverse proxy
  changelog: adds note about closing #9645
  telegram: Send notifications with an inline image
  telegram: Switch to using multipart form rather than JSON as a body
  telegram: Fix a typo in variable name
  fix: alert list pause/start toggle was not working properly
  fix template variable selector overlap by the panel (#10493)
  dashboard: Close/hide 'Add Panel' before saving a dashboard (#10482)
  fix: removed unused param
  Fix variables values passing when both repeat rows and panels is used (#10488)
  moved angular-mocks out of dependencies
  ux: minor change to alert list page
  ux: minor word change to alert list
  fix: updated snapshot test
  Add eu-west-3 in cloudwatch datasource default's region (#10477)
  fix: Make sure orig files are not added to git again #10289
  ...
2018-01-15 10:27:12 +01:00
bergquist
b511788c51 code style fixes 2018-01-15 10:26:33 +01:00
Leonard Gram
b63c834a4b Adds Table in backend datasource contract. 2018-01-15 09:41:44 +01:00
Torkel Ödegaard
270db4da8b fix: share snapshot controller was missing ngInject comment, fixes #10511 2018-01-15 09:05:26 +01:00
m-pavel
dff66559e4 Use URLEncoding instead of StdEncoding to be sure state value will be corectly decoded (#10512) 2018-01-15 08:49:30 +01:00
Carl Bergquist
baffdb156e
Merge pull request #10510 from nir0s/fix-docs
Fix docs
2018-01-15 08:10:59 +01:00
nir0s
b7d4a1887c Optimize metrics and notifications docs 2018-01-14 10:09:49 +02:00
nir0s
71a12c6bb6 Optimize cli and provisioning docs 2018-01-14 08:57:48 +02:00
Daniel Lee
77b5dee408 docs: Guide for IIS reverse proxy 2018-01-12 17:02:10 +01:00
bergquist
594447f5f5 changelog: adds note about closing #9645 2018-01-12 13:20:01 +01:00
Carl Bergquist
a69bdf9432
Merge pull request #9967 from rburchell/master
Add support for inline image uploads to telegram notifier plugin
2018-01-12 13:18:22 +01:00
Robin Burchell
43109dc8ca telegram: Send notifications with an inline image
If image upload is enabled, but there is no public image repository,
fall back to sending an image via telegram's API.
2018-01-11 17:23:50 -05:00
Robin Burchell
b6fcf2b609 telegram: Switch to using multipart form rather than JSON as a body
This is a pre-requisite for uploading inline images.
2018-01-11 17:21:43 -05:00
Robin Burchell
a1a9f339bf telegram: Fix a typo in variable name 2018-01-11 17:21:43 -05:00
bergquist
9e942f1a6d Adds Tables types to protobuf 2018-01-11 15:34:07 +01:00
Torkel Ödegaard
f3a66ecbcb fix: alert list pause/start toggle was not working properly 2018-01-11 15:18:38 +01:00
Alexander Zobnin
6a73205b18 fix template variable selector overlap by the panel (#10493) 2018-01-11 15:03:24 +01:00
bergquist
ce4beb730d Review tsdb protobuf contract 2018-01-11 15:01:49 +01:00
Marcus Efraimsson
2843961677 dashboard: Close/hide 'Add Panel' before saving a dashboard (#10482)
Fixes #10472
2018-01-11 08:56:19 +01:00
bergquist
1fd40a48d9 supports windows compatible plugin binaries 2018-01-10 15:07:04 +01:00
Torkel Ödegaard
9606a34e0a fix: removed unused param 2018-01-10 14:34:08 +01:00
Torkel Ödegaard
ae9b3186e3 Merge branch 'master' of github.com:grafana/grafana 2018-01-10 14:30:54 +01:00
Alexander Zobnin
bfd7e1043b Fix variables values passing when both repeat rows and panels is used (#10488)
* dashboard: repeat rows and panels tests

* fix variable values passing when both repeat rows and panels is used
2018-01-10 14:30:43 +01:00
Torkel Ödegaard
d2f866c27c moved angular-mocks out of dependencies 2018-01-10 14:29:19 +01:00
Torkel Ödegaard
b76958f07b ux: minor change to alert list page 2018-01-10 14:18:58 +01:00
Torkel Ödegaard
32df74ffec ux: minor word change to alert list 2018-01-10 13:17:43 +01:00
Torkel Ödegaard
686548a6ed fix: updated snapshot test 2018-01-10 13:16:16 +01:00
Torkel Ödegaard
7854f80f5a Merge remote-tracking branch 'origin/10289_user_picker' 2018-01-10 13:14:43 +01:00
bergquist
ebd8677607 moves plugin proxy to plugin package 2018-01-10 12:11:57 +01:00
nicolasguyomar
66d7884b48 Add eu-west-3 in cloudwatch datasource default's region (#10477)
* Add eu-west-3 as a possible default datasource

* Add eu-west-3 as a possible default datasource
2018-01-10 12:07:04 +01:00
Johannes Schill
0b81117ee2 fix: Make sure orig files are not added to git again #10289 2018-01-10 12:04:46 +01:00
bergquist
acb7d802d1 improves name for plugin logger 2018-01-10 12:01:39 +01:00
Johannes Schill
79bad41843 fix: Remove conflict file #10289 2018-01-10 12:00:28 +01:00
Alexander Zobnin
1fdc24c412 text panel: fix $apply already in progress error (#10486) 2018-01-10 11:56:01 +01:00
Torkel Ödegaard
5d5de23025 refactoring: alert list improvments PR #10452 2018-01-10 11:54:47 +01:00
bergquist
50db9810e8 uses pluginmanagers log instead of global 2018-01-10 11:49:40 +01:00
Johannes Schill
e4a2bda4f2 10389 react tooltip components (#10473)
* poc: Use react-popper for tooltips #10389

* poc: Add popover component and use a hoc() for Tooltip + Popover to avoid code duplication #10389

* jest: Add snapshot tests to Popover and Tooltip #10389

* poc: Move target from hoc into Popover/Tooltip-component #10389

* poc: Clean up unused styles and use the existing Grafana style/colors on popper tooltip #10389

* poc: Remove test code before PR

* poc: Remove imports used in poc but shouldn't be included anymore #10389
2018-01-10 10:27:33 +01:00
Johannes Schill
ffda5eef95 test: Updated snapshot for UserPicker jest test #10289 2018-01-09 15:48:02 +01:00
Johannes Schill
aac1b250af ux: When adding a new panel we should scroll to top until we figure o… (#10417)
* ux: When adding a new panel we should scroll to top until we figure out a better solution #10299

* ux: Use jquery to add smooth scrolling when scrolling up to add a panel, and make sure to pass the scope to the event emitter, #10299

* ux: Add a close button to the "New panel"-box and make sure you scroll to top every time you click "Add panel" #10299
2018-01-09 15:27:53 +01:00
bergquist
e6921a6a01 removes commented code 2018-01-09 15:25:36 +01:00
Patrick O'Carroll
d48be3ca15 naming fixes and added test file 2018-01-09 15:16:55 +01:00
bergquist
dbd1ba465f makes datasource handshake more explicit 2018-01-09 15:04:59 +01:00
bergquist
44e485af41 backend plugins: improves logging 2018-01-09 14:56:23 +01:00
Daniel Lee
3ea63a1064 fix for unsaved changes popup on tab close/refresh
Incorrect return values in onbeforeunload event handler mean that the
unsaved changes popup is shown despite there being no changes.
2018-01-09 14:42:58 +01:00
Johannes Schill
c62a6aa7df fix: Clean up logging and remove unused css #10289 2018-01-09 14:42:23 +01:00
Johannes Schill
c297a1c5a5 fix: Rename directive user-pickerr (yes two r's) to select-user-picker 2018-01-09 14:42:23 +01:00
Johannes Schill
1a993378bd fix: Accidently added the conflict files (#10289) 2018-01-09 14:39:10 +01:00
Johannes Schill
76ba7d1f8c test: Add snapshot tests for UserPicker and UserPickerOption (#10289) 2018-01-09 14:39:10 +01:00