IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2026-09-05 04:40:13 -05:00
Code Issues Packages Projects Releases Wiki Activity
5,121 Commits 892 Branches 731 Tags
aca9d3965da1c8ce6c74c7de6cea886c6507c977
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Torkel Ödegaard aca9d3965d feat(elasticsearch): added unit option to derivative metric, closes #3512 2015-12-14 18:49:53 +01:00
Torkel Ödegaard b63471ebe9 fix(windows): exclude syslog feature from windows builds 2015-12-14 16:16:36 +01:00
Torkel Ödegaard 33395d530d docs(): updated downloads for 2.6 and whats new in 2.6 article 2015-12-14 15:45:00 +01:00
Torkel Ödegaard fcd3af30ec updated version to 2.6.0 2015-12-14 15:18:01 +01:00
Torkel Ödegaard e334107c7d docs(): added whats new in 2.6 article 2015-12-14 15:15:56 +01:00
Torkel Ödegaard 56c3dd3652 docs(influxdb): updated influxdb docs 2015-12-14 14:16:22 +01:00
Torkel Ödegaard 6ddd458402 docs(elasticsearch): updated elasticsearch with info about templating and pipeline metrics 2015-12-14 13:55:16 +01:00
Torkel Ödegaard ee328667d0 docs(table): updated table docs 2015-12-14 13:40:06 +01:00
Torkel Ödegaard 3dee75603c Merge pull request #3502 from mattttt/table-panel-doc 
New table panel doc
 2015-12-14 10:22:49 +01:00
Torkel Ödegaard c7e3ed096f fix(postgres): fixes db migration issue with_credentials column for postgres, fixes #3505 2015-12-14 10:19:53 +01:00
Torkel Ödegaard 10f66fa78f feat(elasticsearch): adds support for inline script and missing options to all elasticsearch metrics, closes #3500 2015-12-11 18:20:53 +01:00
Torkel Ödegaard 0cbc493113 Merge pull request #3499 from discordianfish/clarify-template-auto-interval-tooltip 
Clarify template option auto interval in tooltip
 2015-12-11 16:50:30 +01:00
Torkel Ödegaard 766b9d5270 Merge branch 'master' of github.com:grafana/grafana 2015-12-11 14:40:18 +01:00
Torkel Ödegaard 023fa2b2cc fix(influxdb): minor fix to new editor, there were 5min as a selectable option in derivative function 2015-12-11 14:39:59 +01:00
Torkel Ödegaard 1b42e3015e fix(timepicker): mini change, removed unneeded space 2015-12-11 14:34:56 +01:00
Torkel Ödegaard 4e9e18d4c0 Merge pull request #3498 from bergquist/always_show_refresh_button 
feat(timepicker): always show refresh button
 2015-12-11 14:33:50 +01:00
Torkel Ödegaard 7e9963ae05 fix(elasticsearch): minor markup fix 2015-12-11 12:51:39 +01:00
Torkel Ödegaard b7c0f3ea95 Merge branch 'master' of github.com:grafana/grafana 2015-12-11 12:45:01 +01:00
Torkel Ödegaard a8e2610d7d updated changelog 2015-12-11 12:44:47 +01:00
Torkel Ödegaard b934ace1fc Merge branch 'moving_avg_es_support' 2015-12-11 12:43:02 +01:00
Torkel Ödegaard 82cbfc9905 feat(elasticsearch): added pipeline aggregations feature to changelog 2015-12-11 12:42:55 +01:00
Torkel Ödegaard 9f294e3565 feat(elasticsearch): completed initial implementation of moving average and derivative pipleline aggregations, closes #3451 2015-12-11 12:41:40 +01:00
Torkel Ödegaard 68775182f0 Merge pull request #3494 from mtanda/cloudwatch_cleanup 
remove aws-sdk-js require setting
 2015-12-11 12:28:26 +01:00
Torkel Ödegaard 5bd128ba85 Merge pull request #3493 from bergquist/table_panel_color_invert_order 
Table Panel: adds invert color order functionality
 2015-12-11 12:05:35 +01:00
Torkel Ödegaard 5921bb0589 Merge pull request #3490 from mtanda/cloudwatch_metric_update 
(cloudwatch) update suggest metrics and dimensions
 2015-12-11 11:09:45 +01:00
Torkel Ödegaard 5227dc679d fix(invite): removed resend invite button, button logic was not implemented, fixes #3484 2015-12-10 13:31:24 +01:00
Torkel Ödegaard 77c510c364 fix(graph legend): fixed issue with escaping html text in graph legend, and in function param, fixes #3482 2015-12-10 13:27:57 +01:00
Torkel Ödegaard 6ea00a4f7c fix(timpicker): another name change to make quick ranges nameing more consistent, fixes #3465 2015-12-10 13:01:41 +01:00
Torkel Ödegaard 1bb0530c69 feat(elasticsearch): metric options alignement 2015-12-10 12:15:11 +01:00
Torkel Ödegaard b36f644628 feat(elasticsearch): added pipleline aggregation derivative 2015-12-10 11:46:19 +01:00
Torkel Ödegaard 2dee9c8d74 Merge branch 'moving_avg_es_support' of https://github.com/bergquist/grafana into bergquist-moving_avg_es_support 2015-12-10 11:19:39 +01:00
Torkel Ödegaard d6311aefb7 Merge branch 'moving_avg_es_support' of https://github.com/bergquist/grafana into bergquist-moving_avg_es_support 2015-12-09 16:46:29 +01:00
Torkel Ödegaard aa4ac9fa05 fix(timerange): fixed broken unit tests 2015-12-09 13:38:53 +01:00
Torkel Ödegaard 0339a5ad01 fix(graph): removed experimental mockup code that was accidently merged master 2015-12-09 13:36:15 +01:00
Torkel Ödegaard bffb217d37 fix(panel): removed accidentally commited test markup 2015-12-09 13:08:47 +01:00
Torkel Ödegaard 40f85e5ca3 refactor(http data source options): #3473 2015-12-09 13:05:05 +01:00
Torkel Ödegaard 2dba2f4a95 Merge branch 'with_credentials' of https://github.com/mtanda/grafana into mtanda-with_credentials 2015-12-09 12:54:00 +01:00
Torkel Ödegaard 70542fb730 refactor(table views): #3466 2015-12-09 12:04:51 +01:00
Torkel Ödegaard 736d58e35f Merge branch 'updated-list-views' of https://github.com/nchristus/grafana into nchristus-updated-list-views 2015-12-09 10:43:51 +01:00
Torkel Ödegaard 64138bd424 fix(timepicker): changed name of Day so far -> Today so far, Week to date > Week so far, closes #3465 2015-12-09 10:35:39 +01:00
Torkel Ödegaard f1bc87133d Merge branch 'cloudwatch_aws-sdk-go-v1.0.0' of https://github.com/mtanda/grafana into mtanda-cloudwatch_aws-sdk-go-v1.0.0 2015-12-08 18:09:40 +01:00
Torkel Ödegaard e194461420 feat(grunt watch): optimized grunt watch, now only operates on changed files 2015-12-08 17:56:02 +01:00
Torkel Ödegaard 45c69fa638 fix(influxdb): fixed issue where Group By label was only showed on first query, fixes #3453 2015-12-08 16:40:41 +01:00
Torkel Ödegaard cdc36dd171 Updated version 2015-12-08 15:41:34 +01:00
Torkel Ödegaard a1d66d98dc Merge pull request #3448 from utkarshcmu/tips 
Fixed closing tags
 2015-12-08 12:10:05 +01:00
Torkel Ödegaard dd3295da60 Merge pull request #3449 from EricSmekens/patch-1 
Cleaned up jquery.flot.events.js
 2015-12-08 12:09:47 +01:00
Torkel Ödegaard 1ebb18ae57 Merge pull request #3432 from toni-moreno/add_rpm_deb_separate_commands 
add option pkg-rpm and pkg-deb to create separately both packages #3407
 2015-12-07 11:46:00 +01:00
Torkel Ödegaard fad4875f11 Merge pull request #3436 from utkarshcmu/templating 
Removed if condition to fix 3370
 2015-12-07 11:45:32 +01:00
