IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity
13,249 Commits 5,454 Branches 554 Tags 1.9 GiB
4aff142fc5
Commit Graph

13249 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marcus Efraimsson
4aff142fc5
Merge pull request #10903 from stukselbax/patch-2 
Invalid url in docs
 2018-02-14 10:42:02 +01:00
stukselbax
5b318428c4
Invalid url in docs 2018-02-14 11:34:46 +03:00
Marcus Efraimsson
2bddf50184 docs: update dashboard permissions http api docs 2018-02-12 14:50:35 +01:00
Marcus Efraimsson
2b31465254 Merge branch 'master' into docs_v5.0 2018-02-12 14:29:22 +01:00
Marcus Efraimsson
12a6de7461 dashboard: always make sure dashboard exist in dashboard acl http api (#10856) 2018-02-12 09:26:09 +01:00
Andrey Inishev
1b795c0ced Fix #10823 (#10851) 
* Fix of #10823

* Typo fix

* Revert Gopkg.lock
 2018-02-12 09:24:01 +01:00
Torkel Ödegaard
6bbd87dd9c ux: minor tweak to grid resize handle color 2018-02-10 20:11:11 +01:00
Marcus Efraimsson
e1e0b5f951 teams: use orgId in all team and team member operations (#10862) 
Also fixes issue in org users tests for postgres
 2018-02-09 17:26:15 +01:00
Alexander Zobnin
111b32290a Fixes for graphite tags editor (#10861) 
* graphite: don't fetch tags on editor init

* add debounce option to query editor directives

* graphite: debounce tag queries
 2018-02-09 16:20:30 +01:00
Torkel Ödegaard
c01b80522e fix: clear items list before fetching permissions list 2018-02-09 16:13:20 +01:00
Marcus Efraimsson
e429cd8333
update README.md regarding running tests 
[skip ci]
 2018-02-09 13:34:10 +01:00
Marcus Efraimsson
fae9eb546e
update README.md regarding running tests 
[skip ci]
 2018-02-09 13:31:37 +01:00
Torkel Ödegaard
e672604835 docs: minor docs update 2018-02-09 12:53:07 +01:00
Torkel Ödegaard
41a6e7c2c8 docs: updated docs landing page 2018-02-09 12:39:17 +01:00
Marcus Efraimsson
a86f2fa34b user picker should only include users from current org (#10845) 2018-02-09 10:42:37 +01:00
Carl Bergquist
864e2647db
Merge pull request #10844 from marefr/env_db_test 
Allow use of environment variable to decide what database engine to run tests on
 2018-02-09 09:35:48 +01:00
Marcus Efraimsson
8921b0b517 db test: allow use of env variable for database engine to run tests for 2018-02-08 19:16:45 +01:00
Marcus Efraimsson
a91bd53a34 dashboard: fix delete of folder from folder settings tab. 
Fixes #10821
 2018-02-08 14:25:23 +01:00
Marcus Efraimsson
0e8377a9f4 Update logic for create/update dashboard, validation and plugin dashboard links (#10809) 
* enables overwrite if dashboard allready exist in folder

* dashboard: Don't allow creating a folder named General

* dashboards: update logic for save/update dashboard

No id and uid creates a new dashboard/folder.
No id and uid, with an existing title in folder allows overwrite
  of dashboard.
Id without uid, allows update of existing dashboard/folder without
  overwrite.
Uid without id allows update of existing dashboard/folder without
  overwrite.
Id without uid, with an existing title in folder allows overwrite
  of dashboard/folder and updated will have the uid of overwritten.
Uid without id, with an existing title in folder allows overwrite
  of dashboard/folder and new will have the same uid as provided.
Trying to change an existing folder to a dashboard yields error.
Trying to change an existing dashboard to a folder yields error.

* dashboards: include folder id when confirmed to save with overwrite

* dashboards: fixes due to new url structure

Return importedUrl property in response to importing dashboards and
getting plugin dashboards and use this for redirects/links in the
frontend.
 2018-02-08 12:48:38 +01:00
Patrick O'Carroll
fc05fc42c9 added width class to add member choose (#10835) 2018-02-08 10:52:13 +01:00
bergquist
4eec4bfb05 docs: adds uid to dashboard.json reference docs 2018-02-08 09:55:12 +01:00
Torkel Ödegaard
39238c192d fix: folder redirect after creation 2018-02-07 15:33:08 +01:00
Daniel Lee
db1423eebc dashfolders: fixes #10820 2018-02-07 15:13:34 +01:00
Torkel Ödegaard
541b0a0ca1 fix: fixed bug with redirect after new dashboard saved, related to buggy angularjs location path/url and base href, fixes #10817 2018-02-07 14:10:23 +01:00
bergquist
76dc7932a4 docs: describe uid for dashboard provisioning 2018-02-07 11:04:48 +01:00
Torkel Ödegaard
17cbd9d6b4 fix: removed old shortcut that does not exist, fixes #10802 2018-02-07 10:43:42 +01:00
Torkel Ödegaard
76c2a6e5ee build: fixed recovery test 2018-02-06 13:16:21 +01:00
Torkel Ödegaard
f54ba20783 fix: css fix, found a better way to fix #10772 2018-02-06 13:01:23 +01:00
Torkel Ödegaard
f1f8c23206 fix: minor build fix 2018-02-06 12:43:11 +01:00
Torkel Ödegaard
0e61a670bb fix: error handling now displays page correctly, fixes #10777 2018-02-06 12:28:17 +01:00
Alexander Zobnin
6e68c2069e Merge PR #10742 2018-02-06 13:39:31 +03:00
Alexander Zobnin
fd5e838f0e heatmap tooltip: minor refactor 2018-02-06 13:38:17 +03:00
Torkel Ödegaard
cf7be5da0b fix: changed dashboard title length to match slug length, will fix mysql index size issue, fixes #10779 2018-02-06 11:03:37 +01:00
Torkel Ödegaard
bc8e59a8d8 docs: added graphite section 2018-02-06 10:32:27 +01:00
Torkel Ödegaard
3614906828 docs: minor update 2018-02-06 10:19:23 +01:00
Alexander Zobnin
81dc051ae9 graph panel: fix csv export (series as col) (#10769) 2018-02-06 10:11:17 +01:00
Daniel Lee
5ca03972a8 org-switcher: should redirect to home page (#10782) 
Fixes #10776
 2018-02-06 10:02:28 +01:00
Alexander Zobnin
45d66e4b29 embedded panel: hide side menu during init (#10788) 2018-02-06 10:01:10 +01:00
Alexander Zobnin
ece9eb54b9 Merge branch 'master' of https://github.com/thattolleyguy/grafana into thattolleyguy-master 2018-02-06 11:38:33 +03:00
Marcus Efraimsson
1e0817f863 docs: update http api for api index, dashboard, folder and dashboard search 2018-02-05 20:53:58 +01:00
Daniel Lee
8c027ea707 scroll: css for #10722 
Missed adding to previous commit. Ref #10722
 2018-02-05 19:31:16 +01:00
Daniel Lee
5d756707ab dashlist: scroll fix when no header 
The first item in the dashlist has a margin that messes up
the height calculation for the scroll bar when the Show headings
option is not selected. This fix adds a margin-top set to 0 for
the 1st item in the list in this case. This prevents a scrollbar
being shown incorrectly. Fixes #10772
 2018-02-05 19:22:15 +01:00
Torkel Ödegaard
1a8501450c docs: video fix 2018-02-05 18:46:03 +01:00
Marcus Efraimsson
690beac277 Update changelog with deprecation notes of http api 2018-02-05 18:42:47 +01:00
Alexander Zobnin
f97be541af redirect "permission denied" requests to "/" (#10773) 2018-02-05 18:17:47 +01:00
Torkel Ödegaard
24d882e7d8 docs: fix 2018-02-05 18:13:06 +01:00
Daniel Lee
4ce862c5b4 scroll: use wheelpropagation. Ref #10772 
Once the vertical scrollbar comes to its end position, it should
allow the page scroll bar to start scrolling.
 2018-02-05 18:12:04 +01:00
Marcus Efraimsson
57e172b30a Merge branch 'master' of github.com:grafana/grafana 2018-02-05 17:59:11 +01:00
Marcus Efraimsson
e1d857887f docs: update dashboard model, persistent urls and api changes in what's new in v5 2018-02-05 17:58:43 +01:00
Torkel Ödegaard
e800b19ef6 docs: fix download link 2018-02-05 17:56:48 +01:00