Fix the Collectd operator panic issue

Fixed the panic issue as the daemonset was used instead of
DaemonsetList. Improved the logging to get data from configmap.
Filters used to query ConfigMap was wrong.

Issue-ID: OPTFRA-461
Signed-off-by: Dileep Ranganathan <dileep.ranganathan@intel.com>
Change-Id: I14807f7b254ccc0636b5cef6d58b4b6cc0c0e375

4 files changed, 21 insertions, 2 deletions

diff --git a/vnfs/DAaaS/microservices/collectd-operator/deploy/crds/onap_v1alpha1_collectdplugin_cr.yaml b/vnfs/DAaaS/microservices/collectd-operator/deploy/crds/cpu_collectdplugin_cr.yaml
index a4684293..fb168c7a 100644
--- a/vnfs/DAaaS/microservices/collectd-operator/deploy/crds/onap_v1alpha1_collectdplugin_cr.yaml
+++ b/vnfs/DAaaS/microservices/collectd-operator/deploy/crds/cpu_collectdplugin_cr.yaml
@@ -1,10 +1,14 @@
 apiVersion: onap.org/v1alpha1
 kind: CollectdPlugin
 metadata:
-  name: example-collectdplugin
+  name: cpu
 spec:
   # Add fields here
   pluginName: "cpu"
   pluginConf: |
     <Plugin "cpu">
+      Interval 5
+      ReportByState false
+      ReportByCpu false
     </Plugin>
+ 
\ No newline at end of file
diff --git a/vnfs/DAaaS/microservices/collectd-operator/deploy/crds/memory_collectdplugin_cr.yaml b/vnfs/DAaaS/microservices/collectd-operator/deploy/crds/memory_collectdplugin_cr.yaml
new file mode 100644
index 00000000..ee051ed3
--- /dev/null
+++ b/vnfs/DAaaS/microservices/collectd-operator/deploy/crds/memory_collectdplugin_cr.yaml
@@ -0,0 +1,14 @@
+apiVersion: onap.org/v1alpha1
+kind: CollectdPlugin
+metadata:
+  name: memory
+spec:
+  # Add fields here
+  pluginName: "memory"
+  pluginConf: |
+    <Plugin "memory">
+      Interval 30
+      ValuesAbsolute false
+      ValuesPercentage true
+    </Plugin>
+ 
\ No newline at end of file
diff --git a/vnfs/DAaaS/microservices/collectd-operator/deploy/operator.yaml b/vnfs/DAaaS/microservices/collectd-operator/deploy/operator.yaml
index 108719ab..b39543ec 100644
--- a/vnfs/DAaaS/microservices/collectd-operator/deploy/operator.yaml
+++ b/vnfs/DAaaS/microservices/collectd-operator/deploy/operator.yaml
@@ -16,7 +16,7 @@ spec:
       containers:
         - name: collectd-operator
           # Replace this with the built image name
-          image: dcr.cluster.local:31976/collectd-operator:latest
+          image: dcr.cluster.local:32644/collectd-operator:latest
           command:
           - collectd-operator
           imagePullPolicy: Always
diff --git a/vnfs/DAaaS/microservices/collectd-operator/deploy/role_binding.yaml b/vnfs/DAaaS/microservices/collectd-operator/deploy/role_binding.yaml
index 5f425081..09da2923 100644
--- a/vnfs/DAaaS/microservices/collectd-operator/deploy/role_binding.yaml
+++ b/vnfs/DAaaS/microservices/collectd-operator/deploy/role_binding.yaml
@@ -5,6 +5,7 @@ metadata:
 subjects:
 - kind: ServiceAccount
   name: collectd-operator
+  namespace: cop
 roleRef:
   kind: ClusterRole
   name: collectd-operator