IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-13 00:55:47 -06:00
Code Issues Packages Projects Releases Wiki Activity
4,783 Commits 5,451 Branches 554 Tags 1.9 GiB
9f17e4ee2c
Commit Graph

829 Commits

Author SHA1 Message Date
Torkel Ödegaard
69db9e0d45 feat(timepickerV2): absolute time / calendar picker works, #2761 2015-09-18 11:01:37 +02:00
Torkel Ödegaard
a8a94ef87b Merge branch 'master' into timepicker2 2015-09-18 10:36:50 +02:00
Torkel Ödegaard
f93215f4ec feat(timepicker2): more progress 2015-09-18 10:36:47 +02:00
ubhatnagar
9af460600d Fixed Indentation and Grunt run. 2015-09-18 00:50:55 -07:00
ubhatnagar
e1576b7131 Added Manage Dashboard Tooltip, hides when clicked. 2015-09-18 00:45:29 -07:00
Torkel Ödegaard
2a52d9bdf6 feat(timepicker2): more work on new timepicker 2015-09-18 08:17:19 +02:00
Torkel Ödegaard
ebf49d0668 Merge pull request #2771 from decbis/maxSeries-func-for-groupByNode 
Added maxSeries option for groupByNode Graphite function
 2015-09-18 08:16:46 +02:00
