Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

LDAP: multildap + ldap integration #18588

Merged
merged 1 commit into from
Aug 18, 2019
Merged

LDAP: multildap + ldap integration #18588

merged 1 commit into from
Aug 18, 2019

Conversation

markelog
Copy link
Contributor

@markelog markelog commented Aug 16, 2019 •
edited
Loading

It seems ldap module introduced new error type of which
multildap module didn't know about.

This broke the multildap login logic

Fixes #18491
Ref #18587

@markelog
LDAP: multildap + ldap integration
4da5210 
It seems `ldap` module introduced new error type of which
multildap module didn't know about.

This broke the multildap login logic

Fixes #18491
Ref #18587
@markelog markelog requested review from xlson and gotjosh August 16, 2019 02:15
@marefr marefr added this to the 6.3.4 milestone Aug 16, 2019
@markelog markelog merged commit 02af966 into master Aug 18, 2019
@markelog markelog deleted the multiple-openldap branch August 18, 2019 21:52
ryantxu added a commit to ryantxu/grafana that referenced this pull request Aug 18, 2019
@ryantxu
Merge remote-tracking branch 'grafana/master' into single-stat-data-f…
704dd11 
…rame

* grafana/master:
  SingleStat: add a gauge migration call to action button in the editor (grafana#18604)
  Build: update revive dependency (grafana#18585)
  LDAP: multildap + ldap integration (grafana#18588)
  Docker: switch docker image to alpine base with phantomjs support (grafana#18468)
  Backend: Adds support for HTTP/2 (grafana#18358)
  Explore: Fixes error when switching from prometheus to loki data sources (grafana#18599)
  TimePicker: Set time to to 23:59:59 when setting To time using calendar (grafana#18595)
  Prometheus: Return labels in query results (grafana#18535)
  Docs: Update changelog and docs for annotation region change (grafana#18593)
  Refactor: move KeyValue and deprecation warning to @grafana/data (grafana#18582)
  Annotations: use a single row to represent a region (grafana#17673)
  Docs: Update upgrading guide (grafana#18547)
  Docs: Adds tests requirement to bugs checklist (grafana#18576)
ryantxu added a commit to ryantxu/grafana that referenced this pull request Aug 18, 2019
@ryantxu
Merge remote-tracking branch 'grafana/master' into reuse-query2
72a931b 
* grafana/master:
  SingleStat: add a gauge migration call to action button in the editor (grafana#18604)
  Build: update revive dependency (grafana#18585)
  LDAP: multildap + ldap integration (grafana#18588)
  Docker: switch docker image to alpine base with phantomjs support (grafana#18468)
  Backend: Adds support for HTTP/2 (grafana#18358)
ryantxu added a commit to ryantxu/grafana that referenced this pull request Aug 18, 2019
@ryantxu
Merge remote-tracking branch 'grafana/master' into stream-mixed-query
af5d306 
* grafana/master:
  SingleStat: add a gauge migration call to action button in the editor (grafana#18604)
  Build: update revive dependency (grafana#18585)
  LDAP: multildap + ldap integration (grafana#18588)
ryantxu added a commit to ryantxu/grafana that referenced this pull request Aug 19, 2019
@ryantxu
Merge remote-tracking branch 'grafana/master' into jwt
787cafa 
* grafana/master: (202 commits)
  Azure Monitor and Log Analytics converted and separated into components (grafana#18259)
  Rewrite user profile edit to react (grafana#17917)
  Docs: remove codecov badge (grafana#18623)
  Prometheus: Prevents panel editor crash when switching to Prometheus datasource (grafana#18616)
  Chore: Rename Popper to Popover (grafana#18543)
  SingleStat: add a gauge migration call to action button in the editor (grafana#18604)
  Build: update revive dependency (grafana#18585)
  LDAP: multildap + ldap integration (grafana#18588)
  Docker: switch docker image to alpine base with phantomjs support (grafana#18468)
  Backend: Adds support for HTTP/2 (grafana#18358)
  Explore: Fixes error when switching from prometheus to loki data sources (grafana#18599)
  TimePicker: Set time to to 23:59:59 when setting To time using calendar (grafana#18595)
  Prometheus: Return labels in query results (grafana#18535)
  Docs: Update changelog and docs for annotation region change (grafana#18593)
  Refactor: move KeyValue and deprecation warning to @grafana/data (grafana#18582)
  Annotations: use a single row to represent a region (grafana#17673)
  Docs: Update upgrading guide (grafana#18547)
  Docs: Adds tests requirement to bugs checklist (grafana#18576)
  DataFrame: convert from row based to a columnar value format (grafana#18391)
  Packages: Temporarily skip canary releases if packages build fail (grafana#18577)
  ...
ryantxu added a commit to ryantxu/grafana that referenced this pull request Aug 21, 2019
@ryantxu
Merge remote-tracking branch 'grafana/master' into transforms
f6be164 
* grafana/master:
  SingleStat: use DataFrame results rather than TimeSeries/TableData (grafana#18580)
  TestData: attach labels to series results (grafana#18653)
  Singlestat: Disable new singlestat gauge usage (grafana#18610)
  Explore: Fixes query field layout in splitted view for Safari browsers (grafana#18654)
  MSI: new long file names are causing error building MSI (grafana#18646)
  Auth: change the error HTTP status codes (grafana#18584)
  Refactor: EmptyListCTA (grafana#18516)
  Build: Upgrade to go 1.12.9 (grafana#18638)
  Chore: Revert React 16.9.0 bump (grafana#18634)
  Azure Monitor and Log Analytics converted and separated into components (grafana#18259)
  Rewrite user profile edit to react (grafana#17917)
  Docs: remove codecov badge (grafana#18623)
  Prometheus: Prevents panel editor crash when switching to Prometheus datasource (grafana#18616)
  Chore: Rename Popper to Popover (grafana#18543)
  SingleStat: add a gauge migration call to action button in the editor (grafana#18604)
  Build: update revive dependency (grafana#18585)
  LDAP: multildap + ldap integration (grafana#18588)
ryantxu added a commit to ryantxu/grafana that referenced this pull request Aug 23, 2019
@ryantxu
Merge remote-tracking branch 'grafana/master' into datalink-on-field
b1a6e48 
* grafana/master:
  SingleStat2: save options to defaults not override (grafana#18666)
  Packages: Fix path import from grafana/data (grafana#18667)
  SingleStat: use DataFrame results rather than TimeSeries/TableData (grafana#18580)
  TestData: attach labels to series results (grafana#18653)
  Singlestat: Disable new singlestat gauge usage (grafana#18610)
  Explore: Fixes query field layout in splitted view for Safari browsers (grafana#18654)
  MSI: new long file names are causing error building MSI (grafana#18646)
  Auth: change the error HTTP status codes (grafana#18584)
  Refactor: EmptyListCTA (grafana#18516)
  Build: Upgrade to go 1.12.9 (grafana#18638)
  Chore: Revert React 16.9.0 bump (grafana#18634)
  Azure Monitor and Log Analytics converted and separated into components (grafana#18259)
  Rewrite user profile edit to react (grafana#17917)
  Docs: remove codecov badge (grafana#18623)
  Prometheus: Prevents panel editor crash when switching to Prometheus datasource (grafana#18616)
  Chore: Rename Popper to Popover (grafana#18543)
  SingleStat: add a gauge migration call to action button in the editor (grafana#18604)
  Build: update revive dependency (grafana#18585)
  LDAP: multildap + ldap integration (grafana#18588)
torkelo pushed a commit that referenced this pull request Aug 30, 2019
@markelog @torkelo
LDAP: multildap + ldap integration (#18588)
9b157fa 
It seems `ldap` module introduced new error type of which
multildap module didn't know about.

This broke the multildap login logic

Fixes #18491
Ref #18587

(cherry picked from commit 02af966)
@torkelo torkelo mentioned this pull request Aug 30, 2019
Merged
torkelo pushed a commit that referenced this pull request Sep 2, 2019
@markelog @torkelo
LDAP: multildap + ldap integration (#18588)
59fa8cc 
It seems `ldap` module introduced new error type of which
multildap module didn't know about.

This broke the multildap login logic

Fixes #18491
Ref #18587

(cherry picked from commit 02af966)
@pdzwart-atlassian pdzwart-atlassian mentioned this pull request Sep 13, 2019
Closed
@ying-jeanne ying-jeanne added the pr/external This PR is from external contributor label Apr 29, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@torkelo torkelo torkelo approved these changes

@xlson xlson xlson approved these changes

@gotjosh gotjosh Awaiting requested review from gotjosh

Assignees
No one assigned
Labels
add to changelog pr/external This PR is from external contributor type/bug
Projects
None yet
Milestone
6.3.5
Development

Successfully merging this pull request may close these issues.

multiple LDAP is not working
5 participants
@markelog @torkelo @xlson @marefr @ying-jeanne