Commit Graph
100 Commits
Author SHA1 Message Date
bergquist 71df2760a1 Merge branch 'cw_high_resolution' of https://github.com/mtanda/grafana
* 'cw_high_resolution' of https://github.com/mtanda/grafana:
  fix, set default highResolution setting
  support cloudwatch high resolution query
2018-03-08 18:02:35 +01:00
bergquist 0273657a1c docs: improves docs for alert rules 2018-03-07 12:26:02 +01:00
bergquist 7ebf42842f docs: improves provisioning description
closes #11126
2018-03-06 18:59:40 +01:00
bergquist 330a290a8d changelog: adds note about closing #7107 2018-03-06 15:21:14 +01:00
bergquist bc22c11675 changelog: adds note about closing #11103 2018-03-06 14:56:57 +01:00
bergquist 76d4163fe1 changelog: note about closing #11097 2018-03-06 12:37:39 +01:00
bergquist 5934521137 fixes invalid link to profile pic when gravatar is disabled
closes #11097
2018-03-06 11:46:50 +01:00
bergquist 0780d57548 changelog: adds note about closing #11016 2018-03-06 11:31:24 +01:00
bergquist cf6e5672ab changelog: adds note about closing #11063 2018-03-06 10:56:17 +01:00
bergquist a7d62f44d3 ignore iteration property when checking for unsaved changes
closes #11063
2018-03-05 22:03:26 +01:00
bergquist 01fb3ea034 docs: adds accesskey and secret to securejsonfields
closes #11005
2018-02-23 09:32:22 +01:00
bergquist 4dc6074e79 provisioning: dont ignore sample yaml files
closes #10963
2018-02-20 08:40:37 +01:00
bergquist 529fc022d5 db: reduce name column size in dashboard_provisoning
ref #10931
2018-02-16 11:49:17 +01:00
bergquist b099f0309f cli: download latest dependency by default 2018-02-16 09:54:37 +01:00
bergquist 5bbe047eaa Revert "removes dependencies install for plugins"
This reverts commit 47e363ea15.
2018-02-16 09:49:29 +01:00
bergquist 651103bdda chore: adds comment for exported function 2018-02-15 15:06:03 +01:00
bergquist 0ab0343995 mark redirect_to cookie as http only
closes #10829
2018-02-15 10:56:29 +01:00
bergquist 8954559cbd dashboard: whitelist allowed chars for uid 2018-02-15 09:56:13 +01:00
bergquist ad42883fc7 provisioning: adds setting to disable dashboard deletes 2018-02-14 17:30:08 +01:00
bergquist 842f4c1d32 tech: dont print error message on 500 page
closes #10828
2018-02-14 16:39:20 +01:00
bergquist 47e363ea15 removes dependencies install for plugins
this features was never intended for production.
2018-02-14 15:40:42 +01:00
bergquist 56907eef69 tests: makes sure we all migrations are working 2018-02-14 15:30:29 +01:00
bergquist 1a041a2250 bug: return correct err message
if the sql query failed has is false and the method will return
m.ErrDataSourceNotFound which is incorrect. We now return the
correct error message from the query

