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
13,496 Commits 1,123 Branches 715 Tags
01582a2f12573f377d476fb9c37146fe925e9882
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Carl Bergquist 01582a2f12 Merge pull request #11121 from grafana/telegram-inline-image-notifications 
alerting: Limits telegram captions to 200 chars.
 2018-03-06 14:19:59 +01:00
Carl Bergquist 9f40ad740f Merge pull request #11118 from bergquist/missing_icon_disabled_gravatar 
fixes invalid link to profile pic when gravatar is disabled
 2018-03-06 12:36:08 +01:00
Carl Bergquist c372716692 Merge pull request #11109 from bergquist/unsaved_changes_fix 
ignore iteration property when checking for unsaved changes
 2018-03-06 10:33:27 +01:00
Carl Bergquist 1fe8b33f65 Merge pull request #11000 from victorclaessen/master 
Added radiation units
 2018-03-06 09:38:12 +01:00
Carl Bergquist 75ae34cf84 Merge pull request #10999 from grafana/10995_docs 
docs: update shortcut docs
 2018-02-23 09:29:05 +01:00
Carl Bergquist 2d5d5e639f Merge pull request #10998 from grafana/10995_shortcut 
Fix keyboard shortcuts
 2018-02-23 09:21:39 +01:00
Carl Bergquist f0d6ea1703 Merge pull request #10967 from bergquist/sample-yaml 
provisioning: dont ignore sample yaml files
 2018-02-20 09:24:31 +01:00
Carl Bergquist af7ede6ec5 Merge pull request #10959 from grafana/10957_influx_escaping 
influxdb: escape backslashes in tag values (for alerting)
 2018-02-19 15:28:55 +01:00
Carl Bergquist 0b8c3ab56f Merge pull request #10962 from agyorev/dashboard-missing-input-error-typo 
Correct typo in DashboardInputMissingError
 2018-02-19 15:23:10 +01:00
Carl Bergquist a1d79997be Merge pull request #10958 from srid99/master 
Fix broken markdown links in CHANGELOG.md
 2018-02-18 20:17:58 +01:00
Carl Bergquist aa902ef826 Merge pull request #10921 from bergquist/invalid_uid 
dashboard: whitelist allowed chars for uid
 2018-02-15 10:19:42 +01:00
