Merge pull request #657 from saagie/SDKTECHNO-268

add SUM_MAX_INSTANCES_FETCHED
saagie · Sep 13, 2024 · bf3a06f · bf3a06f
2 parents b6afa94 + 96b13de
commit bf3a06f
Show file tree

Hide file tree

Showing 9 changed files with 30 additions and 21 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -24,7 +24,7 @@ plugins {
     id("net.thauvin.erik.gradle.semver") version "1.0.4"
     id("com.bmuschko.docker-remote-api") version "6.1.1"
     id("org.kordamp.gradle.project") version "0.54.0"
-    id("com.saagie.technologies") version "1.3.17"
+    id("com.saagie.technologies") version "1.3.18"
 }
 
 apply<SaagieTechnologiesPackageGradlePlugin>()

diff --git a/technologies/app/saagie-usage-monitoring/README.md b/technologies/app/saagie-usage-monitoring/README.md
@@ -18,8 +18,9 @@ To deploy Saagie Usage Monitoring on your platform, you need to create a user wi
   - `SAAGIE_AND_S3` if you want to monitor Saagie and S3 buckets
 - IP_HDFS (Required if MONITORING_OPT=`SAAGIE_AND_DATALAKE`) : Namenode IP
 - AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY, AWS_S3_ENDPOINT and AWS_REGION_NAME (Required if MONITORING_OPT=`SAAGIE_AND_S3`)
-- SAAGIE_SUM_CRON : Cron to collect Saagie informations on API (Optionnal, Default value : `0 * * * *`)
+- SAAGIE_SUM_CRON : Cron to collect Saagie informations on API (Default value : `0 * * * *`)
 - REQUEST_TIMEOUT : Manage SaagieAPI request timeout (Default value in seconds : `10`)
+- SUM_MAX_INSTANCES_FETCHED : Number of instances recovered, for jobs and pipelines (Default value : `1000`)
 
 For an external Postgres database : 
 - SAAGIE_PG_HOST : Postgresql host (Default value : `localhost`)

diff --git a/technologies/app/saagie-usage-monitoring/metadata.yaml b/technologies/app/saagie-usage-monitoring/metadata.yaml
@@ -19,8 +19,9 @@ contexts:
   - id: saagie-usage-monitoring-2023-02
     label: For Saagie 2023.02
     releaseNotes: ""
-    available: true
-    trustLevel: stable
+    available: false
+    trustLevel: deprecated
+    deprecationDate: "2024-09-10T00:00:00Z"
     ports:
       - port: 80
         name: saagie-usage-monitoring
@@ -37,8 +38,9 @@ contexts:
   - id: saagie-usage-monitoring-2023-03
     label: For Saagie 2023.03
     releaseNotes: ""
-    available: true
-    trustLevel: stable
+    available: false
+    trustLevel: deprecated
+    deprecationDate: "2024-09-10T00:00:00Z"
     ports:
       - port: 80
         name: saagie-usage-monitoring
@@ -55,8 +57,9 @@ contexts:
   - id: saagie-usage-monitoring-2023-04
     label: For Saagie 2023.04
     releaseNotes: ""
-    available: true
-    trustLevel: stable
+    available: false
+    trustLevel: deprecated
+    deprecationDate: "2024-09-10T00:00:00Z"
     ports:
       - port: 80
         name: saagie-usage-monitoring
@@ -91,8 +94,9 @@ contexts:
   - id: saagie-usage-monitoring-3.0
     label: For Saagie 3.x
     releaseNotes: ""
-    available: true
-    trustLevel: stable
+    available: false
+    trustLevel: deprecated
+    deprecationDate: "2024-09-10T00:00:00Z"
     ports:
       - port: 80
         name: saagie-usage-monitoring

diff --git a/technologies/app/saagie-usage-monitoring/saagie-usage-monitoring-2023.02/context.yaml b/technologies/app/saagie-usage-monitoring/saagie-usage-monitoring-2023.02/context.yaml
@@ -1,8 +1,9 @@
 id: saagie-usage-monitoring-2023-02
 label: For Saagie 2023.02
 releaseNotes: ""
-available: true
-trustLevel: stable
+available: false
+trustLevel: deprecated
+deprecationDate: "2024-09-10T00:00:00Z"
 ports:
   - port: 80
     name: saagie-usage-monitoring

diff --git a/technologies/app/saagie-usage-monitoring/saagie-usage-monitoring-2023.03/context.yaml b/technologies/app/saagie-usage-monitoring/saagie-usage-monitoring-2023.03/context.yaml
@@ -1,8 +1,9 @@
 id: saagie-usage-monitoring-2023-03
 label: For Saagie 2023.03
 releaseNotes: ""
-available: true
-trustLevel: stable
+available: false
+trustLevel: deprecated
+deprecationDate: "2024-09-10T00:00:00Z"
 ports:
   - port: 80
     name: saagie-usage-monitoring

diff --git a/technologies/app/saagie-usage-monitoring/saagie-usage-monitoring-2023.04/context.yaml b/technologies/app/saagie-usage-monitoring/saagie-usage-monitoring-2023.04/context.yaml
@@ -1,8 +1,9 @@
 id: saagie-usage-monitoring-2023-04
 label: For Saagie 2023.04
 releaseNotes: ""
-available: true
-trustLevel: stable
+available: false
+trustLevel: deprecated
+deprecationDate: "2024-09-10T00:00:00Z"
 ports:
   - port: 80
     name: saagie-usage-monitoring

diff --git a/technologies/app/saagie-usage-monitoring/saagie-usage-monitoring-2023.05/code/utils.py b/technologies/app/saagie-usage-monitoring/saagie-usage-monitoring-2023.05/code/utils.py
@@ -30,7 +30,7 @@
 timeout = int(os.environ["REQUEST_TIMEOUT"])
 
 # Workaround for platforms with too many instances
-MAX_INSTANCES_FETCHED = os.environ.get("SMT_MAX_INSTANCES_FETCHED", 1000)
+MAX_INSTANCES_FETCHED = os.environ.get("SUM_MAX_INSTANCES_FETCHED", 1000)
 
 
 class SaagieUtils(object):

diff --git a/technologies/app/saagie-usage-monitoring/saagie-usage-monitoring-3.0/context.yaml b/technologies/app/saagie-usage-monitoring/saagie-usage-monitoring-3.0/context.yaml
@@ -1,8 +1,9 @@
 id: saagie-usage-monitoring-3.0
 label: For Saagie 3.x
 releaseNotes: ""
-available: true
-trustLevel: stable
+available: false
+trustLevel: deprecated
+deprecationDate: "2024-09-10T00:00:00Z"
 ports:
   - port: 80
     name: saagie-usage-monitoring

diff --git a/version.properties b/version.properties
@@ -1,6 +1,6 @@
-version.buildmeta=
+version.buildmeta=SDKTECHNO-268
 version.major=1
 version.minor=189
 version.patch=0
 version.prerelease=
-version.semver=1.189.0
+version.semver=1.189.0+SDKTECHNO-268