Refactor Distributed Analytics project structure

Modified the project structure to improve maintainability and to add future CI and
integration test support.

Change-Id: Id30bfb1f83f23785a6b5f99e81f42f752d59c0f8
Issue-ID: ONAPARC-280
Signed-off-by: Dileep Ranganathan <dileep.ranganathan@intel.com>

39 files changed, 0 insertions, 1373 deletions

diff --git a/vnfs/DAaaS/collection/charts/cadvisor/.helmignore b/vnfs/DAaaS/collection/charts/cadvisor/.helmignore
deleted file mode 100644
index 50af0317..00000000
--- a/vnfs/DAaaS/collection/charts/cadvisor/.helmignore
+++ /dev/null
@@ -1,22 +0,0 @@
-# Patterns to ignore when building packages.
-# This supports shell glob matching, relative path matching, and
-# negation (prefixed with !). Only one pattern per line.
-.DS_Store
-# Common VCS dirs
-.git/
-.gitignore
-.bzr/
-.bzrignore
-.hg/
-.hgignore
-.svn/
-# Common backup files
-*.swp
-*.bak
-*.tmp
-*~
-# Various IDEs
-.project
-.idea/
-*.tmproj
-.vscode/
diff --git a/vnfs/DAaaS/collection/charts/cadvisor/Chart.yaml b/vnfs/DAaaS/collection/charts/cadvisor/Chart.yaml
deleted file mode 100644
index aea55a29..00000000
--- a/vnfs/DAaaS/collection/charts/cadvisor/Chart.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 2019 Intel Corporation, Inc
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-apiVersion: v1
-appVersion: "1.0"
-description: Cadvisor Helm Chart 
-name: cadvisor
-version: 0.1.0
diff --git a/vnfs/DAaaS/collection/charts/cadvisor/templates/NOTES.txt b/vnfs/DAaaS/collection/charts/cadvisor/templates/NOTES.txt
deleted file mode 100644
index 3eea9994..00000000
--- a/vnfs/DAaaS/collection/charts/cadvisor/templates/NOTES.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright (c) 2019 Intel Corporation.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
-1. Get the application URL by running these commands:
-{{- if .Values.ingress.enabled }}
-{{- range .Values.ingress.hosts }}
-  http://{{ . }}
-{{- end }}
-{{- else if contains "NodePort" .Values.cadvisor_prometheus.service.type }}
-  NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "name" . }})
-  NODE_IPS=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[*].status.addresses[0].address}")
-  visit http://NODE_IP:NODE_PORT
-{{- else if contains "LoadBalancer" .Values.cadvisor_prometheus.service.type }}
-     NOTE: It may take a few minutes for the LoadBalancer IP to be available.
-           You can watch the status of by running 'kubectl get svc -w {{ include "name" . }}'
-  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "name" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
-  echo http://$SERVICE_IP:{{ .Values.service.externalPort }}
-{{- else if contains "ClusterIP" .Values.cadvisor_prometheus.service.type }}
-  export POD_NAME=$(kubectl get pods --namespace={{ .Release.Namespace }} -l "app={{ template "name" . }},release={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
-  echo "Visit http://127.0.0.1:8080 to use your application"
-  kubectl port-forward $POD_NAME 8080:{{ .Values.cadvisor_prometheus.service.targetPort }}
-{{- end }}
diff --git a/vnfs/DAaaS/collection/charts/cadvisor/templates/_helpers.tpl b/vnfs/DAaaS/collection/charts/cadvisor/templates/_helpers.tpl
deleted file mode 100644
index ea2a3266..00000000
--- a/vnfs/DAaaS/collection/charts/cadvisor/templates/_helpers.tpl
+++ /dev/null
@@ -1,25 +0,0 @@
-{{/* vim: set filetype=mustache: */}}
-{{/*
-Expand the name of the chart.
-*/}}
-{{- define "name" -}}
-{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{/*
-Create a default fully qualified app name.
-We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
-*/}}
-{{- define "fullname" -}}
-{{- $name := default .Chart.Name .Values.nameOverride -}}
-{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{/* Workaround for https://github.com/helm/helm/issues/3117 */}}
-{{- define "rangeskipempty" -}}
-{{- range $key, $value := . }}
-{{- if $value }}
-{{ $key }}: {{ $value }}
-{{- end }}
-{{- end }}
-{{- end }}
diff --git a/vnfs/DAaaS/collection/charts/cadvisor/templates/daemonset.yaml b/vnfs/DAaaS/collection/charts/cadvisor/templates/daemonset.yaml
deleted file mode 100644
index e287c7d8..00000000
--- a/vnfs/DAaaS/collection/charts/cadvisor/templates/daemonset.yaml
+++ /dev/null
@@ -1,79 +0,0 @@
-{{/*
-# Copyright 2019 Intel Corporation, Inc
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-*/}}
-
-apiVersion: apps/v1beta2
-kind: DaemonSet
-metadata:
-  name: {{ template "fullname" . }} 
-  labels:
-    app: {{ template "name" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
-spec:
-  replicas: {{ .Values.replicaCount }}
-  updateStrategy:
-    type: RollingUpdate
-  selector:
-    matchLabels:
-      name: {{ template "fullname" . }}
-  template:
-    metadata:
-      labels:
-        name: {{ template "fullname" . }}
-        app: {{ template "name" . }}
-        collector: cadvisor
-        release: {{ .Release.Name }}
-    spec:
-      hostNetwork: true
-      containers:
-      - name: {{ .Chart.Name }}
-        image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
-        imagePullPolicy: {{ .Values.image.pullPolicy }}
-        securityContext:
-          privileged: true
-        volumeMounts:
-        - name: rootfs
-          mountPath: /rootfs
-          readOnly: true
-        - name: var-run
-          mountPath: /var/run
-          readOnly: false
-        - name: sys
-          mountPath: /sys
-          readOnly: true
-        - name: docker
-          mountPath: /var/lib/docker
-          readOnly: true
-        ports:
-          - name: http
-            containerPort: 8080
-            protocol: TCP
-        args:
-          - --housekeeping_interval=10s
-      terminationGracePeriodSeconds: 30
-      volumes:
-      - name: rootfs
-        hostPath:
-          path: /
-      - name: var-run
-        hostPath:
-          path: /var/run
-      - name: sys
-        hostPath:
-          path: /sys
-      - name: docker
-        hostPath:
-          path: /var/lib/docker
diff --git a/vnfs/DAaaS/collection/charts/cadvisor/templates/service.yaml b/vnfs/DAaaS/collection/charts/cadvisor/templates/service.yaml
deleted file mode 100644
index a8a932d1..00000000
--- a/vnfs/DAaaS/collection/charts/cadvisor/templates/service.yaml
+++ /dev/null
@@ -1,37 +0,0 @@
-{{/*
-# Copyright 2019 Intel Corporation, Inc
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-*/}}
-
-apiVersion: v1
-kind: Service
-metadata:
-  name: cadvisor 
-  labels:
-    app: cadvisor
-    release: {{ .Release.Name }}
-spec:
-  type: NodePort
-  externalTrafficPolicy: Local
-  selector:
-{{ include "rangeskipempty" .Values.cadvisor_prometheus.service.selector | indent 4 }}
-  ports:
-  - name: cadvisor-prometheus 
-    {{- if eq .Values.cadvisor_prometheus.service.type "NodePort" }}
-    nodePort: {{ .Values.global.nodePortPrefix }}{{ .Values.cadvisor_prometheus.service.nodePort }}
-    {{- end }}
-    protocol: TCP
-    port: {{ .Values.cadvisor_prometheus.service.port }}
-    nodePort: {{ .Values.global.nodePortPrefix }}{{ .Values.cadvisor_prometheus.service.nodePort }}
-    targetPort: {{ .Values.cadvisor_prometheus.service.targetPort }}
diff --git a/vnfs/DAaaS/collection/charts/cadvisor/values.yaml b/vnfs/DAaaS/collection/charts/cadvisor/values.yaml
deleted file mode 100644
index a17c3dd5..00000000
--- a/vnfs/DAaaS/collection/charts/cadvisor/values.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-# Default values for cadvisor.
-# This is a YAML-formatted file.
-# Declare variables to be passed into your templates.
-ingress:
-  enabled: false
-image:
-  repository: google/cadvisor
-  tag: latest
-  pullPolicy: IfNotPresent
-resources: {}
-  # We usually recommend not to specify default resources and to leave this as a conscious
-  # choice for the user. This also increases chances charts run on environments with little
-  # resources, such as Minikube. If you do want to specify resources, uncomment the following
-  # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
-cadvisor_prometheus:
-  service:
-    type: NodePort
-    port: 80
-    nodePort: 91
-    targetPort: 8080
-    selector:
-      app: cadvisor
-      collector: cadvisor
diff --git a/vnfs/DAaaS/collection/charts/collectd/.helmignore b/vnfs/DAaaS/collection/charts/collectd/.helmignore
deleted file mode 100644
index f0c13194..00000000
--- a/vnfs/DAaaS/collection/charts/collectd/.helmignore
+++ /dev/null
@@ -1,21 +0,0 @@
-# Patterns to ignore when building packages.
-# This supports shell glob matching, relative path matching, and
-# negation (prefixed with !). Only one pattern per line.
-.DS_Store
-# Common VCS dirs
-.git/
-.gitignore
-.bzr/
-.bzrignore
-.hg/
-.hgignore
-.svn/
-# Common backup files
-*.swp
-*.bak
-*.tmp
-*~
-# Various IDEs
-.project
-.idea/
-*.tmproj
diff --git a/vnfs/DAaaS/collection/charts/collectd/Chart.yaml b/vnfs/DAaaS/collection/charts/collectd/Chart.yaml
deleted file mode 100644
index fcdcfde9..00000000
--- a/vnfs/DAaaS/collection/charts/collectd/Chart.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 2019 Intel Corporation, Inc
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-apiVersion: v1
-appVersion: "7.1.0"
-description: Collectd Helm Chart
-name: collectd
-version: 0.2.0
diff --git a/vnfs/DAaaS/collection/charts/collectd/resources/config/collectd.conf b/vnfs/DAaaS/collection/charts/collectd/resources/config/collectd.conf
deleted file mode 100644
index f62adb6a..00000000
--- a/vnfs/DAaaS/collection/charts/collectd/resources/config/collectd.conf
+++ /dev/null
@@ -1,44 +0,0 @@
-FQDNLookup false
-LoadPlugin cpu
-LoadPlugin memory
-LoadPlugin cpufreq
-LoadPlugin disk
-LoadPlugin ethstat
-LoadPlugin ipc
-LoadPlugin ipmi
-LoadPlugin load
-LoadPlugin numa
-LoadPlugin processes
-LoadPlugin df
-LoadPlugin turbostat
-LoadPlugin uptime
-LoadPlugin contextswitch
-LoadPlugin irq
-LoadPlugin df
-LoadPlugin swap
-LoadPlugin write_prometheus
-
-LoadPlugin logfile
-<Plugin logfile>
-  LogLevel info
-  File "/var/log/collectd.log"
-  Timestamp true
-  PrintSeverity false
-</Plugin>
-<Plugin "cpu">
-  Interval 5
-  ReportByState false
-  ReportByCpu false
-</Plugin>
-
-<Plugin "memory">
-  Interval 30
-  ValuesAbsolute false
-  ValuesPercentage true
-</Plugin>
-
-<Plugin "write_prometheus">
- Port "{{ .Values.prometheus_port }}"
-</Plugin>
-
-#Last line (collectd requires ‘\n’ at the last line)
diff --git a/vnfs/DAaaS/collection/charts/collectd/templates/NOTES.txt b/vnfs/DAaaS/collection/charts/collectd/templates/NOTES.txt
deleted file mode 100644
index 06ca128b..00000000
--- a/vnfs/DAaaS/collection/charts/collectd/templates/NOTES.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright (c) 2019 Intel Corporation.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
-1. Get the application URL by running these commands:
-{{- if .Values.ingress.enabled }}
-{{- range .Values.ingress.hosts }}
-  http://{{ . }}
-{{- end }}
-{{- else if contains "NodePort" .Values.collectd_prometheus.service.type }}
-  NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "name" . }})
-  NODE_IPS=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[*].status.addresses[0].address}")
-  visit http://NODE_IP:NODE_PORT
-{{- else if contains "LoadBalancer" .Values.collectd_prometheus.service.type }}
-     NOTE: It may take a few minutes for the LoadBalancer IP to be available.
-           You can watch the status of by running 'kubectl get svc -w {{ include "name" . }}'
-  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "name" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
-  echo http://$SERVICE_IP:{{ .Values.service.externalPort }}
-{{- else if contains "ClusterIP" .Values.collectd_prometheus.service.type }}
-  CLUSTER_NODE_IPS=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[*].status.addresses[0].address}")
-  CLUSTER_NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].port}" services {{ include "name" . }})
-  visit http://CLUSTER_NODE_IP:CLUSTER_NODE_PORT
-{{- end }}
diff --git a/vnfs/DAaaS/collection/charts/collectd/templates/_helpers.tpl b/vnfs/DAaaS/collection/charts/collectd/templates/_helpers.tpl
deleted file mode 100644
index b5e98086..00000000
--- a/vnfs/DAaaS/collection/charts/collectd/templates/_helpers.tpl
+++ /dev/null
@@ -1,25 +0,0 @@
-{{/* vim: set filetype=mustache: */}}
-{{/*
-Expand the name of the chart.
-*/}}
-{{- define "name" -}}
-{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{/*
-Create a default fully qualified app name.
-We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
-*/}}
-{{- define "fullname" -}}
-{{- $name := default .Chart.Name .Values.nameOverride -}}
-{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{/* Workaround for https://github.com/helm/helm/issues/3117 */}}
-{{- define "rangeskipempty" -}}
-{{- range $key, $value := . }}
-{{- if $value }}
-{{ $key }}: {{ $value }}
-{{- end }}
-{{- end }}
-{{- end }}
\ No newline at end of file
diff --git a/vnfs/DAaaS/collection/charts/collectd/templates/configmap.yaml b/vnfs/DAaaS/collection/charts/collectd/templates/configmap.yaml
deleted file mode 100644
index 5f5dde01..00000000
--- a/vnfs/DAaaS/collection/charts/collectd/templates/configmap.yaml
+++ /dev/null
@@ -1,27 +0,0 @@
-{{/*
-# Copyright 2019 Intel Corporation, Inc
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-*/}}
-
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ template "fullname" . }}-config
-  labels:
-    app: {{ template "name" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
-data:
-  node-collectd.conf: |-
-  {{ tpl (.Files.Glob "resources/config/*").AsConfig . | indent 2 }}
diff --git a/vnfs/DAaaS/collection/charts/collectd/templates/daemonset.yaml b/vnfs/DAaaS/collection/charts/collectd/templates/daemonset.yaml
deleted file mode 100644
index 29fdded9..00000000
--- a/vnfs/DAaaS/collection/charts/collectd/templates/daemonset.yaml
+++ /dev/null
@@ -1,83 +0,0 @@
-{{/*
-# Copyright 2019 Intel Corporation, Inc
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-*/}}
-
-apiVersion: extensions/v1beta1
-kind: DaemonSet
-metadata:
-  name: {{ template "fullname" . }}
-  annotations:
-    checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
-  labels:
-    app: {{ template "name" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
-spec:
-  replicas: {{ .Values.replicaCount }}
-  updateStrategy:
-    type: RollingUpdate
-  template:
-    metadata:
-      labels:
-        app: {{ template "name" . }}
-        collector: collectd
-        release: {{ .Release.Name }}
-    spec:
-      hostNetwork: true
-      containers:
-        - name: {{ .Chart.Name }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
-          securityContext:
-            privileged: true
-          volumeMounts:
-          - name: {{ template "fullname" . }}-config
-            mountPath: /opt/collectd/etc
-          - name: proc
-            mountPath: /mnt/proc
-            readOnly: true
-          - name: root
-            mountPath: /hostfs
-            readOnly: true
-          - name: etc
-            mountPath: /mnt/etc
-            readOnly: true
-          - name: run
-            mountPath: /var/run/docker.sock
-          resources:
-{{ toYaml .Values.resources | indent 12 }}
-    {{- if .Values.nodeSelector }}
-      nodeSelector:
-{{ toYaml .Values.nodeSelector | indent 8 }}
-    {{- end }}
-      volumes:
-      - name: {{ template "fullname" . }}-config
-        configMap:
-          name: {{ template "fullname" . }}-config
-          items:
-          - key: node-collectd.conf
-            path: collectd.conf
-      - name: proc
-        hostPath:
-          path: /proc
-      - name: root
-        hostPath:
-          path: /
-      - name: etc
-        hostPath:
-          path: /etc
-      - name: run
-        hostPath:
-          path: /var/run/docker.sock
diff --git a/vnfs/DAaaS/collection/charts/collectd/templates/service.yaml b/vnfs/DAaaS/collection/charts/collectd/templates/service.yaml
deleted file mode 100644
index 7571715d..00000000
--- a/vnfs/DAaaS/collection/charts/collectd/templates/service.yaml
+++ /dev/null
@@ -1,32 +0,0 @@
-{{/*
-# Copyright 2019 Intel Corporation, Inc
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-*/}}
-
-apiVersion: v1
-kind: Service
-metadata:
-  name: collectd
-  labels:
-    app: collectd
-    release: {{ .Release.Name }}
-spec:
-  ports:
-  - name: collectd-prometheus
-    port: {{ .Values.collectd_prometheus.service.port }}
-    protocol: TCP
-    targetPort: {{ .Values.collectd_prometheus.service.targetPort }}
-  selector:
-{{ include "rangeskipempty" .Values.collectd_prometheus.service.selector | indent 4 }}
-  type: ClusterIP
diff --git a/vnfs/DAaaS/collection/charts/collectd/values.yaml b/vnfs/DAaaS/collection/charts/collectd/values.yaml
deleted file mode 100644
index fdfcae71..00000000
--- a/vnfs/DAaaS/collection/charts/collectd/values.yaml
+++ /dev/null
@@ -1,28 +0,0 @@
-# Default values for collectd.
-# This is a YAML-formatted file.
-# Declare variables to be passed into your templates.
-ingress:
-  enabled: false
-image:
-  repository: opnfv/barometer-collectd
-  tag: latest
-  pullPolicy: IfNotPresent
-resources: {}
-  # We usually recommend not to specify default resources and to leave this as a conscious
-  # choice for the user. This also increases chances charts run on environments with little
-  # resources, such as Minikube. If you do want to specify resources, uncomment the following
-  # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
-  # limits:
-  #  cpu: 100m
-  #  memory: 128Mi
-  # requests:
-  #  cpu: 100m
-  #  memory: 128Mi
-collectd_prometheus:
-  service:
-    type: ClusterIP
-    port: 9103
-    targetPort: 9103
-    selector:
-      app: collectd
-      collector: collectd
diff --git a/vnfs/DAaaS/collection/charts/prometheus-node-exporter/.helmignore b/vnfs/DAaaS/collection/charts/prometheus-node-exporter/.helmignore
deleted file mode 100755
index f0c13194..00000000
--- a/vnfs/DAaaS/collection/charts/prometheus-node-exporter/.helmignore
+++ /dev/null
@@ -1,21 +0,0 @@
-# Patterns to ignore when building packages.
-# This supports shell glob matching, relative path matching, and
-# negation (prefixed with !). Only one pattern per line.
-.DS_Store
-# Common VCS dirs
-.git/
-.gitignore
-.bzr/
-.bzrignore
-.hg/
-.hgignore
-.svn/
-# Common backup files
-*.swp
-*.bak
-*.tmp
-*~
-# Various IDEs
-.project
-.idea/
-*.tmproj
diff --git a/vnfs/DAaaS/collection/charts/prometheus-node-exporter/Chart.yaml b/vnfs/DAaaS/collection/charts/prometheus-node-exporter/Chart.yaml
deleted file mode 100755
index 2e45b3a3..00000000
--- a/vnfs/DAaaS/collection/charts/prometheus-node-exporter/Chart.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-apiVersion: v1
-appVersion: 0.17.0
-description: A Helm chart for prometheus node-exporter
-home: https://github.com/prometheus/node_exporter/
-keywords:
-- node-exporter
-- prometheus
-- exporter
-maintainers:
-- email: gianrubio@gmail.com
-  name: gianrubio
-name: prometheus-node-exporter
-sources:
-- https://github.com/prometheus/node_exporter/
-version: 1.3.2
diff --git a/vnfs/DAaaS/collection/charts/prometheus-node-exporter/OWNERS b/vnfs/DAaaS/collection/charts/prometheus-node-exporter/OWNERS
deleted file mode 100755
index fe9b2c3d..00000000
--- a/vnfs/DAaaS/collection/charts/prometheus-node-exporter/OWNERS
+++ /dev/null
@@ -1,4 +0,0 @@
-approvers:
-- gianrubio
-reviewers:
-- gianrubio
\ No newline at end of file
diff --git a/vnfs/DAaaS/collection/charts/prometheus-node-exporter/README.md b/vnfs/DAaaS/collection/charts/prometheus-node-exporter/README.md
deleted file mode 100755
index b9b50101..00000000
--- a/vnfs/DAaaS/collection/charts/prometheus-node-exporter/README.md
+++ /dev/null
@@ -1,80 +0,0 @@
-# Prometheus Node Exporter
-
-* Installs prometheus [node exporter](https://github.com/prometheus/node_exporter)
-
-## TL;DR;
-
-```console
-$ helm install stable/prometheus-node-exporter
-```
-
-## Introduction
-
-This chart bootstraps a prometheus [node exporter](http://github.com/prometheus/node_exporter) deployment on a [Kubernetes](http://kubernetes.io) cluster using the [Helm](https://helm.sh) package manager.
-
-## Installing the Chart
-
-To install the chart with the release name `my-release`:
-
-```console
-$ helm install --name my-release stable/prometheus-node-exporter
-```
-
-The command deploys node exporter on the Kubernetes cluster in the default configuration. The [configuration](#configuration) section lists the parameters that can be configured during installation.
-
-## Uninstalling the Chart
-
-To uninstall/delete the `my-release` deployment:
-
-```console
-$ helm delete my-release
-```
-
-The command removes all the Kubernetes components associated with the chart and deletes the release.
-
-## Configuration
-
-The following table lists the configurable parameters of the Node Exporter chart and their default values.
-
-|             Parameter             |                                                          Description                                                          |                 Default                 |     |
-| --------------------------------- | ----------------------------------------------------------------------------------------------------------------------------- | --------------------------------------- | --- |
-| `image.repository`                | Image repository                                                                                                              | `quay.io/prometheus/node-exporter`      |     |
-| `image.tag`                       | Image tag                                                                                                                     | `v0.16.0`                               |     |
-| `image.pullPolicy`                | Image pull policy                                                                                                             | `IfNotPresent`                          |     |
-| `extraArgs`                       | Additional container arguments                                                                                                | `[]`                                    |     |
-| `extraHostVolumeMounts`           | Additional host volume mounts                                                                                                 | {}                                      |     |
-| `podLabels`                       | Additional labels to be added to pods                                                                                         | {}                                      |     |
-| `rbac.create`                     | If true, create & use RBAC resources                                                                                          | `true`                                  |     |
-| `rbac.pspEnabled`                 | Specifies whether a PodSecurityPolicy should be created.                                                                      | `true`                                  |     |
-| `resources`                       | CPU/Memory resource requests/limits                                                                                           | `{}`                                    |     |
-| `service.type`                    | Service type                                                                                                                  | `ClusterIP`                             |     |
-| `service.port`                    | The service port                                                                                                              | `9100`                                  |     |
-| `service.targetPort`              | The target port of the container                                                                                              | `9100`                                  |     |
-| `service.nodePort`                | The node port of the service                                                                                                  |                                         |     |
-| `service.annotations`             | Kubernetes service annotations                                                                                                | `{prometheus.io/scrape: "true"}`        |     |
-| `serviceAccount.create`           | Specifies whether a service account should be created.                                                                        | `true`                                  |     |
-| `serviceAccount.name`             | Service account to be used. If not set and `serviceAccount.create` is `true`, a name is generated using the fullname template |                                         |     |
-| `serviceAccount.imagePullSecrets` | Specify image pull secrets                                                                                                    | `[]`                                    |     |
-| `securityContext`                 | SecurityContext                                                                                                               | `{"runAsNonRoot": true, "runAsUser": 65534}` |     |
-| `affinity`                        | A group of affinity scheduling rules for pod assignment                                                                       | `{}`                                    |     |
-| `nodeSelector`                    | Node labels for pod assignment                                                                                                | `{}`                                    |     |
-| `tolerations`                     | List of node taints to tolerate                                                                                               | `- effect: NoSchedule operator: Exists` |     |
-| `priorityClassName`               | Name of Priority Class to assign pods                                                                                         | `nil`                                   |     |
-| `endpoints`            | list of addresses that have node exporter deployed outside of the cluster                                                                | `[]`                                    |     |
-| `prometheus.monitor.enabled` | Set this to `true` to create ServiceMonitor for Prometheus operator | `false` | |
-| `prometheus.monitor.additionalLabels` | Additional labels that can be used so ServiceMonitor will be discovered by Prometheus | `{}` | |
-| `prometheus.monitor.namespace` | namespace where servicemonitor resource should be created | `the same namespace as prometheus node exporter` | |
-
-Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example,
-
-```console
-$ helm install --name my-release \
-  --set serviceAccount.name=node-exporter  \
-    stable/prometheus-node-exporter
-```
-
-Alternatively, a YAML file that specifies the values for the above parameters can be provided while installing the chart. For example,
-
-```console
-$ helm install --name my-release -f values.yaml stable/prometheus-node-exporter
-```
diff --git a/vnfs/DAaaS/collection/charts/prometheus-node-exporter/templates/NOTES.txt b/vnfs/DAaaS/collection/charts/prometheus-node-exporter/templates/NOTES.txt
deleted file mode 100755
index 4902798f..00000000
--- a/vnfs/DAaaS/collection/charts/prometheus-node-exporter/templates/NOTES.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-1. Get the application URL by running these commands:
-{{- if contains "NodePort" .Values.service.type }}
-  export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ template "prometheus-node-exporter.fullname" . }})
-  export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
-  echo http://$NODE_IP:$NODE_PORT
-{{- else if contains "LoadBalancer" .Values.service.type }}
-     NOTE: It may take a few minutes for the LoadBalancer IP to be available.
-           You can watch the status of by running 'kubectl get svc -w {{ template "prometheus-node-exporter.fullname" . }}'
-  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "prometheus-node-exporter.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
-  echo http://$SERVICE_IP:{{ .Values.service.port }}
-{{- else if contains "ClusterIP" .Values.service.type }}
-  export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app={{ template "prometheus-node-exporter.name" . }},release={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
-  echo "Visit http://127.0.0.1:8080 to use your application"
-  kubectl port-forward $POD_NAME 8080:80
-{{- end }}
diff --git a/vnfs/DAaaS/collection/charts/prometheus-node-exporter/templates/_helpers.tpl b/vnfs/DAaaS/collection/charts/prometheus-node-exporter/templates/_helpers.tpl
deleted file mode 100755
index 4f0e2dfe..00000000
--- a/vnfs/DAaaS/collection/charts/prometheus-node-exporter/templates/_helpers.tpl
+++ /dev/null
@@ -1,55 +0,0 @@
-{{/* vim: set filetype=mustache: */}}
-{{/*
-Expand the name of the chart.
-*/}}
-{{- define "prometheus-node-exporter.name" -}}
-{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{/*
-Create a default fully qualified app name.
-We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
-If release name contains chart name it will be used as a full name.
-*/}}
-{{- define "prometheus-node-exporter.fullname" -}}
-{{- if .Values.fullnameOverride -}}
-{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
-{{- else -}}
-{{- $name := default .Chart.Name .Values.nameOverride -}}
-{{- if contains $name .Release.Name -}}
-{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
-{{- else -}}
-{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-{{- end -}}
-{{- end -}}
-
-{{/* Generate basic labels */}}
-{{- define "prometheus-node-exporter.labels" }}
-app: {{ template "prometheus-node-exporter.name" . }}
-heritage: {{.Release.Service }}
-release: {{.Release.Name }}
-chart: {{ template "prometheus-node-exporter.chart" . }}
-{{- if .Values.podLabels}}
-{{ toYaml .Values.podLabels }}
-{{- end }}
-{{- end }}
-
-{{/*
-Create chart name and version as used by the chart label.
-*/}}
-{{- define "prometheus-node-exporter.chart" -}}
-{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-
-{{/*
-Create the name of the service account to use
-*/}}
-{{- define "prometheus-node-exporter.serviceAccountName" -}}
-{{- if .Values.serviceAccount.create -}}
-    {{ default (include "prometheus-node-exporter.fullname" .) .Values.serviceAccount.name }}
-{{- else -}}
-    {{ default "default" .Values.serviceAccount.name }}
-{{- end -}}
-{{- end -}}
diff --git a/vnfs/DAaaS/collection/charts/prometheus-node-exporter/templates/daemonset.yaml b/vnfs/DAaaS/collection/charts/prometheus-node-exporter/templates/daemonset.yaml
deleted file mode 100755
index dfb15f1d..00000000
--- a/vnfs/DAaaS/collection/charts/prometheus-node-exporter/templates/daemonset.yaml
+++ /dev/null
@@ -1,98 +0,0 @@
-apiVersion: extensions/v1beta1
-kind: DaemonSet
-metadata:
-  name: {{ template "prometheus-node-exporter.fullname" . }}
-  labels: {{ include "prometheus-node-exporter.labels" . | indent 4 }}
-spec:
-  selector:
-    matchLabels:
-      app: {{ template "prometheus-node-exporter.name" . }}
-      release: {{ .Release.Name }}
-  updateStrategy:
-    type: RollingUpdate
-    rollingUpdate:
-      maxUnavailable: 1
-  template:
-    metadata:
-      labels: {{ include "prometheus-node-exporter.labels" . | indent 8 }}
-    spec:
-{{- if and .Values.rbac.create .Values.serviceAccount.create }}
-      serviceAccountName: {{ template "prometheus-node-exporter.serviceAccountName" . }}
-{{- end }}
-{{- if .Values.securityContext }}
-      securityContext:
-{{ toYaml .Values.securityContext | indent 8 }}
-{{- end }}
-{{- if .Values.priorityClassName }}
-      priorityClassName: {{ .Values.priorityClassName }}
-{{- end }}
-      containers:
-        - name: node-exporter
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
-          args:
-            - --path.procfs=/host/proc
-            - --path.sysfs=/host/sys
-            - --web.listen-address=0.0.0.0:{{ .Values.service.port }}
-{{- if .Values.extraArgs }}
-{{ toYaml .Values.extraArgs | indent 12 }}
-{{- end }}
-          ports:
-            - name: metrics
-              containerPort: {{ .Values.service.targetPort }}
-              protocol: TCP
-          livenessProbe:
-            httpGet:
-              path: /
-              port: {{ .Values.service.port }}
-          readinessProbe:
-            httpGet:
-              path: /
-              port: {{ .Values.service.port }}
-          resources:
-{{ toYaml .Values.resources | indent 12 }}
-          volumeMounts:
-            - name: proc
-              mountPath: /host/proc
-              readOnly:  true
-            - name: sys
-              mountPath: /host/sys
-              readOnly: true
-            {{- if .Values.extraHostVolumeMounts }}
-            {{- range $_, $mount := .Values.extraHostVolumeMounts }}
-            - name: {{ $mount.name }}
-              mountPath: {{ $mount.mountPath }}
-              readOnly: {{ $mount.readOnly }}
-            {{- if $mount.mountPropagation }}
-              mountPropagation: {{ $mount.mountPropagation }}
-            {{- end }}
-            {{- end }}
-            {{- end }}
-      hostNetwork: true
-      hostPID: true
-{{- if .Values.affinity }}
-      affinity:
-{{ toYaml .Values.affinity | indent 8 }}
-{{- end }}
-{{- if .Values.nodeSelector }}
-      nodeSelector:
-{{ toYaml .Values.nodeSelector | indent 8 }}
-{{- end }}
-    {{- with .Values.tolerations }}
-      tolerations:
-{{ toYaml . | indent 8 }}
-    {{- end }}
-      volumes:
-        - name: proc
-          hostPath:
-            path: /proc
-        - name: sys
-          hostPath:
-            path: /sys
-        {{- if .Values.extraHostVolumeMounts }}
-        {{- range $_, $mount := .Values.extraHostVolumeMounts }}
-        - name: {{ $mount.name }}
-          hostPath:
-            path: {{ $mount.hostPath }}
-        {{- end }}
-        {{- end }}
\ No newline at end of file
diff --git a/vnfs/DAaaS/collection/charts/prometheus-node-exporter/templates/endpoints.yaml b/vnfs/DAaaS/collection/charts/prometheus-node-exporter/templates/endpoints.yaml
deleted file mode 100755
index 4c5c75fa..00000000
--- a/vnfs/DAaaS/collection/charts/prometheus-node-exporter/templates/endpoints.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
-{{- if .Values.endpoints }}
-apiVersion: v1
-kind: Endpoints
-metadata:
-  name: {{ template "prometheus-node-exporter.fullname" . }}
-  labels:
-{{ include "prometheus-node-exporter.labels" . | indent 4 }}
-subsets:
-  - addresses:
-      {{- range .Values.endpoints }}
-      - ip: {{ . }}
-      {{- end }}
-    ports:
-      - name: metrics
-        port: 9100
-        protocol: TCP
-{{- end }}
\ No newline at end of file
diff --git a/vnfs/DAaaS/collection/charts/prometheus-node-exporter/templates/monitor.yaml b/vnfs/DAaaS/collection/charts/prometheus-node-exporter/templates/monitor.yaml
deleted file mode 100755
index 9c723e69..00000000
--- a/vnfs/DAaaS/collection/charts/prometheus-node-exporter/templates/monitor.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
-{{- if .Values.prometheus.monitor.enabled }}
-apiVersion: monitoring.coreos.com/v1
-kind: ServiceMonitor
-metadata:
-  name: {{ template "prometheus-node-exporter.fullname" . }}
-  labels: {{ include "prometheus-node-exporter.labels" . | indent 4 }}
-  {{- if .Values.prometheus.monitor.additionalLabels }}
-{{ toYaml .Values.prometheus.monitor.additionalLabels | indent 4 }}
-  {{- end }}
-spec:
-  selector:
-    matchLabels:
-      app: {{ template "prometheus-node-exporter.name" . }}
-      release: {{ .Release.Name }}
-  endpoints:
-    - port: metrics
-{{- end }}
diff --git a/vnfs/DAaaS/collection/charts/prometheus-node-exporter/templates/psp-clusterrole.yaml b/vnfs/DAaaS/collection/charts/prometheus-node-exporter/templates/psp-clusterrole.yaml
deleted file mode 100755
index 3d0a636a..00000000
--- a/vnfs/DAaaS/collection/charts/prometheus-node-exporter/templates/psp-clusterrole.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-{{- if .Values.rbac.create }}
-{{- if .Values.rbac.pspEnabled }}
-kind: ClusterRole
-apiVersion: rbac.authorization.k8s.io/v1beta1
-metadata:
-  labels: {{ include "prometheus-node-exporter.labels" . | indent 4 }}
-  name: psp-{{ template "prometheus-node-exporter.fullname" . }}
-rules:
-- apiGroups: ['extensions']
-  resources: ['podsecuritypolicies']
-  verbs:     ['use']
-  resourceNames:
-  - {{ template "prometheus-node-exporter.fullname" . }}
-{{- end }}
-{{- end }}
diff --git a/vnfs/DAaaS/collection/charts/prometheus-node-exporter/templates/psp-clusterrolebinding.yaml b/vnfs/DAaaS/collection/charts/prometheus-node-exporter/templates/psp-clusterrolebinding.yaml
deleted file mode 100755
index 50f7a149..00000000
--- a/vnfs/DAaaS/collection/charts/prometheus-node-exporter/templates/psp-clusterrolebinding.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
-{{- if .Values.rbac.create }}
-{{- if .Values.rbac.pspEnabled }}
-apiVersion: rbac.authorization.k8s.io/v1beta1
-kind: ClusterRoleBinding
-metadata:
-  labels: {{ include "prometheus-node-exporter.labels" . | indent 4 }}
-  name: psp-{{ template "prometheus-node-exporter.fullname" . }}
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: ClusterRole
-  name: psp-{{ template "prometheus-node-exporter.fullname" . }}
-subjects:
-  - kind: ServiceAccount
-    name: {{ template "prometheus-node-exporter.fullname" . }}
-    namespace: {{ .Release.Namespace }}
-{{- end }}
-{{- end }}
diff --git a/vnfs/DAaaS/collection/charts/prometheus-node-exporter/templates/psp.yaml b/vnfs/DAaaS/collection/charts/prometheus-node-exporter/templates/psp.yaml
deleted file mode 100755
index 1fa6f289..00000000
--- a/vnfs/DAaaS/collection/charts/prometheus-node-exporter/templates/psp.yaml
+++ /dev/null
@@ -1,51 +0,0 @@
-{{- if .Values.rbac.create }}
-{{- if .Values.rbac.pspEnabled }}
-apiVersion: extensions/v1beta1
-kind: PodSecurityPolicy
-metadata:
-  labels: {{ include "prometheus-node-exporter.labels" . | indent 4 }}
-  name: {{ template "prometheus-node-exporter.fullname" . }}
-spec:
-  privileged: false
-  # Required to prevent escalations to root.
-  # allowPrivilegeEscalation: false
-  # This is redundant with non-root + disallow privilege escalation,
-  # but we can provide it for defense in depth.
-  #requiredDropCapabilities:
-  #  - ALL
-  # Allow core volume types.
-  volumes:
-    - 'configMap'
-    - 'emptyDir'
-    - 'projected'
-    - 'secret'
-    - 'downwardAPI'
-    - 'persistentVolumeClaim'
-    - 'hostPath'
-  hostNetwork: true
-  hostIPC: false
-  hostPID: true
-  hostPorts:
-    - min: 0
-      max: 65535
-  runAsUser:
-    # Permits the container to run with root privileges as well.
-    rule: 'RunAsAny'
-  seLinux:
-    # This policy assumes the nodes are using AppArmor rather than SELinux.
-    rule: 'RunAsAny'
-  supplementalGroups:
-    rule: 'MustRunAs'
-    ranges:
-      # Forbid adding the root group.
-      - min: 0
-        max: 65535
-  fsGroup:
-    rule: 'MustRunAs'
-    ranges:
-      # Forbid adding the root group.
-      - min: 0
-        max: 65535
-  readOnlyRootFilesystem: false
-{{- end }}
-{{- end }}
diff --git a/vnfs/DAaaS/collection/charts/prometheus-node-exporter/templates/service.yaml b/vnfs/DAaaS/collection/charts/prometheus-node-exporter/templates/service.yaml
deleted file mode 100755
index cffe547b..00000000
--- a/vnfs/DAaaS/collection/charts/prometheus-node-exporter/templates/service.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ template "prometheus-node-exporter.fullname" . }}
-{{- if .Values.service.annotations }}
-  annotations:
-{{ toYaml .Values.service.annotations | indent 4 }}
-{{- end }}
-  labels: {{ include "prometheus-node-exporter.labels" . | indent 4 }}
-spec:
-  type: {{ .Values.service.type }}
-  ports:
-    - port: {{ .Values.service.port }}
-    {{- if ( and (eq .Values.service.type "NodePort" ) (not (empty .Values.service.nodePort)) ) }}
-      nodePort: {{ .Values.service.nodePort }}
-    {{- end }}
-      targetPort: {{ .Values.service.targetPort }}
-      protocol: TCP
-      name: metrics
-  selector:
-    app: {{ template "prometheus-node-exporter.name" . }}
-    release: {{ .Release.Name }}
diff --git a/vnfs/DAaaS/collection/charts/prometheus-node-exporter/templates/serviceaccount.yaml b/vnfs/DAaaS/collection/charts/prometheus-node-exporter/templates/serviceaccount.yaml
deleted file mode 100755
index b70745aa..00000000
--- a/vnfs/DAaaS/collection/charts/prometheus-node-exporter/templates/serviceaccount.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-{{- if .Values.rbac.create -}}
-{{- if .Values.serviceAccount.create -}}
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: {{ template "prometheus-node-exporter.serviceAccountName" . }}
-  labels:
-    app: {{ template "prometheus-node-exporter.name" . }}
-    chart: {{ template "prometheus-node-exporter.chart" . }}    
-    release: "{{ .Release.Name }}"
-    heritage: "{{ .Release.Service }}"
-imagePullSecrets: 
-{{ toYaml .Values.serviceAccount.imagePullSecrets | indent 2 }}
-{{- end -}}
-{{- end -}}
\ No newline at end of file
diff --git a/vnfs/DAaaS/collection/charts/prometheus-node-exporter/values.yaml b/vnfs/DAaaS/collection/charts/prometheus-node-exporter/values.yaml
deleted file mode 100755
index 14bcfc53..00000000
--- a/vnfs/DAaaS/collection/charts/prometheus-node-exporter/values.yaml
+++ /dev/null
@@ -1,96 +0,0 @@
-# Default values for prometheus-node-exporter.
-# This is a YAML-formatted file.
-# Declare variables to be passed into your templates.
-image:
-  repository: quay.io/prometheus/node-exporter
-  tag: v0.17.0
-  pullPolicy: IfNotPresent
-
-service:
-  type: ClusterIP
-  port: 9100
-  targetPort: 9100
-  nodePort:
-  annotations:
-    prometheus.io/scrape: "true"
-
-prometheus:
-  monitor:
-    enabled: false
-    additionalLabels: {}
-    namespace: ""
-
-resources: {}
-  # We usually recommend not to specify default resources and to leave this as a conscious
-  # choice for the user. This also increases chances charts run on environments with little
-  # resources, such as Minikube. If you do want to specify resources, uncomment the following
-  # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
-  # limits:
-  #   cpu: 200m
-  #    memory: 50Mi
-  # requests:
-  #   cpu: 100m
-  #   memory: 30Mi
-
-serviceAccount:
-  # Specifies whether a ServiceAccount should be created
-  create: true
-  # The name of the ServiceAccount to use.
-  # If not set and create is true, a name is generated using the fullname template
-  name:
-  imagePullSecrets: []
-
-securityContext:
-  runAsNonRoot: true
-  runAsUser: 65534
-
-rbac:
-  ## If true, create & use RBAC resources
-  ##
-  create: true
-  ## If true, create & use Pod Security Policy resources
-  ## https://kubernetes.io/docs/concepts/policy/pod-security-policy/
-  pspEnabled: true
-
-# for deployments that have node_exporter deployed outside of the cluster, list
-# their addresses here
-endpoints: []
-
-## Assign a group of affinity scheduling rules
-##
-affinity: {}
-#   nodeAffinity:
-#     requiredDuringSchedulingIgnoredDuringExecution:
-#       nodeSelectorTerms:
-#         - matchFields:
-#             - key: metadata.name
-#               operator: In
-#               values:
-#                 - target-host-name
-
-## Assign a nodeSelector if operating a hybrid cluster
-##
-nodeSelector: {}
-#   beta.kubernetes.io/arch: amd64
-#   beta.kubernetes.io/os: linux
-
-tolerations:
-  - effect: NoSchedule
-    operator: Exists
-
-## Assign a PriorityClassName to pods if set
-# priorityClassName: ""
-
-## Additional container arguments
-##
-extraArgs: {}
-#   - --collector.diskstats.ignored-devices=^(ram|loop|fd|(h|s|v)d[a-z]|nvme\\d+n\\d+p)\\d+$
-
-## Additional mounts from the host
-##
-extraHostVolumeMounts: {}
-#  - name: <mountName>
-#    hostPath: <hostPath>
-#    mountPath: <mountPath>
-#    readOnly: true|false
-#    mountPropagation: None|HostToContainer|Bidirectional
diff --git a/vnfs/DAaaS/collection/charts/prometheus/.helmignore b/vnfs/DAaaS/collection/charts/prometheus/.helmignore
deleted file mode 100644
index 50af0317..00000000
--- a/vnfs/DAaaS/collection/charts/prometheus/.helmignore
+++ /dev/null
@@ -1,22 +0,0 @@
-# Patterns to ignore when building packages.
-# This supports shell glob matching, relative path matching, and
-# negation (prefixed with !). Only one pattern per line.
-.DS_Store
-# Common VCS dirs
-.git/
-.gitignore
-.bzr/
-.bzrignore
-.hg/
-.hgignore
-.svn/
-# Common backup files
-*.swp
-*.bak
-*.tmp
-*~
-# Various IDEs
-.project
-.idea/
-*.tmproj
-.vscode/
diff --git a/vnfs/DAaaS/collection/charts/prometheus/Chart.yaml b/vnfs/DAaaS/collection/charts/prometheus/Chart.yaml
deleted file mode 100644
index 6e7ddfbc..00000000
--- a/vnfs/DAaaS/collection/charts/prometheus/Chart.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-apiVersion: v1
-appVersion: "1.0"
-description: Prometheus instance with remote storage integrations.
-name: prometheus
-version: 0.1.0
diff --git a/vnfs/DAaaS/collection/charts/prometheus/templates/NOTES.txt b/vnfs/DAaaS/collection/charts/prometheus/templates/NOTES.txt
deleted file mode 100644
index f8882883..00000000
--- a/vnfs/DAaaS/collection/charts/prometheus/templates/NOTES.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-1. Get the application URL by running these commands:
-{{ if contains "NodePort" .Values.prometheus.service.type }}
-  export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "prometheus.fullname" . }}-prometheus)
-  export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
-  echo http://$NODE_IP:$NODE_PORT
-{{- else if contains "LoadBalancer" .Values.prometheus.service.type }}
-     NOTE: It may take a few minutes for the LoadBalancer IP to be available.
-           You can watch the status of by running 'kubectl get svc -w {{ include "prometheus.fullname" . }}'
-  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "prometheus.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
-  echo http://$SERVICE_IP:{{ .Values.service.port }}
-{{- else if contains "ClusterIP" .Values.prometheus.service.type }}
-  export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "prometheus.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
-  echo "Visit http://127.0.0.1:9090 to use your application"
-  kubectl port-forward $POD_NAME 9090:80
-{{- end }}
diff --git a/vnfs/DAaaS/collection/charts/prometheus/templates/_helpers.tpl b/vnfs/DAaaS/collection/charts/prometheus/templates/_helpers.tpl
deleted file mode 100644
index 1ac77dd8..00000000
--- a/vnfs/DAaaS/collection/charts/prometheus/templates/_helpers.tpl
+++ /dev/null
@@ -1,47 +0,0 @@
-{{/* vim: set filetype=mustache: */}}
-{{/*
-Expand the name of the chart.
-*/}}
-{{- define "prometheus.name" -}}
-{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{/*
-Create a default fully qualified app name.
-We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
-If release name contains chart name it will be used as a full name.
-*/}}
-{{- define "prometheus.fullname" -}}
-{{- if .Values.fullnameOverride -}}
-{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
-{{- else -}}
-{{- $name := default .Chart.Name .Values.nameOverride -}}
-{{- if contains $name .Release.Name -}}
-{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
-{{- else -}}
-{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-{{- end -}}
-{{- end -}}
-
-{{/*
-Create chart name and version as used by the chart label.
-*/}}
-{{- define "prometheus.chart" -}}
-{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{/* Create chart name and version as used by the chart label. */}}
-{{- define "prometheus.chartref" -}}
-{{- replace "+" "_" .Chart.Version | printf "%s-%s" .Chart.Name -}}
-{{- end }}
-
-{{/* Generate basic labels */}}
-{{- define "prometheus.labels" }}
-chart: {{ template "prometheus.chartref" . }}
-release: {{ .Release.Name | quote }}
-heritage: {{ .Release.Service | quote }}
-{{- if .Values.commonLabels}}
-{{ toYaml .Values.commonLabels }}
-{{- end }}
-{{- end }}
\ No newline at end of file
diff --git a/vnfs/DAaaS/collection/charts/prometheus/templates/prometheus.yaml b/vnfs/DAaaS/collection/charts/prometheus/templates/prometheus.yaml
deleted file mode 100644
index 9c3d84c2..00000000
--- a/vnfs/DAaaS/collection/charts/prometheus/templates/prometheus.yaml
+++ /dev/null
@@ -1,47 +0,0 @@
-apiVersion: monitoring.coreos.com/v1
-kind: Prometheus
-metadata:
-  name: {{ template "prometheus.fullname" . }}-prometheus
-  labels:
-    app: {{ template "prometheus.name" . }}-prometheus
-  "helm.sh/hook": post-install
-  "helm.sh/hook-weight": "2"
-spec:
-  serviceMonitorSelector:
-    matchLabels:
-      app: {{ template "prometheus.name" . }}-prometheus
-      release: {{ .Release.Name }}
-  serviceMonitorNamespaceSelector:
-    matchNames:
-      - {{ .Release.Namespace | quote }}
-
-  # TODO: Templatizing multiple remote read/write.
-  # Especially Kafka adapater.
-  remoteRead:
-  - url: "{{ .Values.m3db.url }}/api/v1/prom/remote/read"
-    # To test reading even when local Prometheus has the data
-    readRecent: true
-  remoteWrite:
-  - url: "{{ .Values.m3db.url }}/api/v1/prom/remote/write"
-    # To differentiate between local and remote storage we will add a storage label
-    writeRelabelConfigs:
-      - targetLabel: metrics_storage
-        replacement: m3db_remote
-  - url: "{{ .Values.kafkaAdapter.url }}/receive"
-  containers:
-  - name: {{ template "prometheus.name" . }}-adapter
-    image: "{{ .Values.kafkaAdapter.image.repository }}:{{ .Values.kafkaAdapter.image.tag }}"
-    imagePullPolicy: {{ .Values.kafkaAdapter.image.pullPolicy }}
-    env:
-    - name: KAFKA_BROKER_LIST
-      value: {{ .Values.kafkaAdapter.broker }}
-    - name: KAFKA_TOPIC
-      value: {{ .Values.kafkaAdapter.topic }}
-    - name: SERIALIZATION_FORMAT
-      value: {{ .Values.kafkaAdapter.serializationFormat }}
-    - name: PORT
-      value: {{ quote .Values.kafkaAdapter.port }}
-    - name: LOG_LEVEL
-      value: {{ .Values.kafkaAdapter.logLevel }}
-    resources:
-{{ toYaml .Values.kafkaAdapter.resources | indent 6 }}
diff --git a/vnfs/DAaaS/collection/charts/prometheus/templates/service.yaml b/vnfs/DAaaS/collection/charts/prometheus/templates/service.yaml
deleted file mode 100644
index 0114ed2e..00000000
--- a/vnfs/DAaaS/collection/charts/prometheus/templates/service.yaml
+++ /dev/null
@@ -1,38 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ template "prometheus.fullname" . }}-prometheus
-  labels:
-    app: {{ template "prometheus.name" . }}-prometheus
-{{- if .Values.prometheus.service.annotations }}
-  annotations:
-{{ toYaml .Values.prometheus.service.annotations | indent 4 }}
-{{- end }}
-spec:
-{{- if .Values.prometheus.service.clusterIP }}
-  clusterIP: {{ .Values.prometheus.service.clusterIP }}
-{{- end }}
-{{- if .Values.prometheus.service.externalIPs }}
-  externalIPs:
-{{ toYaml .Values.prometheus.service.externalIPs | indent 4 }}
-{{- end }}
-{{- if .Values.prometheus.service.loadBalancerIP }}
-  loadBalancerIP: {{ .Values.prometheus.service.loadBalancerIP }}
-{{- end }}
-{{- if .Values.prometheus.service.loadBalancerSourceRanges }}
-  loadBalancerSourceRanges:
-  {{- range $cidr := .Values.prometheus.service.loadBalancerSourceRanges }}
-    - {{ $cidr }}
-  {{- end }}
-{{- end }}
-  ports:
-  - name: web
-    {{- if eq .Values.prometheus.service.type "NodePort" }}
-    nodePort: {{ .Values.global.nodePortPrefix }}{{ .Values.prometheus.service.nodePort }}
-    {{- end }}
-    port: 9090
-    targetPort: web
-  selector:
-    app: prometheus
-    prometheus: {{ template "prometheus.fullname" . }}-prometheus
-  type: "{{ .Values.prometheus.service.type }}"
diff --git a/vnfs/DAaaS/collection/charts/prometheus/templates/servicemonitor.yaml b/vnfs/DAaaS/collection/charts/prometheus/templates/servicemonitor.yaml
deleted file mode 100644
index ea2b81b6..00000000
--- a/vnfs/DAaaS/collection/charts/prometheus/templates/servicemonitor.yaml
+++ /dev/null
@@ -1,30 +0,0 @@
-{{- if .Values.prometheus.additionalServiceMonitors }}
-apiVersion: v1
-kind: List
-items:
-{{- range .Values.prometheus.additionalServiceMonitors }}
-  - apiVersion: "monitoring.coreos.com/v1"
-    kind: ServiceMonitor
-    metadata:
-      name: {{ .name }}
-      "helm.sh/hook": post-install
-      "helm.sh/hook-weight": "1"
-      labels:
-        app: {{ template "prometheus.name" $ }}-prometheus
-{{ include "prometheus.labels" $ | indent 8 }}
-        {{- if .additionalLabels }}
-{{ toYaml .additionalLabels | indent 8 }}
-        {{- end }}
-    spec:
-      endpoints:
-{{ toYaml .endpoints | indent 8 }}
-    {{- if .jobLabel }}
-      jobLabel: {{ .jobLabel }}
-    {{- end }}
-      namespaceSelector:
-        matchNames:
-          - {{ $.Release.Namespace | quote }}
-      selector:
-{{ toYaml .selector  | indent 8  }}  release: {{ $.Release.Name | quote }}
-{{- end }}
-{{- end }}
diff --git a/vnfs/DAaaS/collection/charts/prometheus/values.yaml b/vnfs/DAaaS/collection/charts/prometheus/values.yaml
deleted file mode 100644
index 4398f52f..00000000
--- a/vnfs/DAaaS/collection/charts/prometheus/values.yaml
+++ /dev/null
@@ -1,79 +0,0 @@
-## Deploy a Prometheus instance
-##
-prometheus:
-  additionalServiceMonitors:
-    - name: service-monitor-collectd
-      additionalLabels:
-        collector: collectd
-      jobLabel: collectd
-      selector:
-        matchLabels:
-          app: collectd
-      endpoints:
-        - port: collectd-prometheus
-          interval: 10s
-          path: /metrics
-    - name: service-monitor-node-exporter
-      additionalLabels:
-        collector: prometheus-node-exporter
-      jobLabel: node-exporter
-      selector:
-        matchLabels:
-          app: prometheus-node-exporter
-      endpoints:
-        - port: metrics
-          interval: 30s
-    - name: service-monitor-cadvisor
-      additionalLabels:
-        collector: cadvisor
-      jobLabel: cadvisor
-      selector:
-        matchLabels:
-          app: cadvisor
-      endpoints:
-        - port: cadvisor-prometheus
-          interval: 10s
-          path: /metrics
- 
-  service:
-    annotations: {}
-    labels: {}
-    clusterIP: ""
-
-    ## To be used with a proxy extraContainer port
-    targetPort: 9090
-
-    ## List of IP addresses at which the Prometheus server service is available
-    ## Ref: https://kubernetes.io/docs/user-guide/services/#external-ips
-    ##
-    externalIPs: []
-
-    ## Port to expose on each node
-    ## Only used if service.type is 'NodePort'
-    ##
-    nodePort: 90
-
-    ## Loadbalancer IP
-    ## Only use if service.type is "loadbalancer"
-    loadBalancerIP: ""
-    loadBalancerSourceRanges: []
-    ## Service type
-    ##
-    type: NodePort
-
-    sessionAffinity: ""
-m3db:
-  url: http://m3coordinator-m3db.m3db-operator.svc.cluster.local:7201
-
-kafkaAdapter:
-  image: 
-    repository: telefonica/prometheus-kafka-adapter
-    tag: 1.2.0 
-    pullPolicy: IfNotPresent
-  url: http://localhost:8080
-  port: 8080
-  broker: my-cluster-kafka-bootstrap.msg.svc.cluster.local:9092
-  topic: orders
-  serializationFormat: json
-  logLevel: debug
-  resources: {}