 Torkel Ödegaard
|
b2add1977a
|
ux: progress on new page header
|
2017-11-30 16:35:27 +01:00 |
|
 Andrei Kalasok
|
68d4211c50
|
grafana-10039: fix query time range ends in the past
|
2017-11-30 15:50:35 +01:00 |
|
|
Torkel Ödegaard
|
74ceb76ec0
|
ux: work on page header
|
2017-11-30 15:37:03 +01:00 |
|
|
Torkel Ödegaard
|
645f49eda4
|
ux: updating header design for pages
|
2017-11-30 11:31:38 +01:00 |
|
 Marcus Efraimsson
|
1e10fcad83
|
test: fix failing postgres test
Should use case insensitive matching when searching for users
|
2017-11-29 15:17:31 +01:00 |
|
 Daniel Lee
|
554c7ba96f
|
notifier: Fixes path for uploaded image for Slack notifier
Fixes #10012
|
2017-11-29 11:16:45 +01:00 |
|
 jomenxiao
|
3f95180c98
|
fix render http[get] params error
|
2017-11-28 22:20:22 +08:00 |
|
 bergquist
|
c0e087640b
|
test: close file before deleting
|
2017-11-28 15:05:53 +01:00 |
|
|
Marcus Efraimsson
|
a335150ad1
|
dashfolders: Add a helper for creating a dashboard folder
|
2017-11-28 12:51:40 +01:00 |
|
|
Marcus Efraimsson
|
82cd24491e
|
dashfolders: revert automatic creation of folders for plugins
|
2017-11-28 12:51:40 +01:00 |
|
|
Marcus Efraimsson
|
368a4d7aed
|
dashfolders: don't create app folder on dashboard import if already exists
|
2017-11-27 18:23:57 +01:00 |
|
|
Daniel Lee
|
4356e980f0
|
dashfolders: create app folder on dashboard import
|
2017-11-27 17:08:39 +01:00 |
|
|
Torkel Ödegaard
|
bc81298d4c
|
worked on search
|
2017-11-24 16:18:56 +01:00 |
|
|
Torkel Ödegaard
|
93d21bec75
|
Merge branch 'master' into develop
|
2017-11-24 09:25:14 +01:00 |
|
|
Torkel Ödegaard
|
b7a8db4937
|
Merge branch 'develop' of github.com:grafana/grafana into develop
|
2017-11-22 14:51:53 +01:00 |
|
 THIERRY SALLE
|
658109e0d6
|
Optimized number of lines fetching in log file initialisation
Added unit tests for file logging line counting
Remove file after unit test
|
2017-11-22 14:25:39 +01:00 |
|
 Carl Bergquist
|
79e788e46f
|
Merge pull request #9937 from saady/gcs-path
[GCS] Support for gcs path
|
2017-11-21 19:46:53 +01:00 |
|
 saady
|
767b460ff1
|
[GCS] Support for gcs path
|
2017-11-21 17:22:40 +00:00 |
|
|
Daniel Lee
|
3dc2e06a33
|
dashboard: fix test for folderIds
|
2017-11-21 16:41:08 +01:00 |
|
|
Torkel Ödegaard
|
9fc22e5a66
|
Merge branch 'master' of github.com:grafana/grafana into develop
|
2017-11-21 16:05:18 +01:00 |
|
|
bergquist
|
3a772c7f7f
|
allows head requests for /api/health endpoint
closes #9955
|
2017-11-21 15:03:04 +01:00 |
|
|
Daniel Lee
|
5dd9582520
|
mysql: add data source support for Azure MySql
Fixes #9649
|
2017-11-21 13:21:19 +01:00 |
|
|
Torkel Ödegaard
|
ccbdb29f07
|
fixed unit tests
|
2017-11-21 11:53:56 +01:00 |
|
|
Torkel Ödegaard
|
0d12b37dfd
|
fix: alert list panel now works correctly after adding manual annotation on dashboard, fixes #9951
|
2017-11-21 11:28:17 +01:00 |
|
|
Torkel Ödegaard
|
fc1d8416a7
|
working on dashboard search
|
2017-11-20 12:47:03 +01:00 |
|
 Tom Wilkie
