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
21,134 Commits 1,123 Branches 715 Tags
b60e71c28b0c62c23717a88ba48bde97a97fdeab
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Carl Bergquist d9db457b87 Merge pull request #16033 from bergquist/backend_codestyle 
Adds backend code style guide
 2019-03-19 08:16:36 +01:00
Carl Bergquist 011e8c4a35 Merge pull request #16022 from grafana/connection-string-log-fix-simple 
Only log connection string in dev environment
 2019-03-15 14:03:01 +01:00
Carl Bergquist b1b0082e36 Merge pull request #16020 from JacobEriksson/patch-1 
Update index.md
 2019-03-15 14:00:23 +01:00
Carl Bergquist 23852b59c9 Merge pull request #15839 from grafana/15836_revoke_auth_tokens 
Support list and revoke of user auth tokens in HTTP API
 2019-03-14 17:12:49 +01:00
Carl Bergquist 291ffcb75b Merge pull request #15457 from bergquist/distributed_cache 
Distributed cache
 2019-03-14 16:16:39 +01:00
Carl Bergquist 11d9122cf5 Merge pull request #15916 from zhulongcheng/victorops-noti 
Add more info to victorOps alert notifications
 2019-03-14 10:02:44 +01:00
Carl Bergquist 9ac69fefc6 Merge pull request #15987 from fetzerch/tags 
docs: Change type of 'tags' in annotationQuery result example to list
 2019-03-14 07:48:38 +01:00
Carl Bergquist 89709e34e4 Merge pull request #15989 from utkarshcmu/fix-#15665 
Added cloudwatch metric math docs
 2019-03-14 07:47:33 +01:00
Carl Bergquist a6e5e777be Merge pull request #15896 from genofire/patch-1 
fix imageurl in notification test
 2019-03-11 07:32:14 +01:00
Carl Bergquist f3753712e0 Revert "Fix Datasource Update to no User/Password" 2019-03-11 07:22:54 +01:00
Carl Bergquist e46e71bbf3 Merge pull request #15878 from zhulongcheng/docs-add-slack-url 
docs: update slack alert notification settings
 2019-03-10 19:40:01 +01:00
Carl Bergquist 71bfefa8fb Merge pull request #15608 from Maddin-619/fix-datasource-update 
Fix Datasource Update to no User/Password
 2019-03-05 14:38:32 +01:00
Carl Bergquist 06de01dc23 Merge pull request #15458 from bergquist/integration_tests_all_packages 
run db tests in all packages
 2019-03-02 21:11:53 +01:00
Carl Bergquist 1e719bb3db Merge pull request #15659 from xlson/interl-metrics-fix 
service: fix for disabled internal metrics.
 2019-03-02 18:51:40 +01:00
Carl Bergquist 369aa2d5dd Merge pull request #15628 from bergquist/move_tracing_infra 
moves tracing packge into /infra
 2019-02-25 16:16:45 +01:00
Carl Bergquist 1aeec31495 Merge pull request #15630 from bergquist/moves_social_to_login 
moves social package to /login
 2019-02-25 16:16:20 +01:00
Carl Bergquist 0aa61c8e12 Merge pull request #15629 from bergquist/moves_metrics_to_infra 
moves metric package to /infra
 2019-02-25 02:44:09 +01:00
Carl Bergquist 0b13c96c83 Merge pull request #15419 from bergquist/contributing_bug_fixes 
contributing: improve guide for bug fixes
 2019-02-14 16:22:58 +01:00
Carl Bergquist 4f3b9c6c37 Merge pull request #15420 from marefr/fix_generic_oauth_doc 
docs: add availability note regarding non-compliant providers
 2019-02-14 10:17:58 +01:00
Carl Bergquist dcec61e1b4 Merge pull request #15378 from grafana/auth_token_quotas 
use authTokenService for session quotas restrictions
 2019-02-12 15:38:57 +01:00
Carl Bergquist 1f7a1f807e Merge pull request #15299 from grafana/15295_fux 
Make sure alert notifier provisioning directory are created for deb and rpm packages
 2019-02-11 13:31:51 +01:00