Carl Bergquist fcca578f41 updates readmes for mysql and postgres (#10913) 
ref #10813
 2018-02-15 09:38:39 +01:00
Carl Bergquist 243b987758 Merge pull request #10910 from bergquist/provisioning_disable_deleting_dashboards 
provisioning: adds setting to disable dashboard deletes
 2018-02-15 08:28:10 +01:00
Carl Bergquist 3091697a2c Merge pull request #10896 from bergquist/provisioning_cfg_camelCase 
Change naming format to camelCase for provisioning configs
 2018-02-14 11:00:01 +01:00
Carl Bergquist d31e333e7e Merge pull request #10888 from ScottBrenner/patch-1 
Minor typo fix
 2018-02-13 15:11:29 +01:00
Carl Bergquist 864e2647db Merge pull request #10844 from marefr/env_db_test 
Allow use of environment variable to decide what database engine to run tests on
 2018-02-09 09:35:48 +01:00
Carl Bergquist 04a94ce396 adds unique index for org_id+folder_id+title on dashboards (#10766) 2018-02-05 14:11:19 +01:00
Carl Bergquist cc0cc8dd73 changes to new urlformat for home dashboard (#10738) 2018-02-05 10:24:48 +01:00
Carl Bergquist a7114dcec1 Merge pull request #10722 from AlexandreRio/patch-1 
Update search datasource by name API path
 2018-02-01 20:43:28 +01:00
Carl Bergquist 3b4e487662 Merge pull request #10715 from grafana/7883_alerting 
Implement new url format in alerting
 2018-02-01 14:38:28 +01:00
Carl Bergquist eff687bece Merge pull request #10694 from grafana/7883_backend 
backend for new url structure.
 2018-02-01 09:35:00 +01:00
Carl Bergquist 1303dc7ac0 Merge pull request #10704 from alexanderzobnin/fix-backend-plugin-table-rows 
plugins: return table with empty rows array insteaf of nil
 2018-02-01 09:17:29 +01:00
Carl Bergquist ac2b36c271 Merge pull request #10610 from grafana/phantomjs_fix 
fixes broken phantomjs rendering
 2018-01-25 21:25:02 +01:00
Carl Bergquist 7c9913cb8a Merge pull request #10605 from tsvehagen/haproxy-example 
docs: Add haproxy example for running behind reverse-proxy
 2018-01-24 22:03:53 +01:00
Carl Bergquist e24d9a6224 Merge pull request #10584 from bkaganyildiz/update-opsgenie-notifier 
Update OpsGenie Notifier to support different api domains.
 2018-01-23 08:57:13 +01:00
Carl Bergquist 184e7046df Merge pull request #10059 from FunkyM/local-image-store 
Add support for internal image store
 2018-01-22 11:03:00 +01:00
Carl Bergquist 89ae4d6685 Merge pull request #9664 from mtanda/prometheus_on_by 
(prometheus) show label name in paren after by/without/on/ignoring/group_left/group_right
 2018-01-22 10:42:20 +01:00
Carl Bergquist 27d103adae Merge pull request #10574 from Jonnymcc/disable-mode-options-line-points-unchecked 
Disable instead of hide mode options when line/points is unchecked
 2018-01-22 08:11:19 +01:00
Carl Bergquist 397da7a444 Merge pull request #10572 from Jonnymcc/add-lumens-unit 
Add lumens unit
 2018-01-22 07:35:26 +01:00
Carl Bergquist 1de00ded1e Merge pull request #10556 from Ultimation/patch-1 
Recommend a limit on database query for influxdb annotations
 2018-01-19 13:49:29 +01:00
Carl Bergquist 987a546e74 Merge pull request #10563 from grafana/golang_dep 
Migrated from govendor to dep
 2018-01-19 10:22:54 +01:00
Carl Bergquist d6667c4fa0 Merge pull request #10548 from StevenTobin/follow_symlinks 
Make file_reader follow symlinks
 2018-01-18 11:29:34 +01:00
Carl Bergquist 81bb3e1e27 Merge pull request #10547 from grafana/provisioning 
Dashboard provisioning. Replace folder property with path
 2018-01-18 10:05:19 +01:00
Carl Bergquist baffdb156e Merge pull request #10510 from nir0s/fix-docs 
Fix docs
 2018-01-15 08:10:59 +01:00
Carl Bergquist a69bdf9432 Merge pull request #9967 from rburchell/master 
Add support for inline image uploads to telegram notifier plugin
 2018-01-12 13:18:22 +01:00
Carl Bergquist 044a44757c Merge pull request #10457 from pachico/master 
Fix typo in error message
 2018-01-09 08:32:51 +01:00
Carl Bergquist e8704569f0 Merge pull request #10449 from xlson/update-go-stack-dependency 
Updates go-stack to v1.7.0.
 2018-01-08 21:19:56 +01:00
Carl Bergquist be93468b58 Merge pull request #10383 from babolivier/enhance/doc-dashboard-version 
Doc version and schemaVersion properties of dashboards
 2017-12-29 13:56:53 +01:00
Carl Bergquist 16ef068342 Merge pull request #10373 from bergquist/dashboard_folder_provisioning 
Dashboards as cfg: create dashboard folder if missing
 2017-12-28 16:13:18 +01:00
Carl Bergquist 29f58475a3 Merge pull request #8956 from saada/azure-external-image-store 
Azure Blob Storage external image uploader
 2017-12-28 15:34:20 +01:00
Carl Bergquist 7a8a52a145 Merge pull request #10362 from grafana/cloudwatch-file-to-ts 
migrated datasource to ts
 2017-12-28 13:44:18 +01:00
Carl Bergquist 07432cb4fa Merge pull request #10297 from m0nhawk/patch-1 
fix missing comma in documentation output example
 2017-12-20 10:07:50 +01:00
Carl Bergquist 326ba11c42 Merge pull request #10280 from bergquist/windows_build 
WIP: delete unused icon files
 2017-12-19 14:35:22 +01:00
Carl Bergquist 887af65ca9 Merge pull request #10264 from SteelPhase/patch-2 
fix: Extra forward slash added when org redirect middleware is called (#10263)
 2017-12-19 13:58:33 +01:00
Carl Bergquist 0d9378d18e Merge pull request #10274 from bergquist/alerting_without_rows 
Alerting without dashboard rows
 2017-12-19 13:19:33 +01:00
Carl Bergquist 47fb017a5f Merge pull request #10240 from sernst/master 
Kinesis Metric Capitalization
 2017-12-16 13:16:01 +01:00
Carl Bergquist f5d26bfcc9 Merge pull request #10050 from davkal/davkal/multi-query-table 
Add support to render values of multiple queries in the same table
 2017-12-14 15:57:07 +01:00
Carl Bergquist 45eda16a87 Merge pull request #10203 from queeno/dashboard_provisioner_id_validation 
Avoid ID validation before provisioning dashboards
 2017-12-14 15:43:07 +01:00
Carl Bergquist 35106537f2 Replace Read Only Editor role with ViewersCanEdit setting (#10166) 
* removes readonly editor role

* adds viewersCanEdit setting

This enable you to allow viewers to edit/inspect
dashboards in grafana in their own browser without
allowing them to save dashboards

* remove read only editor option from all dropdowns

* migrates all read only viewers to viewers

* docs: replace readOnlyEditor with viewersCanEdit
 2017-12-13 18:53:42 +01:00
Carl Bergquist ea2f65b4c3 Merge pull request #10110 from bwhaley/master 
Fixes bug in cloudwatch regarding credentials
 2017-12-12 10:16:53 +01:00
Carl Bergquist 5d70a36ad8 Merge pull request #10150 from jomenxiao/jomenxiao/render_setting_lang 
[render image]add encoding param
 2017-12-11 10:36:38 +01:00
Carl Bergquist 43cff3a2bd Merge pull request #10146 from noakup/master 
hyphen
 2017-12-11 10:18:00 +01:00
Carl Bergquist a5b3f2b891 Merge pull request #10132 from bergquist/go_routine_management 
Wait for all sub routines to finish before closing Grafana
 2017-12-11 09:43:37 +01:00
Carl Bergquist 2408d8f09a Merge pull request #10112 from adiletmaratov/master 
Solves problem with Github authentication restriction by organization
 2017-12-08 16:05:27 +01:00
Carl Bergquist fb386f3c8d Merge pull request #10052 from bergquist/dashboards_from_disk 
Load dashboards from disk into the database at regular interval
 2017-12-07 16:12:02 +01:00
Carl Bergquist f327e7c818 Merge pull request #10055 from paulfantom/master 
add Cloud Alchemy Ansible role
 2017-12-04 11:26:34 +01:00
Carl Bergquist 89fb60a956 Merge pull request #10020 from jomenxiao/master 
fix render http[get] params error
 2017-12-01 16:22:47 +01:00
Carl Bergquist 820abef82d Merge pull request #10025 from jgrassler/systemd-sdnotify 
Use systemd notification where applicable
 2017-12-01 13:26:13 +01:00
Carl Bergquist 142c3a6bc2 Merge pull request #10042 from andrei-kolosok/master 
grafana-10039: fix query time range ends in the past
 2017-11-30 16:41:43 +01:00
Carl Bergquist 603725aeb0 Merge pull request #10041 from grafana/revert-9983-prometheus_nested 
Revert "prometheus nested query support"
 2017-11-30 15:06:16 +01:00
Carl Bergquist af5ced0e18 Revert "prometheus nested query support" 2017-11-30 15:06:02 +01:00
Carl Bergquist 98f0305e68 Merge pull request #9983 from mtanda/prometheus_nested 
prometheus nested query support
 2017-11-30 14:57:34 +01:00
Carl Bergquist 2bc91c8660 Merge pull request #10013 from grafana/view-json-template 
export view json now templatized, fixes #10001
 2017-11-28 15:02:26 +01:00
Carl Bergquist 4a2941dc90 Merge pull request #9981 from grafana/more-js-to-ts-migration 
migrated four files from js to ts
 2017-11-27 09:41:27 +01:00
Carl Bergquist c3699d8259 Merge pull request #9952 from seuf/log_file_count_lines 
Optimized number of lines fetching in log file initialisation
 2017-11-23 14:22:50 +01:00
Carl Bergquist d8d44224f5 Merge pull request #9950 from seuf/es_56_max_concurrent_shards_request 
Elasticsearch max_concurrent_shard_requests parameter for es 5.6+
 2017-11-22 10:49:46 +01:00
Carl Bergquist 79e788e46f Merge pull request #9937 from saady/gcs-path 
[GCS] Support for gcs path
 2017-11-21 19:46:53 +01:00
Carl Bergquist c83975f2e1 Merge pull request #9936 from grafana/js-to-ts-migration 
Js to ts migration
 2017-11-21 09:21:22 +01:00
Carl Bergquist 3351f959d0 Merge pull request #9913 from tomwilkie/dashboard-json-configmaps 
Don't import JSON dashboards from hidden directories.
 2017-11-20 08:31:05 +01:00
Carl Bergquist 03c23dd9c1 Merge pull request #9901 from grafana/fix_annotations_api 
fix: return id from api when creating new annotation, fixes #9798
 2017-11-16 16:51:41 +01:00
Carl Bergquist 9ea5af578e Merge pull request #9504 from grafana/datasource_as_cfg 
Datasources as configuration
 2017-11-16 16:13:02 +01:00
Carl Bergquist 5d6ed6c45f prom: add support for default step param (#9866) 
Alerting for prometheus have been depending on the step parameter from each query.
In https://github.com/grafana/grafana/pull/9226 we changed the behavior for step in the
frontend which caused problems for alerting. This commit fixes that by introducing a default
min interval value so alerting always have something to depend on. 

closes #9777
 2017-11-15 11:22:00 +01:00
Carl Bergquist c44f6e2ec2 Merge pull request #9854 from drenalin23/drenalin-add-networkelb-cloudwatch 
Add AWS/NetworkELB to cloudwatch definitions
 2017-11-13 07:50:45 +01:00
Carl Bergquist c30947df61 Merge pull request #9855 from mtanda/cw_inspector 
(cloudwatch) fix query inspector
 2017-11-13 07:43:21 +01:00
Carl Bergquist 6a485f3016 Merge pull request #9856 from mtanda/cw_null_for_no_datapoint 
(cloudwatch) return empty array for no datapoints
 2017-11-13 07:41:08 +01:00
Carl Bergquist 48d77ea2a8 Merge pull request #9785 from certusoft/mysql_performance 
MySQL Performance when using GF_DATABASE_URL
 2017-11-09 18:07:22 +01:00
Carl Bergquist 56fe1308ce Merge pull request #9826 from agnivade/hexencoding 
Use hex.EncodeToString to encode to hex
 2017-11-09 17:58:35 +01:00
Carl Bergquist b65ea57f97 Merge pull request #9787 from nadezhdamosunova/patch-2 
Update postgres.md
 2017-11-06 07:59:44 +01:00
Carl Bergquist bf85735a36 Merge pull request #9765 from RatnadeepSimhadri/patch-1 
chore(docs): update the search Query Example
 2017-11-02 07:50:08 +01:00
Carl Bergquist 17492c091a Merge pull request #9752 from mtanda/cw_alias_fix 
[bug fix] (cloudwatch) fix default alias format
 2017-11-02 07:45:26 +01:00
Carl Bergquist c783bdac39 Merge pull request #9753 from mtanda/cw_period 
(cloudwatch) add period alias
 2017-11-01 14:02:41 +01:00
Carl Bergquist d4f40eac6f Merge pull request #9745 from cglewis/master 
MAINTAINER is deprecated, now using LABEL
 2017-10-31 18:24:34 +01:00
Carl Bergquist 8ed1d935df Merge pull request #9741 from akshaychhajed/docker-compose-v3 
Transitioning fig to docker-compose v3
 2017-10-31 15:23:59 +01:00
Carl Bergquist 7583b78c3a Merge pull request #9723 from boeboe/master 
Correct help message of api_dataproxy_request_all_milliseconds
 2017-10-30 13:08:32 +01:00
Carl Bergquist 1a3373e049 Merge pull request #9699 from it-teaching-abo-akademi/master 
Alertlist: Inform when no alerts in current time range
 2017-10-30 11:12:11 +01:00
Carl Bergquist d83f0fb266 Merge pull request #9698 from mtanda/text_ace_editor 
[Feature Request] ace editor for text panel
 2017-10-30 11:07:53 +01:00
Carl Bergquist e5ec357625 Merge pull request #9697 from bergquist/fix_removed_threshols 
save as should only delete threshold for panels with alerts
 2017-10-28 23:48:31 +02:00
Carl Bergquist c91a1e994b Merge pull request #9594 from bergquist/datasources_optimistic_concurrency 
datasources: change to optimistic concurrency
 2017-10-25 12:44:36 +02:00
Carl Bergquist 89a070029f Merge pull request #9648 from jasonodonnell/master 
Fix typo in template help tab
 2017-10-24 16:54:05 +02:00
Carl Bergquist 5701b73ab2 Merge pull request #9642 from nadezhdamosunova/patch-1 
Update development.md
 2017-10-24 13:24:16 +02:00
Carl Bergquist e91b00c355 Merge pull request #9637 from utkarshcmu/singlestat_fix 
Fixed #9636
 2017-10-24 10:19:05 +02:00
Carl Bergquist c4365e225c Merge pull request #9605 from jasonodonnell/master 
Fix typos in init.d comment
 2017-10-20 20:12:51 +02:00
Carl Bergquist 1d7a0db54b Sort series in the same order as legend in graph panel (#9563) 
* graph: sort series in the same order as legend

closes #9538

* style: use function arrows

* graph: remove sort by legend option

sort series based on legend by default is sort order
is set and stack is enabled

* graph: remove useless sort

* graph: make code simpler
 2017-10-19 13:04:02 +02:00
Carl Bergquist e8141b48d2 Merge pull request #9555 from mtanda/prometheus_46_improve_minor_fix 
(prometheus) minor fix of auto complete
 2017-10-19 10:42:34 +02:00
Carl Bergquist e8da084baf Merge pull request #9561 from mtanda/prometheus_46_fix_range 
(prometheus) fix to show vector range popup
 2017-10-18 13:39:57 +02:00
Carl Bergquist 43f039859a Merge pull request #9573 from cjchand/master 
When Messasge field is set for an alert, map it to the output field i…
 2017-10-18 12:10:42 +02:00
Carl Bergquist 5910453e8a Merge pull request #9560 from mtanda/prometheus_46_metric_name_matching 
(prometheus) allow ":" character for metric name
 2017-10-17 13:34:25 +02:00
Carl Bergquist 4cc9f4f075 Merge pull request #9558 from mtanda/cw_fix_expand_46 
(cloudwatch) fix template variable expanding
 2017-10-17 11:15:44 +02:00
Carl Bergquist c144dc86f2 Update CHANGELOG.md 2017-10-17 10:59:23 +02:00
Carl Bergquist 7923864935 Update CHANGELOG.md 2017-10-17 10:57:33 +02:00