Torkel Ödegaard d68e1fd308 Merge pull request #3444 from mtanda/cloudwatch_fix_period 
(cloudwatch) fix period overwrite
 2015-12-07 06:43:33 +01:00
Torkel Ödegaard 4c5cfd51d7 fix(metric_editors): Fixes clicking timing issue for typeahead auto dropdown option, fixes #3428 2015-12-06 10:13:47 +01:00
Torkel Ödegaard 5aa90eb086 Merge branch 'master' of github.com:grafana/grafana 2015-12-05 14:22:54 +01:00
Torkel Ödegaard ce58486850 fix(html): removed unneeded tag 2015-12-05 14:22:39 +01:00
Torkel Ödegaard 654d1f939e Merge pull request #3424 from grafana/code-tag 
add variable for codeTagBackground to control look for both themes.
 2015-12-04 18:17:24 +01:00
Torkel Ödegaard df0a5cf52f updated appveyor again 2015-12-04 16:56:37 +01:00
Torkel Ödegaard caa6337952 updated appveyor 2015-12-04 16:48:35 +01:00
Torkel Ödegaard 700a3f9f84 Merge branch 'master' of github.com:grafana/grafana 2015-12-04 15:45:06 +01:00
Torkel Ödegaard f9b13791de change(table panel): changed default transform mode 2015-12-04 15:38:49 +01:00
Torkel Ödegaard 7886318341 Merge pull request #3417 from mtanda/cloudwatch_dimension_filter_fix 
(cloudwatch) null check of dimension
 2015-12-04 12:30:13 +01:00
Torkel Ödegaard 002455da07 fix(table): minor fix to table panel and transform time series to aggregations 2015-12-04 12:15:42 +01:00
Torkel Ödegaard e9e6ac64bd minor change to build script 2015-12-04 11:21:38 +01:00
Torkel Ödegaard 36ab8ae19c fix(table): minor fix for table panel 2015-12-04 10:44:17 +01:00
Torkel Ödegaard df366da721 updated version to 2.6.0-beta1 2015-12-04 10:39:50 +01:00
Torkel Ödegaard 67dc761344 fix(security): do not print ENV config values when they are passwords, fixes #3337 2015-12-04 10:38:27 +01:00
Torkel Ödegaard 0b4552a8e7 fix(timerange): fix handling of invalid dates in from/to url parameters, fixes #3345 2015-12-04 10:32:23 +01:00
Torkel Ödegaard 2345b41a74 feat(elasticsearch): added min_doc_count option for date histogram, closes #3416 2015-12-04 10:06:44 +01:00
Torkel Ödegaard 141e395489 polish(influxdb): minor improvements to influxdb editor raw query editor 2015-12-04 09:20:29 +01:00
Torkel Ödegaard db9c288050 fix(elasticsearch): refactoring of #3321 2015-12-03 18:30:36 +01:00
Torkel Ödegaard f1cb8f2f25 Merge branch 'keep_es_version' of https://github.com/replay/grafana into replay-keep_es_version 2015-12-03 18:08:26 +01:00
Torkel Ödegaard 7ec2c09249 Merge branch 'master' of github.com:grafana/grafana 2015-12-03 18:05:19 +01:00
Torkel Ödegaard 354bfcea15 Merge branch 'master' of https://github.com/skbkontur/grafana 2015-12-03 18:03:55 +01:00
Torkel Ödegaard 891d7c134c Merge pull request #3205 from mtanda/cloudwatch_suggest_fix 
(cloudwatch) fix dimension value suggestion
 2015-12-03 17:17:07 +01:00
Torkel Ödegaard 0011beb654 Merge branch 'master' of github.com:grafana/grafana 2015-12-03 16:32:58 +01:00
Torkel Ödegaard 419251ed35 fix(elasticsearch): fixed issue with default state of elasticsearch query, result in error before query controller could set defaults, moved defaults to query builder, also removed raw query mode as it is pretty broken, fixes #3396 2015-12-03 16:32:35 +01:00
Torkel Ödegaard bd850d8158 Merge pull request #3410 from bergquist/ignore_npm_log 
add npm-debug.log to gitignore
 2015-12-03 15:56:38 +01:00
