Merge pull request #32895 from vespa-engine/bjormel/atlassian-jsm

Atlassian jsm maintaining customers and organizations
vespa-engine · Nov 21, 2024 · 3d8c7c5 · 3d8c7c5
2 parents bc473cd + a47a6ff
commit 3d8c7c5
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 0 deletions.
diff --git a/flags/src/main/java/com/yahoo/vespa/flags/Flags.java b/flags/src/main/java/com/yahoo/vespa/flags/Flags.java
@@ -398,6 +398,12 @@ public class Flags {
             "Whether to sync tenants to HubSpot",
             "Takes effect immediately");
 
+    public static UnboundBooleanFlag ATLASSIAN_SYNC_TENANTS = defineFeatureFlag(
+            "atlassian-sync-tenants", false,
+            List.of("bjormel"), "2024-11-11", "2025-01-01",
+            "Whether to sync tenants to Atlassian",
+            "Takes effect immediately");
+
     public static final UnboundBooleanFlag SYMMETRIC_PUT_AND_ACTIVATE_REPLICA_SELECTION = defineFeatureFlag(
             "symmetric-put-and-activate-replica-selection", false,
             List.of("vekterli"), "2024-05-23", "2024-12-01",

diff --git a/metrics/src/main/java/ai/vespa/metrics/ControllerMetrics.java b/metrics/src/main/java/ai/vespa/metrics/ControllerMetrics.java
@@ -53,6 +53,8 @@ public enum ControllerMetrics implements VespaMetrics {
     HUBSPOT_EXCEPTIONS("hubspot.exceptions", Unit.FAILURE, "Controller: Hubspot exceptions"),
     HUBSPOT_LAST_SUCCESS("hubspot.last_success", Unit.SECONDS_SINCE_EPOCH, "Controller: Last successful Hubspot synchronization"),
     TENANT_CREATED_LAST_SUCCESS("tenant.created.last_success", Unit.SECONDS_SINCE_EPOCH, "Controller: Last successful tenant creation"),
+    ATLASSIAN_EXCEPTIONS("atlassian.exceptions", Unit.FAILURE, "Controller: Atlassian exceptions"),
+    ATLASSIAN_LAST_SUCCESS("atlassian.last_success", Unit.SECONDS_SINCE_EPOCH, "Controller: Last successful Atlassian synchronization"),
 
     // Metrics per API, metrics names generated in ControllerMaintainer/MetricsReporter
     OPERATION_APPLICATION("operation.application", Unit.REQUEST, "Controller: Requests for /application API"),

diff --git a/metrics/src/main/java/ai/vespa/metrics/set/InfrastructureMetricSet.java b/metrics/src/main/java/ai/vespa/metrics/set/InfrastructureMetricSet.java
@@ -210,6 +210,9 @@ private static Set<Metric> getControllerMetrics() {
 
         addMetric(metrics, ControllerMetrics.TENANT_CREATED_LAST_SUCCESS.last());
 
+        addMetric(metrics, ControllerMetrics.ATLASSIAN_EXCEPTIONS.count());
+        addMetric(metrics, ControllerMetrics.ATLASSIAN_LAST_SUCCESS.last());
+
         return metrics;
     }