Group the new props under 'metrics'

Author: jiangzho

docs/config_properties.md

@@ -29,8 +29,8 @@
  | spark.kubernetes.operator.metrics.clientMetricsEnabled | Boolean | true | false | Enable KubernetesClient metrics for measuring the HTTP traffic to the Kubernetes API Server. Since the metrics is collected via Okhttp interceptors, can be disabled when opt in customized interceptors. | 
  | spark.kubernetes.operator.metrics.clientMetricsGroupByResponseCodeEnabled | Boolean | true | false | When enabled, additional metrics group by http response code group(1xx, 2xx, 3xx, 4xx, 5xx) received from API server will be added. Users can disable it when their monitoring system can combine lower level kubernetes.client.http.response.<3-digit-response-code> metrics. | 
  | spark.kubernetes.operator.metrics.port | Integer | 19090 | false | The port used for checking metrics | 
- | spark.kubernetes.operator.enablePrometheusTextBasedFormat | Boolean | true | false | Whether or not to enable text-based format for Prometheus 2.0, as recommended by https://prometheus.io/docs/instrumenting/exposition_formats/#text-based-format | 
- | spark.kubernetes.operator.enableSanitizePrometheusMetricsName | Boolean | true | false | Whether or not to enable automatic name sanitizing for all metrics based on best-practice guide from Prometheus https://prometheus.io/docs/practices/naming/ | 
+ | spark.kubernetes.operator.metrics.enablePrometheusTextBasedFormat | Boolean | true | false | Whether or not to enable text-based format for Prometheus 2.0, as recommended by https://prometheus.io/docs/instrumenting/exposition_formats/#text-based-format | 
+ | spark.kubernetes.operator.metrics.enableSanitizePrometheusMetricsName | Boolean | true | false | Whether or not to enable automatic name sanitizing for all metrics based on best-practice guide from Prometheus https://prometheus.io/docs/practices/naming/ | 
  | spark.kubernetes.operator.health.probePort | Integer | 19091 | false | The port used for health/readiness check probe status. | 
  | spark.kubernetes.operator.health.sentinelExecutorPoolSize | Integer | 3 | false | Size of executor service in Sentinel Managers to check the health of sentinel resources. | 
  | spark.kubernetes.operator.health.sentinelResourceReconciliationDelaySeconds | Integer | 60 | true | Allowed max time(seconds) between spec update and reconciliation for sentinel resources. | 

spark-operator/src/main/java/org/apache/spark/k8s/operator/config/SparkOperatorConf.java

@@ -336,7 +336,7 @@ public final class SparkOperatorConf {
 
   public static final ConfigOption<Boolean> ENABLE_PROMETHEUS_TEXT_BASED_FORMAT =
       ConfigOption.<Boolean>builder()
-          .key("spark.kubernetes.operator.enablePrometheusTextBasedFormat")
+          .key("spark.kubernetes.operator.metrics.enablePrometheusTextBasedFormat")
           .enableDynamicOverride(false)
           .description(
               "Whether or not to enable text-based format for Prometheus 2.0, as "
@@ -348,7 +348,7 @@ public final class SparkOperatorConf {
 
   public static final ConfigOption<Boolean> ENABLE_SANITIZED_PROMETHEUS_METRICS_NAME =
       ConfigOption.<Boolean>builder()
-          .key("spark.kubernetes.operator.enableSanitizePrometheusMetricsName")
+          .key("spark.kubernetes.operator.metrics.enableSanitizePrometheusMetricsName")
           .enableDynamicOverride(false)
           .description(
               "Whether or not to enable automatic name sanitizing for all metrics based on "