Merge branch 'master' of https://git.cluster.fun/AverageMarcus/cluster.fun

manifests/monitoring/promtail.yaml

@@ -63,61 +63,23 @@ data:
     target_config:
       sync_period: 10s
     scrape_configs:
-    - job_name: http-access-logs
+    - job_name: kubernetes-filtering
       kubernetes_sd_configs:
       - role: pod
       pipeline_stages:
-        - docker: {}
-        - match:
-            selector: '{k8s_app="traefik-ingress-lb"}'
-            stages:
-            - json:
-                expressions:
-                  RequestPath: RequestPath
-            - labels:
-                RequestPath:
-        - match:
-            selector: '{RequestPath="/healthz"}'
-            action: drop
-      relabel_configs:
-      - source_labels:
-        - __meta_kubernetes_pod_label_k8s_app
-        target_label: __service__
-      - source_labels:
-        - __meta_kubernetes_pod_node_name
-        target_label: __host__
-      - action: drop
-        regex: ''
-        source_labels:
-        - __service__
-      - action: labelmap
-        regex: __meta_kubernetes_pod_label_(.+)
-      - action: replace
-        replacement: $1
-        separator: /
-        source_labels:
-        - __meta_kubernetes_namespace
-        - __service__
-        target_label: job
-      - action: replace
-        source_labels:
-        - __meta_kubernetes_namespace
-        target_label: namespace
-      - action: replace
-        source_labels:
-        - __meta_kubernetes_pod_name
-        target_label: pod
-      - action: replace
-        source_labels:
-        - __meta_kubernetes_pod_container_name
-        target_label: container
-      - replacement: /var/log/pods/*$1/*.log
-        separator: /
-        source_labels:
-        - __meta_kubernetes_pod_uid
-        - __meta_kubernetes_pod_container_name
-        target_label: __path__
-
+      - drop:
+          source: "k8s_app"
+          expression: "(konnectivity-agent|weave|kube-dns)"
+      - drop:
+          expression: ".*kube-probe.*"
+      - json:
+          expressions:
+            RequestPath: RequestPath
+      - labels:
+          RequestPath:
+      - drop:
+          source: "RequestPath"
+          expression: "/healthz"
 
     - job_name: kubernetes-pods-name
       pipeline_stages: