Commits · d3c022f89e9de1292247f140ac15010ce350268e · Kornkitt Poolsup / nexpie-grafana-theme · GitLab

29 Feb, 2016 20 commits
- Merge branch 'master' of github.com:grafana/grafana · d3c022f8
  Torkel Ödegaard committed Feb 29, 2016
  
  d3c022f8 Browse Files
- misc(): added elasticsearch.yml config file to docker test env · 3624587f
  Torkel Ödegaard committed Feb 29, 2016
  
  3624587f Browse Files
- fix(logging): only log to xorm.log when in dev mode, fixes #4182 · 56c08041
  Torkel Ödegaard committed Feb 29, 2016
  
  56c08041 Browse Files
- Merge pull request #4190 from raintank/issue4185 · da4e3784
```
fix app->plugin renamin in more places
```
  Torkel Ödegaard committed Feb 29, 2016
  da4e3784 Browse Files
- fix app->plugin renamin in more places · 35f7a71f
  Anthony Woods committed Feb 29, 2016
  
  35f7a71f Browse Files
- Merge pull request #4189 from raintank/issue4185 · bf22b4cb
```
correct path for app page links.
```
  Torkel Ödegaard committed Feb 29, 2016
  bf22b4cb Browse Files
- correct path for app page links. · 4741152f
  Anthony Woods committed Feb 29, 2016
  
  4741152f Browse Files
- docs(changelog): add info about templated timeshift · fb33cf45
  bergquist committed Feb 29, 2016
  
  fb33cf45 Browse Files
- Merge pull request #4063 from mtanda/timeshift_template · 1fb38abf
```
timeFrom and timeShift templating
```
  Carl Bergquist committed Feb 29, 2016
  1fb38abf Browse Files
- feat(templates): collapse submenu if none visable templates · 4299feee
  bergquist committed Feb 29, 2016
  
  4299feee Browse Files
- fix(templating): make checkboxes a new row · 86b19067
  bergquist committed Feb 29, 2016
  
  86b19067 Browse Files
- Merge branch 'hide_template' of https://github.com/mtanda/grafana into mtanda-hide_template · 18a0a85d
  bergquist committed Feb 29, 2016
  
  18a0a85d Browse Files
- feat(datasource): add type to datasource list · 05ba32b5
```
closes #4183
```
  bergquist committed Feb 29, 2016
  05ba32b5 Browse Files
- fix(single_stat): rounding bug in value => text · c30c12d3
  bergquist committed Feb 29, 2016
  
  c30c12d3 Browse Files
- timeFrom and timeShift templating · 09dfaf98
  Mitsuhiro Tanda committed Feb 29, 2016
  
  09dfaf98 Browse Files
- ux(annotations): minor polish to annotations editor · ae604b62
  Torkel Ödegaard committed Feb 29, 2016
  
  ae604b62 Browse Files
- Merge pull request #4187 from raintank/issue4185 · fc8146b5
```
replace 'app' with 'plugins' where needed.
```
  Anthony Woods committed Feb 29, 2016
  fc8146b5 Browse Files
- replace 'app' with 'plugins' where needed. · 64184551
  Anthony Woods committed Feb 29, 2016
  
  64184551 Browse Files
- Merge pull request #4105 from benrubson/issue3982-2 · b32809d0
```
Add some more steps for template auto interval
```
  Carl Bergquist committed Feb 29, 2016
  b32809d0 Browse Files
- Merge pull request #4138 from utkarshcmu/tsdb-refac2 · 02b2c748
```
Opentsdb 2.2 support without breaking 2.1
```
  Carl Bergquist committed Feb 29, 2016
  02b2c748 Browse Files
28 Feb, 2016 20 commits
- Merge pull request #4178 from mtanda/prometheus_template_label · 6fd0d5e2
```
(prometheus) fix label_values() templating
```
  Torkel Ödegaard committed Feb 28, 2016
  6fd0d5e2 Browse Files
- rebase against master · a4ecacb9
  benrubson committed Feb 28, 2016
  
  a4ecacb9 Browse Files
- Merge pull request #4103 from benrubson/issue3982 · b9e0fcdf
```
Add a minimum value option for template auto interval
```
  Torkel Ödegaard committed Feb 28, 2016
  b9e0fcdf Browse Files
- Made opentsdb query_ctrl robust · 18c57ea2
  utkarshcmu committed Feb 28, 2016
  
  18c57ea2 Browse Files
- smooth upgrade from Grafana 2.6 to 3.0 · a883424d
  utkarshcmu committed Feb 28, 2016
  
  a883424d Browse Files
- Fixed the UI as per new UX convention · 7fa170ce
  utkarshcmu committed Feb 28, 2016
  
  7fa170ce Browse Files
- Added default opentsdb version to datasource · 89253299
  utkarshcmu committed Feb 28, 2016
  
  89253299 Browse Files
- Added query ctrl tests for Opentsdb · 4aa5dab6
  utkarshcmu committed Feb 28, 2016
  
  4aa5dab6 Browse Files
- Added relevant docs and changes · 936dd2ea
  utkarshcmu committed Feb 28, 2016
  
  936dd2ea Browse Files
- Labels fixed in legend for Filters · 09e80f03
  utkarshcmu committed Feb 28, 2016
  
  09e80f03 Browse Files
- Datasource working with filters after fixing bugs · 63dfa303
  utkarshcmu committed Feb 28, 2016
  
  63dfa303 Browse Files
- Smooth transition from opentsdb 2.1 to 2.2 · 599b1eb6
  utkarshcmu committed Feb 28, 2016
  
  599b1eb6 Browse Files
- add, edit, remove filters functionality implemented · 4a636b6d
  utkarshcmu committed Feb 28, 2016
  
  4a636b6d Browse Files
- Added Filters UI · d92172f5
  utkarshcmu committed Feb 28, 2016
  
  d92172f5 Browse Files
- Fill Policy visible only in <=2.2 · 26232406
  utkarshcmu committed Feb 28, 2016
  
  26232406 Browse Files
- Removed unused code from datasource.js · 908e8577
  utkarshcmu committed Feb 28, 2016
  
  908e8577 Browse Files
- Tracking opentsdb version in opentsdb config · f90fda8e
  utkarshcmu committed Feb 28, 2016
  
  f90fda8e Browse Files
- rebase against master · f4037667
  benrubson committed Feb 28, 2016
  
  f4037667 Browse Files
- rebase against master · a1fd12ef
  benrubson committed Feb 28, 2016
  
  a1fd12ef Browse Files
- Merge pull request #4108 from benrubson/issue3982-3 · 517721ea
```
Make auto interval calculation more accurate
```
  Torkel Ödegaard committed Feb 28, 2016
  517721ea Browse Files