diff --git a/library/Icingadb/ProvidedHook/ApplicationState.php b/library/Icingadb/ProvidedHook/ApplicationState.php index 8c7b008e8..208a97ad7 100644 --- a/library/Icingadb/ProvidedHook/ApplicationState.php +++ b/library/Icingadb/ProvidedHook/ApplicationState.php @@ -31,7 +31,7 @@ public function collectMessages() $this->addError( 'icingadb/redis-down', $downSince, - sprintf(t("Can't connect to Icinga Redis: %s"), $e->getMessage()) + sprintf(t("Can't connect to Redis: %s"), $e->getMessage()) ); return; @@ -89,7 +89,7 @@ public function collectMessages() $this->addError( 'icingadb/redis-outdated', $lastIcingaHeartbeat, - t('Icinga Redis is outdated. Make sure Icinga 2 is running and connected to Redis.') + t('Redis is outdated. Make sure Icinga 2 is running and connected to Redis.') ); break; diff --git a/library/Icingadb/ProvidedHook/RedisHealth.php b/library/Icingadb/ProvidedHook/RedisHealth.php index 1471abaf6..681edacd3 100644 --- a/library/Icingadb/ProvidedHook/RedisHealth.php +++ b/library/Icingadb/ProvidedHook/RedisHealth.php @@ -16,7 +16,7 @@ class RedisHealth extends HealthHook public function getName(): string { - return 'Icinga Redis'; + return 'Redis'; } public function checkHealth() @@ -32,7 +32,7 @@ public function checkHealth() if ($instance === null) { $this->setState(self::STATE_UNKNOWN); $this->setMessage(t( - 'Can\'t check Icinga Redis: Icinga DB is not running or not writing into the database' + 'Can\'t check Redis: Icinga DB is not running or not writing into the database' . ' (make sure the icinga feature "icingadb" is enabled)' )); @@ -42,14 +42,14 @@ public function checkHealth() $outdatedDbHeartbeat = $instance->heartbeat->getTimestamp() < time() - 60; if (! $outdatedDbHeartbeat || $instance->heartbeat->getTimestamp() <= $lastIcingaHeartbeat) { $this->setState(self::STATE_OK); - $this->setMessage(t('Icinga Redis available and up to date.')); + $this->setMessage(t('Redis available and up to date.')); } elseif ($instance->heartbeat->getTimestamp() > $lastIcingaHeartbeat) { $this->setState(self::STATE_CRITICAL); - $this->setMessage(t('Icinga Redis outdated. Make sure Icinga 2 is running and connected to Redis.')); + $this->setMessage(t('Redis outdated. Make sure Icinga 2 is running and connected to Redis.')); } } catch (Exception $e) { $this->setState(self::STATE_CRITICAL); - $this->setMessage(sprintf(t("Can't connect to Icinga Redis: %s"), $e->getMessage())); + $this->setMessage(sprintf(t("Can't connect to Redis: %s"), $e->getMessage())); } } } diff --git a/library/Icingadb/Setup/RedisPage.php b/library/Icingadb/Setup/RedisPage.php index 3c0a74135..69b04bbed 100644 --- a/library/Icingadb/Setup/RedisPage.php +++ b/library/Icingadb/Setup/RedisPage.php @@ -12,9 +12,9 @@ class RedisPage extends Form public function init() { $this->setName('setup_icingadb_redis'); - $this->setTitle(t('Icinga DB Redis')); + $this->setTitle(t('Redis')); $this->addDescription(t( - 'Please fill out the connection details to access the Icinga DB Redis.' + 'Please fill out the connection details to access the Redis server.' )); $this->setValidatePartial(true); } diff --git a/library/Icingadb/Setup/RedisStep.php b/library/Icingadb/Setup/RedisStep.php index 97e50e0ed..7f2baabfb 100644 --- a/library/Icingadb/Setup/RedisStep.php +++ b/library/Icingadb/Setup/RedisStep.php @@ -107,7 +107,7 @@ public function getSummary() $topic = new HtmlElement('div', Attributes::create(['class' => 'topic'])); $topic->addHtml(new HtmlElement('p', null, Text::create(mt( 'icingadb', - 'The Icinga DB Redis will be accessed using the following connection details:' + 'Redis will be accessed using the following connection details:' )))); $primaryOptions = new Table(); @@ -178,7 +178,7 @@ public function getSummary() $summary = new HtmlDocument(); $summary->addHtml( - new HtmlElement('h2', null, Text::create(mt('icingadb', 'Icinga DB Redis'))), + new HtmlElement('h2', null, Text::create(mt('icingadb', 'Redis'))), $topic ); diff --git a/library/Icingadb/Widget/ItemList/StateList.php b/library/Icingadb/Widget/ItemList/StateList.php index 1e6dcb9af..9671c9722 100644 --- a/library/Icingadb/Widget/ItemList/StateList.php +++ b/library/Icingadb/Widget/ItemList/StateList.php @@ -53,7 +53,7 @@ protected function assemble(): void if ($this->data instanceof VolatileStateResults && $this->data->isRedisUnavailable()) { $this->prependWrapper((new HtmlDocument())->addHtml(new Notice( - t('Icinga Redis is currently unavailable. The shown information might be outdated.') + t('Redis is currently unavailable. The shown information might be outdated.') ))); } }