Merged from staging

Author: carlosadiegosysdig

apps/kubernetes-control-plane.yaml

@@ -5,9 +5,7 @@ name: "Kubernetes control plane"
 keywords: 
   - Kubernetes
   - Available
-availableVersions: 
-  - '1.14.0'
-  - '1.18.0'
+availableVersions:
   - '1.22.0'
 shortDescription: Open-source system for automating deployment, scaling, and management of containerized applications.
 description: |

future-apps/openshift/INSTALL.md

@@ -1,33 +1,3 @@
 # Gather the metrics from the prometheus deployed by Openshift
 
-You can either follow the steps given below or just download the script that includes all the commands and execute:
-```sh
-sh installation.sh
-```
-
-The Prometheus is behind an oauth proxy so you have to create the secret with the token:
-
-1. Get the token:
-  ```sh
-  export SECRET=`oc get secret -n openshift-monitoring | grep  prometheus-k8s-token | head -n 1 | awk '{ print $1 }'`
-
-  export TOKEN=`echo $(oc get secret $SECRET -n openshift-monitoring -o json | jq -r '.data.token') | base64 -d`
-  ```
-2. Create the secret in `sysdig-agent` namespace:
-  ```sh
-  oc -n sysdig-agent create secret generic prometheus-k8s-token --from-literal=token=$TOKEN
-  ```
-3. Edit the daemonset of sysdig to mount the secret:
-  ```sh
-  oc -n sysdig-agent patch ds sysdig-agent -p '{"spec":{"template":{"spec":{"volumes":[{"name":"prometheus-k8s-token","secret":{"defaultMode":420,"secretName":"prometheus-k8s-token"}}]}}}}'
-
-  oc -n sysdig-agent patch ds sysdig-agent -p '{"spec":{"template":{"spec":{"containers":[{"name":"sysdig-agent","volumeMounts": [{"mountPath": "/opt/draios/kubernetes/prometheus/secrets","name": "prometheus-k8s-token"}]}]}}}}'
-  ```
-4. Apply the recording rules:
-  ```sh
-  oc apply -f rules.yaml
-  ```
-5. Apply the sysdig configuration:
-  ```
-  oc edit cm sysdig-agent
-  ```
+Metrics are automatically gathered by Prometheus Cluster Monitoring, you can query them in the Prometheus built-in console.

future-apps/openshift/README-v3.11.md

@@ -2,10 +2,6 @@
 Red Hat® OpenShift® offers a consistent hybrid cloud foundation for building and scaling containerized applications.
 Benefit from streamlined platform installation and upgrades from one of the enterprise Kubernetes leaders.
 
-Openshift provides a prometheus with all targets and metrics but doesn't provide any dashboard with this information.
-You can gather the metrics with our agent and show all metrics in our dashboards or even in the grafana dashboards with
-the Sysdig datasource as a Prometheus datasource.
-
 For more information, see the exporter config tab.
 
 # Metrics

future-apps/openshift/README-v4.3.md

@@ -2,10 +2,6 @@
 Red Hat® OpenShift® offers a consistent hybrid cloud foundation for building and scaling containerized applications.
 Benefit from streamlined platform installation and upgrades from one of the enterprise Kubernetes leaders.
 
-Openshift provides a prometheus with all targets and metrics but doesn't provide any dashboard with this information.
-You can gather the metrics with our agent and show all metrics in our dashboards or even in the grafana dashboards with
-the Sysdig datasource as a Prometheus datasource.
-
 For more information, see the exporter config tab.
 
 # Metrics

future-apps/openshift/dashboards-v3.11.yaml

@@ -5,27 +5,6 @@ version: 1.0.0
 appVersion:
 - '3.11'
 configurations:
-- name: Ocp3 / Controller manager
-  kind: Sysdig
-  image: openshift/images/controller_manager_sysdig.png
-  description: |
-    This dashboard offers information on:
-    * Controller manager
-  file: include/dashboard-Sysdig-Ocp3---Controller-manager-3.11.json
-- name: Ocp3 / Api
-  kind: Sysdig
-  image: openshift/images/api_sysdig.png
-  description: |
-    This dashboard offers information on:
-    * Api Server
-  file: include/dashboard-Sysdig-Ocp3---Api-3.11.json
-- name: Ocp3 / Kubelet
-  kind: Sysdig
-  image: openshift/images/kubelet_sysdig.png
-  description: |
-    This dashboard offers information on:
-    * Kubelet
-  file: include/dashboard-Sysdig-Ocp3---Kubelet-3.11.json
 - name: Ocp3 / Api
   kind: Grafana
   image: openshift/images/api_grafana.png

