From 0267c3f9d81223fa8cc4ed9378d630e3f451182c Mon Sep 17 00:00:00 2001
From: dma <dma@ubiqube.com>
Date: Mon, 4 Oct 2021 21:30:19 +0100
Subject: [PATCH] MSA-10091 - kibana live filtering mechanism

---
 .../Kibana/.meta_Process_Delete_Dashboard     |  17 --
 ...ask_Search_Dashboard_Template_Selected.php |  17 --
 Analytics/Kibana/.meta_kibana_dashboard.xml   |   6 +-
 .../.meta_Task_Recovering_and_Filtering.php   |  42 ----
 .../.meta_Task_Recoving_and_Filtring.php      |  29 ---
 ...ask_Search_Dashboard_Template_Selected.php |   2 +-
 ....meta_Task_Send_the_new_template_to_ES.php |  35 ---
 ...ask_Search_Dashboard_Template_Selected.php | 169 ++------------
 .../Task_Send_the_new_template_to_ES.php      | 196 -----------------
 .../.meta_Task_Delete_Dashboard.php           |  35 ---
 .../Task_Delete_Dashboard.php                 |  34 ---
 ...ta_Task_Recove_and_filter_for_Updating.php |  29 ---
 ..._Recovering_and_filtering_for_Updating.php |  42 ----
 ...Search_Dashboard_Selected_for_Updating.php |   2 +-
 ..._Send_back_template_to_ES_for_Updating.php |  35 ---
 ...Search_Dashboard_Selected_for_Updating.php | 160 ++------------
 ..._Send_back_template_to_ES_for_Updating.php | 206 ------------------
 Analytics/Kibana/kibana_dashboard.xml         | 145 +-----------
 18 files changed, 39 insertions(+), 1162 deletions(-)
 delete mode 100755 Analytics/Kibana/.meta_Process_Delete_Dashboard
 delete mode 100644 Analytics/Kibana/.meta_Task_Search_Dashboard_Template_Selected.php
 delete mode 100644 Analytics/Kibana/Process_Create_Report_Dashboard/.meta_Task_Recovering_and_Filtering.php
 delete mode 100755 Analytics/Kibana/Process_Create_Report_Dashboard/.meta_Task_Recoving_and_Filtring.php
 delete mode 100755 Analytics/Kibana/Process_Create_Report_Dashboard/.meta_Task_Send_the_new_template_to_ES.php
 delete mode 100755 Analytics/Kibana/Process_Create_Report_Dashboard/Task_Send_the_new_template_to_ES.php
 delete mode 100755 Analytics/Kibana/Process_Delete_Dashboard/.meta_Task_Delete_Dashboard.php
 delete mode 100755 Analytics/Kibana/Process_Delete_Dashboard/Task_Delete_Dashboard.php
 delete mode 100755 Analytics/Kibana/Process_Update_Dashboard/.meta_Task_Recove_and_filter_for_Updating.php
 delete mode 100644 Analytics/Kibana/Process_Update_Dashboard/.meta_Task_Recovering_and_filtering_for_Updating.php
 delete mode 100755 Analytics/Kibana/Process_Update_Dashboard/.meta_Task_Send_back_template_to_ES_for_Updating.php
 delete mode 100755 Analytics/Kibana/Process_Update_Dashboard/Task_Send_back_template_to_ES_for_Updating.php

diff --git a/Analytics/Kibana/.meta_Process_Delete_Dashboard b/Analytics/Kibana/.meta_Process_Delete_Dashboard
deleted file mode 100755
index 767808ccd..000000000
--- a/Analytics/Kibana/.meta_Process_Delete_Dashboard
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<metadata>
-    <map>
-        <entry>
-            <key>DATE_MODIFICATION</key>
-            <value>1473866407171</value>
-        </entry>
-        <entry>
-            <key>DATE_CREATION</key>
-            <value>1473866407154</value>
-        </entry>
-        <entry>
-            <key>TYPE</key>
-            <value>DIRECTORY</value>
-        </entry>
-    </map>
-</metadata>
diff --git a/Analytics/Kibana/.meta_Task_Search_Dashboard_Template_Selected.php b/Analytics/Kibana/.meta_Task_Search_Dashboard_Template_Selected.php
deleted file mode 100644
index fad434804..000000000
--- a/Analytics/Kibana/.meta_Task_Search_Dashboard_Template_Selected.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<metadata>
-    <map>
-        <entry>
-            <key>DATE_MODIFICATION</key>
-            <value>1484752228416</value>
-        </entry>
-        <entry>
-            <key>DATE_CREATION</key>
-            <value>1484752141060</value>
-        </entry>
-        <entry>
-            <key>TYPE</key>
-            <value>FILE</value>
-        </entry>
-    </map>
-</metadata>
diff --git a/Analytics/Kibana/.meta_kibana_dashboard.xml b/Analytics/Kibana/.meta_kibana_dashboard.xml
index 3ade6f0e2..14353521d 100755
--- a/Analytics/Kibana/.meta_kibana_dashboard.xml
+++ b/Analytics/Kibana/.meta_kibana_dashboard.xml
@@ -7,7 +7,7 @@
         </entry>
         <entry>
             <key>DATE_MODIFICATION</key>
-            <value>1618373411933</value>
+            <value>1633377872118</value>
         </entry>
         <entry>
             <key>REPOSITORY</key>
@@ -15,7 +15,7 @@
         </entry>
         <entry>
             <key>DATE_CREATION</key>
-            <value>1618373411922</value>
+            <value>1633377872112</value>
         </entry>
         <entry>
             <key>MODEL</key>
@@ -26,7 +26,7 @@
         </entry>
         <entry>
             <key>FILE_TYPE</key>
-            <value>text</value>
+            <value>unknown</value>
         </entry>
         <entry>
             <key>MANUFACTURER</key>
diff --git a/Analytics/Kibana/Process_Create_Report_Dashboard/.meta_Task_Recovering_and_Filtering.php b/Analytics/Kibana/Process_Create_Report_Dashboard/.meta_Task_Recovering_and_Filtering.php
deleted file mode 100644
index 6fb3638ac..000000000
--- a/Analytics/Kibana/Process_Create_Report_Dashboard/.meta_Task_Recovering_and_Filtering.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<metadata>
-    <map>
-        <entry>
-            <key>MODEL</key>
-        </entry>
-        <entry>
-            <key>FILE_TYPE</key>
-            <value>text</value>
-        </entry>
-        <entry>
-            <key>DATE_MODIFICATION</key>
-            <value>1496135294687</value>
-        </entry>
-        <entry>
-            <key>COMMENT</key>
-            <value></value>
-        </entry>
-        <entry>
-            <key>REPOSITORY</key>
-        </entry>
-        <entry>
-            <key>DATE_CREATION</key>
-            <value>1485796219899</value>
-        </entry>
-        <entry>
-            <key>MANUFACTURER</key>
-        </entry>
-        <entry>
-            <key>CONFIGURATION_FILTER</key>
-            <value></value>
-        </entry>
-        <entry>
-            <key>TAG</key>
-            <value></value>
-        </entry>
-        <entry>
-            <key>TYPE</key>
-            <value>UPLOAD</value>
-        </entry>
-    </map>
-</metadata>
diff --git a/Analytics/Kibana/Process_Create_Report_Dashboard/.meta_Task_Recoving_and_Filtring.php b/Analytics/Kibana/Process_Create_Report_Dashboard/.meta_Task_Recoving_and_Filtring.php
deleted file mode 100755
index 604269b37..000000000
--- a/Analytics/Kibana/Process_Create_Report_Dashboard/.meta_Task_Recoving_and_Filtring.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<metadata>
-    <map>
-        <entry>
-            <key>FILE_TYPE</key>
-            <value>text</value>
-        </entry>
-        <entry>
-            <key>DATE_MODIFICATION</key>
-            <value>1485769195029</value>
-        </entry>
-        <entry>
-            <key>COMMENT</key>
-            <value></value>
-        </entry>
-        <entry>
-            <key>DATE_CREATION</key>
-            <value>1473866294467</value>
-        </entry>
-        <entry>
-            <key>TAG</key>
-            <value></value>
-        </entry>
-        <entry>
-            <key>TYPE</key>
-            <value>UPLOAD</value>
-        </entry>
-    </map>
-</metadata>
diff --git a/Analytics/Kibana/Process_Create_Report_Dashboard/.meta_Task_Search_Dashboard_Template_Selected.php b/Analytics/Kibana/Process_Create_Report_Dashboard/.meta_Task_Search_Dashboard_Template_Selected.php
index f10065c65..09e27cb7d 100755
--- a/Analytics/Kibana/Process_Create_Report_Dashboard/.meta_Task_Search_Dashboard_Template_Selected.php
+++ b/Analytics/Kibana/Process_Create_Report_Dashboard/.meta_Task_Search_Dashboard_Template_Selected.php
@@ -7,7 +7,7 @@
         </entry>
         <entry>
             <key>DATE_MODIFICATION</key>
-            <value>1618372823705</value>
+            <value>1633377838235</value>
         </entry>
         <entry>
             <key>REPOSITORY</key>
