Daniel Lee
1e5778174c
login: regenerates session id on login
2017-08-07 10:00:29 +02:00
David Wittman
8f5fbb4254
Fix typo in PagerDuty notifier options template ( #8978 )
2017-08-03 08:57:59 +02:00
Torkel Ödegaard
c7ca4830a8
Merge branch 'v4.4.x'
2017-08-03 08:56:46 +02:00
Torkel Ödegaard
1372d2e517
fix: update user permissions validation was not working properly, fixes #8977
2017-08-03 08:56:34 +02:00
Torkel Ödegaard
8d7186d40d
Merge branch 'v4.4.x'
2017-08-02 17:33:19 +02:00
Torkel Ödegaard
3dc9d76b38
fix: viewer role fix, fixes #8976
2017-08-02 17:33:06 +02:00
Torkel Ödegaard
c7c5730c40
Merge branch 'v4.4.x'
2017-07-31 16:04:31 +02:00
Torkel Ödegaard
34cda65998
fix: png rendering api & timeout parameter now works as it should AND default render timeout increased from 30 to 60 seconds, fixes #8710
2017-07-31 16:04:04 +02:00
Torkel Ödegaard
61d8eb1fac
Merge branch 'v4.4.x'
2017-07-31 15:07:22 +02:00
Torkel Ödegaard
73563d087c
feat: more work on #8768
2017-07-31 14:39:33 +02:00
Torkel Ödegaard
23558c61d4
feat: wip work on #8768
2017-07-31 13:03:42 +02:00
Dave Hall
0c70d271dc
Support large github organisations ( #8846 )
...
* Add new HttpGetResponse struct type
* Modify HttpGet() return to use HttpGetResponse
* Look up _all_ the teams the user is a member of
2017-07-31 12:13:29 +02:00
Torkel Ödegaard
24a79a6bea
Merge branch 'v4.4.x'
2017-07-24 12:30:28 +02:00
Torkel Ödegaard
723f5bc9e8
fix: dsahboard_version data column type changed to MEDIUMTEXT, fixes #8813
2017-07-24 12:30:13 +02:00
Mitsuhiro Tanda
b16b649c9b
(cloudwatch) add new elb metrics ( #8894 )
2017-07-20 14:12:56 +02:00
Mitsuhiro Tanda
9d50ab8fb5
(cloudwatch) check auth type before assume role ( #8895 )
2017-07-20 14:11:51 +02:00
gomlgs
228c210379
Cloudwatch: Fix bug with obtaining IAM roles within ECS containers. ( #8766 )
...
Fixes #8750 .
2017-07-12 06:55:59 +02:00
Liang Jiameng
f8d22385ce
add a placeholder to DingTalk Url ( #8820 )
2017-07-10 16:51:03 +02:00
0x6875790d0a
a622c55b1b
(feat) Add image to LINE notify ( #8771 )
2017-07-07 11:20:27 +02:00
Daniel Lee
e6f9546a7c
api: add no cache headers for IE11
...
Adds pragma and expires headers for API calls so that IE11 does not
cache GET calls. Ref #5356
2017-07-06 18:56:22 +02:00
Daniel Lee
6d4c29ea9b
migrations: dashboard version migration handles nulls
...
If a dashboard has a null value for updated_by then the migration
for the dashboard version table fails. This change uses coalesce to
set -1 instead of null when inserting into the created_by column
which has a non-null constraint. Fixes #8783 .
2017-07-05 22:14:03 +02:00
Daniel Lee
16cda723d3
migrations: dashboard version migration handles nulls
...
If a dashboard has a null value for updated_by then the migration
for the dashboard version table fails. This change uses coalesce to
set -1 instead of null when inserting into the created_by column
which has a non-null constraint. Fixes #8783 .
2017-07-05 22:06:00 +02:00
Daniel Lee
74093c700f
api: adds no-cache header for GET requests
...
Fixes #5356 . Internet Explorer aggressively caches GET requests which
means that all API calls fetching data are cached. This fix adds a
Cache-Control header with the value no-cache to all GET requests to
the API.
2017-07-04 21:26:05 +02:00
Liang Jiameng
109fd998ed
Add a new notifier : DingTalk ( #8473 )
...
* add alerting notifier: DingDing
* add alerting notifier: DingDing
* add dingding unit test
* add dingding unit test
* delete debug code & format code style.
* fix build failed: dingding_test.go
2017-07-04 15:16:32 +02:00
Torkel Ödegaard
e269b3b2a0
Merge branch 'refactor-basic-diff' of https://github.com/walmartlabs/grafana into walmartlabs-refactor-basic-diff
2017-07-03 09:49:53 +02:00
Daniel Lee
b8aa203707
signup: fix email sent logic for tempuser
...
Fixes #8656 and properly sets the email_sent and email_sent_on fields
for a tempuser (signup user).
2017-06-30 20:21:08 +02:00
Ben Tranter
1fd7b60efe
Add more information to basic diff logic
2017-06-29 14:38:48 -04:00
Daniel Lee
8973b48f96
setting: add tests for windows
2017-06-28 09:35:33 +02:00
Denis Doria
5aac2d2078
Include user Id on the lookup api ( #8698 )
...
Implements feature request #8682
2017-06-25 14:23:03 +02:00
Torkel Ödegaard
60da730c95
mysql: fix for TIME columns, fixes #8534
2017-06-23 12:55:40 -04:00
Torkel Ödegaard
be29357d22
fix: added missing url route for annotation state history delete, fixes #8660
2017-06-23 11:48:58 -04:00
Ben Tranter
a3d22ae9c7
Document logic behind basic diff
2017-06-22 18:23:31 -04:00
Ben Tranter
b54b43a42e
Add tests for diff formatters
2017-06-22 18:08:37 -04:00
Daniel Lee
2479e51a6b
mysql: Null value should not be considered as previous value
...
fixes #8655
2017-06-20 02:02:05 +02:00
Denis Doria
41d300f69d
Fix timeInterval for mysql datasource ( #8651 )
...
* Fix timeInterval for mysql datasource
This changes the > to >= and the < to <=, so the intervals are inclusive.
This should fix the #8635
* Fix validation
2017-06-19 08:58:22 -04:00
Daniel Lee
0eb297822c
httpserver: fixes #8641
...
Changes to the http_server class meant that the TLS settings were not
getting applied anymore. This fixes so that the minimum TLS version is
1.2 again.
2017-06-17 23:10:12 +02:00
Mitsuhiro Tanda
922073a357
(cloudwatch) add new metrics ( #8569 )
2017-06-08 07:01:33 +02:00
Torkel Ödegaard
08b37186a5
fix: fixed failing sql unit test
2017-06-07 15:42:48 +02:00
Torkel Ödegaard
e7e675e471
Merge branch 'walmartlabs-master' (Dashboard History Feature, #8472 )
2017-06-07 14:30:03 +02:00
Torkel Ödegaard
391dc1e225
dasboard_history: fixed sql integration test
2017-06-07 14:25:46 +02:00
Torkel Ödegaard
46412c8475
dasboard_history: security fix, added orgId filter to dashboard version lookup
2017-06-07 14:21:40 +02:00
Torkel Ödegaard
577dfee086
dasboard_history: fixed json diff so only dashbord is compared and not the whole dashboard revision object (message and restoreFrom etc was showing up in json diff)
2017-06-07 13:36:03 +02:00
Torkel Ödegaard
8f6c9c5946
dasboard_history: some polish around styles & diff colors, and minor fixes
2017-06-07 12:39:06 +02:00
Torkel Ödegaard
ef1dfed0d8
dasboard_history: big refactoring of how the compare api looked, now a POST with a model for new & base version, refactored a simplified UI code as well, this was done to lay foundation to make it possible to do diff against current in browser unsaved version
2017-06-07 11:50:09 +02:00
Torkel Ödegaard
948e5ae74d
dashboard_history: further css & markup fixes, removing style overrides & resuing existing styles and markup components
2017-06-06 23:04:14 +02:00
Torkel Ödegaard
7b5f7ed553
dashboard_history: SQL did not work when using MySQL, fixes to dashboard version numbering, so inserts start at 1, added migration to fix old dashboards with version 0
2017-06-06 15:40:10 +02:00
Torkel Ödegaard
5409f4c0eb
dashboard_history: fixed issue with save as & overwrite
2017-06-06 14:39:57 +02:00
Torkel Ödegaard
689e366f59
refactoring: updated api url routes so they do not conflict with slug route
2017-06-06 09:51:14 +02:00
Torkel Ödegaard
e2061312f5
refactoring: moved compare dashboard version command out of sqlstore, the code in this command did not use any sql operations and was more high level, could be moved out and use existing queries to get the versions
2017-06-06 00:15:40 +02:00
Torkel Ödegaard
746d6cdc88
refactoring: changed name on compare command to make properties more explainatory
2017-06-05 23:29:25 +02:00
