Merge pull request #214 from sysdiglabs/staging

Staging

Author: daviddetorres

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

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

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

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

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

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

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

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

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

resources/portworx/alerts.yaml

@@ -69,15 +69,15 @@ configurations:
           description: Portworx Cache write hit rate is low.
       - alert: '[Portworx] High Read Latency In Disk'
         expr: |
-          px_disk_stats_read_latency_seconds{ disk=~$disk} > 0.100
+          px_disk_stats_read_latency_seconds > 0.100
         for: 5m
         labels:
           severity: warning
         annotations:
           description: Portworx High Read Latency In Disk.
       - alert: '[Portworx] High Write Latency In Disk'
         expr: |
-          px_disk_stats_write_latency_seconds{ disk=~$disk} > 0.250
+          px_disk_stats_write_latency_seconds > 0.250
         for: 5m
         labels:
           severity: warning
@@ -108,47 +108,47 @@ configurations:
         annotations:
           description: Portworx Disk Full In 12H.
       - alert: '[Portworx] Pool Status Not Online'
-        expr: "px_pool_stats_status{ pool=~$pool} != 1"
+        expr: "px_pool_stats_status != 1"
         for: 5m
         labels:
           severity: warning
         annotations:
           description: Portworx Node Status Not Online.
       - alert: '[Portworx] High Write Latency In Pool'
         expr: |
-          px_pool_stats_write_latency_seconds{ pool=~$pool} > 0.250
+          px_pool_stats_write_latency_seconds > 0.250
         for: 5m
         labels:
           severity: warning
         annotations:
           description: Portworx High Write Latency In Pool.
       - alert: '[Portworx] Pool Full In 48H'
         expr: |
-          predict_linear(px_pool_stats_available_bytes{ pool=~$pool}[48h], 48 * 3600) < 0
+          predict_linear(px_pool_stats_available_bytes[48h], 48 * 3600) < 0
         for: 5m
         labels:
           severity: warning
         annotations:
           description: Portworx Pool Full In 48H.
       - alert: '[Portworx] Pool Full In 12H'
         expr: |
-          predict_linear(px_pool_stats_available_bytes{ pool=~$pool}[12h], 12 * 3600) < 0
+          predict_linear(px_pool_stats_available_bytes[12h], 12 * 3600) < 0
         for: 5m
         labels:
           severity: warning
         annotations:
           description: Portworx Pool Full In 12H.
       - alert: '[Portworx] High Write Latency In Volume'
         expr: |
-          px_volume_write_latency_seconds{ pvc=~$pvc} > 0.250
+          px_volume_write_latency_seconds > 0.250
         for: 5m
         labels:
           severity: warning
         annotations:
           description: Portworx High Write Latency In Volume.
       - alert: '[Portworx] High Read Latency In Volume'
         expr: |
-          px_volume_read_latency_seconds{ pvc=~$pvc} > 0.100
+          px_volume_read_latency_seconds > 0.100
         for: 5m
         labels:
           severity: warning