Do not collect disabled jobs

jenkinsci · Jan 25, 2025 · 27e2c88 · 27e2c88
1 parent 02f7f43
commit 27e2c88
Showing 1 changed file with 13 additions and 9 deletions.
diff --git a/src/main/java/org/jenkinsci/plugins/prometheus/JobCollector.java b/src/main/java/org/jenkinsci/plugins/prometheus/JobCollector.java
@@ -157,16 +157,20 @@ public List<MetricFamilySamples> collect() {
 
         Jobs.forEachJob(job -> {
             try {
-                if (!job.isBuildable() && processDisabledJobs) {
-                    LOGGER.debug("job [{}] is disabled", job.getFullName());
-                    return;
+                if (job.isBuildable()) {
+                    if (!MetricStatusChecker.isJobEnabled(job.getFullName())) {
+                        LOGGER.debug("Job [{}] is excluded by configuration", job.getFullName());
+                        return;
+                    }
+                    LOGGER.debug("Collecting metrics for job [{}]", job.getFullName());
+                    appendJobMetrics(job);
+                } else {
+                    if (processDisabledJobs) {
+                        appendJobMetrics(job);
+                    } else {
+                        LOGGER.debug("job [{}] is disabled", job.getFullName());
+                    }
                 }
-                if (!MetricStatusChecker.isJobEnabled(job.getFullName())) {
-                    LOGGER.debug("Job [{}] is excluded by configuration", job.getFullName());
-                    return;
-                }
-                LOGGER.debug("Collecting metrics for job [{}]", job.getFullName());
-                appendJobMetrics(job);
             } catch (IllegalArgumentException e) {
                 if (!e.getMessage().contains("Incorrect number of labels")) {
                     LOGGER.warn("Caught error when processing job [{}] error: ", job.getFullName(), e);