IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2026-07-30 00:08:10 -05:00
Code Issues Packages Projects Releases Wiki Activity
13,615 Commits 1,123 Branches 715 Tags
061a418f0fa01ae3aeb11db813fb5ce5ccfb34fd
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
bergquist 061a418f0f style: dont expose func outside package 2018-03-13 11:24:10 +01:00
bergquist c18c0f6db7 changelog: adds note about closing #11143 
[ci skip]
 2018-03-13 10:43:44 +01:00
bergquist b400f7ccff changelog: adds note about closing #11107 
[ci skip]
 2018-03-13 09:54:46 +01:00
bergquist 18638c21c9 changelog: adds note about closing #10009 
[ci skip]
 2018-03-13 09:48:22 +01:00
bergquist 1a781fcee1 changelog: adds note about closing #10029 
[ci skip]
 2018-03-12 14:26:28 +01:00
bergquist 4362a73dd2 changelog: adds note about closing #9859 2018-03-12 09:23:59 +01:00
bergquist 77cd7f34c7 github: test new issue tempalte 
My hope is that headers will make it easier to read
when people post issues.
 2018-03-09 09:33:28 +01:00
bergquist e5b9219f13 dev: update dev prometheus2 to 2.2.0 2018-03-08 23:01:03 +01:00
bergquist 64aedbf492 Merge branch 'mayli-master' 
* mayli-master:
  Use B/s instead Bps for Bytes per second
 2018-03-08 18:51:45 +01:00
bergquist 0ee6a5216b Merge branch 'master' of https://github.com/mayli/grafana into mayli-master 
* 'master' of https://github.com/mayli/grafana:
  Use B/s instead Bps for Bytes per second
 2018-03-08 18:50:02 +01:00
bergquist c80d346417 changelog: adds note about closing #10925 2018-03-08 18:12:15 +01:00
bergquist ad15c5405d Merge branch 'master' of github.com:grafana/grafana 
* 'master' of github.com:grafana/grafana: (24 commits)
  docs: update latest to 5.0.1
  push 5.0.1 to package cloud
  changelog: adds release date for 5.0.1
  bump master build to 5.1.0-pre1
  move quota to dedicated service
  rename Context to ReqContext
  changelog: note about closing #11145 and #11127
  docs: adds note about closing #10632
  removes commented code
  removes unused variables
  upgrade to go 1.10
  alerting: fixes validation error when saving alerts in dash
  add csv templating format
  docs: note about closing #11046
  docs: adds note about #10942
  Documentation: path "~/go" to "$GOPATH"
  Update ROADMAP.md
  move Context and session out of middleware
  only use jwt token if it contains an email address
  hide row actions for viewers
  ...
 2018-03-08 18:09:15 +01:00
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 e11437ff56 docs: update latest to 5.0.1 2018-03-08 11:06:21 +01:00
bergquist d539905517 push 5.0.1 to package cloud 2018-03-08 10:59:57 +01:00
bergquist d1f5f209c5 changelog: adds release date for 5.0.1 2018-03-08 10:43:40 +01:00
bergquist 7784e8a829 bump master build to 5.1.0-pre1 2018-03-08 09:51:25 +01:00
bergquist e9c64a6631 changelog: note about closing #11145 and #11127 2018-03-07 17:18:03 +01:00
bergquist d9308a0325 docs: adds note about closing #10632 2018-03-07 16:58:27 +01:00
bergquist cb223ee563 removes commented code 2018-03-07 16:40:24 +01:00
bergquist ff6108051d removes unused variables 2018-03-07 16:40:24 +01:00
bergquist 8ed12aa298 upgrade to go 1.10 2018-03-07 16:40:24 +01:00
bergquist 1dd9ee7d3d docs: note about closing #11046 2018-03-07 15:50:13 +01:00
bergquist 9d74e1c35b docs: adds note about #10942 2018-03-07 15:43:04 +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 d3b23b01d8 hide row actions for viewers 
closes #11112
 2018-03-06 12:32:50 +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