IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-15 10:03:33 -06:00
Code Issues Packages Projects Releases Wiki Activity
6,612 Commits 5,452 Branches 554 Tags 1.9 GiB
f6cbbe1e64
Commit Graph

2104 Commits

Author SHA1 Message Date
Torkel Ödegaard
28f4f3a8c8 fix(datasource edit): Editing datasources broken earlier today, fixes #4343 2016-03-12 00:16:08 +01:00
Torkel Ödegaard
1f9f439acb lib(): added simplejson lib 2016-03-11 23:28:33 +01:00
Torkel Ödegaard
c5a817194a more work on dashboard importing and templating 2016-03-11 17:31:57 +01:00
bergquist
c1e4d0590c fix(plugins): fixes broken plugin link 2016-03-11 17:13:35 +01:00
bergquist
85466c7ee1 fix(plugins): fixes broken link 2016-03-11 17:04:26 +01:00
Torkel Ödegaard
d2b0bad1cf fix(): fixed changed partials paths 2016-03-11 13:02:21 +01:00
Torkel Ödegaard
ece8a925a6 Merge branch 'master' of github.com:grafana/grafana 
Conflicts:
	examples/nginx-app/package.json
	examples/nginx-app/plugin.json
 2016-03-11 12:39:10 +01:00
Torkel Ödegaard
fc54c01f01 feat(plugins): more work on plugin dashboard install, #4298 2016-03-11 12:31:56 +01:00
Torkel Ödegaard
3fd420c901 Merge pull request #4335 from mtanda/cloudwatch_tag_query 
(cloudwatch) support tag query
 2016-03-11 11:21:12 +01:00
Torkel Ödegaard
2de439bd1e feat(plugins): progress on dashboard installs , #4298 2016-03-11 09:57:20 +01:00
Mitsuhiro Tanda
b989e2ce37 minor fix 2016-03-11 17:04:42 +09:00
Mitsuhiro Tanda
25f08ddd39 (cloudwatch) change parameter form of ec2_instance_attribute() 2016-03-11 16:59:06 +09:00
Mitsuhiro Tanda
0052e9d136 (cloudwatch) add ec2_instance_attribute() query 2016-03-11 16:48:29 +09:00
simnv
336c1b7b6e Fix groupby selection 
Default groupby selection for influxdb is escaped not like a regex, but as a glob. It works fine with one value in variable, but when you select multiple values, query is incorrect:
> SHOW TAG KEYS FROM "os.disk.fs.space_total" WHERE "host" =~ /{host-1,host-2}$/
 2016-03-11 08:30:56 +05:00
Torkel Ödegaard
60adcedebe feat(plugins): worked on plugin dashboard import handling 2016-03-10 19:57:48 +01:00
Torkel Ödegaard
78b9c3004a feat(plugins): minor progress on dashboard imports 2016-03-10 14:28:31 +01:00
Torkel Ödegaard
1951f3856f feat(plugins): refactored datasourceEditCtrl to typescript, #4298 2016-03-10 09:47:29 +01:00
Mitsuhiro Tanda
df2a23d1a7 fix to use variable.refresh flag 2016-03-10 13:19:07 +09:00
Torkel Ödegaard
d8b11adfd5 Merge branch 'master' into dashboard-thing 2016-03-09 13:11:48 +01:00
Torkel Ödegaard
4a5b753fd8 feat(templating): refactoring of the refresh values of #4281 2016-03-09 13:10:02 +01:00
Torkel Ödegaard
bb1e7f62a0 fix(build): updated moment.js to fix systemjs build issue, fixes #4306 2016-03-09 12:39:05 +01:00
bergquist
f0d1853a66 style(templating): tigth-form -> gf-form 2016-03-09 11:56:52 +01:00
bergquist
7224728ab8 Merge branch 'refresh_temp_value_by_time_range_changes' of https://github.com/mtanda/grafana into mtanda-refresh_temp_value_by_time_range_changes 2016-03-09 11:46:49 +01:00
Carl Bergquist
ac439d83fe Merge pull request #4296 from knowroozi/opentsdb_annotations 
add annotations for opentsdb
 2016-03-09 11:31:05 +01:00
