Merge "Remove incorrect plugins configuration for docker image."

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

docker/collector/templates/cpu.yaml.j2

@@ -1,5 +0,0 @@
-init_config:
-  process_fs_path: /rootfs/proc
-instances:
-    # Cpu check only supports one configured instance
-- name: cpu_stats

docker/collector/templates/disk.yaml.j2

@@ -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

docker/collector/templates/load.yaml.j2

@@ -1,5 +0,0 @@
-init_config:
-  process_fs_path: /rootfs/proc
-instances:
-    # Load check only supports one configured instance
-- name: load_stats

docker/collector/templates/memory.yaml.j2

@@ -1,5 +0,0 @@
-init_config:
-  process_fs_path: /rootfs/proc
-instances:
-    # Memory check only supports one configured instance
-- name: memory_stats