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

Cme 121 frequency #2399

Open
wants to merge 9 commits into
base: ithc
Choose a base branch
from
Open

Cme 121 frequency #2399

wants to merge 9 commits into from

Conversation

kiran-yenigala-hmcts
Copy link

Before creating a pull request make sure that:

  • commit messages are meaningful and follow good commit message guidelines
  • README and other documentation has been updated / added (if needed)
  • tests have been updated / new tests has been added (if needed)

Please remove this line and everything above and fill the following sections:

JIRA link (if applicable)

Change description

Does this PR introduce a breaking change? (check one with "x")

[ ] Yes
[ ] No

mikebrownccd and others added 9 commits November 13, 2024 16:26
[DTSAM-611](https://tools.hmcts.net/jira/browse/DTSAM-611)

Refactor S2S token secrets and environment variables used in FTAs.
…2364)

* DTSAM-571 Audit byPassOrgDroolRule when receiving ORG roles from ORM

* process included in log

* () added to log properties

* do not log if client id = am_org_role_mapping_service

* not ORM log filter fixed by using .equals()

* logging made null safe

* FTAs with ref S-*_Org_Role_Creation added ORM request header to remove from the KQL report

* ServiceAuthorization header moved to Test_Data_Base file

* ServiceAuthorization header added to requests in common dir
* DTSAM-571 Audit byPassOrgDroolRule when receiving ORG roles from ORM

* process included in log

* () added to log properties

* do not log if client id = am_org_role_mapping_service

* not ORM log filter fixed by using .equals()

* DTSAM-572 Audit use of case-allocator rules for CCD case-roles - conditional logInfoMsg() added

* temp removal of conditional for report dev in aat

* temp removal of conditional for report dev in aat

* space added to log

* logging made null safe

* RoleCategory filter uncommented

* logging made null safe

* FTAs with ref S-*_Org_Role_Creation added ORM request header to remove from the KQL report

* ServiceAuthorization header moved to Test_Data_Base file

* ServiceAuthorization header added to requests in common dir

* logged rule corrected to case_allocator_approve_delete_case_role_all_wa_services

* RoleCategory comparisons made null safe
* Update dependency org.pitest:pitest to v1.17.1

* Update versions.tomcat to v9.0.97

* DTSAM-610 Renovate review W/C 2024-11-18 - pitest reverted 1.17.1 -> 1.17.0

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: github-actions <github-actions@github.com>
Co-authored-by: Mike Brown <michael.brown@hmcts.net>
Co-authored-by: mikebrownccd <104495891+mikebrownccd@users.noreply.github.com>
* Update dependency org.projectlombok:lombok to v1.18.36

* Update Terraform azurerm to ~> 3.117.0

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: github-actions <github-actions@github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@kiran-yenigala-hmcts kiran-yenigala-hmcts changed the base branch from master to ithc December 6, 2024 12:38
@hmcts-jenkins-a-to-c
Copy link
Contributor

Plan Result (aat)

Plan: 4 to add, 0 to change, 0 to destroy.
  • Create
    • module.role-assignment-database-v15.azurerm_monitor_action_group.db-alerts-action-group[0]
    • module.role-assignment-database-v15.azurerm_monitor_metric_alert.db_alert_cpu[0]
    • module.role-assignment-database-v15.azurerm_monitor_metric_alert.db_alert_memory[0]
    • module.role-assignment-database-v15.azurerm_monitor_metric_alert.db_alert_storage_utilization[0]
