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
bergquist
bb42579b0f
Merge branch 'master' into alerting_definitions
2016-04-25 16:42:33 +02:00
bergquist
ddd826616b
feat(alerting): serialize whole target obj from dashboard
2016-04-25 16:38:27 +02:00
bergquist
25f6ec8b53
feat(alerting): add support for alert_rule updates
2016-04-25 16:18:28 +02: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
bergquist
c83af353b2
feat(alerting): renames alert table to alert_rule
2016-04-25 14:42:24 +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
bergquist
8ca7ccae38
feat(alerting): add functionallity for converting tresholds to alerts
2016-04-25 14:18:45 +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
bergquist
f167ce19ab
test(alerting): add test for deleting alerts
2016-04-25 13:00:05 +02:00
bergquist
bdd3e2ad73
Merge branch 'master' into alerting_definitions
2016-04-25 11:22:35 +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
bergquist
5d5999561a
test(dashboard): add failing test for deleting dashboards
2016-04-25 08:46:15 +02:00
bergquist
44310921b5
test(alerting): add commented failed test
2016-04-25 08:34:48 +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
bergquist
03e6fc951f
feat(alerting): delete alerts when dashboard gets deleted
2016-04-23 14:14:18 +02:00
bergquist
ec6dbe3067
tests(alerting): connect alerts to dashboard
2016-04-23 10:41:50 +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
bergquist
84115c8038
feat(alerting): delete alerts when panels are removed
2016-04-22 17:49:50 +02:00
Matt Toback
349f6b51a5
Updated link color in text panel to be -link-color
2016-04-22 11:32:19 -04:00
bergquist
8bb62a79d0
feat(alerting): excisting alerts are now updated
2016-04-22 16:51:24 +02:00
bergquist
ba5978abd3
Merge branch 'master' into alerting_definitions
2016-04-22 15:52:56 +02: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
Torkel Ödegaard
3bbc86bcf2
Merge pull request #4719 from nlf/master
...
dont quote numbers for influxdb, closes #4163
2016-04-22 15:04:14 +02:00
