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

Azure data sources: Set selected config type before save #87481

Merged
merged 9 commits into from
May 10, 2024
Merged

Azure data sources: Set selected config type before save #87481

merged 9 commits into from
May 10, 2024

Conversation

bossinc
Copy link
Contributor

@bossinc bossinc commented May 8, 2024

Triggers an onchange event for authType when loading the page and the auth type is null.

This fixes https://github.com/grafana/support-escalations/issues/10390

@bossinc bossinc requested a review from a team as a code owner May 8, 2024 03:35
@bossinc bossinc requested review from asimpson, aangelisc, adamyeats and alyssabull and removed request for a team May 8, 2024 03:35
@grafana-delivery-bot grafana-delivery-bot bot added this to the 11.1.x milestone May 8, 2024
@bossinc bossinc added add to changelog no-backport Skip backport of PR labels May 8, 2024
@grafana-pr-automation grafana-pr-automation bot added datasource/Azure Azure Monitor Datasource datasource/MSSQL Microsoft SQL Server Data Source area/frontend labels May 8, 2024
aangelisc
aangelisc reviewed May 8, 2024
View reviewed changes
Copy link
Contributor

@aangelisc aangelisc left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The prometheus data source is also affected by this bug and will require changes too 😊

@bossinc bossinc requested a review from a team as a code owner May 8, 2024 17:29
aangelisc
aangelisc approved these changes May 9, 2024
View reviewed changes
Copy link
Contributor

@aangelisc aangelisc left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This all LGTM! Just a couple nits in the comments. I think this would also benefit from a unit test to validate that the auth type is correctly set on first load

@bossinc bossinc added backport v10.2.x backport v10.3.x Mark PR for automatic backport to v10.3.x and removed no-backport Skip backport of PR labels May 9, 2024
@grafana-delivery-bot grafana-delivery-bot
Copy link
Contributor

Hello @bossinc!
Backport pull requests need to be either:

  • Pull requests which address bugs,
  • Urgent fixes which need product approval, in order to get merged,
  • Docs changes.

Please, if the current pull request addresses a bug fix, label it with the type/bug label.
If it already has the product approval, please add the product-approved label. For docs changes, please add the type/docs label.
If the pull request modifies CI behaviour, please add the type/ci label.
If none of the above applies, please consider removing the backport label and target the next major/minor release.
Thanks!

1 similar comment
@grafana-delivery-bot grafana-delivery-bot
Copy link
Contributor

Hello @bossinc!
Backport pull requests need to be either:

  • Pull requests which address bugs,
  • Urgent fixes which need product approval, in order to get merged,
  • Docs changes.

Please, if the current pull request addresses a bug fix, label it with the type/bug label.
If it already has the product approval, please add the product-approved label. For docs changes, please add the type/docs label.
If the pull request modifies CI behaviour, please add the type/ci label.
If none of the above applies, please consider removing the backport label and target the next major/minor release.
Thanks!

@grafana-delivery-bot grafana-delivery-bot
Copy link
Contributor

Hello @bossinc!
Backport pull requests need to be either:

  • Pull requests which address bugs,
  • Urgent fixes which need product approval, in order to get merged,
  • Docs changes.

Please, if the current pull request addresses a bug fix, label it with the type/bug label.
If it already has the product approval, please add the product-approved label. For docs changes, please add the type/docs label.
If the pull request modifies CI behaviour, please add the type/ci label.
If none of the above applies, please consider removing the backport label and target the next major/minor release.
Thanks!

@grafana-delivery-bot grafana-delivery-bot
Copy link
Contributor

This PR must be merged before a backport PR will be created.

@bossinc bossinc added product-approved Pull requests that are approved by product/managers and are allowed to be backported missing-labels labels May 9, 2024
@grafana-delivery-bot grafana-delivery-bot
Copy link
Contributor

This PR must be merged before a backport PR will be created.

asimpson
asimpson approved these changes May 9, 2024
View reviewed changes
Copy link
Contributor

@asimpson asimpson left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice nice! 🚀

