Commit Graph

4239 Commits

Author SHA1 Message Date
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
Tomas Dabasinskas
eb517a3791 Update field name 2018-12-19 15:36:45 +02:00
Tomas Dabasinskas
3aa24b3afa Rename the setting and add description 2018-12-19 14:59:33 +02: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
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
Torkel Ödegaard
60ea99078e Panel help view fixes 2018-12-19 11:03:54 +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
Jacob Richard
34d3086ec8 Adding tests for auth proxy CIDR support 2018-12-18 21:16:29 -06: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
Victor Cinaglia
48fe92a945 snapshots: Close response body after error check 2018-12-18 08:32:49 -05:00
Tomas Dabasinskas
54b73025dc Add OAuth provider flag to indicate if it's broken 2018-12-18 13:50:37 +02:00
Tomas Dabasinskas
052772ea2e Register BrokenAuthHeaderProviders if needed 2018-12-18 13:48:25 +02:00
Torkel Ödegaard
a4091813bf
Merge pull request #14534 from grafana/14409/threshold-ux-changes
14409/threshold ux changes
2018-12-18 11:30:48 +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
Jacob Richard
0b50582b56 Adding CIDR capability to auth_proxy whitelist 2018-12-17 23:43:14 -06:00
Torkel Ödegaard
1ee1247912 Gauge option form markup fixes 2018-12-17 17:54:40 +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
Daniel Lee
167e8815d3 ldap: upgrades go-ldap to v3 2018-12-16 01:05:14 +01:00
Torkel Ödegaard
b15bb4fb95 Merge remote-tracking branch 'origin/master' into develop 2018-12-14 17:02:08 +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
Marcus Efraimsson
c46d01dc83
Merge pull request #14090 from marefr/8843_pipeline_doc_count
Fix pipeline aggregations on doc count
2018-12-12 13:21:13 +01:00
Torkel Ödegaard
f9110f7902 Merge branch 'master' into develop 2018-12-11 10:00:29 +01:00
Victor Cinaglia
411d67cae7
snapshots: Add support for deleting external snapshots 2018-12-10 18:47:23 -05: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
Scott Glajch
62a5cd27ba Add the AWS/SES Cloudwatch metrics of BounceRate and ComplaintRate. Pull request #14399 2018-12-07 16:42:29 -05:00
Torkel Ödegaard
efede26eea
Merge pull request #14382 from grafana/davkal/remove-explore-tab
Remove Explore > "New tab" from sidebar
2018-12-07 20:24:13 +01:00
Torkel Ödegaard
eb6d0e9f51 Merge branch 'master' into develop 2018-12-07 14:59:38 +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
David Kaltschmidt
80d62013b2 Remove Explore > "New tab" from sidebar
- we don't support tabs yet, might as well remove the entry
2018-12-07 11:27:46 +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
3c330c8e4c/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
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
Torkel Ödegaard
180ca021b5 Merge branch 'master' into develop 2018-12-05 10:17:22 +01:00
Torkel Ödegaard
769407cd34
Merge pull request #14314 from nitti/add_influxdb_cumulative_sum
added support for influxdb cumulative_sum function in tsdb
2018-12-05 09:29:04 +01:00
Brian Gann
02365514f9 redact value for plugin proxy routes 2018-12-04 22:35:00 -06:00