From 683fc2300096a60d2c40b7049d972a7341694646 Mon Sep 17 00:00:00 2001 From: Mik Vyatskov Date: Tue, 12 Sep 2017 13:14:30 +0200 Subject: [PATCH] [fluentd-gcp addon] Restore the metric for the number of read log entries --- .../addons/fluentd-gcp/fluentd-gcp-configmap.yaml | 15 ++++++++++++++- cluster/addons/fluentd-gcp/fluentd-gcp-ds.yaml | 2 +- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/cluster/addons/fluentd-gcp/fluentd-gcp-configmap.yaml b/cluster/addons/fluentd-gcp/fluentd-gcp-configmap.yaml index be77defb781..1b06178f6f1 100644 --- a/cluster/addons/fluentd-gcp/fluentd-gcp-configmap.yaml +++ b/cluster/addons/fluentd-gcp/fluentd-gcp-configmap.yaml @@ -332,6 +332,19 @@ data: + # This filter allows to count the number of log entries read by fluentd + # before they are processed by the output plugin. This in turn allows to + # monitor the number of log entries that were read but never sent, e.g. + # because of liveness probe removing buffer. + + @type prometheus + + type counter + name logging_entry_count + desc Total number of log entries generated by either application containers or system components + + + # We use 2 output stanzas - one to handle the container logs and one to handle # the node daemon logs, the latter of which explicitly sends its logs to the # compute.googleapis.com service rather than container.googleapis.com to keep @@ -383,7 +396,7 @@ data: num_threads 2 metadata: - name: fluentd-gcp-config-v1.1 + name: fluentd-gcp-config-v1.1.2 namespace: kube-system labels: addonmanager.kubernetes.io/mode: Reconcile diff --git a/cluster/addons/fluentd-gcp/fluentd-gcp-ds.yaml b/cluster/addons/fluentd-gcp/fluentd-gcp-ds.yaml index 51fbc81c063..d107e90a5c4 100644 --- a/cluster/addons/fluentd-gcp/fluentd-gcp-ds.yaml +++ b/cluster/addons/fluentd-gcp/fluentd-gcp-ds.yaml @@ -117,7 +117,7 @@ spec: path: /usr/lib64 - name: config-volume configMap: - name: fluentd-gcp-config-v1.1 + name: fluentd-gcp-config-v1.1.2 - name: ssl-certs hostPath: path: /etc/ssl/certs