Merge pull request #213 from sysdiglabs/fix-cassandra-config

Fixed config in Cassandra and AWS apps
sysdiglabs · Apr 7, 2022 · adcdb26 · adcdb26
2 parents 2f95d9a + b3c6a98
commit adcdb26
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 36 deletions.
diff --git a/resources/aws-alb/include/sysdig-agent-config.yaml b/resources/aws-alb/include/sysdig-agent-config.yaml
@@ -23,13 +23,13 @@ data:
       - action: keep
         source_labels: [__meta_kubernetes_pod_host_ip]
         regex: __HOSTIPS__
-      - action: kee(and cluster hierarchy)
       - action: replace
         source_labels: [__meta_kubernetes_pod_uid]
         target_label: sysdig_k8s_pod_uid
       - action: replace
         source_labels: [__meta_kubernetes_pod_container_name]
-        target_label: sysdig_k8s_pod_container_namep
+        target_label: sysdig_k8s_pod_container_name
+      - action: keep
         source_labels: [__meta_kubernetes_pod_annotation_prometheus_io_scrape]
         regex: true
       - action: replace
@@ -45,8 +45,6 @@ data:
         regex: ([^:]+)(?::\d+)?;(\d+)
         replacement: $1:$2
         target_label: __address__
-        # Holding on to pod-id and container name so we can associate the metrics
-        # with the container
   dragent.yaml: |
     new_k8s: true
     k8s_cluster_name: your-cluster-name

diff --git a/resources/aws-ebs/include/sysdig-agent-config.yaml b/resources/aws-ebs/include/sysdig-agent-config.yaml
@@ -23,13 +23,13 @@ data:
       - action: keep
         source_labels: [__meta_kubernetes_pod_host_ip]
         regex: __HOSTIPS__
-      - action: kee(and cluster hierarchy)
       - action: replace
         source_labels: [__meta_kubernetes_pod_uid]
         target_label: sysdig_k8s_pod_uid
       - action: replace
         source_labels: [__meta_kubernetes_pod_container_name]
-        target_label: sysdig_k8s_pod_container_namep
+        target_label: sysdig_k8s_pod_container_name
+      - action: keep
         source_labels: [__meta_kubernetes_pod_annotation_prometheus_io_scrape]
         regex: true
       - action: replace
@@ -45,8 +45,6 @@ data:
         regex: ([^:]+)(?::\d+)?;(\d+)
         replacement: $1:$2
         target_label: __address__
-        # Holding on to pod-id and container name so we can associate the metrics
-        # with the container
   dragent.yaml: |
     new_k8s: true
     k8s_cluster_name: your-cluster-name

diff --git a/resources/aws-elb/include/sysdig-agent-config.yaml b/resources/aws-elb/include/sysdig-agent-config.yaml
@@ -23,13 +23,13 @@ data:
       - action: keep
         source_labels: [__meta_kubernetes_pod_host_ip]
         regex: __HOSTIPS__
-      - action: kee(and cluster hierarchy)
       - action: replace
         source_labels: [__meta_kubernetes_pod_uid]
         target_label: sysdig_k8s_pod_uid
       - action: replace
         source_labels: [__meta_kubernetes_pod_container_name]
-        target_label: sysdig_k8s_pod_container_namep
+        target_label: sysdig_k8s_pod_container_name
+      - action: keep
         source_labels: [__meta_kubernetes_pod_annotation_prometheus_io_scrape]
         regex: true
       - action: replace
@@ -45,8 +45,6 @@ data:
         regex: ([^:]+)(?::\d+)?;(\d+)
         replacement: $1:$2
         target_label: __address__
-        # Holding on to pod-id and container name so we can associate the metrics
-        # with the container
   dragent.yaml: |
     new_k8s: true
     k8s_cluster_name: your-cluster-name

diff --git a/resources/aws-fargate/include/sysdig-agent-config.yaml b/resources/aws-fargate/include/sysdig-agent-config.yaml
@@ -23,13 +23,13 @@ data:
       - action: keep
         source_labels: [__meta_kubernetes_pod_host_ip]
         regex: __HOSTIPS__
-      - action: kee(and cluster hierarchy)
       - action: replace
         source_labels: [__meta_kubernetes_pod_uid]
         target_label: sysdig_k8s_pod_uid
       - action: replace
         source_labels: [__meta_kubernetes_pod_container_name]
-        target_label: sysdig_k8s_pod_container_namep
+        target_label: sysdig_k8s_pod_container_name
+      - action: keep
         source_labels: [__meta_kubernetes_pod_annotation_prometheus_io_scrape]
         regex: true
       - action: replace
@@ -45,8 +45,6 @@ data:
         regex: ([^:]+)(?::\d+)?;(\d+)
         replacement: $1:$2
         target_label: __address__
-        # Holding on to pod-id and container name so we can associate the metrics
-        # with the container
   dragent.yaml: |
     new_k8s: true
     k8s_cluster_name: your-cluster-name

diff --git a/resources/aws-lambda/include/sysdig-agent-config.yaml b/resources/aws-lambda/include/sysdig-agent-config.yaml
@@ -23,13 +23,13 @@ data:
       - action: keep
         source_labels: [__meta_kubernetes_pod_host_ip]
         regex: __HOSTIPS__
