public/grafana
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
19,865 Commits 655 Branches 650 Tags
b94de101cd95b23f0266cd61e311f09ae8ad7592
Commit Graph
19865 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Torkel Ödegaard b641720575 Merge branch 'master' of github.com:grafana/grafana 2016-03-02 16:56:27 +01:00
Torkel Ödegaard 950455bd93 ux(): combined page header and tab views 2016-03-02 16:56:16 +01:00
bergquist eb79436ab7 feat(plugins): mounts dist folder if exists in plugin 
closes #4230
 2016-03-02 15:13:19 +01:00
Carl Bergquist 10db47bf4c Merge pull request #4228 from utkarshcmu/patch-1 
Update CHANGELOG.md
 2016-03-02 11:37:08 +01:00
Utkarsh Bhatnagar 4d454f8914 Update CHANGELOG.md 2016-03-02 02:31:32 -08:00
Torkel Ödegaard eb4a46b40f Merge pull request #4220 from mtanda/issue_1419 
Align auto refresh interval
 2016-03-02 11:26:34 +01:00
Torkel Ödegaard 7df326083d Merge pull request #4227 from utkarshcmu/tsdb-ms 
Grafana supports ms resolution for Opentsdb
 2016-03-02 11:24:14 +01:00
utkarshcmu 48f5a61564 Grafana supports ms resolution for Opentsdb 2016-03-02 02:14:58 -08:00
bergquist 19f0f7535f Merge branch 'example_datasource' 2016-03-02 10:45:44 +01:00
bergquist e3e0b72b43 fix(examples): ignore dist folder 2016-03-02 10:45:17 +01:00
bergquist 3435df8b9c feat(examples): add datasource plugin example 2016-03-02 10:43:41 +01:00
Torkel Ödegaard 7e12460303 Merge branch 'master' of github.com:grafana/grafana 2016-03-02 08:55:25 +01:00
Torkel Ödegaard 9d3d0912e5 ux(): added on hover chevron to pinned brand button 2016-03-02 08:55:13 +01:00
Torkel Ödegaard 1ed4f64e60 templating(): minor update to regex escape chars, #2918 2016-03-02 08:44:20 +01:00
bergquist 8b64b2113e docs(plugins): improve install docs for plugins 2016-03-02 08:39:46 +01:00
bergquist 5bf2b6c382 docs(plugins): improve install docs for plugins 2016-03-02 08:38:56 +01:00
Mitsuhiro Tanda fa0b06ac60 fix align bug 2016-03-02 16:06:54 +09:00
Mitsuhiro Tanda ef22a87fcf remove align option 2016-03-02 16:02:08 +09:00
Torkel Ödegaard bfce379471 Merge pull request #4222 from raintank/pluginSettingEditHooks 
Add support for pre/post update hooks in the PluginEditCtrl.
 2016-03-02 07:56:23 +01:00
Torkel Ödegaard 4872f6d2dc fix(jshint): removed unused var 2016-03-02 07:54:10 +01:00
Torkel Ödegaard 3c30870dc2 fix(templating): fixed issue with custom all value, fixes #4219 2016-03-02 07:52:48 +01:00
Anthony Woods 4317e4c4a2 Add support for pre/post update hooks in the PluginEditCtrl. 
This allows users to intercept the update procedure from their own
controller to modify the pluginSettings before they are saved and
perform additional tasks like syncing state via a third party API.
 2016-03-02 14:21:25 +08:00
Mitsuhiro Tanda 7da57e0aa5 align refresh interval 2016-03-02 14:26:15 +09:00
Torkel Ödegaard 0da4168836 fix(prometheus): fixed templating issue with prometheus for when using variable with non regex operator, #2918 2016-03-01 21:35:55 +01:00
Torkel Ödegaard df67d57bca ux(): minor work on info popover 2016-03-01 21:01:41 +01:00
Torkel Ödegaard 82e7f1a212 Merge pull request #4201 from raintank/removeForcedHeader 
remove forced page header from app pages.
 2016-03-01 20:14:55 +01:00
Torkel Ödegaard 289521b4b7 Merge pull request #4217 from tdyas/redact_secret_settings 
redact settings containing 'secret' besides 'password'
 2016-03-01 20:14:34 +01:00
Tom Dyas d557beb5f1 redact settings containing 'secret' besides 'password' 
Ensure that settings with the word 'secret' in the name are redacted just
as ones with 'password' in the name are. For example, the Google Auth
client secret should be redacted now.
 2016-03-01 13:50:45 -05:00
Torkel Ödegaard 2cf1193b56 Merge branch 'variable-value-formatting-rethink' 2016-03-01 19:13:11 +01:00
Torkel Ödegaard 57315f1e27 feat(templating): updates to template variable forms 2016-03-01 19:12:54 +01:00
Torkel Ödegaard 56bef637bd feat(templating): fixes for influxdb template variable formating, #2918 2016-03-01 16:33:01 +01:00
Torkel Ödegaard d1bac6cde0 feat(templating): prometheus now works with new template variable formating/escaping, #2918 2016-03-01 16:11:05 +01:00
Torkel Ödegaard 23a136d9ef feat(templating): moved template interpolation into query building 2016-03-01 14:36:55 +01:00
bergquist d8f7bce9d4 feat(dashlist): add info text about recently viewed beeing stored in localstorage 
closes #4206
 2016-03-01 14:28:47 +01:00
bergquist 39354249e9 Merge branch 'utkarshcmu-ms-detection' 2016-03-01 14:11:19 +01:00
bergquist 98e756e278 fix(tooltip): msdetection can now handle null data points 2016-03-01 14:10:09 +01:00
Anthony Woods 91ca5b6f2a Merge pull request #4208 from raintank/suppressNav 
add supressNav property to plugin pages.
 2016-03-01 20:56:31 +08:00
bergquist b6ac0860c6 Merge branch 'ms-detection' of https://github.com/utkarshcmu/grafana into utkarshcmu-ms-detection 2016-03-01 13:55:59 +01:00
bergquist 00dc078311 feat(playlist): render playlists if playlist id is invalid 
close #4209
 2016-03-01 13:50:55 +01:00
Torkel Ödegaard 2d9a2506b4 ux(): fixed panel margin 2016-03-01 13:50:24 +01:00
Torkel Ödegaard fa73b1ce80 feat(templating): changed how the All templating value works 2016-03-01 13:47:02 +01:00
Torkel Ödegaard f4b97979c4 ux(): minor fix 2016-03-01 12:26:31 +01:00
bergquist 62b21c586d style(dashlist): rename last viewed -> recently viewed 2016-03-01 12:13:59 +01:00
bergquist 606c75162f feat(dashlist): add support for scripted dashboards 
- dashlist will only show dashboards from same org
- notfound dashboards will not be added

closes #4207
 2016-03-01 12:05:35 +01:00
Anthony Woods a8c10dbc08 update json field name of suppressNav 2016-03-01 18:17:40 +08:00
bergquist c6768a93c8 fix(dashlist): avoid null ref errors 2016-03-01 11:07:56 +01:00
Anthony Woods 74949d306f add supressNav property to plugin pages. 
This allows pages to be registered that dont show up in the
Navigation menu when the App is pinned.
 2016-03-01 18:07:51 +08:00
bergquist 77f93886da fix(cli): add latest version to list-remote command 
closes #4205
 2016-03-01 10:55:59 +01:00
Torkel Ödegaard 8f5a7f1764 feat(templating): more work on context specific varaiable formats, #2918 2016-03-01 10:51:39 +01:00
bergquist f78f7d6b37 docs(plugins): basic instructions for installing plugins 2016-03-01 10:42:49 +01:00