diff --git a/Analytics/Kibana/Process_Create_Report_Dashboard/.meta_Task_Send_the_new_template_to_ES.php b/Analytics/Kibana/Process_Create_Report_Dashboard/.meta_Task_Send_the_new_template_to_ES.php
deleted file mode 100755
index a1107e1a4..000000000
--- a/Analytics/Kibana/Process_Create_Report_Dashboard/.meta_Task_Send_the_new_template_to_ES.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<metadata>
-    <map>
-        <entry>
-            <key>DISPLAYNAME</key>
-            <value>Task_Send_the_new_template_to_ES.php</value>
-        </entry>
-        <entry>
-            <key>DATE_MODIFICATION</key>
-            <value>1618372868065</value>
-        </entry>
-        <entry>
-            <key>REPOSITORY</key>
-            <value>Process</value>
-        </entry>
-        <entry>
-            <key>DATE_CREATION</key>
-            <value>1618372868061</value>
-        </entry>
-        <entry>
-            <key>TAG</key>
-        </entry>
-        <entry>
-            <key>FILE_TYPE</key>
-            <value>text</value>
-        </entry>
-        <entry>
-            <key>TYPE</key>
-            <value>UPLOAD</value>
-        </entry>
-        <entry>
-            <key>COMMENT</key>
-        </entry>
-    </map>
-</metadata>
diff --git a/Analytics/Kibana/Process_Create_Report_Dashboard/Task_Search_Dashboard_Template_Selected.php b/Analytics/Kibana/Process_Create_Report_Dashboard/Task_Search_Dashboard_Template_Selected.php
index b7f699f10..b9b70d231 100755
--- a/Analytics/Kibana/Process_Create_Report_Dashboard/Task_Search_Dashboard_Template_Selected.php
+++ b/Analytics/Kibana/Process_Create_Report_Dashboard/Task_Search_Dashboard_Template_Selected.php
@@ -7,137 +7,20 @@ function list_args()
 {
   
  create_var_def('ipAddress', 'IpAddress');
- create_var_def('port', 'Integer');
  create_var_def('type', 'String');
- create_var_def('template name', 'String');
+ create_var_def('template_id', 'String');
  create_var_def('searchingURI', 'String');
- create_var_def('uriPutES', 'String');
- create_var_def('customer_id', 'Integer');
  create_var_def('Hash', 'String');
  create_var_def('dashboardName', 'String');
  create_var_def('basePath', 'String');
-
-
- //create_var_def('kibanaUrl', 'String');
+ create_var_def('kibanaUrl', 'String');
  create_var_def('kibanaPort', 'Integer');
  create_var_def('kibanaIpAddress', 'IpAddress');
-
-
-
- create_var_def('filterType', 'String');
- 
- create_var_def('advancedFilter', 'Composite');
- create_var_def('advancedFilterEmpty', 'Composite');
-
- create_var_def('basicFilterEmpty', 'Composite');
- // create_var_def('basicFilter', 'Composite');
-
- create_var_def('filter.0.field', 'Composite');
- create_var_def('filter.0.value', 'Composite');
- create_var_def('filter.0.operator', 'Composite');
-
- create_var_def('filter.0.resultBasictFilter', 'String');
-
-create_var_def('filter.0.apply', 'Composite');
-
-
-
-create_var_def('levelView', 'String');
-
-create_var_def('device_id', 'Device');
-
-create_var_def('device_ip', 'IpAddress');
-
-
-
-
-}
-
-// ENTER YOUR CODE HERE
-// Update $context array for output variables
-
-
-if ($context['filterType']=='Advanced'){
-	
-	if(!empty($context['advancedFilter'])){
-	$context['advancedFilterEmpty']='false';
-	}
-	else{
-
-	$context['advancedFilterEmpty']='true';
-	}
-
-}
-
-else {
-	
-	if(empty($context['filter']))
-	{
-	  $context['basicFilter'] ='';
-	}
-
-	
-	else {
-
-	foreach ($context['filter'] as $filter) {
-		
-			if($filter['apply']=="true"){
-				
-          			$filter['resultBasicFilter']=' '.$filter['operator'].' '.$filter['field'].':'.$filter['value'];
-				
-				$context['basicFilter'].=$filter['resultBasicFilter'];
-			}
-				
-		
-	}
-	
-	
-	$context['basicFilter'] = substr($context['basicFilter'], 3);
-	
-	}
-
-	
-	if(!empty($context['basicFilter'])){
-	$context['basicFilterEmpty']='false';
-	}
-	else{
-
-	$context['basicFilterEmpty']='true';
-	}
-}
-
-
-/* to recover device ip address */
-
-if($context['levelView']=='device') {
-
-preg_match('/(?<digit>\d+)/',$context['device_id'],$device_id_number);
-$context['device_id_number']=$device_id_number[1];
-$context['cmd']="/opt/ubi-jentreprise/bin/api/device/readDeviceById.sh ".$context['device_id_number'];
-$response_cmd= shell_exec($context['cmd']);
-preg_match('#<ipAddress>\n<address>(.*)</address>\n<mask>#',$response_cmd, $out);
-$context['device_ip']=$out[1];
-
 }
 
-
-
-
-/* Recover IP Address for Kibana */
-
-//define('HOST_KIBANA', 'UBI_ES_KIBANA_IP');
-//$_KIBANA=get_vars_value(HOST_KIBANA);
-//preg_match('#(.*):#',$_KIBANA,$_KIBANA);
 $context['kibanaIpAddress']="msa_kibana";
-
-
-/* Recover Port Number for Kibana */
-
-//$_KIBANA=get_vars_value(HOST_KIBANA);
-//preg_match('#:(.*)#',$_KIBANA,$_KIBANA);
 $context['kibanaPort']="5601";
 
-
 /**
 curl -XPOST "10.30.18.116:5601/kibana/api/saved_objects/_export" -H 'kbn-xsrf: true' -H 'Content-Type: application/json' -d'
 {
@@ -151,43 +34,27 @@ function list_args()
 '
 **/
 
-/* ***   Recove ES ip address   **** */ 
-//define('HOST_ES', 'UBI_ES_WEBPORTAL_ENDPOINT');
-//$_H=get_vars_value(HOST_ES);
 $context['ipAddress']="msa_kibana";
-
 /* ** Set basePath ** */
 $context['basePath']="/kibana";
 
-/* ** recove customer_id) ** */
-preg_match('/(?<digit>\d+)/',$context['UBIQUBEID'],$matches);
-$context['customer_id']=$matches[1];
-
-
-/* ***** to hash Url Customer Dashboard ***** */
-$context['Hash']=sha1(uniqid($context['customer_id'] . mt_rand(), true));
-
-
-
 /* ** Url and Method to Find selected Dashboard **** */ 
-$context['searchingURI']='http://'.$context['ipAddress'].':'.$context['port'].$context['basePath'].'/api/saved_objects/_export';
+$context['searchingURI']='http://'.$context['ipAddress'].':'.$context['kibanaPort'].$context['basePath'].'/api/saved_objects/_export';
+$context['Hash']=$context['template_id'];
+$context['kibanaUrl']='http://'.$context['kibanaIpAddress'].':'.$context['kibanaPort'].'/kibana/app/kibana#/dashboard/'.$context['Hash'].'/';
 
 $body_request='
 {
   "objects": [
     {
       "type": "'.$context['type'].'",
-      "id": "'.$context['template name'].'"
+      "id": "'.$context['template_id'].'"
     }
-  ]
+  ],
+  "excludeExportDetails": true
 }
 ';
 
-
-
-$context['f']='/tmp/file_kibana_'.$context['Hash'].'.ndjson';
-$fp = fopen($context['f'], "w");
-
 $ci = curl_init();
     curl_setopt($ci, CURLOPT_URL,$context['searchingURI']);
     curl_setopt($ci, CURLOPT_TIMEOUT, 200);
@@ -197,29 +64,19 @@ function list_args()
     curl_setopt($ci, CURLOPT_POSTFIELDS, $body_request);
     curl_setopt($ci, CURLOPT_HTTPHEADER, array('kbn-xsrf: true','Content-Type: application/json','Authorization: Basic c3VwZXJ1c2VyOnheWnl1R002fnU9K2ZZMkc='));
     $result= curl_exec($ci);
-    fwrite($fp, $result);
 
 /* Store the result in a variable      */    
 $context['result']=$result;	
 
-
-
-/* ** Store Kibana  Url  ***/ 
-
-$context['kibanaUrl']='http://'.$context['kibanaIpAddress'].':'.$context['kibanaPort'].'/kibana/app/kibana#/dashboard/'.$context['Hash'].'/';
-
-
 $check=json_decode($result,true);
 if(!isset($check['statusCode'])){
- 	
-	 task_exit(ENDED, "Template ID found");
-}
 
- else{
- 	
-	 task_exit(WARNING, 'Template ID not found => '.$result.'');
+    task_exit(ENDED, 'Template ID '.$context['template_id'].' has been found');
+	 
 }
+else{
 
+ 	task_exit(WARNING, 'Template ID '.$context['template_id'].' has not been found => '.$result.'');
+}
 //task_exit(ENDED, $result);
-
 ?>