Torkel Ödegaard
c0b92eb5d0 fix(jshint): fixed jshint warning 2016-03-09 10:31:43 +01:00
Torkel Ödegaard
5599bdf1bc Merge branch 'master' of github.com:grafana/grafana 2016-03-09 10:26:11 +01:00
Torkel Ödegaard
de41536046 fix(share): fixed checkboxes in share modal, fixes #4301 2016-03-09 10:26:00 +01:00
Torkel Ödegaard
30d321998c Merge pull request #4295 from utkarshcmu/nav-fix 
Minor nav fix
 2016-03-09 09:27:38 +01:00
Torkel Ödegaard
3191678b14 feat(plugins): work on plugins that include dashboards 2016-03-08 20:46:25 +01:00
Torkel Ödegaard
091726b374 feat(plugins): commented out dashboard import list 2016-03-08 20:27:40 +01:00
Torkel Ödegaard
dfaa6d8eb9 feat(plugins): a lot of work on #4298 2016-03-08 18:17:47 +01:00
Mitsuhiro Tanda
aff4bf8f6c minor refactoring 2016-03-09 01:47:38 +09:00
Mitsuhiro Tanda
ba1e1532ac change option name more clearly 2016-03-09 00:53:43 +09:00
Kaveh Nowroozi
945131ccab add annotations for opentsdb 2016-03-08 10:47:36 -05:00
NickG123
f11b4cb481 Added a select box to templates that allows template values to be refreshed on refresh 2016-03-09 00:40:33 +09:00
utkarshcmu
92c6025390 Minor nav fix 2016-03-08 07:39:41 -08:00
Torkel Ödegaard
7b1d827460 Merge branch 'master' into dashboard-thing 
Conflicts:
	public/app/features/datasources/partials/edit.html
 2016-03-08 15:48:01 +01:00
Torkel Ödegaard
74ebc2d3b0 Merge branch 'master' of github.com:grafana/grafana 2016-03-08 15:32:15 +01:00
Torkel Ödegaard
db98632078 feat(plugins): progress on plugins page 2016-03-08 12:31:37 +01:00
Torkel Ödegaard
3af4b1ff98 Merge pull request #4287 from grafana/raintank-issue4283 
refactor how template vars are updated. fixes #4283
 2016-03-08 11:33:37 +01:00
Torkel Ödegaard
f80c2406a8 feat(plugins): remove app bundled plugins from plugins list 2016-03-08 11:29:36 +01:00
bergquist
453eebbac8 style(graph): convert query options to gf-form 2016-03-08 11:08:43 +01:00
Torkel Ödegaard
6fac471415 feat(templating): fixed failing unit tests in PR #4287 2016-03-08 10:41:20 +01:00
bergquist
252568c91b fix(graph): type in html 2016-03-08 10:33:38 +01:00
bergquist
8e11f8dc21 feat(graph): add spacing above Series specific overrides 2016-03-08 10:30:38 +01:00
Torkel Ödegaard
2475ca8f9a fix(templaing): refactoring PR #4283 2016-03-08 09:32:54 +01:00
woodsaj
dc4743a392 ensure current template variable is set. 
- When distributing a dashboard it is often not practical to have
"current" template variable option set. This commit ensures that
for dashboards with no current, it is assigned when the dashboard
loads (assuming refresh on load is set.)
 2016-03-08 15:41:24 +08:00
woodsaj
0cb57f52de refactor how template vars are updated. fixes #4283 
Use promises to order the updates of variable options so that
parents are always updated before children.
This ensures that we only need to query the datasource once per
variable as variables that depend on other variables will only be
processed once their parent has been.
This commit also ensures that variable options are refreshed if
"refresh_on_load" is true even when query params are used to
set the variable seltion.
 2016-03-08 15:03:34 +08:00
Torkel Ödegaard
f4666df7da Merge branch 'master' of github.com:grafana/grafana 2016-03-07 18:04:06 +01:00
Torkel Ödegaard
4cd4ce504d feat(plugins): worked on markdown support for plugin page, #4275 2016-03-07 18:03:45 +01:00
bergquist
b912edbbef feat(grunt): add autoprefix with postcss 
closes #4250
 2016-03-07 17:49:47 +01:00
