IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2026-07-29 15:59:50 -05:00
Code Issues Packages Projects Releases Wiki Activity
10,240 Commits 1,119 Branches 715 Tags
f23239650e96c614767d48d9add8657900079e2b
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
bergquist fe970f6629 docs: adds note about closing #7676 2017-03-03 11:09:05 +01:00
bergquist 26bb9ad399 build: use initial checkout within container 
speedup and simplify the build within the container
 2017-03-03 11:07:05 +01:00
Carl Bergquist f185c2c953 Merge pull request #7676 from dbrgn/threema-emoji 
feat(alerting): Add emoji to Threema alert notifications
 2017-03-03 11:04:49 +01:00
bergquist 55e0df7896 docs: adds note about closing #7710 2017-03-02 14:01:06 +01:00
bergquist ee190d57eb webhooks: get proxy settings from ini file 
closes #7710
 2017-03-02 13:58:50 +01:00
bergquist 412b8998a8 webhooks: get proxy settings from ini file 
closes #7710
 2017-03-02 13:57:28 +01:00
bergquist 473513aa2f docs: how to configure alert notification links 2017-03-01 17:19:34 +01:00
Carl Bergquist 824357ed3b Merge pull request #7694 from rickard-von-essen/patch-1 
Added some details about Sessions in Postgres
 2017-03-01 12:17:25 +01:00
bergquist 06146b801c build: replace sha1 files with sha256 
due to security reasons.
https://security.googleblog.com/2017/02/announcing-first-sha1-collision.html
 2017-03-01 11:44:53 +01:00
bergquist 62eb19a186 template: dont allow template variables to begin with '__' 
closes #7678
 2017-02-28 17:08:38 +01:00
bergquist 6b1dd1c7fc changelog: adds note about closing #7678 2017-02-28 17:08:17 +01:00
bergquist 9b6571fab1 template: dont allow template variables to begin with '__' 
closes #7678
 2017-02-28 17:04:47 +01:00
bergquist 1631c8de95 build: use correct version for tar.gz files 2017-02-28 09:15:06 +01:00
bergquist 3ef077c180 build: use correct version for tar.gz files 2017-02-28 09:09:49 +01:00
bergquist 7d897c0980 build: add docker trigger for release builds 2017-02-27 13:26:53 +01:00
bergquist 86789c0b69 docs: update docs for 4.2.0 beta release 2017-02-27 12:44:55 +01:00
bergquist a763285daa updates script for packagecloud 2017-02-27 11:05:05 +01:00
bergquist ffe0ecfaaa release 4.2.0 beta1 2017-02-27 10:33:26 +01:00
bergquist 05952688c5 tech: avoid using http.DefaultClient 2017-02-24 17:22:12 +01:00
bergquist 03354bc49a tech: replace context.TODO with background ctx 2017-02-24 09:20:28 +01:00
bergquist 46ac8c098f changelog: adds note about closing #7482 2017-02-24 07:42:30 +01:00
Carl Bergquist 5d3da99806 Merge pull request #7482 from dbrgn/master 
Alerting: Add Threema Gateway integration
 2017-02-24 07:40:36 +01:00
bergquist 785cecac26 changelog: adds note about closing #7526 2017-02-24 07:35:45 +01:00
Carl Bergquist bef216b6f4 Merge pull request #7526 from Mic92/master 
Add Pushover alert notifications
 2017-02-24 07:32:59 +01:00
bergquist 67b8b9743b changelog: note about closing #7602 2017-02-24 07:30:47 +01:00
Carl Bergquist 3ef1a60647 Merge pull request #7602 from Altoros/suppress-empty-results-in-table-plugin 
Added suppressing of empty results to table plugin
 2017-02-24 07:28:59 +01:00
bergquist d88286ab81 orgs: set orgId as query param on load 
ref #1613
 2017-02-23 11:03:39 +01:00
bergquist 73830a44fe sharemodal: fixes broken unittests 2017-02-22 14:29:49 +01:00
bergquist fe223cbc96 changelog: adds note about closing #1613 2017-02-22 14:04:01 +01:00
bergquist fdb06c7c10 sharing: set orgId as query parameter when sharing a dashboard 
to make sure an user opens the dashboard in the correct org, orgId will
always be added when sharing a dashboard. if the users current orgId
doesnt match the query parameter grafana will change it and redirect the
user.

closes #1613
 2017-02-22 13:56:06 +01:00
