Merge branch 'main' into aws/port-11555

port-labs · Jan 13, 2025 · 0c5db5d · 0c5db5d
2 parents 7246b49 + 068cd17
commit 0c5db5d
Show file tree

Hide file tree

Showing 12 changed files with 588 additions and 130 deletions.
diff --git a/integrations/dynatrace/.port/spec.yaml b/integrations/dynatrace/.port/spec.yaml
@@ -4,7 +4,7 @@ icon: Dynatrace
 docs: https://docs.getport.io/build-your-software-catalog/sync-data-to-catalog/apm-alerting/dynatrace
 features:
   - type: exporter
-    section: Incident Management
+    section: APM & Alerting
     resources:
       - kind: problem
       - kind: slo

diff --git a/integrations/dynatrace/CHANGELOG.md b/integrations/dynatrace/CHANGELOG.md
@@ -7,6 +7,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 <!-- towncrier release notes start -->
 
+## 0.1.87 (2025-01-13)
+
+
+### Improvements
+
+- Changed section to APM & Alerting
+
+
 ## 0.1.86 (2025-01-12)
 
 

diff --git a/integrations/dynatrace/pyproject.toml b/integrations/dynatrace/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "dynatrace"
-version = "0.1.86"
+version = "0.1.87"
 description = "An integration used to import Dynatrace resources into Port"
 authors = ["Ayodeji Adeoti <<ayodeji.adeoti@getport.io>>"]
 

diff --git a/integrations/jira/.port/resources/blueprints.json b/integrations/jira/.port/resources/blueprints.json
@@ -21,6 +21,47 @@
     },
     "calculationProperties": {}
   },
+  {
+    "identifier": "jiraTeam",
+    "title": "Jira Team",
+    "icon": "Users",
+    "description": "A team within the organization",
+    "schema": {
+      "properties": {
+        "organizationId": {
+          "title": "Organization ID",
+          "type": "string",
+          "description": "Unique identifier for the parent organization"
+        },
+        "teamType": {
+          "title": "Team Type",
+          "type": "string",
+          "description": "Type of team (e.g., MEMBER_INVITE)",
+          "enum": [
+            "MEMBER_INVITE",
+            "OPEN"
+          ]
+        },
+        "description": {
+          "title": "Description",
+          "type": "string",
+          "description": "Team description"
+        }
+      }
+    },
+    "relations": {
+      "members": {
+        "target": "jiraUser",
+        "title": "Users",
+        "description": "The Jira users belonging to this team",
+        "required": false,
+        "many": true
+      }
+    },
+    "mirrorProperties": {},
+    "calculationProperties": {},
+    "aggregationProperties": {}
+  },
   {
     "identifier": "jiraUser",
     "title": "Jira User",
@@ -34,11 +75,6 @@
           "format": "email",
           "description": "User's email address"
         },
-        "displayName": {
-          "title": "Display Name",
-          "type": "string",
-          "description": "User's full name as displayed in Jira"
-        },
         "active": {
           "title": "Active Status",
           "type": "boolean",
@@ -67,10 +103,10 @@
         }
       }
     },
+    "relations": {},
     "mirrorProperties": {},
     "calculationProperties": {},
-    "aggregationProperties": {},
-    "relations": {}
+    "aggregationProperties": {}
   },
   {
     "identifier": "jiraIssue",
@@ -182,4 +218,4 @@
       }
     }
   }
-]
+]
diff --git a/integrations/jira/.port/resources/port-app-config.yaml b/integrations/jira/.port/resources/port-app-config.yaml
@@ -25,13 +25,29 @@ resources:
           blueprint: '"jiraUser"'
           properties:
             emailAddress: .emailAddress
-            displayName: .displayName
             active: .active
             accountType: .accountType
             timeZone: .timeZone
             locale: .locale
             avatarUrl: .avatarUrls["48x48"]
 
+  - kind: team
+    selector:
+      query: "true"
+      includeMembers: true
+    port:
+      entity:
+        mappings:
+          identifier: .teamId
+          title: .displayName
+          blueprint: '"jiraTeam"'
+          properties:
+            organizationId: .organizationId
+            teamType: .teamType
+            description: .description
+          relations:
+            members: if .__members != null then .__members | map(.accountId) else [] end
+
   - kind: issue
     selector:
       query: "true"
@@ -59,3 +75,4 @@ resources:
             subtasks: .fields.subtasks | map(.key)
             assignee: .fields.assignee.accountId // ""
             reporter: .fields.reporter.accountId
+
diff --git a/integrations/jira/.port/spec.yaml b/integrations/jira/.port/spec.yaml
@@ -8,6 +8,7 @@ features:
     resources:
       - kind: project
       - kind: issue
+      - kind: team
       - kind: user
 configurations:
   - name: appHost
@@ -28,6 +29,11 @@ configurations:
     type: string
     description: You can configure the user token on the <a target="_blank" href="https://id.atlassian.com/manage-profile/security/api-tokens">Atlassian account page</a>
     sensitive: true
+  - name: atlassianOrganizationId
+    required: false
+    type: string
+    description: To sync teams and team members your Atlassian Organization ID is required . Read <a target="_blank" href="https://confluence.atlassian.com/jirakb/what-it-is-the-organization-id-and-where-to-find-it-1207189876.html">How to find your Atlassian Organization ID</a>
+    sensitive: false
 saas:
   enabled: true
   oauthConfiguration:

diff --git a/integrations/jira/CHANGELOG.md b/integrations/jira/CHANGELOG.md
@@ -6,6 +6,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 <!-- towncrier release notes start -->
+## 0.2.20 (2025-1-13)
+
+
+### Improvements
+
+- Added support to sync Jira teams to Port
 
 ## 0.2.19 (2025-01-12)
 
@@ -974,4 +980,4 @@ v## 0.1.0 (2023-08-10)
 
 ### Features
 
-- Added Jira integration with support for projects and issues (PORT-4410)
+- Added Jira integration with support for projects and issues (PORT-4410)