refactor(grafana_agent): clean up config file

!1

templates/ConfigMap-GrafanaAgent.yaml

@@ -17,23 +17,32 @@ data:
       wal_directory: /tmp/wal
 
     logs:
-      # Choose a directory to save the last read position of log files at.
-      # This directory will be created if it doesn't already exist.
       positions_directory: "/tmp"
 
       configs:
 
-      - name: journal
+      - name: node-logs
         clients:
           - url: http://{{ .Values.nfc_monitoring.loki.service_name }}.{{ .Values.nfc_monitoring.loki.namespace }}.svc.{{ .Values.nfc_monitoring.kubernetes.cluster_dns_name }}:{{ .Values.nfc_monitoring.loki.service_port }}/loki/api/v1/push
+            backoff_config:
+              min_period: 10s
+              max_period: 5m
+              max_retries: 10
+
+        limits_config:
+          readline_rate_enabled: true
+          readline_rate: 250
+          readline_burst: 750
+          readline_rate_drop: false
+          max_streams: 500
+
         scrape_configs:
 
           - job_name: systemd-journal
             journal:
-            labels:
-              job: node-journal
               path: /host/root/run/log/journal
               json: true
+              max_age: 24h
             relabel_configs:
                 
             - source_labels:
@@ -45,8 +54,10 @@ data:
             - source_labels:
               - __journal_syslog_identifier
               target_label: syslog_identifier
+            - target_label: "job"
+              replacement: "systemd-journal"
             - target_label: "job_name"
-            replacement: "journal"
+              replacement: "journal-logs"
             - target_label: hostname
               replacement: "${HOSTNAME}"
 
@@ -119,15 +130,6 @@ data:
                   level: 
 
 
-      - name: log-files
-        clients:
-        - url: http://{{ .Values.nfc_monitoring.loki.service_name }}.{{ .Values.nfc_monitoring.loki.namespace }}.svc.{{ .Values.nfc_monitoring.kubernetes.cluster_dns_name }}:{{ .Values.nfc_monitoring.loki.service_port }}/loki/api/v1/push
-        positions:
-          filename: /tmp/var-logfile.yaml
-        target_config:
-          sync_period: 10s
-        scrape_configs:
-
           - job_name: var-logs
             static_configs:
               - targets: [localhost]
@@ -176,107 +178,17 @@ data:
                 replacement: "${HOSTNAME}"
               - target_label: job
                 replacement: log-files
+              - target_label: node
+                replacement: "${HOSTNAME}"
 
-
+            pipeline_stages:
-        # - job_name: varlogs
+              - timestamp:
-        #   static_configs:
+                  format: RFC3339
-        #     - targets: [localhost]
+                  source: time
-        #       labels:
-        #         # cluster: dev
-        #         job: 'container logs'
-        #         __path__: /var/log/pods/*/*/*.log
-        #   pipeline_stages:
-        #     - json:
-        #         expressions:
-        #           namespace: namespace
-        #           level: level
-        #     - regex:
-        #         source: filename
-        #         # expression: '/var/log/pods/(.+)/(?P<pod>.+)/(*.log)'
-        #         # expression: '/var/log/pods/.+/(?P<pod>\\S+?)'
-        #         #expression: '/var/log/pods/.+/(?P<pod>\\S+?)/*.log'
-        #         #expression: '/var/log/pods/.+/(?P<pod>\S+?)/*.log'
-        #         expression: '/var/log/pods/.+/(?P<container>\S+?)/.+log'
-        #     - regex:
-        #         source: filename
-        #         expression: '/var\/log\/pods\/.*_(?P<pod>\S+?)_.*\/.+\/.+log'
-        #     - regex:
-        #         source: filename
-        #         expression: '/var/log/pods/(?P<namespace>\S+?)_.*/.+/.+log'
-        #     - regex:
-        #         #source: message
-        #         expression: '\s?level=(?P<level>\S+)\s+'
-        #     - regex:
-        #         #source: message
-        #         expression: '\s?(?P<level>debug|info|warn|error)\s'
-        #     - template:
-        #         source: level
-        #         template: '{{"{{"}} ToLower .Value {{"}}"}}'
-        #     - labels:
-        #         container:
-        #         level:
-        #         namespace:
-        #         pod:
-          #relabel_configs:
-            
-            # - source_labels: [__filename__]
-            #   separator: '/'
-            #   regex: '/var/log/pods/*/(.*)/*.log'
-            #   replacement: '${1}'
-            #   target_label: pod
-            # - source_labels: [__filename__]
-            #   replacement: '/var/log/pods/*/${1}/*.log'
-            #   target_label: pod
-            # - replacement: /var/log/pods/*/${1}/*.log
-            #   separator: /
-            #   source_labels:
-            #     - __meta_kubernetes_pod_uid
-            #     - __meta_kubernetes_pod_container_name
-            #   target_label: pod
 
 
 
-      #       - targets: [localhost]
-      #         labels:
-      #           job: varlogs
-      #           __path__: /var/logs/*
-      #       - targets: [localhost]
-      #         labels:
-      #           job: varlogs
-      #           __path__: /host/root/var/log/*
-      #       - targets: [localhost]
-      #         labels:
-      #           job: varlogs
-      #           __path__: /host/root/var/logs/*
-      #       - targets: [localhost]
-      #         labels:
-      #           job: varlogs
-      #           __path__: /host/root/var/log/containers/*
-      #       - targets: [localhost]
-      #         labels:
-      #           job: varlogs
-      #           __path__: /host/root/var/log/*/*
-
-
-
-
-
-
-      - name: kubernetes
-        clients:
-        - url: http://{{ .Values.nfc_monitoring.loki.service_name }}.{{ .Values.nfc_monitoring.loki.namespace }}.svc.{{ .Values.nfc_monitoring.kubernetes.cluster_dns_name }}:{{ .Values.nfc_monitoring.loki.service_port }}/loki/api/v1/push
-          # basic_auth:
-          #   username: YOUR_LOKI_USERNAME
-          #   password: YOUR_LOKI_PASSWORD
-          external_labels:
-            #cluster: dev-cluster
-        positions:
-          filename: /tmp/kub-positions.yaml
-        target_config:
-          sync_period: 10s
-        scrape_configs:
           - job_name: pod-logs
-
             kubernetes_sd_configs:
               - role: pod
 
@@ -284,7 +196,6 @@ data:
               - cri: {}
 
               - regex:
-                #source: msg
                   expression: '(\s|\t|level=)?(?P<level>trace|debug|info|warn|error|TRACE|DEBUG|INFO|WARN|ERROR)(\s|\t)'
 
               - labels:
@@ -300,12 +211,8 @@ data:
                 source_labels:
                   - __meta_kubernetes_namespace
                 target_label: namespace
-            # - target_label: job
-            #   # source_labels:
-            #   #     - __meta_kubernetes_namespace
-            #   replacement: loki/ingester_grafana-agent
               - target_label: job
-              replacement: grafana-agent
+                replacement: kubernetes_sd
               - action: replace
                 source_labels:
                   - __meta_kubernetes_pod_name
@@ -321,10 +228,12 @@ data:
                   - __meta_kubernetes_pod_container_name
                 target_label: __path__
               - target_label: "job_name"
-              replacement: "kubernetes_sd"
+                replacement: "kubernetes-logs"
               - target_label: hostname
                 replacement: "${HOSTNAME}"
-
+              - target_label: node
+                source_labels:
+                  - __meta_kubernetes_pod_node_name
 
 
     integrations: