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): ?>
@@ -23,4 +32,9 @@
+
+
+
translate('No graphs found') ?>
+
+
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'),
diff --git a/library/Graphite/EmbedGraphs.php b/library/Graphite/EmbedGraphs.php
new file mode 100644
index 0000000..66212fc
--- /dev/null
+++ b/library/Graphite/EmbedGraphs.php
@@ -0,0 +1,66 @@
+href('graphite/show/host', ['host' => $host]));
+ }
+
+ /**
+ * 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
+ ]));
+ }
+
+ /**
+ * Return a
which causes the framework JS to embed the given URL
+ *
+ * @param Url $url
+ *
+ * @return string
+ */
+ 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 '
';
+ }
+
+ /**
+ * Get the current response view
+ *
+ * @return View
+ */
+ protected static function getView()
+ {
+ return Icinga::app()->getViewRenderer()->view;
+ }
+}
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
new file mode 100644
index 0000000..541b8b0
--- /dev/null
+++ b/library/Graphite/ProvidedHook/Monitoring/DetailviewExtension.php
@@ -0,0 +1,38 @@
+getType()) {
+ case 'host':
+ /** @var Host $object */
+ return $this->getGeneric() . EmbedGraphs::host($object->getName());
+ case 'service':
+ /** @var Service $object */
+ return $this->getGeneric() . EmbedGraphs::service($object->getHost()->getName(), $object->getName());
+ }
+ }
+
+ /**
+ * Get monitored object type independend HTML to use
+ *
+ * @return string
+ */
+ protected function getGeneric()
+ {
+ $this->handleTimeRangePickerRequest();
+ return '
' . mt('graphite', 'Graphs') . '
' . $this->renderTimeRangePicker($this->getView());
+ }
+}
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/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'
+ ]
);
}
diff --git a/public/css/module.less b/public/css/module.less
index 751c10f..89a8e94 100644
--- a/public/css/module.less
+++ b/public/css/module.less
@@ -50,6 +50,16 @@ ul.legend {
}
}
+div.graphs-host {
+ display: inline-block;
+ vertical-align: top;
+ margin-right: 2em;
+
+ > div.container[data-icinga-url] {
+ width: 300px;
+ }
+}
+
form[name=form_timerangepickercommon_graphite] select {
width: 7.5em;
margin-right: 0.25em;
diff --git a/run.php b/run.php
index e4a8474..c64206b 100644
--- a/run.php
+++ b/run.php
@@ -1,5 +1,4 @@
provideHook('monitoring/HostActions');
-$this->provideHook('monitoring/ServiceActions');
-
+/** @var \Icinga\Application\Modules\Module $this */
+$this->provideHook('monitoring/DetailviewExtension');