Skip to content

Commit

Permalink
Remove unnecessary entries in additional config metadata
Browse files Browse the repository at this point in the history
Add the 'enabled' fields directly to the classes instead.

Closes gh-30439
  • Loading branch information
mhalbritter committed Mar 25, 2022
1 parent 0ff8119 commit 24e748d
Show file tree
Hide file tree
Showing 4 changed files with 42 additions and 21 deletions.
@@ -1,5 +1,5 @@
/*
* Copyright 2012-2019 the original author or authors.
* Copyright 2012-2022 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -31,6 +31,11 @@
@ConfigurationProperties(prefix = "management.metrics.export.jmx")
public class JmxProperties {

/**
* Whether exporting of metrics to this backend is enabled.
*/
private boolean enabled = true;

/**
* Metrics JMX domain name.
*/
Expand All @@ -57,4 +62,12 @@ public void setStep(Duration step) {
this.step = step;
}

public boolean isEnabled() {
return this.enabled;
}

public void setEnabled(boolean enabled) {
this.enabled = enabled;
}

}
@@ -1,5 +1,5 @@
/*
* Copyright 2012-2020 the original author or authors.
* Copyright 2012-2022 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -36,6 +36,11 @@
@ConfigurationProperties(prefix = "management.metrics.export.prometheus")
public class PrometheusProperties {

/**
* Whether exporting of metrics to this backend is enabled.
*/
private boolean enabled = true;

/**
* Whether to enable publishing descriptions as part of the scrape payload to
* Prometheus. Turn this off to minimize the amount of data sent on each scrape.
Expand Down Expand Up @@ -82,6 +87,14 @@ public void setStep(Duration step) {
this.step = step;
}

public boolean isEnabled() {
return this.enabled;
}

public void setEnabled(boolean enabled) {
this.enabled = enabled;
}

public Pushgateway getPushgateway() {
return this.pushgateway;
}
Expand Down
@@ -1,5 +1,5 @@
/*
* Copyright 2012-2019 the original author or authors.
* Copyright 2012-2022 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -34,6 +34,11 @@
@ConfigurationProperties(prefix = "management.metrics.export.simple")
public class SimpleProperties {

/**
* Whether exporting of metrics to this backend is enabled.
*/
private boolean enabled = true;

/**
* Step size (i.e. reporting frequency) to use.
*/
Expand All @@ -44,6 +49,14 @@ public class SimpleProperties {
*/
private CountingMode mode = CountingMode.CUMULATIVE;

public boolean isEnabled() {
return this.enabled;
}

public void setEnabled(boolean enabled) {
this.enabled = enabled;
}

public Duration getStep() {
return this.step;
}
Expand Down
Expand Up @@ -421,12 +421,6 @@
"level": "error"
}
},
{
"name": "management.metrics.export.jmx.enabled",
"type": "java.lang.Boolean",
"description": "Whether exporting of metrics to JMX is enabled.",
"defaultValue": true
},
{
"name": "management.metrics.export.kairos.num-threads",
"type": "java.lang.Integer",
Expand All @@ -444,12 +438,6 @@
"level": "error"
}
},
{
"name": "management.metrics.export.prometheus.enabled",
"type": "java.lang.Boolean",
"description": "Whether exporting of metrics to Prometheus is enabled.",
"defaultValue": true
},
{
"name": "management.metrics.export.prometheus.histogram-flavor",
"defaultValue": "prometheus"
Expand All @@ -467,12 +455,6 @@
"level": "error"
}
},
{
"name": "management.metrics.export.simple.enabled",
"type": "java.lang.Boolean",
"description": "Whether, in the absence of any other exporter, exporting of metrics to an in-memory backend is enabled.",
"defaultValue": true
},
{
"name": "management.metrics.export.simple.mode",
"defaultValue": "cumulative"
Expand Down

0 comments on commit 24e748d

Please sign in to comment.