@bossinc bossinc enabled auto-merge (squash) May 9, 2024 22:18
@bossinc bossinc merged commit 5e19aa7 into main May 10, 2024
14 checks passed
@bossinc bossinc deleted the andrew/azure-config-early-save branch May 10, 2024 00:54
grafana-delivery-bot bot pushed a commit that referenced this pull request May 10, 2024
@bossinc @grafana-delivery-bot
Azure data sources: Set selected config type before save (#87481)
343d523 
* set selected config type before save

* use effect once and move in mssql

* add to prom

* Update ConfigurationEditor.tsx

* Update ConfigurationEditor.tsx

* Delete public/app/plugins/datasource/mssql/configuration/ConfigurationEditor.tsx

* omadsfdsa

* remove unneeded assign

(cherry picked from commit 5e19aa7)
@grafana-delivery-bot grafana-delivery-bot bot mentioned this pull request May 10, 2024
Merged
grafana-delivery-bot bot pushed a commit that referenced this pull request May 10, 2024
@bossinc @grafana-delivery-bot
Azure data sources: Set selected config type before save (#87481)
683af3d 
* set selected config type before save

* use effect once and move in mssql

* add to prom

* Update ConfigurationEditor.tsx

* Update ConfigurationEditor.tsx

* Delete public/app/plugins/datasource/mssql/configuration/ConfigurationEditor.tsx

* omadsfdsa

* remove unneeded assign

(cherry picked from commit 5e19aa7)
@grafana-delivery-bot grafana-delivery-bot bot mentioned this pull request May 10, 2024
Merged
grafana-delivery-bot bot pushed a commit that referenced this pull request May 10, 2024
@bossinc @grafana-delivery-bot
Azure data sources: Set selected config type before save (#87481)
d426d0e 
* set selected config type before save

* use effect once and move in mssql

* add to prom

* Update ConfigurationEditor.tsx

* Update ConfigurationEditor.tsx

* Delete public/app/plugins/datasource/mssql/configuration/ConfigurationEditor.tsx

* omadsfdsa

* remove unneeded assign

(cherry picked from commit 5e19aa7)
@grafana-delivery-bot grafana-delivery-bot bot mentioned this pull request May 10, 2024
Merged
aangelisc pushed a commit that referenced this pull request May 10, 2024
@grafana-delivery-bot @bossinc
[v10.2.x] Azure data sources: Set selected config type before save (#…
4c8b6e8 
…87583)

Azure data sources: Set selected config type before save (#87481)

* set selected config type before save

* use effect once and move in mssql

* add to prom

* Update ConfigurationEditor.tsx

* Update ConfigurationEditor.tsx

* Delete public/app/plugins/datasource/mssql/configuration/ConfigurationEditor.tsx

* omadsfdsa

* remove unneeded assign

(cherry picked from commit 5e19aa7)

Co-authored-by: Andrew Hackmann <5140848+bossinc@users.noreply.github.com>
aangelisc pushed a commit that referenced this pull request May 10, 2024
@grafana-delivery-bot @bossinc
[v10.3.x] Azure data sources: Set selected config type before save (#…
d3ccac6 
…87584)

Azure data sources: Set selected config type before save (#87481)

* set selected config type before save

* use effect once and move in mssql

* add to prom

* Update ConfigurationEditor.tsx

* Update ConfigurationEditor.tsx

* Delete public/app/plugins/datasource/mssql/configuration/ConfigurationEditor.tsx

* omadsfdsa

* remove unneeded assign

(cherry picked from commit 5e19aa7)

Co-authored-by: Andrew Hackmann <5140848+bossinc@users.noreply.github.com>
@aangelisc aangelisc added the backport v11.0.x Mark PR for automatic backport to v11.0.x label May 10, 2024
aangelisc pushed a commit that referenced this pull request May 10, 2024
@grafana-delivery-bot @bossinc
[v10.4.x] Azure data sources: Set selected config type before save (#…
4d4cc11 
…87585)

Azure data sources: Set selected config type before save (#87481)

* set selected config type before save

* use effect once and move in mssql

* add to prom

* Update ConfigurationEditor.tsx

* Update ConfigurationEditor.tsx

* Delete public/app/plugins/datasource/mssql/configuration/ConfigurationEditor.tsx

* omadsfdsa

* remove unneeded assign

(cherry picked from commit 5e19aa7)

Co-authored-by: Andrew Hackmann <5140848+bossinc@users.noreply.github.com>
grafana-delivery-bot bot pushed a commit that referenced this pull request May 10, 2024
@bossinc @grafana-delivery-bot
Azure data sources: Set selected config type before save (#87481)
bbb4b2f 
* set selected config type before save

* use effect once and move in mssql

* add to prom

* Update ConfigurationEditor.tsx

* Update ConfigurationEditor.tsx

* Delete public/app/plugins/datasource/mssql/configuration/ConfigurationEditor.tsx

* omadsfdsa

* remove unneeded assign

(cherry picked from commit 5e19aa7)
@grafana-delivery-bot grafana-delivery-bot bot mentioned this pull request May 10, 2024
Merged
aangelisc pushed a commit that referenced this pull request May 10, 2024
@grafana-delivery-bot @bossinc
[v11.0.x] Azure data sources: Set selected config type before save (#…
e52d86e 
…87632)

Azure data sources: Set selected config type before save (#87481)

* set selected config type before save

* use effect once and move in mssql

* add to prom

* Update ConfigurationEditor.tsx

* Update ConfigurationEditor.tsx

* Delete public/app/plugins/datasource/mssql/configuration/ConfigurationEditor.tsx

* omadsfdsa

* remove unneeded assign

(cherry picked from commit 5e19aa7)

Co-authored-by: Andrew Hackmann <5140848+bossinc@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@asimpson asimpson asimpson approved these changes

@aangelisc aangelisc aangelisc approved these changes

@adamyeats adamyeats Awaiting requested review from adamyeats adamyeats is a code owner automatically assigned from grafana/partner-datasources

@alyssabull alyssabull Awaiting requested review from alyssabull alyssabull is a code owner automatically assigned from grafana/partner-datasources

Assignees
No one assigned
Labels
add to changelog area/frontend backport v10.2.x backport v10.3.x Mark PR for automatic backport to v10.3.x backport v10.4.x backport v11.0.x Mark PR for automatic backport to v11.0.x datasource/Azure Azure Monitor Datasource datasource/MSSQL Microsoft SQL Server Data Source datasource/Prometheus product-approved Pull requests that are approved by product/managers and are allowed to be backported type/bug
Projects
None yet
Milestone
11.1.x
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@bossinc @asimpson @aangelisc