From 5d7cc42fd15d17f2220f2696869ec545220ef30f Mon Sep 17 00:00:00 2001 From: Timm Ortloff Date: Tue, 8 Nov 2022 08:40:39 +0100 Subject: [PATCH 1/4] Add EmailProvider for EmailProviderHook --- .../ProvidedHook/Reporting/EmailProvider.php | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 library/Icingadb/ProvidedHook/Reporting/EmailProvider.php diff --git a/library/Icingadb/ProvidedHook/Reporting/EmailProvider.php b/library/Icingadb/ProvidedHook/Reporting/EmailProvider.php new file mode 100644 index 000000000..4204cb9ec --- /dev/null +++ b/library/Icingadb/ProvidedHook/Reporting/EmailProvider.php @@ -0,0 +1,28 @@ +getDb()) as $user) { + $emails[$user['email']] = $user['display_name']; + } + + return $emails; + } +} From 2472b71722990f59f772b634e49c2d8f455f4137 Mon Sep 17 00:00:00 2001 From: Timm Ortloff Date: Tue, 8 Nov 2022 08:40:53 +0100 Subject: [PATCH 2/4] Register EmailProvider --- run.php | 1 + 1 file changed, 1 insertion(+) diff --git a/run.php b/run.php index eb9c71d9e..72ec2c499 100644 --- a/run.php +++ b/run.php @@ -10,6 +10,7 @@ $this->provideHook('health', 'RedisHealth'); $this->provideHook('Reporting/Report', 'Reporting/HostSlaReport'); $this->provideHook('Reporting/Report', 'Reporting/ServiceSlaReport'); +$this->provideHook('Reporting/EmailProvider', 'Reporting/EmailProvider'); if (! $this::exists('monitoring')) { $modulePath = null; From 6abfcea52bb988de1008b88b2369df167c4ad2f9 Mon Sep 17 00:00:00 2001 From: Timm Ortloff Date: Thu, 2 Feb 2023 17:01:27 +0100 Subject: [PATCH 3/4] Rename EmailProvider to EmailAddressBook --- .../Reporting/{EmailProvider.php => EmailAddressBook.php} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename library/Icingadb/ProvidedHook/Reporting/{EmailProvider.php => EmailAddressBook.php} (75%) diff --git a/library/Icingadb/ProvidedHook/Reporting/EmailProvider.php b/library/Icingadb/ProvidedHook/Reporting/EmailAddressBook.php similarity index 75% rename from library/Icingadb/ProvidedHook/Reporting/EmailProvider.php rename to library/Icingadb/ProvidedHook/Reporting/EmailAddressBook.php index 4204cb9ec..0cd33f61e 100644 --- a/library/Icingadb/ProvidedHook/Reporting/EmailProvider.php +++ b/library/Icingadb/ProvidedHook/Reporting/EmailAddressBook.php @@ -5,9 +5,9 @@ use Icinga\Exception\ConfigurationError; use Icinga\Module\Icingadb\Common\Database; use Icinga\Module\Icingadb\Model\User; -use Icinga\Module\Reporting\Hook\EmailProviderHook; +use Icinga\Module\Reporting\Hook\EmailAddressBookHook; -class EmailProvider extends EmailProviderHook +class EmailAddressBook extends EmailAddressBookHook { use Database; @@ -15,7 +15,7 @@ class EmailProvider extends EmailProviderHook * @return array * @throws ConfigurationError */ - public function getContactEmails(): array + public function listEmailAddresses(): array { $emails = []; From 543b45d4f61972f3bb42f99ee4ca8c61dd03e3dd Mon Sep 17 00:00:00 2001 From: Timm Ortloff Date: Thu, 2 Feb 2023 17:01:40 +0100 Subject: [PATCH 4/4] Fix provideHook --- run.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/run.php b/run.php index 72ec2c499..f594a9142 100644 --- a/run.php +++ b/run.php @@ -10,7 +10,7 @@ $this->provideHook('health', 'RedisHealth'); $this->provideHook('Reporting/Report', 'Reporting/HostSlaReport'); $this->provideHook('Reporting/Report', 'Reporting/ServiceSlaReport'); -$this->provideHook('Reporting/EmailProvider', 'Reporting/EmailProvider'); +$this->provideHook('Reporting/EmailAddressBook', 'Reporting/EmailAddressBook'); if (! $this::exists('monitoring')) { $modulePath = null;