qontract-reconcile 0.10.2.dev178__py3-none-any.whl → 0.10.2.dev180__py3-none-any.whl

{qontract_reconcile-0.10.2.dev178.dist-info → qontract_reconcile-0.10.2.dev180.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qontract-reconcile
-Version: 0.10.2.dev178
+Version: 0.10.2.dev180
 Summary: Collection of tools to reconcile services with their desired state as defined in the app-interface DB.
 Project-URL: homepage, https://github.com/app-sre/qontract-reconcile
 Project-URL: repository, https://github.com/app-sre/qontract-reconcile

{qontract_reconcile-0.10.2.dev178.dist-info → qontract_reconcile-0.10.2.dev180.dist-info}/RECORD

@@ -46,7 +46,7 @@ reconcile/jenkins_roles.py,sha256=HadmoNhgOoKMFZJmCe_Gdg0_a9k_1MuOXidtr801nUU,45
 reconcile/jenkins_webhooks.py,sha256=dzMT1ywXjeAo5sHj-ittW06Ed3beAUPjnc_oCAtD-Rg,2150
 reconcile/jenkins_webhooks_cleaner.py,sha256=JsN_NVPfZJwv1JtSzZXDIHUqGiefL-DRffFnDGau9aY,1539
 reconcile/jenkins_worker_fleets.py,sha256=L2wEXpd4xuEHrXGss4iH788nG8UlLSYduZe1EY2IVw4,5377
-reconcile/jira_permissions_validator.py,sha256=Sw7l-EMHwPk5HXA0LqOs2vmvDd-zraVHouUX1Ak2cVM,13524
+reconcile/jira_permissions_validator.py,sha256=5rc4Q2mXGL3HCZmYpZaJkjzBrpCRnlLeCY0Yl2fDOs4,14672
 reconcile/jira_watcher.py,sha256=L_UL2MKm2SoIGNsCLThm28pnqCkoFc154JWsD6bURug,3593
 reconcile/ldap_users.py,sha256=7hdO5CAPl-VNBvDRmKHg13LoblHXXPt7YEKNGomAoGg,3158
 reconcile/mr_client_gateway.py,sha256=WhjMd-sIXDFCV8-rt8CEjurJ5OYB1pOD0K3o0tZRXQg,1885
@@ -123,14 +123,14 @@ reconcile/vpc_peerings_validator.py,sha256=aESqrhm1tpkc2iqSL1UV5to_HjNgjRSffD0cr
 reconcile/aus/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/aus/advanced_upgrade_service.py,sha256=lt684trHbKvVDLwwuNVz3Wu_MnytFSbS_7MZTIITh9k,23969
 reconcile/aus/aus_label_source.py,sha256=o0S2f0qwcII_8nzhHZhRQ83gEZ1DrSXyO4xzSwLebuU,4382
-reconcile/aus/base.py,sha256=rx2OuShoFRP7O6Kov9rRjEkhCPpPavfDF81tieB6XFg,50747
+reconcile/aus/base.py,sha256=Kicj39qfAlINywfk0Legu7RUcUxI4AuoBhA8vJ1gWag,51343
 reconcile/aus/cluster_version_data.py,sha256=VZWbUEIbrDKO-sroMpQtiWCTqDraTMd8tssKV0HyTQ0,7140
 reconcile/aus/healthchecks.py,sha256=jR9c-syh9impnkV0fd6XW3Bnk7iRN5zv8oCRYM-yIRY,2700
-reconcile/aus/metrics.py,sha256=nKT4m2zGT-QOMR0c-z-npVNKWsNMubzdffpU_f9n4II,3927
+reconcile/aus/metrics.py,sha256=qh3-oWL8-Hbj1uXgAKonw7sVXGBlPpCyHtVYJusZ9n8,4271
 reconcile/aus/models.py,sha256=qLjWLDJe5PGXPPtJ5PI01IVEYaSGweu9dkAgf0ZM2hk,8297
 reconcile/aus/node_pool_spec.py,sha256=FkMggklG-4BgQwud2Swp2m3AAAKzZmeaXgohl9uwxZ8,1138
-reconcile/aus/ocm_addons_upgrade_scheduler_org.py,sha256=SHbFEEq9ETtkkuzBBaNuwSDze8fj6DWHeA_XNgOyTbo,10308
-reconcile/aus/ocm_upgrade_scheduler.py,sha256=2uPn13y3QGCHLoKwCc1Z7q9wQsoQf_F1HATMYUbl53s,3695
+reconcile/aus/ocm_addons_upgrade_scheduler_org.py,sha256=PL8QdzWh8lhGneMwSbIYxOp002mJd5gHf_T0Q2cWQho,10350
+reconcile/aus/ocm_upgrade_scheduler.py,sha256=WPIUUr3n3j-ZtyE3DgsPKzBJ3Dm9i1PSHBRepAf6CF4,3783
 reconcile/aus/ocm_upgrade_scheduler_org.py,sha256=QeZAQ1wdDPcwZ77b3Xmt4yBV60rWi3qd8h-vGwnwoCs,3948
 reconcile/aus/upgrades.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/aus/version_gate_approver.py,sha256=iZg7l-VgcgyVf7jV9mLZzXq3d22r8feAnl-1LDVUJR4,7358
@@ -227,10 +227,10 @@ reconcile/glitchtip_project_alerts/integration.py,sha256=BgMx-NyV9mTuv7Sotb2OioC
 reconcile/glitchtip_project_dsn/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/glitchtip_project_dsn/integration.py,sha256=2iugub-kHYkHNK33n0v9_TeWonuxCPah_VkoTPvaajE,8077
 reconcile/gql_definitions/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-reconcile/gql_definitions/introspection.json,sha256=zD5QWpv9KYduZHr8a6dFoGz-oSHM1ItN1Trn02Lh7XQ,2297479
+reconcile/gql_definitions/introspection.json,sha256=lgoJW52hU7zL4UKNpKywvyL--o36MggUI1eFWWlvYLk,2300074
 reconcile/gql_definitions/acs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/gql_definitions/acs/acs_instances.py,sha256=L91WW9LbhJbBSrECqShQpFtjoBOsmNIYLRpMbx1io5o,2181
-reconcile/gql_definitions/acs/acs_policies.py,sha256=bN5i4mks10Z23KJSj7jqp966Osq2dps4d-sPH9gjxEA,7008
+reconcile/gql_definitions/acs/acs_policies.py,sha256=9IFpGAcrZ8nTFC05q3-12nwkNOEkquHB2-XbVq5_jy4,7219
 reconcile/gql_definitions/acs/acs_rbac.py,sha256=cZsIlCWliPQdQHgmBsIMx54fJNOtkdRXLzmOKZmJNHk,3009
 reconcile/gql_definitions/advanced_upgrade_service/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/gql_definitions/advanced_upgrade_service/aus_clusters.py,sha256=230uwBoBaaVz686d_WNZT9eAw6BX2VpoQX0mKhf5UcM,4390
@@ -376,7 +376,7 @@ reconcile/gql_definitions/jenkins_configs/jenkins_instances.py,sha256=b3gYVzQavx
 reconcile/gql_definitions/jira/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/gql_definitions/jira/jira_servers.py,sha256=N7mvIdqoXT-90abkiaC2bxz2ZjW3d826qVV5OL8_TAM,2223
 reconcile/gql_definitions/jira_permissions_validator/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-reconcile/gql_definitions/jira_permissions_validator/jira_boards_for_permissions_validator.py,sha256=7p-GA-dGeuouUcAvOIMBbgGJJtIXPG5Jx4n024to97M,3856
+reconcile/gql_definitions/jira_permissions_validator/jira_boards_for_permissions_validator.py,sha256=RqIDe90sKjEfFNEIxtfBg10Bddc11M6I7ae_FqBl3To,4034
 reconcile/gql_definitions/jumphosts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/gql_definitions/jumphosts/jumphosts.py,sha256=gN595lx7K1XsB2AfxDQ911TBVBbCoxibVeujnsGue_Q,2371
 reconcile/gql_definitions/ldap_groups/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -625,7 +625,7 @@ reconcile/utils/helpers.py,sha256=womAD2bKPUAFOjHvNPAe_2Hsb-oVTxuQiYPGeR-Thp0,17
 reconcile/utils/imap_client.py,sha256=h8YDiCSCvroErhpH_-KGYI7Y2WU2Q2oSpuxDFbOkSbY,1989
 reconcile/utils/instrumented_wrappers.py,sha256=VqT4s0Bdicv224-uSeSaugtHXm-xJ3oSeBiqj0QQRiU,1942
 reconcile/utils/jenkins_api.py,sha256=RaKuZmO7_lbI-hE6c_Pq2a6CQdmBVj7BcP2jR68cIbI,7081
-reconcile/utils/jira_client.py,sha256=oWi7rcAP1C59oIBTPg6kRntI25Zm4e7FyvdVYvZ9RZ8,7881
+reconcile/utils/jira_client.py,sha256=xhklHRsMnQqZ8WCxO1efjRKvx6diLcGQ6DLi5ZKl_HM,10544
 reconcile/utils/jjb_client.py,sha256=4YqeXEkO4p6QtJE_fkaD1XuLKbe9l3g0W7AVpcjJ3yg,15187
 reconcile/utils/jsonpath.py,sha256=wdxOMqR-GMpQf5vRPWRMqAF7bCiXDBkkcFfY2U4j_tk,5536
 reconcile/utils/jump_host.py,sha256=gi8vGUDgdTVwJvROvRVauFxtL0YAramhbWvG70L7AY8,5137
@@ -675,7 +675,7 @@ reconcile/utils/vaultsecretref.py,sha256=0KUSzuvTRxPyKY919TO3-B_eYg4_76fzKvMF8j5
 reconcile/utils/vcs.py,sha256=YtjR3E_VaS7lA4ROzSr7hte-8G-SZ_UmJP5RJ2DCyJk,8807
 reconcile/utils/acs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/utils/acs/base.py,sha256=4UsDrCpAOuddL3PKNuIQYoJP1BtZQNNB8_KEX0lXneg,2532
-reconcile/utils/acs/notifiers.py,sha256=nHVw9C_2-K4nv5zq26jlOTSw1roY6TKlovi1sOfpxpI,4998
+reconcile/utils/acs/notifiers.py,sha256=DlzTDM9arWQlBSiDy70y5Mf38OKVs9V0FzFe2LfOKXA,5046
 reconcile/utils/acs/policies.py,sha256=jpbi3qpGkBD_X6MfzsX12dPajUbmACmhIOz_0rDvYzs,5489
 reconcile/utils/acs/rbac.py,sha256=ugsLM9Pb7FbUbdq85E3VzXGMaB9ZovXob7tdWCxwqZ8,8808
 reconcile/utils/aws_api_typed/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -807,7 +807,7 @@ tools/saas_promotion_state/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJ
 tools/saas_promotion_state/saas_promotion_state.py,sha256=UfwwRLS5Ya4_Nh1w5n1dvoYtchQvYE9yj1VANt2IKqI,3925
 tools/sre_checkpoints/__init__.py,sha256=CDaDaywJnmRCLyl_NCcvxi-Zc0hTi_3OdwKiFOyS39I,145
 tools/sre_checkpoints/util.py,sha256=zEDbGr18ZeHNQwW8pUsr2JRjuXIPz--WAGJxZo9sv_Y,894
-qontract_reconcile-0.10.2.dev178.dist-info/METADATA,sha256=vW_VvL_wbX71KGMMGNeLRCFptzQYPsNcbG1PGHrcJ9g,24627
-qontract_reconcile-0.10.2.dev178.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-qontract_reconcile-0.10.2.dev178.dist-info/entry_points.txt,sha256=5i9l54La3vQrDLAdwDKQWC0iG4sV9RRfOb1BpvzOWLc,698
-qontract_reconcile-0.10.2.dev178.dist-info/RECORD,,
+qontract_reconcile-0.10.2.dev180.dist-info/METADATA,sha256=3ABcj9gi3YuKUyzROkTB3i4Mo6F6eXVi4BpgPXIwLg4,24627
+qontract_reconcile-0.10.2.dev180.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+qontract_reconcile-0.10.2.dev180.dist-info/entry_points.txt,sha256=5i9l54La3vQrDLAdwDKQWC0iG4sV9RRfOb1BpvzOWLc,698
+qontract_reconcile-0.10.2.dev180.dist-info/RECORD,,

reconcile/aus/base.py

@@ -35,6 +35,7 @@ from reconcile.aus.metrics import (
     UPGRADE_SCHEDULED_METRIC_VALUE,
     UPGRADE_STARTED_METRIC_VALUE,
     AUSClusterHealthStateGauge,
+    AUSClusterMissingVersionGateAgreementsGauge,
     AUSClusterUpgradePolicyInfoMetric,
     AUSOCMEnvironmentError,
     AUSOrganizationErrorRate,
@@ -1066,6 +1067,7 @@ def calculate_diff(
     ocm_api: OCMBaseClient,
     version_data: VersionData,
     addon_id: str = "",
+    integration: str = "",
 ) -> list[UpgradePolicyHandler]:
     """Check available upgrades for each cluster in the desired state
     according to upgrade conditions
@@ -1169,13 +1171,25 @@ def calculate_diff(
                     },
                 )
                 if gates_with_missing_agreements:
-                    missing_gate_ids = [
-                        gate.id for gate in gates_with_missing_agreements
+                    missing_gate_labels = [
+                        gate.label for gate in gates_with_missing_agreements
                     ]
                     logging.info(
-                        f"[{spec.org.org_id}/{spec.org.name}/{spec.cluster.name}] found gates with missing agreements for {target_version_prefix} - {missing_gate_ids} "
+                        f"[{spec.org.org_id}/{spec.org.name}/{spec.cluster.name}] found gates with missing agreements for {target_version_prefix} - {missing_gate_labels} "
                         "Skip creation of an upgrade policy until all of them have been acked by the version-gate-approver integration or a user."
                     )
+
+                    metrics.set_gauge(
+                        AUSClusterMissingVersionGateAgreementsGauge(
+                            integration=integration,
+                            ocm_env=spec.org.environment.name,
+                            org_id=spec.org.org_id,
+                            cluster_uuid=spec.cluster.id,
+                            version_prefix=target_version_prefix,
+                        ),
+                        len(gates_with_missing_agreements),
+                    )
+
                     continue
                 diffs.append(
                     UpgradePolicyHandler(

reconcile/aus/metrics.py

@@ -56,6 +56,18 @@ class AUSClusterHealthStateGauge(AUSBaseMetric, GaugeMetric):
         return "aus_cluster_health_state"
 
 
+class AUSClusterMissingVersionGateAgreementsGauge(AUSBaseMetric, GaugeMetric):
+    "The number of missing version gate agreements for a cluster and a target version prefix."
+
+    org_id: str
+    cluster_uuid: str
+    version_prefix: str
+
+    @classmethod
+    def name(cls) -> str:
+        return "aus_cluster_missing_version_gate_agreements"
+
+
 class AUSAddonVersionRemainingSoakDaysGauge(AUSClusterVersionRemainingSoakDaysGauge):
     "Remaining days a version needs to soak for an addon on a cluster"
 

reconcile/aus/ocm_addons_upgrade_scheduler_org.py

@@ -250,6 +250,7 @@ def calculate_diff(
         ocm_api,
         version_data,
         addon_id,
+        integration=QONTRACT_INTEGRATION,
     )
     for current in addon_current_state:
         if addon_id == current.addon_id and (

reconcile/aus/ocm_upgrade_scheduler.py

@@ -76,7 +76,11 @@ class OCMClusterUpgradeSchedulerIntegration(
             )
 
             diffs = aus.calculate_diff(
-                current_state, org_upgrade_spec, ocm_api, version_data
+                current_state,
+                org_upgrade_spec,
+                ocm_api,
+                version_data,
+                integration=self.name,
             )
             aus.act(dry_run, diffs, ocm_api)
 

reconcile/gql_definitions/acs/acs_policies.py

@@ -21,7 +21,7 @@ from pydantic import (  # noqa: F401 # pylint: disable=W0611
 DEFINITION = """
 query AcsPolicy {
   acs_policies: acs_policy_v1 {
-   	name
+    name
     description
     severity
     integrations {
@@ -43,7 +43,10 @@ query AcsPolicy {
                   }
                 }
                 issueType
-                issueSecurityId
+                issueFields {
+                  name
+                  value
+                }
                 disable {
                   integrations
                 }
@@ -59,12 +62,12 @@ query AcsPolicy {
     scope {
       level
       ... on AcsPolicyScopeCluster_v1 {
-				clusters {
+        clusters {
           name
-        }        
+        }
       }
       ... on AcsPolicyScopeNamespace_v1 {
-       	namespaces {
+        namespaces {
           name
           cluster {
             name
@@ -72,7 +75,7 @@ query AcsPolicy {
         }
       }
     }
-	  conditions {
+    conditions {
       policyField
       ... on AcsPolicyConditionsCvss_v1 {
         comparison
@@ -118,6 +121,11 @@ class JiraSeverityPriorityMappingsV1(ConfiguredBaseModel):
     mappings: list[SeverityPriorityMappingV1] = Field(..., alias="mappings")
 
 
+class JiraBoardIssueFieldV1(ConfiguredBaseModel):
+    name: str = Field(..., alias="name")
+    value: str = Field(..., alias="value")
+
+
 class DisableJiraBoardAutomationsV1(ConfiguredBaseModel):
     integrations: Optional[list[str]] = Field(..., alias="integrations")
 
@@ -127,7 +135,7 @@ class JiraBoardV1(ConfiguredBaseModel):
     server: JiraServerV1 = Field(..., alias="server")
     severity_priority_mappings: JiraSeverityPriorityMappingsV1 = Field(..., alias="severityPriorityMappings")
     issue_type: Optional[str] = Field(..., alias="issueType")
-    issue_security_id: Optional[str] = Field(..., alias="issueSecurityId")
+    issue_fields: Optional[list[JiraBoardIssueFieldV1]] = Field(..., alias="issueFields")
     disable: Optional[DisableJiraBoardAutomationsV1] = Field(..., alias="disable")
 
 

reconcile/gql_definitions/introspection.json

@@ -5440,6 +5440,11 @@
                             "name": "MembershipProvider_V1",
                             "ofType": null
                         },
+                        {
+                            "kind": "OBJECT",
+                            "name": "ExternalUser_v1",
+                            "ofType": null
+                        },
                         {
                             "kind": "OBJECT",
                             "name": "GabiInstance_v1",
@@ -13830,6 +13835,151 @@
                     "enumValues": null,
                     "possibleTypes": null
                 },
+                {
+                    "kind": "OBJECT",
+                    "name": "ExternalUser_v1",
+                    "description": null,
+                    "fields": [
+                        {
+                            "name": "schema",
+                            "description": null,
+                            "args": [],
+                            "type": {
+                                "kind": "NON_NULL",
+                                "name": null,
+                                "ofType": {
+                                    "kind": "SCALAR",
+                                    "name": "String",
+                                    "ofType": null
+                                }
+                            },
+                            "isDeprecated": false,
+                            "deprecationReason": null
+                        },
+                        {
+                            "name": "path",
+                            "description": null,
+                            "args": [],
+                            "type": {
+                                "kind": "NON_NULL",
+                                "name": null,
+                                "ofType": {
+                                    "kind": "SCALAR",
+                                    "name": "String",
+                                    "ofType": null
+                                }
+                            },
+                            "isDeprecated": false,
+                            "deprecationReason": null
+                        },
+                        {
+                            "name": "labels",
+                            "description": null,
+                            "args": [],
+                            "type": {
+                                "kind": "SCALAR",
+                                "name": "JSON",
+                                "ofType": null
+                            },
+                            "isDeprecated": false,
+                            "deprecationReason": null
+                        },
+                        {
+                            "name": "name",
+                            "description": null,
+                            "args": [],
+                            "type": {
+                                "kind": "NON_NULL",
+                                "name": null,
+                                "ofType": {
+                                    "kind": "SCALAR",
+                                    "name": "String",
+                                    "ofType": null
+                                }
+                            },
+                            "isDeprecated": false,
+                            "deprecationReason": null
+                        },
+                        {
+                            "name": "github_username",
+                            "description": null,
+                            "args": [],
+                            "type": {
+                                "kind": "SCALAR",
+                                "name": "String",
+                                "ofType": null
+                            },
+                            "isDeprecated": false,
+                            "deprecationReason": null
+                        },
+                        {
+                            "name": "quay_username",
+                            "description": null,
+                            "args": [],
+                            "type": {
+                                "kind": "SCALAR",
+                                "name": "String",
+                                "ofType": null
+                            },
+                            "isDeprecated": false,
+                            "deprecationReason": null
+                        },
+                        {
+                            "name": "sponsors",
+                            "description": null,
+                            "args": [],
+                            "type": {
+                                "kind": "NON_NULL",
+                                "name": null,
+                                "ofType": {
+                                    "kind": "LIST",
+                                    "name": null,
+                                    "ofType": {
+                                        "kind": "NON_NULL",
+                                        "name": null,
+                                        "ofType": {
+                                            "kind": "OBJECT",
+                                            "name": "User_v1",
+                                            "ofType": null
+                                        }
+                                    }
+                                }
+                            },
+                            "isDeprecated": false,
+                            "deprecationReason": null
+                        },
+                        {
+                            "name": "roles",
+                            "description": null,
+                            "args": [],
+                            "type": {
+                                "kind": "LIST",
+                                "name": null,
+                                "ofType": {
+                                    "kind": "NON_NULL",
+                                    "name": null,
+                                    "ofType": {
+                                        "kind": "OBJECT",
+                                        "name": "Role_v1",
+                                        "ofType": null
+                                    }
+                                }
+                            },
+                            "isDeprecated": false,
+                            "deprecationReason": null
+                        }
+                    ],
+                    "inputFields": null,
+                    "interfaces": [
+                        {
+                            "kind": "INTERFACE",
+                            "name": "DatafileObject_v1",
+                            "ofType": null
+                        }
+                    ],
+                    "enumValues": null,
+                    "possibleTypes": null
+                },
                 {
                     "kind": "OBJECT",
                     "name": "CredentialsRequest_v1",
@@ -19225,7 +19375,7 @@
                             "deprecationReason": null
                         },
                         {
-                            "name": "issueSecurityId",
+                            "name": "wontFixResolution",
                             "description": null,
                             "args": [],
                             "type": {
@@ -19237,7 +19387,7 @@
                             "deprecationReason": null
                         },
                         {
-                            "name": "wontFixResolution",
+                            "name": "reopenDuration",
                             "description": null,
                             "args": [],
                             "type": {
@@ -19249,25 +19399,33 @@
                             "deprecationReason": null
                         },
                         {
-                            "name": "reopenDuration",
+                            "name": "disable",
                             "description": null,
                             "args": [],
                             "type": {
-                                "kind": "SCALAR",
-                                "name": "String",
+                                "kind": "OBJECT",
+                                "name": "DisableJiraBoardAutomations_v1",
                                 "ofType": null
                             },
                             "isDeprecated": false,
                             "deprecationReason": null
                         },
                         {
-                            "name": "disable",
+                            "name": "issueFields",
                             "description": null,
                             "args": [],
                             "type": {
-                                "kind": "OBJECT",
-                                "name": "DisableJiraBoardAutomations_v1",
-                                "ofType": null
+                                "kind": "LIST",
+                                "name": null,
+                                "ofType": {
+                                    "kind": "NON_NULL",
+                                    "name": null,
+                                    "ofType": {
+                                        "kind": "OBJECT",
+                                        "name": "JiraBoardIssueField_v1",
+                                        "ofType": null
+                                    }
+                                }
                             },
                             "isDeprecated": false,
                             "deprecationReason": null
@@ -19734,6 +19892,49 @@
                     "enumValues": null,
                     "possibleTypes": null
                 },
+                {
+                    "kind": "OBJECT",
+                    "name": "JiraBoardIssueField_v1",
+                    "description": null,
+                    "fields": [
+                        {
+                            "name": "name",
+                            "description": null,
+                            "args": [],
+                            "type": {
+                                "kind": "NON_NULL",
+                                "name": null,
+                                "ofType": {
+                                    "kind": "SCALAR",
+                                    "name": "String",
+                                    "ofType": null
+                                }
+                            },
+                            "isDeprecated": false,
+                            "deprecationReason": null
+                        },
+                        {
+                            "name": "value",
+                            "description": null,
+                            "args": [],
+                            "type": {
+                                "kind": "NON_NULL",
+                                "name": null,
+                                "ofType": {
+                                    "kind": "SCALAR",
+                                    "name": "String",
+                                    "ofType": null
+                                }
+                            },
+                            "isDeprecated": false,
+                            "deprecationReason": null
+                        }
+                    ],
+                    "inputFields": null,
+                    "interfaces": [],
+                    "enumValues": null,
+                    "possibleTypes": null
+                },
                 {
                     "kind": "OBJECT",
                     "name": "AcsPolicy_v1",
@@ -27249,145 +27450,6 @@
                         }
                     ]
                 },
-                {
-                    "kind": "OBJECT",
-                    "name": "ExternalUser_v1",
-                    "description": null,
-                    "fields": [
-                        {
-                            "name": "schema",
-                            "description": null,
-                            "args": [],
-                            "type": {
-                                "kind": "NON_NULL",
-                                "name": null,
-                                "ofType": {
-                                    "kind": "SCALAR",
-                                    "name": "String",
-                                    "ofType": null
-                                }
-                            },
-                            "isDeprecated": false,
-                            "deprecationReason": null
-                        },
-                        {
-                            "name": "path",
-                            "description": null,
-                            "args": [],
-                            "type": {
-                                "kind": "NON_NULL",
-                                "name": null,
-                                "ofType": {
-                                    "kind": "SCALAR",
-                                    "name": "String",
-                                    "ofType": null
-                                }
-                            },
-                            "isDeprecated": false,
-                            "deprecationReason": null
-                        },
-                        {
-                            "name": "labels",
-                            "description": null,
-                            "args": [],
-                            "type": {
-                                "kind": "SCALAR",
-                                "name": "JSON",
-                                "ofType": null
-                            },
-                            "isDeprecated": false,
-                            "deprecationReason": null
-                        },
-                        {
-                            "name": "name",
-                            "description": null,
-                            "args": [],
-                            "type": {
-                                "kind": "NON_NULL",
-                                "name": null,
-                                "ofType": {
-                                    "kind": "SCALAR",
-                                    "name": "String",
-                                    "ofType": null
-                                }
-                            },
-                            "isDeprecated": false,
-                            "deprecationReason": null
-                        },
-                        {
-                            "name": "github_username",
-                            "description": null,
-                            "args": [],
-                            "type": {
-                                "kind": "SCALAR",
-                                "name": "String",
-                                "ofType": null
-                            },
-                            "isDeprecated": false,
-                            "deprecationReason": null
-                        },
-                        {
-                            "name": "quay_username",
-                            "description": null,
-                            "args": [],
-                            "type": {
-                                "kind": "SCALAR",
-                                "name": "String",
-                                "ofType": null
-                            },
-                            "isDeprecated": false,
-                            "deprecationReason": null
-                        },
-                        {
-                            "name": "sponsors",
-                            "description": null,
-                            "args": [],
-                            "type": {
-                                "kind": "NON_NULL",
-                                "name": null,
-                                "ofType": {
-                                    "kind": "LIST",
-                                    "name": null,
-                                    "ofType": {
-                                        "kind": "NON_NULL",
-                                        "name": null,
-                                        "ofType": {
-                                            "kind": "OBJECT",
-                                            "name": "User_v1",
-                                            "ofType": null
-                                        }
-                                    }
-                                }
-                            },
-                            "isDeprecated": false,
-                            "deprecationReason": null
-                        },
-                        {
-                            "name": "roles",
-                            "description": null,
-                            "args": [],
-                            "type": {
-                                "kind": "LIST",
-                                "name": null,
-                                "ofType": {
-                                    "kind": "NON_NULL",
-                                    "name": null,
-                                    "ofType": {
-                                        "kind": "OBJECT",
-                                        "name": "Role_v1",
-                                        "ofType": null
-                                    }
-                                }
-                            },
-                            "isDeprecated": false,
-                            "deprecationReason": null
-                        }
-                    ],
-                    "inputFields": null,
-                    "interfaces": [],
-                    "enumValues": null,
-                    "possibleTypes": null
-                },
                 {
                     "kind": "OBJECT",
                     "name": "AWSVPC_v1",

reconcile/gql_definitions/jira_permissions_validator/jira_boards_for_permissions_validator.py

@@ -41,7 +41,10 @@ query JiraBoardsForPermissionValidation {
     issueType
     issueResolveState
     issueReopenState
-    issueSecurityId
+    issueFields {
+      name
+      value
+    }
     severityPriorityMappings {
       name
       mappings {
@@ -73,6 +76,11 @@ class JiraServerV1(ConfiguredBaseModel):
     token: VaultSecret = Field(..., alias="token")
 
 
+class JiraBoardIssueFieldV1(ConfiguredBaseModel):
+    name: str = Field(..., alias="name")
+    value: str = Field(..., alias="value")
+
+
 class SeverityPriorityMappingV1(ConfiguredBaseModel):
     priority: str = Field(..., alias="priority")
 
@@ -102,7 +110,7 @@ class JiraBoardV1(ConfiguredBaseModel):
     issue_type: Optional[str] = Field(..., alias="issueType")
     issue_resolve_state: Optional[str] = Field(..., alias="issueResolveState")
     issue_reopen_state: Optional[str] = Field(..., alias="issueReopenState")
-    issue_security_id: Optional[str] = Field(..., alias="issueSecurityId")
+    issue_fields: Optional[list[JiraBoardIssueFieldV1]] = Field(..., alias="issueFields")
     severity_priority_mappings: JiraSeverityPriorityMappingsV1 = Field(..., alias="severityPriorityMappings")
     escalation_policies: Optional[list[AppEscalationPolicyV1]] = Field(..., alias="escalationPolicies")
     disable: Optional[DisableJiraBoardAutomationsV1] = Field(..., alias="disable")

reconcile/jira_permissions_validator.py

@@ -56,7 +56,7 @@ class ValidationError(IntFlag):
     CANT_TRANSITION_ISSUES = auto()
     INVALID_ISSUE_TYPE = auto()
     INVALID_ISSUE_STATE = auto()
-    INVALID_SECURITY_LEVEL = auto()
+    INVALID_ISSUE_FIELD = auto()
     INVALID_PRIORITY = auto()
     PERMISSION_ERROR = auto()
     PUBLIC_PROJECT_NO_SECURITY_LEVEL = auto()
@@ -64,6 +64,9 @@ class ValidationError(IntFlag):
     PROJECT_ARCHIVED = auto()
 
 
+CustomIssueFields = dict[str, dict[str, str]]
+
+
 class RunnerParams(TypedDict):
     boards: list[JiraBoardV1]
     board_check_interval_sec: int
@@ -81,12 +84,14 @@ def board_is_valid(
     default_reopen_state: str,
     jira_server_priorities: NameToIdMap,
     public_projects: Iterable[str],
-) -> ValidationError:
+) -> tuple[ValidationError, CustomIssueFields]:
     error = ValidationError(0)
+    custom_fields: CustomIssueFields = {}
+
     try:
         if jira.is_archived:
             logging.error(f"[{board.name}] project is archived")
-            return ValidationError.PROJECT_ARCHIVED
+            return ValidationError.PROJECT_ARCHIVED, custom_fields
 
         if not jira.can_create_issues():
             logging.error(f"[{board.name}] can not create issues in project")
@@ -109,54 +114,71 @@ def board_is_valid(
                 error |= ValidationError.INVALID_COMPONENT
 
         issue_type = board.issue_type or default_issue_type
-        project_issue_types = jira.project_issue_types()
-        project_issue_types_str = [i.name for i in project_issue_types]
-        if issue_type not in project_issue_types_str:
-            logging.error(
-                f"[{board.name}] {issue_type} is not a valid issue type in project. Valid issue types: {project_issue_types_str}"
+        project_issue_type = jira.get_issue_type(issue_type)
+        if not project_issue_type:
+            project_issue_types_str = ", ".join(
+                t.name for t in jira.project_issue_types()
             )
-            error |= ValidationError.INVALID_ISSUE_TYPE
-
-        available_states = []
-        for project_issue_type in project_issue_types:
-            if issue_type == project_issue_type.name:
-                available_states = project_issue_type.statuses
-                break
-
-        if not available_states:
             logging.error(
-                f"[{board.name}] {issue_type} doesn't have any status. Choose a different issue type."
+                f"[{board.name}] '{issue_type}' is not a valid issue type in project. Valid issue types: {project_issue_types_str}"
             )
             error |= ValidationError.INVALID_ISSUE_TYPE
 
-        reopen_state = board.issue_reopen_state or default_reopen_state
-        if reopen_state.lower() not in [t.lower() for t in available_states]:
-            logging.error(
-                f"[{board.name}] '{reopen_state}' is not a valid state in project. Valid states: {available_states}"
-            )
-            error |= ValidationError.INVALID_ISSUE_STATE
+        if project_issue_type:
+            # Check issue attributes
+            if not project_issue_type.statuses:
+                logging.error(
+                    f"[{board.name}] '{issue_type}' doesn't have any status. Choose a different issue type."
+                )
+                error |= ValidationError.INVALID_ISSUE_TYPE
 
-        if board.issue_resolve_state and board.issue_resolve_state.lower() not in [
-            t.lower() for t in available_states
-        ]:
-            logging.error(
-                f"[{board.name}] '{board.issue_resolve_state}' is not a valid state in project. Valid states: {available_states}"
-            )
-            error |= ValidationError.INVALID_ISSUE_STATE
+            reopen_state = board.issue_reopen_state or default_reopen_state
+            if reopen_state.lower() not in [
+                t.lower() for t in project_issue_type.statuses
+            ]:
+                logging.error(
+                    f"[{board.name}] '{reopen_state}' is not a valid state in project. Valid states: {project_issue_type.statuses}"
+                )
+                error |= ValidationError.INVALID_ISSUE_STATE
 
-        if board.issue_security_id:
-            security_levels = jira.security_levels()
-            if board.issue_security_id not in [level.id for level in security_levels]:
+            if board.issue_resolve_state and board.issue_resolve_state.lower() not in [
+                t.lower() for t in project_issue_type.statuses
+            ]:
                 logging.error(
-                    f"[{board.name}] {board.issue_security_id} is not a valid security level in project. Valid security ids: "
-                    + ", ".join([
-                        f"{level.name} - {level.id}" for level in jira.security_levels()
-                    ])
+                    f"[{board.name}] '{board.issue_resolve_state}' is not a valid state in project. Valid states: {project_issue_type.statuses}"
                 )
-                error |= ValidationError.INVALID_SECURITY_LEVEL
-        elif board.name in public_projects:
+                error |= ValidationError.INVALID_ISSUE_STATE
+
+            for field in board.issue_fields or []:
+                project_issue_field = jira.project_issue_field(
+                    issue_type_id=project_issue_type.id, field=field.name
+                )
+                if not project_issue_field:
+                    logging.error(
+                        f"[{board.name}] '{field.name}' is not a valid field for '{project_issue_type.name}' in this project."
+                    )
+
+                    error |= ValidationError.INVALID_ISSUE_FIELD
+                    continue
+
+                for option in project_issue_field.options:
+                    if option == field.value:
+                        # cache the field id and option value/name for later use, e.g. in jiralert templates
+                        custom_fields[project_issue_field.id] = option.dict()
+                        break
+                else:
+                    # field.value is not in the allowed options
+                    logging.error(
+                        f"[{board.name}] '{field.name}' has an invalid value '{field.value}'. Valid values: {project_issue_field.options}"
+                    )
+                    error |= ValidationError.INVALID_ISSUE_FIELD
+                    continue
+
+        if board.name in public_projects and "Security Level" not in [
+            f.name for f in board.issue_fields or []
+        ]:
             logging.error(
-                f"[{board.name}] is a public project, but no security level is defined."
+                f"[{board.name}] is a public project, but the security level is not defined. Please add 'Security Level' field to the issueFields!"
             )
             error |= ValidationError.PUBLIC_PROJECT_NO_SECURITY_LEVEL
 
@@ -192,7 +214,7 @@ def board_is_valid(
         else:
             raise
 
-    return error
+    return error, custom_fields
 
 
 def validate_boards(
@@ -231,7 +253,7 @@ def validate_boards(
         jira = jira_clients[board.server.server_url]
         jira.project = board.name
         try:
-            error_flags = board_is_valid(
+            error_flags, custom_fields = board_is_valid(
                 jira=jira,
                 board=board,
                 default_issue_type=default_issue_type,
@@ -271,6 +293,9 @@ def validate_boards(
                         error = True
                 case _:
                     error = True
+
+            # cache the field ids for later use, e.g. in jiralert templates
+            state[f"{board.name}-ids"] = custom_fields
         except Exception as e:
             logging.error(f"[{board.name}] {e}")
             error = True

reconcile/utils/acs/notifiers.py

@@ -82,8 +82,10 @@ class JiraNotifier(BaseModel):
         jira_board = escalation_policy.channels.jira_board[0]
 
         custom_fields: dict[str, Any] = {}
-        if jira_board.issue_security_id:
-            custom_fields["security"] = {"id": jira_board.issue_security_id}
+        for field in jira_board.issue_fields or []:
+            if field.name == "Security Level":
+                custom_fields["security"] = {"name": field.value}
+
         if escalation_policy.channels.jira_component:
             custom_fields["components"] = [
                 {"name": escalation_policy.channels.jira_component}

reconcile/utils/jira_client.py

@@ -16,6 +16,8 @@ from jira import (
     Issue,
 )
 from jira.client import ResultList
+from jira.resources import CustomFieldOption as JiraCustomFieldOption
+from jira.resources import Resource
 from pydantic import BaseModel
 
 from reconcile.utils.secret_reader import SecretReader
@@ -26,13 +28,6 @@ class JiraWatcherSettings(Protocol):
     connect_timeout: int
 
 
-class SecurityLevel(BaseModel):
-    """Jira security level."""
-
-    id: str
-    name: str
-
-
 class Priority(BaseModel):
     """Jira priority."""
 
@@ -48,6 +43,50 @@ class IssueType(BaseModel):
     statuses: list[str]
 
 
+class FieldOption(BaseModel):
+    """A standard buildin issue field option."""
+
+    name: str
+
+    def __eq__(self, value: Any) -> bool:
+        """Compare the field option with a string value."""
+        if isinstance(value, str):
+            return self.name == value
+        return False
+
+    def __str__(self) -> str:
+        return self.name
+
+    def __repr__(self) -> str:
+        return self.__str__()
+
+
+class CustomFieldOption(BaseModel):
+    """A custom issue field option."""
+
+    value: str
+
+    def __eq__(self, value: Any) -> bool:
+        """Compare the custom field option with a string value."""
+        if isinstance(value, str):
+            return self.value == value
+        return False
+
+    def __str__(self) -> str:
+        return self.value
+
+    def __repr__(self) -> str:
+        return self.__str__()
+
+
+class IssueField(BaseModel):
+    """Jira issue field."""
+
+    id: str
+    name: str
+    options: list[FieldOption | CustomFieldOption]
+
+
 class JiraClient:
     """Wrapper around Jira client."""
 
@@ -86,6 +125,8 @@ class JiraClient:
         self.priorities = functools.lru_cache(maxsize=None)(self._priorities)
         self.public_projects = functools.lru_cache(maxsize=None)(self._public_projects)
         self.my_permissions = functools.lru_cache(maxsize=None)(self._my_permissions)
+        self.project_issue_types = functools.cache(self._project_issue_types)
+        self.project_issue_fields = functools.cache(self._project_issue_fields)
 
     def _deprecated_init(
         self, jira_board: Mapping[str, Any], settings: Mapping | None
@@ -199,19 +240,63 @@ class JiraClient:
     def can_transition_issues(self) -> bool:
         return self.can_i("TRANSITION_ISSUES")
 
-    def project_issue_types(self) -> list[IssueType]:
+    def _project_issue_types(self, project: str) -> list[IssueType]:
+        # Don't use self.project here, because of function.cache usage
         return [
             IssueType(id=t.id, name=t.name, statuses=[s.name for s in t.statuses])
-            for t in self.jira.issue_types_for_project(self.project)
+            for t in self.jira.issue_types_for_project(project)
+        ]
+
+    def get_issue_type(self, issue_type: str) -> IssueType | None:
+        for _issue_type in self.project_issue_types(self.project):
+            if _issue_type.name == issue_type:
+                return _issue_type
+        return None
+
+    @staticmethod
+    def _get_allowed_issue_field_options(
+        allowed_values: list[Resource],
+    ) -> list[FieldOption | CustomFieldOption]:
+        """Return a list of allowed values for a field."""
+        return [
+            CustomFieldOption(value=v.value)
+            if isinstance(v, JiraCustomFieldOption)
+            else FieldOption(name=v.name)
+            for v in allowed_values
+        ]
+
+    def _project_issue_fields(
+        self, project: str, issue_type_id: str
+    ) -> list[IssueField]:
+        """Return all available issue fields for the project.
+
+        This API endpoint needs createIssue project permissions.
+        """
+        # Don't use self.project here, because of function.cache usage
+        return [
+            IssueField(
+                name=field.name,
+                id=field.fieldId,
+                options=self._get_allowed_issue_field_options(
+                    getattr(field, "allowedValues", [])
+                ),
+            )
+            for field in self.jira.project_issue_fields(
+                project=project, issue_type=issue_type_id, maxResults=9999
+            )
         ]
 
-    def security_levels(self) -> list[SecurityLevel]:
-        """Return a list of all available security levels for the project.
+    def project_issue_field(self, issue_type_id: str, field: str) -> IssueField | None:
+        """Return a issue field for the project if it exists.
 
-        This API endpoint needs admin/owner project permissions.
+        This API endpoint needs createIssue project permissions.
         """
-        scheme = self.jira.project_issue_security_level_scheme(self.project)
-        return [SecurityLevel(id=level.id, name=level.name) for level in scheme.levels]
+        for _field in self.project_issue_fields(
+            project=self.project, issue_type_id=issue_type_id
+        ):
+            if _field.name == field:
+                return _field
+        return None
 
     def _priorities(self) -> list[Priority]:
         """Return a list of all available Jira priorities."""