Torkel Ödegaard
0bae7212f6
annotations: removed category stuff, my mistake, we need tags
2017-04-18 17:15:22 +02:00
Alexander Zobnin
7aa992bde4
initial category types
2017-04-17 18:56:39 +03:00
Alexander Zobnin
f0816b37bd
rename annotation_category to category
2017-04-17 18:53:10 +03:00
Torkel Ödegaard
60ef7d8768
Merge branch 'master' into create-annotations
2017-04-14 22:36:34 +02:00
Dan Cech
f490c5f12c
use X-Grafana-Org-Id header to ensure backend uses correct org ( #8122 )
2017-04-14 15:47:39 +02:00
Torkel Ödegaard
dbe5480edc
create annotations work
2017-04-14 11:41:02 +02:00
Torkel Ödegaard
2fce88ee62
ux: popover forms
2017-04-14 10:18:49 +02:00
Dan Cech
3a607f96a3
fix bug in log sprintf calls ( #8124 )
2017-04-14 07:45:36 +02:00
Torkel Ödegaard
dbeeb32ab6
Merge branch 'master' into popover-forms
2017-04-13 16:22:08 +02:00
Alexander Zobnin
ab99a7c1c7
graph(create annotation): add initial annotation_category table
2017-04-13 16:57:22 +03:00
Torkel Ödegaard
593b2ef866
annotation: added region support to annoations
2017-04-12 16:26:34 +02:00
Torkel Ödegaard
0156a94a49
annotations: you can now read annoations via manually created annoation query
2017-04-12 15:46:41 +02:00
Torkel Ödegaard
8eb112d119
plugins: refactoring builtIn data source concept, now means data source plugins that you do not need to add via data sources page, that is automatically added as selectable data source, #8095
2017-04-12 08:23:44 +02:00
Torkel Ödegaard
e80494390a
Merge branch 'always_displayed_datasources' of https://github.com/ctide/grafana into ctide-always_displayed_datasources
2017-04-12 07:44:59 +02:00
Torkel Ödegaard
b3df1aa9bd
org: fixed issue with orgId query param redirect handling when grafana is under subpath and reverse proxy, fixes #8089
2017-04-12 07:11:08 +02:00
Mitsuhiro Tanda
d2bf2e86ed
upgrade to aws-sdk-go v1.8.11 ( #8091 )
...
* upgrade to aws-sdk-go v1.8.11
* fix test
2017-04-12 06:40:44 +02:00
Chris Burkhart
d12dc2bfa7
Add alwaysDisplayed option to datasource plugins, this will allow it to show up as an option to select when adding queries to a panel without actually adding it as a datasource.
2017-04-11 13:47:53 -07:00
Torkel Ödegaard
07466b6725
security: fixed returning info on weither user exists or not in password reset call, fixes #7619
2017-04-11 16:50:16 +02:00
Torkel Ödegaard
83e0f69cde
Merge branch 'master' of github.com:grafana/grafana
2017-04-11 14:43:40 +02:00
Torkel Ödegaard
9bdcc4ec5f
influxdb: holt winters edits
2017-04-11 14:40:08 +02:00
Daniel Lee
3ca3c96226
profiling: adds profiling and tracing
...
If grafana-server binary is started with the -profile flag then
tracing will create a trace.out file and pprof data can be accessed
on the 6060 port.
A custom port for pprof profiling can be set with the -profile-port
flag.
2017-04-11 10:32:18 +02:00
Alexander Zobnin
f42202e665
Merge branch 'master' into graph-annotations
2017-04-11 10:27:37 +03:00
Alexander Zobnin
d553498a33
graph(add annotation): initial backend implementation #1286
2017-04-10 20:22:58 +03:00
Torkel Ödegaard
0384eecf5c
fix: minor fix for bug when saving alert with empty message, fixes #7927
2017-04-10 15:26:05 +02:00
Alfred Krohmer
41171f8a5c
Add a link to a graph image in Pushover notifications ( #8075 )
2017-04-10 09:17:37 +02:00
Torkel Ödegaard
1cd632cc43
plugins: added state property to plugins
2017-04-07 12:00:03 +02:00
Torkel Ödegaard
26804d630f
Merge branch 'master' into sql-proxy
2017-04-07 10:34:51 +02:00
Torkel Ödegaard
f5f0d94ad4
fix: temp/testing fix for hanging issue, #8033
2017-04-06 13:18:50 +02:00
Alexander Zobnin
2b81bfe9bf
alerting: fix $timeFilter cannot be used twice ( #7969 ) ( #8037 )
2017-04-05 17:17:55 +02:00
Torkel Ödegaard
95e0010a5b
fix: sqlite3 and concurrent write requests caused database locked error some times, depending on how many concurrent requests and speed of disk drive. Fixed by reducign the number of concurrent db connections to 1 for sqlite3, fixes #7992
2017-04-03 09:42:11 +02:00
Torkel Ödegaard
5af81b974e
mysql: graph showing
2017-03-31 13:57:10 +02:00
Torkel Ödegaard
a7babfb7cf
tech: updated xorm libs
2017-03-31 12:54:39 +02:00
Torkel Ödegaard
e5a5bef200
mysql: minor update
2017-03-31 12:49:05 +02:00
Torkel Ödegaard
d6d2080f11
mysql: minor progress on response processing
2017-03-31 11:45:25 +02:00
Torkel Ödegaard
bd4f073425
mysql: minor update
2017-03-30 20:23:40 +02:00
Torkel Ödegaard
998f04e1e8
mysql: testdata
2017-03-30 20:01:04 +02:00
Torkel Ödegaard
34d92b0e79
mysql: starting work on test data
2017-03-30 18:03:50 +02:00
Torkel Ödegaard
080d2a2054
mysql: reading arbitrary SQL data in go is really strange, data is only in strings?
2017-03-30 13:46:46 +02:00
Torkel Ödegaard
00fcaaf171
mysql: commented out old code from old PR
2017-03-29 22:55:37 +02:00
Torkel Ödegaard
8f90c6115d
mysql: progress on mysql data source
2017-03-29 22:54:18 +02:00
Torkel Ödegaard
6965064ea9
Merge branch 'master' into sql-proxy
2017-03-29 16:40:14 +02:00
Seuf
319b8d8fca
Configurable signout menu activation ( #7968 )
2017-03-29 11:33:28 +02:00
Dan Cech
24d4e50343
utf8mb4 encoding ( #7959 )
...
* use utf8mb4 character set for connections to mysql
* use utf8mb4 character set for tables, shorten varchar fields used in unique indexes
* migration type to update table character set
* update table character sets
* set charset for temp_user.status
* gofmt
2017-03-28 14:34:53 +02:00
Jaroslav Hanslík
e91a078105
Slack notification should contain fallback text ( #7961 )
2017-03-28 10:05:44 +02:00
Dan Cech
dde8583db8
xorm engine.SetMaxConns is a deprecated alias for engine.SetMaxOpenConns
2017-03-27 18:04:03 -04:00
Daniel Lee
f45d637025
auth: fix warning in test
2017-03-23 15:52:08 +01:00
Daniel Lee
beb85f413a
oauth: delete session key instead of set to empty
...
Adds the Delete function to the Session wrapper so that the Macaron
function for deleting keys from a Session can be used.
https://go-macaron.com/docs/middlewares/session#implement-provider-interface
2017-03-23 15:26:13 +01:00
Daniel Lee
79cef75fed
Merge pull request #7426 from Altoros/altoros/authorization-errors
...
Add common type for oauth authorization errors
2017-03-23 15:25:35 +01:00
gomlgs
e99137598e
Cloudwatch: Correctly obtain IAM roles within ECS container tasks. ( #7892 )
...
We now obtain credentials based on the container task's role
rather than just relying on the credentials of the enclosing
container instance.
Fixes #6700 .
2017-03-22 07:15:19 +01:00
Daniel Lee
69bec98962
chore: update all grafana.org urls to .com
2017-03-21 15:37:55 +01:00
