Torkel Ödegaard
88ceb19d96
Merge branch 'master' into develop
2017-10-12 16:32:44 +02:00
Torkel Ödegaard
2992fb4b0e
fix: can now remove annotation tags without popover closing
2017-10-12 16:24:32 +02:00
Alexander Zobnin
3b14bee559
tech: add backward compatibility for <spectrum-picker> directive ( #9510 )
2017-10-12 15:31:59 +02:00
Torkel Ödegaard
e7b718ed7a
fix: fixed links on new 404 page, fixes #9493
2017-10-12 15:31:41 +02:00
bergquist
b5727949fd
logging: dont use cli logger in http_server
2017-10-12 15:29:01 +02:00
bergquist
88f55b01d8
oauth: raise error if session state is missing
...
ref #9476
2017-10-12 15:25:27 +02:00
bergquist
0848ba2e9c
oauth: provide more logging for failed oauth requests
2017-10-12 15:25:27 +02:00
bergquist
23c610015f
prepare for 4.6.0-beta1 release
2017-10-12 15:25:27 +02:00
Torkel Ödegaard
2564dda2d0
docs: updated whats new article
2017-10-12 14:53:29 +02:00
Patrick O'Carroll
1334a9e138
docs: initial draft release v46
2017-10-12 13:55:27 +02:00
Daniel Lee
4bdc3a5829
graph: fix y-axis decimalTick check. Fixes #9405
2017-10-12 12:45:20 +02:00
Torkel Ödegaard
a7068d835a
Merge branch 'master' of github.com:grafana/grafana
2017-10-12 12:40:43 +02:00
Torkel Ödegaard
c879cc7615
minor docs update
2017-10-12 12:40:37 +02:00
Torkel Ödegaard
a90052dac3
docs: annotation docs update
2017-10-12 12:19:25 +02:00
bergquist
7548734510
changelog: adds note about closing #7104
2017-10-12 12:13:00 +02:00
bergquist
a45bd400f1
changelog: adds note about closing #9373
2017-10-12 12:11:51 +02:00
Carl Bergquist
b63725033e
Merge pull request #9450 from utkarshcmu/kafka_alert
...
Kafka alerting
2017-10-12 12:11:13 +02:00
Carl Bergquist
ee5f69beb4
metrics: disable gzip for /metrics endpoint ( #9468 )
...
Prometheus client lib support gzip by itself. Which caused the
response to be double gzipped sometimes. We should use the Grafana
middle ware instead.
closes #9464
2017-10-12 12:02:36 +02:00
Daniel Lee
4c5bf76829
dashgrid: fix or skip tests for repeat rows
2017-10-12 12:01:13 +02:00
Patrick O'Carroll
5895f9dc89
Annotation docs ( #9506 )
...
* added images to annotation docs
* added gifs and png to annotations, minor code formatting fix in alertlist
2017-10-12 11:37:42 +02:00
Torkel Ödegaard
98f00f7e1f
Update CHANGELOG.md
2017-10-12 11:35:47 +02:00
Daniel Lee
55d510a319
Update PLUGIN_DEV.md
2017-10-12 11:32:33 +02:00
Daniel Lee
b38016e97f
Update PLUGIN_DEV.md
2017-10-12 11:31:04 +02:00
Torkel Ödegaard
64d75db514
Update README.md
2017-10-12 11:30:01 +02:00
Carl Bergquist
9d53653647
Merge pull request #9378 from mattbostock/verify_tls
...
Bugfix: Always verify TLS unless explicitly told otherwise
2017-10-12 11:11:02 +02:00
Daniel Lee
5272dd6605
dashboardgrid: disable dynamic_dashboard_srv for now
...
The row concept is probably going to change a lot so disabling
the repeating panels and repeating rows code and tests for now.
2017-10-12 11:04:38 +02:00
Patrick O'Carroll
45704d4570
Fixed link issue in CHANGELOG
2017-10-12 10:56:24 +02:00
Torkel Ödegaard
b81e01d1ec
Create PLUGIN_DEV.md
...
initial draft of plugin dev document
2017-10-12 10:53:42 +02:00
bergquist
1f4df2b694
changelog: adds note about closing #9371,#5334,#8812
2017-10-12 10:44:40 +02:00
bergquist
4ca3cc90dd
Merge branch 'mattbostock-verify_datasource_tls'
2017-10-12 10:39:07 +02:00
bergquist
79afd638bb
ds_edit: placeholder should only be cert header
2017-10-12 10:38:45 +02:00
Patrick O'Carroll
b76de790f9
fixed minor styling issus ( #9497 )
...
* fixed minor styling issus
* fixed code formatting
2017-10-12 10:33:42 +02:00
Torkel Ödegaard
81a4df1372
fix: alert api limit param did not work and caused SQL syntax error, fixes #9492
2017-10-12 10:22:53 +02:00
bergquist
c0d257a0ee
Merge branch 'verify_datasource_tls' of https://github.com/mattbostock/grafana into mattbostock-verify_datasource_tls
2017-10-12 10:15:32 +02:00
Alexander Zobnin
04ea7efac9
annotations: add endpoint for writing graphite-like events ( #9495 )
...
* annotations: add endpoint for writing graphite-like events
* annotations: fix new line handling in tooltip
* annotations: support tags in prior to Graphite 0.10.0 format
2017-10-12 10:12:15 +02:00
Carl Bergquist
19a57f7cb1
Merge pull request #9505 from PaulMest/you-to-your-typo
...
You to your typo
2017-10-12 08:49:58 +02:00
Paul Mestemaker
2f73208ca8
Update unsaved_changes_modal.ts
2017-10-11 15:57:33 -07:00
Paul Mestemaker
e1d61c9678
Merge pull request #1 from grafana/master
...
Merging upstream
2017-10-11 15:55:05 -07:00
Torkel Ödegaard
3a089dd04c
newgrid: various fixes
2017-10-11 21:36:03 +02:00
Torkel Ödegaard
0d9ac4d5a4
newgrid: fixed migration code to new grid
2017-10-11 16:58:11 +02:00
Torkel Ödegaard
9358d0c6f7
Merge branch 'develop' of github.com:grafana/grafana into develop
2017-10-11 16:48:30 +02:00
Torkel Ödegaard
ad1d69861e
Merge branch 'master' of github.com:grafana/grafana into develop
2017-10-11 16:47:16 +02:00
Torkel Ödegaard
85405a2e8d
Merge branch 'develop' of github.com:grafana/grafana into develop
2017-10-11 16:32:14 +02:00
Torkel Ödegaard
331b50dcaa
grid: edit/view now works
2017-10-11 16:32:05 +02:00
Daniel Lee
0f6270098b
dashboard: fixes for panels without rows
2017-10-11 16:09:05 +02:00
Daniel Lee
5e8f253ff8
webpack: changed devtools setting to stop exceptions
2017-10-11 16:09:05 +02:00
Torkel Ödegaard
9785e6b630
fix: ignore upgrading dashboard grid when there are no rows
2017-10-11 14:40:18 +02:00
Torkel Ödegaard
d8e4decc60
grid: fixed migration for rows without height
2017-10-11 14:36:25 +02:00
Torkel Ödegaard
d4ebcc82b4
Merge branch 'develop' of github.com:grafana/grafana into develop
2017-10-11 13:52:59 +02:00
Torkel Ödegaard
18f58ea36c
ux: minor fix sidemenu
2017-10-11 13:52:36 +02:00
