Merge pull request #162 from sysdiglabs/nginx_config

Add config for nginx and nginx ingress

Author: daviddetorres

apps/nginx-ingress.yaml

@@ -3,6 +3,7 @@ apiVersion: v1
 kind: App
 name: "Nginx-Ingress"
 keywords: 
+  - Load-balancer
   - Kubernetes
   - Available
 availableVersions: 

resources/nginx-ingress/INSTALL.md

@@ -10,18 +10,29 @@ controller:
     # if this port is changed, change healthz-port: in extraArgs: accordingly
     enabled: true
   podAnnotations:
-    prometheus.io/scrape: "true"
-    prometheus.io/port: "10254"
+    promcat.sysdig.com/port: "10254"
 ```
 
 # Sysdig Agent configuration
 For the Sysdig Agent to discover and scrape the ngnix ingress controller automatically, enable the `use_promscrape` option in the agent configuration.
 
 ```yaml
   dragent.yaml: |-
+    metrics_excess_log: true
+    k8s_cluster_name: YourClusterName
+    10s_flush_enable: true
+    app_checks_enabled: false
     use_promscrape: true
+    new_k8s: true
+    promscrape_fastproto: true
     prometheus:
       enabled: true
       prom_service_discovery: true
+      log_errors: true
+      max_metrics: 200000
+      max_metrics_per_process: 200000
+      max_tags_per_metric: 100
+      ingest_raw: true
+      ingest_calculated: false
 ```
 An example of the Sysdig Agent configuration file is given below.

resources/nginx-ingress/include/sysdig-agent.yaml

@@ -4,6 +4,37 @@ metadata:
   name: sysdig-agent
   namespace: sysdig-agent
 data:
+  prometheus.yaml: |
+    global:
+      scrape_interval: 10s
+    scrape_configs:
+    - job_name: nginx-ingress-default
+      tls_config:
+        insecure_skip_verify: true
+      kubernetes_sd_configs:
+      - role: pod
+      relabel_configs:
+      - action: keep
+        source_labels: [__meta_kubernetes_pod_host_ip]
+        regex: __HOSTIPS__
+      - action: keep
+        source_labels:
+        - __meta_kubernetes_namespace
+        - __meta_kubernetes_pod_name
+        separator: '/'
+        # Add here the namespace/pod-name of your nginx-ingress exporter instance
+        regex: 'nginx-namespace/nginx-ingress-.+'
+      - action: replace
+        source_labels: [__address__, __meta_kubernetes_pod_annotation_promcat_sysdig_com_port]
+        regex: ([^:]+)(?::\d+)?;(\d+)
+        replacement: $1:$2
+        target_label: __address__
+      - 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_name
   dragent.yaml: |-
     metrics_excess_log: true
     k8s_cluster_name: YourClusterName

resources/nginx/INSTALL.md

@@ -6,14 +6,23 @@ Note that the deployment has a label, `app`. This label will be included in the
 # Sysdig Agent configuration
 In the Sysdig Agent configuration, add the following snippet to include the label `app` as a metric label.
 ```yaml
-process_filter:
-  - include:
-      kubernetes.pod.annotation.prometheus.io/scrape: true
-      conf:
-        path: "{kubernetes.pod.annotation.prometheus.io/path}"
-        port: "{kubernetes.pod.annotation.prometheus.io/port}"
-        tags:
-          app: "{kubernetes.pod.label.app}"
+  dragent.yaml: |-
+    metrics_excess_log: true
+    k8s_cluster_name: YourClusterName
+    10s_flush_enable: true
+    app_checks_enabled: false
+    use_promscrape: true
+    new_k8s: true
+    promscrape_fastproto: true
+    prometheus:
+      enabled: true
+      prom_service_discovery: true
+      log_errors: true
+      max_metrics: 200000
+      max_metrics_per_process: 200000
+      max_tags_per_metric: 100
+      ingest_raw: true
+      ingest_calculated: false
 ```
 
 You can download the sample configuration file below and apply it by:

resources/nginx/include/configuration.yaml

@@ -12,8 +12,7 @@ spec:
       labels:
         app: nginx-A
       annotations:
-        prometheus.io/scrape: "true"
-        prometheus.io/port: "9113"
+        promcat.sysdig.com/port: "9113"
     spec:
       containers:
       - name: nginx

resources/nginx/include/sysdig-agent-config.yaml

@@ -4,6 +4,36 @@ metadata:
   name: sysdig-agent
   namespace: sysdig-agent
 data:
+  prometheus.yaml: |
+    global:
+      scrape_interval: 10s
+    scrape_configs:
+    - job_name: nginx-default
+      tls_config:
+        insecure_skip_verify: true
+      kubernetes_sd_configs:
+      - role: pod
+      relabel_configs:
+      - action: keep
+        source_labels: [__meta_kubernetes_pod_host_ip]
+        regex: __HOSTIPS__
+      - action: keep
+        source_labels:
+        - __meta_kubernetes_namespace
+        - __meta_kubernetes_pod_name
+        separator: '/'
+        regex: 'nginx-namespace/nginx-.+'
+      - action: replace
+        source_labels: [__address__, __meta_kubernetes_pod_annotation_promcat_sysdig_com_port]
+        regex: ([^:]+)(?::\d+)?;(\d+)
+        replacement: $1:$2
+        target_label: __address__
+      - 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_name
   dragent.yaml: |-
     metrics_excess_log: true
     k8s_cluster_name: YourClusterName