\ No newline at end of file
diff --git a/Analytics/Kibana/Process_Create_Report_Dashboard/Task_Send_the_new_template_to_ES.php b/Analytics/Kibana/Process_Create_Report_Dashboard/Task_Send_the_new_template_to_ES.php
deleted file mode 100755
index 0b0c99269..000000000
--- a/Analytics/Kibana/Process_Create_Report_Dashboard/Task_Send_the_new_template_to_ES.php
+++ /dev/null
@@ -1,196 +0,0 @@
-<?php
-require_once '/opt/fmc_repository/Process/Reference/Common/common.php';
-
-
-function list_args()
-{
- 
-
-}
-
-
-$i=$context['customer_id'];
-
-
-$filecontent = file_get_contents($context['f']);
-
-if(($context['levelView']=='service') || ($context['levelView']=='summary')) {
-
-$filecontent=preg_replace('#title":"template_(\w+)#','title":"'.$context['dashboardName'].' '.$context['UBIQUBEID'].'', $filecontent);
-
-}
-
-if($context['levelView']=='device') {
-
-$filecontent=preg_replace('#title":"template_(\w+)#','title":"'.$context['dashboardName'].' '.$context['UBIQUBEID'].' '.$context['device_id'].'', $filecontent);
-
-}
-
-/* if filter is empty you just apply customer_id filter , if it's not you add others filter fields */
-
-	if($context['advancedFilterEmpty']=='true'){
-
-		if(($context['levelView']=='service') || ($context['levelView']=='summary')) {
-
-			$filecontent=preg_replace('#customer_id:(\w+)#','customer_id:'.$i.'',$filecontent);
-			
-	
-			/** for netflow **/
-			$var='*';
-			$filecontent=preg_replace('#host:(\w+)#','host:'.$var.'',$filecontent);
-	       }
-
-	       if($context['levelView']=='device') {
-
-			$filecontent=preg_replace('#customer_id:(\w+)#','customer_id:'.$i.' && device_id:'.$context['device_id'].'',$filecontent);
-			
-			/** for netflow **/
-			$filecontent=preg_replace('#host:(\w+)#','host:'.$context['device_ip'].'',$filecontent);
-	       }
-
-	}
-
-
-	elseif($context['advancedFilterEmpty']=='false'){
-		
-		if(($context['levelView']=='service') || ($context['levelView']=='summary')) {
-
-		$filecontent=preg_replace('#customer_id:(\w+)#','customer_id:'.$i.' && ('.$context['advancedFilter'].')', $filecontent);
-		
-		/** for netflow **/
-		$var='*';
-		$filecontent=preg_replace('#host:(\w+)#','host:'.$var.' && ('.$context['advancedFilter'].')',$filecontent);
-	        
-		}
-
-		if($context['levelView']=='device') {
-
-		$filecontent=preg_replace('#customer_id:(\w+)#','customer_id:'.$i.' && device_id:'.$context['device_id'].' && ('.$context['advancedFilter'].')', $filecontent);
-
-
-
-		/** for netflow **/
-		
-		$filecontent=preg_replace('#host:(\w+)#','host:'.$context['device_ip'].' && ('.$context['advancedFilter'].')',$filecontent);
-	        
-		}
-	
-
-	}
-
-
-
-	elseif( $context['basicFilterEmpty']=='true'){
-
-		if(($context['levelView']=='service') || ($context['levelView']=='summary')) {
-		
-		$filecontent=preg_replace('#customer_id:(\w+)#','customer_id:'.$i.'',$filecontent);
-	
-	
-		/** for netflow **/
-		$var='*';
-		$filecontent=preg_replace('#host:(\w+)#','host:'.$var.'',$filecontent);
-		
-		}
-
-		if($context['levelView']=='device') {
-		
-	
-		$filecontent=preg_replace('#customer_id:(\w+)#','customer_id:'.$i.' && device_id:'.$context['device_id'].'',$filecontent);
-	
-	
-		/** for netflow **/
-		$filecontent=preg_replace('#host:(\w+)#','host:'.$context['device_ip'].'',$filecontent);
-		
-		}
-
-
-
-	
-
-
-	}
-
-
-	elseif($context['basicFilterEmpty']=='false'){
-
-		if(($context['levelView']=='service') || ($context['levelView']=='summary')) {
-
-		$filecontent=preg_replace('#customer_id:(\w+)#','customer_id:'.$i.' && ('.$context['basicFilter'].')', $filecontent);
-
-		/** for netflow **/
-		$var='*';
-		$filecontent=preg_replace('#host:(\w+)#','host:'.$var.' && ('.$context['basicFilter'].')',$filecontent);
-	
-	
-		}
-
-		if($context['levelView']=='device') {
-
-		$filecontent=preg_replace('#customer_id:(\w+)#','customer_id:'.$i.' && device_id:'.$context['device_id'].' && ('.$context['basicFilter'].')', $filecontent);
-
-		/** for netflow **/
-		
-		$filecontent=preg_replace('#host:(\w+)#','host:'.$context['device_ip'].' && ('.$context['basicFilter'].')',$filecontent);
-	
-	
-		}
-
-
-
-
-	}
-
-$resp='Filtering';
-
-
-$filecontent=preg_replace('#id":"(.*)","migrationVersion":{"dashboard":"7.0.0"}#','id":"'.$context['Hash'].'","migrationVersion":{"dashboard":"7.0.0"}', $filecontent);
-file_put_contents($context['f'], $filecontent);
-
-						/** ***** End *****/
-
-/**
-curl -XPOST "10.30.18.116:5601/kibana/api/kibana/dashboards/import?exclude=index-pattern" -H 'kbn-xsrf: true' -H 'Content-Type: application/json' -d'
-{
-  "objects": [
-    {"attributes":{"description":"","hits":0,"kibanaSavedObjectMeta":{"searchSourceJSON":"{\"filter\":[{\"query\":{\"query_string\":{\"query\":\"customer_id:0\",\"analyze_wildcard\":true}}}]}"},"optionsJSON":"{\"darkTheme\":false}","panelsJSON":"[{\"col\":1,\"panelIndex\":2,\"row\":1,\"size_x\":8,\"size_y\":2,\"panelRefName\":\"panel_0\"},{\"col\":1,\"panelIndex\":4,\"row\":3,\"size_x\":8,\"size_y\":2,\"panelRefName\":\"panel_1\"},{\"col\":9,\"panelIndex\":6,\"row\":3,\"size_x\":4,\"size_y\":2,\"panelRefName\":\"panel_2\"},{\"col\":9,\"panelIndex\":7,\"row\":7,\"size_x\":4,\"size_y\":2,\"panelRefName\":\"panel_3\"},{\"col\":9,\"panelIndex\":8,\"row\":5,\"size_x\":4,\"size_y\":2,\"panelRefName\":\"panel_4\"},{\"col\":1,\"panelIndex\":9,\"row\":5,\"size_x\":8,\"size_y\":2,\"panelRefName\":\"panel_5\"},{\"col\":1,\"panelIndex\":10,\"row\":7,\"size_x\":8,\"size_y\":2,\"panelRefName\":\"panel_6\"},{\"panelIndex\":11,\"size_x\":4,\"size_y\":2,\"col\":9,\"row\":1,\"panelRefName\":\"panel_7\"}]","timeRestore":false,"title":"template_default","uiStateJSON":"{}","version":1},"id":"template_default","migrationVersion":{"dashboard":"7.0.0"},"references":[{"id":"default-Log-View-EVENTS-OVER-TIME","name":"panel_0","type":"visualization"},{"id":"default-Devices_ID","name":"panel_1","type":"visualization"},{"id":"default-Visualization_type","name":"panel_2","type":"visualization"},{"id":"default-count-devices","name":"panel_3","type":"visualization"},{"id":"default-Indexed-EVENTS","name":"panel_4","type":"visualization"},{"id":"default-TOP10-IpDest","name":"panel_5","type":"visualization"},{"id":"default-TOP10-IpSrc","name":"panel_6","type":"visualization"},{"id":"timeFilter","name":"panel_7","type":"visualization"}],"type":"dashboard","updated_at":"2019-07-12T12:53:34.410Z","version":"WzEwMjcsMV0="}
-  ]
-}
-'
-
-**/
-
-
-$context['uriPutES']='http://'.$context['ipAddress'].':'.$context['port'].$context['basePath'].'/api/kibana/dashboards/import?exclude=index-pattern';
-$json_doc='{"objects": [ '.$filecontent.']}';
-
-
-
-$ci = curl_init();
-    curl_setopt($ci, CURLOPT_URL, $context['uriPutES']);
-    curl_setopt($ci, CURLOPT_TIMEOUT, 200);
-    curl_setopt($ci, CURLOPT_RETURNTRANSFER, 1);
-    curl_setopt($ci, CURLOPT_FORBID_REUSE, 0);
-    curl_setopt($ci, CURLOPT_CUSTOMREQUEST, 'POST');
-    curl_setopt($ci, CURLOPT_POSTFIELDS, $json_doc);
-    curl_setopt($ci, CURLOPT_HTTPHEADER, array('kbn-xsrf: true','Content-Type: application/json','Authorization: Basic c3VwZXJ1c2VyOnheWnl1R002fnU9K2ZZMkc='));
-    $response = curl_exec($ci);
-
-$check=json_decode($response,true);
-if(!isset($check['statusCode'])){
- 	
-	 task_exit(ENDED, "The new dashboard has been sent");
-}
-
- else{
- 	
-	 task_exit(WARNING, $response);
-}
-
-
-unlink($context['f']);
-
-//task_exit(ENDED, $response);
- 
-
-?>
\ No newline at end of file
diff --git a/Analytics/Kibana/Process_Delete_Dashboard/.meta_Task_Delete_Dashboard.php b/Analytics/Kibana/Process_Delete_Dashboard/.meta_Task_Delete_Dashboard.php
deleted file mode 100755
index db8e037b5..000000000
--- a/Analytics/Kibana/Process_Delete_Dashboard/.meta_Task_Delete_Dashboard.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<metadata>
-    <map>
-        <entry>
-            <key>DISPLAYNAME</key>
-            <value>Task_Delete_Dashboard.php</value>
-        </entry>
-        <entry>
-            <key>DATE_MODIFICATION</key>
-            <value>1618373175675</value>
-        </entry>
-        <entry>
-            <key>REPOSITORY</key>
-            <value>Process</value>
-        </entry>
-        <entry>
-            <key>DATE_CREATION</key>
-            <value>1618373175671</value>
-        </entry>
-        <entry>
-            <key>TAG</key>
-        </entry>
-        <entry>
-            <key>FILE_TYPE</key>
-            <value>text</value>
-        </entry>
-        <entry>
-            <key>TYPE</key>
-            <value>UPLOAD</value>
-        </entry>
-        <entry>
-            <key>COMMENT</key>
-        </entry>
-    </map>
-</metadata>
diff --git a/Analytics/Kibana/Process_Delete_Dashboard/Task_Delete_Dashboard.php b/Analytics/Kibana/Process_Delete_Dashboard/Task_Delete_Dashboard.php
deleted file mode 100755
index 47960721b..000000000
--- a/Analytics/Kibana/Process_Delete_Dashboard/Task_Delete_Dashboard.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-require_once '/opt/fmc_repository/Process/Reference/Common/common.php';
-
-// List all the parameters required by the task
-function list_args()
-{
- 
-}
-
-/**
-
-curl -XDELETE "localhost:5601/kibana/api/saved_objects/dashboard/1e57e98993aa04d700f3a754781adcb7babac109" -H 'kbn-xsrf: true'
-
-**/
-
-
-$context['uriDeleteES']='http://'.$context['ipAddress'].':'.$context['port'].$context['basePath'].'/api/saved_objects/dashboard/'.$context['Hash'].'';
-
-$ci = curl_init();
-    curl_setopt($ci, CURLOPT_URL, $context['uriDeleteES']);
-    curl_setopt($ci, CURLOPT_TIMEOUT, 200);
-    curl_setopt($ci, CURLOPT_RETURNTRANSFER, 1);
-    curl_setopt($ci, CURLOPT_FORBID_REUSE, 0);
-    curl_setopt($ci, CURLOPT_CUSTOMREQUEST, 'DELETE');
-    curl_setopt($ci, CURLOPT_HTTPHEADER, array('kbn-xsrf: true','Content-Type: application/json','Authorization: Basic c3VwZXJ1c2VyOnheWnl1R002fnU9K2ZZMkc='));
-    $response2 = curl_exec($ci);
-    $check=json_decode($response2,true);
-
-if(!isset($check['statusCode'])){
-	 task_exit(ENDED, "The dashboard has been deleted : $response2");
-}else{
-	 task_exit(WARNING, $response2);
-}
-?>
\ No newline at end of file
diff --git a/Analytics/Kibana/Process_Update_Dashboard/.meta_Task_Recove_and_filter_for_Updating.php b/Analytics/Kibana/Process_Update_Dashboard/.meta_Task_Recove_and_filter_for_Updating.php
deleted file mode 100755
index 2e32a3ad8..000000000
--- a/Analytics/Kibana/Process_Update_Dashboard/.meta_Task_Recove_and_filter_for_Updating.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<metadata>
-    <map>
-        <entry>
-            <key>FILE_TYPE</key>
-            <value>text</value>
-        </entry>
-        <entry>
-            <key>DATE_MODIFICATION</key>
-            <value>1485769433722</value>
-        </entry>
-        <entry>
-            <key>COMMENT</key>
-            <value></value>
-        </entry>
-        <entry>
-            <key>DATE_CREATION</key>
-            <value>1473866610261</value>
-        </entry>
-        <entry>
-            <key>TAG</key>
-            <value></value>
-        </entry>
-        <entry>
-            <key>TYPE</key>
-            <value>UPLOAD</value>
-        </entry>
-    </map>
-</metadata>
diff --git a/Analytics/Kibana/Process_Update_Dashboard/.meta_Task_Recovering_and_filtering_for_Updating.php b/Analytics/Kibana/Process_Update_Dashboard/.meta_Task_Recovering_and_filtering_for_Updating.php
deleted file mode 100644
index 6e1657455..000000000
--- a/Analytics/Kibana/Process_Update_Dashboard/.meta_Task_Recovering_and_filtering_for_Updating.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<metadata>
-    <map>
-        <entry>
-            <key>MODEL</key>
-        </entry>
-        <entry>
-            <key>FILE_TYPE</key>
-            <value>text</value>
-        </entry>
-        <entry>
-            <key>DATE_MODIFICATION</key>
-            <value>1496136181418</value>
-        </entry>
-        <entry>
-            <key>COMMENT</key>
-            <value></value>
-        </entry>
-        <entry>
-            <key>REPOSITORY</key>
-        </entry>
-        <entry>
-            <key>DATE_CREATION</key>
-            <value>1485796244476</value>
-        </entry>
-        <entry>
-            <key>MANUFACTURER</key>
-        </entry>
-        <entry>
-            <key>CONFIGURATION_FILTER</key>
-            <value></value>
-        </entry>
-        <entry>
-            <key>TAG</key>
-            <value></value>
-        </entry>
-        <entry>
-            <key>TYPE</key>
-            <value>UPLOAD</value>
-        </entry>
-    </map>
-</metadata>
diff --git a/Analytics/Kibana/Process_Update_Dashboard/.meta_Task_Search_Dashboard_Selected_for_Updating.php b/Analytics/Kibana/Process_Update_Dashboard/.meta_Task_Search_Dashboard_Selected_for_Updating.php
index 314163a2f..1ef7c7da1 100755
--- a/Analytics/Kibana/Process_Update_Dashboard/.meta_Task_Search_Dashboard_Selected_for_Updating.php
+++ b/Analytics/Kibana/Process_Update_Dashboard/.meta_Task_Search_Dashboard_Selected_for_Updating.php
@@ -7,7 +7,7 @@
         </entry>
         <entry>
             <key>DATE_MODIFICATION</key>
-            <value>1618373290271</value>
+            <value>1633377856798</value>
         </entry>
         <entry>
             <key>REPOSITORY</key>
diff --git a/Analytics/Kibana/Process_Update_Dashboard/.meta_Task_Send_back_template_to_ES_for_Updating.php b/Analytics/Kibana/Process_Update_Dashboard/.meta_Task_Send_back_template_to_ES_for_Updating.php
deleted file mode 100755
index eca4f9472..000000000
--- a/Analytics/Kibana/Process_Update_Dashboard/.meta_Task_Send_back_template_to_ES_for_Updating.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<metadata>
-    <map>
-        <entry>
-            <key>DISPLAYNAME</key>
-            <value>Task_Send_back_template_to_ES_for_Updating.php</value>
-        </entry>
-        <entry>
-            <key>DATE_MODIFICATION</key>
-            <value>1618373378798</value>
-        </entry>
-        <entry>
-            <key>REPOSITORY</key>
-            <value>Process</value>
-        </entry>
-        <entry>
-            <key>DATE_CREATION</key>
-            <value>1618373378791</value>
-        </entry>
-        <entry>
-            <key>TAG</key>
-        </entry>
-        <entry>
-            <key>FILE_TYPE</key>
-            <value>text</value>
-        </entry>
-        <entry>
-            <key>TYPE</key>
-            <value>UPLOAD</value>
-        </entry>
-        <entry>
-            <key>COMMENT</key>
-        </entry>
-    </map>
-</metadata>
diff --git a/Analytics/Kibana/Process_Update_Dashboard/Task_Search_Dashboard_Selected_for_Updating.php b/Analytics/Kibana/Process_Update_Dashboard/Task_Search_Dashboard_Selected_for_Updating.php
index 8b1f1df2c..a4b8e09fa 100755
--- a/Analytics/Kibana/Process_Update_Dashboard/Task_Search_Dashboard_Selected_for_Updating.php
+++ b/Analytics/Kibana/Process_Update_Dashboard/Task_Search_Dashboard_Selected_for_Updating.php
@@ -4,122 +4,15 @@
 // List all the parameters required by the task
 function list_args()
 {
-create_var_def('template name', 'String');
+create_var_def('template_id', 'String');
 create_var_def('dashboardName', 'String');
-
-
-
- create_var_def('filterType', 'String');
-
- create_var_def('advancedFilter', 'Composite');
- create_var_def('advancedFilterEmpty', 'String');
-
-
- create_var_def('basicFilterEmpty', 'String');
- // create_var_def('basicFilter', 'Composite');
-
-
- create_var_def('filter.0.field', 'Composite');
- create_var_def('filter.0.apply', 'Composite');
- create_var_def('filter.0.value', 'Composite');
-
- create_var_def('filter.0.operator', 'Composite');
- create_var_def('filter.0.resultBasictFilter', 'String');
-
-
-create_var_def('levelView', 'String');
-
-create_var_def('device_id', 'Device');
-
-create_var_def('device_ip', 'IpAddress');
-
-
+create_var_def('Hash', 'String');
+create_var_def('kibanaUrl', 'String');
 }
-// ENTER YOUR CODE HERE
-// Update $context array for output variables
-
-
-if ($context['filterType']=='Advanced'){
-	
-	if(!empty($context['advancedFilter'])){
-	$context['advancedFilterEmpty']='false';
-	}
-	else{
-
-	$context['advancedFilterEmpty']='true';
-	}
-
-}
-
-else {
-	
-	if(empty($context['filter']))
-	{
-	  $context['basicFilter'] ='';
-	}
-
-	
-	else {
-
-	foreach ($context['filter'] as $filter) {
-		
-			if($filter['apply']=="true"){
-				
-          			$filter['resultBasicFilter']=' '.$filter['operator'].' '.$filter['field'].':'.$filter['value'];
-				
-				$context['basicFilter'].=$filter['resultBasicFilter'];
-			}
-				
-		
-	}
-	
-	
-	$context['basicFilter'] = substr($context['basicFilter'], 3);
-	
-	}
-
-	
-	if(!empty($context['basicFilter'])){
-	$context['basicFilterEmpty']='false';
-	}
-	else{
-
-	$context['basicFilterEmpty']='true';
-	}
-}
-
-
-/* to recover device ip address */
-
-if($context['levelView']=='device') {
-
-preg_match('/(?<digit>\d+)/',$context['device_id'],$device_id_number);
-$context['device_id_number']=$device_id_number[1];
-$context['cmd']="/opt/ubi-jentreprise/bin/api/device/readDeviceById.sh ".$context['device_id_number'];
-$response_cmd= shell_exec($context['cmd']);
-preg_match('#<ipAddress>\n<address>(.*)</address>\n<mask>#',$response_cmd, $out);
-$context['device_ip']=$out[1];
 
-}
-
-
-
-
-/* Recover IP Address for Kibana */
-
-//define('HOST_KIBANA', 'UBI_ES_KIBANA_IP');
-//$_KIBANA=get_vars_value(HOST_KIBANA);
-//preg_match('#(.*):#',$_KIBANA,$_KIBANA);
 $context['kibanaIpAddress']="msa_kibana";
-
-
-/* Recover Port Number for Kibana */
-
-//$_KIBANA=get_vars_value(HOST_KIBANA);
-//preg_match('#:(.*)#',$_KIBANA,$_KIBANA);
 $context['kibanaPort']="5601";
 
-
 /**
 curl -XPOST "10.30.18.116:5601/kibana/api/saved_objects/_export" -H 'kbn-xsrf: true' -H 'Content-Type: application/json' -d'
 {
@@ -133,40 +26,26 @@ function list_args()
 '
 **/
 
-/* ***   Recove ES ip address   **** */ 
-//define('HOST_ES', 'UBI_ES_WEBPORTAL_ENDPOINT');
-//$_H=get_vars_value(HOST_ES);
 $context['ipAddress']="msa_kibana";
-
 /* ** Set basePath ** */
 $context['basePath']="/kibana";
-
-/* ** recove customer_id) ** */
-preg_match('/(?<digit>\d+)/',$context['UBIQUBEID'],$matches);
-$context['customer_id']=$matches[1];
-
-
-
-
 /* ** Url and Method to Find selected Dashboard **** */ 
-$context['searchingURI']='http://'.$context['ipAddress'].':'.$context['port'].$context['basePath'].'/api/saved_objects/_export';
+$context['searchingURI']='http://'.$context['ipAddress'].':'.$context['kibanaPort'].$context['basePath'].'/api/saved_objects/_export';
+$context['Hash']=$context['template_id'];
+$context['kibanaUrl']='http://'.$context['kibanaIpAddress'].':'.$context['kibanaPort'].'/app/kibana#/dashboard/'.$context['Hash'].'/';
 
 $body_request='
 {
   "objects": [
     {
       "type": "'.$context['type'].'",
-      "id": "'.$context['template name'].'"
+      "id": "'.$context['template_id'].'"
     }
-  ]
+  ],
+  "excludeExportDetails": true
 }
 ';
 
-
-
-$context['f']='/tmp/file_kibana_'.$context['Hash'].'.ndjson';
-$fp = fopen($context['f'], "w");
-
 $ci = curl_init();
     curl_setopt($ci, CURLOPT_URL,$context['searchingURI']);
     curl_setopt($ci, CURLOPT_TIMEOUT, 200);
