From 0d606dfc06e8c536c2bdb4e71d6d0fa594af1bea Mon Sep 17 00:00:00 2001 From: "Alexander A. Klimov" Date: Thu, 31 Aug 2017 17:12:26 +0200 Subject: [PATCH 01/15] /list/hosts refs #27 --- application/controllers/ListController.php | 30 +++++++++++++ application/views/scripts/list/hosts.phtml | 51 ++++++++++++++++++++++ application/views/scripts/show/host.phtml | 10 +++++ 3 files changed, 91 insertions(+) create mode 100644 application/controllers/ListController.php create mode 100644 application/views/scripts/list/hosts.phtml diff --git a/application/controllers/ListController.php b/application/controllers/ListController.php new file mode 100644 index 0000000..4608d7c --- /dev/null +++ b/application/controllers/ListController.php @@ -0,0 +1,30 @@ +view->hosts = $hosts = $this->backend->select()->from('hoststatus', ['host_name', 'host_display_name']); + $this->applyRestriction('monitoring/filter/objects', $hosts); + $this->filterQuery($hosts); + $this->setupPaginationControl($hosts); + $this->setupLimitControl(); + $this->setupSortControl(['host_display_name' => mt('monitoring', 'Hostname')], $hosts); + } + + /** + * Apply filters on a DataView + * + * @param DataView $dataView The DataView to apply filters on + */ + protected function filterQuery(DataView $dataView) + { + $this->setupFilterControl($dataView, null, null, ['format', 'stateType', 'addColumns', 'problems']); + $this->handleFormatRequest($dataView); + } +} diff --git a/application/views/scripts/list/hosts.phtml b/application/views/scripts/list/hosts.phtml new file mode 100644 index 0000000..8e65867 --- /dev/null +++ b/application/views/scripts/list/hosts.phtml @@ -0,0 +1,51 @@ + +
+ + +
+ + +
+ +
+ +
+hasResult()): ?> +

+
+ +peekAhead($compact) as $host): ?> +

qlink( + $host->host_name === $host->host_display_name + ? $host->host_display_name + : $host->host_display_name . ' (' . $this->escape($host->host_name) . ')', + Url::fromPath('monitoring/host/show', ['host' => $host->host_name]) + ) ?>

+
is enough", but this seems not to work for me + $this->href('graphite/show/host', [ + 'host' => $host->host_name, + 'view' => 'compact' + ]) + ?>">
+ +hasMore()): ?> +
+ qlink( + mt('monitoring', 'Show More'), + $this->url()->without(array('view', 'limit')), + null, + [ + 'class' => 'action-link', + 'data-base-target' => '_next' + ] + ) ?> +
+ + diff --git a/application/views/scripts/show/host.phtml b/application/views/scripts/show/host.phtml index d6dc97c..8b4a99e 100644 --- a/application/views/scripts/show/host.phtml +++ b/application/views/scripts/show/host.phtml @@ -1,7 +1,12 @@ +
tabs ?>

hostname ?>

+
images as $type => $imgs): ?> @@ -23,4 +28,9 @@ + + +

translate('No graphs found') ?>

+ +
From e4a58c4568f4baac59aec66451f1b387dc8d2771 Mon Sep 17 00:00:00 2001 From: "Alexander A. Klimov" Date: Thu, 31 Aug 2017 17:43:52 +0200 Subject: [PATCH 02/15] /list/services refs #27 --- application/controllers/ListController.php | 18 ++++++ application/views/scripts/list/services.phtml | 60 +++++++++++++++++++ application/views/scripts/show/service.phtml | 10 ++++ 3 files changed, 88 insertions(+) create mode 100644 application/views/scripts/list/services.phtml diff --git a/application/controllers/ListController.php b/application/controllers/ListController.php index 4608d7c..852b09e 100644 --- a/application/controllers/ListController.php +++ b/application/controllers/ListController.php @@ -17,6 +17,24 @@ class ListController extends Controller $this->setupSortControl(['host_display_name' => mt('monitoring', 'Hostname')], $hosts); } + public function servicesAction() + { + $this->view->services = $services = $this->backend->select()->from('servicestatus', [ + 'host_name', + 'host_display_name', + 'service_description', + 'service_display_name' + ]); + $this->applyRestriction('monitoring/filter/objects', $services); + $this->filterQuery($services); + $this->setupPaginationControl($services); + $this->setupLimitControl(); + $this->setupSortControl([ + 'service_display_name' => mt('monitoring', 'Service Name'), + 'host_display_name' => mt('monitoring', 'Hostname') + ], $services); + } + /** * Apply filters on a DataView * diff --git a/application/views/scripts/list/services.phtml b/application/views/scripts/list/services.phtml new file mode 100644 index 0000000..ec9ca0d --- /dev/null +++ b/application/views/scripts/list/services.phtml @@ -0,0 +1,60 @@ + +
+ + +
+ + +
+ +
+ +
+hasResult()): ?> +

+
+ +peekAhead($compact) as $service): ?> +

qlink( + $service->host_name === $service->host_display_name + ? $service->host_display_name + : $service->host_display_name . ' (' . $this->escape($service->host_name) . ')', + Url::fromPath('monitoring/host/show', ['host' => $service->host_name]) + ) ?>: qlink( + $service->service_description === $service->service_display_name + ? $service->service_display_name + : $service->service_display_name . ' (' . $this->escape($service->service_description) . ')', + Url::fromPath('monitoring/service/show', [ + 'host' => $service->host_name, + 'service' => $service->service_description + ]) + ) ?>

+
is enough", but this seems not to work for me + $this->href('graphite/show/service', [ + 'host' => $service->host_name, + 'service' => $service->service_description, + 'view' => 'compact' + ]) + ?>">
+ +hasMore()): ?> +
+ qlink( + mt('monitoring', 'Show More'), + $this->url()->without(array('view', 'limit')), + null, + [ + 'class' => 'action-link', + 'data-base-target' => '_next' + ] + ) ?> +
+ + diff --git a/application/views/scripts/show/service.phtml b/application/views/scripts/show/service.phtml index f072481..e29c35c 100644 --- a/application/views/scripts/show/service.phtml +++ b/application/views/scripts/show/service.phtml @@ -1,7 +1,12 @@ +
tabs ?>