Carl Bergquist 1b22ceabbe Merge pull request #15347 from bergquist/usage_stats_naming 
renames usage state metric for auth_token
 2019-02-11 12:52:04 +01:00
Carl Bergquist 396a5a947f Merge pull request #15300 from bergquist/token_usage_stats 
adds usage stats for sessions
 2019-02-11 10:31:57 +01:00
Carl Bergquist e2c2b70a61 Merge pull request #14852 from jpenalbae/pushover-attach 
pushover: add support for attaching images (closes #10780)
 2019-01-31 11:18:08 +01:00
Carl Bergquist c6f80ecec2 Merge pull request #14229 from pbakulev/configurable-alert-notification 
Configurable alert notification
 2019-01-28 22:47:12 +01:00
Carl Bergquist 5082b66e3d Merge pull request #15078 from grafana/golang_1.11.5 
upgrade golang to 1.11.5
 2019-01-28 10:20:20 +01:00
Carl Bergquist 711f9bc034 Merge pull request #14883 from sharkpc0813/14701-fix-alert-context 
fix that alert context and result handle context do not use the same derived context.
 2019-01-28 08:30:45 +01:00
Carl Bergquist 87d44490e6 Merge pull request #15072 from mjtrangoni/fix-megacheck-issue 
pkg/services/dashboards/dashboard_service.go: simplify return
 2019-01-27 23:41:37 +01:00
Carl Bergquist d5c1f8e526 Merge pull request #14912 from grafana/poc_token_auth 
WIP. POC for session replacement base hashed tokens.
 2019-01-25 13:58:35 +01:00
Carl Bergquist 766122856b Merge pull request #14995 from bergquist/token_oauth 
Stores hashed state code in cookie for OAuth logins.
 2019-01-23 10:39:12 +01:00
Carl Bergquist f9560f949d Merge pull request #14885 from bergquist/remove_log2 
removes global log 2 functions
 2019-01-16 09:34:40 +01:00
Carl Bergquist 1a7eb2f462 Merge pull request #14868 from bergquist/provisioning_inifinite_loop 
Avoid infinite loop in the dashboard provisioner
 2019-01-15 10:34:18 +01:00
Carl Bergquist 9793c08613 Merge pull request #14855 from papagian/14841-api-error-unexisting-alert-notification 
Fix Error 500 on unexisting /api/alert-notification/<id>
 2019-01-13 21:05:54 +01:00
Carl Bergquist 0a98306e4b Merge pull request #14813 from bergquist/zero_frequency 
Make sure that frequency is never set to zero
 2019-01-10 15:20:01 +01:00
Carl Bergquist 136f6986e1 Merge pull request #14666 from bergquist/close_body 
Closes the body properly on successful webhooks
 2018-12-27 16:22:39 +01:00
Carl Bergquist b798a5412b Merge pull request #14661 from pfree/fix_typo 
Fix general tab typos
 2018-12-27 14:31:08 +01:00
Carl Bergquist c201fc170f Merge pull request #14563 from tdabasinskas/broken_oauth_provider 
Support OAuth providers that are not RFC6749 compliant
 2018-12-19 16:05:53 +01:00
Carl Bergquist 52ccb49167 Merge pull request #14593 from bergquist/export_create_notifier_func 
export init notifier func
 2018-12-19 13:51:40 +01:00
Carl Bergquist fdb48b7bbc Merge pull request #14531 from grafana/golang_1.11.4 
Upgrade go version to 1.11.4
 2018-12-19 10:09:56 +01:00
Carl Bergquist 251e80aa5e Merge pull request #14547 from jacobrichard/master 
Adding CIDR capability to auth_proxy whitelist
 2018-12-19 08:55:03 +01:00
Carl Bergquist 854487acab Merge pull request #14441 from cinaglia/delete-external-snapshot 
Add support for deleting external snapshots from Snapshots List
 2018-12-18 22:43:12 +01:00
Carl Bergquist ac458a4e4b Merge pull request #14511 from grafana/go-ldap-v3 
ldap: upgrades go-ldap to v3
 2018-12-18 08:18:40 +01:00
Carl Bergquist 7653d8a197 Merge pull request #14468 from bergquist/db_lock 
Infra package for creating distributed lock to make sure functions are executed once even in HA mode.
 2018-12-17 16:51:11 +01:00
Carl Bergquist 82adf5393e Merge pull request #14482 from joesis/logging-provisioning-file-reader 
log error when resolvePath
 2018-12-13 15:16:15 +01:00
Carl Bergquist 1b6ed5815e Merge pull request #14405 from IntegersOfK/master 
Allow backslash escaping in custom variables
 2018-12-10 07:40:18 +01:00
Carl Bergquist e61d87704d Merge pull request #14417 from Napsty/fix-variable-name-in-rp-warning 
Use correct variable name in fail text
 2018-12-10 07:13:59 +01:00
Carl Bergquist 93dee6d4c2 Merge pull request #11410 from PatrickSchuster/add_google_hangouts_chat_notifier 
Add Google Hangouts Chat notifier.
 2018-12-07 14:49:28 +01:00
Carl Bergquist 985576b482 Merge pull request #14365 from bergquist/loki_error_message 
more detailed error message for loki
 2018-12-06 17:17:19 +01:00
Carl Bergquist 3c330c8e4c Merge pull request #14317 from mjtrangoni/fix-misspell-issues 
pkg/*: Fix misspelling issues using locale US
 2018-12-05 10:34:28 +01:00
Carl Bergquist 3c8515bb77 Merge pull request #14220 from mjtrangoni/fix-misspell-issues 
Fix misspelling issues using locale US
 2018-12-03 09:18:46 +01:00
Carl Bergquist 9b20c9c3a5 Merge pull request #14225 from zicklam/patch-3 
removed extra whitespace
 2018-11-29 10:00:09 +01:00
Carl Bergquist 486ece329b Merge pull request #14227 from zicklam/patch-4 
added google_tag_manager_id from defaults.ini
 2018-11-29 09:59:35 +01:00
Carl Bergquist 9785a8aba0 Merge pull request #14219 from orojina/patch-1 
Update export_import.md
 2018-11-29 08:24:09 +01:00
Carl Bergquist c3d64e0352 Merge pull request #14148 from bergquist/alerting_options_to 
updates time range options for alert queries
 2018-11-21 17:25:32 +01:00
Carl Bergquist acf8d43682 Merge pull request #14056 from mjtrangoni/fix-errcheck-issues 
Fix errcheck issues
 2018-11-21 17:23:56 +01:00
Carl Bergquist c852acaeca Merge pull request #14143 from bergquist/docs_alerting_for 
Adds example timeline in docs for alerting for
 2018-11-21 15:15:39 +01:00
Carl Bergquist db8bd8298a Merge pull request #14077 from bobmshannon/bs/metrics_endpoint_auth 
Add basic authentication support to metrics endpoint
 2018-11-20 11:19:55 +01:00
Carl Bergquist 6049855dc7 Merge pull request #13947 from bergquist/alerting_for 
Introduce alert debouncing
 2018-11-19 10:38:02 +01:00
Carl Bergquist 03ac9c5256 Merge pull request #12029 from Nick-Triller/11893_oauth_auto_login 
11893 oauth auto login
 2018-11-19 10:21:33 +01:00
Carl Bergquist 81a5b90022 Merge pull request #14043 from bergquist/upgrade_macaron_session 
Upgrades the go-macaroon package
 2018-11-13 14:42:06 +01:00
Carl Bergquist fdbea75775 Merge pull request #14021 from mjtrangoni/fix-gofmt-issues 
Fix gofmt issues
 2018-11-12 11:22:12 +01:00
Carl Bergquist 733f2b066a Merge pull request #14012 from mjtrangoni/fix-megacheck-issues 
Fix last megacheck issues
 2018-11-11 11:22:26 +01:00
Carl Bergquist a8b8af9742 Merge pull request #13994 from andreykaipov/feature/more-slack-alerting-options 
Adds more options for Slack notifications
 2018-11-08 14:59:56 +01:00
Carl Bergquist 5abc884f5f Merge pull request #13964 from bergquist/alerting_deleted_folder 
alerting: delete alerts when parent folder is deleted
 2018-11-05 15:32:46 +01:00
Carl Bergquist c9aba023b5 Merge pull request #13962 from bergquist/alerting_median_tests 
alerting: adds tests for the median reducer
 2018-11-05 09:25:44 +01:00
Carl Bergquist f43f4a94a7 Merge pull request #13961 from mtanda/cw_doc_math 
add minimal permission to docs
 2018-11-05 09:10:36 +01:00
Carl Bergquist 03d02523fd Merge pull request #13956 from bbodenmiller/patch-1 
Gitlab -> GitLab
 2018-11-05 07:23:55 +01:00
Carl Bergquist 12d38d1fdd Merge pull request #13959 from bbodenmiller/patch-2 
typo fix for "has"
 2018-11-05 07:22:55 +01:00
Carl Bergquist d2a8a8358c Merge pull request #13945 from bergquist/alerting_increase_default_duration 
alerting: increase default duration for queries
 2018-11-03 14:02:03 +01:00
Carl Bergquist 42d902b07d Add new build info metrics that contains more info (#13876) 
* Add new build info metrics that contains more info

The goal was to add more information about Grafana. But rather than
just adding those to the current metrics I created a new metric
since its a common pattern in the prometheus community to expose that
info in a metric named `*_build_info`.

We keep the old metric to avoid introducing any breaking changes but
we should be able to remove it the next breaking change
 2018-10-30 11:18:43 +01:00
Carl Bergquist c0c2df4da0 Merge pull request #13871 from crab86/patch-2 
Updated grafana_stats.json
 2018-10-29 17:42:44 +01:00
Carl Bergquist 1f6df77a80 Merge pull request #13869 from bergquist/delete_old_deocs 
removes old invalid release guide
 2018-10-29 10:47:18 +01:00
Carl Bergquist 0d41904ee5 Merge pull request #13755 from Yukinoshita-Yukino/master 
Fix cannot receive dingding alert when alert message is empty
 2018-10-24 14:56:08 +02:00
Carl Bergquist 94e2d2b483 Merge pull request #13680 from davewat/add-notification-channel-option-to-disable-resolved-alert 
Add channel option to disable the resolved alert (OK Message)
 2018-10-17 11:08:39 +02:00
Carl Bergquist efe9d27820 Merge pull request #13683 from eripe970/patch-2 
Small readme update, link to license
 2018-10-15 23:59:56 +02:00
Carl Bergquist 795a24d027 Merge pull request #13681 from eripe970/patch-1 
Small fixes to documentation
 2018-10-15 23:59:27 +02:00
Carl Bergquist 3f6f98a532 Merge pull request #13661 from mjtrangoni/remove-os-kill 
Remove os.Kill as it cannot be trapped
 2018-10-15 08:47:26 +02:00
Carl Bergquist 8962ca81a6 Merge pull request #13574 from grafana/update-stackdriver-provisioning-docs 
Improve Stackdriver provisioning docs
 2018-10-09 12:39:13 +02:00
Carl Bergquist f35fd0c5a3 Merge pull request #13509 from grafana/13507-permissions-on-role-fix 
Fix issue with updating role permissions #13507
 2018-10-03 14:20:12 +02:00
Carl Bergquist 99f2342fa1 Merge pull request #13508 from grafana/release_publisher 
build: automatically publish releases to grafana.com.
 2018-10-03 14:10:17 +02:00
Carl Bergquist 9e09b2b969 Merge pull request #13477 from grafana/alert_rule_state_changes_version 
use alert state changes counter for alert notification dedupping.
 2018-10-02 10:18:27 +02:00
Carl Bergquist 8e9c0a44c3 Merge pull request #13470 from mjtrangoni/fix-megacheck-issues 
Fix megacheck issues
 2018-10-01 23:14:14 +02:00
Carl Bergquist 464f3f738f Merge pull request #13360 from sapcc/symlinks 
resolve symlink on each run
 2018-09-27 09:21:29 +02:00
Carl Bergquist af0f3f2119 Merge pull request #13391 from grafana/provisioning-interval 
provisioning: changed update interval default 3 to 10 seconds
 2018-09-25 22:43:34 +02:00
Carl Bergquist 4520962ac2 Merge pull request #13401 from grafana/render-limits 
Concurrent render limits
 2018-09-25 15:28:57 +02:00
Carl Bergquist fe9d86c070 Merge pull request #13330 from mjtrangoni/fix-megacheck-issues 
Fix megacheck issues
 2018-09-19 09:52:09 +02:00
Carl Bergquist f2247c160a Merge pull request #13279 from bergquist/init_some_counter_as_zero 
Internal metrics: starts counters at zero
 2018-09-17 11:09:19 +02:00
Carl Bergquist f22f1d46c8 Merge pull request #10163 from grafana/9587_annotation_tags_wih_temp_var 
annotations: allows template variables to be used in tag filter
 2018-09-17 10:34:38 +02:00
Carl Bergquist 6dff5e6bc7 Merge pull request #13295 from mjtrangoni/fix-some-megacheck-issues 
Fix some megacheck issues
 2018-09-17 10:13:34 +02:00
Carl Bergquist 047fb770c8 Merge pull request #13269 from DanCech/pluginUpgrade 
use pluginName consistently when upgrading plugins
 2018-09-14 09:35:58 +02:00
Carl Bergquist ec5aa332ac removes old unused examples (#13260) 
Just wanted to reduce the amount of files/folders in root
 2018-09-13 21:09:21 +02:00
Carl Bergquist 2f9675b3f8 Merge pull request #13217 from mike-sol/master 
Add Centrify documentation for generic_oauth
 2018-09-11 09:34:48 +02:00
Carl Bergquist 5069e4eadd Merge pull request #11681 from Jonnymcc/sort-dashboard-tags 
Sort results from GetDashboardTags
 2018-09-11 09:19:30 +02:00
Carl Bergquist 7e0637aa9d Merge pull request #12260 from strohi/panelids-for-htmlbookmark 
added id tag to Panels for html bookmarking on longer Dashboards
 2018-09-10 13:01:35 +02:00
Carl Bergquist 37af10c61f Merge pull request #13209 from metalmatze/docs-jsonnet 
Add jsonnet with grafonnet-lib to provisioning docs
 2018-09-10 11:59:31 +02:00
Carl Bergquist b070784b8a adds usage stats for alert notifiers (#13173) 2018-09-06 21:03:09 +02:00
Carl Bergquist 3c0b1ef581 Merge pull request #13170 from bergquist/alerting_default_setting 
make default values for alerting configurable
 2018-09-06 13:26:42 +02:00
Carl Bergquist 2f6af7b811 Merge pull request #13125 from overcookedpanda/master 
added Bitcoin as a currency option
 2018-09-04 11:07:49 +02:00
Carl Bergquist ee1083d9b4 cli: avoid rely on response.ContentLength (#13120) 
response.ContentLength might be invalid if the http response
is chunked.

fixes #13079
 2018-09-03 20:33:21 +02:00
Carl Bergquist 861af4cb97 Improve extensions build. (#12461) 
* enable ee build on pr/master

* step1: of including group sync

* disable commit pinning for now

* fixes broken build

* enable team to ldap group sync

* avoid returning error for missing external handler

* services: allow routes to be added before http server start

* services: allows services to add their own migrations

* moves db migrations to ee code base

* build using master branch in ee

* disable enterprise build in .bra.toml

[skip ci]

* removes team sync extensions

* removes commented line
 2018-07-01 07:01:43 -07:00