Skip to content

Commit adcdb26

Browse files
daviddetorresdaviddetorres
authored
Merge pull request #213 from sysdiglabs/fix-cassandra-config
Fixed config in Cassandra and AWS apps
2 parents 2f95d9a + b3c6a98 commit adcdb26

File tree

9 files changed

+18
-36
lines changed

9 files changed

+18
-36
lines changed

‎resources/aws-alb/include/sysdig-agent-config.yaml‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@ data:
2323
- action: keep
2424
source_labels: [__meta_kubernetes_pod_host_ip]
2525
regex: __HOSTIPS__
26-
- action: kee(and cluster hierarchy)
2726
- action: replace
2827
source_labels: [__meta_kubernetes_pod_uid]
2928
target_label: sysdig_k8s_pod_uid
3029
- action: replace
3130
source_labels: [__meta_kubernetes_pod_container_name]
32-
target_label: sysdig_k8s_pod_container_namep
31+
target_label: sysdig_k8s_pod_container_name
32+
- action: keep
3333
source_labels: [__meta_kubernetes_pod_annotation_prometheus_io_scrape]
3434
regex: true
3535
- action: replace
@@ -45,8 +45,6 @@ data:
4545
regex: ([^:]+)(?::\d+)?;(\d+)
4646
replacement: $1:$2
4747
target_label: __address__
48-
# Holding on to pod-id and container name so we can associate the metrics
49-
# with the container
5048
dragent.yaml: |
5149
new_k8s: true
5250
k8s_cluster_name: your-cluster-name

‎resources/aws-ebs/include/sysdig-agent-config.yaml‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@ data:
2323
- action: keep
2424
source_labels: [__meta_kubernetes_pod_host_ip]
2525
regex: __HOSTIPS__
26-
- action: kee(and cluster hierarchy)
2726
- action: replace
2827
source_labels: [__meta_kubernetes_pod_uid]
2928
target_label: sysdig_k8s_pod_uid
3029
- action: replace
3130
source_labels: [__meta_kubernetes_pod_container_name]
32-
target_label: sysdig_k8s_pod_container_namep
31+
target_label: sysdig_k8s_pod_container_name
32+
- action: keep
3333
source_labels: [__meta_kubernetes_pod_annotation_prometheus_io_scrape]
3434
regex: true
3535
- action: replace
@@ -45,8 +45,6 @@ data:
4545
regex: ([^:]+)(?::\d+)?;(\d+)
4646
replacement: $1:$2
4747
target_label: __address__
48-
# Holding on to pod-id and container name so we can associate the metrics
49-
# with the container
5048
dragent.yaml: |
5149
new_k8s: true
5250
k8s_cluster_name: your-cluster-name

‎resources/aws-elb/include/sysdig-agent-config.yaml‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@ data:
2323
- action: keep
2424
source_labels: [__meta_kubernetes_pod_host_ip]
2525
regex: __HOSTIPS__
26-
- action: kee(and cluster hierarchy)
2726
- action: replace
2827
source_labels: [__meta_kubernetes_pod_uid]
2928
target_label: sysdig_k8s_pod_uid
3029
- action: replace
3130
source_labels: [__meta_kubernetes_pod_container_name]
32-
target_label: sysdig_k8s_pod_container_namep
31+
target_label: sysdig_k8s_pod_container_name
32+
- action: keep
3333
source_labels: [__meta_kubernetes_pod_annotation_prometheus_io_scrape]
3434
regex: true
3535
- action: replace
@@ -45,8 +45,6 @@ data:
4545
regex: ([^:]+)(?::\d+)?;(\d+)
4646
replacement: $1:$2
4747
target_label: __address__
48-
# Holding on to pod-id and container name so we can associate the metrics
49-
# with the container
5048
dragent.yaml: |
5149
new_k8s: true
5250
k8s_cluster_name: your-cluster-name

‎resources/aws-fargate/include/sysdig-agent-config.yaml‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@ data:
2323
- action: keep
2424
source_labels: [__meta_kubernetes_pod_host_ip]
2525
regex: __HOSTIPS__
26-
- action: kee(and cluster hierarchy)
2726
- action: replace
2827
source_labels: [__meta_kubernetes_pod_uid]
2928
target_label: sysdig_k8s_pod_uid
3029
- action: replace
3130
source_labels: [__meta_kubernetes_pod_container_name]
32-
target_label: sysdig_k8s_pod_container_namep
31+
target_label: sysdig_k8s_pod_container_name
32+
- action: keep
3333
source_labels: [__meta_kubernetes_pod_annotation_prometheus_io_scrape]
3434
regex: true
3535
- action: replace
@@ -45,8 +45,6 @@ data:
4545
regex: ([^:]+)(?::\d+)?;(\d+)
4646
replacement: $1:$2
4747
target_label: __address__
48-
# Holding on to pod-id and container name so we can associate the metrics
49-
# with the container
5048
dragent.yaml: |
5149
new_k8s: true
5250
k8s_cluster_name: your-cluster-name

