Simplify regexp's (grafana#1202)

This is mostly to remove redundant anchoring (as it makes people believe that Prometheus's regexp's aren't anchored by default, which will backfire badly at some point), but it also removes useless grouping (again to avoid confusion). Signed-off-by: beorn7 <[email protected]>
mraboosk · Oct 28, 2019 · 6b10f76 · 6b10f76
1 parent 72bb22c
commit 6b10f76
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/production/helm/promtail/templates/configmap.yaml b/production/helm/promtail/templates/configmap.yaml
@@ -28,7 +28,7 @@ data:
         - __meta_kubernetes_pod_node_name
         target_label: __host__
       - action: drop
-        regex: ^$
+        regex: ''
         source_labels:
         - __service__
       - action: labelmap
@@ -75,7 +75,7 @@ data:
         - __meta_kubernetes_pod_node_name
         target_label: __host__
       - action: drop
-        regex: ^$
+        regex: ''
         source_labels:
         - __service__
       - action: labelmap
@@ -118,7 +118,7 @@ data:
         - __meta_kubernetes_pod_label_name
         - __meta_kubernetes_pod_label_app
       - action: drop
-        regex: ^([0-9a-z-.]+)(-[0-9a-f]{8,10})$
+        regex: '[0-9a-z-.]+-[0-9a-f]{8,10}'
         source_labels:
         - __meta_kubernetes_pod_controller_name
       - source_labels:
@@ -128,7 +128,7 @@ data:
         - __meta_kubernetes_pod_node_name
         target_label: __host__
       - action: drop
-        regex: ^$
+        regex: ''
         source_labels:
         - __service__
       - action: labelmap
@@ -171,19 +171,19 @@ data:
         - __meta_kubernetes_pod_label_name
         - __meta_kubernetes_pod_label_app
       - action: keep
-        regex: ^([0-9a-z-.]+)(-[0-9a-f]{8,10})$
+        regex: '[0-9a-z-.]+-[0-9a-f]{8,10}'
         source_labels:
         - __meta_kubernetes_pod_controller_name
       - action: replace
-        regex: ^([0-9a-z-.]+)(-[0-9a-f]{8,10})$
+        regex: '([0-9a-z-.]+)-[0-9a-f]{8,10}'
         source_labels:
         - __meta_kubernetes_pod_controller_name
         target_label: __service__
       - source_labels:
         - __meta_kubernetes_pod_node_name
         target_label: __host__
       - action: drop
-        regex: ^$
+        regex: ''
         source_labels:
         - __service__
       - action: labelmap
@@ -220,7 +220,7 @@ data:
       - role: pod
       relabel_configs:
       - action: drop
-        regex: ^$
+        regex: ''
         source_labels:
         - __meta_kubernetes_pod_annotation_kubernetes_io_config_mirror
       - action: replace
@@ -231,7 +231,7 @@ data:
         - __meta_kubernetes_pod_node_name
         target_label: __host__
       - action: drop
-        regex: ^$
+        regex: ''
         source_labels:
         - __service__
       - action: labelmap