woodsaj
ad8dbbb559
allow updates to secureJsonData.
...
SecureJsonData is stored as a json object in the DB. As the
secureJsonData is never returned to the user they are unable
to provide the full json object when performing updates instead
the user can only provide the specific keys they wish to update.
This commit ensures that only the provided keys are updated and
existing keys in the secureJsonData object are left untouched.
2016-04-28 18:39:23 +08:00
Torkel Ödegaard
5a241a8290
fix(): minor query editor fix
2016-04-28 10:29:36 +02:00
Torkel Ödegaard
4a332065d0
changelog(): updated changelog with notice about new query editors, closes #3900
2016-04-28 10:22:17 +02:00
Torkel Ödegaard
0e4b70a4a8
feat(query_editors): more work
2016-04-28 10:13:18 +02:00
Torkel Ödegaard
f1d4fd3e67
feat(query editors): changed chevron position
2016-04-27 21:24:41 +02:00
Torkel Ödegaard
7b560f9080
feat(query editors): converted OpenTSDB editor to new form styles
2016-04-27 16:29:59 +02:00
Torkel Ödegaard
0ebd921bbb
feat(query editors): updated cloudwatch to new form styles
2016-04-27 11:07:26 +02:00
Torkel Ödegaard
206cb51219
feat(query editors): updated prometheus editor
2016-04-27 10:50:29 +02:00
Torkel Ödegaard
5e6485c210
feat(query editors): minor progress
2016-04-27 10:16:04 +02:00
Torkel Ödegaard
65b4945548
Merge branch 'master' into query-editor-style
2016-04-27 08:43:34 +02:00
Torkel Ödegaard
aa98ada141
fix(snapshots): fixed snapshot issue introdiuced yesterday
2016-04-26 14:51:06 +02:00
Torkel Ödegaard
26eeb6578d
feat(gauge): polish to gauge, better handling of automatic font size, added option to hide threshold markers
2016-04-26 13:50:04 +02:00
Torkel Ödegaard
8bb07124f7
fix(gauge): validate min / max range, fixes #4820
2016-04-26 13:14:43 +02:00
Torkel Ödegaard
bce5c447b3
fix(apps): app dashboards can now be updated, fixes #4817
2016-04-26 12:52:44 +02:00
Torkel Ödegaard
34cb17546d
fix(): minor fix for event emitter
2016-04-26 12:39:24 +02:00
Torkel Ödegaard
7c06604f16
Merge branch 'master' of github.com:grafana/grafana
2016-04-26 11:00:20 +02:00
Torkel Ödegaard
0762c38d35
fix(ds_edit): dont show warning when data source does not support testing, fixes #4811
2016-04-26 10:59:57 +02:00
bergquist
baac7809c5
docs(changelog): add notes about fixes for singlestat
2016-04-26 10:04:39 +02:00
bergquist
79ed99a940
fix(singlestat): fixes font size diffs for gauge
2016-04-26 10:00:13 +02:00
Torkel Ödegaard
bca0894f73
feat(query editors): progress on query editors
2016-04-26 09:58:55 +02:00
bergquist
9316bcf307
fix(singlestat): enables autoupdate on change
...
closes #4809
closes #4812
2016-04-26 09:51:31 +02:00
Torkel Ödegaard
60855643c4
Merge pull request #4807 from grafana/makefile
...
add basic Makefile, remove need for global grunt-cli
2016-04-25 19:01:44 +02:00
Dan Cech
650bb4c719
use npm test to run npm tests
2016-04-25 12:53:15 -04:00
Dan Cech
2244224b12
add basic Makefile, remove need for global grunt-cli
2016-04-25 12:44:26 -04:00
Torkel Ödegaard
bbf4d00319
fix(query editors): added select style to segment, used by data source selector
2016-04-25 15:49:33 +02:00
Torkel Ödegaard
6b813b4e2a
feat(query editors): remember collapsed state
2016-04-25 15:11:40 +02:00
Torkel Ödegaard
529cb43397
Merge branch 'master' of github.com:grafana/grafana into query-editor-style
2016-04-25 14:30:41 +02:00
Torkel Ödegaard
6bc898b215
fix(influxdb): fixed issue with using multi value template vars in influxdb measurement clause, fixes #4797
2016-04-25 14:29:51 +02:00
Torkel Ödegaard
1a433de0b4
Merge branch 'master' into query-editor-style
2016-04-25 14:22:36 +02:00
Torkel Ödegaard
4d802df040
fix(influxdb): fixed issue with using multi value template vars in influxdb measurement clause, fixes #4797
2016-04-25 14:22:15 +02:00
Torkel Ödegaard
04a79175bf
fix(plugins): only add app nav link if it has any pages/dashboards with role matching current user, fixes #4784
2016-04-25 14:00:49 +02:00
Torkel Ödegaard
97656d65ec
db(dashboard): minor fix for dashboard delete
2016-04-25 11:22:13 +02:00
Torkel Ödegaard
ba28d2e13f
Merge branch 'master' of github.com:grafana/grafana
2016-04-25 09:26:57 +02:00
Torkel Ödegaard
711992c8e2
fix(influxdb): minor fix for duplicated db param to proxied influxdb call, fixes #4703
2016-04-25 09:26:47 +02:00
Carl Bergquist
31624b410a
Merge pull request #4800 from 1tylermitchell/patch-1
...
typo
2016-04-25 08:01:39 +02:00
Torkel Ödegaard
00827ce921
fix(): let binding cycle complete before adding panel to dom
2016-04-24 12:50:33 +02:00
Tyler Mitchell
21d2a51cd3
typo
...
tabs != tags
2016-04-23 22:00:42 -07:00
bergquist
c0384a04f8
Merge branch 'cli_upgradeFix'
2016-04-23 14:40:05 +02:00
bergquist
ee0c4cd194
docs(changelog): add note about cli issue
...
closes #4651
2016-04-23 14:39:42 +02:00
bergquist
07b13e24fa
style(cli): add some color to error messages
2016-04-23 14:39:42 +02:00
bergquist
0855f51436
feat(cli): improves defer error handling
2016-04-23 14:39:42 +02:00
bergquist
70acfb2cfd
fix(cli): adds better help text.
...
The zip lib is throwing panics sometimes when the response is malformed.
The cli will now try to download the zip file up to three times before
aborting. The cli gives a better error message and informes the user
about retrying.
closes #4651
2016-04-23 14:39:42 +02:00
Torkel Ödegaard
29a2b2032a
Merge pull request #4794 from grafana/issue-4767
...
Updated link color in text panel to be -link-color
2016-04-22 18:37:03 +02:00
Torkel Ödegaard
af2efbe480
Merge pull request #4796 from grafana/g-net-links
...
fix broken link to grafana.net, standardize on https://grafana.net for links
2016-04-22 18:36:42 +02:00
Dan Cech
25b0773a94
fix broken link to grafana.net, standardize on https://grafana.net for links
2016-04-22 12:13:39 -04:00
Matt Toback
349f6b51a5
Updated link color in text panel to be -link-color
2016-04-22 11:32:19 -04:00
Torkel Ödegaard
9917de09af
fix(graph): removed angular copy that was no longer needed
2016-04-22 15:49:51 +02:00
Torkel Ödegaard
884eef32c9
Merge pull request #4793 from daniellee/panel_defaults
...
fix(panels): avoid deep copy problem for panel defaults
2016-04-22 15:47:59 +02:00
Daniel Lee
16dbf3166d
fix(panels): avoid deep copy problem for panel defaults
...
Moves the defaults to be an instance property. This solves
the problem of lodash defaults function not doing a deep
copy. The symptom of this is that new deep properties for
a panel are assigned to every panel of the same type by
the defaults function in the constructor.
2016-04-22 15:29:33 +02:00
Carl Bergquist
be19f8888e
Merge pull request #4792 from grafana/revert-4790-revert-3688-gauges
...
Revert "Revert "Gauges""
2016-04-22 15:06:13 +02:00