‎resources/aws-lambda/include/sysdig-agent-config.yaml‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@ data:
2323
- action: keep
2424
source_labels: [__meta_kubernetes_pod_host_ip]
2525
regex: __HOSTIPS__
26-
- action: kee(and cluster hierarchy)
2726
- action: replace
2827
source_labels: [__meta_kubernetes_pod_uid]
2928
target_label: sysdig_k8s_pod_uid
3029
- action: replace
3130
source_labels: [__meta_kubernetes_pod_container_name]
32-
target_label: sysdig_k8s_pod_container_namep
31+
target_label: sysdig_k8s_pod_container_name
32+
- action: keep
3333
source_labels: [__meta_kubernetes_pod_annotation_prometheus_io_scrape]
3434
regex: true
3535
- action: replace
@@ -45,8 +45,6 @@ data:
4545
regex: ([^:]+)(?::\d+)?;(\d+)
4646
replacement: $1:$2
4747
target_label: __address__
48-
# Holding on to pod-id and container name so we can associate the metrics
49-
# with the container
5048
dragent.yaml: |
5149
new_k8s: true
5250
k8s_cluster_name: your-cluster-name

‎resources/aws-rds/include/sysdig-agent-config.yaml‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@ data:
2323
- action: keep
2424
source_labels: [__meta_kubernetes_pod_host_ip]
2525
regex: __HOSTIPS__
26-
- action: kee(and cluster hierarchy)
2726
- action: replace
2827
source_labels: [__meta_kubernetes_pod_uid]
2928
target_label: sysdig_k8s_pod_uid
3029
- action: replace
3130
source_labels: [__meta_kubernetes_pod_container_name]
32-
target_label: sysdig_k8s_pod_container_namep
31+
target_label: sysdig_k8s_pod_container_name
32+
- action: keep
3333
source_labels: [__meta_kubernetes_pod_annotation_prometheus_io_scrape]
3434
regex: true
3535
- action: replace
@@ -45,8 +45,6 @@ data:
4545
regex: ([^:]+)(?::\d+)?;(\d+)
4646
replacement: $1:$2
4747
target_label: __address__
48-
# Holding on to pod-id and container name so we can associate the metrics
49-
# with the container
5048
dragent.yaml: |
5149
new_k8s: true
5250
k8s_cluster_name: your-cluster-name

‎resources/aws-s3/include/sysdig-agent-config.yaml‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@ data:
2323
- action: keep
2424
source_labels: [__meta_kubernetes_pod_host_ip]
2525
regex: __HOSTIPS__
26-
- action: kee(and cluster hierarchy)
2726
- action: replace
2827
source_labels: [__meta_kubernetes_pod_uid]
2928
target_label: sysdig_k8s_pod_uid
3029
- action: replace
3130
source_labels: [__meta_kubernetes_pod_container_name]
32-
target_label: sysdig_k8s_pod_container_namep
31+
target_label: sysdig_k8s_pod_container_name
32+
- action: keep
3333
source_labels: [__meta_kubernetes_pod_annotation_prometheus_io_scrape]
3434
regex: true
3535
- action: replace
@@ -45,8 +45,6 @@ data:
4545
regex: ([^:]+)(?::\d+)?;(\d+)
4646
replacement: $1:$2
4747
target_label: __address__
48-
# Holding on to pod-id and container name so we can associate the metrics
49-
# with the container
5048
dragent.yaml: |
5149
new_k8s: true
5250
k8s_cluster_name: your-cluster-name

‎resources/aws-sqs/include/sysdig-agent-config.yaml‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@ data:
2323
- action: keep
2424
source_labels: [__meta_kubernetes_pod_host_ip]
2525
regex: __HOSTIPS__
26-
- action: kee(and cluster hierarchy)
2726
- action: replace
2827
source_labels: [__meta_kubernetes_pod_uid]
2928
target_label: sysdig_k8s_pod_uid
3029
- action: replace
3130
source_labels: [__meta_kubernetes_pod_container_name]
32-
target_label: sysdig_k8s_pod_container_namep
31+
target_label: sysdig_k8s_pod_container_name
32+
- action: keep
3333
source_labels: [__meta_kubernetes_pod_annotation_prometheus_io_scrape]
3434
regex: true
3535
- action: replace
@@ -45,8 +45,6 @@ data:
4545
regex: ([^:]+)(?::\d+)?;(\d+)
4646
replacement: $1:$2
4747
target_label: __address__
48-
# Holding on to pod-id and container name so we can associate the metrics
49-
# with the container
5048
dragent.yaml: |
5149
new_k8s: true
5250
k8s_cluster_name: your-cluster-name

‎resources/cassandra/include/sysdig-agent.yaml‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@ data:
2121
- action: keep
2222
source_labels: [__meta_kubernetes_pod_host_ip]
2323
regex: __HOSTIPS__
24-
- action: kee(and cluster hierarchy)
2524
- action: replace
2625
source_labels: [__meta_kubernetes_pod_uid]
2726
target_label: sysdig_k8s_pod_uid
2827
- action: replace
2928
source_labels: [__meta_kubernetes_pod_container_name]
30-
target_label: sysdig_k8s_pod_container_namep
29+
target_label: sysdig_k8s_pod_container_name
30+
- action: keep
3131
source_labels: [__meta_kubernetes_pod_annotation_prometheus_io_scrape]
3232
regex: true
3333
- action: replace
@@ -43,8 +43,6 @@ data:
4343
regex: ([^:]+)(?::\d+)?;(\d+)
4444
replacement: $1:$2
4545
target_label: __address__
46-
# Holding on to pod-id and container name so we can associate the metrics
47-
# with the container
4846
dragent.yaml: |-
4947
metrics_excess_log: true
5048
k8s_cluster_name: YourClusterName

0 commit comments

Comments
 (0)