future-apps/openshift/dashboards-v4.3.yaml

@@ -5,48 +5,6 @@ version: 1.0.0
 appVersion:
 - '4.3'
 configurations:
-- name: Ocp4 / Controller manager
-  kind: Sysdig
-  image: openshift/images/controller_manager_sysdig.png
-  description: |
-    This dashboard offers information on:
-    * Controller manager
-  file: include/dashboard-Sysdig-Ocp4---Controller-manager-4.3.json
-- name: Ocp4 / Api
-  kind: Sysdig
-  image: openshift/images/api_sysdig.png
-  description: |
-    This dashboard offers information on:
-    * Api Server
-  file: include/dashboard-Sysdig-Ocp4---Api-4.3.json
-- name: Ocp4 / Kubelet
-  kind: Sysdig
-  image: openshift/images/kubelet_sysdig.png
-  description: |
-    This dashboard offers information on:
-    * Kubelet
-  file: include/dashboard-Sysdig-Ocp4---Kubelet-4.3.json
-- name: Ocp4 / Scheduler
-  kind: Sysdig
-  image: openshift/images/scheduler_sysdig.png
-  description: |
-    This dashboard offers information on:
-    * Scheduler
-  file: include/dashboard-Sysdig-Ocp4---Scheduler-4.3.json
-- name: Ocp4 / etcd
-  kind: Sysdig
-  image: openshift/images/etcd_sysdig.png
-  description: |
-    This dashboard offers information on:
-    * etcd
-  file: include/dashboard-Sysdig-Ocp4---etcd-4.3.json
-- name: Ocp4 / coreDNS
-  kind: Sysdig
-  image: openshift/images/coreDNS_sysdig.png
-  description: |
-    This dashboard offers information on:
-    * CoreDNS
-  file: include/dashboard-Sysdig-Ocp4---CoreDNS-4.3.json
 - name: Ocp4 / Api
   kind: Grafana
   image: openshift/images/api_grafana.png

future-apps/openshift/setup-guide-v3.11.yaml

@@ -4,11 +4,5 @@ app: Openshift
 version: 1.0.0
 appVersion:
 - '3.11'
-configurations:
-- name: installation.sh
-  file: include/installation-v3.11.sh
-- name: sysdig-agent.yaml
-  file: include/sysdig-agent.yaml
-- name: rules.yaml
-  file: include/rules-v3.11.yaml
+configurations: []
 descriptionFile: INSTALL.md

future-apps/openshift/setup-guide-v4.3.yaml

@@ -4,11 +4,5 @@ app: Openshift
 version: 1.0.0
 appVersion:
 - '4.3'
-configurations:
-- name: installation.sh
-  file: include/installation-v4.3.sh
-- name: sysdig-agent.yaml
-  file: include/sysdig-agent.yaml
-- name: rules.yaml
-  file: include/rules-v4.3.yaml
+configurations: []
 descriptionFile: INSTALL.md

future-apps/rancher/INSTALL.md

@@ -1,20 +1,9 @@
 # Prerequisites
 ## Enable monitoring
 Rancher can deploy a Prometheus server. To get a default monitoring you have to enable it in the monitoring tab.
-## Mount the etcd certificates in the sysdig agent
-```sh
-kubectl -n sysdig-agent patch ds sysdig-agent -p '{"spec":{"template":{"spec":{"volumes":[{"hostPath":{"path":"/etc/kubernetes/pki/etcd-manager-main","type":"DirectoryOrCreate"},"name":"etcd-certificates"}]}}}}'
 
-kubectl -n sysdig-agent patch ds sysdig-agent -p '{"spec":{"template":{"spec":{"containers":[{"name":"sysdig-agent","volumeMounts": [{"mountPath": "/etc/kubernetes/pki/etcd-manager","name": "etcd-certificates"}]}]}}}}'
-```
 # Gather the metrics from the prometheus deployed by Rancher
