From d702f9c2e0d2c3c1505dc3f8698aa892b72ce6ff Mon Sep 17 00:00:00 2001
From: Adrian Czarnecki <adrian.czarnecki@ts.fujitsu.com>
Date: Wed, 24 Mar 2021 08:04:50 -0700
Subject: [PATCH] Remove incorrect plugins configuration for docker image.

These plugins are not working with docker image because of docker architecture,
this kind of metrics are collected by cadvisor plugin.

Change-Id: I67c47ddfc26a30f6e48bcf4102c750812970be97
---
 docker/collector/start.sh                 | 6 ------
 docker/collector/templates/cpu.yaml.j2    | 5 -----
 docker/collector/templates/disk.yaml.j2   | 6 ------
 docker/collector/templates/load.yaml.j2   | 5 -----
 docker/collector/templates/memory.yaml.j2 | 5 -----
 5 files changed, 27 deletions(-)
 delete mode 100644 docker/collector/templates/cpu.yaml.j2
 delete mode 100644 docker/collector/templates/disk.yaml.j2
 delete mode 100644 docker/collector/templates/load.yaml.j2
 delete mode 100644 docker/collector/templates/memory.yaml.j2

diff --git a/docker/collector/start.sh b/docker/collector/start.sh
index 42f75b92..f138dbef 100644
--- a/docker/collector/start.sh
+++ b/docker/collector/start.sh
@@ -94,12 +94,6 @@ if [ "$MONASCA_MONITORING" = "true" ] || [ "$MONASCA_LOG_MONITORING" = "true" ];
   template $PLUGIN_TEMPLATES/process.yaml.j2 $AGENT_PLUGINS/process.yaml
 fi
 
-# System.
-template $PLUGIN_TEMPLATES/cpu.yaml.j2 $AGENT_PLUGINS/cpu.yaml
-template $PLUGIN_TEMPLATES/disk.yaml.j2 $AGENT_PLUGINS/disk.yaml
-template $PLUGIN_TEMPLATES/load.yaml.j2 $AGENT_PLUGINS/load.yaml
-template $PLUGIN_TEMPLATES/memory.yaml.j2 $AGENT_PLUGINS/memory.yaml
-
 # Apply user templates.
 for f in $USER_PLUGINS/*.yaml.j2; do
   if [ -e "$f" ]; then
diff --git a/docker/collector/templates/cpu.yaml.j2 b/docker/collector/templates/cpu.yaml.j2
deleted file mode 100644
index 790bed2f..00000000
--- a/docker/collector/templates/cpu.yaml.j2
+++ /dev/null
@@ -1,5 +0,0 @@
-init_config:
-  process_fs_path: /rootfs/proc
-instances:
-    # Cpu check only supports one configured instance
-- name: cpu_stats
diff --git a/docker/collector/templates/disk.yaml.j2 b/docker/collector/templates/disk.yaml.j2
deleted file mode 100644
index bec14720..00000000
--- a/docker/collector/templates/disk.yaml.j2
+++ /dev/null
@@ -1,6 +0,0 @@
-init_config:
-  process_fs_path: /rootfs/proc
-instances:
-    # Disk check only supports one configured instance
-- name: disk_stats
-  ignore_filesystem_types: iso9660,tmpfs,nsfs
diff --git a/docker/collector/templates/load.yaml.j2 b/docker/collector/templates/load.yaml.j2
deleted file mode 100644
index c825934a..00000000
--- a/docker/collector/templates/load.yaml.j2
+++ /dev/null
@@ -1,5 +0,0 @@
-init_config:
-  process_fs_path: /rootfs/proc
-instances:
-    # Load check only supports one configured instance
-- name: load_stats
diff --git a/docker/collector/templates/memory.yaml.j2 b/docker/collector/templates/memory.yaml.j2
deleted file mode 100644
index 5c99c446..00000000
--- a/docker/collector/templates/memory.yaml.j2
+++ /dev/null
@@ -1,5 +0,0 @@
-init_config:
-  process_fs_path: /rootfs/proc
-instances:
-    # Memory check only supports one configured instance
-- name: memory_stats