@@ -176,27 +55,18 @@ function list_args()
     curl_setopt($ci, CURLOPT_POSTFIELDS, $body_request);
     curl_setopt($ci, CURLOPT_HTTPHEADER, array('kbn-xsrf: true','Content-Type: application/json','Authorization: Basic c3VwZXJ1c2VyOnheWnl1R002fnU9K2ZZMkc='));
     $result= curl_exec($ci);
-    fwrite($fp, $result);
 
 /* Store the result in a variable      */    
-$context['result']=$result;	
-
-/* ** Store Kibana  Url  ***/ 
-
-$context['kibanaUrl']='http://'.$context['kibanaIpAddress'].':'.$context['kibanaPort'].'/app/kibana#/dashboard/'.$context['Hash'].'/';
+$context['result']=$result;
 
 $check=json_decode($result,true);
 if(!isset($check['statusCode'])){
- 	
-	 task_exit(ENDED, "Template ID found");
-}
 
- else{
- 	
-	 task_exit(WARNING, 'Template ID not found => '.$result.'');
+    task_exit(ENDED, 'Template ID '.$context['template_id'].' has been found');
+	 
+}
+else{
+    task_exit(WARNING, 'Template ID '.$context['template_id'].' has not been found => '.$result.'');
 }
-
-
 //task_exit(ENDED, $result);
-
 ?>
\ No newline at end of file
diff --git a/Analytics/Kibana/Process_Update_Dashboard/Task_Send_back_template_to_ES_for_Updating.php b/Analytics/Kibana/Process_Update_Dashboard/Task_Send_back_template_to_ES_for_Updating.php
deleted file mode 100755
index 29f9d175b..000000000
--- a/Analytics/Kibana/Process_Update_Dashboard/Task_Send_back_template_to_ES_for_Updating.php
+++ /dev/null
@@ -1,206 +0,0 @@
-<?php
-require_once '/opt/fmc_repository/Process/Reference/Common/common.php';
-
-
-function list_args()
-{
- 
-
-}
-					/** ******  this part is recovered from step 2  ****** **/
-
-$i=$context['customer_id'];
-//$context['result']=json_encode($filecontent);
-
-$filecontent = file_get_contents($context['f']);
-
-if(($context['levelView']=='service') || ($context['levelView']=='summary')) {
-
-$filecontent=preg_replace('#title":"template_(\w+)#','title":"'.$context['dashboardName'].' '.$context['UBIQUBEID'].'', $filecontent);
-
-}
-
-if($context['levelView']=='device') {
-
-$filecontent=preg_replace('#title":"template_(\w+)#','title":"'.$context['dashboardName'].' '.$context['UBIQUBEID'].' '.$context['device_id'].'', $filecontent);
-
-}
-
-/* if filter is empty you just apply customer_id filter , if it's not you add others filter fields */
-
-	if($context['advancedFilterEmpty']=='true'){
-
-		if(($context['levelView']=='service') || ($context['levelView']=='summary')) {
-
-			$filecontent=preg_replace('#customer_id:(\w+)#','customer_id:'.$i.'',$filecontent);
-			
-	
-			/** for netflow **/
-			$var='*';
-			$filecontent=preg_replace('#host:(\w+)#','host:'.$var.'',$filecontent);
-	       }
-
-	       if($context['levelView']=='device') {
-
-			$filecontent=preg_replace('#customer_id:(\w+)#','customer_id:'.$i.' && device_id:'.$context['device_id'].'',$filecontent);
-			
-			/** for netflow **/
-			$filecontent=preg_replace('#host:(\w+)#','host:'.$context['device_ip'].'',$filecontent);
-	       }
-
-	}
-
-
-	elseif($context['advancedFilterEmpty']=='false'){
-		
-		if(($context['levelView']=='service') || ($context['levelView']=='summary')) {
-
-		$filecontent=preg_replace('#customer_id:(\w+)#','customer_id:'.$i.' && ('.$context['advancedFilter'].')', $filecontent);
-		
-		/** for netflow **/
-		$var='*';
-		$filecontent=preg_replace('#host:(\w+)#','host:'.$var.' && ('.$context['advancedFilter'].')',$filecontent);
-	        
-		}
-
-		if($context['levelView']=='device') {
-
-		$filecontent=preg_replace('#customer_id:(\w+)#','customer_id:'.$i.' && device_id:'.$context['device_id'].' && ('.$context['advancedFilter'].')', $filecontent);
-
-
-
-		/** for netflow **/
-		
-		$filecontent=preg_replace('#host:(\w+)#','host:'.$context['device_ip'].' && ('.$context['advancedFilter'].')',$filecontent);
-	        
-		}
-	
-
-	}
-
-
-
-	elseif( $context['basicFilterEmpty']=='true'){
-
-		if(($context['levelView']=='service') || ($context['levelView']=='summary')) {
-		
-		$filecontent=preg_replace('#customer_id:(\w+)#','customer_id:'.$i.'',$filecontent);
-	
-	
-		/** for netflow **/
-		$var='*';
-		$filecontent=preg_replace('#host:(\w+)#','host:'.$var.'',$filecontent);
-		
-		}
-
-		if($context['levelView']=='device') {
-		
-	
-		$filecontent=preg_replace('#customer_id:(\w+)#','customer_id:'.$i.' && device_id:'.$context['device_id'].'',$filecontent);
-	
-	
-		/** for netflow **/
-		$filecontent=preg_replace('#host:(\w+)#','host:'.$context['device_ip'].'',$filecontent);
-		
-		}
-
-
-
-	
-
-
-	}
-
-
-	elseif($context['basicFilterEmpty']=='false'){
-
-		if(($context['levelView']=='service') || ($context['levelView']=='summary')) {
-
-		$filecontent=preg_replace('#customer_id:(\w+)#','customer_id:'.$i.' && ('.$context['basicFilter'].')', $filecontent);
-
-		/** for netflow **/
-		$var='*';
-		$filecontent=preg_replace('#host:(\w+)#','host:'.$var.' && ('.$context['basicFilter'].')',$filecontent);
-	
-	
-		}
-
-		if($context['levelView']=='device') {
-
-		$filecontent=preg_replace('#customer_id:(\w+)#','customer_id:'.$i.' && device_id:'.$context['device_id'].' && ('.$context['basicFilter'].')', $filecontent);
-
-		/** for netflow **/
-		
-		$filecontent=preg_replace('#host:(\w+)#','host:'.$context['device_ip'].' && ('.$context['basicFilter'].')',$filecontent);
-	
-	
-		}
-
-
-
-
-	}
-
-$resp='Filtering';
-
-
-$filecontent=preg_replace('#id":"(.*)","migrationVersion":{"dashboard":"7.0.0"}#','id":"'.$context['Hash'].'","migrationVersion":{"dashboard":"7.0.0"}', $filecontent);
-file_put_contents($context['f'], $filecontent);
-
-						/** ***** End *****/
-
-/**
-curl -XPOST "10.30.18.116:5601/kibana/api/kibana/dashboards/import?exclude=index-pattern" -H 'kbn-xsrf: true' -H 'Content-Type: application/json' -d'
-{
-  "objects": [
-    {"attributes":{"description":"","hits":0,"kibanaSavedObjectMeta":{"searchSourceJSON":"{\"filter\":[{\"query\":{\"query_string\":{\"query\":\"customer_id:0\",\"analyze_wildcard\":true}}}]}"},"optionsJSON":"{\"darkTheme\":false}","panelsJSON":"[{\"col\":1,\"panelIndex\":2,\"row\":1,\"size_x\":8,\"size_y\":2,\"panelRefName\":\"panel_0\"},{\"col\":1,\"panelIndex\":4,\"row\":3,\"size_x\":8,\"size_y\":2,\"panelRefName\":\"panel_1\"},{\"col\":9,\"panelIndex\":6,\"row\":3,\"size_x\":4,\"size_y\":2,\"panelRefName\":\"panel_2\"},{\"col\":9,\"panelIndex\":7,\"row\":7,\"size_x\":4,\"size_y\":2,\"panelRefName\":\"panel_3\"},{\"col\":9,\"panelIndex\":8,\"row\":5,\"size_x\":4,\"size_y\":2,\"panelRefName\":\"panel_4\"},{\"col\":1,\"panelIndex\":9,\"row\":5,\"size_x\":8,\"size_y\":2,\"panelRefName\":\"panel_5\"},{\"col\":1,\"panelIndex\":10,\"row\":7,\"size_x\":8,\"size_y\":2,\"panelRefName\":\"panel_6\"},{\"panelIndex\":11,\"size_x\":4,\"size_y\":2,\"col\":9,\"row\":1,\"panelRefName\":\"panel_7\"}]","timeRestore":false,"title":"template_default","uiStateJSON":"{}","version":1},"id":"template_default","migrationVersion":{"dashboard":"7.0.0"},"references":[{"id":"default-Log-View-EVENTS-OVER-TIME","name":"panel_0","type":"visualization"},{"id":"default-Devices_ID","name":"panel_1","type":"visualization"},{"id":"default-Visualization_type","name":"panel_2","type":"visualization"},{"id":"default-count-devices","name":"panel_3","type":"visualization"},{"id":"default-Indexed-EVENTS","name":"panel_4","type":"visualization"},{"id":"default-TOP10-IpDest","name":"panel_5","type":"visualization"},{"id":"default-TOP10-IpSrc","name":"panel_6","type":"visualization"},{"id":"timeFilter","name":"panel_7","type":"visualization"}],"type":"dashboard","updated_at":"2019-07-12T12:53:34.410Z","version":"WzEwMjcsMV0="}
-  ]
-}
-'
-
-**/
-
-
-$context['uriDeleteES']='http://'.$context['ipAddress'].':'.$context['port'].$context['basePath'].'/api/saved_objects/dashboard/'.$context['Hash'].'';
-
-$ci = curl_init();
-    curl_setopt($ci, CURLOPT_URL, $context['uriDeleteES']);
-    curl_setopt($ci, CURLOPT_TIMEOUT, 200);
-    curl_setopt($ci, CURLOPT_RETURNTRANSFER, 1);
-    curl_setopt($ci, CURLOPT_FORBID_REUSE, 0);
-    curl_setopt($ci, CURLOPT_CUSTOMREQUEST, 'DELETE');
-    curl_setopt($ci, CURLOPT_HTTPHEADER, array('kbn-xsrf: true','Content-Type: application/json','Authorization: Basic c3VwZXJ1c2VyOnheWnl1R002fnU9K2ZZMkc='));
-    $response2 = curl_exec($ci);
-
-
-$context['uriPutES']='http://'.$context['ipAddress'].':'.$context['port'].$context['basePath'].'/api/kibana/dashboards/import?exclude=index-pattern';
-$json_doc='{"objects": [ '.$filecontent.']}';
-
-
-
-$ci = curl_init();
-    curl_setopt($ci, CURLOPT_URL, $context['uriPutES']);
-    curl_setopt($ci, CURLOPT_TIMEOUT, 200);
-    curl_setopt($ci, CURLOPT_RETURNTRANSFER, 1);
-    curl_setopt($ci, CURLOPT_FORBID_REUSE, 0);
-    curl_setopt($ci, CURLOPT_CUSTOMREQUEST, 'POST');
-    curl_setopt($ci, CURLOPT_POSTFIELDS, $json_doc);
-    curl_setopt($ci, CURLOPT_HTTPHEADER, array('kbn-xsrf: true','Content-Type: application/json','Authorization: Basic c3VwZXJ1c2VyOnheWnl1R002fnU9K2ZZMkc='));
-    $response = curl_exec($ci);
-
-  unlink($context['f']);
-
-$check=json_decode($response,true);
-if(!isset($check['statusCode'])){
- 	
-	 task_exit(ENDED, "The dashboard has been updated");
-}
-
- else{
- 	
-	 task_exit(WARNING, $response);
-}
- //task_exit(ENDED, $response);
- 
-
-?>
\ No newline at end of file
diff --git a/Analytics/Kibana/kibana_dashboard.xml b/Analytics/Kibana/kibana_dashboard.xml
index 1e7369c41..387d9c4c2 100755
--- a/Analytics/Kibana/kibana_dashboard.xml
+++ b/Analytics/Kibana/kibana_dashboard.xml
@@ -1,12 +1,10 @@
 <ObjectDefinition>
   <variables frozen="0">