hostname ?>: service ?>

+
images as $type => $imgs): ?> @@ -23,4 +28,9 @@ + + +

translate('No graphs found') ?>

+ +
From 6c59b145fbee12232bf8c5374c39d8da55e0ff91 Mon Sep 17 00:00:00 2001 From: "Alexander A. Klimov" Date: Fri, 1 Sep 2017 17:00:20 +0200 Subject: [PATCH 03/15] /list/*: fix missing navigation refs #27 --- application/controllers/ListController.php | 30 ++++++++++++++++++++++ configuration.php | 5 +++- 2 files changed, 34 insertions(+), 1 deletion(-) diff --git a/application/controllers/ListController.php b/application/controllers/ListController.php index 852b09e..7e60b47 100644 --- a/application/controllers/ListController.php +++ b/application/controllers/ListController.php @@ -4,11 +4,18 @@ namespace Icinga\Module\Graphite\Controllers; use Icinga\Module\Monitoring\Controller; use Icinga\Module\Monitoring\DataView\DataView; +use Icinga\Web\Url; class ListController extends Controller { public function hostsAction() { + $this->addTitleTab( + 'hosts', + mt('monitoring', 'Hosts'), + mt('monitoring', 'List hosts') + ); + $this->view->hosts = $hosts = $this->backend->select()->from('hoststatus', ['host_name', 'host_display_name']); $this->applyRestriction('monitoring/filter/objects', $hosts); $this->filterQuery($hosts); @@ -19,6 +26,12 @@ class ListController extends Controller public function servicesAction() { + $this->addTitleTab( + 'services', + mt('monitoring', 'Services'), + mt('monitoring', 'List services') + ); + $this->view->services = $services = $this->backend->select()->from('servicestatus', [ 'host_name', 'host_display_name', @@ -45,4 +58,21 @@ class ListController extends Controller $this->setupFilterControl($dataView, null, null, ['format', 'stateType', 'addColumns', 'problems']); $this->handleFormatRequest($dataView); } + + /** + * Add title tab + * + * @param string $action + * @param string $title + * @param string $tip + */ + protected function addTitleTab($action, $title, $tip) + { + $this->getTabs()->add($action, [ + 'title' => $tip, + 'label' => $title, + 'url' => Url::fromRequest(), + 'active' => true + ]); + } } diff --git a/configuration.php b/configuration.php index 52470fd..6d39c75 100644 --- a/configuration.php +++ b/configuration.php @@ -2,7 +2,10 @@ /** @var \Icinga\Application\Modules\Module $this */ -$this->menuSection(N_('Graphite'), ['icon' => 'chart-area'])->setUrl('graphite/show/overview'); +/** @var \Icinga\Application\Modules\MenuItemContainer $section */ +$section = $this->menuSection(N_('Graphite'), ['icon' => 'chart-area'])->setUrl('graphite/show/overview'); +$section->add(N_('Hosts'), ['url' => 'graphite/list/hosts']); +$section->add(N_('Services'), ['url' => 'graphite/list/services']); $this->provideConfigTab('backend', array( 'title' => $this->translate('Configure the Graphite Web backend'), From 1f03b999c09d7e1e3728170c841022120cd9692e Mon Sep 17 00:00:00 2001 From: "Alexander A. Klimov" Date: Fri, 1 Sep 2017 18:05:36 +0200 Subject: [PATCH 04/15] Display monitored objects' graphs in their detail views refs #27 --- application/views/scripts/list/hosts.phtml | 10 +-- application/views/scripts/list/services.phtml | 11 +-- library/Graphite/EmbedGraphs.php | 67 +++++++++++++++++++ .../Monitoring/DetailviewExtension.php | 34 ++++++++++ run.php | 3 +- 5 files changed, 109 insertions(+), 16 deletions(-) create mode 100644 library/Graphite/EmbedGraphs.php create mode 100644 library/Graphite/ProvidedHook/Monitoring/DetailviewExtension.php diff --git a/application/views/scripts/list/hosts.phtml b/application/views/scripts/list/hosts.phtml index 8e65867..d012cbd 100644 --- a/application/views/scripts/list/hosts.phtml +++ b/application/views/scripts/list/hosts.phtml @@ -1,4 +1,6 @@ : $host->host_display_name . ' (' . $this->escape($host->host_name) . ')', Url::fromPath('monitoring/host/show', ['host' => $host->host_name]) ) ?> -
is enough", but this seems not to work for me - $this->href('graphite/show/host', [ - 'host' => $host->host_name, - 'view' => 'compact' - ]) - ?>">
+ host_name) ?> hasMore()): ?>
diff --git a/application/views/scripts/list/services.phtml b/application/views/scripts/list/services.phtml index ec9ca0d..cced3bc 100644 --- a/application/views/scripts/list/services.phtml +++ b/application/views/scripts/list/services.phtml @@ -1,4 +1,6 @@ 'service' => $service->service_description ]) ) ?> -
is enough", but this seems not to work for me - $this->href('graphite/show/service', [ - 'host' => $service->host_name, - 'service' => $service->service_description, - 'view' => 'compact' - ]) - ?>">
+ host_name, $service->service_description) ?> hasMore()): ?>
diff --git a/library/Graphite/EmbedGraphs.php b/library/Graphite/EmbedGraphs.php new file mode 100644 index 0000000..4ff2e2a --- /dev/null +++ b/library/Graphite/EmbedGraphs.php @@ -0,0 +1,67 @@ +href('graphite/show/host', [ + 'host' => $host, + 'view' => 'compact' + ])); + } + + /** + * Embed all graphs of the given service of the given host + * + * @param string $host + * @param string $service + * + * @return string + */ + public static function service($host, $service) + { + return static::url(static::getView()->href('graphite/show/service', [ + 'host' => $host, + 'service' => $service, + 'view' => 'compact' + ])); + } + + /** + * Return a
which causes the framework JS to embed the given URL + * + * @param Url $url + * + * @return string + */ + protected static function url(Url $url) + { + // TODO(ak): EL says "
is enough", + // but this seems not to work for me + return '
'; + } + + /** + * Get the current response view + * + * @return View + */ + protected static function getView() + { + return Icinga::app()->getViewRenderer()->view; + } +} diff --git a/library/Graphite/ProvidedHook/Monitoring/DetailviewExtension.php b/library/Graphite/ProvidedHook/Monitoring/DetailviewExtension.php new file mode 100644 index 0000000..42beac2 --- /dev/null +++ b/library/Graphite/ProvidedHook/Monitoring/DetailviewExtension.php @@ -0,0 +1,34 @@ +getType()) { + case 'host': + /** @var Host $object */ + return $this->getHeader() . EmbedGraphs::host($object->getName()); + case 'service': + /** @var Service $object */ + return $this->getHeader() . EmbedGraphs::service($object->getHost()->getName(), $object->getName()); + } + } + + /** + * Get HTML header to use + * + * @return string + */ + protected function getHeader() + { + return '

' . mt('graphite', 'Graphs') . '

'; + } +} diff --git a/run.php b/run.php index e4a8474..9f0e41e 100644 --- a/run.php +++ b/run.php @@ -1,5 +1,6 @@ provideHook('monitoring/HostActions'); $this->provideHook('monitoring/ServiceActions'); - +$this->provideHook('monitoring/DetailviewExtension'); From a72f923de1163194058106a8f436f8a06caf8e8f Mon Sep 17 00:00:00 2001 From: "Alexander A. Klimov" Date: Fri, 1 Sep 2017 18:08:33 +0200 Subject: [PATCH 05/15] Remove obsolete monitoring hooks refs #27 --- .../ProvidedHook/Monitoring/HostActions.php | 17 -------------- .../Monitoring/ServiceActions.php | 22 ------------------- run.php | 2 -- 3 files changed, 41 deletions(-) delete mode 100644 library/Graphite/ProvidedHook/Monitoring/HostActions.php delete mode 100644 library/Graphite/ProvidedHook/Monitoring/ServiceActions.php diff --git a/library/Graphite/ProvidedHook/Monitoring/HostActions.php b/library/Graphite/ProvidedHook/Monitoring/HostActions.php deleted file mode 100644 index cdd63a3..0000000 --- a/library/Graphite/ProvidedHook/Monitoring/HostActions.php +++ /dev/null @@ -1,17 +0,0 @@ - Url::fromPath('graphite/show/host', array('host' => $host->host_name)) - ); - } -} diff --git a/library/Graphite/ProvidedHook/Monitoring/ServiceActions.php b/library/Graphite/ProvidedHook/Monitoring/ServiceActions.php deleted file mode 100644 index 29214e1..0000000 --- a/library/Graphite/ProvidedHook/Monitoring/ServiceActions.php +++ /dev/null @@ -1,22 +0,0 @@ - Url::fromPath( - 'graphite/show/service', - array( - 'host' => $service->host_name, - 'service' => $service->service_description, - )) - ); - } -} diff --git a/run.php b/run.php index 9f0e41e..c64206b 100644 --- a/run.php +++ b/run.php @@ -1,6 +1,4 @@ provideHook('monitoring/HostActions'); -$this->provideHook('monitoring/ServiceActions'); $this->provideHook('monitoring/DetailviewExtension'); From 764badf79f84486c59c0c0d9266c128fb63ad759 Mon Sep 17 00:00:00 2001 From: "Alexander A. Klimov" Date: Mon, 4 Sep 2017 11:03:01 +0200 Subject: [PATCH 06/15] /show/{host,service}: make more compact refs #27 --- application/views/scripts/show/host.phtml | 22 ++++++++++++-------- application/views/scripts/show/service.phtml | 22 ++++++++++++-------- 2 files changed, 26 insertions(+), 18 deletions(-) diff --git a/application/views/scripts/show/host.phtml b/application/views/scripts/show/host.phtml index 8b4a99e..712cded 100644 --- a/application/views/scripts/show/host.phtml +++ b/application/views/scripts/show/host.phtml @@ -12,15 +12,19 @@ if (! $compact): ?> images as $type => $imgs): ?> 0): ?> -

escape(ucfirst($type)) ?>

-templates[$type] ?> -partial( - 'show/legend.phtml', - array( - 'template' => $template, - 'disabledDatasources' => $this->disabledDatasources - ) -) ?> +
+{$this->escape(ucfirst($type))}"; + echo $this->partial( + 'show/legend.phtml', + array( + 'template' => $this->templates[$type], + 'disabledDatasources' => $this->disabledDatasources + ) + ); +} +?> $url): ?> diff --git a/application/views/scripts/show/service.phtml b/application/views/scripts/show/service.phtml index e29c35c..ddabecd 100644 --- a/application/views/scripts/show/service.phtml +++ b/application/views/scripts/show/service.phtml @@ -12,15 +12,19 @@ if (! $compact): ?> images as $type => $imgs): ?> 0): ?> -

escape(ucfirst($type)) ?>

-templates[$type] ?> -partial( - 'show/legend.phtml', - array( - 'template' => $template, - 'disabledDatasources' => $this->disabledDatasources - ) -) ?> +
+{$this->escape(ucfirst($type))}"; + echo $this->partial( + 'show/legend.phtml', + array( + 'template' => $this->templates[$type], + 'disabledDatasources' => $this->disabledDatasources + ) + ); +} +?> $url): ?> From d6a9978ce315bfbff922e44d2d5e91938db5d5ff Mon Sep 17 00:00:00 2001 From: "Alexander A. Klimov" Date: Mon, 4 Sep 2017 12:48:56 +0200 Subject: [PATCH 07/15] /list/{hosts,services}: require a filter refs #27 --- application/views/scripts/list/hosts.phtml | 60 +++++++------- application/views/scripts/list/services.phtml | 78 +++++++++++-------- 2 files changed, 78 insertions(+), 60 deletions(-) diff --git a/application/views/scripts/list/hosts.phtml b/application/views/scripts/list/hosts.phtml index d012cbd..7e31688 100644 --- a/application/views/scripts/list/hosts.phtml +++ b/application/views/scripts/list/hosts.phtml @@ -4,6 +4,7 @@ use Icinga\Module\Graphite\EmbedGraphs; use Icinga\Web\Url; /** @var \Icinga\Web\View $this */ +/** @var \Icinga\Web\Widget\FilterEditor $filterEditor */ /** @var \Icinga\Module\Monitoring\DataView\DataView $hosts */ if (! $compact): ?> @@ -18,30 +19,37 @@ if (! $compact): ?>
-hasResult()): ?> -

