Commit Graph
13856 Commits
Author SHA1 Message Date
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
Dan Cech c62b0858ae move graphite /functions parsing into gfunc.ts 2018-01-16 18:04:59 -05:00
Dan Cech 50ffe56b60 remove duplicate sass rules 2018-01-16 17:17:58 -05:00
Dan Cech 315ecf8505 fix tests & some display issues 2018-01-16 17:02:03 -05:00
Torkel Ödegaard e9d33750cb fix: graphite func editor fixes, this component is messy and ugly as hell 2018-01-16 17:02:03 -05:00
Torkel Ödegaard 1a6bf692c6 fix: minor fixes 2018-01-16 17:02:03 -05:00
Torkel Ödegaard 38f4d5d06d fix: restored previous behavior of form_dropdown, this fixes all my observerd bugs with the dropdown behavior 2018-01-16 17:02:03 -05:00
Torkel Ödegaard 7e750cef43 fix: query editor needs to wait for function definitions to load 2018-01-16 17:02:03 -05:00
Dan Cech b483d42d34 fix issue with metric find & functions being loaded multiple times 2018-01-16 17:02:03 -05:00
Dan Cech 60ba6ee6a2 interpolate variables in tags & values during autocomplete 2018-01-16 17:02:03 -05:00
Dan Cech 92086bc858 fix typo 2018-01-16 17:02:03 -05:00
Dan Cech 1d00c3c72a update rst2html 2018-01-16 17:02:03 -05:00
Dan Cech da9e1a7e98 fix line length, run jscs & jshint in precommit 2018-01-16 17:02:03 -05:00
Dan Cech 3ddb65fc8b function description formatting 2018-01-16 17:02:03 -05:00
Dan Cech 4d3bac0284 tooltips for function definitions 2018-01-16 17:02:03 -05:00
Dan Cech 80a6e0d8d1 support specifying tag_values("<tag>") as graphite template query 2018-01-16 17:02:03 -05:00
Dan Cech 7c1be021ac use typeahead value in graphite find requests 2018-01-16 17:02:03 -05:00
Dan Cech ff759b0ef7 send prefix when auto-completing tags 2018-01-16 17:02:03 -05:00
Dan Cech d8f2a20775 add button to trigger evaluation of tag queries 2018-01-16 17:02:03 -05:00
Dan Cech a3dba6070e sync function categories with graphite-web 2018-01-16 17:02:03 -05:00
Dan Cech ebad19b232 work on tag dropdown behavior 2018-01-16 17:02:03 -05:00
Dan Cech 3a4e05133e support for loading function definitions from graphite 2018-01-16 17:02:03 -05: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 a5830c6dbc Merge remote-tracking branch 'upstream/master' into dashboard_permissions 2018-01-16 12:02:13 +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