Marcus Efraimsson
13d0bd5815
Merge branch 'docs-5.1' into graph_51_docs
2018-03-23 15:51:32 +01:00
Marcus Efraimsson
0a487c484d
docs: fix typos
2018-03-23 15:49:54 +01:00
Marcus Efraimsson
403c64ab20
docs: update postgres, mysql and mssql documentation
...
Due to changes closing #11306
2018-03-23 15:48:04 +01:00
Marcus Efraimsson
c318f7bb31
Merge branch 'master' into docs-5.1
2018-03-23 15:15:57 +01:00
Marcus Efraimsson
1b8103f0ea
docs: update graph panel documentation
...
Added new versions of images and new images to better highlight the possible
configuration options.
Documentation was very outdated so tried to fix that to better reflect the
current state/latest release.
2018-03-23 14:43:57 +01:00
Daniel Lee
e84f746d1d
Merge pull request #11348 from grafana/11306-sql-table-time
...
Postgres, MySQL, MSSQL minor refactoring/unification
2018-03-23 14:23:31 +01:00
Carl Bergquist
8d7fa644de
Merge pull request #11352 from digineo/golint
...
Make golint happier
2018-03-23 13:35:11 +01:00
Daniel Lee
7b141280e5
docs: tweaks
2018-03-23 13:31:02 +01:00
bergquist
e2ba6fbb00
changelog: adds note about closing #5855
2018-03-23 13:20:02 +01:00
Carl Bergquist
8db09d7556
Merge pull request #11290 from Thib17/retry
...
Alerting: Add retry mechanism
2018-03-23 13:17:24 +01:00
ryan
7defb1adf5
remove dashboardId check... i can't figure out how the tests work
2018-03-23 12:54:53 +01:00
Daniel Lee
78d314a9c1
Merge pull request #11140 from grafana/11131_right_legend_responsive
...
added media breakpoint to legend-right
2018-03-23 12:49:35 +01:00
ryan
e92ea79524
get circle to run tests again
2018-03-23 12:48:03 +01:00
ryan
2116152295
add dashboardId to test
2018-03-23 12:35:39 +01:00
ryan
a58b4ff2d6
remove api tests
2018-03-23 12:13:38 +01:00
ryan
14b737e662
update CHANGELOG
2018-03-23 12:08:32 +01:00
ryan
b39fb7fdd5
fix operator
2018-03-23 12:01:21 +01:00
ryan
a0a6fa6fa5
remove constraint from sqlstore
2018-03-23 11:47:07 +01:00
ryan
a5588b6957
Merge remote-tracking branch 'origin/annotations-created' into annotations-created
...
* origin/annotations-created:
dooh
2018-03-23 11:44:21 +01:00
ryan
4ed1ec5174
Merge remote-tracking branch 'grafana/master' into annotations-created
...
* grafana/master: (30 commits)
changelog: adds note about closing #11278
docs: spelling
docs: add intro paragraph to provisioning page
Cleanup CircleCI V2 Conversion
changelog: notes for #1271 and #2740
graph: minor fixes to y-axes alignment feature
added save icon to save buttons
removed trash can icon from save buttons
Return actual user ID in UserProfileDTO
dashboard version cleanup: more tests and refactor
minor refactor of dashboard version cleanup
refactor: dashboard version cleanup
limit number of rows deleted by dashboard version cleanup
fix dashboard version cleanup on large datasets
Allocated to a separate alignment block. Replaced the attribute of the second axis by the attribute of the axes.
Fixed unit test.
Changed the way this feature was activated. And changed tolltip.
Added validation of input parameters.
Resolved conflict
Corrected work for graphs created before this feature.
...
2018-03-23 11:38:43 +01:00
ryan
db92a96067
move dashboard error to API (not sql)
2018-03-23 11:36:44 +01:00
Daniel Lee
4f38d237cb
legend: small refactoring
2018-03-23 11:08:24 +01:00
bergquist
09df38d9f4
changelog: adds note about closing #11278
2018-03-23 11:01:32 +01:00
Carl Bergquist
f0d77804da
Merge pull request #11329 from alexanderzobnin/fix-11278
...
fix dashboard version cleanup on large datasets
2018-03-23 10:53:51 +01:00
Marcus Efraimsson
1d515bb52c
Merge branch 'master' into docs-5.1
2018-03-23 10:40:12 +01:00
Carl Bergquist
d29116d8ff
Merge pull request #11346 from infernix/fix-api-user-id
...
Return actual user ID in UserProfileDTO
2018-03-23 10:36:47 +01:00
Carl Bergquist
113888d6aa
Merge pull request #11357 from tylerauerbeck/update_circleciv2
...
Cleanup CircleCI V2 Conversion
2018-03-23 10:29:37 +01:00
Daniel Lee
1c1d962bb1
docs: spelling
2018-03-23 09:04:50 +01:00
Daniel Lee
ccfe9de014
docs: add intro paragraph to provisioning page
2018-03-23 08:55:11 +01:00
Tyler Auerbeck
6f0eb94d46
Cleanup CircleCI V2 Conversion
2018-03-23 02:14:12 -04:00
Julian Kornberger
0a415c50d0
Make golint happier
2018-03-22 22:38:44 +01:00
Ryan McKinley
164ddb16c9
dooh
2018-03-22 20:48:40 +01:00
ryan
0c7294593c
update the updated column!
2018-03-22 20:05:04 +01:00
ryan
d554c6f9be
using circle as my tester
2018-03-22 19:44:47 +01:00
ryan
fa021b547a
using circle as my tester
2018-03-22 19:39:30 +01:00
ryan
db91033b6e
adding tests, but they arent running locally
2018-03-22 19:33:33 +01:00
Marcus Efraimsson
63465fd556
changelog: notes for #1271 and #2740
...
[skip ci]
2018-03-22 19:19:56 +01:00
Marcus Efraimsson
1ee0d1c296
Merge pull request #10994 from ilgizar/1271_share_zero
2018-03-22 18:34:38 +01:00
Marcus Efraimsson
f04a5d7329
Merge branch 'master' into 1271_share_zero
2018-03-22 18:31:37 +01:00
Marcus Efraimsson
c672e44d35
graph: minor fixes to y-axes alignment feature
2018-03-22 18:30:23 +01:00
Marcus Efraimsson
4af3a7875a
Merge pull request #11349 from grafana/save_trash
...
Fix save icon in folder settings
2018-03-22 18:21:28 +01:00
Patrick O'Carroll
99626b8e07
added save icon to save buttons
2018-03-22 17:04:00 +01:00
Marcus Efraimsson
2e8aeffc13
Merge branch 'master' into 1271_share_zero
2018-03-22 16:59:36 +01:00
Patrick O'Carroll
823f903048
removed trash can icon from save buttons
2018-03-22 16:59:06 +01:00
Marcus Efraimsson
b818e9f619
Merge branch 'master' into 11306-sql-table-time
2018-03-22 16:45:33 +01:00
Marcus Efraimsson
f0f41c2a8e
mysql: skip tests by default
2018-03-22 16:44:55 +01:00
Gerben Meijer
e722732021
Return actual user ID in UserProfileDTO
...
This fixes calls to /api/user where ID is currently always 0
2018-03-22 16:30:04 +01:00
ryan
20353db966
convert epoch to milliseconds
2018-03-22 16:21:47 +01:00
ryan
a2bbd89a9e
adding updated column
2018-03-22 15:52:09 +01:00
Marcus Efraimsson
bd4ecaeac6
mssql: update query editor help
2018-03-22 15:46:40 +01:00