Mike Kobyakov
5d516592d9 Merge remote-tracking branch 'upstream/master' 2015-09-17 23:07:52 -07:00
Eugen Dinca
7dc2b36413 Added maxSeries option for groupByNode function 2015-09-17 16:50:09 -04:00
Torkel Ödegaard
5eefa36111 feat(timepickerv2): big progress on new design of new timepicker, #2761 2015-09-17 22:44:59 +02:00
Torkel Ödegaard
a30f73fe36 feat(timepicker): more work on getting new time formats to work in all data sources 2015-09-17 12:40:04 +02:00
Torkel Ödegaard
1a9c52e17f feat(timepicker): lots of big changes, moving to datemath from kbn.parseDateMath, moving to moment dates instead of native javascript dates 2015-09-17 11:21:38 +02:00
Torkel Ödegaard
5ad38ee9f8 feat(timepicker2): fixed timesrv specs 2015-09-17 09:57:59 +02:00
Torkel Ödegaard
4c79591403 fix(graphite): removed debug comment 2015-09-17 09:45:53 +02:00
Torkel Ödegaard
a9812167d7 feat(timepicker2): worked on more rich time range support 2015-09-17 09:44:51 +02:00
Torkel Ödegaard
a0a98cb035 feat(timepicker2): working on richer timepicker options 2015-09-16 19:49:05 +02:00
Liu Yubao
4fccfbf543 increase limit to lookup unique metric tag values 
Default limit is 25 which is too small. Considering currently the
/api/search/lookup query isn't narrowed down by selected tag
keys and values (see https://github.com/grafana/grafana/pull/1433), 
the limit is set to 3000, this should be fine because people rarely
create new graph panel.
 2015-09-17 01:36:36 +08:00
Liu Yubao
62ae80eeae deduplicate tag value suggestions for OpenTSDB 2015-09-17 01:25:28 +08:00
Torkel Ödegaard
d705108be5 feat(timepicker2): added date math tests 2015-09-16 18:48:41 +02:00
Torkel Ödegaard
3912eb7b26 Merge branch 'master' into timepicker2 2015-09-16 17:03:08 +02:00
Torkel Ödegaard
1f959272c5 feat(migration): added back support to import old dashboard from from Elasticsearch 2015-09-16 16:28:41 +02:00
Torkel Ödegaard
4ffa26cf2c feat() started work on more feature rich time picker 2015-09-15 13:23:36 +02:00
Torkel Ödegaard
2b95cd5081 refactor: moving routes into core, improved bundle loader 2015-09-15 08:53:06 +02:00
Torkel Ödegaard
5545cdbf4d refactor: improving structure, moving things into a core module 2015-09-15 08:17:40 +02:00
Torkel Ödegaard
9dec50832d refactor: refactoring app boot up and core structure 2015-09-14 22:54:00 +02:00
Torkel Ödegaard
de753bf330 fix(build): fixed issue with ngAnnotate not including files in core/*, fixes #2733 2015-09-14 09:33:26 +02:00
Torkel Ödegaard
1900c81d9f tech(nodejs upgrade): upgraded to nodejs 4.0 for grunt build 2015-09-13 12:13:47 +02:00
Torkel Ödegaard
9db6f82628 refactor: finished timepicker to typescript and directive refactor 2015-09-12 12:52:50 +02:00
Torkel Ödegaard
d96a6a59ee refactor: moved timepicker from a simple panel to component, removed simple panel directive 2015-09-12 11:49:27 +02:00
Torkel Ödegaard
7535677ed4 fix(build): fixed failing tslint test 2015-09-11 21:04:02 +02:00
Torkel Ödegaard
812e4c7cd4 refactor: moved array join directive to typecrtipt 2015-09-11 10:54:56 +02:00
Torkel Ödegaard
85baae1ebd feat(influxdb): added back fill option to editor, forgot to add it in the new updated query editor 2015-09-11 10:42:50 +02:00
Torkel Ödegaard
8174b9f041 fix(tests): fixed failling backend test 2015-09-11 08:58:45 +02:00
Torkel Ödegaard
286b4c0e46 Merge branch 'typescript' 2015-09-11 08:01:11 +02:00
Torkel Ödegaard
166a3c4d64 tech(typescript): added tslint to default task 2015-09-11 08:00:13 +02:00
Torkel Ödegaard
d4a701aad0 tech(typescript): more work on typescript 2015-09-11 07:47:00 +02:00
Torkel Ödegaard
84371f03b5 tech(typescript): more testing and migration 2015-09-10 16:47:38 +02:00
Torkel Ödegaard
20407bca89 tech(typescript): converted signup controller to typescript 2015-09-10 16:21:57 +02:00
Torkel Ödegaard
dceec44671 removed tsconfig 2015-09-10 14:36:05 +02:00
Torkel Ödegaard
da832368f0 dev building and optimized builds work 2015-09-10 12:42:24 +02:00
Torkel Ödegaard
abac8bccc6 tech(typescript): its looking good 2015-09-10 11:26:40 +02:00
Torkel Ödegaard
82061c7c3b experiments 2015-09-09 20:37:27 +02:00
Torkel Ödegaard
a8197df1c1 more experiments for mixing javascript and typescript 2015-09-09 19:34:24 +02:00
Torkel Ödegaard
005e1e002b more playing around with typescript 2015-09-09 17:40:52 +02:00
Torkel Ödegaard
eaa061d90c cleanup(): removed old influxdb editor partial 2015-09-09 14:18:56 +02:00
Torkel Ödegaard
1ab374008f feat(influxdb): completed work on new influxdb query editor, now supports #2708, #2647, #2599 2015-09-09 14:17:55 +02:00
Torkel Ödegaard
8c9d551826 feat(influxdb): you can now change group by time iunterval on per query basis, #2647 2015-09-09 13:48:57 +02:00
Torkel Ödegaard
c4c3f9dc1f feat(influxdb): more work on changing the influxdb editor to support better aliasing and interval options, #2647, #2599 2015-09-09 13:39:45 +02:00
Torkel Ödegaard
5b722deb39 feat(influxdb): began work on changing the influxdb editor to support better aliasing and interval options, #2647, #2599 2015-09-09 11:59:02 +02:00
Torkel Ödegaard
b61b7f0c3b fix(influxdb): fixed editor bug introduced in recent commit 2015-09-09 11:05:49 +02:00
Torkel Ödegaard
3c40310e9b tech(typescript): testing for how to migrate to typescript 2015-09-09 09:57:06 +02:00
Torkel Ödegaard
3e9e34afb8 feat(annotations): polished up the annotation editor tabs, similar to recent commits for templating editor 2015-09-08 16:59:39 +02:00
Torkel Ödegaard
26d8a041ef fix(templating): updated templating UI and tab behavior, now edit tab is not visible when not actually editing an existing var, fixes #2679 2015-09-08 15:54:08 +02:00
Torkel Ödegaard
fad1d4cf98 feat(organization): added update org address to http api and to org details settings view, closes #2672 2015-09-08 14:22:44 +02:00
Torkel Ödegaard
daf64421f2 fix(api): Added error handling to create and update org http apis and sql update handlers, now checks for org name taken scenarios and returns correct http error code and message, fixes #2686 2015-09-08 13:06:18 +02:00
Torkel Ödegaard
41154d6d11 fix(elasticsearch): fixed series naming & aliasing when using field for extended_stats and percentiles 2015-09-08 10:08:27 +02:00
Torkel Ödegaard
9904d01958 fix(unit test): trying to fix failing unit test due to timezone different on build server 2015-09-08 09:50:50 +02:00
Torkel Ödegaard
212a8ad6a6 Merge branch 'master' of github.com:grafana/grafana 2015-09-08 09:18:03 +02:00
Torkel Ödegaard
f2c518ba24 Merge branch 'elastic_ds' 
Conflicts:
	public/app/plugins/datasource/influxdb/queryCtrl.js
 2015-09-08 09:17:34 +02:00
Torkel Ödegaard
f8b61a4ebe changelog(): added #1034 to changelog 2015-09-08 09:16:41 +02:00
Torkel Ödegaard
35cc3837a0 feat(elasticsearch): more work on alias pattern, #1034 2015-09-08 09:10:26 +02:00
Torkel Ödegaard
572a80d1d1 feat(elasticsearch): metric response handling and processsing now supports alias patterns, {{term field name}} and {{metric}} now works, #1034 2015-09-07 23:15:49 +02:00
Torkel Ödegaard
2aa695fb66 feat(elasticsearch): refactoring elasticsearch response handling to support series alias patterns 2015-09-07 20:00:27 +02:00
Torkel Ödegaard
f361f324da feat(elasticsearch): more polish to editor, made interval configurable per query, #1034 2015-09-07 16:35:40 +02:00
Torkel Ödegaard
3999a3caa2 feat(elasticsearch): extended stats like std deviation now works, and sigma option as well, added unique count (cardinality as well, #1034 2015-09-07 13:13:27 +02:00
Torkel Ödegaard
efc3def7f2 feat(elasticsearch): small refactoring and polish 2015-09-07 09:36:56 +02:00
Torkel Ödegaard
6c304924f7 feat(elastic_ds): moving time field name to dataasource option, it is no longer specified for each query and date_histogram 2015-09-07 08:57:46 +02:00
Torkel Ödegaard
f90714f8fe feat(elasticsearch): changed default sort to asc 2015-09-06 16:11:01 +02:00
Torkel Ödegaard
0960360b35 feat(elasticsearch): added support for index time based patterns, #1034 2015-09-06 16:09:42 +02:00
Torkel Ödegaard
8db47e335f fixed jshint errors 2015-09-06 14:45:12 +02:00
Torkel Ödegaard
c609f67e16 fixed broken editors because of some recent refactorings 2015-09-06 14:29:28 +02:00
Torkel Ödegaard
14cb2b0143 began work on support index time patterns 2015-09-06 12:58:53 +02:00
Torkel Ödegaard
b24c539206 feat(elasticsearch): began work on supporting extended stats metric agg, it gives you standard deviation and more 2015-09-05 20:22:54 +02:00
Torkel Ödegaard
52eeefa6d9 feat(elasticsearch): fields are fetch from mapping instead of docs, you can enter custom value in field options, other fixes, #1034 2015-09-05 19:55:58 +02:00
Torkel Ödegaard
f942ec952e feat(elasticsearch): worked on percentiles metric aggregator in editor and in elasticsearch response processing 2015-09-05 18:31:42 +02:00
Torkel Ödegaard
3e9aca3ed4 feat(elasticsearch): terms aggregation options are working, things are starting to come together, #1034 2015-09-05 15:41:04 +02:00
Torkel Ödegaard
2d832e10b0 feat(elasticsearch): term metric filters are starting to work! like terms aggregation with top 5, order by metric 1 desc, where metric 1 is maybe average of @load 2015-09-05 12:51:05 +02:00
Torkel Ödegaard
f1e995ec79 feat(elasticsearch): added bucket agg id concept 2015-09-05 12:24:14 +02:00
Torkel Ödegaard
756ec8ccd7 feat(elasticsearch): close to getting group by term options ui working 2015-09-05 10:48:11 +02:00
Torkel Ödegaard
c48f24d269 feat(editor): more work on editor components, extracing things and making reusable directives 2015-09-05 10:14:21 +02:00
Torkel Ödegaard
0d2e13549a feat(editor): thing are starting to work again 2015-09-05 09:05:09 +02:00
Torkel Ödegaard
f9ce9bdcec feat(editor): refactoring and making new editor abstractions 2015-09-05 08:07:40 +02:00
Torkel Ödegaard
e339dbf473 feat(elasticsearch): so much work on new editor, its pretty broken right now, but when it is done it is going to be amazing 2015-09-04 22:10:56 +02:00
Torkel Ödegaard
f27f028d44 Merge pull request #2676 from jd/master 
doc: fix link to basic concepts
 2015-09-04 17:34:01 +02:00
Julien Danjou
697aaf7e70 partials: fix closing markup in datasourceHttpConfig 2015-09-04 17:14:27 +02:00
Torkel Ödegaard
cc1e3d0101 feat(elasticsearch): groundwork for a much more sophisticated elasticsearch query editor 2015-09-04 16:05:47 +02:00
Torkel Ödegaard
9daa3997e9 feat(elasticsearch): time field selector now works, #1034 2015-09-04 11:17:52 +02:00
Torkel Ödegaard
83930ec9d1 feat(elasticsearch): raw queries work, more unit tests and polish, #1034 2015-09-04 09:41:23 +02:00
Torkel Ödegaard
5beced458c fix(): fixed problems in last commit 2015-09-04 07:41:50 +02:00
Torkel Ödegaard
ead451a979 feat(influxdb): More alias options, can now use syntax to reference part of a measurement name (seperated by dots), closes #2599 2015-09-04 07:40:28 +02:00
Torkel Ödegaard
97d42991a7 fix(graph tooltip): fixed graph tooltip when stacking and one series is not stacked (via override), fixes #2670 2015-09-03 21:18:05 +02:00
Torkel Ödegaard
cd6bdc1a78 fix(influxdb): fixed influxdb template var filter suggestion, fixes #2666 2015-09-03 20:53:20 +02:00
Torkel Ödegaard
977f538420 feat(elasticsearch): lots of work on elasticsearch metrics query editor, #1034 2015-09-03 16:35:11 +02:00
Torkel Ödegaard
590b155c6c feat(elasticsearch): lots of work on elasticsearch metrics query editor, #1034 2015-09-03 15:56:41 +02:00
Torkel Ödegaard
7e9f11ea1c feat(elasticsearch): lots of work on elasticsearch metrics query editor, #1034 2015-09-03 14:55:48 +02:00
Torkel Ödegaard
525724cc1f feat(elasticsearch): lots of work on elasticsearch metrics query editor, #1034 2015-09-03 14:02:31 +02:00
Torkel Ödegaard
b3bda02063 feat(elasticsearch): lots of work on elasticsearch metrics processing, handling grouped responses, etc, #1034 2015-09-03 12:35:21 +02:00
Torkel Ödegaard
df1d56e7b1 feat(elasticsearch): lots of work on elasticsearch metrics processing, handling grouped responses, etc, #1034 2015-09-03 11:14:25 +02:00
Torkel Ödegaard
d099d8950f feat(elasticsearch): lots of work on elasticsearch metrics queries, #1034 2015-09-03 08:18:00 +02:00
Torkel Ödegaard
ae7093e0bb feat(elasticsearch): small progress on new elasticsearch metric query capability 2015-09-02 17:45:41 +02:00
Torkel Ödegaard
d932a877e8 fix(influxdb): removed limit of 20 for influxdb field dropdown, fixes #2655 2015-09-02 16:10:58 +02:00
Torkel Ödegaard
745a7b4461 fix(influxdb): Fixed issue when using the eye to disable queries in the query editor and when applying aliases, #2651 2015-09-02 16:06:28 +02:00
Torkel Ödegaard
9e1a9723c2 Merge branch 'cloudwatch' into elastic_ds 2015-09-02 15:25:45 +02:00
Torkel Ödegaard
e48754c73c feat(elasticsearch): began work on elasticsearch datasource, based on work in pr #2293, will need a lot more work 2015-09-02 15:25:40 +02:00
Torkel Ödegaard
096a554bfb Merge branch 'elasticsearch-datasource' of https://github.com/aheinz-sg/grafana into elastic_ds 2015-09-02 15:12:26 +02:00
Torkel Ödegaard
74da5a610c fix(spelling): capitalize text 2015-09-02 13:20:19 +02:00
Torkel Ödegaard
ea7c6edcd0 feat(cloudwatch): lots of refactoring and polish work on cloudwatch query editor 2015-09-02 12:40:08 +02:00
Torkel Ödegaard
27d5f02329 refactoring(query editors): broke out metric segment 2015-09-02 11:33:32 +02:00
Torkel Ödegaard
6d7c8431be fix(inspector): lots of improvements and fixes for the error inspector, now shows you request details and responses in many more cases, fixes #2646 2015-09-02 10:35:15 +02:00
Torkel Ödegaard
3ed63d09d9 Merge branch 'master' into cloudwatch 2015-09-01 17:25:36 +02:00
Torkel Ödegaard
4b4299604b fix(import): fixed nav link in header, fixes #2633 2015-09-01 17:14:48 +02:00
Torkel Ödegaard
3842bcb921 fix(influxdb): quote field name, fixes #2629 2015-09-01 14:49:42 +02:00
Torkel Ödegaard
6989c6332d fix(influxdb): fixed issue in last commit 2015-09-01 13:04:59 +02:00
Torkel Ödegaard
209e9ebda7 fix(influxdb): fixes and refactorings of influxdb 0.9 editor, no longer shows template vars in keys dropdown and group by dropdownm, fixes #2636 2015-09-01 13:01:21 +02:00
Torkel Ödegaard
aa89416bca fix(invite): fixes to org invite stuff, #2630 2015-09-01 12:35:06 +02:00
Torkel Ödegaard
e93fba206d fix(kariosdb): fixed how kairosdb makes datasource requests, fixes #2628 2015-08-31 19:13:45 +02:00
Torkel Ödegaard
822a689b82 datasource(cloudwatch): began on polishing cloudwatch datasource, #684, #2445 2015-08-31 19:07:25 +02:00
Torkel Ödegaard
ffbf70af25 Merge branch 'cloudwatch' of https://github.com/mtanda/grafana into cloudwatch 2015-08-31 15:45:49 +02:00
Adam Heinz
d3e307b102 Refactor post-rebase to configure directives. 2015-08-31 09:32:47 -04:00
Adam Heinz
a3e4abfd5e Added group by to Elasticsearch data source. 2015-08-31 09:04:56 -04:00
Adam Heinz
56d1411253 Replace deprecated facets with aggregations. 2015-08-31 08:53:49 -04:00
Adam Heinz
7bccd17bbe Enable 'Test Connection' for Elasticsearch datasource. 2015-08-31 08:53:49 -04:00
Adam Heinz
c193208cd2 Rewrite query builder to allow for multiple time series. 2015-08-31 08:53:49 -04:00
Joseph Jones
923f9345a7 add elasticsearch query fields to the es query editor 2015-08-31 08:53:49 -04:00
Adam Heinz
d618526037 Copy/paste influxdb query editor. 2015-08-31 08:53:49 -04:00
Adam Heinz
a1dcd5f069 Initial prototype returning time series from (partially hardcoded) Elasticsearch data source. 2015-08-31 08:53:29 -04:00
Torkel Ödegaard
3dfa28570f ui(timepicker): slight polish to the time picker options view 2015-08-31 14:12:10 +02:00
Torkel Ödegaard
6fac241404 Merge branch 'signup_remake' 2015-08-31 11:42:30 +02:00
Torkel Ödegaard
d19e101e6b feat(signup): almost done with new sign up flow, #2353 2015-08-31 11:35:07 +02:00
Torkel Ödegaard
13c70ac02c feat(signup): selecting org after invite now works 2015-08-31 09:37:14 +02:00
Mitsuhiro Tanda
3405e44a1d add legend format tip 2015-08-31 16:03:39 +09:00
Mitsuhiro Tanda
8c5a28c0b8 improve dollar escape 2015-08-31 16:03:28 +09:00
Mitsuhiro Tanda
7229c59b8e escape {} in tip 2015-08-31 16:02:59 +09:00
Torkel Ödegaard
14884d5a2b feat(signup): progress on new signup flow, #2353 2015-08-30 18:56:53 +02:00
Torkel Ödegaard
688ed405df fix(graph tooltip): multi series tooltip did no highlight correct point when stacking was enabled and series were of different resolution, fixes #2620 2015-08-30 11:11:43 +02:00
Torkel Ödegaard
d3c79c9b49 fix(datasource query editors): fixed issue with duplicate query and the query letter (refId) 2015-08-30 10:24:15 +02:00
Torkel Ödegaard
c61b22cefb feat(signup): progress on new sign up and email verification flow, #2353 2015-08-28 13:45:16 +02:00
Torkel Ödegaard
24dfa55465 feat(signup): progress on new sign up and email verification flow, #2353 2015-08-28 09:24:30 +02:00
Torkel Ödegaard
d25624a8ad feat(signup): began work on new / alternate signup flow that includes email verification, #2353 2015-08-27 13:59:58 +02:00
Torkel Ödegaard
7e44a8ed1d feat(tagmanager): added Name variable to datalayer 2015-08-26 15:07:39 +02:00
Torkel Ödegaard
874503ca68 fix(ngblur): removed ngblur directive as it conflicted with angular naitive directive, fixes #2429 2015-08-26 13:05:33 +02:00
robbie
46c0215b1f updating the limit of returned tagvs in a MetricKeyLookup since opentsdb supports limit in 2.1.0 2015-08-25 12:46:54 -07:00
Mitsuhiro Tanda
7c6e49ec65 fix too much CloudWatch query 2015-08-26 00:31:59 +09:00
Torkel Ödegaard
9a142cea7a fix(panel links): fixed panel height issue when using panel links, could cause strange panel flow, fixes #2576 2015-08-25 15:49:46 +02:00
Torkel Ödegaard
af95daadf4 fix(jscs): fixed failing js style check 2015-08-25 09:39:42 +02:00
Torkel Ödegaard
6e8d5cd873 fix(opentsdb): blur event triggered twice for metric selector, caused double query to opentsdb after metric name change 2015-08-25 09:34:43 +02:00
Torkel Ödegaard
48686cf9f7 fix(influxdb_09): fix for handling empty series object in response from influxdb, fixes #2413 2015-08-25 09:11:39 +02:00
Mitsuhiro Tanda
b7fc3059b6 add legend format 2015-08-25 15:51:32 +09:00
Mitsuhiro Tanda
64ce5e0fad add tooltip 2015-08-25 13:35:27 +09:00
Mitsuhiro Tanda
d815d06c1c ignore empty custom metrics setting 2015-08-24 22:13:53 +09:00
Mitsuhiro Tanda
c0c8465ec2 add loading custom metrics definitions 2015-08-24 22:06:45 +09:00
Torkel Ödegaard
364d9de751 feat(ui viewer): prevent viewers from creating new dashboard or importing dashboard, closes #2590 2015-08-24 14:24:10 +02:00
Mitsuhiro Tanda
e74be5887c don't require cloudwatch dimension 2015-08-24 11:38:52 +09:00
Mitsuhiro Tanda
253d0c834c change required option by access mode 2015-08-23 14:54:08 +09:00
Mitsuhiro Tanda
feb19adb8f fix checkbox 2015-08-23 14:53:58 +09:00
Denis Doria
06077faa6a Fix small typo "dashbord" to dashboard 2015-08-22 11:48:35 +02:00
Torkel Ödegaard
960a4f71a3 fix(jsc): fixed javascript indenting 2015-08-21 16:28:01 +02:00
Torkel Ödegaard
292db86c9e feat(relative time override): You can now use the new relative time option in panel time override, closes #2575 2015-08-21 16:19:51 +02:00
Torkel Ödegaard
6d3b36d61b fix(annotations): removed accidental test code from annotationsSrv 2015-08-21 15:32:20 +02:00
Torkel Ödegaard
c876aa537a feat(panel resize): Resize handles in panel bottom right corners for easy width and height change, closes #2577 
Conflicts:
	public/app/features/panel/panelDirective.js
 2015-08-21 14:59:15 +02:00
Mitsuhiro Tanda
f1e5238e16 escape dimension if it is variable name 2015-08-21 20:15:45 +09:00
Mitsuhiro Tanda
d75d4a5c08 filter empty dimension 2015-08-21 18:29:38 +09:00
Mitsuhiro Tanda
266fe876ba pass dimension in metricFindQuery 2015-08-21 18:29:32 +09:00
Torkel Ödegaard
ca53ae4fc5 fix(templating): Another atempt at fixing #2534 (Init multi value template var used in repeat panel from url), fixes #2564 2015-08-21 10:40:14 +02:00
Torkel Ödegaard
8f35683ccb fix(annotations): Fixed issue when html sanitizer failes for title to annotation body, now fallbacks to html escaping title and text, fixes #2563 2015-08-21 10:17:02 +02:00
Torkel Ödegaard
30cd782e92 fix(snapshot): Fix for snapshot with expire 7 days option, 7 days option not correct, was 7 hours, fixes #2574 2015-08-21 09:51:16 +02:00
Torkel Ödegaard
3d37c9c9a3 feat(tagmanager): support to add google tagmanager id, closes #2569 2015-08-21 09:30:39 +02:00
Mitsuhiro Tanda
c72bddf15e add cloudwatch datasource test 2015-08-21 12:55:18 +09:00
Torkel Ödegaard
abd7c15ba8 fix(TimePicker): Fix for when you applied custom time range it did not refreh dashboard, fixes #2565 2015-08-20 17:57:15 +02:00
Torkel Ödegaard
5b9ea96dc5 Merge branch 'v2.1.x' 
Conflicts:
	CHANGELOG.md
	package.json
 2015-08-20 11:16:05 +02:00
Torkel Ödegaard
e5794ed1c1 fix(dragdrop): Fix for broken drag drop behavior, fixes #2558 2015-08-20 11:12:06 +02:00
Mitsuhiro Tanda
00f76ecaf6 CloudWatch proxy support 2015-08-20 00:51:23 +09:00
Torkel Ödegaard
aa21bfd8a8 fix(timepicker): fixed for viewing auto refresh submenu when timpicker selection is set to Today, fixes #2552 2015-08-19 13:25:36 +02:00
Torkel Ödegaard
0339026674 fix(default datasource): minor fix for handling of default datasource 2015-08-18 20:04:24 +02:00
Torkel Ödegaard
50281f12b9 fix(default datasource): minor fix for handling of default datasource 2015-08-18 14:54:56 +02:00
Mitsuhiro Tanda
1c6b7203cc add template variable to drop down list 2015-08-18 20:35:12 +09:00
Torkel Ödegaard
bf5081ec8c fix(type ahead): fixed highlight, and made the highlight more distinct, also rolled back #2436 due to its issues on linux and windows, fixes #2527 2015-08-18 10:09:12 +02:00
Torkel Ödegaard
9a9c9b2b12 Merge branch 'query-editor-breakout' 
Conflicts:
	CHANGELOG.md
 2015-08-18 08:23:13 +02:00
Torkel Ödegaard
5c2d49f7ce feat(mixed datasource): updated Elasticsearch so it uses new way to define annotations editor 2015-08-18 07:58:44 +02:00
Mitsuhiro Tanda
28ccd63255 fix templating 2015-08-18 13:29:17 +09:00
Torkel Ödegaard
3de041a411 feat(mixed datasource): added datasource name to left of query hamburger #436 2015-08-17 21:25:08 +02:00
Torkel Ödegaard
00f5f8b2a0 feat(mixed datasource): polishing feature, making sure everything works, #436 2015-08-17 21:20:09 +02:00
Torkel Ödegaard
95f1343a59 feat(mixed datasource): fixing varios issues with the query editor changes, updated kariosdb data source editor to work with the new model, #436 2015-08-17 20:53:40 +02:00
Torkel Ödegaard
b4115b0362 feat(query editor): updated influxdb 0.8.x data source query editors to new abstraction 2015-08-17 17:28:03 +02:00
Torkel Ödegaard
6ee0f2c6a7 feat(mixed data source queries): lots of minor polish to new mixed data source and all the changes it has required, #436 2015-08-17 17:07:33 +02:00
Torkel Ödegaard
af39e4de3e Merge branch 'v2.1.x' 
Conflicts:
	CHANGELOG.md
 2015-08-17 15:02:47 +02:00
Torkel Ödegaard
0d8303cf5d fix(templating): fix for setting template variable value via url and having repeated panels or rows, fixes #2534 2015-08-17 15:01:16 +02:00
Torkel Ödegaard
4a6b5274bc feat(invite): fixes for org invite enhancement story, #2353 2015-08-17 10:55:52 +02:00
Torkel Ödegaard
f7ea420a3f Merge pull request #2521 from mattttt/email-tweaks 
Email tweaks
 2015-08-17 10:33:06 +02:00
Torkel Ödegaard
56d5b0b12a feat(mixed datasource): minor progress 2015-08-17 10:31:54 +02:00
Torkel Ödegaard
a16c63a43e feat(mixed datasources): continued work on editor design change 2015-08-16 20:52:30 +02:00
Torkel Ödegaard
3105215425 feat(mixed datasource): changed how query ref ids (letters) are assigned, now they are persisted 2015-08-16 11:24:32 +02:00
Torkel Ödegaard
e916f93787 feat(mixed datasource): fixed failing unit tests 2015-08-16 10:06:36 +02:00
Torkel Ödegaard
1332ddbc93 feat(mixed datasources): updated OpenTSDB data source query editor to new model, #436 2015-08-16 09:52:45 +02:00
Torkel Ödegaard
b30dfcf28a feat(datasource): added new mixed data source 2015-08-16 01:34:09 +02:00
Torkel Ödegaard
b9cfade18c feat(mutli db query): major changes to query editor and data source handling, looks promising 2015-08-15 23:11:37 +02:00
Torkel Ödegaard
ad1fa110ff change(search): opening search dropdown should not take you out of fullscreen view or edit 2015-08-15 21:57:41 +02:00
Torkel Ödegaard
ed49962120 refactor(): began work on big design change for how data source query editors are loaded 2015-08-15 21:49:30 +02:00
Matt Toback
0651f134e4 Backed our new styles out of ink.css and moved them into style.css. Small margin tweaks, looking good to go. 2015-08-14 15:21:51 -04:00
Pivotal
dc9c2773cb fix test connection bug 2015-08-14 13:50:01 +08:00
Matt Toback
60eec49e95 Added in additional text and incorporated the bulletproof button that was built for raintank. Needs some help from Torkel or Nick to make sure it's cleaner 2015-08-13 17:57:58 -04:00
Mitsuhiro Tanda
caccacf52b don't calculate cumulative value if series overrides stack to false 2015-08-13 13:40:16 +09:00
Torkel Ödegaard
8fcaa4997d feat(admin): Deleting org from orgs list now works, will permanently delete dashboards, data sources, etc, closes #2457 2015-08-12 08:59:39 +02:00
Torkel Ödegaard
745162c589 fix(graphite): Import dashboard from graphite is working again, fixes #2490 2015-08-11 21:20:20 +02:00
Torkel Ödegaard
089508db8e fix(influxdb 0.9): removed function from function dropdown as this function does not exist in InfluxDB 0.9 2015-08-11 21:10:15 +02:00
Torkel Ödegaard
fe093c6385 feat(timepicker): added new relative time option , will set time range to midnight to now, closes #1186 2015-08-11 19:16:45 +02:00
Torkel Ödegaard
43ef9f909a feat(admin): admin page for all grafana organizations (list / edit view), #2457 2015-08-11 15:20:50 +02:00
Mitsuhiro Tanda
4f42dae3cb change behavior of dimension value suggestion 2015-08-11 20:43:34 +09:00
Torkel Ödegaard
234d1291f9 Merge branch 'invite' 
Conflicts:
	public/css/less/gfbox.less
	public/emails/reset_password.html
	public/emails/welcome_on_signup.html
 2015-08-11 11:22:43 +02:00
Torkel Ödegaard
74932e6311 feat(invite): added specific email for invites to existing grafana users 2015-08-11 10:35:10 +02:00
Torkel Ödegaard
b0b96aa410 Moved reset password and welcome on sign up email to new email build template system 2015-08-11 10:01:52 +02:00
Mitsuhiro Tanda
deedd166db add metricFindQuery 2015-08-11 14:26:24 +09:00
Mitsuhiro Tanda
6ffab821b2 refactor suggest function 2015-08-11 14:26:18 +09:00
Mitsuhiro Tanda
6705902a94 fix style 2015-08-11 10:17:48 +09:00
Mitsuhiro Tanda
fd96e30c9c add region field in query editor 2015-08-11 10:17:39 +09:00
Torkel Ödegaard
4439545428 feat(invite): lots of work completing the new email template system and css inlineing, converted new_user_invite.html to new system, #2353 2015-08-10 21:24:47 +02:00
Torkel Ödegaard
e53c1e39d3 feat(invite): can now add org user with sername again, #2353 2015-08-10 14:03:08 +02:00
Torkel Ödegaard
775e044e69 feat(invite): progress on invite feature, #2353 2015-08-10 13:47:06 +02:00
Torkel Ödegaard
4b849243ce Merge branch 'influxdb_alias_columns' of https://github.com/thuck/grafana into thuck-influxdb_alias_columns 2015-08-10 09:11:19 +02:00
Torkel Ödegaard
e7fc72067a refactor(influxdb): refactoring of PR 2477, added unit tests, #2477 2015-08-10 09:09:39 +02:00
Torkel Ödegaard
ca6476a57f Merge branch 'influxdb_operators' of https://github.com/thuck/grafana into thuck-influxdb_operators 2015-08-10 08:45:16 +02:00
Torkel Ödegaard
fb9f954882 fix(graphite): Fix for bug when using series ref (#A-Z) and referenced series is hidden in query editor. fixes #2484 2015-08-10 07:59:27 +02:00
Denis Doria
a4af30675d Included $col as an option for the "Alias pattern" on influxdb 
With this patch it's possible to use the column name as an identifier.
This can help when we have multiple columns as it would be possible to automatic generate a legend.
Also this would help in future when grafana could support the "AS" in the query builder.
 2015-08-10 00:22:08 +02:00
Torkel Ödegaard
95cad91bae Merge pull request #2482 from thuck/influxdb_fill 
Including more special options for fill
 2015-08-09 20:18:45 +02:00
Denis Doria
166a56828d Including more special options for fill 
Included "previous" and "none" as possible values for fill.
From the influxdb documentation:
 - "previous" means the values of the previous window is used.
 - "none" means that all null values are removed.
 2015-08-09 19:17:01 +02:00
Denis Doria
950d4bb24e Code style correction 2015-08-09 12:03:51 +02:00
Denis Doria
42caf02fb0 Include context for operators 
Depending of the value a different set of operators will show up.
If regex only =~ and !~ will show up.
Any other value will show =, <>, <, >.
 2015-08-09 11:58:08 +02:00
Denis Doria
4bd83443f8 Fixing issue for missing tag.operator 
This should fix the case from when we migrate from a version that doesn't contain tag.operator.
 2015-08-08 17:00:10 +02:00
Denis Doria
5a906e0f3e Fix small corner case 2015-08-08 14:40:55 +02:00
Denis Doria
a51d900da0 Fix code style and included missed semicolon 2015-08-08 13:54:01 +02:00
Denis Doria
9a9902cea9 Includes more comparators/operators for influxdb 
This patch includes some missing comparators/operators for influxdb:
>  - greater than
<  - less than
<> - not equal
!~ - doesn't match against

It includes the tag.operator fields to facilitate identification of the operators on the segments.
It keeps the logic for the regex syntax; although it changes the way to validate it, to handle the new operators use case.
 2015-08-08 13:31:37 +02:00
Torkel Ödegaard
81790aed13 tech(lib upgrade): updated angularjs to 1.4.3 2015-08-08 12:31:37 +02:00
Torkel Ödegaard
0ed4744a33 influxdb(auth): fixed issue with using basic auth and influxdb, fixes #2455 2015-08-07 11:02:32 +02:00
Torkel Ödegaard
776ca86a60 Merge pull request #2458 from thuck/influxdb_non_negative_derivative 
Including non_negative_derivative function on influxdb
 2015-08-07 10:20:25 +02:00
Torkel Ödegaard
c43f2bbb86 fix(singlestat): fix to handle series with no data points, fixes #2460 2015-08-07 10:03:21 +02:00
Denis Doria
f3fc128ec3 Including non_negative_derivative function on influxdb 
Since version 0.9.0 of influxdb the non_negative_derivative function
is merged, this small patch includes it as an option on grafana.
 2015-08-06 10:23:52 +02:00
Mitsuhiro Tanda
6a697eed2f fix deactivating statistics bug 2015-08-06 14:41:06 +09:00
Torkel Ödegaard
41e13fab55 fix(influxdb): fix for using template variables in side alias field in influxdb 0.9 editor, fixes #2446 2015-08-05 18:42:03 +02:00
Mitsuhiro Tanda
134819cb45 fix jshint error 2015-08-06 00:05:40 +09:00
Mitsuhiro Tanda
88ce05976e add CloudWatch datasource 2015-08-05 23:10:32 +09:00
Torkel Ödegaard
bd7ae3dc71 fix(templating): fix for text panel when using template variables in text and repeating panel, fixes #2442 2015-08-05 14:23:09 +02:00
Torkel Ödegaard
91e5fcf8f1 fix(templating): fixed issue with repeat row, was pretty buggy due to very recent change, fixes #2443 2015-08-05 14:19:09 +02:00
Matt Toback
b64c550989 Added some small styling tweaks to the modals, and adjusted some copy. 2015-08-04 15:58:07 -04:00
Matt
997bd030f9 Changed font weight to look less muddy 
Changed the font weight to look a bit less muddy. Any reason why we cant use a number instead of bold?
 2015-08-04 15:38:45 -04:00
Torkel Ödegaard
85b606b7d2 fix(test): fix for failing unit test 2015-08-04 15:44:29 +02:00
Torkel Ödegaard
775a805959 fix(): fix for cleaning up repeat panel scope for orphaned panels or duplicated panels 2015-08-04 15:15:03 +02:00
Torkel Ödegaard
0586dbaf8b feat(save_as): imporved save as dialog, now auto focus, and enter key to submit works, closes #2426 2015-08-03 10:46:07 +02:00
Torkel Ödegaard
dd6a34e60a fix(influxdb): very minor fix to editor, blur event for alias input caused two refresh events, fixes #2429 2015-08-03 10:18:18 +02:00
Trent White
6b6b102079 updated some hard-coded colors to variables so they work well on light theme 2015-07-31 15:51:31 -04:00
Torkel Ödegaard
0fd4c3bd00 fix(templating): small fixed toplaceholder text in template variable editor 2015-07-31 14:56:51 +02:00