git: 0ef06e410580 - main - net-mgmt/icingaweb2-module-grafana: Update to latest version
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 13 Feb 2025 17:24:17 UTC
The branch main has been updated by lme:
URL: https://cgit.FreeBSD.org/ports/commit/?id=0ef06e4105808c37e8549aa864f71f31aab1d5d8
commit 0ef06e4105808c37e8549aa864f71f31aab1d5d8
Author: Denis Shaposhnikov <dsh@bamus.cz>
AuthorDate: 2025-02-13 16:57:06 +0000
Commit: Lars Engels <lme@FreeBSD.org>
CommitDate: 2025-02-13 17:12:01 +0000
net-mgmt/icingaweb2-module-grafana: Update to latest version
- Update to 3.0.1 (compatible with PHP >= 8.1)
- Switch to new upstream (now maintained by NETWAYS)
- Pass maintainership to submitter
PR: 275525
Reported by: Denis Shaposhnikov <dsh@bamus.cz>
---
net-mgmt/icingaweb2-module-grafana/Makefile | 9 ++++-----
net-mgmt/icingaweb2-module-grafana/distinfo | 6 +++---
.../patch-application_controllers_IcingadbimgController.php | 10 ++++++++++
...brary_Grafana_ProvidedHook_Icingadb_HostDetailExtension.php | 10 ++++++++++
...ry_Grafana_ProvidedHook_Icingadb_ServiceDetailExtension.php | 10 ++++++++++
net-mgmt/icingaweb2-module-grafana/pkg-plist | 8 ++------
6 files changed, 39 insertions(+), 14 deletions(-)
diff --git a/net-mgmt/icingaweb2-module-grafana/Makefile b/net-mgmt/icingaweb2-module-grafana/Makefile
index 130131e9852a..a961e5b0f0cc 100644
--- a/net-mgmt/icingaweb2-module-grafana/Makefile
+++ b/net-mgmt/icingaweb2-module-grafana/Makefile
@@ -1,13 +1,12 @@
PORTNAME= icingaweb2-module-grafana
DISTVERSIONPREFIX= v
-DISTVERSION= 2.0.3
-PORTREVISION= 0
+DISTVERSION= 3.0.1
CATEGORIES= net-mgmt www
PKGNAMESUFFIX= ${PHP_PKGNAMESUFFIX}
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER= dsh@bamus.cz
COMMENT= Add Grafana graphs into Icinga Web 2 to display performance metrics
-WWW= https://github.com/Mikesch-mp/icingaweb2-module-grafana
+WWW= https://github.com/NETWAYS/icingaweb2-module-grafana
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/LICENSE
@@ -17,7 +16,7 @@ RUN_DEPENDS= icingaweb2${PHP_PKGNAMESUFFIX}>=2.11.4:net-mgmt/icingaweb2@${PHP_FL
USES= php:web,flavors
USE_GITHUB= yes
-GH_ACCOUNT= mikesch-mp
+GH_ACCOUNT= NETWAYS
NO_BUILD= yes
NO_ARCH= yes
diff --git a/net-mgmt/icingaweb2-module-grafana/distinfo b/net-mgmt/icingaweb2-module-grafana/distinfo
index d5dd8f7d0913..b5a9432d0b00 100644
--- a/net-mgmt/icingaweb2-module-grafana/distinfo
+++ b/net-mgmt/icingaweb2-module-grafana/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1685178892
-SHA256 (mikesch-mp-icingaweb2-module-grafana-v2.0.3_GH0.tar.gz) = f51ace389ac5c2b8735e88dac94e6bde4f183b25154e424af1fa11a03bb0715f
-SIZE (mikesch-mp-icingaweb2-module-grafana-v2.0.3_GH0.tar.gz) = 1765565
+TIMESTAMP = 1739460243
+SHA256 (NETWAYS-icingaweb2-module-grafana-v3.0.1_GH0.tar.gz) = ce1c893553ad485fb3b46a053d4af4b56fb805e05bcfdec7114774fbc56cff4c
+SIZE (NETWAYS-icingaweb2-module-grafana-v3.0.1_GH0.tar.gz) = 1539799
diff --git a/net-mgmt/icingaweb2-module-grafana/files/patch-application_controllers_IcingadbimgController.php b/net-mgmt/icingaweb2-module-grafana/files/patch-application_controllers_IcingadbimgController.php
new file mode 100644
index 000000000000..a259bc4931a5
--- /dev/null
+++ b/net-mgmt/icingaweb2-module-grafana/files/patch-application_controllers_IcingadbimgController.php
@@ -0,0 +1,10 @@
+--- application/controllers/IcingadbimgController.php.orig 2025-02-03 09:18:12 UTC
++++ application/controllers/IcingadbimgController.php
+@@ -16,6 +16,7 @@ use ipl\Web\Url;
+ /**
+ * IcingadbimgController loads graphs as images from the grafana-image-renderer.
+ */
++#[\AllowDynamicProperties]
+ class IcingadbimgController extends IcingadbGrafanaController
+ {
+ protected $timerange;
diff --git a/net-mgmt/icingaweb2-module-grafana/files/patch-library_Grafana_ProvidedHook_Icingadb_HostDetailExtension.php b/net-mgmt/icingaweb2-module-grafana/files/patch-library_Grafana_ProvidedHook_Icingadb_HostDetailExtension.php
new file mode 100644
index 000000000000..0323228d37cb
--- /dev/null
+++ b/net-mgmt/icingaweb2-module-grafana/files/patch-library_Grafana_ProvidedHook_Icingadb_HostDetailExtension.php
@@ -0,0 +1,10 @@
+--- library/Grafana/ProvidedHook/Icingadb/HostDetailExtension.php.orig 2025-02-03 09:18:12 UTC
++++ library/Grafana/ProvidedHook/Icingadb/HostDetailExtension.php
+@@ -7,6 +7,7 @@ use ipl\Html\ValidHtml;
+ use ipl\Html\HtmlString;
+ use ipl\Html\ValidHtml;
+
++#[\AllowDynamicProperties]
+ class HostDetailExtension extends HostDetailExtensionHook
+ {
+ use IcingaDbGrapher;
diff --git a/net-mgmt/icingaweb2-module-grafana/files/patch-library_Grafana_ProvidedHook_Icingadb_ServiceDetailExtension.php b/net-mgmt/icingaweb2-module-grafana/files/patch-library_Grafana_ProvidedHook_Icingadb_ServiceDetailExtension.php
new file mode 100644
index 000000000000..81e262630393
--- /dev/null
+++ b/net-mgmt/icingaweb2-module-grafana/files/patch-library_Grafana_ProvidedHook_Icingadb_ServiceDetailExtension.php
@@ -0,0 +1,10 @@
+--- library/Grafana/ProvidedHook/Icingadb/ServiceDetailExtension.php.orig 2025-02-03 09:18:12 UTC
++++ library/Grafana/ProvidedHook/Icingadb/ServiceDetailExtension.php
+@@ -7,6 +7,7 @@ use ipl\Html\ValidHtml;
+ use ipl\Html\HtmlString;
+ use ipl\Html\ValidHtml;
+
++#[\AllowDynamicProperties]
+ class ServiceDetailExtension extends ServiceDetailExtensionHook
+ {
+ use IcingaDbGrapher;
diff --git a/net-mgmt/icingaweb2-module-grafana/pkg-plist b/net-mgmt/icingaweb2-module-grafana/pkg-plist
index e3103b538a53..a2962efb1548 100644
--- a/net-mgmt/icingaweb2-module-grafana/pkg-plist
+++ b/net-mgmt/icingaweb2-module-grafana/pkg-plist
@@ -1,6 +1,7 @@
%%WWWDIR%%/CHANGELOG.md
%%WWWDIR%%/CONTRIBUTING.md
%%WWWDIR%%/LICENSE
+%%WWWDIR%%/Makefile
%%WWWDIR%%/README.md
%%WWWDIR%%/RELEASE.md
%%WWWDIR%%/application/controllers/ConfigController.php
@@ -68,7 +69,6 @@
%%WWWDIR%%/doc/06-create-grafana-dashboards-influxdb.md
%%WWWDIR%%/doc/07-create-grafana-dashboards-graphite.md
%%WWWDIR%%/doc/images/02-installation-01.png
-%%WWWDIR%%/doc/images/03-module_grafana_configuration01.png
%%WWWDIR%%/doc/images/04-graph.configuration-01.png
%%WWWDIR%%/doc/images/04-graph.configuration-02.png
%%WWWDIR%%/doc/images/04-graph.configuration-03.png
@@ -76,13 +76,11 @@
%%WWWDIR%%/doc/images/04-graph.configuration-05.png
%%WWWDIR%%/doc/images/04-graph.configuration-06.png
%%WWWDIR%%/doc/images/04-graph.configuration-07.png
-%%WWWDIR%%/doc/images/06-cog.png
%%WWWDIR%%/doc/images/06-create-new.png
%%WWWDIR%%/doc/images/06-dashboard-add-panel.png
%%WWWDIR%%/doc/images/06-dashboard-panel-axis.png
%%WWWDIR%%/doc/images/06-dashboard-panel-colors.png
%%WWWDIR%%/doc/images/06-dashboard-panel-display-overrides.png
-%%WWWDIR%%/doc/images/06-dashboard-panel-graphite-edit.png
%%WWWDIR%%/doc/images/06-dashboard-panel-influx-edit.png
%%WWWDIR%%/doc/images/06-dashboard-panel-legend.png
%%WWWDIR%%/doc/images/06-dashboard-panel-metrics-crit-warn.png
@@ -105,12 +103,9 @@
%%WWWDIR%%/doc/images/07-templating-graphite.png
%%WWWDIR%%/doc/images/grafana-datasource-graphite.png
%%WWWDIR%%/doc/images/grafana-datasource-influxdb.png
-%%WWWDIR%%/doc/images/grafana-import-base-metrics-dashboard.png
%%WWWDIR%%/doc/images/grafana-import-icinga2-default-dashboard.png
%%WWWDIR%%/doc/images/icingaweb2_grafana_screenshot_01.png
%%WWWDIR%%/doc/images/icingaweb2_grafana_screenshot_02.png
-%%WWWDIR%%/doc/images/icingaweb2_grafana_screenshot_03.png
-%%WWWDIR%%/doc/images/icingaweb2_grafana_screenshot_04.png
%%WWWDIR%%/doc/images/icingaweb2_grafana_screenshot_05.png
%%WWWDIR%%/doc/images/icingaweb2_grafana_screenshot_06.png
%%WWWDIR%%/doc/images/showallgraph.png
@@ -124,6 +119,7 @@
%%WWWDIR%%/library/Grafana/Web/Controller/IcingadbGrafanaController.php
%%WWWDIR%%/library/Grafana/Web/Widget/PrintAction.php
%%WWWDIR%%/module.info
+%%WWWDIR%%/phpcs.xml
%%WWWDIR%%/public/css/module.less
%%WWWDIR%%/public/js/behavior/iframe.js
%%WWWDIR%%/run.php