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,725 Commits 1,123 Branches 715 Tags
10a0460dc64fde9deca216f37478300a2e67fd66
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Carl Bergquist 10a0460dc6 Merge pull request #11282 from alexanderzobnin/fix-11086 
Fix rendering link to panel in collapsed row
 2018-03-20 12:40:30 +01:00
Carl Bergquist f64c6e490a Merge pull request #11258 from mitjaziv/hide-credentials 
add regex search/replace of username/password in urls
 2018-03-20 09:37:09 +01:00
Carl Bergquist 930d00b513 Merge pull request #11284 from flopp999/patch-1 
Changed Swedish and Icelandic currency
 2018-03-19 08:15:34 +01:00
Carl Bergquist 1014f7c40a Merge pull request #11260 from iksaif/master 
alertmanager: handle resolved alerts, nodata, and execution errors + cleanups
 2018-03-16 09:11:59 +01:00
Carl Bergquist 18e498e0ff Update README.md 
Removes alpha 

closes https://github.com/grafana/grafana/issues/11251
 2018-03-14 21:07:55 +01:00
Carl Bergquist 105f6ff88c Merge pull request #11249 from bergquist/legacy_render_urls 
Avoid redirecting internal rendering requests
 2018-03-14 15:42:07 +01:00
Carl Bergquist 6d1e3613f7 Merge pull request #11246 from grafana/11227_import 
dashboard: fix import dashboard with alert rule(s)
 2018-03-14 14:38:29 +01:00
Carl Bergquist a8918047a2 Merge pull request #11238 from grafana/11155-mysql-issue 
middleware: recover and retry on session start
 2018-03-14 14:29:47 +01:00
Carl Bergquist 0ef94ea403 Merge pull request #11232 from grafana/11231_dash_url 
Should be possible to browse dashboard using only uid
 2018-03-14 14:18:58 +01:00
Carl Bergquist a0a57ac33a Merge pull request #11236 from grafana/alerting_collapsed_panels 
alerting: supports extracting alerts from collapsed panels
 2018-03-14 14:16:50 +01:00
Carl Bergquist 9cae6f05b4 Merge pull request #11225 from flopp999/patch-1 
Added icon for iOS web app
 2018-03-13 21:54:55 +01:00
Carl Bergquist 6df13252bf Merge pull request #11143 from ApsOps/colorize-singlestat-prefix-postfix 
Add color to prefix and postfix in singlestat panel
 2018-03-13 10:41:40 +01:00
Carl Bergquist bf6ff50d0b Merge pull request #11087 from alexanderzobnin/prometheus-heatmap 
Prometheus heatmap support
 2018-03-13 09:44:25 +01:00
Carl Bergquist ccd11ac928 Merge pull request #11212 from flopp999/patch-1 
Added concentration units and "Normal cubic metre"
 2018-03-13 08:23:04 +01:00
Carl Bergquist a9fd3e65ea Merge pull request #11214 from kkohtaka/patch-1 
docs: fix an outdated link to Prometheus's doc
 2018-03-13 08:00:26 +01:00
Carl Bergquist a9d485c1e8 Merge pull request #11205 from matrixik/patch-1 
Fix urls in plugin update_checker logs
 2018-03-12 20:40:24 +01:00
Carl Bergquist e94d23e5ff Merge pull request #10873 from willyhutw/cloudwatch_dimension_values_add_dimension_filter 
Cloudwatch dimension_values add dimension filter.
 2018-03-12 14:24:26 +01:00
Carl Bergquist 74602b1077 Merge pull request #11183 from jtyr/jtyr-timeticks 
Adding Timeticks unit
 2018-03-12 09:53:53 +01:00
Carl Bergquist 4edc49bfab Merge pull request #9859 from mtanda/prometheus_post 
(prometheus) support POST for query and query_range
 2018-03-12 09:21:45 +01:00
Carl Bergquist a589f701ad Merge pull request #10925 from mtanda/cw_high_resolution 
(cloudwatch) support high resolution query
 2018-03-08 18:06:08 +01:00
Carl Bergquist 5153d8e535 Merge pull request #11161 from DanCech/quota-refactor 
move quota to dedicated service
 2018-03-08 15:21:16 +01:00
Carl Bergquist 87db2d1183 Merge pull request #11130 from DanCech/context-refactor 
move Context and session out of middleware
 2018-03-08 10:21:34 +01:00
Carl Bergquist e3b86637f9 Merge pull request #11146 from grafana/go1.10 
Upgrade golang to 1.10
 2018-03-07 18:00:37 +01:00
Carl Bergquist 687179809e Merge pull request #11139 from jonyrock/patch-1 
Documentation fix: "~/go" to "$GOPATH"
 2018-03-07 17:51:21 +01:00
Carl Bergquist d220516664 Merge pull request #11145 from grafana/alerting-invalid-data 
alerting: fixes validation error when saving alerts in dash
 2018-03-07 17:06:19 +01:00
Carl Bergquist d07aff8991 Merge pull request #11127 from DanCech/oauth-jwt-email 
only use jwt token if it contains an email address
 2018-03-07 17:01:12 +01:00
Carl Bergquist b1494637d1 Merge pull request #11141 from mtanda/templating_comma_join 
add comma templating format
 2018-03-07 16:49:19 +01:00
Carl Bergquist c39e68de24 Merge pull request #11046 from llamashoes/master 
Add metrics that triggered alert to description in OpsGenie.
 2018-03-07 15:48:30 +01:00
Carl Bergquist 3f6e525755 Merge pull request #10942 from grafana/pausing_alerts_updates_timestamp 
Pausing/un alerts now updates new_state_date
 2018-03-07 15:40:12 +01:00
Carl Bergquist 08f587a0ef Merge pull request #10838 from ilgizar/7107_right_y_axis 
Thresholds for Right Y axis
 2018-03-06 15:18:24 +01:00
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