Upgrade/promtail

.github/workflows/validate.yml

@@ -30,9 +30,11 @@ jobs:
       - name: check
         run: echo "${{ steps.changes.outputs.NOMAD_FILES_CHANGED }}"
       - name: Setup Tailscale
-        uses: tailscale/github-action@main
+        uses: tailscale/github-action@v2
         with:
-          authkey: ${{ secrets.TAILSCALE_AUTHKEY }}
+          oauth-client-id: ${{ secrets.TAILSCALE_OAUTH_CLIENT_ID }}
+          oauth-secret: ${{ secrets.TAILSCALE_OAUTH_KEY }}
+          tags: tag:ci
       - name: check connectivity
         run: ifconfig ; host sense.orca-ordinal.ts.net
       - name: Checkout change

monitoring/promtail.nomad

@@ -1,7 +1,7 @@
 variable "promtail_version" {
   description = "Version of Promtail to deploy"
   type = string
-  default = "2.7.3"
+  default = "2.9.1"
 }
 
 job "promtail" {

monitoring/templates/promtail.yml.tpl

@@ -10,29 +10,33 @@ clients:
   - url: http://localhost:9999/loki/loki/api/v1/push
 
 scrape_configs:
-- job_name: consul
-  static_configs:
-  - targets:
-      - localhost
-    labels:
-      job: consul
-      __path__: /home/consul/*.log
-- job_name: nomad
-  static_configs:
-  - targets:
-      - localhost
-    labels:
-      job: nomad
-      __path__: /var/log/nomad*.log
-- job_name: journal
-  journal:
-    max_age: 12h
-    path: /var/log/journal
-    matches: _TRANSPORT
-    labels:
-      job: systemd-journal
-  relabel_configs:
-  - source_labels: ['__journal__systemd_unit']
-    target_label: 'unit'
-  - source_labels: ['__journal_syslog_identifier']
-    target_label: 'syslog_identifier'
+  - job_name: consul
+    static_configs:
+    - targets:
+        - localhost
+      labels:
+        job: consul
+        __path__: /home/consul/*.log
+  - job_name: nomad
+    static_configs:
+    - targets:
+        - localhost
+      labels:
+        job: nomad
+        __path__: /var/log/nomad*.log
+  - job_name: journal
+    journal:
+      json: false
+      max_age: 12h
+      path: /var/log/journal
+      matches: _TRANSPORT=kernel
+      labels:
+        job: systemd-journal
+    relabel_configs:
+      - source_labels: ['__journal__systemd_unit']
+        target_label: 'unit'
+      - source_labels: ['__journal_syslog_identifier']
+        target_label: 'syslog_identifier'
+      - source_labels:
+          - __journal__hostname
+        target_label: nodename