-      - action: kee(and cluster hierarchy)
       - action: replace
         source_labels: [__meta_kubernetes_pod_uid]
         target_label: sysdig_k8s_pod_uid
       - action: replace
         source_labels: [__meta_kubernetes_pod_container_name]
-        target_label: sysdig_k8s_pod_container_namep
+        target_label: sysdig_k8s_pod_container_name
+      - action: keep
         source_labels: [__meta_kubernetes_pod_annotation_prometheus_io_scrape]
         regex: true
       - action: replace
@@ -45,8 +45,6 @@ data:
         regex: ([^:]+)(?::\d+)?;(\d+)
         replacement: $1:$2
         target_label: __address__
-        # Holding on to pod-id and container name so we can associate the metrics
-        # with the container
   dragent.yaml: |
     new_k8s: true
     k8s_cluster_name: your-cluster-name

diff --git a/resources/aws-rds/include/sysdig-agent-config.yaml b/resources/aws-rds/include/sysdig-agent-config.yaml
@@ -23,13 +23,13 @@ data:
       - action: keep
         source_labels: [__meta_kubernetes_pod_host_ip]
         regex: __HOSTIPS__
-      - action: kee(and cluster hierarchy)
       - action: replace
         source_labels: [__meta_kubernetes_pod_uid]
         target_label: sysdig_k8s_pod_uid
       - action: replace
         source_labels: [__meta_kubernetes_pod_container_name]
-        target_label: sysdig_k8s_pod_container_namep
+        target_label: sysdig_k8s_pod_container_name
+      - action: keep
         source_labels: [__meta_kubernetes_pod_annotation_prometheus_io_scrape]
         regex: true
       - action: replace
@@ -45,8 +45,6 @@ data:
         regex: ([^:]+)(?::\d+)?;(\d+)
         replacement: $1:$2
         target_label: __address__
-        # Holding on to pod-id and container name so we can associate the metrics
-        # with the container
   dragent.yaml: |
     new_k8s: true
     k8s_cluster_name: your-cluster-name

diff --git a/resources/aws-s3/include/sysdig-agent-config.yaml b/resources/aws-s3/include/sysdig-agent-config.yaml
@@ -23,13 +23,13 @@ data:
       - action: keep
         source_labels: [__meta_kubernetes_pod_host_ip]
         regex: __HOSTIPS__
-      - action: kee(and cluster hierarchy)
       - action: replace
         source_labels: [__meta_kubernetes_pod_uid]
         target_label: sysdig_k8s_pod_uid
       - action: replace
         source_labels: [__meta_kubernetes_pod_container_name]
-        target_label: sysdig_k8s_pod_container_namep
+        target_label: sysdig_k8s_pod_container_name
+      - action: keep
         source_labels: [__meta_kubernetes_pod_annotation_prometheus_io_scrape]
         regex: true
       - action: replace
@@ -45,8 +45,6 @@ data:
         regex: ([^:]+)(?::\d+)?;(\d+)
         replacement: $1:$2
         target_label: __address__
-        # Holding on to pod-id and container name so we can associate the metrics
-        # with the container
   dragent.yaml: |
     new_k8s: true
     k8s_cluster_name: your-cluster-name

diff --git a/resources/aws-sqs/include/sysdig-agent-config.yaml b/resources/aws-sqs/include/sysdig-agent-config.yaml
@@ -23,13 +23,13 @@ data:
       - action: keep
         source_labels: [__meta_kubernetes_pod_host_ip]
         regex: __HOSTIPS__
-      - action: kee(and cluster hierarchy)
       - action: replace
         source_labels: [__meta_kubernetes_pod_uid]
         target_label: sysdig_k8s_pod_uid
       - action: replace
         source_labels: [__meta_kubernetes_pod_container_name]
-        target_label: sysdig_k8s_pod_container_namep
+        target_label: sysdig_k8s_pod_container_name
+      - action: keep
         source_labels: [__meta_kubernetes_pod_annotation_prometheus_io_scrape]
         regex: true
       - action: replace
@@ -45,8 +45,6 @@ data:
         regex: ([^:]+)(?::\d+)?;(\d+)
         replacement: $1:$2
         target_label: __address__
-        # Holding on to pod-id and container name so we can associate the metrics
-        # with the container
   dragent.yaml: |
     new_k8s: true
     k8s_cluster_name: your-cluster-name

diff --git a/resources/cassandra/include/sysdig-agent.yaml b/resources/cassandra/include/sysdig-agent.yaml
@@ -21,13 +21,13 @@ data:
       - action: keep
         source_labels: [__meta_kubernetes_pod_host_ip]
         regex: __HOSTIPS__
-      - action: kee(and cluster hierarchy)
       - action: replace
         source_labels: [__meta_kubernetes_pod_uid]
         target_label: sysdig_k8s_pod_uid
       - action: replace
         source_labels: [__meta_kubernetes_pod_container_name]
-        target_label: sysdig_k8s_pod_container_namep
+        target_label: sysdig_k8s_pod_container_name
+      - action: keep
         source_labels: [__meta_kubernetes_pod_annotation_prometheus_io_scrape]
         regex: true
       - action: replace
@@ -43,8 +43,6 @@ data:
         regex: ([^:]+)(?::\d+)?;(\d+)
         replacement: $1:$2
         target_label: __address__
-        # Holding on to pod-id and container name so we can associate the metrics
-        # with the container
   dragent.yaml: |-
     metrics_excess_log: true
     k8s_cluster_name: YourClusterName