Change Result (Click me)
  # module.role-assignment-database-v15.azurerm_monitor_action_group.db-alerts-action-group[0] will be created
  + resource "azurerm_monitor_action_group" "db-alerts-action-group" {
      + enabled             = true
      + id                  = (known after apply)
      + location            = "global"
      + name                = "am-role-assignment-service-postgres-db-v15-action_group"
      + resource_group_name = "am-role-assignment-service-postgres-db-v15-data-aat"
      + short_name          = "am-role-assi"
      + tags                = {
          + "application"         = "access-management"
          + "autoShutdown"        = "true"
          + "builtFrom"           = "https://github.com/HMCTS/am-role-assignment-service.git"
          + "businessArea"        = "CFT"
          + "contactSlackChannel" = "#am-master-builds"
          + "environment"         = "staging"
          + "managedBy"           = "AM"
        }

      + email_receiver {
          + email_address           = (sensitive value)
          + name                    = "Email Receiver"
          + use_common_alert_schema = true
        }
    }

  # module.role-assignment-database-v15.azurerm_monitor_metric_alert.db_alert_cpu[0] will be created
  + resource "azurerm_monitor_metric_alert" "db_alert_cpu" {
      + auto_mitigate            = true
      + description              = "Whenever the cpu utilization is greater than 5"
      + enabled                  = true
      + frequency                = "PT5M"
      + id                       = (known after apply)
      + name                     = "db_cpu_percent_am-role-assignment-service-postgres-db-v15-aat"
      + resource_group_name      = "am-role-assignment-service-postgres-db-v15-data-aat"
      + scopes                   = [
          + "/subscriptions/1c4f0704-a29e-403d-b719-b90c34ef14c9/resourceGroups/am-role-assignment-service-postgres-db-v15-data-aat/providers/Microsoft.DBforPostgreSQL/flexibleServers/am-role-assignment-service-postgres-db-v15-aat",
        ]
      + severity                 = 1
      + tags                     = {
          + "application"         = "access-management"
          + "autoShutdown"        = "true"
          + "builtFrom"           = "https://github.com/HMCTS/am-role-assignment-service.git"
          + "businessArea"        = "CFT"
          + "contactSlackChannel" = "#am-master-builds"
          + "environment"         = "staging"
          + "managedBy"           = "AM"
        }
      + target_resource_location = (known after apply)
      + target_resource_type     = (known after apply)
      + window_size              = "PT15M"

      + action {
          + action_group_id = (known after apply)
        }

      + criteria {
          + aggregation            = "Average"
          + metric_name            = "cpu_percent"
          + metric_namespace       = "Microsoft.DBforPostgreSQL/flexibleServers"
          + operator               = "GreaterThanOrEqual"
          + skip_metric_validation = false
          + threshold              = 5
        }
    }

  # module.role-assignment-database-v15.azurerm_monitor_metric_alert.db_alert_memory[0] will be created
  + resource "azurerm_monitor_metric_alert" "db_alert_memory" {
      + auto_mitigate            = true
      + description              = "Whenever the memory utilization is greater than 7"
      + enabled                  = true
      + frequency                = "PT5M"
      + id                       = (known after apply)
      + name                     = "db_memory_percent_am-role-assignment-service-postgres-db-v15-aat"
      + resource_group_name      = "am-role-assignment-service-postgres-db-v15-data-aat"
      + scopes                   = [
          + "/subscriptions/1c4f0704-a29e-403d-b719-b90c34ef14c9/resourceGroups/am-role-assignment-service-postgres-db-v15-data-aat/providers/Microsoft.DBforPostgreSQL/flexibleServers/am-role-assignment-service-postgres-db-v15-aat",
        ]
      + severity                 = 1
      + tags                     = {
          + "application"         = "access-management"
          + "autoShutdown"        = "true"
          + "builtFrom"           = "https://github.com/HMCTS/am-role-assignment-service.git"
          + "businessArea"        = "CFT"
          + "contactSlackChannel" = "#am-master-builds"
          + "environment"         = "staging"
          + "managedBy"           = "AM"
        }
      + target_resource_location = (known after apply)
      + target_resource_type     = (known after apply)
      + window_size              = "PT15M"

      + action {
          + action_group_id = (known after apply)
        }

      + criteria {
          + aggregation            = "Average"
          + metric_name            = "memory_percent"
          + metric_namespace       = "Microsoft.DBforPostgreSQL/flexibleServers"
          + operator               = "GreaterThanOrEqual"
          + skip_metric_validation = false
          + threshold              = 7
        }
    }

  # module.role-assignment-database-v15.azurerm_monitor_metric_alert.db_alert_storage_utilization[0] will be created
  + resource "azurerm_monitor_metric_alert" "db_alert_storage_utilization" {
      + auto_mitigate            = true
      + description              = "Whenever the storage utilization is greater than 2"
      + enabled                  = true
      + frequency                = "PT5M"
      + id                       = (known after apply)
      + name                     = "db_storage_utilization_am-role-assignment-service-postgres-db-v15-aat"
      + resource_group_name      = "am-role-assignment-service-postgres-db-v15-data-aat"
      + scopes                   = [
          + "/subscriptions/1c4f0704-a29e-403d-b719-b90c34ef14c9/resourceGroups/am-role-assignment-service-postgres-db-v15-data-aat/providers/Microsoft.DBforPostgreSQL/flexibleServers/am-role-assignment-service-postgres-db-v15-aat",
        ]
      + severity                 = 1
      + tags                     = {
          + "application"         = "access-management"
          + "autoShutdown"        = "true"
          + "builtFrom"           = "https://github.com/HMCTS/am-role-assignment-service.git"
          + "businessArea"        = "CFT"
          + "contactSlackChannel" = "#am-master-builds"
          + "environment"         = "staging"
          + "managedBy"           = "AM"
        }
      + target_resource_location = (known after apply)
      + target_resource_type     = (known after apply)
      + window_size              = "PT15M"

      + action {
          + action_group_id = (known after apply)
        }

      + criteria {
          + aggregation            = "Average"
          + metric_name            = "storage_percent"
          + metric_namespace       = "Microsoft.DBforPostgreSQL/flexibleServers"
          + operator               = "GreaterThanOrEqual"
          + skip_metric_validation = false
          + threshold              = 2
        }
    }

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

@hmcts-jenkins-a-to-c
Copy link
Contributor

Plan Result (ithc)

Plan: 0 to add, 1 to change, 0 to destroy.
  • Update
    • module.role-assignment-database-v15.azurerm_monitor_metric_alert.db_alert_memory[0]
Change Result (Click me)
  # module.role-assignment-database-v15.azurerm_monitor_metric_alert.db_alert_memory[0] will be updated in-place
  ~ resource "azurerm_monitor_metric_alert" "db_alert_memory" {
      ~ description              = "Whenever the memory utilization is greater than 5" -> "Whenever the memory utilization is greater than 7"
        id                       = "/subscriptions/7a4e3bd5-ae3a-4d0c-b441-2188fee3ff1c/resourceGroups/am-role-assignment-service-postgres-db-v15-data-ithc/providers/Microsoft.Insights/metricAlerts/db_memory_percent_am-role-assignment-service-postgres-db-v15-ithc"
        name                     = "db_memory_percent_am-role-assignment-service-postgres-db-v15-ithc"
        tags                     = {
            "application"         = "access-management"
            "autoShutdown"        = "true"
            "builtFrom"           = "https://github.com/HMCTS/am-role-assignment-service.git"
            "businessArea"        = "CFT"
            "contactSlackChannel" = "#am-master-builds"
            "environment"         = "ithc"
            "managedBy"           = "AM"
        }
        # (9 unchanged attributes hidden)

      ~ criteria {
          ~ threshold              = 5 -> 7
            # (5 unchanged attributes hidden)
        }

        # (1 unchanged block hidden)
    }

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants