IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2026-07-30 00:08:10 -05:00
Code Issues Packages Projects Releases Wiki Activity
4,387 Commits 1,123 Branches 715 Tags
d96a6a59ee25cd44813794368862b9b34668fe74
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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 fb9e91e486 Merge branch 'master' of github.com:grafana/grafana 2015-09-11 08:13:49 +02:00
Torkel Ödegaard 1429737a60 tech(typescript): added not about typescript to changelog 2015-09-11 08:11:17 +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 96af2debfc Merge pull request #2717 from sileht/sileht/dataproxy_test-bug 
Fix dataproxy_test.go tests
 2015-09-10 15:51:02 +02:00
Torkel Ödegaard dceec44671 removed tsconfig 2015-09-10 14:36:05 +02:00
Torkel Ödegaard 0b5f40e66c tech(): made config system check for generated css or javascript files and panic if there are none, also if there is a public_gen directory it will use that, even if static root is set to public 2015-09-10 13:34:32 +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 ec3a684be2 Merge pull request #2711 from jsternberg/master 
Update docstring for postgres session provider
 2015-09-09 20:17:23 +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 9603dce469 feat(dataproxy): added whitelist setting and feature for data proxies, closes #2626 2015-09-09 17:21:25 +02:00
Torkel Ödegaard 13190f6f15 fixed version in changelog 2015-09-09 14:25:59 +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 7a167742d0 Merge pull request #2701 from brunoqc/patch-1 
Fix typo
 2015-09-08 22:31:58 +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 7c25edc7b2 docs(): fixed iframe snapshot links in docs, fixes #2682 2015-09-08 15:24:20 +02:00
Torkel Ödegaard 2725053c82 docs(): fixed iframe snapshot links in docs, fixes #2682 2015-09-08 15:19:59 +02:00
Torkel Ödegaard e2cb66f8d7 fix(logging): removed temp dev logging code 2015-09-08 14:32:25 +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 fa3329271d fix(email notifications): added error handling to email template parsing, fixes #2690 2015-09-08 10:57:47 +02:00
Torkel Ödegaard fdcb4473af fix(api auth): return 401 for authentication errors and 403 for access denied errors, fixes #2693 2015-09-08 10:46:31 +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 171ed497f9 version bumped to 2.5 2015-09-08 09:20:46 +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
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 b83a1bf4cc Merge pull request #2673 from rodo/add_doc_app_mode 
Add comments on app_mode with possible values
 2015-09-04 09:25:44 +02:00
Torkel Ödegaard f29471521c Merge pull request #2663 from victorhooi/patch-1 
Add note about phantomjs binary and PNG rendering.
 2015-09-04 08:40:53 +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 64cee145e0 Merge pull request #2669 from jd/master 
doc: fix link to basic concepts
 2015-09-03 14:03:04 +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 d56e7787f2 Merge pull request #2637 from matschaffer/env-var-output-fix 
Iterate over the right env override list variable
 2015-09-02 11:32:49 +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