-For the control plane metrics, the services are not created by default. To get them in the Prometheus server you have to create new services and seviceMonitors. To gather that metrics with the Sysdig agent, you have to create the rules to filter them, and then federate the metrics with the agent itself.
-
-You can either follow the steps given below or download the script and execute:
-```sh
-sh installation.sh
-```
-And then apply the configuration changes for the `sysdig-agent`.
+For the control plane metrics, the services are not created by default. To get them in the Prometheus server you have to create new services and seviceMonitors. 
 
 1. Apply the services:
 ```bash
@@ -24,108 +13,3 @@ kubectl apply -f services.yaml
 ```bash
 kubectl apply -f service-monitor.yaml
 ```
-## Configuring the Sysdig Agent
-
-In order to collect the metrics you have to enable `promscrape_fastproto` to do. Therefore, ensure that your `dragent.yaml` includes the following values:
-```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
-```
-
-See the example `sysdig-agent.yaml` file given below:
-
-With the promscrape v2 enabled you can scrape the etcd. To do so, ensure that your `sysdig-agent.yaml` includes the prometheus job as given below:
-```yaml
-- job_name: etcd
-  scheme: https
-  tls_config:
-    insecure_skip_verify: true
-    cert_file: /etc/kubernetes/pki/etcd-manager/etcd-clients-ca.crt
-    key_file: /etc/kubernetes/pki/etcd-manager/etcd-clients-ca.key
-  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: 'kube-system/etcd-manager-main.+'
-  - source_labels:
-    - __address__
-    action: replace
-    target_label: __address__
-    regex: (.+?)(\\:\\d)?
-    replacement: $1:4001
-    # 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
-```
-Additionally, you will need a job corresponding to the control plane:
-```yaml
-- job_name: control-plane
-  honor_labels: true
-  metrics_path: '/federate'
-  params:
-    'match[]':
-      - '{sysdig="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: 'cattle-prometheus/prometheus-cluster-monitoring-0'
-  - source_labels:
-    - __address__
-    action: replace
-    target_label: __address__
-    regex: (.+?)(\\:\\d)?
-    replacement: $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
-```
-
-See the examples below.
-
-3. Apply the rules:
-```
-kubectl apply -f rules.yaml
-```
-4. Apply the sysdig configuration:
-```
-kubectl apply -f sysdig-agent.yaml
-```

future-apps/rancher/dashboards.yaml

@@ -5,55 +5,6 @@ version: 1.0.0
 appVersion:
   - '2.5.0'
 configurations:
-- name: Rancher / Api
-  kind: Sysdig
-  image: rancher/images/api_sysdig.png
-  description: |
-    This dashboard offers information on:
-    * Api Server
-  file: include/dashboard-Sysdig-Rancher---Api.json
-- name: Rancher / Controller manager
-  kind: Sysdig
-  image: rancher/images/controller_manager_sysdig.png
-  description: |
-    This dashboard offers information on:
-    * Controller manager
-  file: include/dashboard-Sysdig-Rancher---Controller_Manager.json
-- name: Rancher / Kubelet
-  kind: Sysdig
-  image: rancher/images/kubelet_sysdig.png
-  description: |
-    This dashboard offers information on:
-    * Kubelet
-  file: include/dashboard-Sysdig-Rancher---Kubelet.json
-- name: Rancher / Scheduler
-  kind: Sysdig
-  image: rancher/images/scheduler_sysdig.png
-  description: |
-    This dashboard offers information on:
-    * Scheduler
-  file: include/dashboard-Sysdig-Rancher---Scheduler.json
-- name: Rancher / Proxy
-  kind: Sysdig
-  image: rancher/images/proxy_sysdig.png
-  description: |
-    This dashboard offers information on:
-    * Proxy server
-  file: include/dashboard-Sysdig-Rancher---Proxy.json
-- name: Rancher / CoreDNS
-  kind: Sysdig
-  image: rancher/images/coredns_sysdig.png
-  description: |
-    This dashboard offers information on:
-    * CoreDns
-  file: include/dashboard-Sysdig-Rancher---CoreDNS.json
-- name: Rancher / etcd
-  kind: Sysdig
-  image: rancher/images/etcd_sysdig.png
-  description: |
-    This dashboard offers information on:
-    * Etcd
-  file: include/dashboard-Sysdig-Rancher---etcd.json
 - name: Rancher / Api
   kind: Grafana
   image: rancher/images/api_grafana.png