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 |
|
Torkel Ödegaard
|
f163ceffd0
|
fix(elasticsearch): fixes spelling of lucene, #3519
|
2015-12-15 08:29:24 +01: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 |
|
Carl Bergquist
|
4ee9e48e7c
|
Merge pull request #3405 from piotr1212/master
Add more info in route logging
|
2015-12-11 16:23:59 +01:00 |
|
Carl Bergquist
|
55fab0493d
|
Merge pull request #3393 from pepl/master
Fixed spelling error
|
2015-12-11 16:12:19 +01:00 |
|
carl bergquist
|
22c4e605cf
|
Merge remote-tracking branch 'upstream/master'
|
2015-12-11 15:25:34 +01:00 |
|
carl bergquist
|
67737b1556
|
feat(changelog): add info about merge PR to changelog
|
2015-12-11 15:24:22 +01:00 |
|
carl bergquist
|
cdfd3449ed
|
Merge branch 'tmonk42-ldap_login_hints'
|
2015-12-11 15:18:29 +01:00 |
|
carl bergquist
|
fab1062c0b
|
Merge branch 'ldap_login_hints' of https://github.com/tmonk42/grafana into tmonk42-ldap_login_hints
Conflicts:
conf/defaults.ini
pkg/setting/setting.go
closes #2571
closes #2494
|
2015-12-11 15:16:57 +01:00 |
|
Torkel Ödegaard
|
766b9d5270
|
Merge branch 'master' of github.com:grafana/grafana
|
2015-12-11 14:40:18 +01:00 |
|
Torkel Ödegaard
|
023fa2b2cc
|
fix(influxdb): minor fix to new editor, there were 5min as a selectable option in derivative function
|
2015-12-11 14:39:59 +01:00 |
|
carl bergquist
|
8910351f5c
|
fix(changelog): add info about merged PR's
|
2015-12-11 14:38:50 +01:00 |
|
Torkel Ödegaard
|
1b42e3015e
|
fix(timepicker): mini change, removed unneeded space
|
2015-12-11 14:34:56 +01:00 |
|
Torkel Ödegaard
|
4e9e18d4c0
|
Merge pull request #3498 from bergquist/always_show_refresh_button
feat(timepicker): always show refresh button
|
2015-12-11 14:33:50 +01:00 |
|
carl bergquist
|
ba5b127684
|
feat(timepicker): always show refresh button
closes #1628
closes #1208
|
2015-12-11 14:26:38 +01:00 |
|
Carl Bergquist
|
225e7a6a32
|
Merge pull request #3161 from mischief/syslog
syslog support closes #3160
|
2015-12-11 14:03:21 +01:00 |
|
Torkel Ödegaard
|
7e9963ae05
|
fix(elasticsearch): minor markup fix
|
2015-12-11 12:51:39 +01:00 |
|
Torkel Ödegaard
|
b7c0f3ea95
|
Merge branch 'master' of github.com:grafana/grafana
|
2015-12-11 12:45:01 +01:00 |
|
Torkel Ödegaard
|
a8e2610d7d
|
updated changelog
|
2015-12-11 12:44:47 +01:00 |
|
Torkel Ödegaard
|
b934ace1fc
|
Merge branch 'moving_avg_es_support'
|
2015-12-11 12:43:02 +01:00 |
|
Torkel Ödegaard
|
82cbfc9905
|
feat(elasticsearch): added pipeline aggregations feature to changelog
|
2015-12-11 12:42:55 +01:00 |
|
Torkel Ödegaard
|
9f294e3565
|
feat(elasticsearch): completed initial implementation of moving average and derivative pipleline aggregations, closes #3451
|
2015-12-11 12:41:40 +01:00 |
|
Torkel Ödegaard
|
68775182f0
|
Merge pull request #3494 from mtanda/cloudwatch_cleanup
remove aws-sdk-js require setting
|
2015-12-11 12:28:26 +01:00 |
|
Mitsuhiro Tanda
|
dc3e172eb4
|
remove aws-sdk-js require setting
|
2015-12-11 20:27:24 +09:00 |
|
Torkel Ödegaard
|
5bd128ba85
|
Merge pull request #3493 from bergquist/table_panel_color_invert_order
Table Panel: adds invert color order functionality
|
2015-12-11 12:05:35 +01:00 |
|
carl bergquist
|
1a8579cd6d
|
feat(table_panel): adds invert color order functionality
|
2015-12-11 12:01:04 +01:00 |
|