ref #10843
2018-02-14 13:32:52 +01:00
bergquist dba087463a provisioing: always skip sample.yaml files 2018-02-14 11:33:58 +01:00
bergquist 165304a342 provisioning: handle nil configs 2018-02-14 11:22:24 +01:00
bergquist fc371af47f adds tests that validate that updated is correct 2018-02-14 10:31:36 +01:00
bergquist 84de76ff0a provisioning: code formating 2018-02-14 10:30:08 +01:00
bergquist 44baaeed8f provisioning: adds logs about deprecated config format 2018-02-14 10:30:08 +01:00
bergquist b010e4df93 provisioning: support camelcase for dashboards configs 2018-02-14 10:30:08 +01:00
bergquist 4a35244cb9 provisioning: support camcelCase provisioning files 2018-02-14 10:30:08 +01:00
bergquist f01890c3ff provisioning: better variable naming 2018-02-12 08:22:34 +01:00
bergquist 84fea7c148 provisioning: dont return error unless you want to cancel all operations 2018-02-09 15:43:58 +01:00
bergquist 5a76624003 provisioning: createWalkFn doesnt have to be attached to the filereader anymore 2018-02-09 15:33:54 +01:00
bergquist e93fe9db25 provisioning: update sample config to use path 2018-02-09 15:25:31 +01:00
bergquist 59cd2d5102 provisioning: avoid caching and use updated field from db 2018-02-09 15:23:38 +01:00
bergquist 31f3fdcba3 provisioning: delete dashboards before insert/update 2018-02-09 12:17:58 +01:00
bergquist 4eec4bfb05 docs: adds uid to dashboard.json reference docs 2018-02-08 09:55:12 +01:00
bergquist 76dc7932a4 docs: describe uid for dashboard provisioning 2018-02-07 11:04:48 +01:00
bergquist 130a2b6499 handle new error message 2018-02-02 11:06:32 +01:00
bergquist 0c98c4db30 removes uid when using 'save as'
closes #10720
2018-02-02 10:59:31 +01:00
bergquist 734a2e59aa add gofmt as precommit hook 2018-02-01 15:23:52 +01:00
bergquist 90207bcb7d register handler for get dashboards by slug 2018-02-01 14:17:14 +01:00
bergquist fcd86fb24f make it easier for dashboards to generate ur; 2018-02-01 14:08:51 +01:00
bergquist 74ca6f6dbf changes dashboard url in alertlist 2018-02-01 14:08:51 +01:00
bergquist 992fd37010 alert: use new url format 2018-02-01 14:08:51 +01:00
bergquist 58cfb23625 retry uid generation 2018-01-31 17:29:17 +01:00
bergquist 9aa488c084 Merge remote-tracking branch 'origin/7883_frontend_step' into 7883_backend
* origin/7883_frontend_step:
  dashboards: make scripted dashboards work using the old legacy urls
  dashboards: redirect from old url used to load dashboard to new url
  dashboards: add new default frontend route for rendering a dashboard panel
  dashboards: fix links to recently viewed and starred dashboards
  dashboards: use new *url* prop from dashboard search for linking to dashboards
  dashboards: when saving dashboard redirect if url changes
  dashboards: add new default frontend route for loading a dashboard
  dashboards: return url in response to save dashboard. #7883
2018-01-31 15:57:03 +01:00
bergquist 16a1642831 gofmt... 2018-01-31 15:15:15 +01:00
bergquist 3da2ab61e0 Verifies requirement of id in dashboards. 2018-01-31 14:36:14 +01:00
bergquist 7e96052594 ensure dashboard title is unique in folder 2018-01-31 14:18:54 +01:00
bergquist bb3183f6cd removes uniqnes check on slug when saving dashboards 2018-01-31 10:29:52 +01:00
bergquist 6d2a555866 Drops unique index orgid_slug from dashboards. 2018-01-31 10:26:06 +01:00
bergquist 56d5ece340 plugins: return empty tables array insteaf of nil 2018-01-31 09:59:23 +01:00
bergquist 8fed56e334 test: fixes failing test in go1.10 2018-01-31 08:49:04 +01:00
bergquist 8c8328eac5 test: fixes failing test in go1.10 2018-01-30 16:00:32 +01:00
bergquist 40832e6d71 docs: adds more info about whats new in v5 2018-01-30 15:25:18 +01:00
bergquist 2782ad0955 plugins: only set error if errorstring is not empty 2018-01-29 09:53:18 +01:00
bergquist c34d458b94 Merge branch 'go1.9.3'
* go1.9.3:
  tech: upgrade to golang 1.9.3
2018-01-26 16:00:31 +01:00
bergquist 33beacff0a tech: upgrade to golang 1.9.3 2018-01-26 14:34:47 +01:00
bergquist 0c6a90db08 changelog: move all 4.7 changes into 5.0 2018-01-26 11:16:09 +01:00
bergquist a17dbf9af8 changelog: be more explicit about backwards compatibility 2018-01-26 10:51:31 +01:00
bergquist d62d5c7418 provisioning: delete dashboards from db when file is missing 2018-01-25 15:25:07 +01:00
bergquist 49673c509d fixes broken phantomjs rendering
when migrating from govendor to dep we broke the phantomjs rendering.

