Merge pull request #52335 from crassirostris/sd-logging-add-metric

Automatic merge from submit-queue (batch tested with PRs 51041, 52297, 52296, 52335, 52338)

[fluentd-gcp addon] Restore the metric for the number of read log entries

This metric, previously removed, will allow to monitor the number of log entries, that were read, but weren't sent by the output plugin because of liveness probe removing the data.

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

@@ -332,6 +332,19 @@ data:
       </metric>
     </match>
 
+    # 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.
+    <filter **>
+      @type prometheus
+      <metric>
+        type counter
+        name logging_entry_count
+        desc Total number of log entries generated by either application containers or system components
+      </metric>
+    </filter>
+
     # 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
     </match>
 metadata:
-  name: fluentd-gcp-config-v1.1
+  name: fluentd-gcp-config-v1.1.2
   namespace: kube-system
   labels:
     addonmanager.kubernetes.io/mode: Reconcile

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