bergquist dea2e5d743 changelog: adds note about closing #6948 2017-02-22 11:24:06 +01:00
bergquist 607ee635d1 alerting: adds deduping of alert notifications 2017-02-22 10:52:01 +01:00
Carl Bergquist b4fd6f2d45 Merge pull request #7632 from grafana/alerting_notification_dedupe 
alerting: dedupe alert notifications when running multiple servers
 2017-02-22 10:48:41 +01:00
bergquist c1d69358ba changelog: adds note about closing #552 2017-02-22 10:39:52 +01:00
bergquist 9ed1d12cc0 style: use for loops over _.each in typescript 2017-02-22 10:36:30 +01:00
bergquist c5a76fba87 shortcuts: add expand/collapse to shortcut help 2017-02-22 10:33:24 +01:00
bergquist e828f3a97b shortcuts: change init bind key to d 2017-02-22 10:32:30 +01:00
bergquist 00dddca26a alerting: dedupe alert notifications when running multiple servers 
alert notifications will only be sent if the database value
is updated.

ref #6957
 2017-02-21 16:54:49 +01:00
bergquist 70b36a02af Revert "tech: use context package over xperimental version" 
This reverts commit 99f1c30071.
 2017-02-20 22:04:51 +01:00
bergquist 99f1c30071 tech: use context package over xperimental version 2017-02-20 21:44:15 +01:00
bergquist 072c1559ba middlware: prevent orgredirect to open body stream 
the org redirecter opened the body stream by misstake. Causing
downstream code to start reading from an empty stream and raise errors.
 2017-02-20 11:38:29 +01:00
bergquist 492b2bd42f build: fixes golang 1.8 build on windows 2017-02-19 11:32:26 +01:00
bergquist d2444cbed0 Merge branch 'paging-users' 2017-02-17 16:25:03 +01:00
bergquist 400bd8d2d3 build: reduce logs from npm install 2017-02-17 16:16:17 +01:00
Carl Bergquist 24474ba41a Merge pull request #7601 from grafana/redirect_on_new_orgid 
middlware: change org when url contains orgid
 2017-02-17 15:31:17 +01:00
bergquist 6115941df0 middleware: rename org-id -> orgId 2017-02-17 15:18:40 +01:00
bergquist 5174d050f2 middlware: change org when url contains orgid 
closes #6948
ref #1613
 2017-02-17 15:02:14 +01:00
bergquist 12f1ea71fd chore: delete empty test 2017-02-17 12:07:46 +01:00
bergquist 76f617b862 build: disable setup for windows build 2017-02-17 12:06:24 +01:00
bergquist 774c1de892 changelog: adds note about closing #7319 2017-02-17 10:42:52 +01:00
bergquist 5fb4540358 changelog: adds note about closing #7382 2017-02-17 10:41:15 +01:00
bergquist 79daa71350 docs: update golang requirement to 1.8 2017-02-17 10:37:59 +01:00
bergquist defa81e4c1 Merge branch 'http_graceful' 2017-02-17 10:34:02 +01:00
bergquist cf871b1284 http: close http server gracefully. 2017-02-17 10:33:47 +01:00
bergquist 52566376b2 tech(server): remove unused code 2017-02-17 10:18:11 +01:00
bergquist a32b7dfb9d build: upgrade to golang 1.8 2017-02-17 09:05:52 +01:00
bergquist c924510deb alertlist: adds pause as filter option 
closes #7400
 2017-02-16 16:01:57 +01:00
bergquist a747d33373 templating: allow whitespace values 
closes #7382
 2017-02-16 15:58:01 +01:00
bergquist d72011589e templating: refactor sorting test 2017-02-16 14:22:38 +01:00
bergquist 927b39fa63 templating: adds test for sorting template values 2017-02-16 14:14:17 +01:00
bergquist 3c0f61511d build: deps-go is not required for building grafana 
setup compiles the backend and caches it which is nice
when developing grafana since incremental compiles are
much faster. But its not required for building grafana.
 2017-02-16 09:10:55 +01:00
bergquist 9b4d95ff25 changelog: note about closing #7347 2017-02-15 14:35:40 +01:00
bergquist bd010289b2 alerting: images in alert notifications is now optional 
its now possible to turn of image uploading in alert notifications
for those who operate on very sensitive data.

closes #7419
 2017-02-15 14:17:36 +01:00
bergquist f14e25612e annotations: go vet fixes 2017-02-15 14:15:42 +01:00
bergquist c8c3021987 docs: tutorial for setting up grafana as HA 
ref #7541
 2017-02-15 12:38:50 +01:00
