Commit Graph

1688 Commits

Author SHA1 Message Date
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
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
Torkel Ödegaard cbeefcd376 Merge pull request #14574 from grafana/14543_org_redirect
fix signed in user for orgId=0 result should return active org id
2018-12-19 11:31:06 +01:00
Torkel Ödegaard 36154e59b0 Merge pull request #14571 from oiooj/pr-ds-limit
Raise datasources number to 5000
2018-12-19 11:26:16 +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
Marcus Efraimsson e82b3632f6 fix signed in user for orgId=0 result should return active org id 2018-12-18 20:02:27 +01:00
Baokun Lee f51222027d Raise datasources number to 5000 2018-12-18 23:59:14 +08:00
bergquist 7aa84aeb61 moves migrations to /sqlstore/migrations 2018-12-17 16:36:57 +01:00
bergquist 11cde7ed71 renames main lock function 2018-12-17 16:36:57 +01:00
bergquist 823bba8d98 change from db_text to nvarchar 2018-12-17 16:36:57 +01:00
Joesis 92a8c5b81b log error when resolvePath 2018-12-13 02:10:29 -08:00
Daniel Lee 90e2175716 migration: renames logging ds to loki ds in data_source table 2018-12-12 20:54:05 +01:00
Victor Cinaglia 9d6da10e82 snapshots: Move external snapshot creation to backend 2018-12-10 16:36:32 -05:00
Victor Cinaglia d9d6a4481f snapshots: Add external_delete_url column 2018-12-10 16:25:02 -05: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
moznion 4397ee61d0 Put issue number to test code 2018-12-05 22:47:41 +09:00
moznion d1e1cde00e Fix bug what updating user quota doesn't work
Reason is same as 061e06c226
2018-12-05 22:29:07 +09:00
moznion 061e06c226 Fix bug what updating org quota doesn't work
https://github.com/grafana/grafana/blob/3c330c8e4c0b0f9fb258801ba8a7fe2586bbc819/pkg/services/sqlstore/quota.go#L106

In the real use case, `has` that is described by the above code is always `false` because it includes `Updated` in a query.

So this commit fixes this issue.
2018-12-05 22:19:40 +09:00
Mario Trangoni fadd816d89 pkg/*: Fix misspell issues
See,
$ find . -type f | xargs misspell -locale US | grep -vi -e vendor -e devenv -e Unknwon -e Destory | grep pkg
./pkg/services/sqlstore/org_test.go:190:15: "frome" is a misspelling of "from"
./pkg/tsdb/elasticsearch/response_parser.go:544:24: "Unkown" is a misspelling of "Unknown"
./pkg/tsdb/opentsdb/opentsdb.go:87:20: "marshalling" is a misspelling of "marshaling"
./pkg/components/dynmap/dynmap_test.go:2:7: "Licence" is a misspelling of "License"
./pkg/components/dynmap/dynmap.go:2:7: "Licence" is a misspelling of "License"
2018-12-04 23:29:34 +01:00
danielbh d1b8f13c66 feat: #11067 prevent removing last grafana admin permissions 2018-12-03 20:05:52 -05:00
Marcus Efraimsson 36aec52c08 return actual error if failing to update alert data 2018-11-22 11:19:08 +01:00
bergquist 862815d18d go meta lint errors 2018-11-19 14:00:20 +01:00
Carl Bergquist 6049855dc7 Merge pull request #13947 from bergquist/alerting_for
Introduce alert debouncing
2018-11-19 10:38:02 +01:00
Patrick 2de5a7119b Merge branch 'master' into add_google_hangouts_chat_notifier 2018-11-18 22:00:53 +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 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
Marcus Efraimsson 5f9fecd254 feat: team preferences 2018-11-12 20:01:53 +01:00
bergquist 2fb78a50d6 minor fixes based on code review 2018-11-12 10:50:56 +01:00
Andrey Kaipov 63fdffe8c0 Fixes #13993 - adds more options for Slack notifications 2018-11-07 22:08:26 -05:00
Marcus Efraimsson 26cbc6be81 Merge pull request #13966 from marefr/alert_extractor_refactor
Refactor dashboard alert extractor
2018-11-05 17:06:27 +01:00
bergquist 423331dae0 alerting: delete alerts when parent folder is deleted
closes #13322
2018-11-05 14:25:26 +01:00
Marcus Efraimsson 9e0da02b6a refactor dashboard alert extractor 2018-11-05 14:25:19 +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
Marcus Efraimsson 5882e5bb46 Merge pull request #13900 from marefr/ds_cache_refactor
Datasource proxy cache refactor
2018-11-05 11:02:31 +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
Marcus Efraimsson 818d48c2c0 always execute the user teams query 2018-11-05 10:49:56 +01:00
Marcus Efraimsson 5be2332c66 handle error before populating cache 2018-11-05 09:58:13 +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
Marcus Efraimsson 6ef941ea17 fix failing tests 2018-11-02 16:03:12 +01:00
Sergio Conde Gomez 65a15b157f Increase Telegram captions length limit. 2018-10-31 18:07:09 +01:00