Merge pull request #167 from sysdiglabs/staging

Staging to Prod (June 2021)

Author: daviddetorres

resources/apache/alerts.yaml

@@ -8,4 +8,4 @@ descriptionFile: ALERTS.md
 configurations:
 - name: alerts.yaml
   kind: Prometheus
-  file: include/alerts-rules.yaml
+  file: include/alerts-rules.yaml

resources/aws-alb/alerts.yaml

@@ -8,4 +8,4 @@ descriptionFile: ALERTS.md
 configurations:
 - kind: Prometheus
   name: alerts.yaml
-  file: include/alerts-rules.yaml
+  file: include/alerts-rules.yaml

resources/elasticsearch/INSTALL.md

@@ -56,6 +56,8 @@ spec:
       ...
 ```
 # Sysdig Agent configuration
+> Requires Sysdig Agent >= v11.3 
+
 In the ElasticSearch exporter deployment, use the Sysdig annotations to configure the port of the exporter as scraping port. You can see an example in the `exporter_no_credentials.yaml` file.
 
 Additionally, you can use these labels to add the namespace, workload type, and name of the database the exporter will retrieve the data from.
@@ -68,13 +70,15 @@ spec:
         promcat.sysdig.com/port: "9108"
 
         # Add here the namespace, workload type (deployment, statefulset, replicaset, daemonset) 
-
         # and workload name of the instance that the exporter will take data from
         promcat.sysdig.com/target_ns: elastic-namespace
         promcat.sysdig.com/target_workload_type: statefulset
         promcat.sysdig.com/target_workload_name: elasticsearch
 ```
 This way, on the Sysdig Monitor, you can view the associated metrics corresponding to the database pods and the exporter.
+
+
+
 After you configure the Sysdig annotations, download the sample configuration file and apply it by:
 ```bash
 kubectl apply -f sysdig-agent-config.yaml

resources/elasticsearch/include/exporter_no_credentials.yaml

@@ -21,7 +21,6 @@ spec:
         promcat.sysdig.com/target_ns: elastic-namespace
         promcat.sysdig.com/target_workload_type: statefulset
         promcat.sysdig.com/target_workload_name: elasticsearch
-        promcat.sysdig.com/target_cluster_name: cluster-name
       labels:
         app: elasticsearch-exporter
     spec:

resources/elasticsearch/include/exporter_with_credentials.yaml

@@ -22,7 +22,6 @@ spec:
         promcat.sysdig.com/target_ns: elastic-namespace
         promcat.sysdig.com/target_workload_type: statefulset
         promcat.sysdig.com/target_workload_name: elasticsearch
-        promcat.sysdig.com/target_cluster_name: cluster-name
       labels:
         app: elasticsearch-exporter
     spec:

resources/elasticsearch/include/sysdig-agent.yaml

@@ -56,9 +56,6 @@ data:
       - action: replace
         source_labels: [__meta_kubernetes_pod_annotation_promcat_sysdig_com_target_workload_name]
         target_label: kube_workload_name
-      - action: replace
-        source_labels: [__meta_kubernetes_pod_annotation_promcat_sysdig_com_target_cluster_name]
-        target_label: kube_cluster_name
       - action: replace
         replacement: true
         target_label: sysdig_omit_source

resources/postgresql/INSTALL.md

@@ -104,7 +104,9 @@ kubectl create secret generic postgres-exporter-auth \
 
 You can use the `postgresql-auth-deploy.yaml` file as an example of a deployment with SSL authentication.
 
-# SYSDIG AGENT CONFIGURATION
+# Sysdig Agent configuration
+> Requires Sysdig Agent >= v11.3 
+
 In the Postgres exporter deployment, use the Sysdig annotations to configure the port of the exporter as the scraping port. See the example in the `postgresql-standalone-exporter.yaml` file.
 
 Additionally, you can use the labels to add the namespace, workload type, and name of the database the exporter will take data from.

resources/postgresql/include/postgresql-standalone-exporter.yaml

@@ -19,7 +19,6 @@ spec:
         promcat.sysdig.com/target_ns: default
         promcat.sysdig.com/target_workload_type: deployment
         promcat.sysdig.com/target_workload_name: postgres
-        promcat.sysdig.com/target_cluster_name: cluster-name
     spec:
       containers:
         - name: postgres-exporter

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

@@ -56,9 +56,6 @@ data:
       - action: replace
         source_labels: [__meta_kubernetes_pod_annotation_promcat_sysdig_com_target_workload_name]
         target_label: kube_workload_name
-      - action: replace
-        source_labels: [__meta_kubernetes_pod_annotation_promcat_sysdig_com_target_cluster_name]
-        target_label: kube_cluster_name
       - action: replace
         replacement: true
         target_label: sysdig_omit_source

resources/redis/INSTALL.md

@@ -27,6 +27,8 @@ kubectl apply -f redis-exporter-deploy.yaml
 If your Redis instance does not requires authentication, you can remove the `REDIS_USER` and `REDIS_PASSWORD` environment variables.
 
 # Sysdig Agent configuration
+> Requires Sysdig Agent >= v11.3 
+
 In the Redis exporter Deployment use the Sysdig annotations to configure the port of the exporter as the scraping port. See the example given in the `redis-exporter-deploy.yaml` file.
 
 Additionally, you can use the labels to add the namespace, workload type, and name of the database the exporter will take data from.