-
- -peekAhead($compact) as $host): ?> -

qlink( - $host->host_name === $host->host_display_name - ? $host->host_display_name - : $host->host_display_name . ' (' . $this->escape($host->host_name) . ')', - Url::fromPath('monitoring/host/show', ['host' => $host->host_name]) - ) ?>

- host_name) ?> - -hasMore()): ?> -
- qlink( - mt('monitoring', 'Show More'), - $this->url()->without(array('view', 'limit')), - null, - [ - 'class' => 'action-link', - 'data-base-target' => '_next' - ] - ) ?> -
- +getFilter()->isEmpty()) { + echo '

' . $this->escape($this->translate('Please specify a filter')) . '

'; +} elseif ($hosts->hasResult()) { + foreach ($hosts->peekAhead($compact) as $host) { + echo '

' + . $this->qlink( + $host->host_name === $host->host_display_name + ? $host->host_display_name + : $host->host_display_name . ' (' . $this->escape($host->host_name) . ')', + Url::fromPath('monitoring/host/show', ['host' => $host->host_name]) + ) + . '

'; + echo EmbedGraphs::host($host->host_name); + } + + if ($hosts->hasMore()) { + echo '
' + . $this->qlink( + mt('monitoring', 'Show More'), + $this->url()->without(array('view', 'limit')), + null, + [ + 'class' => 'action-link', + 'data-base-target' => '_next' + ] + ) + . '
'; + } +} else { + echo '

' . $this->escape(mt('monitoring', 'No hosts found matching the filter.')) . '

'; +} +?>
diff --git a/application/views/scripts/list/services.phtml b/application/views/scripts/list/services.phtml index cced3bc..ed7ba95 100644 --- a/application/views/scripts/list/services.phtml +++ b/application/views/scripts/list/services.phtml @@ -4,6 +4,7 @@ use Icinga\Module\Graphite\EmbedGraphs; use Icinga\Web\Url; /** @var \Icinga\Web\View $this */ +/** @var \Icinga\Web\Widget\FilterEditor $filterEditor */ /** @var \Icinga\Module\Monitoring\DataView\DataView $services */ if (! $compact): ?> @@ -18,38 +19,47 @@ if (! $compact): ?>
-hasResult()): ?> -

