You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by wa...@apache.org on 2022/03/04 03:14:30 UTC
[flink-kubernetes-operator] 01/02: [hotfix] change operator metrics group name to work with prometheus
This is an automated email from the ASF dual-hosted git repository.
wangyang0918 pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/flink-kubernetes-operator.git
commit 1b90737d5fa2af6e7452c682f75f4d04311890fd
Author: Matyas Orhidi <ma...@apple.com>
AuthorDate: Mon Feb 28 16:46:25 2022 +0100
[hotfix] change operator metrics group name to work with prometheus
---
.../kubernetes/operator/metrics/KubernetesOperatorMetricGroup.java | 2 +-
.../kubernetes/operator/metrics/KubernetesOperatorMetricOptions.java | 5 ++---
.../operator/metrics/KubernetesOperatorMetricGroupTest.java | 4 ++--
helm/flink-operator/templates/flink-operator.yaml | 2 +-
4 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/flink-kubernetes-operator/src/main/java/org/apache/flink/kubernetes/operator/metrics/KubernetesOperatorMetricGroup.java b/flink-kubernetes-operator/src/main/java/org/apache/flink/kubernetes/operator/metrics/KubernetesOperatorMetricGroup.java
index 5d1de59..83beb22 100644
--- a/flink-kubernetes-operator/src/main/java/org/apache/flink/kubernetes/operator/metrics/KubernetesOperatorMetricGroup.java
+++ b/flink-kubernetes-operator/src/main/java/org/apache/flink/kubernetes/operator/metrics/KubernetesOperatorMetricGroup.java
@@ -30,7 +30,7 @@ import java.util.Map;
public class KubernetesOperatorMetricGroup
extends AbstractMetricGroup<KubernetesOperatorMetricGroup> {
- private static final String GROUP_NAME = "kubernetes-operator";
+ private static final String GROUP_NAME = "k8soperator";
private String namespace;
private String name;
private String hostname;
diff --git a/flink-kubernetes-operator/src/main/java/org/apache/flink/kubernetes/operator/metrics/KubernetesOperatorMetricOptions.java b/flink-kubernetes-operator/src/main/java/org/apache/flink/kubernetes/operator/metrics/KubernetesOperatorMetricOptions.java
index 3c07674..42e1d40 100644
--- a/flink-kubernetes-operator/src/main/java/org/apache/flink/kubernetes/operator/metrics/KubernetesOperatorMetricOptions.java
+++ b/flink-kubernetes-operator/src/main/java/org/apache/flink/kubernetes/operator/metrics/KubernetesOperatorMetricOptions.java
@@ -23,9 +23,8 @@ import org.apache.flink.configuration.ConfigOptions;
/** Configuration options for metrics. */
public class KubernetesOperatorMetricOptions {
public static final ConfigOption<String> SCOPE_NAMING_KUBERNETES_OPERATOR =
- ConfigOptions.key("metrics.scope.kubernetes-operator")
- .stringType()
- .defaultValue("<host>.kubernetes-operator.<namespace>.<name>")
+ ConfigOptions.key("metrics.scope.k8soperator")
+ .defaultValue("<host>.k8soperator.<namespace>.<name>")
.withDescription(
"Defines the scope format string that is applied to all metrics scoped to the kubernetes operator.");
}
diff --git a/flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/metrics/KubernetesOperatorMetricGroupTest.java b/flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/metrics/KubernetesOperatorMetricGroupTest.java
index 9f65293..4289adc 100644
--- a/flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/metrics/KubernetesOperatorMetricGroupTest.java
+++ b/flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/metrics/KubernetesOperatorMetricGroupTest.java
@@ -40,10 +40,10 @@ public class KubernetesOperatorMetricGroupTest {
KubernetesOperatorMetricGroup.create(
registry, configuration, "default", "flink-operator", "localhost");
assertArrayEquals(
- new String[] {"localhost", "kubernetes-operator", "default", "flink-operator"},
+ new String[] {"localhost", "k8soperator", "default", "flink-operator"},
group.getScopeComponents());
assertEquals(
- "localhost.kubernetes-operator.default.flink-operator.test",
+ "localhost.k8soperator.default.flink-operator.test",
group.getMetricIdentifier("test"));
assertEquals(
diff --git a/helm/flink-operator/templates/flink-operator.yaml b/helm/flink-operator/templates/flink-operator.yaml
index 028b25e..8c982a4 100644
--- a/helm/flink-operator/templates/flink-operator.yaml
+++ b/helm/flink-operator/templates/flink-operator.yaml
@@ -136,7 +136,7 @@ data:
flink-conf.yaml: |+
metrics.reporter.slf4j.factory.class: org.apache.flink.metrics.slf4j.Slf4jReporterFactory
metrics.reporter.slf4j.interval: 1 MINUTE
- # metrics.scope.kubernetes-operator: <host>.kubernetes-operator.<namespace>.<name>
+ # metrics.scope.k8soperator: <host>.k8soperator.<namespace>.<name>
log4j2.properties: |+
rootLogger.level = DEBUG
rootLogger.appenderRef.console.ref = ConsoleAppender