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.

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

Add broker/corr as grafan editors #1122

Merged
merged 4 commits into from
Nov 20, 2024
Merged

Add broker/corr as grafan editors #1122

merged 4 commits into from
Nov 20, 2024

Conversation

bengtfredh
Copy link
Member

@bengtfredh bengtfredh commented Nov 20, 2024

Description

Add broker and correspondence developers as grafana editors to grafana.altinn.cloud

Summary by CodeRabbit

  • New Features

    • Expanded user groups for Grafana dashboard access, including new developer roles.
    • Enhanced permissions for additional developer groups with editor access.
  • Bug Fixes

    • Ensured consistent application of error handling across role assignments.

Copy link

coderabbitai bot commented Nov 20, 2024

📝 Walkthrough
<details>
<summary>📝 Walkthrough</summary>

## Walkthrough
The changes involve modifications to the Terraform configuration for Azure resources, specifically enhancing local variables related to developer groups for Grafana access. New local variables have been added to define additional developer groups, which are incorporated into the `grafana_editor` variable. The `for_each` loop for `grafana_editors` has been updated to include these new groups in the role assignment. The `grafana_admin` role assignment remains unchanged, and the `skip_service_principal_aad_check` parameter is consistently applied across all role assignments.

## Changes

| File Path                                                   | Change Summary                                                                                      |
|------------------------------------------------------------|----------------------------------------------------------------------------------------------------|
| infrastructure/adminservices-test/altinn-monitor-test-rg/grafana.tf | - Added local variables: `altinn_30_broker_test_developers`, `altinn_30_broker_prod_developers`, `altinn_30_correspondence_prod_developer`, `altinn_30_correspondence_test_developer`.<br>- Updated local variable `grafana_editor` to include new groups.<br>- Updated `for_each` loop in `azurerm_role_assignment` for `grafana_editors` to reference `local.grafana_editor`.<br>- Updated local variable `grafana_admin` (no structural change).<br>- Consistent application of `skip_service_principal_aad_check` across role assignments. |

</details>

Warning

Rate limit exceeded

@bengtfredh has exceeded the limit for the number of commits or files that can be reviewed per hour. Please wait 11 minutes and 57 seconds before requesting another review.

⌛ How to resolve this issue?

After the wait time has elapsed, a review can be triggered using the @coderabbitai review command as a PR comment. Alternatively, push new commits to this PR.

We recommend that you space out your commits to avoid hitting the rate limit.

🚦 How do rate limits work?

CodeRabbit enforces hourly rate limits for each developer per organization.

Our paid plans have higher rate limits than the trial, open-source and free plans. In all cases, we re-allow further reviews after a brief timeout.

Please see our FAQ for further information.

📥 Commits

Reviewing files that changed from the base of the PR and between d436ee0 and c5a7a1e.


📜 Recent review details

Configuration used: .coderabbit.yaml
Review profile: CHILL

📥 Commits

Reviewing files that changed from the base of the PR and between d436ee0 and c5a7a1e.

📒 Files selected for processing (1)
  • infrastructure/adminservices-test/altinn-monitor-test-rg/grafana.tf (1 hunks)
🚧 Files skipped from review as they are similar to previous changes (1)
  • infrastructure/adminservices-test/altinn-monitor-test-rg/grafana.tf

Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

❤️ Share
🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Generate unit testing code for this file.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit testing code for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and generate unit testing code.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

Copy link

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

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

Actionable comments posted: 1

🧹 Outside diff range and nitpick comments (1)
infrastructure/adminservices-test/altinn-monitor-test-rg/grafana.tf (1)

43-46: LGTM! Consider adding documentation comments.

The new Azure AD group variables are well-structured with clear naming. Consider adding comments to document the purpose of each group for better maintainability.

+ # Azure AD group for broker team (test environment)
  altinn_30_broker_test_developers        = "9b99f951-3873-4310-8baf-464b4da43f26"
+ # Azure AD group for broker team (production environment)
  altinn_30_broker_prod_developers        = "7708786a-aa50-4ce8-9f7f-e85459357de1"
+ # Azure AD group for correspondence team (production environment)
  altinn_30_correspondence_prod_developer = "89627577-7e88-446b-a64b-699a9208343c"
+ # Azure AD group for correspondence team (test environment)
  altinn_30_correspondence_test_developer = "12b73376-8726-493c-8d27-aa87e5213e6b"
📜 Review details

Configuration used: .coderabbit.yaml
Review profile: CHILL

📥 Commits

Reviewing files that changed from the base of the PR and between 69f4cda and b7b587e.

📒 Files selected for processing (1)
  • infrastructure/adminservices-test/altinn-monitor-test-rg/grafana.tf (2 hunks)
🔇 Additional comments (2)
infrastructure/adminservices-test/altinn-monitor-test-rg/grafana.tf (2)

49-56: LGTM! Editor permissions properly configured.

The grafana_editor list correctly includes both existing and new developer groups, maintaining appropriate access control.


43-46: Verify Azure AD group IDs and test access

Please ensure:

  1. The Azure AD group IDs are correct and active
  2. Test access for both broker and correspondence teams in their respective environments
  3. Verify that the groups have the expected team members

Also applies to: 49-56

Copy link

