b7a8db4937
Merge branch 'develop' of github.com:grafana/grafana into develop
2017-11-22 14:51:53 +01:00
3dc2e06a33
dashboard: fix test for folderIds
2017-11-21 16:41:08 +01:00
9fc22e5a66
Merge branch 'master' of github.com:grafana/grafana into develop
2017-11-21 16:05:18 +01:00
ccbdb29f07
fixed unit tests
2017-11-21 11:53:56 +01:00
0d12b37dfd
fix: alert list panel now works correctly after adding manual annotation on dashboard, fixes #9951
2017-11-21 11:28:17 +01:00
fc1d8416a7
working on dashboard search
2017-11-20 12:47:03 +01:00
0015183a7b
Don't import JSON dashboards from hidden directories.
2017-11-17 17:21:49 +00:00
7b17d134fc
Merge branch 'develop' of github.com:grafana/grafana into develop
2017-11-17 15:49:47 +01:00
0e44fe082b
Merge branch 'master' into develop
2017-11-17 15:49:17 +01:00
7c74111187
search: add expanded folders
2017-11-17 15:30:21 +01:00
98b4074c16
refactoring: minor refactor of clean up dashboard history PR #9882
2017-11-17 14:41:44 +01:00
aaa465a100
Merge branch 'feat-9671' of https://github.com/alexanderzobnin/grafana into alexanderzobnin-feat-9671
2017-11-17 14:16:49 +01:00
a55be07ea5
dashboard history clean up: avoid potential SQL injections
2017-11-17 10:51:50 +03:00
f47673ab5c
search: refactor search sql into a builder class
2017-11-17 00:16:33 +01:00
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
87983021e2
datasources as cfg: convert yaml map into json for jsonData
2017-11-16 13:23:42 +01:00
ebbfc529e0
datasource as cfg: support globbing
2017-11-15 14:30:32 +01:00
0f136a940c
datasource as cfg: enable editable ds's
2017-11-15 14:30:32 +01:00
36676e23c1
datasource as cfg: adds readonly datasources
2017-11-15 14:30:32 +01:00
c6a6ae261f
datasource as cfg: refactor to use bus
2017-11-15 14:30:32 +01:00
dc002abe4c
datasource as cfg: test for reading all properties
2017-11-15 14:30:32 +01:00
665df676a5
datasource as cfg: rename feature to provisioning
2017-11-15 14:30:32 +01:00
0f29b8ac83
datasources as cfg: tests for insert/updating datasources
2017-11-15 14:30:32 +01:00
59d89e422b
dashboard history clean up: add tests
2017-11-15 13:38:44 +03:00
a0a1f4aacd
dashboard history: refactor after review
2017-11-15 13:36:36 +03:00
1a3170373a
Merge branch 'alertList-notOK'
2017-11-15 10:48:20 +01:00
ba8c02f594
refactor: changed string slicing to strings.TrimPrefix, #9862
2017-11-15 10:48:03 +01:00
08e2bbef83
dashboard history: clean up dashboard version history
2017-11-14 18:22:18 +03:00
3bb704144d
teams: removes print statement
2017-11-14 11:05:01 +01:00
fd2451823b
Add Microsoft Teams notifier
2017-11-14 11:05:01 +01:00
9ad186bcc9
not ok option to alert list, fixes : #9754
2017-11-13 10:30:11 +01:00
a51b1e8951
Update the config key to database_log_queries so it is more descriptive, as suggested in #9785 .
2017-11-06 08:01:31 -06:00
5fdfa3ff7e
MySQL Performance when using GF_DATABASE_URL
...
Set MaxIdleConn and MaxOpenConn when using the GF_DATABASE_URL configuration. Also added GF_DATABASE_DEBUG flag to print SQL statements and SQL execution times.
See #9784 for the details.
2017-11-03 14:05:32 -05:00
9605ab4475
Merge branch 'master' into develop
2017-10-26 15:59:50 +02:00
c91a1e994b
Merge pull request #9594 from bergquist/datasources_optimistic_concurrency
...
datasources: change to optimistic concurrency
2017-10-25 12:44:36 +02:00
d68bfaa8be
datasource as cfg: typo
2017-10-25 12:21:06 +02:00
da6430ac01
datasource as cfg: explain why cmd.version can be higher
2017-10-25 09:39:27 +02:00
dea631bedc
tech: remove rabbitmq event publisher
...
closes #9645
2017-10-24 14:10:23 +02:00
2f35759346
asscoiate comment with name
2017-10-24 13:40:38 +02:00
89923bf77a
datasources: change to optimisic concurrency
...
prerequisite for #9504
2017-10-23 07:55:16 +02:00
fff0fa2aee
Merge branch 'master' into develop
2017-10-22 11:51:14 +02:00
204fe007b7
When Messasge field is set for an alert, map it to the output field in a Sensu check result. If Message is empty, send "Grafana Metric Condition Met"
2017-10-17 16:22:56 -05:00
d8230f8fa7
Merge branch 'master' into develop
2017-10-17 11:17:28 +02:00
45a572ebd8
annotations: quote reserved fields ( #9550 )
2017-10-17 11:03:19 +02:00
ec14fa58b5
alerting: add count_non_null reducer
...
makes it possible to have a second condition requering
at least X points of data.
2017-10-13 09:47:10 +02:00
88ceb19d96
Merge branch 'master' into develop
2017-10-12 16:32:44 +02:00
b63725033e
Merge pull request #9450 from utkarshcmu/kafka_alert
...
Kafka alerting
2017-10-12 12:11:13 +02:00
81a4df1372
fix: alert api limit param did not work and caused SQL syntax error, fixes #9492
2017-10-12 10:22:53 +02:00
9358d0c6f7
Merge branch 'develop' of github.com:grafana/grafana into develop
2017-10-11 16:48:30 +02:00
ad1d69861e
Merge branch 'master' of github.com:grafana/grafana into develop
2017-10-11 16:47:16 +02:00
Torkel Ödegaard
Daniel Lee
Tom Wilkie
Alexander Zobnin
Marcus Efraimsson
bergquist
Anton Huck
Patrick O'Carroll
Furtchet
Carl Bergquist
Chris Chandler
krise3k