Torkel Ödegaard
|
8e6fdf62fb
|
tech(systemjs): things are starting to work
|
2015-12-15 19:27:04 +01:00 |
|
Torkel Ödegaard
|
74d7a946a7
|
tech(systemjs): work on moving to systemjs
|
2015-12-15 19:10:08 +01:00 |
|
Torkel Ödegaard
|
7ee290cc57
|
tech(systemjs): systemjs and jspm work
|
2015-12-15 17:56:16 +01:00 |
|
Torkel Ödegaard
|
f1b897b3de
|
change(cloudwatch): minor change to editor
|
2015-12-15 13:57:20 +01:00 |
|
Torkel Ödegaard
|
0589134006
|
Merge branch 'master' of github.com:grafana/grafana
|
2015-12-15 13:53:15 +01:00 |
|
Torkel Ödegaard
|
6ed36e01ac
|
fix(unit tests): moved kairosdb spec to it's plugin repo
|
2015-12-15 13:52:14 +01:00 |
|
Carl Bergquist
|
25d93d1041
|
Merge pull request #3066 from mtanda/cloudwatch_annotation
(cloudwatch) annotation support
|
2015-12-15 13:43:02 +01:00 |
|
Torkel Ödegaard
|
e28c9b3309
|
cleanup(KairosDB): removed kairosdb from main repo, can easily be installed via as plugin via its own plugin repo, https://github.com/grafana/datasource-plugin-kairosdb, closes #3524
|
2015-12-15 11:35:39 +01:00 |
|
Torkel Ödegaard
|
5335a6b636
|
Merge branch 'master' of github.com:grafana/grafana
|
2015-12-15 11:21:17 +01:00 |
|
Torkel Ödegaard
|
f83d5f4280
|
cleanup(influxdb_08): removed influxdb 0.8 data source as an built in official data source, moved it to an external plugin repo, https://github.com/grafana/datasource-plugin-influxdb-08, closes #3523
|
2015-12-15 11:21:00 +01:00 |
|
carl bergquist
|
28ec6b4d60
|
feat(graphite): add optional parameter for perSecond
closes #966
|
2015-12-15 11:10:13 +01:00 |
|
Torkel Ödegaard
|
27a0ef7ee8
|
Merge branch 'master' of github.com:grafana/grafana
|
2015-12-15 10:29:07 +01:00 |
|
Torkel Ödegaard
|
5eab5dc47b
|
feat(plugins): removed external plugins and bundle code, not ready for master yet, will revert this commit in seperate branch
|
2015-12-15 10:28:52 +01:00 |
|
Torkel Ödegaard
|
2ec5bc77d7
|
Merge branch 'external-plugins'
|
2015-12-15 10:10:48 +01:00 |
|
carl bergquist
|
2f3587ee8a
|
fix(jshint): fix jshint error ._.
|
2015-12-15 09:06:11 +01:00 |
|
carl bergquist
|
9ece45caa5
|
feat(top_nav): option to make dashboards editable again
closes #2587
closes #2554
|
2015-12-15 08:43:03 +01:00 |
|
Torkel Ödegaard
|
f163ceffd0
|
fix(elasticsearch): fixes spelling of lucene, #3519
|
2015-12-15 08:29:24 +01:00 |
|
Mitsuhiro Tanda
|
31de9faaf2
|
fix test
|
2015-12-15 11:32:24 +09:00 |
|
Mitsuhiro Tanda
|
d302c82c82
|
share cloudwatch query editor
|
2015-12-15 11:32:23 +09:00 |
|
Mitsuhiro Tanda
|
6fa5e681aa
|
fix EC2RoleProvider parameter
|
2015-12-15 11:25:20 +09:00 |
|
Mitsuhiro Tanda
|
e631940d9e
|
pkg/api/cloudwatch: fix api client construction against aws-sdk-go v0.10.2
|
2015-12-15 11:25:19 +09:00 |
|
Mitsuhiro Tanda
|
e22e20fa9d
|
fix cloudwatch annotation, reflect API change
|
2015-12-15 11:25:18 +09:00 |
|
Mitsuhiro Tanda
|
79c8556927
|
style change annotation editor
|
2015-12-15 11:25:18 +09:00 |
|
Mitsuhiro Tanda
|
7d16307db4
|
parse string date format
|
2015-12-15 11:25:17 +09:00 |
|
Mitsuhiro Tanda
|
1626982a3a
|
add CloudWatch Annotation
|
2015-12-15 11:25:16 +09:00 |
|
Mitsuhiro Tanda
|
6beb9be42c
|
add CloudWatch Alarm API support
|
2015-12-15 11:25:15 +09:00 |
|
Torkel Ödegaard
|
38f4cfb7a2
|
Merge branch 'v2.6.x'
|
2015-12-14 18:51:09 +01:00 |
|
Torkel Ödegaard
|
aca9d3965d
|
feat(elasticsearch): added unit option to derivative metric, closes #3512
|
2015-12-14 18:49:53 +01:00 |
|
Torkel Ödegaard
|
4cc06ad779
|
Merge branch 'master' of github.com:grafana/grafana
|
2015-12-14 18:33:58 +01:00 |
|
Torkel Ödegaard
|
79d56f779d
|
fix(graphite): minor fix to graphite query editor so it does not issue render requests for incomplete queries, fixes #3510
|
2015-12-14 18:33:44 +01:00 |
|
Carl Bergquist
|
280f9befae
|
Merge pull request #2949 from shoonoise/master
Add option to hide raintank share button
Fixes #2727
|
2015-12-14 17:29:09 +01:00 |
|
Torkel Ödegaard
|
201f50b121
|
Merge branch 'master' into external-plugins
Conflicts:
pkg/api/login.go
public/app/core/routes/all.js
public/app/core/table_model.ts
public/app/panels/table/table_model.ts
public/app/plugins/panels/table/editor.ts
public/app/plugins/panels/table/table_model.ts
|
2015-12-14 17:28:57 +01:00 |
|
carl bergquist
|
1cfa523f49
|
style(sidemenu): rename signup method to signout
|
2015-12-14 17:19:26 +01:00 |
|
Carl Bergquist
|
548ee47aa7
|
Merge pull request #3122 from shoonoise/hide_signout
Disable sign out button in case of auth proxy enabled
|
2015-12-14 17:18:04 +01:00 |
|
Torkel Ödegaard
|
55448de92a
|
updated master version to 3.0.0-pre1
|
2015-12-14 17:10:30 +01:00 |
|
Torkel Ödegaard
|
b63471ebe9
|
fix(windows): exclude syslog feature from windows builds
|
2015-12-14 16:16:36 +01:00 |
|
Torkel Ödegaard
|
33395d530d
|
docs(): updated downloads for 2.6 and whats new in 2.6 article
|
2015-12-14 15:45:00 +01:00 |
|
Torkel Ödegaard
|
fcd3af30ec
|
updated version to 2.6.0
|
2015-12-14 15:18:01 +01:00 |
|
Torkel Ödegaard
|
e334107c7d
|
docs(): added whats new in 2.6 article
|
2015-12-14 15:15:56 +01:00 |
|
carl bergquist
|
f5eb54e595
|
feat(elasticsearch): only show pipeline agg for es version >= 2
|
2015-12-14 15:08:34 +01:00 |
|
Torkel Ödegaard
|
56c3dd3652
|
docs(influxdb): updated influxdb docs
|
2015-12-14 14:16:22 +01:00 |
|
Torkel Ödegaard
|
6ddd458402
|
docs(elasticsearch): updated elasticsearch with info about templating and pipeline metrics
|
2015-12-14 13:55:16 +01:00 |
|
Torkel Ödegaard
|
ee328667d0
|
docs(table): updated table docs
|
2015-12-14 13:40:06 +01:00 |
|
Torkel Ödegaard
|
3dee75603c
|
Merge pull request #3502 from mattttt/table-panel-doc
New table panel doc
|
2015-12-14 10:22:49 +01:00 |
|
Torkel Ödegaard
|
c7e3ed096f
|
fix(postgres): fixes db migration issue with_credentials column for postgres, fixes #3505
|
2015-12-14 10:19:53 +01:00 |
|
Matt Toback
|
62fe5cdbaa
|
New table panel doc
|
2015-12-11 14:20:21 -05:00 |
|
Torkel Ödegaard
|
10f66fa78f
|
feat(elasticsearch): adds support for inline script and missing options to all elasticsearch metrics, closes #3500
|
2015-12-11 18:20:53 +01:00 |
|
Torkel Ödegaard
|
0cbc493113
|
Merge pull request #3499 from discordianfish/clarify-template-auto-interval-tooltip
Clarify template option auto interval in tooltip
|
2015-12-11 16:50:30 +01:00 |
|
Johannes 'fish' Ziemke
|
c30c9fbca9
|
Clarify template option auto interval in tooltip
|
2015-12-11 16:47:05 +01:00 |
|
carl bergquist
|
f4fd3f48f0
|
feat(changelog): adds info about merge PR
|
2015-12-11 16:26:11 +01:00 |
|