-    <variable displayName="Customer Id" name="params.customer_id" startIncrement="0" type="Integer" mandatoryArray="false" visible="false" description="" groupSeparator="" groupDisplayName="" displayOrder="0" increment="0" refServiceURI="" keepOnImport="false" editable="true" onlyDetailView="false" localVarNameMatch="" remoteVarNameMatch="" arrayCanAdd="true" arrayCanRemove="true" arrayCanMove="true" arrayCanEdit="true" isMandatory="true" isUserLocked="true" isGrouped="false" isSearchable="false" isUniqueGlobal="false"/>
     <variable displayName="Ipaddress" name="params.ipAddress" startIncrement="0" type="IpAddress" mandatoryArray="false" visible="false" description="" groupSeparator="" groupDisplayName="" displayOrder="1" increment="0" refServiceURI="" keepOnImport="false" editable="true" onlyDetailView="false" localVarNameMatch="" remoteVarNameMatch="" arrayCanAdd="true" arrayCanRemove="true" arrayCanMove="true" arrayCanEdit="true" isMandatory="true" isUserLocked="true" isGrouped="false" isSearchable="false" isUniqueGlobal="false"/>
-    <variable displayName="Port" name="params.port" startIncrement="0" type="Integer" mandatoryArray="false" visible="true" description="" groupSeparator="" groupDisplayName="" displayOrder="2" increment="0" refServiceURI="" keepOnImport="false" editable="true" onlyDetailView="true" localVarNameMatch="" remoteVarNameMatch="" arrayCanAdd="true" arrayCanRemove="true" arrayCanMove="true" arrayCanEdit="true" default="5601" isMandatory="true" isUserLocked="true" isGrouped="false" isSearchable="false" isUniqueGlobal="false"/>
     <variable displayName="Base Path" name="params.basePath" startIncrement="0" type="String" mandatoryArray="false" visible="false" description="" groupSeparator="" groupDisplayName="" displayOrder="26" increment="0" refServiceURI="" keepOnImport="false" editable="false" onlyDetailView="false" localVarNameMatch="" remoteVarNameMatch="" arrayCanAdd="true" arrayCanRemove="true" arrayCanMove="true" arrayCanEdit="true" displayNameHeader="" fullDisplayName="" default="/kibana" isMandatory="false" isUserLocked="false" isGrouped="false" isSearchable="false" isUniqueGlobal="false"/>
     <variable displayName="Index" name="params.index" startIncrement="0" type="String" mandatoryArray="false" visible="false" description="" groupSeparator="" groupDisplayName="" displayOrder="3" increment="0" refServiceURI="" keepOnImport="false" editable="true" onlyDetailView="false" localVarNameMatch="" remoteVarNameMatch="" arrayCanAdd="true" arrayCanRemove="true" arrayCanMove="true" arrayCanEdit="true" default=".kibana" isMandatory="true" isUserLocked="true" isGrouped="false" isSearchable="false" isUniqueGlobal="false"/>
-    <variable displayName="Type" name="params.type" startIncrement="0" type="String" mandatoryArray="false" visible="true" description="" groupSeparator="" groupDisplayName="" displayOrder="4" increment="0" refServiceURI="" keepOnImport="false" editable="true" onlyDetailView="true" localVarNameMatch="" remoteVarNameMatch="" arrayCanAdd="true" arrayCanRemove="true" arrayCanMove="true" arrayCanEdit="true" default="dashboard" isMandatory="true" isUserLocked="true" isGrouped="false" isSearchable="false" isUniqueGlobal="false"/>
-    <variable displayName="Template Name" name="params.template name" startIncrement="0" type="String" mandatoryArray="false" visible="true" description="Select available dashboards on Kibana or write the name of your created dashboard (based on the dashboard url) " groupSeparator="" groupDisplayName="" displayOrder="5" increment="0" refServiceURI="" keepOnImport="false" editable="true" onlyDetailView="false" localVarNameMatch="" remoteVarNameMatch="" arrayCanAdd="true" arrayCanRemove="true" arrayCanMove="true" arrayCanEdit="true" default="template_default" isMandatory="true" isUserLocked="false" isGrouped="false" isSearchable="false" isUniqueGlobal="false">
+    <variable displayName="Type" name="params.type" startIncrement="0" type="String" mandatoryArray="false" visible="false" description="" groupSeparator="" groupDisplayName="" displayOrder="4" increment="0" refServiceURI="" keepOnImport="false" editable="true" onlyDetailView="false" localVarNameMatch="" remoteVarNameMatch="" arrayCanAdd="true" arrayCanRemove="true" arrayCanMove="true" arrayCanEdit="true" default="dashboard" isMandatory="true" isUserLocked="false" isGrouped="false" isSearchable="false" isUniqueGlobal="false"/>
+    <variable displayName="Template" name="params.template_id" startIncrement="0" type="String" mandatoryArray="false" visible="true" description="Select available dashboards on Kibana or write the name of your created dashboard (based on the dashboard url) " groupSeparator="" groupDisplayName="" displayOrder="5" increment="0" refServiceURI="" keepOnImport="false" editable="true" onlyDetailView="false" localVarNameMatch="" remoteVarNameMatch="" arrayCanAdd="true" arrayCanRemove="true" arrayCanMove="true" arrayCanEdit="true" default="template_default" isMandatory="true" isUserLocked="false" isGrouped="false" isSearchable="false" isUniqueGlobal="false">
       <values>
         <values displayValue="Default traffic overview">template_default</values>
         <values displayValue="Email overview">template_Email_Overview</values>
@@ -24,126 +22,13 @@
     <variable displayName="Searchinguri" name="params.searchingURI" startIncrement="0" type="String" mandatoryArray="false" visible="false" description="" groupSeparator="" groupDisplayName="" displayOrder="7" increment="0" refServiceURI="" keepOnImport="false" editable="true" onlyDetailView="false" localVarNameMatch="" remoteVarNameMatch="" arrayCanAdd="true" arrayCanRemove="true" arrayCanMove="true" arrayCanEdit="true" isMandatory="false" isUserLocked="false" isGrouped="false" isSearchable="false" isUniqueGlobal="false"/>
     <variable displayName="Uriputes" name="params.uriPutES" startIncrement="0" type="String" mandatoryArray="false" visible="false" description="" groupSeparator="" groupDisplayName="" displayOrder="8" increment="0" refServiceURI="" keepOnImport="false" editable="true" onlyDetailView="false" localVarNameMatch="" remoteVarNameMatch="" arrayCanAdd="true" arrayCanRemove="true" arrayCanMove="true" arrayCanEdit="true" isMandatory="false" isUserLocked="false" isGrouped="false" isSearchable="false" isUniqueGlobal="false"/>
     <variable displayName="Hash" name="params.Hash" startIncrement="0" type="String" mandatoryArray="false" visible="false" description="" groupSeparator="" groupDisplayName="" displayOrder="19" increment="0" refServiceURI="" keepOnImport="false" editable="true" onlyDetailView="false" localVarNameMatch="" remoteVarNameMatch="" arrayCanAdd="true" arrayCanRemove="true" arrayCanMove="true" arrayCanEdit="true" isMandatory="true" isUserLocked="true" isGrouped="false" isSearchable="false" isUniqueGlobal="false"/>