github-actions bot commented Nov 20, 2024

Terraform environment test

Format and Style 🖌success

Initialization ⚙️success

Validation 🤖success

Validation Output

Success! The configuration is valid.


Plan 📖success

Show Plan

[Lines containing Refreshing state removed]
[Maybe further truncated see logs for complete plan output]
Acquiring state lock. This may take a few moments...
data.azurerm_client_config.current: Reading...
data.azurerm_client_config.current: Read complete after 0s [id=Y2xpZW50Q29uZmlncy9jbGllbnRJZD1mMDNmNzU3OS01ZjM5LTRkN2YtYmNlYS04ZTVjYjZkN2FjYTQ7b2JqZWN0SWQ9MDJiMTdkMjgtN2VjOC00MDg0LTkyY2UtZDI2MDUxZmE0OTk4O3N1YnNjcmlwdGlvbklkPTFjZThlOWFmLWMyZDYtNDRlNy05YzVlLTA5OWEzMDgwNTZmZTt0ZW5hbnRJZD1jZDAwMjZkOC0yODNiLTRhNTUtOWJmYS1kMGVmNGE4YmEyMWM=]

Terraform used the selected providers to generate the following execution
plan. Resource actions are indicated with the following symbols:
  + create

Terraform will perform the following actions:

  # azurerm_role_assignment.grafana_editors["12b73376-8726-493c-8d27-aa87e5213e6b"] will be created
  + resource "azurerm_role_assignment" "grafana_editors" {
      + id                               = (known after apply)
      + name                             = (known after apply)
      + principal_id                     = "12b73376-8726-493c-8d27-aa87e5213e6b"
      + principal_type                   = "Group"
      + role_definition_id               = (known after apply)
      + role_definition_name             = "Grafana Editor"
      + scope                            = "/subscriptions/1ce8e9af-c2d6-44e7-9c5e-099a308056fe/resourceGroups/altinn-monitor-test-rg/providers/Microsoft.Dashboard/grafana/altinn-grafana-test"
      + skip_service_principal_aad_check = true
    }

  # azurerm_role_assignment.grafana_editors["7708786a-aa50-4ce8-9f7f-e85459357de1"] will be created
  + resource "azurerm_role_assignment" "grafana_editors" {
      + id                               = (known after apply)
      + name                             = (known after apply)
      + principal_id                     = "7708786a-aa50-4ce8-9f7f-e85459357de1"
      + principal_type                   = "Group"
      + role_definition_id               = (known after apply)
      + role_definition_name             = "Grafana Editor"
      + scope                            = "/subscriptions/1ce8e9af-c2d6-44e7-9c5e-099a308056fe/resourceGroups/altinn-monitor-test-rg/providers/Microsoft.Dashboard/grafana/altinn-grafana-test"
      + skip_service_principal_aad_check = true
    }

  # azurerm_role_assignment.grafana_editors["89627577-7e88-446b-a64b-699a9208343c"] will be created
  + resource "azurerm_role_assignment" "grafana_editors" {
      + id                               = (known after apply)
      + name                             = (known after apply)
      + principal_id                     = "89627577-7e88-446b-a64b-699a9208343c"
      + principal_type                   = "Group"
      + role_definition_id               = (known after apply)
      + role_definition_name             = "Grafana Editor"
      + scope                            = "/subscriptions/1ce8e9af-c2d6-44e7-9c5e-099a308056fe/resourceGroups/altinn-monitor-test-rg/providers/Microsoft.Dashboard/grafana/altinn-grafana-test"
      + skip_service_principal_aad_check = true
    }

  # azurerm_role_assignment.grafana_editors["9b99f951-3873-4310-8baf-464b4da43f26"] will be created
  + resource "azurerm_role_assignment" "grafana_editors" {
      + id                               = (known after apply)
      + name                             = (known after apply)
      + principal_id                     = "9b99f951-3873-4310-8baf-464b4da43f26"
      + principal_type                   = "Group"
      + role_definition_id               = (known after apply)
      + role_definition_name             = "Grafana Editor"
      + scope                            = "/subscriptions/1ce8e9af-c2d6-44e7-9c5e-099a308056fe/resourceGroups/altinn-monitor-test-rg/providers/Microsoft.Dashboard/grafana/altinn-grafana-test"
      + skip_service_principal_aad_check = true
    }

Plan: 4 to add, 0 to change, 0 to destroy.

─────────────────────────────────────────────────────────────────────────────

Saved the plan to: tfplan.out

To perform exactly these actions, run the following command to apply:
    terraform apply "tfplan.out"
Releasing state lock. This may take a few moments...

Context Values
Pusher @bengtfredh
Action push
Working Directory ./infrastructure/adminservices-test/altinn-monitor-test-rg
State File github.com/altinn/altinn-platform/environments/test/altinn-monitor-test-rg.tfstate
Plan File github.com_altinn_altinn-platform_environments_test_altinn-monitor-test-rg.tfstate.tfplan

Copy link
Member

@tjololo tjololo left a comment

Choose a reason for hiding this comment

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

:godmode:

@bengtfredh bengtfredh merged commit 7424e35 into main Nov 20, 2024
6 checks passed
@bengtfredh bengtfredh deleted the add-access-grafana branch November 20, 2024 11:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants