Marcus Efraimsson
c367cb294e
docs: minor folder http api changes
2018-02-22 16:07:55 +01:00
Marcus Efraimsson
6751bbc17f
Merge branch 'master' into docs_v5.0
2018-02-22 15:55:44 +01:00
Marcus Efraimsson
3aca9090e5
Merge pull request #10984 from grafana/10630_docs
...
Update http api docs for folder, dashboard and permissions
2018-02-22 15:53:57 +01:00
Marcus Efraimsson
a34acdda1a
Merge pull request #10739 from grafana/10630_folder_api
...
New folder and permissions API
2018-02-22 15:51:54 +01:00
Torkel Ödegaard
2451282563
Update ROADMAP.md
2018-02-22 15:24:38 +01:00
Torkel Ödegaard
5b8a49ee44
Update ROADMAP.md
2018-02-22 15:14:37 +01:00
Marcus Efraimsson
3f588b4c48
dashboards: created/updated and createdby/updatedby should be set before save
...
If creating a new folder/dashboard created/updated and createdby/updatedby should always be set.
If updating an existing folder/dashboard updated and updatedby should always be set.
2018-02-22 11:54:28 +01:00
Marcus Efraimsson
bb7a6718f1
Fix save as dashboard from folder to General folder ( #10988 )
...
* dashboards: fix save as dashboard from folder to general folder
* dashboards: disable save button in save dashboard as dialog when creating a new folder
2018-02-22 10:52:21 +01:00
Marcus Efraimsson
20ebb614f6
dashboards: cleanup
...
Move api calls to backend_srv
2018-02-21 16:56:34 +01:00
Marcus Efraimsson
b7cf6f9781
folders: use folder api for retrieving folder
2018-02-21 16:55:35 +01:00
Marcus Efraimsson
9d288c3a86
Merge branch 'master' into 10630_folder_api
2018-02-21 16:38:36 +01:00
Marcus Efraimsson
3f3175972e
dashboards: fix batch dashboard/folder delete response
...
Use message returned from backend and use that as alert success response to user
2018-02-21 16:38:09 +01:00
Torkel Ödegaard
aa3872a0e2
fix: elasticsearch terms size now allows custom values again, fixes #10124
2018-02-21 15:41:55 +01:00
Marcus Efraimsson
0135178645
folders: fix create folder in folder picker
2018-02-21 15:05:33 +01:00
Leonard Gram
13209f5671
Merge pull request #10639 from overcookedpanda/hash-rate-units
...
added hash rate units for monitoring mining processes
2018-02-21 13:39:09 +01:00
Marcus Efraimsson
02b412b127
docs: update http api index
2018-02-21 13:11:32 +01:00
Marcus Efraimsson
7d89f19f6f
docs: dashboard and folder permissions http api
2018-02-21 13:09:54 +01:00
Marcus Efraimsson
b5e96f5ec2
docs: folder http api
2018-02-21 13:09:01 +01:00
Marcus Efraimsson
71c9741764
permissions: use updated api endpoint for dashboard permissions
2018-02-21 11:53:02 +01:00
Marcus Efraimsson
9889c92083
fix typos in api, acl to permissions
2018-02-21 11:50:32 +01:00
Marcus Efraimsson
3df8ae2306
folders: rename folder_acl in api to folder_permission
2018-02-21 11:45:19 +01:00
Marcus Efraimsson
d68099bc4a
dashboards: change api route for dashboard permissions
...
From /api/dashboards/id/:id/acl to /api/dashboards/id/:id/permissions
2018-02-21 11:42:54 +01:00
Marcus Efraimsson
8a8f3bd5bb
folders: fix typo
2018-02-21 11:28:11 +01:00
Marcus Efraimsson
3c6bc263dc
Merge branch 'master' into 10630_folder_api
2018-02-21 11:25:56 +01:00
Marcus Efraimsson
78283b9c77
folders: extend folder service tests
2018-02-21 11:25:21 +01:00
Leonard Gram
f00a7e4dd7
dev: docker-compose setup for prom2.
...
Copy of prometheus1 docker-compose config.
2018-02-21 11:25:14 +01:00
Marcus Efraimsson
a167e19b37
folders: folder api tests
2018-02-21 11:24:54 +01:00
Torkel Ödegaard
98a4731454
fix: scrollbar position now to max right pos, fixes #10982
2018-02-21 11:01:48 +01:00
Torkel Ödegaard
2f6e77af1e
Merge branch 'master' into docs_v5.0
2018-02-21 10:47:14 +01:00
Alexander Zobnin
ceb8223ddf
Fixes for heatmap panel in Grafana 5 ( #10973 )
...
* heatmap: fix chart height
* heatmap: fix font size
* heatmap: fix legend size
* heatmap: fix rendering tests
2018-02-21 09:16:56 +01:00
Marcus Efraimsson
417541c77f
folders: folder permissions api tests
2018-02-20 18:11:50 +01:00
Marcus Efraimsson
02278f90a7
dashboards: make fake dashboard guardian available to other packages
2018-02-20 18:08:19 +01:00
Torkel Ödegaard
3964d6b797
fix: added new known data source plugins, and minor migration fix for v1 dashboards
2018-02-20 16:08:43 +01:00
Marcus Efraimsson
892bdecb19
folders: folder permission api routes
2018-02-20 15:25:16 +01:00
Marcus Efraimsson
717d8d0c45
folders: fix api error mapping
2018-02-20 15:01:20 +01:00
Marcus Efraimsson
b56e2a61f9
folders: basic integration tests for folders
2018-02-20 14:00:32 +01:00
Marcus Efraimsson
ea7998ca8e
folders: use new folder service in folder api routes
2018-02-20 13:57:32 +01:00
Marcus Efraimsson
268fb4dc6c
folders: new folder service for managing folders
2018-02-20 13:56:22 +01:00
Marcus Efraimsson
39aba03483
dashboards: created date should be set when creating a folder/dashboard
2018-02-20 13:54:31 +01:00
Torkel Ödegaard
dceac3aa71
fix: fixes to signup flow, fixes #9816
2018-02-20 13:39:16 +01:00
Torkel Ödegaard
69ccbffaed
fix: fixed github oauth login with allowed orgs filter, fixes #10964 , reverts #10851
2018-02-20 11:30:18 +01:00
Torkel Ödegaard
21d48df095
fix: plugin dashboard did not get plugin id after import
2018-02-20 11:30:18 +01:00
Patrick O'Carroll
9f4b7ac26f
added scroll to org list modal ( #10960 )
...
* added scroll to org list modal, fixes #10774
* removed console.log
2018-02-20 11:08:53 +01:00
Patrick O'Carroll
1293fcadd2
added an if to check for null to sort null as 0 ( #10961 )
...
* added an if to check for null to sort null as 0
* changed 0 to -Infinity
2018-02-20 09:45:30 +01:00
Torkel Ödegaard
7d0c3ae6a7
fix: alert history list now shows on graphs with manually added annotation events, fixes #10968
2018-02-20 09:33:28 +01:00
Carl Bergquist
f0d6ea1703
Merge pull request #10967 from bergquist/sample-yaml
...
provisioning: dont ignore sample yaml files
2018-02-20 09:24:31 +01:00
bergquist
4dc6074e79
provisioning: dont ignore sample yaml files
...
closes #10963
2018-02-20 08:40:37 +01:00
Torkel Ödegaard
c5461fe2e2
docs: updated for changelog and docs with beta4
2018-02-19 15:41:59 +01:00
Carl Bergquist
af7ede6ec5
Merge pull request #10959 from grafana/10957_influx_escaping
...
influxdb: escape backslashes in tag values (for alerting)
2018-02-19 15:28:55 +01:00
Carl Bergquist
0b8c3ab56f
Merge pull request #10962 from agyorev/dashboard-missing-input-error-typo
...
Correct typo in DashboardInputMissingError
2018-02-19 15:23:10 +01:00
