Commit Graph

13617 Commits

Author SHA1 Message Date
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
Willy Hu (IS-TW)
417df1eae5 docs: updated cloudwatch docs
add dimension filter as a option for dimension_values query.
2018-02-21 10:51:28 +08: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
Aleksandar Gyorev
89a17a4ace Correct typo in DashboardInputMissingError 2018-02-19 15:44:20 +02:00
Torkel Ödegaard
1de889169c build: updated build version to v5.0-beta4 2018-02-19 14:24:01 +01:00
Marcus Efraimsson
fce1e3f7f1 Merge branch 'master' into 10630_folder_api 2018-02-19 13:32:45 +01:00
Torkel Ödegaard
ae20366b01 graph: added 0.5 point radius option 2018-02-19 11:37:42 +01:00
Marcus Efraimsson
53cd39fde5 Shouldn't be able to overwrite a dashboard if you don't have permissions (#10900)
* dashboards: new command for validating dashboard before update

Removes validation logic from saveDashboard and later on use the new command for validating
dashboard before saving a dashboard. This due to the fact that we need to validate permissions
for overwriting other dashboards by uid and title.

* dashboards: use the new command for validating dashboard before saving

Had to refactor dashboard provisioning a bit to be able to sidetrack the permission validation
in a somewhat reasonable way.
Adds some initial tests of the dashboard repository, but needs to be extended later. At least
now you can mock the dashboard guardian

* dashboards: removes validation logic in the save dashboard api layer

Use the dashboard repository solely for create/update dashboards and let it do all
the validation. One exception regarding quota validation which still is in api layer
since that logic is in a macaron middleware.
Need to move out-commented api tests later.

* dashboards: fix database tests for validate and saving dashboards

* dashboards: rename dashboard repository to dashboard service

Split the old dashboard repository interface in two new interfaces, IDashboardService and
IDashboardProvisioningService. Makes it more explicit when using it from the provisioning package
and there's no possibility of calling an incorrect method for saving a dashboard.

* database: make the InitTestDB function available to use from other packages

* dashboards: rename ValidateDashboardForUpdateCommand and some refactoring

* dashboards: integration tests of dashboard service

* dashboard: fix sqlstore test due to folder exist validation

* dashboards: move dashboard service integration tests to sqlstore package

Had to move it to the sqlstore package due to concurrency problems when running
against mysql and postgres. Using InitTestDB from two packages added conflicts
when clearing and running migrations on the test database

* dashboards: refactor how to find id to be used for save permission check

* dashboards: remove duplicated dashboard tests

* dashboards: cleanup dashboard service integration tests

* dashboards: handle save dashboard errors and return correct http status

* fix: remove log statement

* dashboards: import dashboard should use dashboard service

Had to move alerting commands to models package due to problems with import cycles of packages.

* dashboards: cleanup dashboard api tests and add some tests for post dashboard

* dashboards: rename dashboard service interfaces

* dashboards: rename dashboard guardian interface
2018-02-19 11:12:56 +01:00
Leonard Gram
63f8854a48
Merge pull request #10947 from grafana/use-epoch-for-login-attempt
login: uses epochs for login throtting.
2018-02-19 10:15:06 +01:00
Daniel Lee
f959ba9bcf influxdb: escape backslashes in tag values (for alerting)
Closes #10957. Backslash escaping was already implemented on the
frontend but does not work for queries executed on the backend.
2018-02-19 10:02:14 +01:00
Zachary Cava
710bb70746 [elasticsearch] Allow nested fields for annotation source (#10936) 2018-02-19 09:26:13 +01:00
Patrick O'Carroll
9c36ee22a8 changed m3 and dm3 to fixedUnit, fixes #10920 (#10944) 2018-02-19 09:23:02 +01:00
Mitsuhiro Tanda
f47542db28 migrate panels in collapsed rows (#10948) 2018-02-19 09:07:29 +01:00
Carl Bergquist
a1d79997be
Merge pull request #10958 from srid99/master
Fix broken markdown links in CHANGELOG.md
2018-02-18 20:17:58 +01:00
Sridhar Gnanasekaran
b238d4e7fb
Update CHANGELOG.md 2018-02-18 19:00:11 +01:00
Leonard Gram
fe357a72d9 login: migration fix. 2018-02-16 17:36:28 +01:00
Leonard Gram
0053be9882 login: uses epochs for login throtting.
Closes #10937
2018-02-16 17:25:46 +01:00
Torkel Ödegaard
2e9433c495 fix: fixed redirect after save, fixes #10946 2018-02-16 16:29:14 +01:00
Torkel Ödegaard
497132c441 fix: esc key now closes panel edit/view mode as usual, fixes #10945 2018-02-16 16:09:54 +01:00
Torkel Ödegaard
76cfa0bee3
Update CHANGELOG.md 2018-02-16 14:48:50 +01:00
Torkel Ödegaard
577a00e3cf docs: updated to beta3 2018-02-16 14:43:36 +01:00
Leonard Gram
1f3442020b alerts: refactoring tests 2018-02-16 14:37:10 +01:00
Leonard Gram
c5226a945b alerting: pausing alerts modifies updated.
When pausing an alert the updated field is
modified to the current time.

Closes #10191
2018-02-16 14:24:52 +01:00
Torkel Ödegaard
8af2c9f1f8 test: added integration test for #10941 2018-02-16 14:17:41 +01:00
Torkel Ödegaard
5323971c21
refactoring: alert rule query refactoring (#10941) 2018-02-16 13:56:04 +01:00