ref #10602
2018-01-25 13:27:24 +01:00
bergquist c3a768b3ed provsioning: dont stop grafana due to missing 2018-01-25 09:30:37 +01:00
bergquist 31a5134a0f docs: improve docs for image uploaders 2018-01-24 22:26:00 +01:00
bergquist 1508755422 cfg: remove local as default image uploader
ref #9967
2018-01-24 21:31:07 +01:00
bergquist 57e7048b8f provisioning: enables title changes for dashboards 2018-01-24 19:16:57 +01:00
bergquist 6618bff806 mysql: pin the mysql dependency 2018-01-24 11:07:57 +01:00
bergquist d7f6f11eb1 tech: ignore /public and /node_modules 2018-01-24 11:01:27 +01:00
bergquist d36e424fe0 tech: ignore /data folder for dep 2018-01-24 10:50:01 +01:00
bergquist 6a6eab5ea1 plugins: map error property on query result 2018-01-24 10:37:04 +01:00
bergquist ee973a977b stats: send amount of stars as stats 2018-01-23 22:51:05 +01:00
bergquist ea988a37dd tech: avoid using deprecated functions 2018-01-23 22:30:45 +01:00
bergquist 5a1cf2c793 style: minor code style changes 2018-01-23 22:28:47 +01:00
bergquist 77a4ccb822 dashboards: save provisioning meta data 2018-01-23 21:54:30 +01:00
bergquist 67a9e6a71d provisioing: add lookup table provisioned dashboards 2018-01-23 21:52:55 +01:00
bergquist 5546828b9f cfg: adds info about local img uploader to docs 2018-01-22 11:11:30 +01:00
bergquist 704a198ffa docs: adds info about local img uploader 2018-01-22 11:09:16 +01:00
bergquist b98dd680e9 changelog: adds note about closing #6922 2018-01-22 11:04:56 +01:00
bergquist 6780e00c7d changelog: note about closing #9664 2018-01-22 10:47:23 +01:00
bergquist 9678be15d9 changelog: adds note about closing #9770 2018-01-22 08:16:31 +01:00
bergquist 083abff297 Merge branch 'master' into provisioning
* master:
  install dep instead of govendor on setup
  remove unused code from vendor
  migrate from govendor to dep
  fix: cloudwatch corrected error handling so original error is not thrown away
  Generic Oauth Support for ADFS (#9242)
  Adjusted the border color on the buttons in dashboard nav, fixed alert email text area width, fixed padding-top issue on dashboard settings aside
  mysql: convert numbers to text for annotation tooltip
  mysql: update to use ColumnTypes interface in new version
  mysql: update mysql driver to latest master
  gofmt my dear friend
  ux: updated react-layout-grid
2018-01-19 10:36:02 +01:00
bergquist 278337e45a install dep instead of govendor on setup 2018-01-19 10:27:02 +01:00
bergquist 7ed643f302 remove unused code from vendor 2018-01-19 09:54:22 +01:00
bergquist e023f79c5a migrate from govendor to dep 2018-01-19 09:48:15 +01:00
bergquist 7858965117 codestyle: extract code into methods 2018-01-18 12:04:12 +01:00
bergquist a32644198c gofmt my dear friend 2018-01-18 11:49:45 +01:00
bergquist b6e6935821 plugins: send secureJsonData unencrypted 2018-01-18 11:22:44 +01: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
bergquist 5eb36e65f2 use context over golang.org/x/net/context 2018-01-16 12:32:58 +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
bergquist 594447f5f5 changelog: adds note about closing #9645 2018-01-12 13:20:01 +01:00
bergquist 9e942f1a6d Adds Tables types to protobuf 2018-01-11 15:34:07 +01:00
bergquist ce4beb730d Review tsdb protobuf contract 2018-01-11 15:01:49 +01:00
bergquist 1fd40a48d9 supports windows compatible plugin binaries 2018-01-10 15:07:04 +01:00