Commit Graph

1662 Commits

Author SHA1 Message Date
Torkel Ödegaard
35c05463e7 Merge branch 'v3.0.x' 2016-05-20 12:23:50 +02:00
Torkel Ödegaard
f00cbc0aeb fix(panel height): fixed issue with singlestat height, fixes #4679, fixes #4894, fixes #5113 2016-05-20 12:23:26 +02:00
Torkel Ödegaard
ee86d24797 fix(elasticsearch): minor editor layout fix 2016-05-20 10:31:22 +02:00
Torkel Ödegaard
91c6ebb06c Merge branch 'v3.0.x' 2016-05-20 09:06:39 +02:00
Torkel Ödegaard
df0ddc0b50 fix(prometheus): fixed bug in prometheus query editor, fixes #5107 2016-05-20 09:03:52 +02:00
Torkel Ödegaard
a3ee388b66 Merge branch 'master' into query-part-refactor 2016-05-19 14:52:18 +02:00
bergquist
ef4f5147be Merge branch 'master' into alerting_definitions 2016-05-19 08:05:35 +02:00
Torkel Ödegaard
03551a5961 Merge remote-tracking branch 'origin/development' 2016-05-18 14:23:21 +02:00
Mitsuhiro Tanda
a86d218891 (prometheus) fix metric find query 2016-05-18 16:36:57 +09:00
Mitsuhiro Tanda
66bcae353c (prometheus) pass dashboard time range to template query (#5007)
* (prometheus) pass dashboard time range to template query

* (prometheus) add passing time test of templating
2016-05-18 07:56:23 +02:00
Mitsuhiro Tanda
07d355851e (cloudwatch) assume role support (#5065)
* (cloudwatch) assume role support

* save godep

* (cloudwatch) add assumeRoleArn field

* (cloudwatch) set cred provider for sts

* (cloudwatch) fix test
2016-05-18 07:54:24 +02:00
Mitsuhiro Tanda
8d2f350ad1 (prometheus) fix prometheus link 2016-05-18 07:50:30 +02:00
Mitsuhiro Tanda
fc1891320e (prometheus) fix prometheus link (#5074) 2016-05-18 07:49:32 +02:00
Utkarsh Bhatnagar
8a9455d901 Fixed singlestat mapping typo (#5070) 2016-05-18 07:44:01 +02:00
Torkel Ödegaard
495404ef73 Merge branch 'master' into alerting_definitions 2016-05-16 14:12:56 +02:00
Torkel Ödegaard
2be8658034 Merge remote-tracking branch 'origin/development' 2016-05-16 11:40:12 +02:00
bergquist
31698a1c55 Merge branch 'master' into alerting_definitions 2016-05-16 09:28:14 +02:00
Lindsay Hill
85758a2dd2 Fixed minor typo s/seperate/separate/
Fixed small typo in help text
2016-05-14 17:51:08 +12:00
Utkarsh Bhatnagar
7bc15ec6c1 [Bug Fix] Opentsdb Alias issue (#4910)
* Fixed Opentsdb Alias issue

* Fixed Opentsdb query editor
2016-05-13 22:22:56 +02:00
bergquist
579b36754a Merge branch 'master' into development 2016-05-13 14:30:47 +02:00
bergquist
6849bfae16 fix(graph): fixes broken hide xaxis option
closes #5024
2016-05-13 13:52:57 +02:00
bergquist
c3f1d1a647 fix(influxdb): fixes extra semi colon due to hidden series
closes #5005
2016-05-13 13:36:57 +02:00
bergquist
d5899aacfb fix(graph-panel): fixes broken PNG rendering
When refactoring y-axies for graph panel these
was forgotten and which caused the graphite datasource
to send invalid data.

closes #5025
2016-05-13 12:20:39 +02:00
bergquist
88b2f48493 Merge branch 'master' into development 2016-05-12 16:22:18 +02:00
Torkel Ödegaard
b170b6ec8b feat(query part): moved query part editor from influxdb to core 2016-05-11 14:52:44 +02:00
bergquist
e69658128c docs(alerting): change api url layout 2016-05-11 14:08:45 +02:00
bergquist
c76c2f30a8 tech(alerting): add default values for alerts 2016-05-11 13:04:03 +02:00
bergquist
b58be91e71 feat(alerting): add delete button for removing alerts 2016-05-11 11:11:45 +02:00
Leandro Piccilli
0d34740a62 Add support to ElasticSearch 5.0 2016-05-10 19:38:22 +02:00
Torkel Ödegaard
cca37caf33 feat(prometheus): began work on prometheus query model 2016-05-10 15:48:07 +02:00
Torkel Ödegaard
4358687bfa Merge branch 'master' into query-part-refactor 2016-05-10 14:38:49 +02:00
Torkel Ödegaard
ae66c3f289 fix(influxdb): minor editor display fix 2016-05-10 14:38:11 +02:00
Torkel Ödegaard
d3bbc245c9 feat(query_part): began query part refactor to be able to reuse it in prometheus query editor 2016-05-10 14:32:25 +02:00
Carl Bergquist
c522341136 Merge pull request #4944 from Gueust/optional_tooltip_ordering
Add optional tooltip ordering (against the development branch)
2016-05-10 12:51:44 +02:00
bergquist
2cebe151f2 Merge branch 'master' into development 2016-05-10 12:40:17 +02:00
bergquist
35c73902da Merge branch 'master' into alerting_definitions 2016-05-09 11:34:56 +02:00
bergquist
27274f37e8 feat(alerting): update paths for alert state 2016-05-06 14:37:41 +02:00
Torkel Ödegaard
c7e7a0cd16 fix(singlestat): rerender singlestat and reevaluate thresholds on render, fixes #4920 2016-05-05 10:29:14 +02:00
Mathieu Payeur Levallois
c86cdb1805 opentsdb: apply templating on filters (#4594) 2016-05-04 13:47:05 +02:00
Torkel Ödegaard
bd15534360 fix(singlestat gauge): better font size handling for gauge, now value font size is used as scaling factor, fixes #4876 2016-05-04 11:46:21 +02:00
Idan Zalzberg
bca8d6d07b singlestat/module.ts onDataError was calling onDataReceived incorrectly (#4897)
onDataError was calling onDataReceived with {data : []} which breaks at the first line since object has no map function.
The correct form is probably just []
2016-05-04 10:48:01 +02:00
bergquist
3d366c2a4c feat(graphs): align forms for line mode checkbox 2016-05-04 10:42:12 +02:00
bergquist
7757d6d636 feat(alerting): set default title for alerts 2016-05-04 08:22:44 +02:00
Idan Zalzberg
2f7af968bf Bring back threshold line mode
Threshold line mode was somehow discarded from the HTML in the ui redesign, this brings it back
2016-05-04 10:04:00 +07:00
Torkel Ödegaard
3bd4b5ccc6 Merge branch 'master' of github.com:grafana/grafana 2016-05-03 19:00:57 +02:00
Torkel Ödegaard
f4a013946f feat(pluginlist): link in plugin list now goes to app/plugin default nav unless enabled 2016-05-03 19:00:42 +02:00
Matt Toback
d2fd829a58 Update module.html 2016-05-03 12:42:37 -04:00
bergquist
2ccb3956a6 feat(alerting): set default value for query 2016-05-03 17:55:41 +02:00
bergquist
1624dc9dfd feat(alerting): separate operator and level 2016-05-03 17:31:04 +02:00
bergquist
3c7e793c1f feat(alerting): add color to alert state icons 2016-05-03 16:36:49 +02:00
bergquist
b0a16a9e6b Merge branch 'master' into alerting_definitions 2016-05-03 14:32:31 +02:00
Torkel Ödegaard
5ffd57695c feat(table): added support for column units overriding style units for table 2016-05-03 11:29:51 +02:00
Torkel Ödegaard
6dc24ab2d7 Merge branch 'master' of github.com:grafana/grafana 2016-05-03 10:25:16 +02:00
Torkel Ödegaard
fe0b7533a1 fix(influxdb): quote number valued tag values, only not quote when operator is > or <, fixes #4885 2016-05-03 10:25:06 +02:00
Utkarsh Bhatnagar
b8d861edc1 Fixed query editor UI for keywords (#4890) 2016-05-03 10:09:03 +02:00
Torkel Ödegaard
152e085310 fix(elasticsearch): minor form fix to elastic query editor 2016-05-02 16:34:07 +02:00
bergquist
9c5b4e6f25 feat(alerting): auto convert thresholds if existing 2016-05-02 14:41:29 +02:00
bergquist
ca959d1ab0 Merge branch 'master' into alerting_definitions 2016-05-02 13:22:58 +02:00
bergquist
de5a39f320 Revert "Revert "Merge branch 'utkarshcmu-rangeMaps'""
This reverts commit 58b91befde.
2016-05-02 13:17:57 +02:00
bergquist
58b91befde Revert "Merge branch 'utkarshcmu-rangeMaps'"
This reverts commit 8f976fd980, reversing
changes made to 072f51e300.
2016-05-02 13:15:18 +02:00
bergquist
8f976fd980 Merge branch 'utkarshcmu-rangeMaps' 2016-05-02 13:10:17 +02:00
bergquist
91047ffa30 tech(singlestat): convert to gf-form 2016-05-02 12:43:07 +02:00
bergquist
b42064acdb tech(singlestat): fixes indentation 2016-05-02 10:40:28 +02:00
bergquist
7e220b2b9e Merge branch 'rangeMaps' of https://github.com/utkarshcmu/grafana into utkarshcmu-rangeMaps 2016-05-02 10:26:30 +02:00
Torkel Ödegaard
e6bccc5eff feat(influxdb): Added new functions moving_average and difference to query editor, closes #4698 2016-05-02 09:07:44 +02:00
Jean-Baptiste Lespiau
c555bbce3d Add optional tooltip ordering 2016-05-01 01:32:36 +02:00
joelanford
cbefd8f8ae Fixed legend labeling bug in Prometheus datasource (#4858) 2016-04-30 16:40:41 +02:00
Torkel Ödegaard
736ee3ffff fix(influxdb): Fixed issue with missing plus group by icon, fixes #4862 2016-04-30 16:35:42 +02:00
Torkel Ödegaard
36c583dddf fix(graphite): Fixed issue graphite png rendering option, fixes #4864 2016-04-30 16:26:25 +02:00
bergquist
6d66d9f42d feat(alerting): adds fearture toogle for alerting 2016-04-29 14:35:58 +02:00
Archit Sharma
5372bcc7a2 fixes #4849 - minor fix for metric-segment-model (agg.field) 2016-04-29 07:21:52 +02:00
Lucas Costa
9b84b88518 Add support to Elasticsearch precision_threshold 2016-04-28 19:23:45 -03:00
bergquist
bd30a4d23e Merge branch 'master' into alerting_definitions 2016-04-28 16:04:28 +02:00
bergquist
16cede30f6 feat(alerting): move alertingtab to seperate directive 2016-04-28 16:03:14 +02:00
Torkel Ödegaard
5d652dcaef fix(table): table column sorting fix 2016-04-28 15:48:49 +02:00
Torkel Ödegaard
69c2fafa7a feat(elasticsearch): added geo hash bucket aggregation 2016-04-28 15:29:54 +02:00
bergquist
5bc3672296 Merge branch 'master' into alerting_definitions 2016-04-28 11:03:33 +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
bergquist
2e097f4af1 Merge branch 'master' into alerting_definitions 2016-04-26 17:38:29 +02:00
bergquist
55e83a3d62 feat(alerting): rename alerting dashboard names 2016-04-26 16:06:29 +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
utkarshcmu
c1cd1fedf4 Added relevant tests 2016-04-26 02:57:46 -07:00
utkarshcmu
5defc2a3d2 Fixed remove mapping function 2016-04-26 02:57:46 -07:00
utkarshcmu
7b2a21994f Moved mappings to new tab, added rangeMaps feature 2016-04-26 02:57:45 -07: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
bergquist
bb42579b0f Merge branch 'master' into alerting_definitions 2016-04-25 16:42:33 +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
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
bergquist
bdd3e2ad73 Merge branch 'master' into alerting_definitions 2016-04-25 11:22:35 +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
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
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
Torkel Ödegaard
8b656f15b9 feat(graphite): added stddevSeries func def, closes #4782 2016-04-22 14:57:16 +02:00
Carl Bergquist
453f8b312a Revert "Revert "Gauges"" 2016-04-22 14:55:35 +02:00
Torkel Ödegaard
723bfa70db fix(table panel): fixed issue with string array formating, fixes #4791 2016-04-22 14:46:32 +02:00
Torkel Ödegaard
45dd9c5795 fix(graph panel): fix for graph panel alignment when legend is in table mode, fixes #4772 2016-04-22 14:36:20 +02:00
Carl Bergquist
24fbcd8dea Revert "Gauges" 2016-04-22 13:05:43 +02:00
Carl Bergquist
2748a3fbd8 Merge pull request #3688 from keis/gauges
Gauges
2016-04-22 11:49:35 +02:00
bergquist
d21f97e69b feat(alerting): adds basic alerting tab 2016-04-21 11:47:30 +02:00
Torkel Ödegaard
7079b5d770 fix(dashboard list): fixed minor issue with dashboard list panel, fixes #4768 2016-04-20 09:15:45 -07:00
Shaunak Kashyap
3925bcb94c Updating Elasticsearch logo 2016-04-20 08:50:28 -07:00
Mitsuhiro Tanda
ab9abee67b (cloudwatch) add test for interval variable 2016-04-20 01:27:44 +09:00
bergquist
0108b5eb88 fix(singlestat): adds support for lighttheme 2016-04-19 16:18:29 +02:00
bergquist
0c6841bdc7 fix(singlestat): adds support for fontsizes in gagues 2016-04-19 16:18:22 +02:00
David Keijser
c455e501ac Add gauge option to singlestat 2016-04-19 16:18:09 +02:00
Mitsuhiro Tanda
2e5a1328a8 (cloudwatch) support interval template variable 2016-04-19 22:57:34 +09:00
bergquist
c148e54bbd style(influxdb): improve naming 2016-04-18 18:52:09 +02:00
bergquist
267ab822c2 tech(influxdb): uses hashmap for uniqueness 2016-04-18 18:46:50 +02:00
Torkel Ödegaard
39cdaf5175 ux(query-editors): more progress and fixes 2016-04-18 11:35:24 -04:00
bergquist
fde6eee4f4 fix(influxdb): adds support for multi table values
When quering for tag values without measurement
all tags and values should be shown

closes #4726
2016-04-18 16:27:06 +02:00
Torkel Ödegaard
8ebe9d1e16 Merge branch 'query-editor-style' of github.com:grafana/grafana into query-editor-style 2016-04-18 09:51:28 -04:00
Torkel Ödegaard
4515e66783 feat(query editors): more progress on ES query editor 2016-04-18 08:43:11 -04:00
Torkel Ödegaard
4c4835e869 ux(query-editors): more progress on elastic query editor 2016-04-17 22:04:43 -04:00
Torkel Ödegaard
a1faaa133c feat(): query editors, started work on updated ES query editor 2016-04-17 17:17:30 -04:00
Torkel Ödegaard
805fd18b7b feat(query editors): more work on query editors make over 2016-04-17 16:43:13 -04:00
Torkel Ödegaard
33f7b8479e ux(query editors): progress on new query editor styles 2016-04-17 12:14:25 -04:00
Torkel Ödegaard
68bd82f1b6 Merge branch 'master' into query-editor-style 2016-04-16 13:46:05 -04:00
Torkel Ödegaard
e307ada374 ux(): tooltip improvement 2016-04-15 19:56:39 -04:00
Nathan LaFreniere
b6de656cf1 dont quote numbers for influxdb, closes #4163 2016-04-14 17:08:54 -07:00
Matt Toback
d27da57b02 Fixed the fix. 2016-04-14 12:39:37 -04:00
Matt Toback
8ac5c36735 Still not fixed, not sure why.
despite having pushed that code with @torkelo.
2016-04-14 11:12:00 -04:00
Torkel Ödegaard
6355896584 fix(snapshots): Fixed issue with empty snapshots, fixes #4706 2016-04-14 11:06:48 -04:00
Torkel Ödegaard
6216ce455f fix(pluginlist): fixed issue with pluginlist link, fixes #4705 2016-04-14 10:55:24 -04:00
Matt Toback
c13ebce2f6 Update module.html 2016-04-12 17:01:30 -04:00
Torkel Ödegaard
ad0794cc59 ux(): updated light theme 2016-04-12 14:26:55 -04:00
Torkel Ödegaard
9868edb138 ux(): changed tooltip style 2016-04-12 13:00:33 -04:00
Torkel Ödegaard
29dff7ba1a fix(graph): fixed color picker appearingunder pinned side nav, fixes #4556 2016-04-12 11:07:34 -04:00
Torkel Ödegaard
329ee8d9f1 fix(prometheus): added template variable escape format to prometheus annotations queries, fixes #4656 2016-04-12 10:50:58 -04:00
Torkel Ödegaard
905d31442c fix(annotations): make sure a data source that supports annotations is used in annotation editor when creating new 2016-04-12 10:16:40 -04:00
Torkel Ödegaard
497e9343aa Merge branch 'pluginlist' 2016-04-11 21:10:54 -04:00
Torkel Ödegaard
6ce934f1dd feat(pluginlist): worked on plugin list 2016-04-11 20:33:58 -04:00
Matt Toback
f4fc3f48a7 New modal for upgrades and updated styles on list 2016-04-11 19:01:18 -04:00
Torkel Ödegaard
31441f0b43 feat(dashlist): updated dashlist 2016-04-11 16:21:25 -04:00
Torkel Ödegaard
451a8bef39 feat(pluginslist): minor update 2016-04-11 14:17:38 -04:00
Torkel Ödegaard
c518fdc155 Merge branch 'updatecheck' into pluginlist 2016-04-11 13:43:29 -04:00
Torkel Ödegaard
5a81cf6c17 Merge branch 'master' of github.com:grafana/grafana 2016-04-11 09:27:30 -04:00
Torkel Ödegaard
788a0154d3 Merge branch 'master' of github.com:grafana/grafana 2016-04-10 14:59:03 -04:00
Torkel Ödegaard
a8f4b0227f fix(graph): Fixed issue with legend height in table mode with few series, affected iframe embedding as well, fixes #4640 2016-04-10 14:58:52 -04:00
Torkel Ödegaard
cdf8c0fac9 Merge pull request #4635 from idanz/patch-2
Table module calls renderingCompleted
2016-04-10 14:09:34 -04:00
utkarshcmu
c100df412d Consistency in options for future support 2016-04-10 01:30:58 -07:00
Idan Zalzberg
cf00775bb8 Table module calls renderingCompleted 2016-04-10 11:00:25 +07:00
Torkel Ödegaard
97be3c05e6 feat(pluginlist panel): updates to pluginlist panel, hooked up plugin type categories 2016-04-09 15:32:41 -04:00
Torkel Ödegaard
4fd5552d3d Merge branch 'pluginlist' of github.com:grafana/grafana into pluginlist 2016-04-09 15:02:01 -04:00
Torkel Ödegaard
12800f831a Merge branch 'master' into pluginlist 2016-04-09 15:01:39 -04:00
Torkel Ödegaard
ebb373eedb fix(graph): fixed issue with toggling series on and off would loose stacking, fixes #4557 2016-04-09 14:37:30 -04:00
Torkel Ödegaard
262c341bdc fix(influxdb): fixed annotation queries containting template variables, fixes #4602 2016-04-09 13:09:03 -04:00
Torkel Ödegaard
22b11d7d4d feat(graph panel): changed to PR #4493 and other polish, removed the relative time from graph tooltip, did not think it worked that well 2016-04-09 12:45:35 -04:00
Torkel Ödegaard
034244217f Merge pull request #4493 from mtanda/highlight_tooltip
highlight series name in tooltip when shared tooltip enabled
2016-04-09 11:29:05 -04:00
Torkel Ödegaard
5d9c3d595f fix(graph): fixed issue with y-axis labels overlapping with the yaxis, fixes #4626 2016-04-09 11:26:48 -04:00
Torkel Ödegaard
ed62822d44 feat(influxdb): changed multi query encoding in order to support InfluxDB >v0.11, closes #4533 2016-04-09 11:00:35 -04:00
Matt Toback
cf750c53fd Few more style adjustments 2016-04-08 19:07:20 -04:00
Matt Toback
d2421d964a New styles almost ready 2016-04-08 18:46:45 -04:00
Torkel Ödegaard
52e2091f2c fix(): fixed issue with series override color selector when using the mouse to select color option, fixes #4620 2016-04-08 18:12:08 -04:00
Torkel Ödegaard
1a29a769c6 fix(series overrides): graph no rerenders with new styles after updating series override, fixes #4621 2016-04-08 17:43:13 -04:00
Torkel Ödegaard
d66d25ff14 feat(pluginlist): added plugin logo 2016-04-08 17:01:17 -04:00
Torkel Ödegaard
d70ef90bdd feat(): plugin list panel 2016-04-08 16:42:33 -04:00
Torkel Ödegaard
44cf66d7ff refactoring(): fixing event things 2016-04-07 19:23:20 -04:00
Torkel Ödegaard
b8baeac860 Merge branch 'master' of github.com:grafana/grafana 2016-04-07 11:00:56 -04:00
Torkel Ödegaard
a425ce0826 fix(graph panel): Fixed legend option max not updating, fixes #4601 2016-04-07 10:57:55 -04:00
Torkel Ödegaard
c3d88aa53d fix(graph panel): fixed issue where newly added graph panels shared axes config binding, fixes #4582 2016-04-06 15:27:29 -04:00
Vitor Boschi
ed1fe93648 Fix percentage checkbox naming. Fix #4584 2016-04-06 08:53:20 -03:00
Torkel Ödegaard
3c1e9e9a25 fix(table): fixed issue with table panel and annotations, fixes #4563 2016-04-05 09:05:34 -04:00
Torkel Ödegaard
6bb001e416 Merge branch 'master' into query-editor-style 2016-04-04 13:55:55 -04:00
Torkel Ödegaard
892e79a982 fix(table): another fix for table panel sorting, fixes #4544 2016-04-04 13:43:13 -04:00
Torkel Ödegaard
542e080f0a fix(graph): fixed issue with graph legend when in table mode and series on righ-y axis, also fixed so that you can see what series are on right-y axis when legend is in table mode, fixes #4551, fixes #1145 2016-04-04 13:13:25 -04:00
Adrian Lopez
9fbb1214ae Allow to show multiple tags with annotations with InfluxDB datasource 2016-04-04 16:57:34 +02:00
Torkel Ödegaard
c764e7fd97 fix(elasticsearch): add a better default terms size limit of 10, fixes #4013 2016-04-03 16:11:42 -04:00
Torkel Ödegaard
1c97f10d8a fix(table panel): fixed column sort issue with table panel, #4532 2016-04-03 16:01:48 -04:00
Torkel Ödegaard
d8499e6941 fix(influxdb): added regex start string char to templating suggestion, fixes #4405 2016-04-03 15:51:54 -04:00
Torkel Ödegaard
105a678d64 fix(): another test fix 2016-04-03 10:28:31 -04:00
Torkel Ödegaard
b30b78e442 feat(preferences): got timezone option to work on org and profile level, as well as dashboard 2016-04-03 06:05:43 -07:00
Pascal Borreli
eb850ddd36 doc(plugins): typo 2016-03-31 11:43:04 +01:00
Daniel Lee
45b90972dc feat(plugins): adds a readme for every native plugin 2016-03-30 23:33:30 +02:00
Torkel Ödegaard
7180d6aa07 Merge pull request #4504 from sebito91/master
Issue with templating latest InfluxDB v0.11.0, force query to lowercase
2016-03-30 13:20:48 -07:00
Torkel Ödegaard
49a1d4417d fix(dashlist): fixed dashlist bug 2016-03-30 09:49:07 -07:00
Mitsuhiro Tanda
0a13b7c559 highlight series name in tooltip when shared tooltip active 2016-03-30 22:46:46 +09:00
Torkel Ödegaard
2ee9376df2 ux(): form tweaks 2016-03-29 20:49:42 +02:00
Sebastian Borza
aa62c2eff6 Force the query check to lowercase for tag values, fix issue with templating influxdb v0.11.0 2016-03-29 12:36:21 -05:00
Torkel Ödegaard
50d773988b ux(): updated graphite editor 2016-03-29 19:17:32 +02:00
Torkel Ödegaard
d2239427f2 ux(): big progress on updating query editors 2016-03-29 19:03:24 +02:00
Torkel Ödegaard
24a7d4f816 ux(): query editors, added group by 2016-03-29 17:56:34 +02:00
Torkel Ödegaard
a4f9621473 Merge branch 'master' into query-editor-style 2016-03-29 17:45:24 +02:00
Torkel Ödegaard
d545902acc ux(): updated and polished legend option forms 2016-03-29 15:53:41 +02:00
Torkel Ödegaard
4871a8f43e refactor(graph): changed how graph stores panel yaxis options 2016-03-29 14:54:33 +02:00
Torkel Ödegaard
32c8f495ab ux(): redesign of axis & grid forms 2016-03-29 12:32:40 +02:00
Torkel Ödegaard
82ad5a632d tech(): fixed broken tests due to angularjs upgrade 2016-03-28 20:44:32 +02:00
Torkel Ödegaard
1dabd68327 Merge branch 'master' into checkboxv3 2016-03-28 11:22:23 +02:00
Torkel Ödegaard
576a490435 Merge pull request #4472 from volter/issue-3728
Solve issue #3728
2016-03-28 11:06:33 +02:00
Torkel Ödegaard
1ff90b713f Merge pull request #4473 from grafana/new-panel-icons
added new icons for default panels
2016-03-25 13:46:23 +01:00
Trent White
694c6e8fd2 added new icons for default panels 2016-03-24 16:14:51 -04:00
Volker Fröhlich
45186255cf Solve issue 3728
Conditionally add a format element to ES annotation queries
2016-03-24 17:58:03 +01:00
Torkel Ödegaard
481139772b Merge branch 'master' of github.com:grafana/grafana 2016-03-23 16:38:47 +01:00
Torkel Ödegaard
5dfac9a765 feat(plugins): added plugin logo to navbar on plugin page, #4452 2016-03-23 16:37:58 +01:00
bergquist
5f2f4a0897 test(influxdb): remove redundant test 2016-03-23 15:23:14 +01:00
bergquist
991b6eafca tech(influxdb): convert datasource to TS class 2016-03-23 14:45:24 +01:00
bergquist
5b75eea8cf fix(influxdb): remove unused parameter 2016-03-23 14:45:24 +01:00
bergquist
ba48f40d21 feat(influxdb): bases parsing upon query 2016-03-23 14:45:23 +01:00
bergquist
6fafc8dba1 add(influxdb): add support for 0.11.0 tags 2016-03-23 14:45:23 +01:00
bergquist
53312852e9 tests(influxdb): adds tests for influxdb response 2016-03-23 14:45:23 +01:00
Torkel Ödegaard
585503f9fb fix(): renamed plugin.json for wip for new work in progress data source 2016-03-23 13:11:55 +01:00
Torkel Ödegaard
4058c85e2a fix(): singlestat init 2016-03-23 13:02:37 +01:00
Torkel Ödegaard
b3c073ab6c feat(panels): more panel refactoring, using events instead of overriding base class methods 2016-03-23 12:50:56 +01:00
Torkel Ödegaard
6a42b95d39 feat(panels): panel refactorings 2016-03-23 11:31:31 +01:00
Torkel Ödegaard
cb49e11eca feat(live): panel sdk/api refactorings 2016-03-22 21:27:53 +01:00
Torkel Ödegaard
8dee54bf5d feat(live): progress on panel <-> data source communication patterns 2016-03-22 18:21:21 +01:00
bergquist
83b7397398 Revert "feat(influxdb): add support for 0.11.0 tags"
This reverts commit b73d196c6b.
2016-03-22 16:07:00 +01:00
bergquist
b73d196c6b feat(influxdb): add support for 0.11.0 tags
this change is backwards compatible.

closes #4392
2016-03-22 14:35:46 +01:00
Torkel Ödegaard
c711fb67c8 Merge branch 'master' into websocket 2016-03-22 10:31:57 +01:00
Torkel Ödegaard
98206ab49f ux(): created new gf-form-switch directive clean/refactoring 2016-03-21 21:24:06 +01:00
Torkel Ödegaard
fc983f9751 ux(): checkbox v2 tweaks 2016-03-21 14:08:18 +01:00
Torkel Ödegaard
ae255a7adf ux(): new checkbox tweaks 2016-03-21 13:37:56 +01:00
Torkel Ödegaard
530b6a5088 ux(): another checkbox design 2016-03-21 11:27:53 +01:00
Torkel Ödegaard
5e52aaac6f ux(): checkbox style test 2016-03-21 11:07:37 +01:00
Torkel Ödegaard
3ea441d1a0 feat(live): tricky 2016-03-21 10:42:10 +01:00
Torkel Ödegaard
bd6a68bfe5 ux(): more changes to influxdb query editor 2016-03-20 18:01:25 +01:00
Torkel Ödegaard
a5a244767a Merge branch 'master' into query-editor-style 2016-03-20 17:39:31 +01:00
Torkel Ödegaard
273311eed2 ux(graph styles tab): updated forms in graph styles tab 2016-03-20 17:33:30 +01:00
Torkel Ödegaard
55189200a4 ux(): updated query editor test 2016-03-20 16:18:31 +01:00
Torkel Ödegaard
4377e95c99 fix(graph legend): minor correction to last commit 2016-03-20 11:21:06 +01:00
Torkel Ödegaard
f4feb38089 fix(graph): fixed issue with graph and legend to the right in snapshots, closes #4400 2016-03-20 11:17:53 +01:00
Torkel Ödegaard
6d36641080 fix(text panel): fixed escaping issue with markdown in text panel, fixes #4409 2016-03-19 11:25:19 +01:00
Torkel Ödegaard
1ccde201be feat(live datasouces): moved from Observable to Subject 2016-03-18 13:52:26 +01:00
Torkel Ödegaard
9ddf22ea93 Merge branch 'master' into websocket 2016-03-17 10:16:05 +01:00
bergquist
57ecb276c8 fix(singlestat): use exact value for coloring
closes #4259
2016-03-16 16:04:35 +01:00
Torkel Ödegaard
0f6579801d Merge branch 'master' into websocket
Conflicts:
	public/app/core/core.ts
2016-03-16 15:19:32 +01:00
Torkel Ödegaard
0d7eb18d7b Merge branch 'master' of github.com:grafana/grafana 2016-03-16 10:32:24 +01:00
Torkel Ödegaard
81c11ebb53 fix(dashlist): fixed issue with viewing last viewed dashboards, when you had more than dashboards in last viewed than panel limit they did not show up in list 2016-03-16 10:32:11 +01:00
Mitsuhiro Tanda
381a48f21d (cloudwatch) remove duplicative attribute 2016-03-16 15:41:52 +09:00
Trent White
cba7c1726f add graphite logo to datasource card 2016-03-15 10:08:23 -04:00
Torkel Ödegaard
b273cd1339 Merge branch 'master' into websocket 2016-03-15 09:52:36 +01:00
Torkel Ödegaard
82eb32a71e ux(): initial pass at new card / list design, #4364 2016-03-15 09:15:24 +01:00
Torkel Ödegaard
2e1f26096f feat(grafana_live): more work pushing data to websocket, #4355 2016-03-14 22:26:43 +01:00
Sean Kenny
8f97e8d5ed Fix minor typo in tooltip 2016-03-14 19:40:23 +00:00
Torkel Ödegaard
92f20b9b7d feat(websocket): reconnection and resubscription handling, #4355 2016-03-14 19:21:32 +01:00
Torkel Ödegaard
2adc4d12be feat(live): work on websocket data source, #3455 2016-03-14 13:20:55 +01:00
Torkel Ödegaard
fbd94fc6ce feat(websockets): inital work on websockets, #4355 2016-03-14 11:59:51 +01:00
Torkel Ödegaard
d575a5ce12 feat(plugins): added prometheus dashboard to prometheus data source, #4298 2016-03-12 10:40:55 +01:00
Torkel Ödegaard
0398face05 feat(plugins): dashboard import for data sources is working! #4298 2016-03-12 10:13:49 +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
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
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
78b9c3004a feat(plugins): minor progress on dashboard imports 2016-03-10 14:28:31 +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
dfaa6d8eb9 feat(plugins): a lot of work on #4298 2016-03-08 18:17:47 +01:00
Kaveh Nowroozi
945131ccab add annotations for opentsdb 2016-03-08 10:47:36 -05: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
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
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
4cd4ce504d feat(plugins): worked on markdown support for plugin page, #4275 2016-03-07 18:03:45 +01:00
Torkel Ödegaard
135679096b feat(plugins): progress on plugin details page, # 4275 2016-03-07 14:31:17 +01:00
bergquist
435d0f22f5 fix(dashlist): better handling of invalid dashboard ids 2016-03-07 11:04:02 +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
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
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
Shani Elharrar
f121e8309d ElasticSearch Terms & Date Histogram: Support 'missing' setting 2016-03-03 22:34:28 +02:00
Torkel Ödegaard
8ed8bfb8bc feat(prometheus): added special regex escape for prometheus, fixes #4234 2016-03-03 10:49:30 +01:00
utkarshcmu
48f5a61564 Grafana supports ms resolution for Opentsdb 2016-03-02 02:14:58 -08: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
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
b6ac0860c6 Merge branch 'ms-detection' of https://github.com/utkarshcmu/grafana into utkarshcmu-ms-detection 2016-03-01 13:55:59 +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
Torkel Ödegaard
8f5a7f1764 feat(templating): more work on context specific varaiable formats, #2918 2016-03-01 10:51:39 +01:00
utkarshcmu
922b7c44ce Added some more test for sanity 2016-03-01 01:15:29 -08:00
utkarshcmu
8bc63e9029 Added spec tests for millisecond resolution 2016-03-01 01:09:14 -08:00
utkarshcmu
77f6449db9 Added millisecond detection in series 2016-03-01 00:20:34 -08:00
Torkel Ödegaard
f3ad71d751 feat(templating): lots of progress on template variable context specific formats, #2918, all elasticsearch / lucene use cases seem to work now 2016-03-01 08:43:54 +01:00
bergquist
ad9b2ab617 fix(impressionStorage): use title instead of slut
closes #4194
2016-02-29 19:51:35 +01:00
Torkel Ödegaard
cb8b038795 feat(templating): progress on templating rethink 2016-02-29 17:31:31 +01:00
Torkel Ödegaard
078e69d06d feat(templating): simplified templating forms removed all formats 2016-02-29 17:07:53 +01:00
bergquist
854c360def Merge branch 'plopp-master' 2016-02-29 15:02:14 +01:00
bergquist
0cbb95ed1e fix(export_csv): rename export to csv label 2016-02-29 15:01:26 +01:00
bergquist
d8929b1d3e Merge branch 'master' of https://github.com/plopp/grafana into plopp-master 2016-02-29 14:58:38 +01:00
Carl Bergquist
fa99a6745d Merge pull request #4192 from bergquist/last_viewed_dashboards
feat(dashlist): list last x viewed dashboards
2016-02-29 14:51:20 +01:00
bergquist
b79217be1e feat(impressionStore): remove un needed js-ts bridge 2016-02-29 14:37:09 +01:00
bergquist
e5970e83ff feat(dashlist): list last x viewed dashboards
closes #3896
2016-02-29 14:14:43 +01:00
Carl Bergquist
1fb38abf6b Merge pull request #4063 from mtanda/timeshift_template
timeFrom and timeShift templating
2016-02-29 11:11:45 +01:00
bergquist
c30c12d369 fix(single_stat): rounding bug in value => text 2016-02-29 10:05:41 +01:00
Mitsuhiro Tanda
09dfaf9875 timeFrom and timeShift templating 2016-02-29 17:53:41 +09:00
Carl Bergquist
02b2c7482a Merge pull request #4138 from utkarshcmu/tsdb-refac2
Opentsdb 2.2 support without breaking 2.1
2016-02-29 06:55:41 +01:00
Torkel Ödegaard
6fd0d5e267 Merge pull request #4178 from mtanda/prometheus_template_label
(prometheus) fix label_values() templating
2016-02-28 16:40:37 +01:00
utkarshcmu
18c57ea230 Made opentsdb query_ctrl robust 2016-02-28 01:50:50 -08:00
utkarshcmu
a883424d25 smooth upgrade from Grafana 2.6 to 3.0 2016-02-28 01:50:11 -08:00
utkarshcmu
7fa170cee9 Fixed the UI as per new UX convention 2016-02-28 01:50:10 -08:00
utkarshcmu
8925329950 Added default opentsdb version to datasource 2016-02-28 01:50:10 -08:00
utkarshcmu
4aa5dab62d Added query ctrl tests for Opentsdb 2016-02-28 01:50:10 -08:00
utkarshcmu
09e80f0390 Labels fixed in legend for Filters 2016-02-28 01:49:34 -08:00
utkarshcmu
63dfa303e5 Datasource working with filters after fixing bugs 2016-02-28 01:49:34 -08:00
utkarshcmu
599b1eb689 Smooth transition from opentsdb 2.1 to 2.2 2016-02-28 01:49:34 -08:00
utkarshcmu
4a636b6da7 add, edit, remove filters functionality implemented 2016-02-28 01:49:34 -08:00
utkarshcmu
d92172f50c Added Filters UI 2016-02-28 01:49:34 -08:00
utkarshcmu
2623240635 Fill Policy visible only in <=2.2 2016-02-28 01:49:34 -08:00
utkarshcmu
908e8577bb Removed unused code from datasource.js 2016-02-28 01:49:33 -08:00
utkarshcmu
f90fda8e6f Tracking opentsdb version in opentsdb config 2016-02-28 01:49:33 -08:00
Torkel Ödegaard
b56a2c14bb Merge pull request #4161 from godfreyhe/fix_bug_getAggregators
fix bug: can't get the aggregators from opentsdb server
2016-02-28 07:52:02 +01:00
Mitsuhiro Tanda
3125177e5c (prometheus) fix label_values() templating 2016-02-28 13:33:29 +09:00
godfreyhe
7810413699 use ES6 arrow function instead of self var on getAggregators 2016-02-28 11:48:54 +08:00
godfreyhe
8e7a127792 fix bug: can't get the aggregators from opentsdb server 2016-02-26 20:47:22 +08:00
bergquist
6afe2c4e9f ux(influxdb): query options minor changes 2016-02-26 13:25:31 +01:00
bergquist
be69e2c02c ux(influxdb): tight-form -> gf-form 2016-02-26 11:58:59 +01:00
Torkel Ödegaard
30f3b55baf fix(prometheus): set default templating format to pipe 2016-02-25 10:26:07 +01:00
Torkel Ödegaard
f6c49daaa6 Merge branch 'master' of github.com:grafana/grafana 2016-02-24 19:33:08 +01:00
Torkel Ödegaard
22ae259cf5 ux(): varios tweaks and polish 2016-02-24 17:49:08 +01:00
bergquist
0525bf5d4e ux(table): tight-form -> gf-form 2016-02-24 10:42:53 +01:00
bergquist
59d2fe8aa4 ux(dashlist_options): tight-form -> gf-form 2016-02-24 10:09:12 +01:00
Torkel Ödegaard
a11396c901 Merge branch 'annotations-v2' 2016-02-23 08:42:08 +01:00
Torkel Ödegaard
cd52c24e87 feat(annotations): more work on new annotations 2016-02-23 08:42:03 +01:00
Torkel Ödegaard
2e52008542 feat(annotations): updated editor, removed line color and icon size 2016-02-23 08:22:00 +01:00
Torkel Ödegaard
a6a5f393cc feat(annotations): updated flot events lib and refactored it to use tether-drop lib 2016-02-23 08:09:56 +01:00
Carl Bergquist
f788c8cb37 Merge pull request #3632 from mtanda/cloudwatch_annotation_describe_alarms
(cloudwatch) multiple CloudWatch alarm annotation support
2016-02-23 07:41:10 +01:00
Torkel Ödegaard
fa5cf602f5 removed old popover and unused boostrap components 2016-02-22 18:56:35 +01:00
Torkel Ödegaard
c94659f552 ux(color popover): refactored color popover to use drop lib 2016-02-22 18:46:58 +01:00
Torkel Ödegaard
3f05b4bb1e fix(annotations): updated annotations query editor 2016-02-22 14:54:19 +01:00
Torkel Ödegaard
9eabd956b7 ux(): tweak to help popover annimation and fixed pull-right state 2016-02-22 14:20:43 +01:00
Torkel Ödegaard
cb83c237f4 Merge branch 'master' of github.com:grafana/grafana
Conflicts:
	public/sass/_grafana.scss
2016-02-22 12:00:57 +01:00
bergquist
f225bb0032 ux(annotations): migrate annotations editors to new form 2016-02-22 10:07:02 +01:00
Torkel Ödegaard
363f36dfae ux(): tweaks 2016-02-21 15:21:01 +01:00
Torkel Ödegaard
ac45ccbad7 fix(panel): fixed text panel issue due to recent style changes, fixes #4095 2016-02-21 08:51:01 +01:00
Torkel Ödegaard
9c47fdeb2f ux(): tweaks to light theme 2016-02-21 00:31:35 +01:00
Torkel Ödegaard
52241b8e0b ux(): completed gf-size class rename 2016-02-20 14:48:10 +01:00
Torkel Ödegaard
701a2fdcf3 ux(): tweaks and polish, and also simpifying width classes, gf-size-xxx and gf-size-max-xx are now width-(1-30), and max-width-(1-30) 2016-02-20 14:21:39 +01:00
Torkel Ödegaard
995f17493e ux(): updated influxdb datasource edit forms 2016-02-20 12:55:47 +01:00
Torkel Ödegaard
2f2326006d Merge remote-tracking branch 'origin/master' into style-changes-bulletfactory 2016-02-18 13:37:31 +01:00
Torkel Ödegaard
3003a8cb6e ux(sass): a lot of polish on headings and margins, ONLY USE bottom margins, othewise margin collapse causes issues 2016-02-18 12:16:47 +01:00
bergquist
63ca9f6f5a fix(legend): only add overflow scroll when needed
In firefox the scrollbar is always show when setting
overflow: scroll. This commit makes sure the overflow
setting is only applied when needed.

closes #4049
2016-02-18 11:08:13 +01:00
Torkel Ödegaard
ffc9a8322b Merge pull request #4054 from mtanda/cloudwatch_template_dimension_fix
(cloudwatch) fix template replace in legend
2016-02-17 06:11:26 +01:00
Mitsuhiro Tanda
f28eec8be3 (cloudwatch) fix template replace with panel repeat 2016-02-17 11:59:53 +09:00
Mitsuhiro Tanda
807c052fea (cloudwatch) fix dimension template replace in legend 2016-02-17 11:55:11 +09:00
Torkel Ödegaard
41b775561a ux(): datasource form tweaks 2016-02-16 07:57:58 +01:00
Marcus Kempe
14312d225c Added exporting graph data to CSV with series.alias in columns. 2016-02-15 22:49:25 +01:00
Torkel Ödegaard
37b031afcf ux(css): more progress on css refactor / cleanup 2016-02-14 22:33:03 +01:00
Torkel Ödegaard
92f4442356 fix(influxdb): fixed annotations editor, broken recently in master due to plugin changes, fixes #4023 2016-02-14 10:39:20 +01:00
Carl Bergquist
c483b2ff98 Merge pull request #3999 from mtanda/cloudwatch_custom_metrics_namespace
(cloudwatch) custom metrics namespace support
2016-02-12 09:47:42 +01:00
Torkel Ödegaard
87fc83678c feat(imports): work on datasource dashboards 2016-02-11 21:02:01 +01:00
Mitsuhiro Tanda
81ad469533 (cloudwatch) custom metrics namespace support 2016-02-12 00:30:33 +09:00
Torkel Ödegaard
4e33e80957 fix(): clicking on items in graphites add function menu did not work, now works again, broken in recent panel refactorings 2016-02-11 15:25:34 +01:00
utkarshcmu
4c35c83b84 Minor html fix 2016-02-10 11:13:17 -08:00
Torkel Ödegaard
ae39ec8585 feat(plugins): changed so that plugins can load css async via util function exposed from app/plugins/sdk 2016-02-10 13:09:39 +01:00
Torkel Ödegaard
257b824d4f feat(plugins): better logging and handling of loading plugins, try to create plugins dir if it does not exist, fixes #3974 2016-02-10 11:03:12 +01:00
Mitsuhiro Tanda
5c7689388d fix template url for annotation editor 2016-02-10 11:42:59 +09:00
Torkel Ödegaard
8784be9a14 feat(plugins): made it possible to have relative plugin template urls 2016-02-09 18:17:32 +01:00
bergquist
e7ff018487 feat(table): uses lodash to escape html 2016-02-09 11:16:07 +01:00
bergquist
ddb1d0c684 fix(table): escape / chars as well 2016-02-09 11:14:08 +01:00
bergquist
7d89cf228c fix(table): remove html for htmlencoding option 2016-02-09 11:14:08 +01:00
bergquist
5775c0a341 feat(table): remove option to disable html encoding 2016-02-09 11:14:08 +01:00
bergquist
d750908e36 feat(table): escape html by default
closes #3673
2016-02-09 11:14:08 +01:00
bergquist
b1a648608b test(table): rewrite invalid tests 2016-02-09 11:14:08 +01:00
Mitsuhiro Tanda
2cce057df1 (prometheus) add query result template query 2016-02-09 01:37:43 +09:00
Carl Bergquist
a3b6efdbfa Merge pull request #2883 from mtanda/prometheus_annotation_support
Prometheus annotation support
2016-02-08 14:51:59 +01:00
Torkel Ödegaard
9c0da733e8 Merge branch 'master' of github.com:grafana/grafana 2016-02-08 10:31:36 +01:00
Torkel Ödegaard
de90ad8967 feat(influxdb): escape influxdb tag values, fixes #3950 2016-02-08 10:31:26 +01:00
bergquist
73bed3880f feat(graph): sets fixed height for right side legend
closes #1277
2016-02-08 09:49:53 +01:00
bergquist
edebdb166e fix(graph): add missing ctrl in variable 2016-02-08 09:24:30 +01:00
Torkel Ödegaard
a5d1e9ee43 fix(singlestat): fix for singlestat background and sparklines, fixes #3955 2016-02-07 18:37:07 +01:00
Torkel Ödegaard
801129530e feat(plugins): base clases are now in app/plugins/sdk 2016-02-05 18:08:21 +01:00
bergquist
f8b3c0a64c feat(influxdb): add default interval setting
closes #1552
2016-02-05 15:10:33 +01:00
Torkel Ödegaard
853cd16336 fix(search); fixes to dashboard search (using keyboard), and fix for singlestat in snapshot view 2016-02-05 13:48:10 +01:00
Torkel Ödegaard
9fc0a83b83 Merge branch 'master' of github.com:grafana/grafana 2016-02-05 11:08:44 +01:00
Torkel Ödegaard
aa8bd044c5 fix(): various fixes to snapshots 2016-02-05 11:05:47 +01:00
Carl Bergquist
59cb429d2d Merge pull request #3949 from bergquist/table_panel_thresholds
tablepanel: using two thresholds
2016-02-05 10:38:31 +01:00
Torkel Ödegaard
273fbaac68 refactor(): minor changes 2016-02-05 10:37:14 +01:00
bergquist
8ff997594f fix(tablepanel): change to using two thresholds
fixes #3878
2016-02-05 10:30:46 +01:00
Torkel Ödegaard
f188900379 Merge branch 'master' of github.com:grafana/grafana 2016-02-05 08:50:31 +01:00
Torkel Ödegaard
f80d5f8c03 refactor(): minor refactor 2016-02-05 08:50:15 +01:00
Torkel Ödegaard
1bce8f6669 Merge pull request #3736 from mtanda/cloudwatch_custom_metrics_alpha
(cloudwatch) custom metrics support
2016-02-05 08:44:50 +01:00
Torkel Ödegaard
660ce3a61d fix(row editor): row editor fix and cleanup of unused code 2016-02-04 22:19:46 +01:00
Torkel Ödegaard
33dc9fdd76 fix(inspector): fixed broken panel error inspect 2016-02-04 15:23:40 +01:00
Torkel Ödegaard
316e1aac67 fix(build): minor fix 2016-02-04 15:12:44 +01:00
Torkel Ödegaard
2ed3cd7f1a Merge branch 'master' of github.com:grafana/grafana 2016-02-04 15:04:20 +01:00
Torkel Ödegaard
14cc771cbe feat(plugins): made panels loaded via plugin-componet directive 2016-02-04 15:04:07 +01:00
Torkel Ödegaard
2a8b96b680 feat(plugins): last refactoring of how panels are implemented, now the same way as plugin editors 2016-02-04 14:36:19 +01:00
Torkel Ödegaard
6f923ecd17 Merge pull request #3901 from bobrik/opentsdb-tag-name-suggestions
Show relevant tag name suggestions for OpenTSDB, closes #3610
2016-02-04 14:30:33 +01:00
Torkel Ödegaard
501f21b16c fix(dashlist): fix for entering dashboard list edit mode 2016-02-04 13:58:43 +01:00
Ivan Babrou
f4ad673b6d Show relevant tag name suggestions for OpenTSDB, closes #3610 2016-02-04 10:57:19 +00:00
Torkel Ödegaard
37ff432f9d fix(influxdb): fix for influxdb when using format as table and having group by time, fixes #2928 2016-02-04 09:48:17 +01:00
Mitsuhiro Tanda
20283a46f9 fix annotation editor error 2016-02-04 14:14:19 +09:00
Mitsuhiro Tanda
634699c8e2 fix prometheus datasource plugin 2016-02-04 14:10:27 +09:00
Mitsuhiro Tanda
7d97f381cf fix tslint error 2016-02-04 14:09:59 +09:00
Mitsuhiro Tanda
7a1326ff14 follow new plugin format 2016-02-04 14:06:01 +09:00
Mitsuhiro Tanda
ee84d4371b fix prometheus annotation, reflect API change 2016-02-04 14:05:51 +09:00
Mitsuhiro Tanda
f8b05e0f42 add prometheus annotation query 2016-02-04 14:05:44 +09:00
Mitsuhiro Tanda
a4e5b7ea37 fix cloudwatch test error 2016-02-04 13:21:29 +09:00
Mitsuhiro Tanda
a20443b577 (cloudwatch) refactor annotation query 2016-02-04 13:16:55 +09:00
Mitsuhiro Tanda
defb15bea1 CloudWatch multiple alarm annotation support 2016-02-04 13:16:55 +09:00
Mitsuhiro Tanda
10016d9d38 add CloudWatch DescribeAlarms API support 2016-02-04 13:14:03 +09:00
Mitsuhiro Tanda
73ec486434 (cloudwatch) custom metrics support 2016-02-04 13:07:02 +09:00
Torkel Ödegaard
80e15dd754 feat(css): minor css tweaks 2016-02-03 19:41:39 +01:00
Torkel Ödegaard
de394311e0 feat(datasources): minor fix for optimized build for the refactored query editors 2016-02-03 19:10:01 +01:00
Torkel Ödegaard
908765e0e7 feat(plugins): various fixes entering edit mode after adding a new panel 2016-02-03 18:49:36 +01:00
Torkel Ödegaard
0da733de9c feat(plugins): migrated opentsdb plugin 2016-02-03 18:25:39 +01:00
Torkel Ödegaard
2fc8da7a87 feat(plugins): migrated cloudwatch and fixed a bunch of issues with data source edit views 2016-02-03 17:01:53 +01:00
Torkel Ödegaard
0bea6aba63 feat(plugins): migrated elasticsearch to new plugin editor model, also minor fixes 2016-02-03 16:31:07 +01:00
Torkel Ödegaard
eecf844ca2 feat(plugins): migrated influxdb query editor to new plugin model 2016-02-02 22:58:37 +01:00
Torkel Ödegaard
05dfccbb74 feat(plugins): moved annotation editor to new plugin component loader 2016-02-02 18:16:30 +01:00
Torkel Ödegaard
fc829b32d9 feat(plugins): minor fixes to breaking out query editor row into reusable component 2016-02-02 16:57:05 +01:00
Torkel Ödegaard
f2700822e9 feat(plugins): extracted first plugin row to its own component 2016-02-02 16:32:36 +01:00
Torkel Ödegaard
21f6c07686 feat(plugins): more progress on plugin editors 2016-02-02 15:15:20 +01:00
Torkel Ödegaard
356f7b9db6 feat(plugins): good progress on converting query editors, graphite's query ctrl is now working as is unit tests 2016-02-02 13:07:54 +01:00
Torkel Ödegaard
822c8f1575 feat(plugins): migrating graphite query editor to new model 2016-02-02 12:52:43 +01:00
Torkel Ödegaard
efdd4a6682 feat(plugins): more work on plugin editors,prometheus query editor is working 2016-02-02 10:19:15 +01:00
Torkel Ödegaard
eaaf9246b7 feat(plugins): more work on refining datasource editors 2016-02-02 09:12:58 +01:00
Torkel Ödegaard
0583ec0f93 feat(plugins): more work on plugin directives and isolation 2016-02-01 23:32:12 +01:00
Torkel Ödegaard
12f487e223 feat(plugin-editors): more work on plugin editor loading 2016-02-01 23:24:08 +01:00
Torkel Ödegaard
30a8a434a1 Merge branch 'master' into plugin-editors
Conflicts:
	public/app/features/panel/panel.ts
	public/app/features/panel/panel_directive.js
	public/app/plugins/datasource/grafana/module.ts
2016-02-01 21:37:36 +01:00
Torkel Ödegaard
78598df96e fixes(): fixes for changed app -> public/app paths and fixes for optimized build 2016-02-01 19:00:40 +01:00
Torkel Ödegaard
e737dab5ca removed /app route, confusing when some assets use public/app/.. route and some use just app/... all public static assets should no use public route, app route is no more 2016-02-01 18:19:02 +01:00
Torkel Ödegaard
0b25a29a9c Merge branch 'panelbase' 2016-02-01 17:11:08 +01:00
Torkel Ödegaard
b1bfd35968 feat(datasources): last fixes for data sources 2016-02-01 17:06:44 +01:00
Torkel Ödegaard
a053552fee fixes to data source query editors 2016-02-01 13:51:47 +01:00
Torkel Ödegaard
6886faa944 feat(plugins): fixed cloudwatch query editor 2016-02-01 13:30:20 +01:00
Torkel Ödegaard
c843637a6a more progress on some experimental stuff 2016-02-01 13:02:11 +01:00
Torkel Ödegaard
2f78584cdb poc(plugin editors): experimential test for plugin editors 2016-02-01 12:42:10 +01:00
Torkel Ödegaard
2e20c680cb Merge pull request #3892 from pfischermx/master
Allow the use of auth and credentials in opentsdb
2016-02-01 11:01:15 +01:00
Pablo Fischer
f33de8e911 Fix lint/syntax (grunt test) 2016-02-01 09:29:57 +00:00
Torkel Ödegaard
3f945e886b merge sync with master 2016-01-31 19:51:23 +01:00
Torkel Ödegaard
931d7cd039 Merge branch 'master' into panelbase 2016-01-31 16:57:04 +01:00
Pablo Fischer
98082a940c Allow the use of auth and credentials in opentsdb 2016-01-30 01:09:55 +00:00
Daniel Lee
2897f618a6 Merge pull request #3880 from vitorboschi/fix3877
add default value for fill policy
2016-01-29 21:44:08 +01:00
Vitor Boschi
bb3360e92a add default value for fill policy 2016-01-29 07:50:30 -02:00
Torkel Ödegaard
05e8c576a2 feat(panels): updated influxdb editor to use panelCtrl 2016-01-28 19:07:53 -05:00
Torkel Ödegaard
3c3d3c9ec6 feat(): fixed share modal 2016-01-28 18:05:49 -05:00
Torkel Ödegaard
56c76f380b feat(panels): fixes 2016-01-28 16:48:37 -05:00
bergquist
64fa9a6394 fix(singlestat): add ngInject for controller
fixes #3879
2016-01-28 22:27:17 +01:00
Torkel Ödegaard
600ffa727e feat(panels): fixes 2016-01-28 14:19:24 -05:00
Torkel Ödegaard
9bd3b417c4 feat(panels): upgraded table panel to latest plugin model 2016-01-28 12:48:43 -05:00
Torkel Ödegaard
a985f21d44 Merge pull request #3849 from pfischermx/master
Send OpenTSDB POST request as urlencoded
2016-01-28 09:53:16 -05:00
Torkel Ödegaard
307c86fc28 feat(panels): fixed singlestat tests 2016-01-27 19:16:33 -05:00
bergquist
72a64388b5 fix(tests): remove only in spec 2016-01-28 01:14:12 +01:00
bergquist
1210fca8e5 fix(singlestat): fix bug in threshold calculations 2016-01-28 01:11:52 +01:00
Torkel Ödegaard
97ac81aa9c feat(panels): upgradede singlestat panel 2016-01-27 19:07:39 -05:00
Torkel Ödegaard
57d22fb93f Merge remote-tracking branch 'origin/master' into panelbase 2016-01-27 17:33:33 -05:00
Torkel Ödegaard
f0f7da9ff0 feat(panels): fixing broken stuff 2016-01-27 17:16:00 -05:00
Torkel Ödegaard
9c1217cd2c updated 2016-01-27 14:32:19 -05:00
Torkel Ödegaard
34b82caaa8 feat(panels): fixed unit tests 2016-01-27 12:51:01 -05:00
Carl Bergquist
a1b5aae958 Merge pull request #3866 from daniellee/issue3852
fix(graph): narrow panels shows correct date format on x-axis
2016-01-27 17:45:31 +01:00
sgarg7
75ab2e026d test(spelling): fix spelling/typo in string 2016-01-27 17:38:02 +01:00
Daniel Lee
f43e1ab2ff fix(graph): narrow panels shows right date format on x-axis
fixes #3852. The function that calculates the date format for
the x-axis on a panel takes the panel width into account and
can be wrong for certain date ranges if the panel is too
narrow. E.g. can show dates in format %m/%d %H:%M when it
should show it as %H:%M
2016-01-27 17:23:02 +01:00
Torkel Ödegaard
51a32a2bfa feat(panels): fixes 2016-01-26 18:08:08 -05:00
Torkel Ödegaard
e6013353d2 fix series overrides 2016-01-26 17:54:57 -05:00
Torkel Ödegaard
aac190eaa9 feat(panels): graph panel starting to work 2016-01-26 17:50:18 -05:00
Torkel Ödegaard
ebba7a0327 feat(graph): updating graph panel to new format progress 2016-01-26 17:28:07 -05:00
Gueust
269583a6a1 Serialize an elasticsearch error previously printed as 'Object' 2016-01-26 23:15:54 +01:00
Torkel Ödegaard
aa251fc9ce feat(panels): upgraded dashlist panel to new format 2016-01-26 12:22:46 -05:00
Torkel Ödegaard
cc375f48c7 feat(panels): minor fix 2016-01-26 11:34:58 -05:00
Pablo Fischer
29185eeef7 If OpenTSDB is 3rd-party hosted (or by another team) and does not support OPTIONS, send the request as POST (urlencoded) 2016-01-26 00:12:56 +00:00
Torkel Ödegaard
53dc21c69b feat(panels): minor fixes 2016-01-25 17:58:41 -05:00
Torkel Ödegaard
b0dd79cbfd feat(panels): MetricsPanelCtrl is starting to work 2016-01-25 17:51:18 -05:00
Torkel Ödegaard
c30b1b126d feat(panels): minor progress 2016-01-25 15:58:24 -05:00
Torkel Ödegaard
9c6698e87b feat(panels): progress on new panel infrastructure, base classes 2016-01-25 15:09:37 -05:00
bergquist
b939a27a8d revert f3bc726001bfbc707597bce5fa169b46e992eb7ao
This change have caused alot of questions. So we revert
2016-01-25 18:40:28 +01:00
Torkel Ödegaard
73af4df96d feat(panels): upgraded text panel 2016-01-25 11:41:20 -05:00
bergquist
cd1b2e2841 feat(singlestat): reduce max thresholds to two.
closes #3248
2016-01-25 16:27:58 +01:00
bergquist
b0a24ae4aa tech(singlestat): move singlestat test to plugin
and change to typescript
2016-01-25 16:13:45 +01:00
Torkel Ödegaard
11e35f7b68 Merge remote-tracking branch 'origin/master' into panelbase 2016-01-25 10:00:25 -05:00
Torkel Ödegaard
8f4cf6c797 feat(panels): updated text panel to new format 2016-01-25 09:56:17 -05:00
Torkel Ödegaard
3e14f8a0e5 feat(): panel refactoring 2016-01-24 18:44:21 -05:00
Torkel Ödegaard
a950ff9795 feat(panel): more panel base infrastructure 2016-01-24 17:58:08 -05:00
Torkel Ödegaard
4132cf12e3 feat(panels): more panel refactoring 2016-01-24 17:30:29 -05:00
Torkel Ödegaard
4f7fb40d9b feat(panel plugin): improving panel plugin model 2016-01-24 16:39:25 -05:00
bergquist
42802ac710 tech(singlestat): convert singlestat panel to typescript 2016-01-24 18:56:10 +01:00
Torkel Ödegaard
94a7e9b185 poc(panel): experimental panel stuff 2016-01-22 19:59:36 +01:00
Torkel Ödegaard
0796b2c0e3 poc(panel as isolated compoennts): experimental panel stuff 2016-01-21 17:46:57 +01:00
Ivan Babrou
bbfdbaf952 Support OpenTSDB 2.2 fill policies, closes #3802 2016-01-21 16:38:46 +00:00
Torkel Ödegaard
7b4fe824ec Merge branch 'master' into panelbase 2016-01-21 15:29:14 +01:00
bergquist
28fabadeae style: remove empty row 2016-01-21 15:13:06 +01:00
bergquist
ba65b89bbb feat(csv export): extract csv export into a new file 2016-01-21 14:22:39 +01:00
Torkel Ödegaard
3d353c7d6d fix(mixed datasource): fixed issue with mixed data source in optimized build 2016-01-21 13:14:25 +01:00
Torkel Ödegaard
cbb5811d8b fix(cleanup): removed unused js file 2016-01-21 11:40:04 +01:00
matteo brancaleoni
cdcc7a7172 add export to csv in table panel 2016-01-21 10:02:23 +01:00
Torkel Ödegaard
8dd118bd86 updated 2016-01-20 09:45:24 +01:00
Torkel Ödegaard
3e3b996963 feat(plugin): experimental work on plugin architecture 2016-01-19 21:57:58 +01:00
Torkel Ödegaard
7a26d309b1 feat(apps): more work on apps and how apps can include panels 2016-01-19 18:18:53 +01:00
utkarshcmu
54383a9a0c Fix failing circleci 2016-01-19 00:08:55 -08:00
Torkel Ödegaard
510a21195a feat(influxdb): support for policy selection in query editor, closes #2018 2016-01-18 18:38:36 +01:00
Torkel Ödegaard
3b5a583903 Merge branch 'master' into influxdb-policy-selector 2016-01-18 18:10:01 +01:00
Torkel Ödegaard
1d4803cff0 fix(singlestat): fixed issue with singlestat and drilldown link introduced in recent commit, fixes #3777 2016-01-18 16:18:04 +01:00
Torkel Ödegaard
edcef7d078 fix(graph): fixed for graph series color selector popover, broken in recent 3.0-pre1 build, fixes #3774 2016-01-18 12:12:05 +01:00
Torkel Ödegaard
1adb7b286c updated 2016-01-18 07:28:01 +01:00
Torkel Ödegaard
a8e3f731b7 feat(influxdb): began work on influxdb policy selector 2016-01-17 17:53:38 +01:00
Torkel Ödegaard
2bfded3c5f ux(): general ux polish 2016-01-15 14:42:59 +01:00
Torkel Ödegaard
d4e1a715eb fix(datasources): many datasources did not work in optimized build due to missing ngInject comment 2016-01-15 12:51:55 +01:00
Torkel Ödegaard
2ccc19185c fix(text panel): fix for text panel in optimized builds, introduced in recent commit due to plugin api changes 2016-01-14 19:14:02 +01:00
Torkel Ödegaard
b5726a8d5a feat(plugins): completed upgrade of all built in panels 2016-01-14 18:57:02 +01:00
Torkel Ödegaard
1d9ad9be33 feat(plugins): upgraded singlestat to new plugin format 2016-01-14 17:20:50 +01:00
Torkel Ödegaard
a233570777 feat(plugins): upgraded opentsdb and prometheus to new plugin module return format 2016-01-14 16:01:17 +01:00
Torkel Ödegaard
6fae264222 feat(plugins): upgraded influxdb to new plugin format 2016-01-14 15:35:14 +01:00
Torkel Ödegaard
8699d49f93 feat(plugins): updated cloudwatch to new plugin style 2016-01-14 15:15:45 +01:00
Torkel Ödegaard
c4ce3293a2 feat(plugins): now solved all cases of loading plugin directives, now just have to upgrade all panels and data sources 2016-01-14 14:37:04 +01:00
Torkel Ödegaard
dbafc8c9db feat(plugins): work on plugin directive loading 2016-01-14 13:21:05 +01:00
Torkel Ödegaard
6c6c3a5081 feat(plugins): more work on how plugins expose directives 2016-01-14 12:35:31 +01:00
Torkel Ödegaard
d420cb38d1 feat(plugins): work on plugin directives loading 2016-01-14 11:21:56 +01:00
Torkel Ödegaard
08caf4bbde feat(tslint): more tslint work 2016-01-13 21:22:39 +01:00
Mitsuhiro Tanda
c317149a08 add test for prometheus fill null 2016-01-13 15:59:59 +09:00
Mitsuhiro Tanda
ff8b25a50a fix, should fill null at end timestamp 2016-01-13 15:59:59 +09:00
Mitsuhiro Tanda
afa539368f fill null in Prometheus 2016-01-13 15:59:59 +09:00
Torkel Ödegaard
a87b5f757d fix(datasources): minor fix to data sources after apps branch merge 2016-01-12 20:05:40 +01:00
Torkel Ödegaard
e5b3f27a30 Merge branch 'apps' 2016-01-12 15:41:15 +01:00
Torkel Ödegaard
144c703c7b Merge pull request #3703 from mtanda/cloudwatch_seoul
(cloudwatch) add seoul region
2016-01-12 10:51:34 +01:00
Torkel Ödegaard
ae6cae0771 Merge branch 'master' of github.com:grafana/grafana 2016-01-12 10:32:49 +01:00
Torkel Ödegaard
2b99b64ec5 fix(table panel): fixed issue with table panel in optimized builds, closes #3702 2016-01-12 10:32:19 +01:00
Mitsuhiro Tanda
7d8519f5f0 add seoul region 2016-01-12 18:15:29 +09:00
Torkel Ödegaard
66f7a2be15 Merge branch 'snapshot_annotation' of https://github.com/mtanda/grafana into mtanda-snapshot_annotation 2016-01-11 16:35:45 +01:00
Mitsuhiro Tanda
012d1378d4 snapshot annotation 2016-01-11 19:26:48 +09:00
Torkel Ödegaard
d83e24572a feat(plugins): more refactoring 2016-01-09 23:52:13 +01:00
Torkel Ödegaard
1ffcea1952 feat(plugins): major improvement in plugins golang code 2016-01-09 23:34:20 +01:00
Torkel Ödegaard
35f40b7312 feat(plugins): upgraded opentsdb 2016-01-09 21:54:03 +01:00
Torkel Ödegaard
b76449d151 feat(plugins): upgraded influxdb to new data source plugin model 2016-01-09 21:42:26 +01:00
Torkel Ödegaard
ca3405afc5 feat(plugins): moved http settings to directive instad of just ng-include partial 2016-01-09 19:03:03 +01:00
Torkel Ödegaard
36ebfc747a feat(plugins): more upgrading work 2016-01-09 18:44:13 +01:00
Torkel Ödegaard
bc328cbed7 feat(plugins): upgraded Cloudwatch to new plugin schema 2016-01-09 18:36:25 +01:00
Torkel Ödegaard
cf98a16db0 feat(plugins): made data source custom edit view into a directive instead of html path config in plugin.json 2016-01-09 18:07:42 +01:00
Torkel Ödegaard
f813b4c58f feat(plugins): converted graphite plugin to new format 2016-01-09 13:30:02 +01:00
Torkel Ödegaard
c5635f9c89 feat(plugins): changed what datasources should return, they should now return the datasource constructor 2016-01-09 13:21:16 +01:00
Torkel Ödegaard
3bb20dbf2e feat(plugins): changed plugin schema, pluginType -> type, type -> id 2016-01-08 23:15:44 +01:00
Torkel Ödegaard
69d0e82453 Merge branch 'master' into apps
Conflicts:
	pkg/services/sqlstore/migrations/migrations.go
2016-01-08 10:20:46 +01:00
Byron
40845578c6 Fix elasticsearch hourly indexes 2016-01-07 14:39:20 -08:00
bergquist
bcdddfe4e8 style(tooltip): removed comment and extrated sort 2016-01-07 18:09:51 +01:00
bergquist
c4ca1444f9 Merge branch 'hover-order' of https://github.com/hcooper/grafana into hcooper-hover-order 2016-01-07 17:43:04 +01:00
bergquist
5de69b288f feat(singlestat): make sparkline height dynamic
closes #3553
2016-01-05 19:21:12 +01:00
Mitsuhiro Tanda
ebf0bd5fc9 fix end time of Prometheus link 2015-12-31 16:05:04 +09:00
Mitsuhiro Tanda
be48caf59f fix Prometheus link, expand template variable in expression 2015-12-31 16:05:04 +09:00
Qtax
c0cf0cb802 Added an option to set a min-width for the graphs side table/area. 2015-12-29 14:42:52 +01:00
Torkel Ödegaard
41a0995db7 feat(apps): minor progress on app meta data 2015-12-22 16:32:17 +01:00
Torkel Ödegaard
d1145ed3fb Merge branch 'master' into apps 2015-12-22 13:59:25 +01:00
Torkel Ödegaard
f074c1eaff refactor(lodash): changed how lodash is referenced from typescript 2015-12-22 13:59:11 +01:00
Torkel Ödegaard
7a87c900ee Merge branch 'master' into apps 2015-12-22 12:41:52 +01:00
bergquist
690a6e1a59 feat(graphs): zoom out on double click 2015-12-22 09:56:24 +01:00
woodsaj
0903d5541b Merge branch 'master' of github.com:grafana/grafana into externalPlugin
Conflicts:
	pkg/api/api.go
	pkg/api/api_plugin.go
	pkg/api/datasources.go
	pkg/api/frontendsettings.go
	pkg/api/index.go
	pkg/plugins/models.go
	pkg/plugins/plugins.go
2015-12-22 00:23:24 +08:00
Torkel Ödegaard
c19a2e5b45 fix(influxdb): systemjs fix 2015-12-21 16:48:12 +01:00
Torkel Ödegaard
dabd680d6b tech(systemjs): merged sync with master, all tests are passing 2015-12-21 16:13:24 +01:00
Torkel Ödegaard
4522b02925 tech(systemjs): almost all tests are passing 2015-12-21 16:00:58 +01:00
Torkel Ödegaard
0dd7fb7361 tech(systemjs): most things work 2015-12-18 10:28:00 +01:00
Torkel Ödegaard
d34ba416a6 tech(systemjs): more stuff is starting to work 2015-12-18 08:22:05 +01:00
woodsaj
48cf56b69a more renaming. also moved apps and datasource menus 2015-12-18 13:46:40 +08:00
xiaoping378
488165ec73 fixes #3555, path of table panel option error 2015-12-18 12:35:02 +08:00
Torkel Ödegaard
545c39356a tech(systemjs): starting work on systemjs bundling 2015-12-17 19:18:30 +01:00
woodsaj
c35b51a268 refactor.
Rename externalPlugin to apiPlugin
Rename bundle to app
Move js, css, menuItem and staticRoot to be properties os App
Add "app" field to panel, datasource and api plugin models. If populated
then the plugin is only enabled if the specific app is enabled for the Org.
If app is "", then the plugin is enabled for all orgs and can't be disabled.
2015-12-17 23:53:58 +08:00
Torkel Ödegaard
a7d7f31e76 Merge branch 'master' of github.com:grafana/grafana 2015-12-17 10:13:40 +01:00
Torkel Ödegaard
16847fdb41 feat(elasticsearch): trim edges, minor refactoring of #3541 2015-12-17 10:13:23 +01:00
carl bergquist
80d757b371 feat(elasticsearch): move default query parameters to new table 2015-12-17 10:00:53 +01:00
carl bergquist
5bdf0cd136 Merge branch 'global_interval' of https://github.com/felixbarny/grafana into felixbarny-global_interval
Conflicts:
	public/app/plugins/datasource/elasticsearch/partials/config.html
2015-12-17 09:53:02 +01:00
carl bergquist
e498503428 fix(elastic): fixed typo 2015-12-17 09:05:01 +01:00
Carl Bergquist
ef46b23250 Merge pull request #3133 from tdyas/add_pencil_to_graphite_ds
add pencil icon back to graphite data source
2015-12-17 08:48:03 +01:00
carl bergquist
39ccf1526f Merge branch 'addshore-graphiteSortByNameNatural' 2015-12-17 07:21:43 +01:00
carl bergquist
12889a9509 feat(graphite): make sortByName optional
fixes #3360
closes #3361
2015-12-17 07:17:39 +01:00
Torkel Ödegaard
c24935b519 minor progress 2015-12-16 17:01:34 +01:00
carl bergquist
8c02a7bd6b Merge branch 'relative' of https://github.com/utkarshcmu/grafana into utkarshcmu-relative 2015-12-16 16:09:44 +01:00
carl bergquist
dc30b9d37b feat(elastic): change concept to trim edges instead. 2015-12-16 13:50:56 +01:00
carl bergquist
37cfe2a3cb feat(elastic): shorten expression to target input 2015-12-16 13:29:54 +01:00
carl bergquist
26abce647d feat(elastic): isolate drop first and last logic 2015-12-16 13:27:35 +01:00
Torkel Ödegaard
ca84ef38f8 angular2 test 2015-12-16 12:21:13 +01:00
carl bergquist
d882af9f94 Merge branch 'es_drop_first_last' of https://github.com/Qtax/grafana into Qtax-es_drop_first_last 2015-12-16 09:48:14 +01:00
carl bergquist
48539c851e feat(graphite): adds support for grep function
closes #1163
2015-12-16 09:45:28 +01:00
Mitsuhiro Tanda
e44ef7f823 fix cloudwatch query editor 2015-12-16 17:01:58 +09:00
Torkel Ödegaard
7ee290cc57 tech(systemjs): systemjs and jspm work 2015-12-15 17:56:16 +01:00
Stefan Siegl
ce2ae31950 Use percent-formatter for stack+percentage graph 2015-12-15 17:32:52 +01:00
Torkel Ödegaard
f1b897b3de change(cloudwatch): minor change to editor 2015-12-15 13:57:20 +01:00
Carl Bergquist
25d93d1041 Merge pull request #3066 from mtanda/cloudwatch_annotation
(cloudwatch) annotation support
2015-12-15 13:43:02 +01:00
Torkel Ödegaard
e28c9b3309 cleanup(KairosDB): removed kairosdb from main repo, can easily be installed via as plugin via its own plugin repo, https://github.com/grafana/datasource-plugin-kairosdb, closes #3524 2015-12-15 11:35:39 +01:00
Torkel Ödegaard
5335a6b636 Merge branch 'master' of github.com:grafana/grafana 2015-12-15 11:21:17 +01:00
Torkel Ödegaard
f83d5f4280 cleanup(influxdb_08): removed influxdb 0.8 data source as an built in official data source, moved it to an external plugin repo, https://github.com/grafana/datasource-plugin-influxdb-08, closes #3523 2015-12-15 11:21:00 +01:00
carl bergquist
28ec6b4d60 feat(graphite): add optional parameter for perSecond
closes #966
2015-12-15 11:10:13 +01:00
Torkel Ödegaard
5eab5dc47b feat(plugins): removed external plugins and bundle code, not ready for master yet, will revert this commit in seperate branch 2015-12-15 10:28:52 +01:00
Torkel Ödegaard
2ec5bc77d7 Merge branch 'external-plugins' 2015-12-15 10:10:48 +01:00
Torkel Ödegaard
f163ceffd0 fix(elasticsearch): fixes spelling of lucene, #3519 2015-12-15 08:29:24 +01:00
Mitsuhiro Tanda
31de9faaf2 fix test 2015-12-15 11:32:24 +09:00
Mitsuhiro Tanda
d302c82c82 share cloudwatch query editor 2015-12-15 11:32:23 +09:00