|
0015183a7b
|
Don't import JSON dashboards from hidden directories.
|
2017-11-17 17:21:49 +00:00 |
|
|
Torkel Ödegaard
|
7b17d134fc
|
Merge branch 'develop' of github.com:grafana/grafana into develop
|
2017-11-17 15:49:47 +01:00 |
|
|
Torkel Ödegaard
|
0e44fe082b
|
Merge branch 'master' into develop
|
2017-11-17 15:49:17 +01:00 |
|
|
Daniel Lee
|
7c74111187
|
search: add expanded folders
|
2017-11-17 15:30:21 +01:00 |
|
|
Torkel Ödegaard
|
98b4074c16
|
refactoring: minor refactor of clean up dashboard history PR #9882
|
2017-11-17 14:41:44 +01:00 |
|
|
Torkel Ödegaard
|
aaa465a100
|
Merge branch 'feat-9671' of https://github.com/alexanderzobnin/grafana into alexanderzobnin-feat-9671
|
2017-11-17 14:16:49 +01:00 |
|
|
Torkel Ödegaard
|
303e3de488
|
fix: fix for avatar images when gzip is turned on, fixes #5952
|
2017-11-17 13:13:58 +01:00 |
|
 Alexander Zobnin
|
a55be07ea5
|
dashboard history clean up: avoid potential SQL injections
|
2017-11-17 10:51:50 +03:00 |
|
|
Daniel Lee
|
f47673ab5c
|
search: refactor search sql into a builder class
|
2017-11-17 00:16:33 +01:00 |
|
|
bergquist
|
0f69e06fcf
|
removes invalid comment
|
2017-11-16 16:55:02 +01:00 |
|
|
Marcus Efraimsson
|
909601d6ab
|
api: fix so that datasources functions returns Response
|
2017-11-16 16:29:05 +01:00 |
|
|
Marcus Efraimsson
|
89b27b35ba
|
fix: Use Response as return type
|
2017-11-16 16:19:01 +01:00 |
|
|
Marcus Efraimsson
|
540d540ea9
|
fix: return id from api when creating new annotation/graphite annotation, fixes #9798
When creating a region annotation the response will include both
id (region start id) and endId (region end id), if not only id.
|
2017-11-16 16:19:01 +01:00 |
|
|
Carl Bergquist
|
9ea5af578e
|
Merge pull request #9504 from grafana/datasource_as_cfg
Datasources as configuration
|
2017-11-16 16:13:02 +01:00 |
|
|
bergquist
|
87983021e2
|
datasources as cfg: convert yaml map into json for jsonData
|
2017-11-16 13:23:42 +01:00 |
|
 Sven Klemm
|
26ab25b7c0
|
dont loose subsecond precision when dealing with timestamp or (#9851)
timestamptz
|
2017-11-15 14:50:32 +01:00 |
|
|
bergquist
|
6267ef1391
|
datasource as cfg: fixes typos
|
2017-11-15 14:30:32 +01:00 |
|
|
bergquist
|
ebbfc529e0
|
datasource as cfg: support globbing
|
2017-11-15 14:30:32 +01:00 |
|
|
bergquist
|
0f136a940c
|
datasource as cfg: enable editable ds's
|
2017-11-15 14:30:32 +01:00 |
|
|
bergquist
|
36676e23c1
|
datasource as cfg: adds readonly datasources
|
2017-11-15 14:30:32 +01:00 |
|
|
bergquist
|
c6a6ae261f
|
datasource as cfg: refactor to use bus
|
2017-11-15 14:30:32 +01:00 |
|
|
bergquist
|
dc002abe4c
|
datasource as cfg: test for reading all properties
|
2017-11-15 14:30:32 +01:00 |
|
|
bergquist
|
665df676a5
|
datasource as cfg: rename feature to provisioning
|
2017-11-15 14:30:32 +01:00 |
|
|
bergquist
|
c9bfa781fd
|
datasource as cfg: improve name for this feature
|
2017-11-15 14:30:32 +01:00 |
|
|
bergquist
|
ba4bbd1d47
|
datasource as cfg: refactor tests to use yaml files
|
2017-11-15 14:30:32 +01:00 |
|