Torkel Ödegaard
648e8a9547
Merge branch 'master' of https://github.com/limefamily/grafana into limefamily-master
2017-05-23 14:48:14 +02:00
Torkel Ödegaard
1e3a42ca68
packaging: added rpm fonts to rpm package dependencies ( #8442 )
2017-05-23 13:53:03 +02:00
Torkel Ödegaard
21e61319f1
Merge branch 'master' of github.com:grafana/grafana
2017-05-23 13:52:24 +02:00
Torkel Ödegaard
48fdfe721e
build: updated master version to 4.4.0-pre1
2017-05-23 13:52:07 +02:00
Torkel Ödegaard
423ad4d36e
docs: updated docs
2017-05-23 12:45:15 +02:00
Torkel Ödegaard
bd8a0be3aa
Update CHANGELOG.md
2017-05-23 12:26:30 +02:00
Torkel Ödegaard
d9c6f7a141
release: bumped version to 4.3.0
2017-05-23 11:14:53 +02:00
Torkel Ödegaard
044668a395
login: minor fix to login page
2017-05-23 11:10:16 +02:00
Torkel Ödegaard
90dbd4978b
Merge branch 'master' of github.com:grafana/grafana
2017-05-23 10:56:37 +02:00
Torkel Ödegaard
359421b5e8
refactor: sqlstore inTransaction consolidated to one version, fixes #8376
2017-05-23 10:56:23 +02:00
Daniel Lee
73cb035231
mysql: annotation support. Fixes #8382
...
Simple query editor - a text area with a Show Help section.
Validation for empty query and if the time_sec column is missing.
2017-05-23 09:53:20 +02:00
Matt Toback
d47078e27f
2017!
2017-05-22 17:29:24 -04:00
Torkel Ödegaard
5e33b5fcfa
docs: updated changelog
2017-05-22 15:39:46 +02:00
Torkel Ödegaard
c34db77f04
grafana_com: changed name of oauth grafana_net integration (old settings names still work), and updated login button look, closes #8415
2017-05-22 14:56:50 +02:00
Torkel Ödegaard
7c50563f0f
fix: fixed crash when gzip was enabled
2017-05-22 14:09:54 +02:00
Torkel Ödegaard
a64c06d02c
mysql: add user permission notice mysql config view, closes #8359
2017-05-22 13:53:43 +02:00
Torkel Ödegaard
966cefc8d0
docs: updated changelog
2017-05-22 13:04:59 +02:00
Torkel Ödegaard
a0b9dcad4d
alert: alerting annotation improvements, fixes #8421
2017-05-22 13:02:49 +02:00
Torkel Ödegaard
370db82238
docs: updated changelog
2017-05-22 10:55:22 +02:00
Torkel Ödegaard
20e631a22d
fix: All alert annotations showed up in unsaved/new dashboards graph panels with alert, fixes #8361
2017-05-22 10:49:26 +02:00
Junliang Huang
6d3246e39e
docs(readme): remove dev.ini reference ( #8419 )
...
remove dev.ini reference as it seems not working anymore.
2017-05-21 10:07:21 +02:00
Joe Handzik
d4264cbfc2
Make location for plugins consistent ( #8429 )
...
Please let me know if this changed in a more recent version of Grafana, but when using 4.2.0 the manual install directions were off a little (there was no `data/plugins` directory, only a `plugins` directory).
Signed-Off-By: Joe Handzik <joseph.t.handzik@hpe.com>
2017-05-21 10:03:57 +02:00
Dave Scott
f7215608e9
Update VictorOps notifier w/ auto resolve and image URL ( #8431 )
...
* Fixed newline JSON buy in VictorOps integration
* Fixed payload sent to VictorOps so that link displays correctly
* Fixed formatted to resolve go error
* Add auto resolve incidents and image URL to VictorOps notifier
2017-05-21 10:02:48 +02:00
Torkel Ödegaard
7cb6466251
feat: query troubleshooter, improving json explorer
2017-05-20 23:43:59 +02:00
Torkel Ödegaard
d840645dd7
feat: metrics tab, minor change
2017-05-20 23:03:04 +02:00
Torkel Ödegaard
a8673a2e33
feat: metrics tab
2017-05-20 22:41:34 +02:00
Torkel Ödegaard
4a2c405ac0
feat: metris tab, moved data source selector
2017-05-20 18:35:34 +02:00
Torkel Ödegaard
499e01d832
feat: metrics tab reworking
2017-05-20 18:21:41 +02:00
Torkel Ödegaard
5e090b84ec
feat: Copy to clipboard now works in query troubleshooter
2017-05-20 14:52:33 +02:00
Torkel Ödegaard
b8aa6a8e47
query: more work on metrics tab changes
2017-05-20 10:48:47 +02:00
Torkel Ödegaard
912301fe24
query: more work on metrics tab changes
2017-05-20 10:14:41 +02:00
Torkel Ödegaard
5909f9ef92
feat: more work on metrics tab reworkings
2017-05-19 21:32:23 +02:00
Torkel Ödegaard
5fcb966297
feat: query troubleshooter progress
2017-05-19 17:35:36 +02:00
Torkel Ödegaard
6ad1a396a5
feat: query troubleshooter
2017-05-19 16:00:01 +02:00
Torkel Ödegaard
5513d3c9d1
feat: moved json-formatter-js into core grafana to be able to make changes
2017-05-19 13:16:05 +02:00
Torkel Ödegaard
878121bb46
fix: templating variable name validation detecting global variable naming wrongly, fixes #8423
2017-05-19 11:14:11 +02:00
Torkel Ödegaard
9045be5689
fix: Prometheus & hidden queries caused no metric query to be issued, fixes #8413
2017-05-19 10:24:47 +02:00
田子宽
9c35d3f87c
Add kibana like readable label to elasticsearch query builder
2017-05-19 11:38:28 +08:00
Torkel Ödegaard
f7a6c9a1e6
ux: minor change
2017-05-18 17:05:15 +02:00
Torkel Ödegaard
f65878c21d
ux: working on query troubleshooting
2017-05-18 17:04:31 +02:00
Torkel Ödegaard
78dbb4dc13
config: removed trace level from config comment
2017-05-18 14:19:39 +02:00
Torkel Ödegaard
d5481fa0f1
Merge branch 'master' into query_troubleshooting
2017-05-18 14:14:33 +02:00
Torkel Ödegaard
59f3cca135
docs: updated changelog
2017-05-18 14:13:05 +02:00
Torkel Ödegaard
8918922179
alerting: fixed issue with included alerting error & no data reasons, fixes #8412
2017-05-18 14:10:12 +02:00
Torkel Ödegaard
43d5525aaa
Merge branch 'master' into alert_state
2017-05-18 13:38:34 +02:00
Torkel Ödegaard
fbc3e0371d
Merge branch 'master' into query_troubleshooting
2017-05-18 13:38:11 +02:00
Torkel Ödegaard
86ce3d5e45
feat: in app query request & response troubleshooting
2017-05-17 17:02:50 +02:00
Daniel Lee
4182acda58
Merge pull request #8332 from sliceratwork/master
...
upgrade to Font Awesome 4.7.0
2017-05-17 14:58:14 +02:00
Daniel Lee
16fb7a2e4a
Merge pull request #8394 from berghauz/master
...
Proxy support added to webdav uploader, fixes #7922
2017-05-17 14:49:22 +02:00
Daniel Lee
f5118ced4d
Merge pull request #8400 from haidaraM/docs-admin
...
docs: Added requests body for 'Password for User' and 'Permissions'
2017-05-17 14:42:14 +02:00
