Updated OCP-Haproxy router with PromScrape V2 config (#139)

* Updated OCP-Haproxy router with PromScrape V2 config.

* Fixed typo

Author: daviddetorres

resources/openshift-haproxy-router/INSTALL.v3.11.md

@@ -13,13 +13,19 @@ kubectl -n default get deploymentConfig router -o json | jq -r '.spec.template.s
 >Note: to execute these commands ou will need the tool [jq](https://stedolan.github.io/jq/)
 
 # Sysdig Agent configuration
-To set up the configuration of the Sysdig Agent to collect the metrics from the HAProxy router in OpenShift 3.11 you have to add the following configuration changing the `USER` and `PASSWORD` by the values extracted in the previous step:
+To set up the configuration of the Sysdig Agent to collect the metrics from the HAProxy router in OpenShift 3.11 you have to add in the job of the `prometheus.yaml`file the following configuration changing the `USER` and `PASSWORD` by the values extracted in the previous step:
 ```yaml
-prometheus:
-  process_filter: 
-    - include: 
-        port: 1936
-        conf: 
-          username: "USER"
-          password: "PASSWORD"
+scrape_configs:
+  - job_name: 'haproxy-router'
+      basic_auth:
+        username: USER
+        password: PASSWORD
+      relabel_configs:
+      - action: keep
+        source_labels:
+        - __meta_kubernetes_namespace
+        - __meta_kubernetes_pod_name
+        separator: '/'
+        regex: 'default/router-1-.+'
 ```
+You can check a configuration example below. 

resources/openshift-haproxy-router/INSTALL.v4.3.md

@@ -13,13 +13,19 @@ kubectl -n openshift-ingress get secret router-stats-default -o json | jq -r '.d
 >Note: to execute these commands ou will need the tool [jq](https://stedolan.github.io/jq/)
 
 # Sysdig Agent configuration
-To set up the configuration of the Sysdig Agent to collect the metrics from the HAProxy router in OpenShift 4.3 you have to add the following configuration changing the `USER` and `PASSWORD` by the values extracted in the previous step:
+To set up the configuration of the Sysdig Agent to collect the metrics from the HAProxy router in OpenShift 4.3 you have to add in the job of the `prometheus.yaml`file the following configuration changing the `USER` and `PASSWORD` by the values extracted in the previous step:
 ```yaml
-prometheus:
-  process_filter: 
-    - include: 
-        port: 1936
-        conf: 
-          username: "USER"
-          password: "PASSWORD"
+scrape_configs:
+  - job_name: 'haproxy-router'
+      basic_auth:
+        username: USER
+        password: PASSWORD
+      relabel_configs:
+      - action: keep
+        source_labels:
+        - __meta_kubernetes_namespace
+        - __meta_kubernetes_pod_name
+        separator: '/'
+        regex: 'default/router-1-.+'
 ```
+You can check a configuration example below. 

resources/openshift-haproxy-router/include/configuration.yaml

@@ -1 +1,62 @@
-#
+apiVersion: v1
+data:
+  dragent.yaml: |
+    new_k8s: true
+    k8s_cluster_name: your-cluster-name
+    metrics_excess_log: true
+    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
+    snaplen: 512
+    tags: role:cluster
+  prometheus.yaml: |
+    global:
+      scrape_interval: 10s
+    scrape_configs:
+    - job_name: 'haproxy-router'
+      basic_auth:
+        username: USER
+        password: PASSWORD
+      tls_config:
+        insecure_skip_verify: true
+      kubernetes_sd_configs:
+      - role: pod
+      relabel_configs:
+        # Trying to ensure we only scrape local targets
+        # We need the wildcard at the end because in AWS the node name is the FQDN,
+        # whereas in Azure the node name is the base host name
+      - action: keep
+        source_labels: [__meta_kubernetes_pod_host_ip]
+        regex: __HOSTIPS__
+      - action: keep
+        source_labels:
+        - __meta_kubernetes_namespace
+        - __meta_kubernetes_pod_name
+        separator: '/'
+        regex: 'default/router-1-.+'
+        # Holding on to pod-id and container name so we can associate the metrics
+        # with the container (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_name
+
+kind: ConfigMap
+metadata:
+    labels:
+      app: sysdig-agent
+    name: sysdig-agent
+    namespace: sysdig-agent