MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity

new: [usage data widget] added a global caching for attribute counts 

- counts are too bloody expensive not to do this
pull/8902/merge
iglocska 2023-05-31 09:00:37 +02:00
parent f02d52b1ab
commit 8246b5b44f
No known key found for this signature in database
GPG Key ID: BEA224F1FEF113AC
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
app/Lib/Dashboard/UsageDataWidget.php
View File

@ -16,6 +16,7 @@ class UsageDataWidget
private $Correlation = null; private $Correlation = null;
private $Thread = null; private $Thread = null;
private $AuthKey = null; private $AuthKey = null;
private $redis = null;
private $validFilterKeys = [ private $validFilterKeys = [
'nationality', 'nationality',
@ -41,8 +42,12 @@ class UsageDataWidget
'Discussion posts' 'Discussion posts'
]; ];
public function handler($user, $options = array()){ public function handler($user, $options = array()) {
$this->User = ClassRegistry::init('User'); $this->User = ClassRegistry::init('User');
$this->redis = $this->User->setupRedis();
if (!$this->redis) {
throw new NotFoundException(__('No redis connection found.'));
}
$this->Event = ClassRegistry::init('Event'); $this->Event = ClassRegistry::init('Event');
$this->Thread = ClassRegistry::init('Thread'); $this->Thread = ClassRegistry::init('Thread');
$this->Correlation = ClassRegistry::init('Correlation'); $this->Correlation = ClassRegistry::init('Correlation');
@ -203,11 +208,17 @@ class UsageDataWidget
if (!empty($orgIdList)) { if (!empty($orgIdList)) {
$conditions['AND'][] = ['Event.orgc_id IN' => $orgIdList]; $conditions['AND'][] = ['Event.orgc_id IN' => $orgIdList];
} }
return $this->Event->Attribute->find('count', [ $hash = hash('sha256', json_encode($orgIdList));
'conditions' => $conditions, $count = $this->redis->get('misp:dashboard:attribute_count:' . $hash);
'contain' => ['Event'], if (empty($count)) {
'recursive' => -1 $count = $this->Event->Attribute->find('count', [
]); 'conditions' => $conditions,
'contain' => ['Event'],
'recursive' => -1
]);
$this->redis->setEx('misp:dashboard:attribute_count:' . $hash, 3600, $count);
}
return $count;
} }
private function getAttributesCountMonth($orgConditions, $orgIdList, $thisMonth) private function getAttributesCountMonth($orgConditions, $orgIdList, $thisMonth)