Torkel Ödegaard
b8fb8cdce6 feat(plugins): progress on plugin details page, # 4275 2016-03-07 14:32:16 +01:00
Torkel Ödegaard
135679096b feat(plugins): progress on plugin details page, # 4275 2016-03-07 14:31:17 +01:00
bergquist
e16f45e494 fix(playlist): fixes failed refactoring 2016-03-07 11:10:10 +01:00
bergquist
435d0f22f5 fix(dashlist): better handling of invalid dashboard ids 2016-03-07 11:04:02 +01:00
Torkel Ödegaard
00c70307ad fix(panel): fixed to panel height for text panel and unknown panel 2016-03-06 19:23:22 +01:00
Carl Bergquist
883435336c Merge pull request #4265 from utkarshcmu/hide-pass 
Hiding password text
 2016-03-06 14:56:44 +01:00
Torkel Ödegaard
2c8e35a933 fix(panel): fixed issues with png rendering, also fixed #4260 2016-03-06 12:51:36 +01:00
Torkel Ödegaard
7df18678a4 fix(ux): fixed hidden overflow text in api key modal, fixes #4263 2016-03-06 12:37:06 +01:00
Torkel Ödegaard
260c731f6b fix(panel): fixes for panel height and alignment management and scrollable legends, closes #4266 2016-03-06 12:34:47 +01:00
utkarshcmu
00b1908f3c Hiding password text 2016-03-05 23:47:50 -08:00
Torkel Ödegaard
e73e7aea56 Merge branch 'master' of github.com:grafana/grafana 2016-03-05 13:44:24 +01:00
Torkel Ödegaard
a72d73294c ux(): updated fonts 2016-03-05 13:44:14 +01:00
bergquist
0f546a4692 fix(dashlink): improve variable naming 2016-03-05 12:34:45 +01:00
bergquist
dd7e215e78 feat(dashslist): make sure dashbords exists in recently viewd dashboards 
closes #4249
 2016-03-05 12:27:37 +01:00
Torkel Ödegaard
fcd75422d5 ux(): update all confirm modals to new design 2016-03-04 20:57:10 +01:00
Torkel Ödegaard
b673bc1386 ux(): minor fix to login page 2016-03-04 12:13:40 +01:00
Torkel Ödegaard
4b08f3909d fix(graph): legend height calculation now takes into account series hidden from legend, fixes #4245 2016-03-04 11:16:31 +01:00
Torkel Ödegaard
31c317f5f7 fix(graphite editor): fixed moving functions right and left, broken recently, fixes #3246 2016-03-04 09:42:35 +01:00
Torkel Ödegaard
a6623357ad ux(): minor tweak to validation state 2016-03-04 09:42:35 +01:00
Torkel Ödegaard
8ed8bfb8bc feat(prometheus): added special regex escape for prometheus, fixes #4234 2016-03-03 10:49:30 +01:00
Torkel Ödegaard
e7ef79e0d3 refactor(): minor tweak to markdown to remove watchers 2016-03-03 09:04:06 +01:00
Torkel Ödegaard
ae69244ac7 updated keyboard shortcuts modal 2016-03-02 21:36:34 +01:00
Torkel Ödegaard
8232552152 ux(): updated api key modal 2016-03-02 21:34:04 +01:00
Torkel Ödegaard
f7b481fc28 ux(): updated inspector modal 2016-03-02 21:31:49 +01:00
Torkel Ödegaard
8bc1af9d1a ux(): work on new modal design #4191 2016-03-02 21:27:08 +01:00
Torkel Ödegaard
fd1a0edf7f ux(): worked on new modal design #4191 2016-03-02 20:56:04 +01:00
Torkel Ödegaard
950455bd93 ux(): combined page header and tab views 2016-03-02 16:56:16 +01:00
Torkel Ödegaard
eb4a46b40f Merge pull request #4220 from mtanda/issue_1419 
Align auto refresh interval
 2016-03-02 11:26:34 +01:00
utkarshcmu
48f5a61564 Grafana supports ms resolution for Opentsdb 2016-03-02 02:14:58 -08: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
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
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
98e756e278 fix(tooltip): msdetection can now handle null data points 2016-03-01 14:10:09 +01:00