-    <variable displayName=" Kibana Url" name="params.kibanaUrl" startIncrement="0" type="Link" mandatoryArray="false" visible="false" description="" groupSeparator="" groupDisplayName="" displayOrder="20" increment="0" refServiceURI="" keepOnImport="false" editable="true" onlyDetailView="false" localVarNameMatch="" remoteVarNameMatch="" arrayCanAdd="true" arrayCanRemove="true" arrayCanMove="true" arrayCanEdit="true" isMandatory="false" isUserLocked="true" isGrouped="false" isSearchable="false" isUniqueGlobal="false"/>
-    <variable displayName="Kibanaport" name="params.kibanaPort" startIncrement="0" type="Integer" mandatoryArray="false" visible="false" description="" groupSeparator="" groupDisplayName="" displayOrder="21" increment="0" refServiceURI="" keepOnImport="false" editable="true" onlyDetailView="false" localVarNameMatch="" remoteVarNameMatch="" arrayCanAdd="true" arrayCanRemove="true" arrayCanMove="true" arrayCanEdit="true" isMandatory="false" isUserLocked="false" isGrouped="false" isSearchable="false" isUniqueGlobal="false"/>
+    <variable displayName=" Kibana Url" name="params.kibanaUrl" startIncrement="0" type="String" mandatoryArray="false" visible="false" description="" groupSeparator="" groupDisplayName="" displayOrder="20" increment="0" refServiceURI="" keepOnImport="false" editable="false" onlyDetailView="false" localVarNameMatch="" remoteVarNameMatch="" arrayCanAdd="true" arrayCanRemove="true" arrayCanMove="true" arrayCanEdit="true" displayNameHeader="" fullDisplayName="" isMandatory="false" isUserLocked="false" isGrouped="false" isSearchable="false" isUniqueGlobal="false"/>
+    <variable displayName="Kibanaport" name="params.kibanaPort" startIncrement="0" type="Integer" mandatoryArray="false" visible="false" description="" groupSeparator="" groupDisplayName="" displayOrder="21" increment="0" refServiceURI="" keepOnImport="false" editable="true" onlyDetailView="false" localVarNameMatch="" remoteVarNameMatch="" arrayCanAdd="true" arrayCanRemove="true" arrayCanMove="true" arrayCanEdit="true" default="5601" isMandatory="false" isUserLocked="false" isGrouped="false" isSearchable="false" isUniqueGlobal="false"/>
     <variable displayName="Kibanaipaddress" name="params.kibanaIpAddress" startIncrement="0" type="IpAddress" mandatoryArray="false" visible="false" description="" groupSeparator="" groupDisplayName="" displayOrder="22" increment="0" refServiceURI="" keepOnImport="false" editable="true" onlyDetailView="false" localVarNameMatch="" remoteVarNameMatch="" arrayCanAdd="true" arrayCanRemove="true" arrayCanMove="true" arrayCanEdit="true" isMandatory="false" isUserLocked="false" isGrouped="false" isSearchable="false" isUniqueGlobal="false"/>
-    <variable displayName="Filter type" name="params.filterType" startIncrement="0" type="String" mandatoryArray="false" visible="true" description="- Advanced : your write all fields and their values  with operators ( OR, AND ) in Advanced filter input&#xa;- Basic : you have Basic Fitler table that you can put fields and select your operator.  Then you can decide if you want to apply your filter directly or just save it" groupSeparator="" groupDisplayName="" displayOrder="38" increment="0" refServiceURI="" keepOnImport="false" editable="false" onlyDetailView="true" localVarNameMatch="" remoteVarNameMatch="" arrayCanAdd="true" arrayCanRemove="true" arrayCanMove="true" arrayCanEdit="true" default="Advanced" isMandatory="true" isUserLocked="true" isGrouped="false" isSearchable="false" isUniqueGlobal="false">
-      <sections>
-        <sections>Filtering</sections>
-      </sections>
-      <values>
-        <values displayValue="Basic ">Basic </values>
-        <values displayValue="Advanced">Advanced</values>
-      </values>
-    </variable>
-    <variable displayName="Advanced filter" name="params.advancedFilter" startIncrement="0" type="Composite" mandatoryArray="false" visible="true" description="Write your filter in according index fields (ex. port:&lt;50 OR protocol:UDP)" groupSeparator="" groupDisplayName="" displayOrder="39" increment="0" refServiceURI="" keepOnImport="false" editable="true" onlyDetailView="true" localVarNameMatch="" remoteVarNameMatch="" arrayCanAdd="true" arrayCanRemove="true" arrayCanMove="true" arrayCanEdit="true" selector="params.filterType" default="" isMandatory="false" isUserLocked="true" isGrouped="false" isSearchable="false" isUniqueGlobal="false">
-      <behaviors>
-        <behaviour arrayCanAdd="true" arrayCanRemove="true" arrayCanMove="true" arrayCanEdit="true" editable="true" visible="true" displayName="Advanced filter" displayOrder="0" maxLength="100" isMandatory="false" isUserLocked="false" name="params.advancedFilter" selectorValue="Advanced" startIncrement="0" type="String"/>
-        <behaviour arrayCanAdd="true" arrayCanRemove="true" arrayCanMove="true" arrayCanEdit="true" editable="true" visible="true" displayName="advancedFilter" displayOrder="0" maxLength="100" isMandatory="false" isUserLocked="false" name="params.advancedFilter" selectorValue="Basic " startIncrement="0" type="String"/>
-      </behaviors>
-      <sections>
-        <sections>Filtering</sections>
-      </sections>
-    </variable>
-    <variable displayName="Advancedfilterempty" name="params.advancedFilterEmpty" startIncrement="0" type="Composite" mandatoryArray="false" visible="true" description="" groupSeparator="" groupDisplayName="" displayOrder="40" increment="0" refServiceURI="" keepOnImport="false" editable="true" onlyDetailView="true" localVarNameMatch="" remoteVarNameMatch="" arrayCanAdd="true" arrayCanRemove="true" arrayCanMove="true" arrayCanEdit="true" selector="params.filterType" isMandatory="false" isUserLocked="true" isGrouped="false" isSearchable="false" isUniqueGlobal="false">
-      <behaviors>
-        <behaviour arrayCanAdd="true" arrayCanRemove="true" arrayCanMove="true" arrayCanEdit="true" editable="true" visible="true" displayName="Advancedfilterempty" displayOrder="0" maxLength="100" isMandatory="false" isUserLocked="false" name="params.advancedFilterEmpty" selectorValue="Advanced" startIncrement="0" type="String"/>
-        <behaviour arrayCanAdd="true" arrayCanRemove="true" arrayCanMove="true" arrayCanEdit="true" editable="true" visible="true" displayName="advancedFilterEmpty" displayOrder="0" maxLength="100" isMandatory="false" isUserLocked="false" name="params.advancedFilterEmpty" selectorValue="Basic " startIncrement="0" type="String"/>
-      </behaviors>
-      <sections>
-        <sections>Filtering</sections>
-      </sections>
-    </variable>
-    <variable displayName="Basicfilterempty" name="params.basicFilterEmpty" startIncrement="0" type="Composite" mandatoryArray="false" visible="true" description="" groupSeparator="" groupDisplayName="" displayOrder="41" increment="0" refServiceURI="" keepOnImport="false" editable="true" onlyDetailView="true" localVarNameMatch="" remoteVarNameMatch="" arrayCanAdd="true" arrayCanRemove="true" arrayCanMove="true" arrayCanEdit="true" selector="params.filterType" isMandatory="false" isUserLocked="true" isGrouped="false" isSearchable="false" isUniqueGlobal="false">
-      <behaviors>
-        <behaviour arrayCanAdd="true" arrayCanRemove="true" arrayCanMove="true" arrayCanEdit="true" editable="true" visible="true" displayName="basicFilterEmpty" displayOrder="0" maxLength="100" isMandatory="false" isUserLocked="false" name="params.basicFilterEmpty" selectorValue="Advanced" startIncrement="0" type="String"/>
-        <behaviour arrayCanAdd="true" arrayCanRemove="true" arrayCanMove="true" arrayCanEdit="true" editable="true" visible="true" displayName="Basicfilterempty" displayOrder="0" maxLength="100" isMandatory="false" isUserLocked="false" name="params.basicFilterEmpty" selectorValue="Basic " startIncrement="0" type="String"/>
-      </behaviors>
-      <sections>
-        <sections>Filtering</sections>
-      </sections>
-    </variable>
-    <variable displayName="Basic filter" name="params.basicFilter" startIncrement="0" type="Composite" mandatoryArray="false" visible="true" description="" groupSeparator="" groupDisplayName="" displayOrder="42" increment="0" refServiceURI="" keepOnImport="false" editable="true" onlyDetailView="true" localVarNameMatch="" remoteVarNameMatch="" arrayCanAdd="true" arrayCanRemove="true" arrayCanMove="true" arrayCanEdit="true" selector="params.filterType" isMandatory="false" isUserLocked="true" isGrouped="false" isSearchable="false" isUniqueGlobal="false">
-      <behaviors>
-        <behaviour arrayCanAdd="true" arrayCanRemove="true" arrayCanMove="true" arrayCanEdit="true" editable="true" visible="true" displayName="basicFilter" displayOrder="0" maxLength="100" isMandatory="false" isUserLocked="false" name="params.basicFilter" selectorValue="Advanced" startIncrement="0" type="String"/>
-        <behaviour arrayCanAdd="true" arrayCanRemove="true" arrayCanMove="true" arrayCanEdit="true" editable="true" visible="true" displayName="Basic filter" displayOrder="0" maxLength="100" isMandatory="false" isUserLocked="false" name="params.basicFilter" selectorValue="Basic " startIncrement="0" type="String"/>
-      </behaviors>
-      <sections>
-        <sections>Filtering</sections>
-      </sections>
-    </variable>
-    <variable displayName="Field" name="params.filter.0.field" startIncrement="0" type="Composite" mandatoryArray="false" visible="false" description="" groupSeparator="" groupDisplayName="" displayOrder="50" increment="0" refServiceURI="" keepOnImport="false" editable="true" onlyDetailView="false" localVarNameMatch="" remoteVarNameMatch="" arrayCanAdd="true" arrayCanRemove="true" arrayCanMove="true" arrayCanEdit="true" selector="params.filterType" isMandatory="true" isUserLocked="false" isGrouped="false" isSearchable="false" isUniqueGlobal="false">
-      <behaviors>
-        <behaviour arrayCanAdd="true" arrayCanRemove="true" arrayCanMove="true" arrayCanEdit="true" editable="true" visible="true" displayName="field" displayOrder="0" maxLength="100" isMandatory="false" isUserLocked="false" name="params.filter.0.field" selectorValue="Advanced" startIncrement="0" type="String"/>
-        <behaviour arrayCanAdd="true" arrayCanRemove="true" arrayCanMove="true" arrayCanEdit="true" editable="true" visible="true" displayName="Field" displayOrder="0" maxLength="100" isMandatory="false" isUserLocked="false" name="params.filter.0.field" selectorValue="Basic " startIncrement="0" type="String"/>
-      </behaviors>
-      <sections>
-        <sections></sections>
-      </sections>
-    </variable>
-    <variable displayName="Value" name="params.filter.0.value" startIncrement="0" type="Composite" mandatoryArray="false" visible="false" description="" groupSeparator="" groupDisplayName="" displayOrder="51" increment="0" refServiceURI="" keepOnImport="false" editable="true" onlyDetailView="false" localVarNameMatch="" remoteVarNameMatch="" arrayCanAdd="true" arrayCanRemove="true" arrayCanMove="true" arrayCanEdit="true" selector="params.filterType" isMandatory="true" isUserLocked="false" isGrouped="false" isSearchable="false" isUniqueGlobal="false">
-      <behaviors>
-        <behaviour arrayCanAdd="true" arrayCanRemove="true" arrayCanMove="true" arrayCanEdit="true" editable="true" visible="true" displayName="value" displayOrder="0" maxLength="100" isMandatory="false" isUserLocked="false" name="params.filter.0.value" selectorValue="Advanced" startIncrement="0" type="String"/>
-        <behaviour arrayCanAdd="true" arrayCanRemove="true" arrayCanMove="true" arrayCanEdit="true" editable="true" visible="true" displayName="Value" displayOrder="0" maxLength="100" isMandatory="false" isUserLocked="false" name="params.filter.0.value" selectorValue="Basic " startIncrement="0" type="String"/>
-      </behaviors>
-      <sections>
-        <sections></sections>
-      </sections>
-    </variable>
-    <variable displayName="Operator" name="params.filter.0.operator" startIncrement="0" type="Composite" mandatoryArray="false" visible="false" description="" groupSeparator="" groupDisplayName="" displayOrder="52" increment="0" refServiceURI="" keepOnImport="false" editable="true" onlyDetailView="false" localVarNameMatch="" remoteVarNameMatch="" arrayCanAdd="true" arrayCanRemove="true" arrayCanMove="true" arrayCanEdit="true" selector="params.filterType" isMandatory="true" isUserLocked="false" isGrouped="false" isSearchable="false" isUniqueGlobal="false">
-      <behaviors>
-        <behaviour arrayCanAdd="true" arrayCanRemove="true" arrayCanMove="true" arrayCanEdit="true" editable="true" visible="true" displayName="operator" displayOrder="0" maxLength="100" isMandatory="false" isUserLocked="false" name="params.filter.0.operator" selectorValue="Advanced" startIncrement="0" type="String"/>
-        <behaviour arrayCanAdd="true" arrayCanRemove="true" arrayCanMove="true" arrayCanEdit="true" editable="true" visible="true" displayName="Operator" displayOrder="0" maxLength="100" isMandatory="false" isUserLocked="false" name="params.filter.0.operator" selectorValue="Basic " startIncrement="0" type="String"/>
-      </behaviors>
-      <sections>
-        <sections></sections>
-      </sections>
-    </variable>
-    <variable displayName="Resultbasictfilter" name="params.filter.0.resultBasictFilter" startIncrement="0" type="String" mandatoryArray="false" visible="false" description="" groupSeparator="" groupDisplayName="" displayOrder="53" increment="0" refServiceURI="" keepOnImport="false" editable="true" onlyDetailView="false" localVarNameMatch="" remoteVarNameMatch="" arrayCanAdd="true" arrayCanRemove="true" arrayCanMove="true" arrayCanEdit="true" isMandatory="true" isUserLocked="false" isGrouped="false" isSearchable="false" isUniqueGlobal="false">
-      <sections>
-        <sections></sections>
-      </sections>
-    </variable>
-    <variable displayName="Apply" name="params.filter.0.apply" startIncrement="0" type="Composite" mandatoryArray="false" visible="false" description="" groupSeparator="" groupDisplayName="" displayOrder="54" increment="0" refServiceURI="" keepOnImport="false" editable="true" onlyDetailView="false" localVarNameMatch="" remoteVarNameMatch="" arrayCanAdd="true" arrayCanRemove="true" arrayCanMove="true" arrayCanEdit="true" selector="params.filterType" isMandatory="true" isUserLocked="false" isGrouped="false" isSearchable="false" isUniqueGlobal="false">
-      <behaviors>
-        <behaviour arrayCanAdd="true" arrayCanRemove="true" arrayCanMove="true" arrayCanEdit="true" editable="true" visible="true" displayName="apply" displayOrder="0" maxLength="100" isMandatory="false" isUserLocked="false" name="params.filter.0.apply" selectorValue="Advanced" startIncrement="0" type="String"/>
-        <behaviour arrayCanAdd="true" arrayCanRemove="true" arrayCanMove="true" arrayCanEdit="true" editable="true" visible="true" displayName="Apply" displayOrder="0" maxLength="100" isMandatory="false" isUserLocked="false" name="params.filter.0.apply" selectorValue="Basic " startIncrement="0" type="Boolean"/>
-      </behaviors>
-      <sections>
-        <sections></sections>
-      </sections>
-    </variable>
-    <variable displayName="Level" name="params.levelView" startIncrement="0" type="String" mandatoryArray="false" visible="true" description="In according your selection, the dashboard that your are going to deploy will be display in the appropriated tab" groupSeparator="" groupDisplayName="" displayOrder="143" increment="0" refServiceURI="" keepOnImport="false" editable="false" onlyDetailView="true" localVarNameMatch="" remoteVarNameMatch="" arrayCanAdd="true" arrayCanRemove="true" arrayCanMove="true" arrayCanEdit="true" default="service" isMandatory="true" isUserLocked="true" isGrouped="false" isSearchable="false" isUniqueGlobal="false">
-      <sections>
-        <sections>Level View</sections>
-      </sections>
-      <values>
-        <values displayValue="Subtenant">service</values>
-        <values displayValue="ME">device</values>
-      </values>
-    </variable>
-    <variable displayName="Device Id" name="params.device_id" startIncrement="0" type="Composite" mandatoryArray="false" visible="true" description="" groupSeparator="" groupDisplayName="" displayOrder="144" increment="0" refServiceURI="" keepOnImport="false" editable="true" onlyDetailView="true" localVarNameMatch="" remoteVarNameMatch="" arrayCanAdd="true" arrayCanRemove="true" arrayCanMove="true" arrayCanEdit="true" selector="params.levelView" isMandatory="false" isUserLocked="true" isGrouped="false" isSearchable="false" isUniqueGlobal="false">
-      <behaviors>
-        <behaviour arrayCanAdd="true" arrayCanRemove="true" arrayCanMove="true" arrayCanEdit="true" editable="true" visible="true" displayName="Device Id" displayOrder="0" maxLength="100" isMandatory="false" isUserLocked="false" name="params.device_id" selectorValue="device" startIncrement="0" type="Device"/>
-        <behaviour arrayCanAdd="true" arrayCanRemove="true" arrayCanMove="true" arrayCanEdit="true" editable="true" visible="true" displayName="device_id" displayOrder="0" maxLength="100" isMandatory="false" isUserLocked="false" name="params.device_id" selectorValue="service" startIncrement="0" type="String"/>
-      </behaviors>
-      <sections>
-        <sections>Level View</sections>
-      </sections>
-    </variable>
-    <variable displayName="Device Ip" name="params.device_ip" startIncrement="0" type="Composite" mandatoryArray="false" visible="true" description="" groupSeparator="" groupDisplayName="" displayOrder="177" increment="0" refServiceURI="" keepOnImport="false" editable="true" onlyDetailView="true" localVarNameMatch="" remoteVarNameMatch="" arrayCanAdd="true" arrayCanRemove="true" arrayCanMove="true" arrayCanEdit="true" selector="params.levelView" isMandatory="false" isUserLocked="true" isGrouped="false" isSearchable="false" isUniqueGlobal="false">
-      <behaviors>
-        <behaviour arrayCanAdd="true" arrayCanRemove="true" arrayCanMove="true" arrayCanEdit="true" editable="true" visible="true" displayName="Device Ip" displayOrder="0" maxLength="100" isMandatory="false" isUserLocked="false" name="params.device_ip" selectorValue="device" startIncrement="0" type="IpAddress"/>
-        <behaviour arrayCanAdd="true" arrayCanRemove="true" arrayCanMove="true" arrayCanEdit="true" editable="true" visible="true" displayName="device_ip" displayOrder="0" maxLength="100" isMandatory="false" isUserLocked="false" name="params.device_ip" selectorValue="service" startIncrement="0" type="String"/>
-      </behaviors>
-      <sections>
-        <sections>Level View</sections>
-      </sections>
-    </variable>
   </variables>
   <example/>
   <process name="Process/Analytics/Kibana/Process_Create_Report_Dashboard">
