Merge pull request #47402 from crassirostris/fix-fluentd-metrics-port

Automatic merge from submit-queue (batch tested with PRs 47302, 47389, 47402, 47468, 47459) Change port on which fluentd exposes its metrics Fix https://github.com/kubernetes/kubernetes/issues/47397 /cc @Q-Lee @nicksardo ```release-note Stackdriver Logging deployment exposes metrics on node port 31337 when enabled. ```

Merge pull request #47402 from crassirostris/fix-fluentd-metrics-port
38fa5dc3 · Kubernetes Submit Queue · GitHub · d8983699 · 1cc2235c · 38fa5dc3
Commit 38fa5dc3 authored Jun 13, 2017 by Kubernetes Submit Queue Committed by GitHub Jun 13, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

fluentd-gcp-configmap.yaml cluster/addons/fluentd-gcp/fluentd-gcp-configmap.yaml +1 -1

fluentd-gcp-ds.yaml cluster/addons/fluentd-gcp/fluentd-gcp-ds.yaml +1 -0

No files found.
--- a/cluster/addons/fluentd-gcp/fluentd-gcp-configmap.yaml
+++ b/cluster/addons/fluentd-gcp/fluentd-gcp-configmap.yaml
@@ -295,7 +295,7 @@ data:
    # Prometheus monitoring
    <source>
      @type prometheus
-      port 80
+      port 31337
    </source>

    <source>

--- a/cluster/addons/fluentd-gcp/fluentd-gcp-ds.yaml
+++ b/cluster/addons/fluentd-gcp/fluentd-gcp-ds.yaml
@@ -94,6 +94,7 @@ spec:
        command:
          - /monitor
          - --component=fluentd
+          - --target-port=31337
          - --stackdriver-prefix=container.googleapis.com/internal/addons
          - --whitelisted-metrics=logging_line_count,logging_entry_count
        volumeMounts: