diff --git a/app/Stats/StatisticsData.php b/app/Stats/StatisticsData.php index 3d55b03b..140980ec 100644 --- a/app/Stats/StatisticsData.php +++ b/app/Stats/StatisticsData.php @@ -11,8 +11,8 @@ class StatisticsData public function monthlyIngested($userId) { - $first = new \DateTime('-12 months'); - $last = new \DateTime(); + $first = new \DateTime('-11 months'); + $last = new \DateTime('+1 months'); $interval = DateInterval::createFromDateString('1 month'); $period = new DatePeriod($first, $interval, $last); @@ -59,8 +59,8 @@ private function monthlyOfflineIngested($date, $userId) public function monthlyAccessed($userId) { - $first = new \DateTime('-12 months'); - $last = new \DateTime(); + $first = new \DateTime('-11 months'); + $last = new \DateTime('+1 months'); $interval = DateInterval::createFromDateString('1 month'); $period = new DatePeriod($first, $interval, $last); diff --git a/deploy/logstash/conf.d/inputs/ingested_file_formats.conf b/deploy/logstash/conf.d/inputs/ingested_file_formats.conf index 884f234d..1830e1e3 100644 --- a/deploy/logstash/conf.d/inputs/ingested_file_formats.conf +++ b/deploy/logstash/conf.d/inputs/ingested_file_formats.conf @@ -15,7 +15,7 @@ input { path not like '%/data/objects/submissionDocumentation/%' ) ) fo - left join bags on bags.id = fo.storable_id + left join aips a on a.id = fo.storable_id group by mime_type, owner ) ingested_file_formats" schedule => "* * * * *"