From 9462fe5d9f9c215d80c4e37979928d85235de262 Mon Sep 17 00:00:00 2001
From: Kylian Serrania <kylian.serrania@datadoghq.com>
Date: Mon, 19 Jul 2021 17:48:13 +0200
Subject: [PATCH] Remove superfluous and costly JobsInJobQueueInfo query

---
 ibm_i/datadog_checks/ibm_i/check.py   |  1 -
 ibm_i/datadog_checks/ibm_i/queries.py | 19 -------------------
 2 files changed, 20 deletions(-)

diff --git a/ibm_i/datadog_checks/ibm_i/check.py b/ibm_i/datadog_checks/ibm_i/check.py
index 3d5a044a9b9ff..2be3aa0b601e0 100644
--- a/ibm_i/datadog_checks/ibm_i/check.py
+++ b/ibm_i/datadog_checks/ibm_i/check.py
@@ -125,7 +125,6 @@ def set_up_query_manager(self):
                 queries.ActiveJobStatus,
                 queries.JobMemoryUsage,
                 queries.MemoryInfo,
-                queries.JobsInJobQueueInfo,
                 queries.JobQueueInfo,
                 queries.get_message_queue_info(self.config.severity_threshold),
             ]
diff --git a/ibm_i/datadog_checks/ibm_i/queries.py b/ibm_i/datadog_checks/ibm_i/queries.py
index 4d3fb7eca6190..2b427bacc2d8a 100644
--- a/ibm_i/datadog_checks/ibm_i/queries.py
+++ b/ibm_i/datadog_checks/ibm_i/queries.py
@@ -151,25 +151,6 @@
     ],
 }
 
-JobsInJobQueueInfo = {
-    'name': 'jobs_in_job_queue',
-    'query': (
-        "SELECT SUBSTR(JOB_NAME,1,POSSTR(JOB_NAME,'/')-1) AS JOB_ID, "
-        "SUBSTR(JOB_NAME,POSSTR(JOB_NAME,'/')+1,POSSTR(SUBSTR(JOB_NAME,POSSTR(JOB_NAME,'/')+1),'/')-1) AS JOB_USER, "
-        "SUBSTR(SUBSTR(JOB_NAME,POSSTR(JOB_NAME,'/')+1),POSSTR(SUBSTR(JOB_NAME,POSSTR(JOB_NAME,'/')+1),'/')+1) AS JOB_NAME, "  # noqa:E501
-        "JOB_QUEUE_NAME, JOB_QUEUE_STATUS, 1 "
-        "FROM TABLE(QSYS2.JOB_INFO('*JOBQ', '*ALL', '*ALL', '*ALL', '*ALL'))"
-    ),
-    'columns': [
-        {'name': 'job_id', 'type': 'tag'},
-        {'name': 'job_user', 'type': 'tag'},
-        {'name': 'job_name', 'type': 'tag'},
-        {'name': 'job_queue_name', 'type': 'tag'},
-        {'name': 'job_queue_status', 'type': 'tag'},
-        {'name': 'ibm_i.job.in_jobq', 'type': 'gauge'},
-    ],
-}
-
 JobQueueInfo = {
     'name': 'job_queue',
     'query': (