From 81822f12d3e7763711952a874a88eacdc9814f7d Mon Sep 17 00:00:00 2001 From: Kazuhiro MUSASHI Date: Mon, 21 Sep 2020 00:19:52 +0900 Subject: [PATCH 1/2] Modify `promtail` config for `init` journal. --- .../promtail/templates/etc/promtail/base.yaml | 22 ++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/cookbooks/promtail/templates/etc/promtail/base.yaml b/cookbooks/promtail/templates/etc/promtail/base.yaml index 3f73651..46df03b 100644 --- a/cookbooks/promtail/templates/etc/promtail/base.yaml +++ b/cookbooks/promtail/templates/etc/promtail/base.yaml @@ -208,9 +208,29 @@ scrape_configs: path: /var/log/journal labels: job: init - level: notice hostname: <%= @HOSTNAME %> + pipeline_stages: + - match: + selector: '{job="init"} |~ "(apt download|Message of the Day)"' + stages: + - template: + source: level + template: 'info' + + - labels: + level: + + - match: + selector: '{job="init"} !~ "(apt download|Message of the Day)"' + stages: + - template: + source: level + template: 'notice' + + - labels: + level: + relabel_configs: - action: keep regex: 'init\.scope' From 0d3d8fe8006be0dffaf03a393d66db1934356d76 Mon Sep 17 00:00:00 2001 From: Kazuhiro MUSASHI Date: Mon, 21 Sep 2020 00:20:34 +0900 Subject: [PATCH 2/2] Modify `promtail` config for `systemd`. --- .../promtail/templates/etc/promtail/base.yaml | 27 ++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/cookbooks/promtail/templates/etc/promtail/base.yaml b/cookbooks/promtail/templates/etc/promtail/base.yaml index 46df03b..2470f8c 100644 --- a/cookbooks/promtail/templates/etc/promtail/base.yaml +++ b/cookbooks/promtail/templates/etc/promtail/base.yaml @@ -249,11 +249,36 @@ scrape_configs: pipeline_stages: - match: - selector: '{job="systemd"}' + selector: '{job="systemd"} !~ "temperature"' stages: - drop: expression: (CMD|UFW|session|TTY) + - match: + selector: '{job="systemd"} |~ "temperature"' + + stages: + - regex: + expression: '^(?P.+)$' + + - template: + source: level + template: '{{ .message }}' + + - template: + source: level + template: '{{ regexReplaceAllLiteral ".*normal.*" .Value "notice" }}' + + - template: + source: level + template: '{{ regexReplaceAllLiteral ".*temperature.*" .Value "error" }}' + + - labels: + level: + + - output: + source: message + relabel_configs: - source_labels: ['__journal__systemd_unit'] target_label: 'unit'