diff --git a/CHANGELOG.md b/CHANGELOG.md index 3031c33..e3da3e7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## v0.2.0 + +- Macros in templates are now resolved +- Add maxDataPoints when fetching data +- Add Icinga Web benchmark points +- Fix TLS verify logic + ## v0.1.2 - Fix config validation for Graphite diff --git a/library/Perfdatagraphsgraphite/ProvidedHook/Perfdatagraphs/PerfdataSource.php b/library/Perfdatagraphsgraphite/ProvidedHook/Perfdatagraphs/PerfdataSource.php index 7a5cf03..f07fe81 100644 --- a/library/Perfdatagraphsgraphite/ProvidedHook/Perfdatagraphs/PerfdataSource.php +++ b/library/Perfdatagraphsgraphite/ProvidedHook/Perfdatagraphs/PerfdataSource.php @@ -9,7 +9,7 @@ use Icinga\Module\Perfdatagraphs\Model\PerfdataRequest; use Icinga\Module\Perfdatagraphs\Model\PerfdataResponse; -use Icinga\Application\Logger; +use Icinga\Application\Benchmark; use GuzzleHttp\Exception\RequestException; use GuzzleHttp\Exception\ConnectException; @@ -32,6 +32,8 @@ public function fetchData(PerfdataRequest $req): PerfdataResponse $perfdataresponse = new PerfdataResponse(); + Benchmark::measure('Fetching performance data from Graphite'); + // Create a client and get the data from the API try { $client = Graphite::fromConfig(); @@ -70,14 +72,20 @@ public function fetchData(PerfdataRequest $req): PerfdataResponse $perfdataresponse->addError($e->getMessage()); } + Benchmark::measure('Fetched performance data from Graphite'); + // Why even bother when we have errors here if ($perfdataresponse->hasErrors()) { return $perfdataresponse; } + Benchmark::measure('Transforming performance data from Graphite'); + // Transform into the PerfdataSourceHook format $perfdataresponse = Transformer::transform($response, $req->getCheckcommand()); + Benchmark::measure('Transformed performance data from Graphite'); + return $perfdataresponse; } }