Commit Graph

12844 Commits

Author SHA1 Message Date
bergquist
e023f79c5a migrate from govendor to dep 2018-01-19 09:48:15 +01:00
Dan Cech
5bb22b836d Generic Oauth Support for ADFS (#9242)
* check upn field if email address isn't present, support for adfs

* correctly set login to the user's email address if not specified by the oauth server

* break up GenericOAuth.UserInfo into helper functions
2018-01-18 17:24:04 +01:00
Daniel Lee
1a019052d5 mysql: convert numbers to text for annotation tooltip 2018-01-18 11:50:16 +01:00
Daniel Lee
6d13645206 mysql: update to use ColumnTypes interface in new version
The custom code in vendor is not needed anymore and most of the
mapping code can be replaced.
2018-01-18 11:50:16 +01:00
Daniel Lee
7bc7af6c39 mysql: update mysql driver to latest master
The latest master implements the ColumnType interface.

See https://github.com/go-sql-driver/mysql/issues/495

This removes the custom code in the vendor folder that
did a ColumnType mapping.
2018-01-18 11:50:16 +01:00
bergquist
a32644198c gofmt my dear friend 2018-01-18 11:49:45 +01:00
Torkel Ödegaard
7dc046d9f5 ux: updated react-layout-grid 2018-01-18 11:33:39 +01:00
Carl Bergquist
d6667c4fa0
Merge pull request #10548 from StevenTobin/follow_symlinks
Make file_reader follow symlinks
2018-01-18 11:29:34 +01:00
bergquist
b6e6935821 plugins: send secureJsonData unencrypted 2018-01-18 11:22:44 +01:00
Carl Bergquist
81bb3e1e27
Merge pull request #10547 from grafana/provisioning
Dashboard provisioning. Replace folder property with path
2018-01-18 10:05:19 +01:00
stobin
f1813ae3a3 Make file_reader follow symlinks 2018-01-17 14:51:17 +00:00
bergquist
34d7f8a44f dashboards as cfg: property path replaces folder 2018-01-17 15:48:24 +01:00
bergquist
9e20004ec8 Merge branch 'plugin_lib'
* plugin_lib:
  moves datasource plugin model to grafana/grafana_plugin_model
2018-01-17 13:47:36 +01:00
bergquist
a183ea97bb moves datasource plugin model to grafana/grafana_plugin_model 2018-01-17 13:21:42 +01:00
Torkel Ödegaard
af9d1cc577
Update package.json
fixed duplicate dev dependency, closes #10542
2018-01-17 11:53:49 +01:00
Torkel Ödegaard
561561d8fe fix: fixed build issue 2018-01-17 10:48:07 +01:00
Torkel Ödegaard
66edb29f53 fix: multi valued query variables did not work correctly, fixes #10539 2018-01-17 09:41:35 +01:00
Torkel Ödegaard
c4c0e7934b
Update building_from_source.md
corrected build instructions, #10532
2018-01-16 20:15:52 +01:00
Torkel Ödegaard
94b0c79631
Update README.md
Simplified build instructions i
2018-01-16 20:14:53 +01:00
Torkel Ödegaard
6edc945e85
Update default_task.js
removed build clean from test task, #10532
2018-01-16 20:13:27 +01:00
Leonard Gram
183507964c Clearer naming for dashboard provisioning config.
Renames folder (in options) to path to make it
different from the grafana folder wherein the
dashboard will be created.
2018-01-16 17:40:14 +01:00
Torkel Ödegaard
307b419f7c ux: dashboard nav and settings tweaks 2018-01-16 14:41:08 +01:00
Torkel Ödegaard
11ba8070b8
Tag filters in search (#10521)
* tag filter: initial react component

* dashboard: move tag filter to filterbox

* tag filter: customize value rendering

* tag filter: get color from name

* tag filter:  custom option renderer

* tag filter: mode with tags in different container

* tag filter: refactor

* refactoring PR #10519

* tag filter: refactor of PR #10521
2018-01-16 12:52:13 +01:00
Torkel Ödegaard
42d7308034 fix: save as enter key now works and folder selection also works, fixes #10464 2018-01-16 12:50:24 +01:00
bergquist
5eb36e65f2 use context over golang.org/x/net/context 2018-01-16 12:32:58 +01:00
Daniel Lee
87064bff79 docs: small update to IIS proxy docs 2018-01-16 09:49:12 +01:00
Patrick O'Carroll
08211eb220 added a variable for grid color and if statment to switch colors, fixes #10509 (#10517) 2018-01-15 12:43:09 +01:00
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