Sasjobsfixes (#705)

CHANGELOG.md

@@ -1,6 +1,7 @@
 # SAS Viya Monitoring for Kubernetes
 
 ## Unreleased
+
 * **Logging**
   * [SECURITY] Fluent Bit log collecting pods no longer run as `root` user.  In addition, the database used to
 maintain state information for the log collector has moved to a hostPath volume and been renamed. A new initContainer
@@ -16,6 +17,11 @@ deployment process.
   * [SECURITY] On OpenShift, all Fluent Bit pods now use custom SCC objects to support changes described above.
   * [CHANGE] Improved handling of long log messages and those from some Crunchy Data pods
 
+* **Metrics**
+  * [FIX] Rule defintion for `:sas_launcher_pod_info:` updated to: support multiple SAS Viya deployments
+running in same cluster and address a data problem seen on OpenShift when there is a significant delay (> 1s)
+between when a pod being created and it being assigned an IP address.
+
 
 ## Version 1.2.32 (09DEC2024)
 * **Overall**

monitoring/rules/viya/rules-sas-launcher-job.yaml

@@ -9,7 +9,7 @@ spec:
   - name: sas-launcher-job-info.rules
     interval: 6s
     rules:
-    - expr: sum((label_replace(kube_pod_labels{label_sas_com_created_by="sas-launcher"},"job_pod","$1","pod","(.+)") * on (job_pod) group_left(job_name,queue_name) sas_job_info{}) * on (pod) group_left(node) kube_pod_info{}) without (container, endpoint, instance, job, service)
+    - expr: sum((label_replace(kube_pod_labels{label_sas_com_created_by="sas-launcher"},"job_pod","$1","pod","(.+)") * on (job_pod) group_left(job_name,queue_name) sas_job_info{}) * on (namespace,pod) group_left(node) kube_pod_info{pod_ip!="",host_ip!=""}) without(container, endpoint, instance, job, service)
       record: ':sas_launcher_pod_info:'
     - expr: sum(:sas_launcher_pod_info:* on (namespace, pod) group_left(phase) (kube_pod_status_phase{}==1)) without (endpoint,instance,job,service)
       record: ':sas_launcher_pod_status:'