bergquist 423e8686ef docs: fixes markdown formating 2017-02-14 12:56:49 +01:00
bergquist e97cab9964 docs: removes version selector from influxdb 2017-02-14 12:02:31 +01:00
bergquist 73bec813fc docs: adds delete datasource by name 2017-02-14 10:41:08 +01:00
bergquist 9f80e8c03d changelog: rearrange closed issues 2017-02-14 10:06:31 +01:00
bergquist 6761661e10 changelog: adds note about closing #7542 2017-02-14 10:03:23 +01:00
bergquist 0523830716 changelog: add note about closing #7542 2017-02-14 08:56:00 +01:00
Carl Bergquist 05a6cb3f76 Merge pull request #7548 from ryantxu/influxdb_logo 
update datasource logos
 2017-02-14 08:23:03 +01:00
bergquist 2ad2b96133 build: avoid progress bar update on yarn install 
this will save us ~100TB of unneeded data in the long term.
 2017-02-13 15:26:10 +01:00
bergquist 2c68c071c0 changelog: update release of 2017-02-13 2017-02-13 15:11:45 +01:00
bergquist c7560edba5 docs: release 4.1.2 for windows 2017-02-13 14:17:26 +01:00
bergquist 89fdcc84de docs: release 4.1.2 2017-02-13 13:52:42 +01:00
bergquist e80f673264 changelog: adds note about closing issues 2017-02-10 15:56:28 +01:00
Carl Bergquist 7f4f38e773 Merge pull request #7519 from huydx/master 
(feat) support datasource delete by name api
 2017-02-10 15:53:34 +01:00
bergquist f147ac053d Merge branch 'huydx-feat/sqlmax' 2017-02-10 15:30:12 +01:00
bergquist 5b7b3fef64 conf: adds sample values for db conn settings 2017-02-10 15:30:01 +01:00
bergquist 3c7cf3f728 docs: kairosdb is no longer supported by default 2017-02-10 14:42:19 +01:00
bergquist 900230890f changelog: adds note about closing #2385 2017-02-10 10:15:03 +01:00
bergquist dcf097a8b9 changelog: adds note about closing #6109 2017-02-10 08:57:46 +01:00
bergquist 7bf570532f docs: adds note about closing #7493 2017-02-10 08:34:56 +01:00
bergquist 38c29d2209 changelog: adds note about closing #7513 2017-02-10 08:29:44 +01:00
Carl Bergquist 73d441450b Merge pull request #7516 from grafana/oauth-login-redirect 
redirect user to requested url after login via oauth
 2017-02-10 08:27:41 +01:00
bergquist 5dd961c0f5 settings: remove commented code 2017-02-10 07:39:26 +01:00
bergquist c7febca447 mqe: fixes broken test for indexalias 2017-02-09 16:43:57 +01:00
bergquist aa7292fac6 mqe: adds support for wildcard and index aliases 2017-02-09 16:25:03 +01:00
bergquist 10508d0238 docs(changelog): adds note about closing #6451 2017-02-08 11:28:26 +01:00
bergquist e8f191ef32 Merge branch 'jregovic-master' 2017-02-08 11:25:41 +01:00
bergquist 00549f393c style(hipchat): improves code style 2017-02-08 11:24:49 +01:00
bergquist 5bba0c2a94 tech(build): upgrade dist builder to golang1.8rc3 2017-02-07 12:45:06 +01:00
bergquist b3db5aae4b docs(changelog): adds note about closing #6799 2017-02-07 11:21:20 +01:00
Carl Bergquist 7d205ae2b8 Merge pull request #7466 from hagen1778/prometheus-basicauth-query 
allow setting basic auth headers for prometheus datasource
 2017-02-07 11:18:17 +01:00
bergquist 8ca4afaf22 docs(changelog): adds note about closing #7459 2017-02-07 11:17:20 +01:00
bergquist 9ece10ef24 style(dataproxy): simplify expression 2017-02-07 11:03:57 +01:00
bergquist b386920abb Merge branch 'prometheus_secure' of https://github.com/mtanda/grafana into mtanda-prometheus_secure 2017-02-07 11:01:02 +01:00
bergquist 285918caf6 tech(build): switch to golang 1.8rc3 2017-02-07 10:13:21 +01:00
bergquist 5a7abe365c tech(build): echo before running go fmt/vet 2017-02-06 15:55:22 +01:00