|
 |
ee3a35 |
From 7b09e9782c4e6892a8d16fd4e3aa2cca440a41e6 Mon Sep 17 00:00:00 2001
|
|
|
ee3a35 |
From: Rich Megginson <rmeggins@redhat.com>
|
|
|
ee3a35 |
Date: Wed, 22 Aug 2018 08:37:03 -0600
|
|
|
ee3a35 |
Subject: [PATCH] url not required - add information about CRI-O
|
|
|
ee3a35 |
|
|
|
ee3a35 |
The KubernetesURL parameter is not mandatory since it has
|
|
|
ee3a35 |
a useful default value.
|
|
|
ee3a35 |
Add information about CRI-O.
|
|
|
ee3a35 |
Minor cleanup.
|
|
|
ee3a35 |
---
|
|
|
ee3a35 |
source/configuration/modules/mmkubernetes.rst | 18 +++++++++---------
|
|
|
ee3a35 |
1 file changed, 9 insertions(+), 9 deletions(-)
|
|
|
ee3a35 |
|
|
|
ee3a35 |
diff --git a/source/configuration/modules/mmkubernetes.rst b/source/configuration/modules/mmkubernetes.rst
|
|
|
ee3a35 |
index be9e710f..a3cd4d49 100644
|
|
|
ee3a35 |
--- a/source/configuration/modules/mmkubernetes.rst
|
|
|
ee3a35 |
+++ b/source/configuration/modules/mmkubernetes.rst
|
|
|
ee3a35 |
@@ -19,14 +19,14 @@ namespace.
|
|
|
ee3a35 |
|
|
|
ee3a35 |
.. note::
|
|
|
ee3a35 |
|
|
|
ee3a35 |
- This **only** works with log files in `/var/log/containers/*.log`
|
|
|
ee3a35 |
- (docker `--log-driver=json-file`), or with journald entries with
|
|
|
ee3a35 |
+ This **only** works with log files in `/var/log/containers/*.log` (docker
|
|
|
ee3a35 |
+ `--log-driver=json-file`, or CRI-O log files), or with journald entries with
|
|
|
ee3a35 |
message properties `CONTAINER_NAME` and `CONTAINER_ID_FULL` (docker
|
|
|
ee3a35 |
- `--log-driver=journald`), and when the application running inside
|
|
|
ee3a35 |
- the container writes logs to `stdout`/`stderr`. This **does not**
|
|
|
ee3a35 |
- currently work with other log drivers.
|
|
|
ee3a35 |
+ `--log-driver=journald`), and when the application running inside the
|
|
|
ee3a35 |
+ container writes logs to `stdout`/`stderr`. This **does not** currently
|
|
|
ee3a35 |
+ work with other log drivers.
|
|
|
ee3a35 |
|
|
|
ee3a35 |
-For json-file logs, you must use the `imfile` module with the
|
|
|
ee3a35 |
+For json-file and CRI-O logs, you must use the `imfile` module with the
|
|
|
ee3a35 |
`addmetadata="on"` parameter, and the filename must match the
|
|
|
ee3a35 |
liblognorm rules specified by the `filenamerules`
|
|
|
ee3a35 |
(:ref:`filenamerules`) or `filenamerulebase` (:ref:`filenamerulebase`)
|
|
|
ee3a35 |
@@ -70,7 +70,7 @@ KubernetesURL
|
|
|
ee3a35 |
:widths: auto
|
|
|
ee3a35 |
:class: parameter-table
|
|
|
ee3a35 |
|
|
|
ee3a35 |
- "word", "https://kubernetes.default.svc.cluster.local:443", "yes", "none"
|
|
|
ee3a35 |
+ "word", "https://kubernetes.default.svc.cluster.local:443", "no", "none"
|
|
|
ee3a35 |
|
|
|
ee3a35 |
The URL of the Kubernetes API server. Example: `https://localhost:8443`.
|
|
|
ee3a35 |
|
|
|
ee3a35 |
@@ -248,8 +248,6 @@ match the filename and extract metadata. The default value is::
|
|
|
ee3a35 |
In the above rules, the slashes ``\`` ending each line indicate
|
|
|
ee3a35 |
line wrapping - they are not part of the rule.
|
|
|
ee3a35 |
|
|
|
ee3a35 |
-There are two rules because the `container_hash` is optional.
|
|
|
ee3a35 |
-
|
|
|
ee3a35 |
.. _filenamerulebase:
|
|
|
ee3a35 |
|
|
|
ee3a35 |
filenamerulebase
|
|
|
ee3a35 |
@@ -351,6 +349,8 @@ get the basic necessary Kubernetes metadata from the filename:
|
|
|
ee3a35 |
input(type="imfile" file="/var/log/containers/*.log"
|
|
|
ee3a35 |
tag="kubernetes" addmetadata="on")
|
|
|
ee3a35 |
|
|
|
ee3a35 |
+(Add `reopenOnTruncate="on"` if using Docker, not required by CRI-O).
|
|
|
ee3a35 |
+
|
|
|
ee3a35 |
and/or an `imjournal` input for docker journald container logs annotated by
|
|
|
ee3a35 |
Kubernetes:
|
|
|
ee3a35 |
|