Torkel Ödegaard 0fb95297a2 Merge branch 'master' of github.com:grafana/grafana 2015-12-03 15:10:23 +01:00
Torkel Ödegaard cf1f43dc9d feat(influxdb): support for table queries, closes #3409, #3219 2015-12-03 15:09:39 +01:00
Torkel Ödegaard efbbb31370 Update README.md 2015-12-03 12:03:06 +01:00
Torkel Ödegaard 8eb3e48bc7 fix(build): fixed build issues with concat not including require_config 2015-12-02 18:22:47 +01:00
Torkel Ödegaard 24324939e1 Merge branch 'fix_refresh_variable_from_url' of https://github.com/toni-moreno/grafana into toni-moreno-fix_refresh_variable_from_url 2015-12-01 15:28:48 +01:00
Torkel Ödegaard 2436cda7ac fix(graph panel): minor spelling change 2015-12-01 15:28:34 +01:00
Torkel Ödegaard 75b83af08f refactoring(ui): minor ui improvement to graph axis tab 2015-12-01 14:04:44 +01:00
Torkel Ödegaard 82d8e3c2b6 feat(graph panel): refactoring of hide zero option, #3336 2015-12-01 13:34:42 +01:00
Torkel Ödegaard c351f46e47 Merge branch 'hide-zero' of https://github.com/utkarshcmu/grafana into utkarshcmu-hide-zero 2015-12-01 13:08:37 +01:00
Torkel Ödegaard fb9e8d2166 feat(table panel): fixed issue with column selection for new table panel 2015-12-01 10:16:11 +01:00
Torkel Ödegaard 3668cb6dd4 fix(readme): minor readme update 2015-12-01 09:23:30 +01:00
Torkel Ödegaard 93f3e30cac fix(log): removed logging accidentlally checked in 2015-12-01 09:19:22 +01:00
Torkel Ödegaard 52af346ec8 Merge pull request #3375 from hartfordfive/issue-3374 
Add flag option to display app version (Issue 3374)
 2015-12-01 09:18:37 +01:00
Torkel Ödegaard 8e0bba4f99 fix(templating): minor fix to default property name, fixes #3378 2015-12-01 09:01:44 +01:00
Torkel Ödegaard 4cc61d10ff fix(docs): fixed typo in installing docs fixes #3379 2015-12-01 08:59:30 +01:00
Torkel Ödegaard 0f867a3484 Merge pull request #3230 from utkarshcmu/time-units 
Added currency units, time units, tests
 2015-11-30 17:29:51 +01:00
Torkel Ödegaard 6eeddaa564 Merge pull request #3369 from matschaffer/cw/alias-fix 
Use of `<dimension name>` seems to confuse angular so changing to DIMENSION_NAME
 2015-11-30 17:28:41 +01:00
Torkel Ödegaard d80458ef81 Merge branch 'refresh' of https://github.com/utkarshcmu/grafana into utkarshcmu-refresh 2015-11-30 17:23:50 +01:00
Torkel Ödegaard ad15df7222 Merge branch 'influxdb_editor_v3' 2015-11-30 16:29:20 +01:00
Torkel Ödegaard 98f7febed1 feat(influxdb): added all functions 2015-11-30 16:28:56 +01:00
Torkel Ödegaard 4f04eaec3a feat(influxdb): moved query builder tests 2015-11-30 15:27:38 +01:00
Torkel Ödegaard 5a2b9b1f44 feat(influxdb): worked on schema upgrade for new influx query editor 2015-11-30 15:09:18 +01:00
Torkel Ödegaard 721b37a08e feat(influxdb): new editor now supports field and tag lookup again 2015-11-30 10:14:42 +01:00
Torkel Ödegaard b3d494d4c8 feat(influxdb): minor fixes to new editor 2015-11-30 08:40:11 +01:00
Torkel Ödegaard e2f0ff9e88 Merge pull request #3367 from utkarshcmu/orgs 
Fixed #3357
 2015-11-30 07:40:07 +01:00
Torkel Ödegaard 72d9fcdcb4 feat(influxdb): progress with new influxdb editor 2015-11-27 16:35:40 +01:00