Branch: refs/heads/master
Home: https://github.com/jenkinsci/prometheus-plugin
Commit: c9d21a29ed75fa66da9d3b3d9fc625856303b81c
https://github.com/jenkinsci/prometheus-plugin/commit/c9d21a29ed75fa66da9d3b3d9fc625856303b81c
Author: Adam Gabrys <[email protected]>
Date: 2021-12-29 (Wed, 29 Dec 2021)
Changed paths:
M
src/main/java/org/jenkinsci/plugins/prometheus/config/PrometheusConfiguration.java
M
src/main/java/org/jenkinsci/plugins/prometheus/util/ConfigurationUtils.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 it
should be enabled 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. It is calculated based on the saved configuration
which fallback to the `COLLECT_DISK_USAGE` environment variable or `true` (if
the environment variable is not set). The
`ConfigurationUtils#getCollectDiskUsage` method is updated to execute the
`PrometheusConfiguration#getCollectDiskUsage()` method, so the user
configuration is taken into account.
Commit: 24aff15663114129cd5795907e63f42b63d4f98f
https://github.com/jenkinsci/prometheus-plugin/commit/24aff15663114129cd5795907e63f42b63d4f98f
Author: Marky Jackson <[email protected]>
Date: 2022-02-24 (Thu, 24 Feb 2022)
Changed paths:
M
src/main/java/org/jenkinsci/plugins/prometheus/config/PrometheusConfiguration.java
M
src/main/java/org/jenkinsci/plugins/prometheus/util/ConfigurationUtils.java
A
src/test/java/org/jenkinsci/plugins/prometheus/util/ConfigurationUtilsTest.java
Log Message:
-----------
Merge pull request #337 from agabrys/feature/JENKINS-66790
Disable DiskUsageCollector when its option is unchecked (JENKINS-66790)
Compare:
https://github.com/jenkinsci/prometheus-plugin/compare/045fe8f3a46e...24aff1566311
--
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 [email protected].
To view this discussion on the web visit
https://groups.google.com/d/msgid/jenkinsci-commits/jenkinsci/prometheus-plugin/push/refs/heads/master/045fe8-24aff1%40github.com.
