public/grafana
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
19,517 Commits 655 Branches 650 Tags
f157c19e16cdc970542867ec77eb5a61fe5f11ad
Commit Graph
1743 Commits
Author SHA1 Message Date
bergquist 0cbc89b063 Merge branch 'master' into 14701-fix-alert-context 
* master: (262 commits)
  pkg/services/dashboards/dashboard_service.go: simplify return
  Updated url query param encoding to exctly match angular encoding
  Updated snapshot
  Added missing props not being passed to scrollbar component, fixes #15058
  Document /api/health
  changelog: adds note for #15062
  change default rotate_token_minutes to 10 minutes
  fix
  load test/ha fixes
  set low login cookie rotate time in ha mode
  fix multiple piechart instances bug
  scripts/build/*: Fix some golint issues
  scripts/build/*: Fix golint issues Url => URL
  build: fixes building grafana completely within docker.
  dont specify domain for auth cookies
  New snapshot reflecting changes
  Makes the clickable side menu header look great in light theme again
  org id fix for load test
  user auth token load tests using k6.io
  moves cookie https setting to [security]
  ...
 2019-01-28 08:09:52 +01:00
bergquist 364154d81f moves timeout tests to an integration test 2019-01-28 07:56:31 +01:00
Mario Trangoni bf90ff87cf pkg/services/dashboards/dashboard_service.go: simplify return 
See,
$ gometalinter --vendor --deadline 10m --disable-all --enable=megacheck  ./...
pkg/services/dashboards/dashboard_service.go:167:2⚠️ 'if err != nil { return err }; return nil' can be simplified to 'return err' (S1013) (megacheck)
 2019-01-26 14:23:10 +01:00
bergquist 75760aa892 dont specify domain for auth cookies 2019-01-25 10:40:50 +01:00
bergquist d6edaa1328 moves cookie https setting to [security] 2019-01-24 19:04:58 +01:00
bergquist 516037fbdd makes sure rotation is always higher than urgent rotation 2019-01-24 13:54:45 +01:00
bergquist fd0f9f2dd2 fixes broken test 2019-01-24 12:06:44 +01:00
bergquist ff483f3782 removes old cookie auth configuration 2019-01-24 10:55:10 +01:00
bergquist 56a521b264 makes auth token rotation time configurable 2019-01-24 10:50:18 +01:00
bergquist 5998646da5 restrict session usage to auth_proxy 2019-01-23 14:56:48 +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
bergquist c3ff3d644c fixes nil ref in tests 2019-01-22 16:16:32 +01:00
bergquist 31b5db06f1 Merge branch 'master' into poc_token_auth 
* master: (156 commits)
  Fixed issues with the sanitizie input in text panels, added docs, renamed config option
  build: removes arm32v6 docker image.
  Updated version in package.json to 6.0.0-pre1
  Update CHANGELOG.md
  build: armv6 docker image.
  build: skips building rpm for armv6.
  build: builds for armv6.
  Explore: mini styling fix for angular query editors
  Removed unused props & state in PromQueryField
  chore: Remove logging and use the updated config param
  chore: Reverse sanitize variable so it defaults to false
  feat: wip: Sanitize user input on text panel
  fix: Text panel should re-render when panel mode is changed #14922
  Minor rename of LogsProps and LogsState
  Splitted up LogLabels into LogLabelStats and LogLabel
  Refactored out LogRow to a separate file
  Removed strange edit
  Added link to side menu header and fixed styling
  Moved ValueMapping logic and tests to separate files
  Fixed data source selection in explore
  ...
 2019-01-22 15:39:54 +01:00
bergquist 64124b5042 add setting for how to long we should keep expired tokens 2019-01-22 15:31:43 +01:00
bergquist 12f8338977 stores hashed state code in cookie 2019-01-22 15:22:24 +01:00
bergquist d3ec8e1ccb creates new config section for login settings 2019-01-22 15:22:11 +01:00
Marcus Efraimsson 4096449aec extract auth token interface and remove auth token from context 2019-01-22 12:00:33 +01:00
Marcus Efraimsson 366e356e08 more auth token tests 2019-01-21 21:48:18 +01:00
bergquist 777bd9ea18 adds cleanup job for old session tokens 2019-01-21 19:03:32 +01:00
Marcus Efraimsson f040f9a400 fix tests after renaming now 2019-01-21 16:53:00 +01:00
Marcus Efraimsson 38efc1d7d2 s/print/log 2019-01-21 15:53:40 +01:00
bergquist 92620af75f avoid calling now() multiple times 2019-01-21 15:48:17 +01:00
Marcus Efraimsson dd8476d81a passing auth token tests 2019-01-21 15:06:33 +01:00
Marcus Efraimsson 565408194a handle expired tokens 2019-01-21 13:22:20 +01:00
bergquist 697ddccd8e set userToken on request when logging in 2019-01-21 11:42:10 +01:00
bergquist 55b3013eb3 moves initWithToken to auth package 2019-01-21 11:37:44 +01:00
Marcus Efraimsson 734a7d38b2 set cookie name from configuration 2019-01-21 11:21:43 +01:00
Marcus Efraimsson 766cfab374 change rotate time 2019-01-21 10:22:18 +01:00
Marcus Efraimsson 0d1e3759eb mixor fixes 2019-01-21 10:20:23 +01:00
bergquist 2e97d39abe removes commented code 2019-01-21 10:01:48 +01:00
bergquist 47a7d93fd9 moves rotation into auth since both happens before c.Next() 2019-01-21 08:59:01 +01:00
sharkpc0813 35013a28cd add timeout test for alert handling. 2019-01-18 11:23:00 +09:00
bergquist fd937e3d95 remove maxage from session token 2019-01-17 21:03:27 +01:00
bergquist c2accfa4c0 inital code for rotate 2019-01-17 17:11:52 +01:00
bergquist aba6148c43 login users based on token cookie 2019-01-16 16:44:40 +01:00
Marcus Efraimsson b0df7280be begin user auth token implementation 2019-01-15 15:16:20 +01:00
bergquist 1b6203e430 removes error2 logger 2019-01-15 11:49:18 +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
sharkpc0813 e172bade40 fix that alert context and result handle context do not use the same derived context. 2019-01-15 17:51:50 +09:00
bergquist 8880829eda avoid infinite loop in the dashboard provisioner 
if one dashboard with an uid is refered to by two
provsioners each provsioner overwrite each other.
filling up dashboard_versions quite fast if using
default settings.

ref #12864
 2019-01-14 16:38:39 +01:00
fredbcode 110ffb69de Fix bug tls renegociation problem in Notification channel (webhook) #14800 2019-01-13 21:42:33 +01:00
bergquist fbb3ad5fc4 make sure frequency cannot be zero 
frequency set to zero causes division by zero
panics in the alert schedular.

closes #14810
 2019-01-10 14:17:10 +01:00
Torkel Ödegaard 0a936a55b4 Fixed new gometalinter issues 2019-01-07 11:01:31 +01:00
Torkel Ödegaard 3e873a2500 Merge pull request #14710 from grafana/fixed-gometalinter 
Fixed new gotmetalinter warning
 2019-01-03 07:23:45 +01:00
Torkel Ödegaard 80e441f48b Fixed new gotmetalinter warning 2019-01-02 19:17:35 +01:00
Dan Cech efa738ddf6 Merge pull request #14540 from grafana/session-skip-update 
only update session in mysql database when required
 2018-12-31 11:54:04 -05:00
Torkel Ödegaard 22399b336f Merge pull request #14577 from marefr/14351_db_migration 
fix only create/drop database indices if not exists/exists
 2018-12-31 16:20:07 +01:00
Torkel Ödegaard 983b85139c Merge pull request #14665 from bergquist/sqlite_cache_mode_setting 
WIP: makes cache mode configurable
 2018-12-31 08:35:27 +01:00
bergquist 9895b1e6d0 adds orgId to user dto for provisioned dashboards 2018-12-28 10:49:00 +01:00
bergquist 24636da800 closes the body properly on successful webhooks 
this commit also adds a test docker container
for receiving alerting web hook requests
 2018-12-27 16:08:13 +01:00