-
- -peekAhead($compact) as $service): ?> -

qlink( - $service->host_name === $service->host_display_name - ? $service->host_display_name - : $service->host_display_name . ' (' . $this->escape($service->host_name) . ')', - Url::fromPath('monitoring/host/show', ['host' => $service->host_name]) - ) ?>: qlink( - $service->service_description === $service->service_display_name - ? $service->service_display_name - : $service->service_display_name . ' (' . $this->escape($service->service_description) . ')', - Url::fromPath('monitoring/service/show', [ - 'host' => $service->host_name, - 'service' => $service->service_description - ]) - ) ?>

- host_name, $service->service_description) ?> - -hasMore()): ?> -
- qlink( - mt('monitoring', 'Show More'), - $this->url()->without(array('view', 'limit')), - null, - [ - 'class' => 'action-link', - 'data-base-target' => '_next' - ] - ) ?> -
- +getFilter()->isEmpty()) { + echo '

' . $this->escape($this->translate('Please specify a filter')) . '

'; +} elseif ($services->hasResult()) { + foreach ($services->peekAhead($compact) as $service) { + echo '

' + . $this->qlink( + $service->host_name === $service->host_display_name + ? $service->host_display_name + : $service->host_display_name . ' (' . $this->escape($service->host_name) . ')', + Url::fromPath('monitoring/host/show', ['host' => $service->host_name]) + ) + . ': ' + . $this->qlink( + $service->service_description === $service->service_display_name + ? $service->service_display_name + : $service->service_display_name . ' (' . $this->escape($service->service_description) . ')', + Url::fromPath('monitoring/service/show', [ + 'host' => $service->host_name, + 'service' => $service->service_description + ]) + ) + . '

'; + echo EmbedGraphs::service($service->host_name, $service->service_description); + } + + if ($services->hasMore()) { + echo '
' + . $this->qlink( + mt('monitoring', 'Show More'), + $this->url()->without(array('view', 'limit')), + null, + [ + 'class' => 'action-link', + 'data-base-target' => '_next' + ] + ) + . '
'; + } +} else { + echo '

' . $this->escape(mt('monitoring', 'No services found matching the filter.')) . '

'; +} +?>
From 26ab619310ed7772124f294310f9d5ea6932dd40 Mon Sep 17 00:00:00 2001 From: "Alexander A. Klimov" Date: Mon, 4 Sep 2017 13:02:03 +0200 Subject: [PATCH 08/15] /list/{hosts,services}: correct a[data-base-target] refs #27 --- application/views/scripts/list/hosts.phtml | 4 +++- application/views/scripts/list/services.phtml | 8 ++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/application/views/scripts/list/hosts.phtml b/application/views/scripts/list/hosts.phtml index 7e31688..e70b7da 100644 --- a/application/views/scripts/list/hosts.phtml +++ b/application/views/scripts/list/hosts.phtml @@ -29,7 +29,9 @@ if ($filterEditor->getFilter()->isEmpty()) { $host->host_name === $host->host_display_name ? $host->host_display_name : $host->host_display_name . ' (' . $this->escape($host->host_name) . ')', - Url::fromPath('monitoring/host/show', ['host' => $host->host_name]) + Url::fromPath('monitoring/host/show', ['host' => $host->host_name]), + null, + ['data-base-target' => '_next'] ) . ''; echo EmbedGraphs::host($host->host_name); diff --git a/application/views/scripts/list/services.phtml b/application/views/scripts/list/services.phtml index ed7ba95..e614a19 100644 --- a/application/views/scripts/list/services.phtml +++ b/application/views/scripts/list/services.phtml @@ -29,7 +29,9 @@ if ($filterEditor->getFilter()->isEmpty()) { $service->host_name === $service->host_display_name ? $service->host_display_name : $service->host_display_name . ' (' . $this->escape($service->host_name) . ')', - Url::fromPath('monitoring/host/show', ['host' => $service->host_name]) + Url::fromPath('monitoring/host/show', ['host' => $service->host_name]), + null, + ['data-base-target' => '_next'] ) . ': ' . $this->qlink( @@ -39,7 +41,9 @@ if ($filterEditor->getFilter()->isEmpty()) { Url::fromPath('monitoring/service/show', [ 'host' => $service->host_name, 'service' => $service->service_description - ]) + ]), + null, + ['data-base-target' => '_next'] ) . ''; echo EmbedGraphs::service($service->host_name, $service->service_description); From d57315202808a31a0632e92a38d640f81ac7d1b7 Mon Sep 17 00:00:00 2001 From: "Alexander A. Klimov" Date: Mon, 4 Sep 2017 13:20:25 +0200 Subject: [PATCH 09/15] /list/{hosts,services}: add dashboard and menu actions refs #27 --- application/controllers/ListController.php | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/application/controllers/ListController.php b/application/controllers/ListController.php index 7e60b47..267583a 100644 --- a/application/controllers/ListController.php +++ b/application/controllers/ListController.php @@ -5,9 +5,17 @@ namespace Icinga\Module\Graphite\Controllers; use Icinga\Module\Monitoring\Controller; use Icinga\Module\Monitoring\DataView\DataView; use Icinga\Web\Url; +use Icinga\Web\Widget\Tabextension\DashboardAction; +use Icinga\Web\Widget\Tabextension\MenuAction; class ListController extends Controller { + public function init() + { + parent::init(); + $this->getTabs()->extend(new DashboardAction())->extend(new MenuAction()); + } + public function hostsAction() { $this->addTitleTab( From a725de8719fa9b99dae3c06eb4278312cc0fe69f Mon Sep 17 00:00:00 2001 From: "Alexander A. Klimov" Date: Mon, 4 Sep 2017 13:41:00 +0200 Subject: [PATCH 10/15] /list/{hosts,services}: make more compact refs #27 --- application/views/scripts/list/hosts.phtml | 24 +++++----- application/views/scripts/list/services.phtml | 48 ++++++++++--------- 2 files changed, 38 insertions(+), 34 deletions(-) diff --git a/application/views/scripts/list/hosts.phtml b/application/views/scripts/list/hosts.phtml index e70b7da..a9aed43 100644 --- a/application/views/scripts/list/hosts.phtml +++ b/application/views/scripts/list/hosts.phtml @@ -24,20 +24,22 @@ if ($filterEditor->getFilter()->isEmpty()) { echo '

' . $this->escape($this->translate('Please specify a filter')) . '

'; } elseif ($hosts->hasResult()) { foreach ($hosts->peekAhead($compact) as $host) { - echo '

' - . $this->qlink( - $host->host_name === $host->host_display_name - ? $host->host_display_name - : $host->host_display_name . ' (' . $this->escape($host->host_name) . ')', - Url::fromPath('monitoring/host/show', ['host' => $host->host_name]), - null, - ['data-base-target' => '_next'] - ) - . '

'; + if (! $compact) { + echo '

' + . $this->qlink( + $host->host_name === $host->host_display_name + ? $host->host_display_name + : $host->host_display_name . ' (' . $this->escape($host->host_name) . ')', + Url::fromPath('monitoring/host/show', ['host' => $host->host_name]), + null, + ['data-base-target' => '_next'] + ) + . '

'; + } echo EmbedGraphs::host($host->host_name); } - if ($hosts->hasMore()) { + if (! $compact && $hosts->hasMore()) { echo '
' . $this->qlink( mt('monitoring', 'Show More'), diff --git a/application/views/scripts/list/services.phtml b/application/views/scripts/list/services.phtml index e614a19..787057a 100644 --- a/application/views/scripts/list/services.phtml +++ b/application/views/scripts/list/services.phtml @@ -24,32 +24,34 @@ if ($filterEditor->getFilter()->isEmpty()) { echo '

' . $this->escape($this->translate('Please specify a filter')) . '

'; } elseif ($services->hasResult()) { foreach ($services->peekAhead($compact) as $service) { - echo '

' - . $this->qlink( - $service->host_name === $service->host_display_name - ? $service->host_display_name - : $service->host_display_name . ' (' . $this->escape($service->host_name) . ')', - Url::fromPath('monitoring/host/show', ['host' => $service->host_name]), - null, - ['data-base-target' => '_next'] - ) - . ': ' - . $this->qlink( - $service->service_description === $service->service_display_name - ? $service->service_display_name - : $service->service_display_name . ' (' . $this->escape($service->service_description) . ')', - Url::fromPath('monitoring/service/show', [ - 'host' => $service->host_name, - 'service' => $service->service_description - ]), - null, - ['data-base-target' => '_next'] - ) - . '

'; + if (! $compact) { + echo '

' + . $this->qlink( + $service->host_name === $service->host_display_name + ? $service->host_display_name + : $service->host_display_name . ' (' . $this->escape($service->host_name) . ')', + Url::fromPath('monitoring/host/show', ['host' => $service->host_name]), + null, + ['data-base-target' => '_next'] + ) + . ': ' + . $this->qlink( + $service->service_description === $service->service_display_name + ? $service->service_display_name + : $service->service_display_name . ' (' . $this->escape($service->service_description) . ')', + Url::fromPath('monitoring/service/show', [ + 'host' => $service->host_name, + 'service' => $service->service_description + ]), + null, + ['data-base-target' => '_next'] + ) + . '

'; + } echo EmbedGraphs::service($service->host_name, $service->service_description); } - if ($services->hasMore()) { + if (! $compact && $services->hasMore()) { echo '
' . $this->qlink( mt('monitoring', 'Show More'), From 2ffabe3d4af6b77d771e406f41c12cfa85ccaca0 Mon Sep 17 00:00:00 2001 From: "Alexander A. Klimov" Date: Mon, 4 Sep 2017 14:30:25 +0200 Subject: [PATCH 11/15] /list/hosts: use all available container width Hosts don't have more than one graph. refs #27 --- application/views/scripts/list/hosts.phtml | 4 ++++ public/css/module.less | 10 ++++++++++ 2 files changed, 14 insertions(+) diff --git a/application/views/scripts/list/hosts.phtml b/application/views/scripts/list/hosts.phtml index a9aed43..fb664ea 100644 --- a/application/views/scripts/list/hosts.phtml +++ b/application/views/scripts/list/hosts.phtml @@ -24,6 +24,8 @@ if ($filterEditor->getFilter()->isEmpty()) { echo '

' . $this->escape($this->translate('Please specify a filter')) . '

'; } elseif ($hosts->hasResult()) { foreach ($hosts->peekAhead($compact) as $host) { + echo '
'; + if (! $compact) { echo '

' . $this->qlink( @@ -37,6 +39,8 @@ if ($filterEditor->getFilter()->isEmpty()) { . '

'; } echo EmbedGraphs::host($host->host_name); + + echo '
'; } if (! $compact && $hosts->hasMore()) { diff --git a/public/css/module.less b/public/css/module.less index 3d73af0..37d4399 100644 --- a/public/css/module.less +++ b/public/css/module.less @@ -49,3 +49,13 @@ ul.legend { } } } + +div.graphs-host { + display: inline-block; + vertical-align: top; + margin-right: 2em; + + > div.container[data-icinga-url] { + width: 300px; + } +} From f02ab198725b33bf7f3237c2cd79e19b3fe5463b Mon Sep 17 00:00:00 2001 From: "Alexander A. Klimov" Date: Thu, 7 Sep 2017 17:33:46 +0200 Subject: [PATCH 12/15] Use the time range picker in the detail view refs #27 --- application/controllers/ShowController.php | 52 +++++++++++++------ .../TimeRangePicker/TimeRangePickerTrait.php | 28 ++++++++++ library/Graphite/EmbedGraphs.php | 13 +++-- library/Graphite/GraphiteChart.php | 38 +++++++++++++- .../Monitoring/DetailviewExtension.php | 14 +++-- 5 files changed, 114 insertions(+), 31 deletions(-) diff --git a/application/controllers/ShowController.php b/application/controllers/ShowController.php index 849f8c6..3b85366 100644 --- a/application/controllers/ShowController.php +++ b/application/controllers/ShowController.php @@ -4,6 +4,7 @@ namespace Icinga\Module\Graphite\Controllers; use DirectoryIterator; use Icinga\Exception\NotFoundError; +use Icinga\Module\Graphite\Forms\TimeRangePicker\TimeRangePickerTrait; use Icinga\Module\Graphite\GraphiteChart; use Icinga\Module\Graphite\GraphiteUtil; use Icinga\Module\Graphite\GraphiteWeb; @@ -11,6 +12,7 @@ use Icinga\Module\Graphite\GraphiteWebClient; use Icinga\Module\Graphite\GraphTemplate; use Icinga\Module\Graphite\TemplateStore; use Icinga\Web\Controller; +use Icinga\Web\UrlParams; use Icinga\Web\Widget; class ShowController extends Controller @@ -168,15 +170,14 @@ class ShowController extends Controller foreach ($set->loadTemplates() as $key => $template) { if (strpos($template->getFilterString(), '$service') !== false) continue; - $imgParams = array( - 'template' => $key, - 'start' => $view->start, - 'width' => $view->width, - 'height' => $view->height - ); + $imgParams = (new UrlParams()) + ->set('template', $key) + ->set('start', $view->start) + ->set('width', $view->width) + ->set('height', $view->height); if ($this->view->disabledDatasources) { - $imgParams['disabled'] = $this->view->disabledDatasources; + $imgParams->set('disabled', $this->view->disabledDatasources); foreach ($this->view->disabledDatasources as $dis) { if ($template->hasDatasource($dis)) { $template->getDatasource($dis)->disable(); @@ -190,7 +191,7 @@ class ShowController extends Controller ->select() ->from($template->getFilterString()) ->where('hostname', $hostname) - ->getWrappedImageLinks($template, $imgParams); + ->getWrappedImageLinks($template, TimeRangePickerTrait::copyAllRangeParameters($imgParams)); } } @@ -228,15 +229,14 @@ class ShowController extends Controller foreach ($set->loadTemplates() as $key => $template) { if (strpos($template->getFilterString(), '$service') === false) continue; - $imgParams = array( - 'template' => $key, - 'start' => $view->start, - 'width' => $view->width, - 'height' => $view->height - ); + $imgParams = (new UrlParams()) + ->set('template', $key) + ->set('start', $view->start) + ->set('width', $view->width) + ->set('height', $view->height);; if ($this->view->disabledDatasources) { - $imgParams['disabled'] = $this->view->disabledDatasources; + $imgParams->set('disabled', $this->view->disabledDatasources); foreach ($this->view->disabledDatasources as $dis) { if ($template->hasDatasource($dis)) { $template->getDatasource($dis)->disable(); @@ -252,7 +252,7 @@ class ShowController extends Controller ->from($template->getFilterString()) ->where('hostname', $hostname) ->where('service', $service) - ->getWrappedImageLinks($template, $imgParams); + ->getWrappedImageLinks($template, TimeRangePickerTrait::copyAllRangeParameters($imgParams)); } } @@ -329,12 +329,29 @@ class ShowController extends Controller $this->view->disabledDatasources = $this->params->getValues('disabled'); } + /** + * Get time range parameters for Graphite from the URL + * + * @return string[] + */ + protected function getRangeFromTimeRangePicker() + { + $params = $this->getRequest()->getUrl()->getParams(); + $relative = $params->get(TimeRangePickerTrait::getRelativeRangeParameter()); + if ($relative !== null) { + return ["-{$relative}s", null]; + } + + $absolute = TimeRangePickerTrait::getAbsoluteRangeParameters(); + return [$params->get($absolute['start'], '-1hours'), $params->get($absolute['end'])]; + } + protected function handleGraphParams() { if ($this->handledGraphParams === false) { $this->handledGraphParams = true; $view = $this->view; - $view->start = $this->params->shift('start', '-1hours'); + list($view->start, $view->end) = $this->getRangeFromTimeRangePicker(); $view->width = $this->params->shift('width', '300'); $view->height = $this->params->shift('height', '150'); } @@ -347,6 +364,7 @@ class ShowController extends Controller $this->handleGraphParams(); $view = $this->view; $chart->setStart($view->start) + ->setUntil($view->end) ->setWidth($view->width) ->setHeight($view->height) // TODO: handle before diff --git a/application/forms/TimeRangePicker/TimeRangePickerTrait.php b/application/forms/TimeRangePicker/TimeRangePickerTrait.php index 26577a5..cb4f0bd 100644 --- a/application/forms/TimeRangePicker/TimeRangePickerTrait.php +++ b/application/forms/TimeRangePicker/TimeRangePickerTrait.php @@ -2,6 +2,7 @@ namespace Icinga\Module\Graphite\Forms\TimeRangePicker; +use Icinga\Web\Url; use Icinga\Web\UrlParams; trait TimeRangePickerTrait @@ -46,6 +47,33 @@ trait TimeRangePickerTrait return array_values(array_merge(static::getAllRangeParameters(), [static::getRangeCustomizationParameter()])); } + /** + * Copy {@link getAllRangeParameters()} from one {@link UrlParams} instance to another + * + * @param UrlParams|null $copy Defaults to a new instance + * @param UrlParams|null $origin Defaults to the current request's params + * + * @return UrlParams The copy + */ + public static function copyAllRangeParameters(UrlParams $copy = null, UrlParams $origin = null) + { + if ($origin === null) { + $origin = Url::fromRequest()->getParams(); + } + if ($copy === null) { + $copy = new UrlParams(); + } + + foreach (TimeRangePickerTrait::getAllRangeParameters() as $param) { + $value = $origin->get($param); + if ($value !== null) { + $copy->set($param, $value); + } + } + + return $copy; + } + /** * Extract the relative time range (if any) from the given URL parameters * diff --git a/library/Graphite/EmbedGraphs.php b/library/Graphite/EmbedGraphs.php index 4ff2e2a..66212fc 100644 --- a/library/Graphite/EmbedGraphs.php +++ b/library/Graphite/EmbedGraphs.php @@ -3,6 +3,7 @@ namespace Icinga\Module\Graphite; use Icinga\Application\Icinga; +use Icinga\Module\Graphite\Forms\TimeRangePicker\TimeRangePickerTrait; use Icinga\Web\Url; use Icinga\Web\View; @@ -17,10 +18,7 @@ class EmbedGraphs */ public static function host($host) { - return static::url(static::getView()->href('graphite/show/host', [ - 'host' => $host, - 'view' => 'compact' - ])); + return static::url(static::getView()->href('graphite/show/host', ['host' => $host])); } /** @@ -35,8 +33,7 @@ class EmbedGraphs { return static::url(static::getView()->href('graphite/show/service', [ 'host' => $host, - 'service' => $service, - 'view' => 'compact' + 'service' => $service ])); } @@ -49,10 +46,12 @@ class EmbedGraphs */ protected static function url(Url $url) { + TimeRangePickerTrait::copyAllRangeParameters($url->getParams()); + // TODO(ak): EL says "
is enough", // but this seems not to work for me return '
'; + . ' data-icinga-url="' . $url->setParam('view', 'compact') . '">
'; } /** diff --git a/library/Graphite/GraphiteChart.php b/library/Graphite/GraphiteChart.php index 13d2f1a..d09e00a 100644 --- a/library/Graphite/GraphiteChart.php +++ b/library/Graphite/GraphiteChart.php @@ -12,6 +12,11 @@ class GraphiteChart protected $from = '-4hours'; + /** + * @var string + */ + protected $until; + protected $showLegend = true; protected $height = 200; @@ -70,9 +75,32 @@ class GraphiteChart return $this->from; } + /** + * Get {@link until} + * + * @return string + */ + public function getUntil() + { + return $this->until; + } + + /** + * Set {@link until} + * + * @param string $until + * + * @return $this + */ + public function setUntil($until) + { + $this->until = $until; + return $this; + } + protected function getParams() { - return array( + $params = [ 'height' => $this->height, 'width' => $this->width, '_salt' => time() . '.000', @@ -90,7 +118,13 @@ class GraphiteChart // 'hideYAxis' => 'true', // 'format' => 'svg', // 'pieMode' => 'average', - ); + ]; + + if ($this->until !== null) { + $params['until'] = $this->until; + } + + return $params; } public function getUrl() diff --git a/library/Graphite/ProvidedHook/Monitoring/DetailviewExtension.php b/library/Graphite/ProvidedHook/Monitoring/DetailviewExtension.php index 42beac2..541b8b0 100644 --- a/library/Graphite/ProvidedHook/Monitoring/DetailviewExtension.php +++ b/library/Graphite/ProvidedHook/Monitoring/DetailviewExtension.php @@ -3,6 +3,7 @@ namespace Icinga\Module\Graphite\ProvidedHook\Monitoring; use Icinga\Module\Graphite\EmbedGraphs; +use Icinga\Module\Graphite\Web\Controller\TimeRangePickerTrait; use Icinga\Module\Monitoring\Hook\DetailviewExtensionHook; use Icinga\Module\Monitoring\Object\Host; use Icinga\Module\Monitoring\Object\MonitoredObject; @@ -10,25 +11,28 @@ use Icinga\Module\Monitoring\Object\Service; class DetailviewExtension extends DetailviewExtensionHook { + use TimeRangePickerTrait; + public function getHtmlForObject(MonitoredObject $object) { switch ($object->getType()) { case 'host': /** @var Host $object */ - return $this->getHeader() . EmbedGraphs::host($object->getName()); + return $this->getGeneric() . EmbedGraphs::host($object->getName()); case 'service': /** @var Service $object */ - return $this->getHeader() . EmbedGraphs::service($object->getHost()->getName(), $object->getName()); + return $this->getGeneric() . EmbedGraphs::service($object->getHost()->getName(), $object->getName()); } } /** - * Get HTML header to use + * Get monitored object type independend HTML to use * * @return string */ - protected function getHeader() + protected function getGeneric() { - return '

' . mt('graphite', 'Graphs') . '

'; + $this->handleTimeRangePickerRequest(); + return '

' . mt('graphite', 'Graphs') . '

' . $this->renderTimeRangePicker($this->getView()); } } From aff73cf4d789721abd49b3442071c840c247dbb4 Mon Sep 17 00:00:00 2001 From: "Alexander A. Klimov" Date: Thu, 7 Sep 2017 17:44:47 +0200 Subject: [PATCH 13/15] Use the time range picker in the list views refs #27 --- application/controllers/ListController.php | 17 ++++++++++++++++- application/views/scripts/list/hosts.phtml | 1 + application/views/scripts/list/services.phtml | 1 + 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/application/controllers/ListController.php b/application/controllers/ListController.php index 267583a..586ce2e 100644 --- a/application/controllers/ListController.php +++ b/application/controllers/ListController.php @@ -2,6 +2,8 @@ namespace Icinga\Module\Graphite\Controllers; +use Icinga\Module\Graphite\Forms\TimeRangePicker\TimeRangePickerTrait as TimeRangePicker; +use Icinga\Module\Graphite\Web\Controller\TimeRangePickerTrait; use Icinga\Module\Monitoring\Controller; use Icinga\Module\Monitoring\DataView\DataView; use Icinga\Web\Url; @@ -10,6 +12,8 @@ use Icinga\Web\Widget\Tabextension\MenuAction; class ListController extends Controller { + use TimeRangePickerTrait; + public function init() { parent::init(); @@ -30,6 +34,9 @@ class ListController extends Controller $this->setupPaginationControl($hosts); $this->setupLimitControl(); $this->setupSortControl(['host_display_name' => mt('monitoring', 'Hostname')], $hosts); + + $this->handleTimeRangePickerRequest(); + $this->view->timeRangePicker = $this->renderTimeRangePicker($this->view); } public function servicesAction() @@ -54,6 +61,9 @@ class ListController extends Controller 'service_display_name' => mt('monitoring', 'Service Name'), 'host_display_name' => mt('monitoring', 'Hostname') ], $services); + + $this->handleTimeRangePickerRequest(); + $this->view->timeRangePicker = $this->renderTimeRangePicker($this->view); } /** @@ -63,7 +73,12 @@ class ListController extends Controller */ protected function filterQuery(DataView $dataView) { - $this->setupFilterControl($dataView, null, null, ['format', 'stateType', 'addColumns', 'problems']); + $this->setupFilterControl( + $dataView, + null, + null, + array_merge(['format', 'stateType', 'addColumns', 'problems'], TimeRangePicker::getAllParameters()) + ); $this->handleFormatRequest($dataView); } diff --git a/application/views/scripts/list/hosts.phtml b/application/views/scripts/list/hosts.phtml index fb664ea..73b9938 100644 --- a/application/views/scripts/list/hosts.phtml +++ b/application/views/scripts/list/hosts.phtml @@ -16,6 +16,7 @@ if (! $compact): ?>
+
diff --git a/application/views/scripts/list/services.phtml b/application/views/scripts/list/services.phtml index 787057a..1f108c8 100644 --- a/application/views/scripts/list/services.phtml +++ b/application/views/scripts/list/services.phtml @@ -16,6 +16,7 @@ if (! $compact): ?>
+
From cc5899abab188dcf33ef380de6c8dd9ddb53563c Mon Sep 17 00:00:00 2001 From: "Alexander A. Klimov" Date: Tue, 19 Sep 2017 17:27:56 +0200 Subject: [PATCH 14/15] Fix data-base-target refs #27 --- library/Graphite/Web/Controller/TimeRangePickerTrait.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/library/Graphite/Web/Controller/TimeRangePickerTrait.php b/library/Graphite/Web/Controller/TimeRangePickerTrait.php index 6f67a4e..807785d 100644 --- a/library/Graphite/Web/Controller/TimeRangePickerTrait.php +++ b/library/Graphite/Web/Controller/TimeRangePickerTrait.php @@ -53,7 +53,10 @@ trait TimeRangePickerTrait $view->translate('Custom', 'TimeRangePicker'), $url->with(TimeRangePicker::getRangeCustomizationParameter(), '1'), null, - ['class' => 'button-link'] + [ + 'class' => 'button-link', + 'data-base-target' => '_self' + ] ); } From 8939b11b736c2919495a5cefa60b3c2e191d71b6 Mon Sep 17 00:00:00 2001 From: "Alexander A. Klimov" Date: Wed, 20 Sep 2017 10:51:09 +0200 Subject: [PATCH 15/15] Fix forms' data-base-target refs #27 --- application/forms/TimeRangePicker/CommonForm.php | 1 + application/forms/TimeRangePicker/CustomForm.php | 1 + 2 files changed, 2 insertions(+) diff --git a/application/forms/TimeRangePicker/CommonForm.php b/application/forms/TimeRangePicker/CommonForm.php index c00ce65..2934de3 100644 --- a/application/forms/TimeRangePicker/CommonForm.php +++ b/application/forms/TimeRangePicker/CommonForm.php @@ -36,6 +36,7 @@ class CommonForm extends Form public function init() { $this->setName('form_timerangepickercommon_graphite'); + $this->setAttrib('data-base-target', '_self'); } public function createElements(array $formData) diff --git a/application/forms/TimeRangePicker/CustomForm.php b/application/forms/TimeRangePicker/CustomForm.php index a90834c..ab5aacc 100644 --- a/application/forms/TimeRangePicker/CustomForm.php +++ b/application/forms/TimeRangePicker/CustomForm.php @@ -40,6 +40,7 @@ class CustomForm extends Form public function init() { $this->setName('form_timerangepickercustom_graphite'); + $this->setAttrib('data-base-target', '_self'); } public function createElements(array $formData)