IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2026-09-05 04:40:13 -05:00
Code Issues Packages Projects Releases Wiki Activity
19,404 Commits 892 Branches 731 Tags
516037fbdd35235f6d839a4cb34a74e0581d8f2b
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
bergquist 516037fbdd makes sure rotation is always higher than urgent rotation 2019-01-24 13:54:45 +01:00
bergquist 9ae306e417 use defer to make sure we always release session data 2019-01-24 13:48:36 +01:00
bergquist fd0f9f2dd2 fixes broken test 2019-01-24 12:06:44 +01:00
bergquist f257101c41 removes unused/commented code 2019-01-24 11:26:45 +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 4626f083bb store oauth login error messages in an encrypted cookie 2019-01-23 17:01:09 +01:00
bergquist df85cc9bb1 redirect logged in users from /login to home 2019-01-23 15:28:33 +01:00
bergquist 5998646da5 restrict session usage to auth_proxy 2019-01-23 14:56:48 +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
bergquist 777bd9ea18 adds cleanup job for old session tokens 2019-01-21 19:03:32 +01:00
bergquist 92620af75f avoid calling now() multiple times 2019-01-21 15:48:17 +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
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
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
bergquist 3cd0cb3d3f removes debug2 logging 2019-01-15 11:52:39 +01:00
bergquist 1b6203e430 removes error2 logger 2019-01-15 11:49:18 +01:00
bergquist 1c0a385df1 changelog: adds ntoe about closing #12864 2019-01-15 10:37:56 +01: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
bergquist db448b5d53 Merge branch 'fredbcode-master' 
* fredbcode-master:
  Fix bug tls renegociation problem in Notification channel (webhook) #14800
 2019-01-13 21:43:47 +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
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
bergquist 74124ec8ed makes cache mode configurable 
this makes the cache mode in the sqlite connection
string configurable. the default also changed from
shared to private to solve #107272 but allow the user
to use shared if performance is more important.

ref #10727
 2018-12-27 10:48:11 +01:00
bergquist 7637ea55e4 changelog: adds note about closing #14562 2018-12-19 16:11:35 +01:00
bergquist 69489993c3 export init notifier func 
makes it possible to validate that an notifier can be
initialzed from the provisioning package
 2018-12-19 13:38:49 +01:00
bergquist a6d90151da changelog: adds note about closing #14546 2018-12-19 08:58:14 +01:00
bergquist ea84ec6229 changelog: adds note about closing #14109 2018-12-18 22:49:38 +01:00
bergquist 3c6bcde8b2 changelog: adds note about closing #14548 2018-12-18 08:22:02 +01:00
bergquist 7aa84aeb61 moves migrations to /sqlstore/migrations 2018-12-17 16:36:57 +01:00
bergquist dbcc2e868d adds integration tests to ci build 2018-12-17 16:36:57 +01:00
bergquist 11cde7ed71 renames main lock function 2018-12-17 16:36:57 +01:00
bergquist c565b018c5 clean up integration tests 2018-12-17 16:36:57 +01:00
bergquist 823bba8d98 change from db_text to nvarchar 2018-12-17 16:36:57 +01:00
bergquist dc49bebb00 adds server lock package 2018-12-17 16:36:57 +01:00
bergquist ff136b6ba8 initial verison of server lock 2018-12-17 16:36:57 +01:00
bergquist 17f8be90ae upgrade to golang 1.11.4 2018-12-17 14:25:47 +01:00
bergquist ed2a9b8e73 changelog: adds note about closing #13754 2018-12-12 08:08:30 +01:00
bergquist 2b5b16f5d3 changelog: adds note about closing #11221 2018-12-07 14:50:41 +01:00
bergquist 9eea585773 removes unused code 2018-12-07 14:39:44 +01:00
bergquist 5d720674e3 Merge branch 'master' into add_google_hangouts_chat_notifier 
* master: (322 commits)
  graphInterval needs to update after query execution, fixes #14364
  Explore: Parse initial dates
  Aligned styling of stats popover/box with rest of grafana & minor css refactoring
  Prometheus: Make result transformer more robust for empty responses
  Rebase fixes
  Explore: Logging line parsing and field stats
  fixed unit tests
  made unknown color theme aware and sync with graph color, some minor cleanup
  Explore: improve error handling
  use render props instead of cloneElement
  sort of a hacky way to figure if the small variation should be used for the label
  add basic button group component, using the the same label style as is
  explore logs styling
  wip: alternative level styling & hover effect
  wip: explore logs styling
  more detailed error message for loki
  If user login equals user email, only show the email once #14341
  UserPicker and TeamPicker should use min-width instead of fixed widths to avoid overflowing form buttons.  #14341
  wip: explore logs styling
  restoring monospace & making sure width are correct when hiding columns
  ...
 2018-12-07 14:31:13 +01:00
bergquist a90bba859a fixes merge error 2018-12-07 14:17:09 +01:00
bergquist e230827c06 more detailed error message for loki 
if grafana tries to access loki without promtail running
it will return an error.
 2018-12-06 13:59:19 +01:00
bergquist dc2ebeb7c0 margin when listing multiple gf-form should be right 
when listing multiple gf-form elements this style is
applied to all elements except the first. By having the
margin on the right side there will always be some margin
between all gf-forms
 2018-11-22 11:00:27 +01:00
bergquist 14688766ef updates time range options for alert queries 
add some new options for the to value.
removes '1s' option for from since thats unreasonable low

closes #12134
 2018-11-21 15:43:37 +01:00
