diff --git a/CHANGELOG.md b/CHANGELOG.md index 8b2f871..f68f8f6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ ## Changelog +5.0.4 - 2026-01-05 +- Updated Api timeout to 5 seconds and changed log levels + 5.0.3 - 2025-11-10 - Updated cover image for marketplace - Updated screenshot to not include extra plugins diff --git a/Slack.php b/Slack.php index 33372e6..4a9263d 100644 --- a/Slack.php +++ b/Slack.php @@ -429,7 +429,7 @@ public function sendNewAlerts($triggeredAlerts): void foreach ($groupedAlerts as $slackChannelId => $alert) { if (!$slackApi->sendMessage(implode("\n", $alert['message']), $slackChannelId)) { $logger = StaticContainer::get(LoggerInterface::class); - $logger->debug('Slack alert failed for following alerts: ' . implode("\n", $alert['name'])); + $logger->info('Slack alert failed for following alerts: ' . implode("\n", $alert['name'])); } } } diff --git a/SlackApi.php b/SlackApi.php index 02e6c3c..3639594 100644 --- a/SlackApi.php +++ b/SlackApi.php @@ -36,7 +36,7 @@ class SlackApi private const SLACK_COMPLETE_UPLOAD_EXTERNAL = 'https://slack.com/api/files.completeUploadExternal'; private const SLACK_POST_MESSAGE_URL = 'https://slack.com/api/chat.postMessage'; - private const SLACK_TIMEOUT = 5000; + private const SLACK_TIMEOUT = 5; public function __construct( #[\SensitiveParameter] @@ -60,7 +60,7 @@ public function uploadFile(string $subject, string $fileName, string $fileConten return $this->completeUploadExternal($channel, $subject); } - $this->logger->debug('Unable to send ' . $fileName . ' report to Slack'); + $this->logger->info('Unable to send ' . $fileName . ' report to Slack'); return false; } @@ -87,7 +87,7 @@ public function getUploadURLExternal(string $fileName, int $fileLength): string ['Content-Type' => 'multipart/form-data'] ); } catch (\Exception $e) { - $this->logger->debug('Slack error getUploadURLExternal: ' . $e->getMessage()); + $this->logger->error('Slack error getUploadURLExternal: ' . $e->getMessage()); return ''; } @@ -120,7 +120,7 @@ public function sendFile(string $uploadURL, string $fileContents): bool true ); } catch (\Exception $e) { - $this->logger->debug('Slack error sendFile: ' . $e->getMessage()); + $this->logger->error('Slack error sendFile: ' . $e->getMessage()); return false; } @@ -151,7 +151,7 @@ public function completeUploadExternal(string $channel, string $subject): bool ['Content-Type' => 'multipart/form-data'] ); } catch (\Exception $e) { - $this->logger->debug('Slack error completeUploadExternal:' . $e->getMessage()); + $this->logger->error('Slack error completeUploadExternal:' . $e->getMessage()); return false; } @@ -171,7 +171,7 @@ public function completeUploadExternal(string $channel, string $subject): bool public function sendMessage(string $message, string $channel): bool { if (empty($message) || empty($channel)) { - $this->logger->debug('Empty message or channel for sending message'); + $this->logger->info('Empty message or channel for sending message'); return false; } @@ -187,7 +187,7 @@ public function sendMessage(string $message, string $channel): bool ['Content-Type' => 'multipart/form-data'] ); } catch (\Exception $e) { - $this->logger->debug('Slack error sendMessage:' . $e->getMessage()); + $this->logger->error('Slack error sendMessage:' . $e->getMessage()); return false; } diff --git a/plugin.json b/plugin.json index 9ba40c9..d750b45 100644 --- a/plugin.json +++ b/plugin.json @@ -1,7 +1,7 @@ { "name": "Slack", "description": "Send Matomo reports and alerts to Slack channels, keeping your team informed and ready to act in real time.", - "version": "5.0.3", + "version": "5.0.4", "theme": false, "require": { "matomo": ">=5.0.0,<6.0.0-b1" diff --git a/tests/UI/expected-ui-screenshots/Slack_new_scheduled_reports.png b/tests/UI/expected-ui-screenshots/Slack_new_scheduled_reports.png index 6359f9d..b683055 100644 Binary files a/tests/UI/expected-ui-screenshots/Slack_new_scheduled_reports.png and b/tests/UI/expected-ui-screenshots/Slack_new_scheduled_reports.png differ diff --git a/tests/UI/expected-ui-screenshots/Slack_send_via_slack.png b/tests/UI/expected-ui-screenshots/Slack_send_via_slack.png index 458172a..5dcac04 100644 Binary files a/tests/UI/expected-ui-screenshots/Slack_send_via_slack.png and b/tests/UI/expected-ui-screenshots/Slack_send_via_slack.png differ diff --git a/tests/UI/expected-ui-screenshots/Slack_send_via_slack_new.png b/tests/UI/expected-ui-screenshots/Slack_send_via_slack_new.png index b830964..e524c44 100644 Binary files a/tests/UI/expected-ui-screenshots/Slack_send_via_slack_new.png and b/tests/UI/expected-ui-screenshots/Slack_send_via_slack_new.png differ diff --git a/tests/UI/expected-ui-screenshots/Slack_slack_report_disabled.png b/tests/UI/expected-ui-screenshots/Slack_slack_report_disabled.png index 458172a..5dcac04 100644 Binary files a/tests/UI/expected-ui-screenshots/Slack_slack_report_disabled.png and b/tests/UI/expected-ui-screenshots/Slack_slack_report_disabled.png differ diff --git a/tests/UI/expected-ui-screenshots/Slack_slack_report_enabled.png b/tests/UI/expected-ui-screenshots/Slack_slack_report_enabled.png index 8311039..bc5e464 100644 Binary files a/tests/UI/expected-ui-screenshots/Slack_slack_report_enabled.png and b/tests/UI/expected-ui-screenshots/Slack_slack_report_enabled.png differ diff --git a/tests/UI/expected-ui-screenshots/Slack_slack_report_error.png b/tests/UI/expected-ui-screenshots/Slack_slack_report_error.png index eb49b87..fc2a8f3 100644 Binary files a/tests/UI/expected-ui-screenshots/Slack_slack_report_error.png and b/tests/UI/expected-ui-screenshots/Slack_slack_report_error.png differ diff --git a/tests/UI/expected-ui-screenshots/Slack_slack_report_pdf_view.png b/tests/UI/expected-ui-screenshots/Slack_slack_report_pdf_view.png index 9297530..f759825 100644 Binary files a/tests/UI/expected-ui-screenshots/Slack_slack_report_pdf_view.png and b/tests/UI/expected-ui-screenshots/Slack_slack_report_pdf_view.png differ