-    <displayName>Create Dashboard</displayName>
+    <displayName>Dashboard View Enablement</displayName>
     <type>CREATE</type>
     <visibility>5</visibility>
     <allowSchedule/>
@@ -151,23 +36,9 @@
       <processPath>/opt/fmc_repository/Process/Analytics/Kibana/Process_Create_Report_Dashboard/</processPath>
       <displayName>Search Dashboard Template Selected</displayName>
     </task>
-    <task name="Task_Send_the_new_template_to_ES.php">
-      <processPath>/opt/fmc_repository/Process/Analytics/Kibana/Process_Create_Report_Dashboard/</processPath>
-      <displayName>Send the new template to ES</displayName>
-    </task>
-  </process>
-  <process name="Process/Analytics/Kibana/Process_Delete_Dashboard">
-    <displayName>Delete Dashboard</displayName>
-    <type>UPDATE</type>
-    <visibility>5</visibility>
-    <allowSchedule/>
-    <task name="Task_Delete_Dashboard.php">
-      <processPath>/opt/fmc_repository/Process/Analytics/Kibana/Process_Delete_Dashboard/</processPath>
-      <displayName>Delete Dashboard</displayName>
-    </task>
   </process>
   <process name="Process/Analytics/Kibana/Process_Update_Dashboard">
-    <displayName>Update Dashboard</displayName>
+    <displayName>Update Dashboard View Enablement</displayName>
     <type>UPDATE</type>
     <visibility>5</visibility>
     <allowSchedule/>
@@ -175,10 +46,6 @@
       <processPath>/opt/fmc_repository/Process/Analytics/Kibana/Process_Update_Dashboard/</processPath>
       <displayName>Search Dashboard Selected for Updating</displayName>
     </task>
-    <task name="Task_Send_back_template_to_ES_for_Updating.php">
-      <processPath>/opt/fmc_repository/Process/Analytics/Kibana/Process_Update_Dashboard/</processPath>
-      <displayName>Send back template to ES for Updating</displayName>
-    </task>
   </process>
   <process name="Process/Analytics/Kibana/Process_Delete_Instance">
     <displayName>Delete Instance</displayName>