From: Srivahni Date: Fri, 22 Mar 2019 23:22:35 +0000 (-0700) Subject: Move Prometheus-operator to operator package X-Git-Tag: 1.4.0~48 X-Git-Url: https://gerrit.onap.org/r/gitweb?p=demo.git;a=commitdiff_plain;h=e638d92d1f48e0747fae96cd0606a52525ce9bf8 Move Prometheus-operator to operator package Change-Id: I9f3b1a67c62303e40c46fa9d28abe0339e248ed6 Issue-ID: ONAPARC-444 Signed-off-by: Srivahni --- diff --git a/vnfs/DAaaS/collection/charts/prometheus-operator/requirements.yaml b/vnfs/DAaaS/collection/charts/prometheus-operator/requirements.yaml deleted file mode 100644 index 076e5513..00000000 --- a/vnfs/DAaaS/collection/charts/prometheus-operator/requirements.yaml +++ /dev/null @@ -1,16 +0,0 @@ -dependencies: - - - name: kube-state-metrics - version: 0.14.* - repository: https://kubernetes-charts.storage.googleapis.com/ - condition: kubeStateMetrics.enabled - - - name: prometheus-node-exporter - version: 1.3.* - repository: https://kubernetes-charts.storage.googleapis.com/ - condition: nodeExporter.enabled - - - name: grafana - version: 2.0.* - repository: https://kubernetes-charts.storage.googleapis.com/ - condition: grafana.enabled diff --git a/vnfs/DAaaS/collection/charts/prometheus-operator/.helmignore b/vnfs/DAaaS/operator/charts/prometheus-operator/.helmignore similarity index 100% rename from vnfs/DAaaS/collection/charts/prometheus-operator/.helmignore rename to vnfs/DAaaS/operator/charts/prometheus-operator/.helmignore diff --git a/vnfs/DAaaS/collection/charts/prometheus-operator/Chart.yaml b/vnfs/DAaaS/operator/charts/prometheus-operator/Chart.yaml similarity index 100% rename from vnfs/DAaaS/collection/charts/prometheus-operator/Chart.yaml rename to vnfs/DAaaS/operator/charts/prometheus-operator/Chart.yaml diff --git a/vnfs/DAaaS/collection/charts/prometheus-operator/README.md b/vnfs/DAaaS/operator/charts/prometheus-operator/README.md similarity index 100% rename from vnfs/DAaaS/collection/charts/prometheus-operator/README.md rename to vnfs/DAaaS/operator/charts/prometheus-operator/README.md diff --git a/vnfs/DAaaS/collection/charts/prometheus-operator/templates/NOTES.txt b/vnfs/DAaaS/operator/charts/prometheus-operator/templates/NOTES.txt similarity index 100% rename from vnfs/DAaaS/collection/charts/prometheus-operator/templates/NOTES.txt rename to vnfs/DAaaS/operator/charts/prometheus-operator/templates/NOTES.txt diff --git a/vnfs/DAaaS/collection/charts/prometheus-operator/templates/_helpers.tpl b/vnfs/DAaaS/operator/charts/prometheus-operator/templates/_helpers.tpl similarity index 100% rename from vnfs/DAaaS/collection/charts/prometheus-operator/templates/_helpers.tpl rename to vnfs/DAaaS/operator/charts/prometheus-operator/templates/_helpers.tpl diff --git a/vnfs/DAaaS/collection/charts/prometheus-operator/templates/alertmanager/alertmanager.yaml b/vnfs/DAaaS/operator/charts/prometheus-operator/templates/alertmanager/alertmanager.yaml similarity index 100% rename from vnfs/DAaaS/collection/charts/prometheus-operator/templates/alertmanager/alertmanager.yaml rename to vnfs/DAaaS/operator/charts/prometheus-operator/templates/alertmanager/alertmanager.yaml diff --git a/vnfs/DAaaS/collection/charts/prometheus-operator/templates/alertmanager/ingress.yaml b/vnfs/DAaaS/operator/charts/prometheus-operator/templates/alertmanager/ingress.yaml similarity index 100% rename from vnfs/DAaaS/collection/charts/prometheus-operator/templates/alertmanager/ingress.yaml rename to vnfs/DAaaS/operator/charts/prometheus-operator/templates/alertmanager/ingress.yaml diff --git a/vnfs/DAaaS/collection/charts/prometheus-operator/templates/alertmanager/podDisruptionBudget.yaml b/vnfs/DAaaS/operator/charts/prometheus-operator/templates/alertmanager/podDisruptionBudget.yaml similarity index 100% rename from vnfs/DAaaS/collection/charts/prometheus-operator/templates/alertmanager/podDisruptionBudget.yaml rename to vnfs/DAaaS/operator/charts/prometheus-operator/templates/alertmanager/podDisruptionBudget.yaml diff --git a/vnfs/DAaaS/collection/charts/prometheus-operator/templates/alertmanager/psp-clusterrole.yaml b/vnfs/DAaaS/operator/charts/prometheus-operator/templates/alertmanager/psp-clusterrole.yaml similarity index 100% rename from vnfs/DAaaS/collection/charts/prometheus-operator/templates/alertmanager/psp-clusterrole.yaml rename to vnfs/DAaaS/operator/charts/prometheus-operator/templates/alertmanager/psp-clusterrole.yaml diff --git a/vnfs/DAaaS/collection/charts/prometheus-operator/templates/alertmanager/psp-clusterrolebinding.yaml b/vnfs/DAaaS/operator/charts/prometheus-operator/templates/alertmanager/psp-clusterrolebinding.yaml similarity index 100% rename from vnfs/DAaaS/collection/charts/prometheus-operator/templates/alertmanager/psp-clusterrolebinding.yaml rename to vnfs/DAaaS/operator/charts/prometheus-operator/templates/alertmanager/psp-clusterrolebinding.yaml diff --git a/vnfs/DAaaS/collection/charts/prometheus-operator/templates/alertmanager/psp.yaml b/vnfs/DAaaS/operator/charts/prometheus-operator/templates/alertmanager/psp.yaml similarity index 100% rename from vnfs/DAaaS/collection/charts/prometheus-operator/templates/alertmanager/psp.yaml rename to vnfs/DAaaS/operator/charts/prometheus-operator/templates/alertmanager/psp.yaml diff --git a/vnfs/DAaaS/collection/charts/prometheus-operator/templates/alertmanager/secret.yaml b/vnfs/DAaaS/operator/charts/prometheus-operator/templates/alertmanager/secret.yaml similarity index 100% rename from vnfs/DAaaS/collection/charts/prometheus-operator/templates/alertmanager/secret.yaml rename to vnfs/DAaaS/operator/charts/prometheus-operator/templates/alertmanager/secret.yaml diff --git a/vnfs/DAaaS/collection/charts/prometheus-operator/templates/alertmanager/service.yaml b/vnfs/DAaaS/operator/charts/prometheus-operator/templates/alertmanager/service.yaml similarity index 100% rename from vnfs/DAaaS/collection/charts/prometheus-operator/templates/alertmanager/service.yaml rename to vnfs/DAaaS/operator/charts/prometheus-operator/templates/alertmanager/service.yaml diff --git a/vnfs/DAaaS/collection/charts/prometheus-operator/templates/alertmanager/serviceaccount.yaml b/vnfs/DAaaS/operator/charts/prometheus-operator/templates/alertmanager/serviceaccount.yaml similarity index 100% rename from vnfs/DAaaS/collection/charts/prometheus-operator/templates/alertmanager/serviceaccount.yaml rename to vnfs/DAaaS/operator/charts/prometheus-operator/templates/alertmanager/serviceaccount.yaml diff --git a/vnfs/DAaaS/collection/charts/prometheus-operator/templates/alertmanager/servicemonitor.yaml b/vnfs/DAaaS/operator/charts/prometheus-operator/templates/alertmanager/servicemonitor.yaml similarity index 100% rename from vnfs/DAaaS/collection/charts/prometheus-operator/templates/alertmanager/servicemonitor.yaml rename to vnfs/DAaaS/operator/charts/prometheus-operator/templates/alertmanager/servicemonitor.yaml diff --git a/vnfs/DAaaS/collection/charts/prometheus-operator/templates/exporters/node-exporter/servicemonitor.yaml b/vnfs/DAaaS/operator/charts/prometheus-operator/templates/exporters/node-exporter/servicemonitor.yaml similarity index 100% rename from vnfs/DAaaS/collection/charts/prometheus-operator/templates/exporters/node-exporter/servicemonitor.yaml rename to vnfs/DAaaS/operator/charts/prometheus-operator/templates/exporters/node-exporter/servicemonitor.yaml diff --git a/vnfs/DAaaS/collection/charts/prometheus-operator/templates/grafana/configmap-dashboards.yaml b/vnfs/DAaaS/operator/charts/prometheus-operator/templates/grafana/configmap-dashboards.yaml similarity index 100% rename from vnfs/DAaaS/collection/charts/prometheus-operator/templates/grafana/configmap-dashboards.yaml rename to vnfs/DAaaS/operator/charts/prometheus-operator/templates/grafana/configmap-dashboards.yaml diff --git a/vnfs/DAaaS/collection/charts/prometheus-operator/templates/grafana/configmaps-datasources.yaml b/vnfs/DAaaS/operator/charts/prometheus-operator/templates/grafana/configmaps-datasources.yaml similarity index 100% rename from vnfs/DAaaS/collection/charts/prometheus-operator/templates/grafana/configmaps-datasources.yaml rename to vnfs/DAaaS/operator/charts/prometheus-operator/templates/grafana/configmaps-datasources.yaml diff --git a/vnfs/DAaaS/collection/charts/prometheus-operator/templates/grafana/dashboards/etcd.yaml b/vnfs/DAaaS/operator/charts/prometheus-operator/templates/grafana/dashboards/etcd.yaml similarity index 100% rename from vnfs/DAaaS/collection/charts/prometheus-operator/templates/grafana/dashboards/etcd.yaml rename to vnfs/DAaaS/operator/charts/prometheus-operator/templates/grafana/dashboards/etcd.yaml diff --git a/vnfs/DAaaS/collection/charts/prometheus-operator/templates/grafana/dashboards/k8s-cluster-rsrc-use.yaml b/vnfs/DAaaS/operator/charts/prometheus-operator/templates/grafana/dashboards/k8s-cluster-rsrc-use.yaml similarity index 100% rename from vnfs/DAaaS/collection/charts/prometheus-operator/templates/grafana/dashboards/k8s-cluster-rsrc-use.yaml rename to vnfs/DAaaS/operator/charts/prometheus-operator/templates/grafana/dashboards/k8s-cluster-rsrc-use.yaml diff --git a/vnfs/DAaaS/collection/charts/prometheus-operator/templates/grafana/dashboards/k8s-coredns.yaml b/vnfs/DAaaS/operator/charts/prometheus-operator/templates/grafana/dashboards/k8s-coredns.yaml similarity index 100% rename from vnfs/DAaaS/collection/charts/prometheus-operator/templates/grafana/dashboards/k8s-coredns.yaml rename to vnfs/DAaaS/operator/charts/prometheus-operator/templates/grafana/dashboards/k8s-coredns.yaml diff --git a/vnfs/DAaaS/collection/charts/prometheus-operator/templates/grafana/dashboards/k8s-node-rsrc-use.yaml b/vnfs/DAaaS/operator/charts/prometheus-operator/templates/grafana/dashboards/k8s-node-rsrc-use.yaml similarity index 100% rename from vnfs/DAaaS/collection/charts/prometheus-operator/templates/grafana/dashboards/k8s-node-rsrc-use.yaml rename to vnfs/DAaaS/operator/charts/prometheus-operator/templates/grafana/dashboards/k8s-node-rsrc-use.yaml diff --git a/vnfs/DAaaS/collection/charts/prometheus-operator/templates/grafana/dashboards/k8s-resources-cluster.yaml b/vnfs/DAaaS/operator/charts/prometheus-operator/templates/grafana/dashboards/k8s-resources-cluster.yaml similarity index 100% rename from vnfs/DAaaS/collection/charts/prometheus-operator/templates/grafana/dashboards/k8s-resources-cluster.yaml rename to vnfs/DAaaS/operator/charts/prometheus-operator/templates/grafana/dashboards/k8s-resources-cluster.yaml diff --git a/vnfs/DAaaS/collection/charts/prometheus-operator/templates/grafana/dashboards/k8s-resources-namespace.yaml b/vnfs/DAaaS/operator/charts/prometheus-operator/templates/grafana/dashboards/k8s-resources-namespace.yaml similarity index 100% rename from vnfs/DAaaS/collection/charts/prometheus-operator/templates/grafana/dashboards/k8s-resources-namespace.yaml rename to vnfs/DAaaS/operator/charts/prometheus-operator/templates/grafana/dashboards/k8s-resources-namespace.yaml diff --git a/vnfs/DAaaS/collection/charts/prometheus-operator/templates/grafana/dashboards/k8s-resources-pod.yaml b/vnfs/DAaaS/operator/charts/prometheus-operator/templates/grafana/dashboards/k8s-resources-pod.yaml similarity index 100% rename from vnfs/DAaaS/collection/charts/prometheus-operator/templates/grafana/dashboards/k8s-resources-pod.yaml rename to vnfs/DAaaS/operator/charts/prometheus-operator/templates/grafana/dashboards/k8s-resources-pod.yaml diff --git a/vnfs/DAaaS/collection/charts/prometheus-operator/templates/grafana/dashboards/nodes.yaml b/vnfs/DAaaS/operator/charts/prometheus-operator/templates/grafana/dashboards/nodes.yaml similarity index 100% rename from vnfs/DAaaS/collection/charts/prometheus-operator/templates/grafana/dashboards/nodes.yaml rename to vnfs/DAaaS/operator/charts/prometheus-operator/templates/grafana/dashboards/nodes.yaml diff --git a/vnfs/DAaaS/collection/charts/prometheus-operator/templates/grafana/dashboards/persistentvolumesusage.yaml b/vnfs/DAaaS/operator/charts/prometheus-operator/templates/grafana/dashboards/persistentvolumesusage.yaml similarity index 100% rename from vnfs/DAaaS/collection/charts/prometheus-operator/templates/grafana/dashboards/persistentvolumesusage.yaml rename to vnfs/DAaaS/operator/charts/prometheus-operator/templates/grafana/dashboards/persistentvolumesusage.yaml diff --git a/vnfs/DAaaS/collection/charts/prometheus-operator/templates/grafana/dashboards/pods.yaml b/vnfs/DAaaS/operator/charts/prometheus-operator/templates/grafana/dashboards/pods.yaml similarity index 100% rename from vnfs/DAaaS/collection/charts/prometheus-operator/templates/grafana/dashboards/pods.yaml rename to vnfs/DAaaS/operator/charts/prometheus-operator/templates/grafana/dashboards/pods.yaml diff --git a/vnfs/DAaaS/collection/charts/prometheus-operator/templates/grafana/dashboards/statefulset.yaml b/vnfs/DAaaS/operator/charts/prometheus-operator/templates/grafana/dashboards/statefulset.yaml similarity index 100% rename from vnfs/DAaaS/collection/charts/prometheus-operator/templates/grafana/dashboards/statefulset.yaml rename to vnfs/DAaaS/operator/charts/prometheus-operator/templates/grafana/dashboards/statefulset.yaml diff --git a/vnfs/DAaaS/collection/charts/prometheus-operator/templates/grafana/servicemonitor.yaml b/vnfs/DAaaS/operator/charts/prometheus-operator/templates/grafana/servicemonitor.yaml similarity index 100% rename from vnfs/DAaaS/collection/charts/prometheus-operator/templates/grafana/servicemonitor.yaml rename to vnfs/DAaaS/operator/charts/prometheus-operator/templates/grafana/servicemonitor.yaml diff --git a/vnfs/DAaaS/collection/charts/prometheus-operator/templates/prometheus-operator/cleanup-crds.yaml b/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus-operator/cleanup-crds.yaml similarity index 100% rename from vnfs/DAaaS/collection/charts/prometheus-operator/templates/prometheus-operator/cleanup-crds.yaml rename to vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus-operator/cleanup-crds.yaml diff --git a/vnfs/DAaaS/collection/charts/prometheus-operator/templates/prometheus-operator/clusterrole.yaml b/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus-operator/clusterrole.yaml similarity index 100% rename from vnfs/DAaaS/collection/charts/prometheus-operator/templates/prometheus-operator/clusterrole.yaml rename to vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus-operator/clusterrole.yaml diff --git a/vnfs/DAaaS/collection/charts/prometheus-operator/templates/prometheus-operator/clusterrolebinding.yaml b/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus-operator/clusterrolebinding.yaml similarity index 100% rename from vnfs/DAaaS/collection/charts/prometheus-operator/templates/prometheus-operator/clusterrolebinding.yaml rename to vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus-operator/clusterrolebinding.yaml diff --git a/vnfs/DAaaS/collection/charts/prometheus-operator/templates/prometheus-operator/crd-alertmanager.yaml b/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus-operator/crd-alertmanager.yaml similarity index 100% rename from vnfs/DAaaS/collection/charts/prometheus-operator/templates/prometheus-operator/crd-alertmanager.yaml rename to vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus-operator/crd-alertmanager.yaml diff --git a/vnfs/DAaaS/collection/charts/prometheus-operator/templates/prometheus-operator/crd-prometheus.yaml b/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus-operator/crd-prometheus.yaml similarity index 100% rename from vnfs/DAaaS/collection/charts/prometheus-operator/templates/prometheus-operator/crd-prometheus.yaml rename to vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus-operator/crd-prometheus.yaml diff --git a/vnfs/DAaaS/collection/charts/prometheus-operator/templates/prometheus-operator/crd-prometheusrules.yaml b/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus-operator/crd-prometheusrules.yaml similarity index 100% rename from vnfs/DAaaS/collection/charts/prometheus-operator/templates/prometheus-operator/crd-prometheusrules.yaml rename to vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus-operator/crd-prometheusrules.yaml diff --git a/vnfs/DAaaS/collection/charts/prometheus-operator/templates/prometheus-operator/crd-servicemonitor.yaml b/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus-operator/crd-servicemonitor.yaml similarity index 100% rename from vnfs/DAaaS/collection/charts/prometheus-operator/templates/prometheus-operator/crd-servicemonitor.yaml rename to vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus-operator/crd-servicemonitor.yaml diff --git a/vnfs/DAaaS/collection/charts/prometheus-operator/templates/prometheus-operator/deployment.yaml b/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus-operator/deployment.yaml similarity index 100% rename from vnfs/DAaaS/collection/charts/prometheus-operator/templates/prometheus-operator/deployment.yaml rename to vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus-operator/deployment.yaml diff --git a/vnfs/DAaaS/collection/charts/prometheus-operator/templates/prometheus-operator/psp-clusterrole.yaml b/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus-operator/psp-clusterrole.yaml similarity index 100% rename from vnfs/DAaaS/collection/charts/prometheus-operator/templates/prometheus-operator/psp-clusterrole.yaml rename to vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus-operator/psp-clusterrole.yaml diff --git a/vnfs/DAaaS/collection/charts/prometheus-operator/templates/prometheus-operator/psp-clusterrolebinding.yaml b/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus-operator/psp-clusterrolebinding.yaml similarity index 100% rename from vnfs/DAaaS/collection/charts/prometheus-operator/templates/prometheus-operator/psp-clusterrolebinding.yaml rename to vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus-operator/psp-clusterrolebinding.yaml diff --git a/vnfs/DAaaS/collection/charts/prometheus-operator/templates/prometheus-operator/psp.yaml b/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus-operator/psp.yaml similarity index 100% rename from vnfs/DAaaS/collection/charts/prometheus-operator/templates/prometheus-operator/psp.yaml rename to vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus-operator/psp.yaml diff --git a/vnfs/DAaaS/collection/charts/prometheus-operator/templates/prometheus-operator/service.yaml b/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus-operator/service.yaml similarity index 100% rename from vnfs/DAaaS/collection/charts/prometheus-operator/templates/prometheus-operator/service.yaml rename to vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus-operator/service.yaml diff --git a/vnfs/DAaaS/collection/charts/prometheus-operator/templates/prometheus-operator/serviceaccount.yaml b/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus-operator/serviceaccount.yaml similarity index 100% rename from vnfs/DAaaS/collection/charts/prometheus-operator/templates/prometheus-operator/serviceaccount.yaml rename to vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus-operator/serviceaccount.yaml diff --git a/vnfs/DAaaS/collection/charts/prometheus-operator/templates/prometheus-operator/servicemonitor.yaml b/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus-operator/servicemonitor.yaml similarity index 100% rename from vnfs/DAaaS/collection/charts/prometheus-operator/templates/prometheus-operator/servicemonitor.yaml rename to vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus-operator/servicemonitor.yaml diff --git a/vnfs/DAaaS/collection/charts/prometheus-operator/templates/prometheus/additionalAlertRelabelConfigs.yaml b/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/additionalAlertRelabelConfigs.yaml similarity index 100% rename from vnfs/DAaaS/collection/charts/prometheus-operator/templates/prometheus/additionalAlertRelabelConfigs.yaml rename to vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/additionalAlertRelabelConfigs.yaml diff --git a/vnfs/DAaaS/collection/charts/prometheus-operator/templates/prometheus/additionalAlertmanagerConfigs.yaml b/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/additionalAlertmanagerConfigs.yaml similarity index 100% rename from vnfs/DAaaS/collection/charts/prometheus-operator/templates/prometheus/additionalAlertmanagerConfigs.yaml rename to vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/additionalAlertmanagerConfigs.yaml diff --git a/vnfs/DAaaS/collection/charts/prometheus-operator/templates/prometheus/additionalPrometheusRules.yaml b/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/additionalPrometheusRules.yaml similarity index 100% rename from vnfs/DAaaS/collection/charts/prometheus-operator/templates/prometheus/additionalPrometheusRules.yaml rename to vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/additionalPrometheusRules.yaml diff --git a/vnfs/DAaaS/collection/charts/prometheus-operator/templates/prometheus/additionalScrapeConfigs.yaml b/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/additionalScrapeConfigs.yaml similarity index 100% rename from vnfs/DAaaS/collection/charts/prometheus-operator/templates/prometheus/additionalScrapeConfigs.yaml rename to vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/additionalScrapeConfigs.yaml diff --git a/vnfs/DAaaS/collection/charts/prometheus-operator/templates/prometheus/clusterrole.yaml b/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/clusterrole.yaml similarity index 100% rename from vnfs/DAaaS/collection/charts/prometheus-operator/templates/prometheus/clusterrole.yaml rename to vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/clusterrole.yaml diff --git a/vnfs/DAaaS/collection/charts/prometheus-operator/templates/prometheus/clusterrolebinding.yaml b/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/clusterrolebinding.yaml similarity index 100% rename from vnfs/DAaaS/collection/charts/prometheus-operator/templates/prometheus/clusterrolebinding.yaml rename to vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/clusterrolebinding.yaml diff --git a/vnfs/DAaaS/collection/charts/prometheus-operator/templates/prometheus/ingress.yaml b/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/ingress.yaml similarity index 100% rename from vnfs/DAaaS/collection/charts/prometheus-operator/templates/prometheus/ingress.yaml rename to vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/ingress.yaml diff --git a/vnfs/DAaaS/collection/charts/prometheus-operator/templates/prometheus/podDisruptionBudget.yaml b/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/podDisruptionBudget.yaml similarity index 100% rename from vnfs/DAaaS/collection/charts/prometheus-operator/templates/prometheus/podDisruptionBudget.yaml rename to vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/podDisruptionBudget.yaml diff --git a/vnfs/DAaaS/collection/charts/prometheus-operator/templates/prometheus/prometheus.yaml b/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/prometheus.yaml similarity index 100% rename from vnfs/DAaaS/collection/charts/prometheus-operator/templates/prometheus/prometheus.yaml rename to vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/prometheus.yaml diff --git a/vnfs/DAaaS/collection/charts/prometheus-operator/templates/prometheus/psp-clusterrole.yaml b/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/psp-clusterrole.yaml similarity index 100% rename from vnfs/DAaaS/collection/charts/prometheus-operator/templates/prometheus/psp-clusterrole.yaml rename to vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/psp-clusterrole.yaml diff --git a/vnfs/DAaaS/collection/charts/prometheus-operator/templates/prometheus/psp-clusterrolebinding.yaml b/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/psp-clusterrolebinding.yaml similarity index 100% rename from vnfs/DAaaS/collection/charts/prometheus-operator/templates/prometheus/psp-clusterrolebinding.yaml rename to vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/psp-clusterrolebinding.yaml diff --git a/vnfs/DAaaS/collection/charts/prometheus-operator/templates/prometheus/psp.yaml b/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/psp.yaml similarity index 100% rename from vnfs/DAaaS/collection/charts/prometheus-operator/templates/prometheus/psp.yaml rename to vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/psp.yaml diff --git a/vnfs/DAaaS/collection/charts/prometheus-operator/templates/prometheus/role-config.yaml b/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/role-config.yaml similarity index 100% rename from vnfs/DAaaS/collection/charts/prometheus-operator/templates/prometheus/role-config.yaml rename to vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/role-config.yaml diff --git a/vnfs/DAaaS/collection/charts/prometheus-operator/templates/prometheus/role-specificNamespace.yaml b/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/role-specificNamespace.yaml similarity index 100% rename from vnfs/DAaaS/collection/charts/prometheus-operator/templates/prometheus/role-specificNamespace.yaml rename to vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/role-specificNamespace.yaml diff --git a/vnfs/DAaaS/collection/charts/prometheus-operator/templates/prometheus/rolebinding-config.yaml b/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/rolebinding-config.yaml similarity index 100% rename from vnfs/DAaaS/collection/charts/prometheus-operator/templates/prometheus/rolebinding-config.yaml rename to vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/rolebinding-config.yaml diff --git a/vnfs/DAaaS/collection/charts/prometheus-operator/templates/prometheus/rolebinding-specificNamespace.yaml b/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/rolebinding-specificNamespace.yaml similarity index 100% rename from vnfs/DAaaS/collection/charts/prometheus-operator/templates/prometheus/rolebinding-specificNamespace.yaml rename to vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/rolebinding-specificNamespace.yaml diff --git a/vnfs/DAaaS/collection/charts/prometheus-operator/templates/prometheus/rules/alertmanager.rules.yaml b/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/rules/alertmanager.rules.yaml similarity index 100% rename from vnfs/DAaaS/collection/charts/prometheus-operator/templates/prometheus/rules/alertmanager.rules.yaml rename to vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/rules/alertmanager.rules.yaml diff --git a/vnfs/DAaaS/collection/charts/prometheus-operator/templates/prometheus/rules/etcd.yaml b/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/rules/etcd.yaml similarity index 100% rename from vnfs/DAaaS/collection/charts/prometheus-operator/templates/prometheus/rules/etcd.yaml rename to vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/rules/etcd.yaml diff --git a/vnfs/DAaaS/collection/charts/prometheus-operator/templates/prometheus/rules/general.rules.yaml b/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/rules/general.rules.yaml similarity index 100% rename from vnfs/DAaaS/collection/charts/prometheus-operator/templates/prometheus/rules/general.rules.yaml rename to vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/rules/general.rules.yaml diff --git a/vnfs/DAaaS/collection/charts/prometheus-operator/templates/prometheus/rules/k8s.rules.yaml b/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/rules/k8s.rules.yaml similarity index 100% rename from vnfs/DAaaS/collection/charts/prometheus-operator/templates/prometheus/rules/k8s.rules.yaml rename to vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/rules/k8s.rules.yaml diff --git a/vnfs/DAaaS/collection/charts/prometheus-operator/templates/prometheus/rules/kube-apiserver.rules.yaml b/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/rules/kube-apiserver.rules.yaml similarity index 100% rename from vnfs/DAaaS/collection/charts/prometheus-operator/templates/prometheus/rules/kube-apiserver.rules.yaml rename to vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/rules/kube-apiserver.rules.yaml diff --git a/vnfs/DAaaS/collection/charts/prometheus-operator/templates/prometheus/rules/kube-prometheus-node-alerting.rules.yaml b/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/rules/kube-prometheus-node-alerting.rules.yaml similarity index 100% rename from vnfs/DAaaS/collection/charts/prometheus-operator/templates/prometheus/rules/kube-prometheus-node-alerting.rules.yaml rename to vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/rules/kube-prometheus-node-alerting.rules.yaml diff --git a/vnfs/DAaaS/collection/charts/prometheus-operator/templates/prometheus/rules/kube-prometheus-node-recording.rules.yaml b/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/rules/kube-prometheus-node-recording.rules.yaml similarity index 100% rename from vnfs/DAaaS/collection/charts/prometheus-operator/templates/prometheus/rules/kube-prometheus-node-recording.rules.yaml rename to vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/rules/kube-prometheus-node-recording.rules.yaml diff --git a/vnfs/DAaaS/collection/charts/prometheus-operator/templates/prometheus/rules/kube-scheduler.rules.yaml b/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/rules/kube-scheduler.rules.yaml similarity index 100% rename from vnfs/DAaaS/collection/charts/prometheus-operator/templates/prometheus/rules/kube-scheduler.rules.yaml rename to vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/rules/kube-scheduler.rules.yaml diff --git a/vnfs/DAaaS/collection/charts/prometheus-operator/templates/prometheus/rules/kubernetes-absent.yaml b/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/rules/kubernetes-absent.yaml similarity index 100% rename from vnfs/DAaaS/collection/charts/prometheus-operator/templates/prometheus/rules/kubernetes-absent.yaml rename to vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/rules/kubernetes-absent.yaml diff --git a/vnfs/DAaaS/collection/charts/prometheus-operator/templates/prometheus/rules/kubernetes-apps.yaml b/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/rules/kubernetes-apps.yaml similarity index 100% rename from vnfs/DAaaS/collection/charts/prometheus-operator/templates/prometheus/rules/kubernetes-apps.yaml rename to vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/rules/kubernetes-apps.yaml diff --git a/vnfs/DAaaS/collection/charts/prometheus-operator/templates/prometheus/rules/kubernetes-resources.yaml b/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/rules/kubernetes-resources.yaml similarity index 100% rename from vnfs/DAaaS/collection/charts/prometheus-operator/templates/prometheus/rules/kubernetes-resources.yaml rename to vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/rules/kubernetes-resources.yaml diff --git a/vnfs/DAaaS/collection/charts/prometheus-operator/templates/prometheus/rules/kubernetes-storage.yaml b/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/rules/kubernetes-storage.yaml similarity index 100% rename from vnfs/DAaaS/collection/charts/prometheus-operator/templates/prometheus/rules/kubernetes-storage.yaml rename to vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/rules/kubernetes-storage.yaml diff --git a/vnfs/DAaaS/collection/charts/prometheus-operator/templates/prometheus/rules/kubernetes-system.yaml b/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/rules/kubernetes-system.yaml similarity index 100% rename from vnfs/DAaaS/collection/charts/prometheus-operator/templates/prometheus/rules/kubernetes-system.yaml rename to vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/rules/kubernetes-system.yaml diff --git a/vnfs/DAaaS/collection/charts/prometheus-operator/templates/prometheus/rules/node.rules.yaml b/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/rules/node.rules.yaml similarity index 100% rename from vnfs/DAaaS/collection/charts/prometheus-operator/templates/prometheus/rules/node.rules.yaml rename to vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/rules/node.rules.yaml diff --git a/vnfs/DAaaS/collection/charts/prometheus-operator/templates/prometheus/rules/prometheus-operator.yaml b/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/rules/prometheus-operator.yaml similarity index 100% rename from vnfs/DAaaS/collection/charts/prometheus-operator/templates/prometheus/rules/prometheus-operator.yaml rename to vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/rules/prometheus-operator.yaml diff --git a/vnfs/DAaaS/collection/charts/prometheus-operator/templates/prometheus/rules/prometheus.rules.yaml b/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/rules/prometheus.rules.yaml similarity index 100% rename from vnfs/DAaaS/collection/charts/prometheus-operator/templates/prometheus/rules/prometheus.rules.yaml rename to vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/rules/prometheus.rules.yaml diff --git a/vnfs/DAaaS/collection/charts/prometheus-operator/templates/prometheus/service.yaml b/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/service.yaml similarity index 100% rename from vnfs/DAaaS/collection/charts/prometheus-operator/templates/prometheus/service.yaml rename to vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/service.yaml diff --git a/vnfs/DAaaS/collection/charts/prometheus-operator/templates/prometheus/serviceaccount.yaml b/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/serviceaccount.yaml similarity index 100% rename from vnfs/DAaaS/collection/charts/prometheus-operator/templates/prometheus/serviceaccount.yaml rename to vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/serviceaccount.yaml diff --git a/vnfs/DAaaS/collection/charts/prometheus-operator/templates/prometheus/servicemonitor.yaml b/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/servicemonitor.yaml similarity index 100% rename from vnfs/DAaaS/collection/charts/prometheus-operator/templates/prometheus/servicemonitor.yaml rename to vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/servicemonitor.yaml diff --git a/vnfs/DAaaS/collection/charts/prometheus-operator/templates/prometheus/servicemonitors.yaml b/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/servicemonitors.yaml similarity index 100% rename from vnfs/DAaaS/collection/charts/prometheus-operator/templates/prometheus/servicemonitors.yaml rename to vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/servicemonitors.yaml diff --git a/vnfs/DAaaS/collection/charts/prometheus-operator/values.yaml b/vnfs/DAaaS/operator/charts/prometheus-operator/values.yaml similarity index 100% rename from vnfs/DAaaS/collection/charts/prometheus-operator/values.yaml rename to vnfs/DAaaS/operator/charts/prometheus-operator/values.yaml