From 45eb8fb610f7e2a161b1b5a9771ec70ee41e834a Mon Sep 17 00:00:00 2001
From: cruizba <charlesrb94@outlook.com>
Date: Wed, 3 Feb 2021 19:25:09 +0100
Subject: [PATCH] openvidu-pro: minor fix metricbeat ilm and add metrics for
 elasticsearch

---
 .../beats/metricbeat-elasticsearch.yml        |  2 +-
 .../openvidu-server-pro/beats/metricbeat.yml  | 26 +++++++++++++++++++
 .../openvidu-server-pro/docker-compose.yml    |  1 +
 3 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/openvidu-server/deployments/pro/docker-compose/media-node/beats/metricbeat-elasticsearch.yml b/openvidu-server/deployments/pro/docker-compose/media-node/beats/metricbeat-elasticsearch.yml
index 5a2309d9..5bedc23a 100644
--- a/openvidu-server/deployments/pro/docker-compose/media-node/beats/metricbeat-elasticsearch.yml
+++ b/openvidu-server/deployments/pro/docker-compose/media-node/beats/metricbeat-elasticsearch.yml
@@ -2,7 +2,7 @@ metricbeat.modules:
   - module: system
     metricsets:
       - cpu
-        #- diskio
+      - diskio
       - memory
       - network
       - filesystem
diff --git a/openvidu-server/deployments/pro/docker-compose/openvidu-server-pro/beats/metricbeat.yml b/openvidu-server/deployments/pro/docker-compose/openvidu-server-pro/beats/metricbeat.yml
index 09a68d9a..279e2e07 100644
--- a/openvidu-server/deployments/pro/docker-compose/openvidu-server-pro/beats/metricbeat.yml
+++ b/openvidu-server/deployments/pro/docker-compose/openvidu-server-pro/beats/metricbeat.yml
@@ -5,6 +5,32 @@ metricbeat.modules:
   period: 10s
   hosts: ["http://127.0.0.1"]
   server_status_path: "nginx_status"
+- module: system
+  metricsets:
+    - cpu
+    - diskio
+    - memory
+    - network
+    - filesystem
+    - fsstat
+    - process_summary
+    - uptime
+  filesystem.ignore_types: [nfs, smbfs, autofs, devtmpfs, devpts, hugetlbfs, tmpfs, sysfs, securityfs, cgroup2, cgroup, pstore, debugfs, configfs, fusectl, proc, fuse.lxcfs, squashfs]
+  processes: ['.*']
+  processors:
+    - drop_event:
+          when:
+            or:
+              - regexp:
+                    system.network.name: '^(veth|lo|docker|br-)($|)'
+              - regexp:
+                    system.filesystem.mount_point: '^/(sys|cgroup|proc|dev|etc|host)($|/)'
+              - regexp:
+                    system.filesystem.mount_point: '^/hostfs/(sys|cgroup|proc|dev|etc|host)($|/)'
+  enabled: true
+  period: ${OPENVIDU_PRO_STATS_MONITORING_INTERVAL}s
+  cpu.metrics: [normalized_percentages]
 output:
   elasticsearch:
     hosts: ["${OPENVIDU_PRO_ELASTICSEARCH_HOST}"]
+setup.ilm.enabled: false
\ No newline at end of file
diff --git a/openvidu-server/deployments/pro/docker-compose/openvidu-server-pro/docker-compose.yml b/openvidu-server/deployments/pro/docker-compose/openvidu-server-pro/docker-compose.yml
index 3eb8d3cd..a3c0a2db 100644
--- a/openvidu-server/deployments/pro/docker-compose/openvidu-server-pro/docker-compose.yml
+++ b/openvidu-server/deployments/pro/docker-compose/openvidu-server-pro/docker-compose.yml
@@ -148,6 +148,7 @@ services:
             - .env
         environment:
             - OPENVIDU_PRO_ELASTICSEARCH_HOST=${OPENVIDU_PRO_ELASTICSEARCH_HOST:-http://127.0.0.1:9200}
+            - OPENVIDU_PRO_STATS_MONITORING_INTERVAL=${OPENVIDU_PRO_STATS_MONITORING_INTERVAL:-10}
         volumes:
             - ./beats/metricbeat.yml:/usr/share/metricbeat/metricbeat.yml:ro
         command: >