bergquist 60c291c8dc format: remove </input> and align tabs 2018-11-21 15:42:25 +01:00
bergquist 4bd8b2c130 gfdev: fixes unparseable for duration 2018-11-21 11:41:54 +01:00
bergquist afbc16c499 gfdev: adds alert always in pending state 2018-11-21 11:34:21 +01:00
bergquist 1491ea1c75 docs: adds example timeline for alerting for 2018-11-21 11:11:46 +01:00
bergquist baba8a92ee update path to alerting for image 2018-11-20 17:09:21 +01:00
bergquist 8bd0aeb56e changelog: adds note about closing #13577 2018-11-20 11:21:17 +01:00
bergquist c999394b49 adds basic auth configuration to default.ini 2018-11-20 11:07:39 +01:00
bergquist 862815d18d go meta lint errors 2018-11-19 14:00:20 +01:00
bergquist 8130067fd1 changelog: adds note about closing #7886 & #6202 2018-11-19 10:47:37 +01:00
bergquist 23b1fbcf48 changelog: adds note about closing #11893 2018-11-19 10:22:26 +01:00
bergquist bb66661cc6 changelog: adds note about closing #14043 2018-11-19 09:15:07 +01:00
bergquist 76cbd7f0de alerting: reduce the length of range queries 
since we introduce deboucing the length should matter less.
But going below 5m as default might be weird depending on datasource.
 2018-11-19 09:10:19 +01:00
bergquist caec36e7ec alert rule have to be pending before alerting is for is specified 2018-11-15 15:37:46 +01:00
bergquist 7ba04466a2 alerting: improve annotations for pending state 2018-11-15 14:30:36 +01:00
bergquist e7260d77b3 adds pending filter for alert list page 2018-11-15 12:46:28 +01:00
bergquist 968bfd0139 adds pending state to alert list panel 2018-11-15 12:42:47 +01:00
bergquist a70ea2101c alertmanager: adds tests for should notify 2018-11-15 12:36:11 +01:00
bergquist 28029ce4a7 alerting: support for on execution errors and notdata 2018-11-15 11:04:16 +01:00
bergquist 84eb3bd095 tests for supporting for with all alerting scenarios 2018-11-14 23:43:09 +01:00
bergquist 8fb997d935 should not notify when going from unknown to pending 2018-11-14 23:43:09 +01:00
bergquist aa340b9099 changelog: adds note about closing #14043 2018-11-14 11:30:19 +01:00
bergquist a0496d554a updates latest to 5.3.4 2018-11-13 14:04:28 +01:00
bergquist 3a672c6dc2 changelod: add release date for 5.3.3 and 5.3.4 2018-11-13 13:58:35 +01:00
bergquist 5954ab2c0d adds redis devenv block 2018-11-13 10:27:57 +01:00
bergquist d5555f123f updates macaron session package 2018-11-13 09:41:36 +01:00
bergquist 2fb78a50d6 minor fixes based on code review 2018-11-12 10:50:56 +01:00
bergquist 16bf269c31 changelog: adds note about closing #13993 
[skip ci]
 2018-11-08 15:04:16 +01:00
bergquist aa1b80fe45 docs: improve helper test for For 2018-11-08 14:16:58 +01:00
bergquist 975f0aa064 alerting: adds docs about the for setting 2018-11-08 13:52:06 +01:00
bergquist 0ddfd92f8c adds debounce duration for alert dashboards in ha_test 2018-11-07 22:30:23 +01:00
bergquist 7bde98aff9 rename and mark functions as private 2018-11-06 09:00:17 +01:00
bergquist 17adb58d80 export: provide more help regarding export format 
this will provide the user with more info about
the export format and default to not use the format
for sharing on grafana.com etc.

ref #13781
 2018-11-05 17:33:42 +01:00
bergquist 30e924611d changelog: adds note about closing #13322 2018-11-05 15:42:26 +01:00
bergquist 423331dae0 alerting: delete alerts when parent folder is deleted 
closes #13322
 2018-11-05 14:25:26 +01:00
bergquist 3789583014 for: use 0m as default for existing alerts and 5m for new 2018-11-05 13:51:35 +01:00
bergquist ae2d536740 adds tests for extracting for property 2018-11-05 13:29:33 +01:00
bergquist ccd89eee97 renames debouceduration to for 2018-11-05 11:05:30 +01:00
bergquist d25284a364 introduce state unknown for rules that have not been evaluated yet 2018-11-05 10:50:28 +01:00
bergquist 6f748d8a96 fixes go meta lint issue 2018-11-05 10:50:28 +01:00
bergquist 4526660cb2 wire up debounce setting in the ui 2018-11-05 10:50:28 +01:00
bergquist 2d3a575489 adds db migration for debounce_duration 2018-11-05 10:50:28 +01:00
bergquist ccfd9c89b2 introduces hard coded deboucing for alerting 2018-11-05 10:50:28 +01:00
bergquist 7c3dcb3702 alerting: adds tests for the median reducer 
adds a test that verify that null values are not used
when calculating the median value in alerting

closes #10056
 2018-11-05 09:03:35 +01:00
bergquist 65ace003c9 changelog: adds note about closing #13945 2018-11-03 14:03:41 +01:00
bergquist bc37e3caa2 alerting: increase default duration for queries 
we should promote using longer queries since this should
increase the quality of the alerts. only using a 5min range
means that we will only have 4 datapoints in data is written
every min which is not good enough for the generic alert rule
 2018-11-02 10:43:05 +01:00
bergquist b58b4ef128 changelog: adds note about closing #13876 2018-10-30 11:20:49 +01:00
bergquist c9ac762fb1 build: adds branch info to binary build 2018-10-29 13:27:29 +01:00