Branch: refs/heads/master Home: https://github.com/jenkinsci/prometheus-plugin Commit: 047ba8bf56289984370f85d6a40eb111e713fcd8 https://github.com/jenkinsci/prometheus-plugin/commit/047ba8bf56289984370f85d6a40eb111e713fcd8 Author: Adam Gabrys <adam.gab...@live.com> Date: 2022-02-27 (Sun, 27 Feb 2022)
Changed paths: M src/main/java/org/jenkinsci/plugins/prometheus/DiskUsageCollector.java M src/main/java/org/jenkinsci/plugins/prometheus/config/PrometheusConfiguration.java M src/main/java/org/jenkinsci/plugins/prometheus/util/ConfigurationUtils.java M src/test/java/org/jenkinsci/plugins/prometheus/DiskUsageCollectorTest.java M src/test/java/org/jenkinsci/plugins/prometheus/rest/PrometheusActionTest.java A src/test/java/org/jenkinsci/plugins/prometheus/util/ConfigurationUtilsTest.java Log Message: ----------- Disable DiskUsageCollector when its option is unchecked (JENKINS-66790) The `DiskUsageCollector` class uses the `ConfigurationUtils#getCollectDiskUsage` method to determine whether the disk usage statistics should be collected or not. Unfortunately, the mentioned method ignores the checkbox configuration option available on the `Configure System` page. The `PrometheusConfiguration` class keeps the requested value in the `collectDiskUsage` field which is set with the default value if needed. The `ConfigurationUtils#getCollectDiskUsage` method is removed and the `PrometheusConfiguration#getCollectDiskUsage` method is used instead. The `PrometheusConfiguration#getDefaultCollectDiskUsage` method is no longer used, so it has been removed too. Commit: c5d4ce1e3c0d134c45704fd5b63536b7302abc78 https://github.com/jenkinsci/prometheus-plugin/commit/c5d4ce1e3c0d134c45704fd5b63536b7302abc78 Author: Marky Jackson <markyjackson-tau...@users.noreply.github.com> Date: 2022-03-07 (Mon, 07 Mar 2022) Changed paths: M src/main/java/org/jenkinsci/plugins/prometheus/DiskUsageCollector.java M src/main/java/org/jenkinsci/plugins/prometheus/config/PrometheusConfiguration.java M src/main/java/org/jenkinsci/plugins/prometheus/util/ConfigurationUtils.java M src/test/java/org/jenkinsci/plugins/prometheus/DiskUsageCollectorTest.java M src/test/java/org/jenkinsci/plugins/prometheus/rest/PrometheusActionTest.java A src/test/java/org/jenkinsci/plugins/prometheus/util/ConfigurationUtilsTest.java Log Message: ----------- Merge pull request #364 from agabrys/feature/JENKINS-66790 Disable DiskUsageCollector when its option is unchecked (JENKINS-66790) Compare: https://github.com/jenkinsci/prometheus-plugin/compare/9d7877c99e37...c5d4ce1e3c0d -- You received this message because you are subscribed to the Google Groups "Jenkins Commits" group. To unsubscribe from this group and stop receiving emails from it, send an email to jenkinsci-commits+unsubscr...@googlegroups.com. To view this discussion on the web visit https://groups.google.com/d/msgid/jenkinsci-commits/jenkinsci/prometheus-plugin/push/refs/heads/master/9d7877-c5d4ce%40github.com.